Bug 346973 - [client] Replace icons in the clone view

Change-Id: I1c321b73384e5e5466523523e58789a9176de4d0

7 files changed, 10 insertions, 6 deletions

diff --git a/bundles/org.eclipse.orion.client.core/static/js/explorer.js b/bundles/org.eclipse.orion.client.core/static/js/explorer.js
index cd5ce33..965e97b 100644
--- a/bundles/org.eclipse.orion.client.core/static/js/explorer.js
+++ b/bundles/org.eclipse.orion.client.core/static/js/explorer.js
@@ -307,9 +307,9 @@ eclipse.ExplorerRenderer = (function() {
 			return rowId+"__expand";

 		},

 		
-		getExpandImage: function(tableRow, placeHolder){
+		getExpandImage: function(tableRow, placeHolder, decorateImage){
 			var expandImg = dojo.create("img", {src: this._collapseImgSrc, name: this.expandCollapseImageId(tableRow.id)}, placeHolder, "last");
-			dojo.create("img", {src: "/images/fldr_obj.gif"}, placeHolder, "last");
+			dojo.create("img", {src: decorateImage ? decorateImage : "/images/fldr_obj.gif"}, placeHolder, "last");
 			expandImg.onclick = dojo.hitch(this, function(evt) {
 				this.tableTree.toggle(tableRow.id, this.expandCollapseImageId(tableRow.id), this._expandImgSrc, this._collapseImgSrc);

 				var expanded = this.tableTree.isExpanded(tableRow.id);

diff --git a/bundles/org.eclipse.orion.client.git/static/images/git-branch.gif b/bundles/org.eclipse.orion.client.git/static/images/git-branch.gif
new file mode 100644
index 0000000..09eca35
--- a/dev/null
+++ b/bundles/org.eclipse.orion.client.git/static/images/git-branch.gif
diff --git a/bundles/org.eclipse.orion.client.git/static/images/git-branches.gif b/bundles/org.eclipse.orion.client.git/static/images/git-branches.gif
new file mode 100644
index 0000000..3973c47
--- a/dev/null
+++ b/bundles/org.eclipse.orion.client.git/static/images/git-branches.gif
diff --git a/bundles/org.eclipse.orion.client.git/static/images/git-remote.gif b/bundles/org.eclipse.orion.client.git/static/images/git-remote.gif
new file mode 100644
index 0000000..4d7ff8c
--- a/dev/null
+++ b/bundles/org.eclipse.orion.client.git/static/images/git-remote.gif
diff --git a/bundles/org.eclipse.orion.client.git/static/images/git-remotes.gif b/bundles/org.eclipse.orion.client.git/static/images/git-remotes.gif
new file mode 100644
index 0000000..aec2dd9
--- a/dev/null
+++ b/bundles/org.eclipse.orion.client.git/static/images/git-remotes.gif
diff --git a/bundles/org.eclipse.orion.client.git/static/images/git-repository.gif b/bundles/org.eclipse.orion.client.git/static/images/git-repository.gif
new file mode 100644
index 0000000..0470e15
--- a/dev/null
+++ b/bundles/org.eclipse.orion.client.git/static/images/git-repository.gif
diff --git a/bundles/org.eclipse.orion.client.git/static/js/git-clone/git-clones-explorer.js b/bundles/org.eclipse.orion.client.git/static/js/git-clone/git-clones-explorer.js
index a929052..1c08f81 100644
--- a/bundles/org.eclipse.orion.client.git/static/js/git-clone/git-clones-explorer.js
+++ b/bundles/org.eclipse.orion.client.git/static/js/git-clone/git-clones-explorer.js
@@ -167,7 +167,7 @@ eclipse.git.GitClonesRenderer = (function(){
 				var nameId =  tableRow.id + "__expand";

 				div = dojo.create("div", null, col, "only");

 				// defined in ExplorerRenderer.  Sets up the expand/collapse behavior

-				this.getExpandImage(tableRow, div);

+				this.getExpandImage(tableRow, div, "/images/git-repository.gif");

 				

 				link = dojo.create("a", {innerHTML: item.Name, className: "navlinkonpage", href: "/navigate/table.html#" + item.ContentLocation+"?depth=1"}, div, "last");

 				dojo.place(document.createTextNode(item.Name), link, "only");

@@ -176,7 +176,7 @@ eclipse.git.GitClonesRenderer = (function(){
 				var nameId =  tableRow.id + "__expand";

 				div = dojo.create("div", null, col, "only");

 				// defined in ExplorerRenderer.  Sets up the expand/collapse behavior

-				this.getExpandImage(tableRow, div);

+				this.getExpandImage(tableRow, div, item.Name==="Branch" ? "/images/git-branches.gif" : "/images/git-remotes.gif");

 				

 				link = dojo.create("a", {innerHTML: item.Name, className: "navlinkonpage"}, div, "last");

 				dojo.place(document.createTextNode(item.Name), link, "only");

@@ -188,21 +188,25 @@ eclipse.git.GitClonesRenderer = (function(){
 				if (item.Current)

 					link.style.fontWeight = "bold";

 				dojo.place(document.createTextNode(item.Name), link, "only");

+				dojo.create("img", {src: "/images/git-branch.gif"}, link, "first");

+				

 			} else if (item.Type === "Remote"){

 				col = document.createElement('td');

 				var nameId =  tableRow.id + "__expand";

 				div = dojo.create("div", null, col, "only");

 				// defined in ExplorerRenderer.  Sets up the expand/collapse behavior

-				this.getExpandImage(tableRow, div);

+				this.getExpandImage(tableRow, div, "/images/git-remote.gif");

 				

 				link = dojo.create("a", {innerHTML: item.Name, className: "navlinkonpage"}, div, "last");

 				dojo.place(document.createTextNode(item.Name), link, "only");

 			} else if (item.Type === "RemoteTrackingBranch"){

 				col = document.createElement('td');

 				div = dojo.create("div", null, col, "only");

-				

+								

 				link = dojo.create("a", {innerHTML: item.Name, className: "navlinkonpage"}, div, "last");

+								

 				dojo.place(document.createTextNode(item.Name), link, "only");

+				dojo.create("img", {src: "/images/git-branch.gif"}, link, "first");

 			}	

 			return col;

 		case 1: