[Bug 418680] Icon sprite pass for 4.0RC2
-Rename menu_twistie to downarrow
-Remove duplication of dropdownArrow(Right|Down) background offsets in theme.css
diff --git a/bundles/org.eclipse.orion.client.git/web/git/css/git.css b/bundles/org.eclipse.orion.client.git/web/git/css/git.css
index f59ed72..acc2780 100644
--- a/bundles/org.eclipse.orion.client.git/web/git/css/git.css
+++ b/bundles/org.eclipse.orion.client.git/web/git/css/git.css
@@ -87,6 +87,10 @@
 	vertical-align: middle;
 }
 
+/* Individual sprites
+ * These classes are generated by a sprite builder. Do not edit manually.
+ * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=360041#c5 for instructions.
+ */
 .git-sprite-addition{ background-image: url(../images/git-add.png); width: 16px; height: 16px; } 
 .git-sprite-apply_patch{ background-image: url(../images/bandaid.png); width: 16px; height: 16px; } 
 .git-sprite-branch{ background-position: 0 -36px; width: 16px; height: 16px; } 
diff --git a/bundles/org.eclipse.orion.client.ui/web/css/images.css b/bundles/org.eclipse.orion.client.ui/web/css/images.css
index f1f62cf..3161c1d 100644
--- a/bundles/org.eclipse.orion.client.ui/web/css/images.css
+++ b/bundles/org.eclipse.orion.client.ui/web/css/images.css
@@ -22,49 +22,46 @@
  * These classes are generated by a sprite builder. Do not edit manually.
  * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=360041#c5 for instructions.
  */
-.core-sprite-addcontent{ background:url(../images/addcontent.png); width: 16px; height: 16px; } 
+.core-sprite-addcontent{ background-position: 0 0; width: 16px; height: 16px; } 
 .core-sprite-check{ background-position: 0 -18px; width: 16px; height: 16px; } 
 .core-sprite-check_on{ background-position: 0 -36px; width: 16px; height: 16px; } 
 .core-sprite-close{ background-position: 0 -54px; width: 16px; height: 16px; } 
 .core-sprite-closedarrow{ background-position: 0 -72px; width: 16px; height: 16px; } 
-.core-sprite-collapseAll{ background:url(../images/collapseAll.png); width: 16px; height: 16px; } 
+.core-sprite-collapseAll{ background-position: 0 -90px; width: 16px; height: 16px; } 
 .core-sprite-compare-addition{ background-position: 0 -108px; width: 16px; height: 16px; } 
 .core-sprite-compare-removal{ background-position: 0 -126px; width: 16px; height: 16px; } 
 .core-sprite-copy-folder{ background-position: 0 -144px; width: 16px; height: 16px; } 
