Attachment #211865 for bug #335890

Lines 557-564 Link Here

(-)a/bundles/org.eclipse.orion.client.core/web/orion/fileCommands.js (-2 / +2 lines)
557		557
558		558
559	var importCommand = new mCommands.Command({	559	var importCommand = new mCommands.Command({
560	name : "Import from zip...",	560	name : "Import local file(s)...",
561	tooltip: "Copy files and folders contained in a local zip file",	561	tooltip: "Copy file(s) directly or as a zip file",
562	imageClass: "core-sprite-importzip",	562	imageClass: "core-sprite-importzip",
563	id: "eclipse.importCommand",	563	id: "eclipse.importCommand",
564	callback : function(data) {	564	callback : function(data) {

Lines 25-31 Link Here

(-)a/bundles/org.eclipse.orion.client.core/web/orion/widgets/ImportDialog.js (-1 / +1 lines)
25	},	25	},
26	postMixInProperties : function() {	26	postMixInProperties : function() {
27	this.inherited(arguments);	27	this.inherited(arguments);
28	this.title = "Import from zip";	28	this.title = "Import local file(s)";
29	},	29	},
30	postCreate : function() {	30	postCreate : function() {
31	this.inherited(arguments);	31	this.inherited(arguments);




						</div>
					</div>
					<div style="display: table-row">
						<div style="display: table-cell; padding: 5"></div>
						<div style="display: table-cell; padding: 5">
							<p>If the same file exists in both the source and destination:</p>
						    <input type="checkbox" dojoAttachPoint="overwriteAll" dojoType="dijit.form.CheckBox" name="no-overwrite" id="no-overwrite" value="no-overwrite" />
						    <label for="radioOne">Do not overwrite if file(s) already exist</label>
						    <br />
						    <input type="checkbox" dojoAttachPoint="extract" dojoType="dijit.form.CheckBox" name="extract" checked id="extract"/>
				    		<label for="radioOne">Extract archive after importing</label>
						    <br />
						</div>
					</div>
					<div style="display: table-row">
						<div style="display: table-cell; padding: 1px;">
						</div>
						<div style="display: table-cell; padding: 1px;">

Return to bug 335890

Lines 25-30 Link Here

(-)a/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/ImportDialog.html (+12 lines)
25	</div>	25	</div>
26	</div>	26	</div>
27	<div style="display: table-row">	27	<div style="display: table-row">
		28	<div style="display: table-cell; padding: 5"></div>
		29	<div style="display: table-cell; padding: 5">
		30	<p>If the same file exists in both the source and destination:</p>
		31	<input type="checkbox" dojoAttachPoint="overwriteAll" dojoType="dijit.form.CheckBox" name="no-overwrite" id="no-overwrite" value="no-overwrite" />
		32	<label for="radioOne">Do not overwrite if file(s) already exist</label>
		33	<br />
		34	<input type="checkbox" dojoAttachPoint="extract" dojoType="dijit.form.CheckBox" name="extract" checked id="extract"/>
		35	<label for="radioOne">Extract archive after importing</label>
		36	<br />
		37	</div>
		38	</div>
		39	<div style="display: table-row">
28	<div style="display: table-cell; padding: 1px;">	40	<div style="display: table-cell; padding: 1px;">
29	</div>	41	</div>
30	<div style="display: table-cell; padding: 1px;">	42	<div style="display: table-cell; padding: 1px;">