Attachment 211865 Details for Bug 335890 – Patch for client component

[patch] Patch for client component

Fix-for-bug-335890.patch (text/plain), 2.54 KB, created by Jay Arthanareeswaran

on 2012-03-01 05:35:15 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Jay Arthanareeswaran

Created: 2012-03-01 05:35:15 EST

Size: 2.54 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.core/web/orion/fileCommands.js b/bundles/org.eclipse.orion.client.core/web/orion/fileCommands.js
>index ec632fc..9c4400d 100644
>--- a/bundles/org.eclipse.orion.client.core/web/orion/fileCommands.js
>+++ b/bundles/org.eclipse.orion.client.core/web/orion/fileCommands.js
>@@ -557,8 +557,8 @@
> 
> 					
> 		var importCommand = new mCommands.Command({
>-			name : "Import from zip...",
>-			tooltip: "Copy files and folders contained in a local zip file",
>+			name : "Import local file(s)...",
>+			tooltip: "Copy file(s) directly or as a zip file",
> 			imageClass: "core-sprite-importzip",
> 			id: "eclipse.importCommand",
> 			callback : function(data) {
>diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/ImportDialog.js b/bundles/org.eclipse.orion.client.core/web/orion/widgets/ImportDialog.js
>index c2b3ad3..846c162 100644
>--- a/bundles/org.eclipse.orion.client.core/web/orion/widgets/ImportDialog.js
>+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/ImportDialog.js
>@@ -25,7 +25,7 @@
> 	},
> 	postMixInProperties : function() {
> 		this.inherited(arguments);
>-		this.title = "Import from zip";
>+		this.title = "Import local file(s)";
> 	},
> 	postCreate : function() {
> 		this.inherited(arguments);		
>diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/ImportDialog.html b/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/ImportDialog.html
>index c7c454b..e3dade5 100644
>--- a/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/ImportDialog.html
>+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/templates/ImportDialog.html
>@@ -25,6 +25,18 @@
> 						</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;">

Actions: View | Diff

Attachments on bug 335890: 187991 | 187992 | 211864 | 211865