-.core-sprite-delete{ background:url(../images/delete.png); width: 16px; height: 16px; } 
-.core-sprite-edit{ background:url(../images/edit.png); width: 16px; height: 16px; } 
-.core-sprite-error{ background-position: 0 -198px; width: 16px; height: 16px; } 
-.core-sprite-expandAll{ background:url(../images/expandAll.png); width: 16px; height: 16px; } 
-.core-sprite-file{ background-position: 0 -252px; width: 16px; height: 16px; } 
-.core-sprite-file_model{ background:url(../images/file.png); width: 16px; height: 16px; } 
-.core-sprite-folder{ background-position: 0 -288px; width: 16px; height: 16px; } 
-.core-sprite-folder_model{ background:url(../images/folder.png); width: 16px; height: 16px; background-repeat: no-repeat; } 
-.core-sprite-gear{ background:url(../images/gear.png); width: 16px; height: 16px; } 
-.core-sprite-go-down{ background:url(../images/go-down.png); width: 16px; height: 16px; }
-.core-sprite-go-up{ background:url(../images/go-up.png); width: 16px; height: 16px; } 
-.core-sprite-hamburger{ background-position: 0 -342px; width: 16px; height: 16px; } 
-.core-sprite-initproject{ background:url(../images/initproject.png); width: 16px; height: 16px; } 
-.core-sprite-information{ background-position: 0 -360px; width: 16px; height: 16px; } 
-.core-sprite-leftarrow{ background-position: 0 -378px; width: 16px; height: 16px; } 
-.core-sprite-link{ background-position: 0 -396px; width: 16px; height: 16px; } 
-.core-sprite-list{ background-position: 0 -414px; width: 16px; height: 16px; } 
-.core-sprite-menu_twistie{ background-position: 0 -432px; width: 5px; height: 3px; } 
-.core-sprite-move_down{ background-position: 0 -437px; width: 16px; height: 16px; } 
-.core-sprite-move_up{ background-position: 0 -455px; width: 16px; height: 16px; } 
-.core-sprite-none{ background-position: 0 -473px; width: 16px; height: 16px; } 
-.core-sprite-ok{ background-position: 0 -491px; width: 16px; height: 16px; } 
-.core-sprite-openarrow{ background-position: 0 -509px; width: 16px; height: 16px; } 
-.core-sprite-orion-logo{ background-position: 0 -527px; width: 36px; height: 25px; } 
-.core-sprite-outline{ background-position: 0 -554px; width: 16px; height: 16px; } 
-.core-sprite-refresh{ background-position: 0 -572px; width: 16px; height: 16px; } 
-.core-sprite-replaceAll{ background-position: 0 -590px; width: 16px; height: 16px; } 
-.core-sprite-rightarrow{ background-position: 0 -608px; width: 16px; height: 16px; } 
-.core-sprite-sep{ background-position: 0 -626px; width: 1px; height: 16px; } 
-.core-sprite-silhouette{ background-position: 0 -644px; width: 16px; height: 16px; } 
-.core-sprite-start{ background-position: 0 -662px; width: 16px; height: 16px; } 
-.core-sprite-stop{ background-position: 0 -680px; width: 16px; height: 16px; } 
-.core-sprite-stylesheet{ background-position: 0 -698px; width: 16px; height: 16px; } 
+.core-sprite-delete{ background-position: 0 -162px; width: 16px; height: 16px; } 
+.core-sprite-downarrow{ background-position: 0 -180px; width: 5px; height: 3px; } 
+.core-sprite-edit{ background-position: 0 -185px; width: 16px; height: 16px; } 
+.core-sprite-error{ background-position: 0 -203px; width: 16px; height: 16px; } 
+.core-sprite-expandAll{ background-position: 0 -221px; width: 16px; height: 16px; } 
+.core-sprite-file{ background-position: 0 -239px; width: 16px; height: 16px; } 
+.core-sprite-file_model{ background-position: 0 -257px; width: 16px; height: 16px; } 
+.core-sprite-folder{ background-position: 0 -275px; width: 16px; height: 16px; } 
+.core-sprite-gear{ background-position: 0 -293px; width: 16px; height: 16px; } 
+.core-sprite-go-down{ background-position: 0 -311px; width: 16px; height: 16px; } 
+.core-sprite-go-up{ background-position: 0 -329px; width: 16px; height: 16px; } 
+.core-sprite-hamburger{ background-position: 0 -347px; width: 16px; height: 16px; } 
+.core-sprite-information{ background-position: 0 -365px; width: 16px; height: 16px; } 
+.core-sprite-initproject{ background-position: 0 -383px; width: 16px; height: 16px; } 
+.core-sprite-leftarrow{ background-position: 0 -401px; width: 16px; height: 16px; } 
+.core-sprite-link{ background-position: 0 -419px; width: 16px; height: 16px; } 
+.core-sprite-list{ background-position: 0 -437px; width: 16px; height: 16px; } 
+.core-sprite-move_down{ background-position: 0 -455px; width: 16px; height: 16px; } 
+.core-sprite-move_up{ background-position: 0 -473px; width: 16px; height: 16px; } 
+.core-sprite-none{ background-position: 0 -491px; width: 16px; height: 16px; } 
+.core-sprite-ok{ background-position: 0 -509px; width: 16px; height: 16px; } 
+.core-sprite-openarrow{ background-position: 0 -527px; width: 16px; height: 16px; } 
+.core-sprite-orion-logo{ background-position: 0 -545px; width: 36px; height: 25px; } 
+.core-sprite-outline{ background-position: 0 -572px; width: 16px; height: 16px; } 
+.core-sprite-refresh{ background-position: 0 -590px; width: 16px; height: 16px; } 
+.core-sprite-replaceAll{ background-position: 0 -608px; width: 16px; height: 16px; } 
+.core-sprite-rightarrow{ background-position: 0 -626px; width: 16px; height: 16px; } 
+.core-sprite-sep{ background-position: 0 -644px; width: 1px; height: 16px; } 
+.core-sprite-silhouette{ background-position: 0 -662px; width: 16px; height: 16px; } 
+.core-sprite-start{ background-position: 0 -680px; width: 16px; height: 16px; } 
+.core-sprite-stop{ background-position: 0 -698px; width: 16px; height: 16px; } 
 .core-sprite-thumbnail{ background-position: 0 -716px; width: 16px; height: 16px; } 
 .core-sprite-warning{ background-position: 0 -734px; width: 16px; height: 16px; } 
 .core-sprite-wrench{ background-position: 0 -752px; width: 16px; height: 16px; } 
