summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMalgorzata Janczarska2011-05-26 05:43:07 (EDT)
committer Malgorzata Janczarska2011-05-26 05:43:07 (EDT)
commita16f896d1f8c945741523a2f6e7d6ac1aaaba3ef (patch)
treea068e579436701f1a9605205d19e4afe4e7b16bc
parent68ca93944d74170857fc0b81d2b1804730f85a69 (diff)
downloadorg.eclipse.orion.client-a16f896d1f8c945741523a2f6e7d6ac1aaaba3ef.zip
org.eclipse.orion.client-a16f896d1f8c945741523a2f6e7d6ac1aaaba3ef.tar.gz
org.eclipse.orion.client-a16f896d1f8c945741523a2f6e7d6ac1aaaba3ef.tar.bz2
Bug 346973 - [client] Replace icons in the clone view
-rw-r--r--bundles/org.eclipse.orion.client.core/static/js/explorer.js4
-rw-r--r--bundles/org.eclipse.orion.client.git/static/images/git-branch.gifbin0 -> 158 bytes
-rw-r--r--bundles/org.eclipse.orion.client.git/static/images/git-branches.gifbin0 -> 925 bytes
-rw-r--r--bundles/org.eclipse.orion.client.git/static/images/git-remote.gifbin0 -> 950 bytes
-rw-r--r--bundles/org.eclipse.orion.client.git/static/images/git-remotes.gifbin0 -> 523 bytes
-rw-r--r--bundles/org.eclipse.orion.client.git/static/images/git-repository.gifbin0 -> 545 bytes
-rw-r--r--bundles/org.eclipse.orion.client.git/static/js/git-clone/git-clones-explorer.js12
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
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.git/static/images/git-branch.gif
Binary files differ
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
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.git/static/images/git-branches.gif
Binary files differ
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
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.git/static/images/git-remote.gif
Binary files differ
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
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.git/static/images/git-remotes.gif
Binary files differ
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
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.git/static/images/git-repository.gif
Binary files differ
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: