Attachment 205439 Details for Bug 361013 – Fix v02

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix v02

361013v02.patch (text/plain), 5.24 KB, created by Tomasz Zarna

on 2011-10-18 12:30:24 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2011-10-18 12:30:24 EDT

Size: 5.24 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.git/web/git/git-clone.html b/bundles/org.eclipse.orion.client.git/web/git/git-clone.html
>index b07b086..5682c1d 100644
>--- a/bundles/org.eclipse.orion.client.git/web/git/git-clone.html
>+++ b/bundles/org.eclipse.orion.client.git/web/git/git-clone.html
>@@ -1,12 +1,12 @@
> <!doctype html>
> <html style="height: 100%" >
>-    <head>
>+	<head>
> 		<meta name="copyright" content="Copyright (c) IBM Corporation and others 2010, 2011." >
> 		<meta http-equiv="Content-Language" content="en-us">
> 		<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
>-    	<title>Git Clones</title>
>-    	<link rel="stylesheet" type="text/css" href="git-clone.css" />
>-   	<script type="text/javascript" src="../requirejs/require.js"></script>
>+		<title>Git Repositories</title>
>+		<link rel="stylesheet" type="text/css" href="git-clone.css" />
>+	<script type="text/javascript" src="../requirejs/require.js"></script>
> 		<script type="text/javascript">
> 		require({
> 			  baseUrl: '..',
>@@ -56,7 +56,7 @@
> 			<div class="mainpane" id="rightPane" dojoType="dijit.layout.ContentPane" region="center" splitter="false">
> 				<div id="explorer-tree" class="navigator" style="margin-left: 16px">
> 					<div id="clonesList" style="min-width: 500px">
>-					<div  id="clonesProgress">Loading git clones...</div>
>+					<div  id="clonesProgress">Loading git repositories...</div>
> 					</div>
> 				</div>
> 			</div>
>diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js b/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js
>index 42f20b7..3104d1f 100644
>--- a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js
>+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js
>@@ -318,12 +318,12 @@ var exports = {};
> 		commandService.addCommand(addBranchCommand, "object");
> 		
> 		var removeBranchCommand = new mCommands.Command({
>-			name: "Remove", // "Remove Branch"
>-			tooltip: "Remove the local branch from the repository",
>+			name: "Delete", // "Delete Branch"
>+			tooltip: "Delete the local branch from the repository",
> 			imageClass: "core-sprite-delete",
> 			id: "eclipse.removeBranch",
> 			callback: function(item) {
>-				if(confirm("Are you sure you want to remove branch " + item.Name+"?"))
>+				if(confirm("Are you sure you want to delete branch " + item.Name+"?"))
> 				serviceRegistry.getService("orion.git.provider").then(
> 					function(service) {
> 						service.removeBranch(item.Location).then(
>@@ -341,12 +341,12 @@ var exports = {};
> 		commandService.addCommand(removeBranchCommand, "object");
> 		
> 		var removeRemoteBranchCommand = new mCommands.Command({
>-			name: "Remove", // "Remove Remote Branch",
>-			tooltip: "Remove the remote tracking branch from the repository",
>+			name: "Delete", // "Delete Remote Branch",
>+			tooltip: "Delete the remote tracking branch from the repository",
> 			imageClass: "core-sprite-delete",
> 			id: "eclipse.removeRemoteBranch",
> 			callback: function(item) {
>-				if(confirm("You're going to remove remote branch " + item.Name+" and push the change.\n\nAre you sure?"))
>+				if(confirm("You're going to delete remote branch " + item.Name+" and push the change.\n\nAre you sure?"))
> 				exports.getDefaultSshOptions(serviceRegistry).then(function(options){
> 						var func = arguments.callee;
> 						serviceRegistry.getService("orion.git.provider").then(function(gitService) {
>@@ -357,7 +357,7 @@ var exports = {};
> 											function(jsonData){
> 												if (jsonData.Result.Severity == "Ok")
> 													dojo.hitch(explorer, explorer.changedItem)(item.parent);
>-											}, func, "Remove Remote Branch");
>+											}, func, "Delete Remote Branch");
> 									});
> 								});
> 							});
>@@ -396,12 +396,12 @@ var exports = {};
> 		commandService.addCommand(addRemoteCommand, "object");
> 		
> 		var removeRemoteCommand = new mCommands.Command({
>-			name: "Remove", // "Remove Remote",
>-			tooltip: "Remove the remote from the repository",
>+			name: "Delete", // "Delete Remote",
>+			tooltip: "Delete the remote from the repository",
> 			imageClass: "core-sprite-delete",
> 			id: "eclipse.removeRemote",
> 			callback: function(item) {
>-				if(confirm("Are you sure you want to remove remote " + item.Name+"?"))
>+				if(confirm("Are you sure you want to delete remote " + item.Name+"?"))
> 				serviceRegistry.getService("orion.git.provider").then(
> 					function(service) {
> 						service.removeRemote(item.Location).then(
>@@ -1156,7 +1156,7 @@ var exports = {};
> 		
> 		var resetIndexCommand = new mCommands.Command({
> 			name : "Reset",
>-			tooltip: "Reset your active branch to the state of the selected branch. Remove all staged and unstaged changes.",
>+			tooltip: "Reset your active branch to the state of the selected branch. Discard all staged and unstaged changes.",
> 			imageClass: "git-sprite-refresh",
> 			spriteClass: "gitCommandSprite",
> 			id : "eclipse.orion.git.resetIndex",
>@@ -1670,8 +1670,8 @@ var exports = {};
> 		commandService.addCommand(initGitRepositoryCommand, "dom");
> 		
> 		var deleteCommand = new mCommands.Command({
>-			name: "Remove", // "Remove Clone"
>-			tooltip: "Remove the repository",
>+			name: "Delete", // "Delete Repository"
>+			tooltip: "Delete the repository",
> 			imageClass: "core-sprite-delete",
> 			id: "eclipse.git.deleteClone",
> 			visibleWhen: function(item) {

Actions: View | Diff

Attachments on bug 361013: 205305 | 205306 | 205439