- 
diff --git a/bundles/org.eclipse.orion.client.ui/web/css/theme.css b/bundles/org.eclipse.orion.client.ui/web/css/theme.css
index 9ebd326..e6a8c3a 100644
--- a/bundles/org.eclipse.orion.client.ui/web/css/theme.css
+++ b/bundles/org.eclipse.orion.client.ui/web/css/theme.css
@@ -337,20 +337,14 @@
 }

 

 .dropdownArrowDown {

-	background-position: 0 -432px;	

-	width: 5px;

-	height: 3px;

-	background-image: url(../images/core_sprites.png); 

+	background-image: url(../images/core_sprites.png);

 	display: inline-block; 

 	margin: 4px 4px 0;

 	vertical-align: top; 

 }

 

 .dropdownArrowRight {

-	background-position: 0 -72px; 

-	width: 16px;

-	height: 16px;

-	background-image: url(../images/core_sprites.png); 

+	background-image: url(../images/core_sprites.png);

 	position: absolute;

 	right: 0;

 }

diff --git a/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.html b/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.html
index a2a3d0c..33ad946 100644
--- a/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.html
+++ b/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.html
@@ -4,7 +4,7 @@
 <style type="text/css">
 h1 { font-family : Arial, Helvetica, sans-serif; font-size : 14pt; font-weight : bold; font-style : normal; }
 p,td,ul { font-family : Arial, Helvetica, sans-serif; font-size : 10pt;}
-P.footer { font-family : Arial, Helvetica, sans-serif; font-size : 8pt; }
+p.footer { font-family : Arial, Helvetica, sans-serif; font-size : 8pt; }
 </style>
 <title>Orion Core Sprites</title>
 </head>
@@ -13,48 +13,51 @@
 <table><tr><td valign="top">
 <img src="core_sprites.png">
 </td><td valign="top">
-<span class="imageSprite core-sprite-addcontent"></span>addcontent<br>
-<span class="imageSprite core-sprite-check"></span>check<br>
-<span class="imageSprite core-sprite-check_on"></span>check_on<br>
-<span class="imageSprite core-sprite-close"></span>close<br>
-<span class="imageSprite core-sprite-closedarrow"></span>closedarrow<br>
-<span class="imageSprite core-sprite-collapseAll"></span>collapseAll<br>
-<span class="imageSprite core-sprite-compare-addition"></span>compare-addition<br>
-<span class="imageSprite core-sprite-compare-removal"></span>compare-removal<br>
-<span class="imageSprite core-sprite-copy-folder"></span>copy-folder<br>
-<span class="imageSprite core-sprite-delete"></span>delete<br>
-<span class="imageSprite core-sprite-edit"></span>edit<br>
-<span class="imageSprite core-sprite-error"></span>error<br>
-<span class="imageSprite core-sprite-expandAll"></span>expandAll<br>
-<span class="imageSprite core-sprite-file"></span>file<br>
-<span class="imageSprite core-sprite-file_model"></span>file_model<br>
-<span class="imageSprite core-sprite-folder"></span>folder<br>
-<span class="imageSprite core-sprite-gear"></span>gear<br>
-<span class="imageSprite core-sprite-go-up"></span>go-up<br>
-<span class="imageSprite core-sprite-hamburger"></span>hamburger<br>
-<span class="imageSprite core-sprite-information"></span>information<br>
-<span class="imageSprite core-sprite-leftarrow"></span>leftarrow<br>
-<span class="imageSprite core-sprite-link"></span>link<br>
-<span class="imageSprite core-sprite-list"></span>list<br>
-<span class="imageSprite core-sprite-menu_twistie"></span>menu_twistie<br>
-<span class="imageSprite core-sprite-move_down"></span>move_down<br>
-<span class="imageSprite core-sprite-move_up"></span>move_up<br>
-<span class="imageSprite core-sprite-none"></span>none<br>
-<span class="imageSprite core-sprite-ok"></span>ok<br>
-<span class="imageSprite core-sprite-openarrow"></span>openarrow<br>
-<span class="imageSprite core-sprite-orion-logo"></span>orion-logo<br>
-<span class="imageSprite core-sprite-outline"></span>outline<br>
-<span class="imageSprite core-sprite-refresh"></span>refresh<br>
-<span class="imageSprite core-sprite-replaceAll"></span>replaceAll<br>
-<span class="imageSprite core-sprite-rightarrow"></span>rightarrow<br>
-<span class="imageSprite core-sprite-sep"></span>sep<br>
-<span class="imageSprite core-sprite-silhouette"></span>silhouette<br>
-<span class="imageSprite core-sprite-start"></span>start<br>
-<span class="imageSprite core-sprite-stop"></span>stop<br>
-<span class="imageSprite core-sprite-stylesheet"></span>stylesheet<br>
-<span class="imageSprite core-sprite-thumbnail"></span>thumbnail<br>
-<span class="imageSprite core-sprite-warning"></span>warning<br>
-<span class="imageSprite core-sprite-wrench"></span>wrench<br>
+
+<span class="imageSprite core-sprite-addcontent"></span>core-sprite-addcontent<br>
+<span class="imageSprite core-sprite-check"></span>core-sprite-check<br>
+<span class="imageSprite core-sprite-check_on"></span>core-sprite-check_on<br>
+<span class="imageSprite core-sprite-close"></span>core-sprite-close<br>
+<span class="imageSprite core-sprite-closedarrow"></span>core-sprite-closedarrow<br>
+<span class="imageSprite core-sprite-collapseAll"></span>core-sprite-collapseAll<br>
+<span class="imageSprite core-sprite-compare"></span>core-sprite-compare<br>
+<span class="imageSprite core-sprite-compare"></span>core-sprite-compare<br>
+<span class="imageSprite core-sprite-copy"></span>core-sprite-copy<br>
+<span class="imageSprite core-sprite-delete"></span>core-sprite-delete<br>
+<span class="imageSprite core-sprite-downarrow"></span>core-sprite-downarrow<br>
+<span class="imageSprite core-sprite-edit"></span>core-sprite-edit<br>
+<span class="imageSprite core-sprite-error"></span>core-sprite-error<br>
+<span class="imageSprite core-sprite-expandAll"></span>core-sprite-expandAll<br>
+<span class="imageSprite core-sprite-file"></span>core-sprite-file<br>
+<span class="imageSprite core-sprite-file_model"></span>core-sprite-file_model<br>
+<span class="imageSprite core-sprite-folder"></span>core-sprite-folder<br>
+<span class="imageSprite core-sprite-gear"></span>core-sprite-gear<br>
+<span class="imageSprite core-sprite-go"></span>core-sprite-go<br>
+<span class="imageSprite core-sprite-go"></span>core-sprite-go<br>
+<span class="imageSprite core-sprite-hamburger"></span>core-sprite-hamburger<br>
+<span class="imageSprite core-sprite-information"></span>core-sprite-information<br>
+<span class="imageSprite core-sprite-initproject"></span>core-sprite-initproject<br>
+<span class="imageSprite core-sprite-leftarrow"></span>core-sprite-leftarrow<br>
+<span class="imageSprite core-sprite-link"></span>core-sprite-link<br>
+<span class="imageSprite core-sprite-list"></span>core-sprite-list<br>
+<span class="imageSprite core-sprite-move_down"></span>core-sprite-move_down<br>
+<span class="imageSprite core-sprite-move_up"></span>core-sprite-move_up<br>
+<span class="imageSprite core-sprite-none"></span>core-sprite-none<br>
+<span class="imageSprite core-sprite-ok"></span>core-sprite-ok<br>
+<span class="imageSprite core-sprite-openarrow"></span>core-sprite-openarrow<br>
+<span class="imageSprite core-sprite-orion"></span>core-sprite-orion<br>
+<span class="imageSprite core-sprite-outline"></span>core-sprite-outline<br>
+<span class="imageSprite core-sprite-refresh"></span>core-sprite-refresh<br>
+<span class="imageSprite core-sprite-replaceAll"></span>core-sprite-replaceAll<br>
+<span class="imageSprite core-sprite-rightarrow"></span>core-sprite-rightarrow<br>
+<span class="imageSprite core-sprite-sep"></span>core-sprite-sep<br>
+<span class="imageSprite core-sprite-silhouette"></span>core-sprite-silhouette<br>
+<span class="imageSprite core-sprite-start"></span>core-sprite-start<br>
+<span class="imageSprite core-sprite-stop"></span>core-sprite-stop<br>
+<span class="imageSprite core-sprite-thumbnail"></span>core-sprite-thumbnail<br>
+<span class="imageSprite core-sprite-warning"></span>core-sprite-warning<br>
+<span class="imageSprite core-sprite-wrench"></span>core-sprite-wrench<br>
+
 </td></tr></table>
 <p class="footer">Generated: Wed Jun 19 15:04:35 EDT 2013 </p>
 </body>
diff --git a/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.png b/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.png
index ac56c92..e54b372 100644
--- a/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.png
+++ b/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.png
Binary files differ
diff --git a/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.sh b/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.sh
index 4965b0e..5f2d6c9 100644
--- a/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.sh
+++ b/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 zip core_sprites.zip \
 addcontent.png \
 check.gif \
@@ -9,10 +10,10 @@
 compare-removal.gif \
 copy-folder.png \
 delete.png \
-edit.gif \
+downarrow.gif \
+edit.png \
 error.png \
 expandAll.png \
-favorite.png \
 file.png \
 file_model.gif \
 folder.png \
@@ -25,7 +26,6 @@
 leftarrow.png \
 link.png \
 list.png \
-menu_twistie.gif \
 move_down.gif \
 move_up.gif \
 none.png \
@@ -40,7 +40,6 @@
 silhouette.png \
 start.gif \
 stop.gif \
-stylesheet.gif \
 thumbnail.png \
 warning.gif \
 wrench.png
diff --git a/bundles/org.eclipse.orion.client.ui/web/images/menu_twistie.gif b/bundles/org.eclipse.orion.client.ui/web/images/downarrow.gif
similarity index 100%
rename from bundles/org.eclipse.orion.client.ui/web/images/menu_twistie.gif
rename to bundles/org.eclipse.orion.client.ui/web/images/downarrow.gif
Binary files differ
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/explorers/navigatorRenderer.js b/bundles/org.eclipse.orion.client.ui/web/orion/explorers/navigatorRenderer.js
index 5317eae..a412480 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/explorers/navigatorRenderer.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/explorers/navigatorRenderer.js
@@ -255,7 +255,7 @@
 			return null;

 		}

 		var span = document.createElement("span"); //$NON-NLS-0$

-		span.className = "core-sprite-folder_model modelDecorationSprite"; //$NON-NLS-0$

+		span.className = "core-sprite-folder modelDecorationSprite"; //$NON-NLS-0$

 		return span;

 	};

 

diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/SFTPConnectionDialog.js b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/SFTPConnectionDialog.js
index f4403d9..60d9183 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/SFTPConnectionDialog.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/SFTPConnectionDialog.js
@@ -74,7 +74,7 @@
 		'<div>' + //$NON-NLS-0$
 			'<div><label for="sftpPath">${Location:}</label></div>' +  //$NON-NLS-0$
 			'<div><select id="sftpConnectionList" name="sftpConnectionList"></select>' + //$NON-NLS-0$
-			'<button id="newSftpConnection" style="margin-left: 16px;" class="dropdownTrigger orionButton commandButton">${New}<span class="dropdownArrowDown"></span></button></div>' + //$NON-NLS-0$
+			'<button id="newSftpConnection" style="margin-left: 16px;" class="dropdownTrigger orionButton commandButton">${New}<span class="dropdownArrowDown core-sprite-downarrow"></span></button></div>' + //$NON-NLS-0$
 			'<div><label for="sftpPassword">${Password:}</label></div>' + //$NON-NLS-0$
 			'<div><input id="sftpPassword" type="password" /></div>' + //$NON-NLS-0$
 			'<p>${If the same file exists in both the source and destination:}</p>' + //$NON-NLS-0$
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dropdowntriggerbutton.html b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dropdowntriggerbutton.html
index 4b9530b..dcb5eda 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dropdowntriggerbutton.html
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dropdowntriggerbutton.html
@@ -1 +1 @@
-<button class="dropdownTrigger">${ButtonText}<span class="dropdownArrowDown"></span></button><ul class="dropdownMenu"></ul>
\ No newline at end of file
+<button class="dropdownTrigger">${ButtonText}<span class="dropdownArrowDown core-sprite-downarrow"></span></button><ul class="dropdownMenu"></ul>
\ No newline at end of file
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/webui/submenutriggerbutton.html b/bundles/org.eclipse.orion.client.ui/web/orion/webui/submenutriggerbutton.html
index db206e8..5eefbf0 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/webui/submenutriggerbutton.html
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/webui/submenutriggerbutton.html
@@ -1 +1 @@
-<li class="dropdownSubMenu"><span class="dropdownTrigger dropdownMenuItem" role="menuitem" tabindex="0">${ButtonText}<span class="dropdownArrowRight"></span></span><ul class="dropdownMenu"></ul></li>
\ No newline at end of file
+<li class="dropdownSubMenu"><span class="dropdownTrigger dropdownMenuItem" role="menuitem" tabindex="0">${ButtonText}<span class="dropdownArrowRight core-sprite-closedarrow"></span></span><ul class="dropdownMenu"></ul></li>
\ No newline at end of file