aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Hunter2013-06-14 16:47:28 (EDT)
committerMark Macdonald2013-06-14 17:45:59 (EDT)
commit11c5af4c11d9574d72d270e612e62b7e3ea3dd93 (patch)
tree6f2953d9a507e854ecf2c5ce1732a7a3342506be
parentf0e68d6e6cea78f35a8555ad68444eb6834e557e (diff)
downloadorg.eclipse.orion.client-11c5af4c11d9574d72d270e612e62b7e3ea3dd93.zip
org.eclipse.orion.client-11c5af4c11d9574d72d270e612e62b7e3ea3dd93.tar.gz
org.eclipse.orion.client-11c5af4c11d9574d72d270e612e62b7e3ea3dd93.tar.bz2
Bug 410233 Need pass for icon sprites for 3.0 release
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/css/ide.css3
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/css/images.css179
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/edit/setup.js2
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/images/collapseAll.gifbin136 -> 0 bytes
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/images/collapseAll.png (renamed from bundles/org.eclipse.orion.client.ui/web/images/collapse.png)bin193 -> 193 bytes
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/images/core_sprites.html62
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/images/core_sprites.pngbin8097 -> 7819 bytes
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/images/core_sprites.sh43
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/images/expandAll.gifbin143 -> 0 bytes
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/images/expandAll.png (renamed from bundles/org.eclipse.orion.client.ui/web/images/expand.png)bin238 -> 238 bytes
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/images/go-up.png (renamed from bundles/org.eclipse.orion.client.ui/web/images/moveUp.png)bin381 -> 381 bytes
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/navigate/table.js6
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/banner/footer.html2
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html2
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js8
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js2
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js8
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/status.js4
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OpenResourceDialog.js4
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/mini-nav.js4
20 files changed, 169 insertions, 160 deletions
diff --git a/bundles/org.eclipse.orion.client.ui/web/css/ide.css b/bundles/org.eclipse.orion.client.ui/web/css/ide.css
index 8289372..b86867a 100644
--- a/bundles/org.eclipse.orion.client.ui/web/css/ide.css
+++ b/bundles/org.eclipse.orion.client.ui/web/css/ide.css
@@ -790,9 +790,6 @@ input {
/* FOR NAVIGATION DROP DOWN */
.centralNavigation {
- /* width:10px;
- height:10px; */
- padding:2px;
cursor:pointer;
}
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 e2e5c3b..5bb4a34 100644
--- a/bundles/org.eclipse.orion.client.ui/web/css/images.css
+++ b/bundles/org.eclipse.orion.client.ui/web/css/images.css
@@ -5,35 +5,12 @@
Use additional classes in theme.css or layout.css where more treatment is needed.
*/
-.logoFooter {
- background: url(../images/orion-logo.png) no-repeat top left;
- width: 50px;
- height: 28px;
- float: left;
-}
-
.commandSprite {
background: url(../images/core_sprites.png) no-repeat top left;
vertical-align: middle;
display: inline-block;
}
-.compareAdditionSprite {
- background-image: url(../images/compare-addition.gif);
- vertical-align: middle;
- display: inline-block;
- width: 16px;
- height: 16px;
-}
-
-.compareRemovalSprite {
- background-image: url(../images/compare-removal.gif);
- vertical-align: middle;
- display: inline-block;
- width: 16px;
- height: 16px;
-}
-
.imageSprite {
background-image: url(../images/core_sprites.png);
display: inline-block;
@@ -41,117 +18,45 @@
}
/* Individual sprites */
-.core-sprite-check{ background-position: 0 0; width: 16px; height: 16px; }
-.core-sprite-check_on{ background-position: 0 -18px; width: 16px; height: 16px; }
-.core-sprite-close{ background-position: 0 -36px; width: 12px; height: 12px; }
-.core-sprite-closedarrow{ background-position: 0 -54px; width: 16px; height: 16px; }
-/* .core-sprite-collapseAll{ background-position: 0 -72px; width: 16px; height: 16px; } */
-.core-sprite-collapseAll{ background: url(../images/collapse.png) no-repeat top left; width: 16px; height: 16px; }
-.core-sprite-delete{ background-position: 0 -90px; width: 16px; height: 16px; }
-.core-sprite-diff-border-sel{ background-position: 0 -108px; width: 46px; height: 1px; }
-.core-sprite-diff-border{ background-position: 0 -111px; width: 46px; height: 1px; }
-.core-sprite-diff-empty-add-word-border{ background-position: 0 -114px; width: 4px; height: 18px; }
-.core-sprite-diff-empty-del-word-border{ background-position: 0 -134px; width: 4px; height: 18px; }
-.core-sprite-diff-empty-word-border-black{ background-position: 0 -154px; width: 2px; height: 18px; }
-.core-sprite-edit{ background-position: 0 -174px; width: 16px; height: 16px; }
-.core-sprite-error{ background: url(../images/error.png) no-repeat top left; width: 16px; height: 16px; }
-/* .core-sprite-error{ background-position: 0 -192px; width: 16px; height: 16px; } */
-/* .core-sprite-expandAll{ background-position: 0 -210px; width: 16px; height: 16px; } */
-.core-sprite-expandAll{ background: url(../images/expand.png) no-repeat top left; width: 16px; height: 16px; }
-.core-sprite-favorite_sml{ background-position: 0 -228px; width: 12px; height: 12px; }
-.core-sprite-file{ background-position: 0 -246px; width: 16px; height: 16px; }
-.core-sprite-file_model{ background-position: 0 -264px; width: 16px; height: 16px; }
-.core-sprite-folder{ background-position: 0 -282px; width: 16px; height: 16px; }
-.core-sprite-glass{ background-position: 0 -300px; width: 12px; height: 12px; }
-.core-sprite-html{ background-position: 0 -314px; width: 16px; height: 16px; }
-.core-sprite-info{ background: url(../images/information.png) no-repeat top left; width: 16px; height: 16px; }
-/* .core-sprite-info{ background-position: 0 -332px; width: 16px; height: 16px; } */
-.core-sprite-javascript{ background-position: 0 -350px; width: 16px; height: 16px; }
-.core-sprite-leftarrow{ background-position: 0 -368px; width: 16px; height: 16px; }
-.core-sprite-link{ background-position: 0 -386px; width: 16px; height: 16px; }
-/* .core-sprite-makeFavorite{ background-position: 0 -404px; width: 16px; height: 16px; } */
-.core-sprite-makeFavorite{ background:url(../images/favorite.png) no-repeat top left; width: 16px; height: 16px; }
-.core-sprite-menu_twistie{ background-position: 0 -422px; width: 5px; height: 3px; }
-.core-sprite-move_down{ background-position: 0 -427px; width: 16px; height: 16px; }
-.core-sprite-move_up{ background-position: 0 -445px; width: 16px; height: 16px; }
-.core-sprite-none{ background-position: 0 -463px; width: 16px; height: 16px; }
-.core-sprite-ok{ background-position: 0 -481px; width: 16px; height: 16px; }
-.core-sprite-openarrow{ background-position: 0 -499px; width: 16px; height: 16px; }
-.core-sprite-orion-transparent{ background: url(../images/orion-dark.png) no-repeat top left; width: 37px; height: 14px; }
-.core-sprite-problem{ background-position: 0 -533px; width: 16px; height: 16px; }
-.core-sprite-progress_running{ background-position: 0 -551px; width: 16px; height: 16px; }
-.core-sprite-refresh{ background-position: 0 -569px; width: 16px; height: 16px; }
-.core-sprite-replaceAll{ background-position: 0 -587px; width: 16px; height: 16px; }
-.core-sprite-rightarrow{ background-position: 0 -605px; width: 16px; height: 16px; }
-.core-sprite-sep{ background-position: 0 -623px; width: 1px; height: 16px; }
-.core-sprite-splitterleft{ background-position: 0 -641px; width: 6px; height: 11px; }
-.core-sprite-splitterright{ background-position: 0 -654px; width: 6px; height: 11px; }
-.core-sprite-start{ background-position: 0 -667px; width: 16px; height: 16px; }
-.core-sprite-stop{ background-position: 0 -685px; width: 16px; height: 16px; }
-.core-sprite-stylesheet{ background-position: 0 -703px; width: 16px; height: 16px; }
-.core-sprite-warning{ background-position: 0 -721px; width: 16px; height: 16px; }
-.core-sprite-hamburger-inverse{ background: url(../images/hamburger.png) no-repeat top left; width: 16px; height: 16px;}
-.core-sprite-silhouette-inverse{ background: url(../images/silhouette.png) no-repeat top left; width: 16px; height: 16px;}
-.core-sprite-silhouette{ background: url(../images/silhouette-dark.png) no-repeat top left; width: 16px; height: 16px;}
-
-.core-sprite-add-content{
- background: url(../images/addcontent.png) no-repeat top left;
- width: 16px;
- height: 16px;
-}
-
-.core-sprite-go-up{
- background: url(../images/moveUp.png) no-repeat center;
- width: 16px;
- height: 16px;
-}
-
-.core-sprite-outline{
- background: url(../images/outline.png) no-repeat top left;
- width: 16px;
- height: 16px;
-}
-
-.core-sprite-settings {
- background: url(../images/gear.png) no-repeat top left;
- height: 16px;
- width: 16px;
-}
-
-.core-sprite-wrench {
- background: url(../images/wrench.png) no-repeat center;
- height: 21px;
- width: 20px;
- border: none;
-}
-
-.core-sprite-wrench-white {
- background: url(../images/wrench-white.png) no-repeat center;
- height: 21px;
- width: 20px;
- border: none;
-}
-
-.core-sprite-thumbnail {
- background: url(../images/thumbnail.png) no-repeat top left;
- vertical-align: middle;
- display: inline-block;
- margin: 7px;
- height: 16px;
- width: 16px;
-}
-
-.core-sprite-list {
- background: url(../images/list.png) no-repeat top left;
- vertical-align: middle;
- display: inline-block;
- margin: 7px;
- height: 16px;
- width: 16px;
-}
-
-.core-sprite-copy-folder {
- background: url(../images/copy-folder.png) no-repeat top left;
- height: 16px;
- width: 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-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-position: 0 -162px; width: 16px; height: 16px; }
+.core-sprite-edit{ background-position: 0 -180px; width: 16px; height: 16px; }
+.core-sprite-error{ background-position: 0 -198px; width: 16px; height: 16px; }
+.core-sprite-expandAll{ background-position: 0 -216px; width: 16px; height: 16px; }
+.core-sprite-favorite{ background-position: 0 -234px; width: 16px; height: 16px; }
+.core-sprite-file{ background-position: 0 -252px; width: 16px; height: 16px; }
+.core-sprite-file_model{ background-position: 0 -270px; width: 16px; height: 16px; }
+.core-sprite-folder{ background-position: 0 -288px; width: 16px; height: 16px; }
+.core-sprite-gear{ background-position: 0 -306px; width: 16px; height: 16px; }
+.core-sprite-go-up{ background-position: 0 -324px; width: 16px; height: 16px; }
+.core-sprite-hamburger{ background-position: 0 -342px; 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-move_down{ background-position: 0 -432px; width: 16px; height: 16px; }
+.core-sprite-move_up{ background-position: 0 -450px; width: 16px; height: 16px; }
+.core-sprite-none{ background-position: 0 -468px; width: 16px; height: 16px; }
+.core-sprite-ok{ background-position: 0 -486px; width: 16px; height: 16px; }
+.core-sprite-openarrow{ background-position: 0 -504px; width: 16px; height: 16px; }
+.core-sprite-orion-logo{ background-position: 0 -522px; width: 36px; height: 25px; }
+.core-sprite-outline{ background-position: 0 -549px; width: 16px; height: 16px; }
+.core-sprite-refresh{ background-position: 0 -567px; width: 16px; height: 16px; }
+.core-sprite-replaceAll{ background-position: 0 -585px; width: 16px; height: 16px; }
+.core-sprite-rightarrow{ background-position: 0 -603px; width: 16px; height: 16px; }
+.core-sprite-sep{ background-position: 0 -621px; width: 1px; height: 16px; }
+.core-sprite-silhouette{ background-position: 0 -639px; width: 16px; height: 16px; }
+.core-sprite-start{ background-position: 0 -657px; width: 16px; height: 16px; }
+.core-sprite-stop{ background-position: 0 -675px; width: 16px; height: 16px; }
+.core-sprite-stylesheet{ background-position: 0 -693px; width: 16px; height: 16px; }
+.core-sprite-thumbnail{ background-position: 0 -711px; width: 16px; height: 16px; }
+.core-sprite-warning{ background-position: 0 -729px; width: 16px; height: 16px; }
+.core-sprite-wrench{ background-position: 0 -747px; width: 16px; height: 16px; }
diff --git a/bundles/org.eclipse.orion.client.ui/web/edit/setup.js b/bundles/org.eclipse.orion.client.ui/web/edit/setup.js
index 4d19778..5879689 100644
--- a/bundles/org.eclipse.orion.client.ui/web/edit/setup.js
+++ b/bundles/org.eclipse.orion.client.ui/web/edit/setup.js
@@ -271,7 +271,7 @@ exports.setUpEditor = function(serviceRegistry, preferences, isReadOnly){
noFile.classList.add("noFile"); //$NON-NLS-0$
noFile.textContent = messages["NoFile"];
var plusIcon = document.createElement("span"); //$NON-NLS-0$
- plusIcon.classList.add("core-sprite-add-content"); //$NON-NLS-0$
+ plusIcon.classList.add("core-sprite-addcontent"); //$NON-NLS-0$
plusIcon.classList.add("icon-inline"); //$NON-NLS-0$
lib.processDOMNodes(noFile, [plusIcon]);
diff --git a/bundles/org.eclipse.orion.client.ui/web/images/collapseAll.gif b/bundles/org.eclipse.orion.client.ui/web/images/collapseAll.gif
deleted file mode 100644
index 7e90a2e..0000000
--- a/bundles/org.eclipse.orion.client.ui/web/images/collapseAll.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.orion.client.ui/web/images/collapse.png b/bundles/org.eclipse.orion.client.ui/web/images/collapseAll.png
index bf1a6cd..bf1a6cd 100644
--- a/bundles/org.eclipse.orion.client.ui/web/images/collapse.png
+++ b/bundles/org.eclipse.orion.client.ui/web/images/collapseAll.png
Binary files differ
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
new file mode 100644
index 0000000..b94d97a
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.html
@@ -0,0 +1,62 @@
+<html>
+<head>
+<link href="../css/images.css" rel="stylesheet" type="text/css">
+<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; }
+</style>
+<title>Orion Core Sprites</title>
+</head>
+<body>
+<h1>Orion Core Sprites</h1>
+<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-favorite"></span>favorite<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><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>
+</td></tr></table>
+<p class="footer">Generated: Fri Jun 14 15:23:04 EDT 2013 </p>
+</body>
+</html>
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 8d32a03..4422b78 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
new file mode 100644
index 0000000..c948895
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.ui/web/images/core_sprites.sh
@@ -0,0 +1,43 @@
+zip core_sprites.zip \
+addcontent.png \
+check.gif \
+check_on.gif \
+close.gif \
+closedarrow.png \
+collapseAll.png \
+compare-addition.gif \
+compare-removal.gif \
+copy-folder.png \
+delete.gif \
+edit.gif \
+error.png \
+expandAll.png \
+favorite.png \
+file.gif \
+file_model.gif \
+folder.gif \
+gear.png \
+go-up.png \
+hamburger.png \
+information.png \
+leftarrow.png \
+link.png \
+list.png \
+move_down.gif \
+move_up.gif \
+none.png \
+ok.gif \
+openarrow.png \
+orion-logo.png \
+outline.png \
+refresh.png \
+replaceAll.gif \
+rightarrow.png \
+sep.gif \
+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/expandAll.gif b/bundles/org.eclipse.orion.client.ui/web/images/expandAll.gif
deleted file mode 100644
index 3270151..0000000
--- a/bundles/org.eclipse.orion.client.ui/web/images/expandAll.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.orion.client.ui/web/images/expand.png b/bundles/org.eclipse.orion.client.ui/web/images/expandAll.png
index 094a810..094a810 100644
--- a/bundles/org.eclipse.orion.client.ui/web/images/expand.png
+++ b/bundles/org.eclipse.orion.client.ui/web/images/expandAll.png
Binary files differ
diff --git a/bundles/org.eclipse.orion.client.ui/web/images/moveUp.png b/bundles/org.eclipse.orion.client.ui/web/images/go-up.png
index 5c96343..5c96343 100644
--- a/bundles/org.eclipse.orion.client.ui/web/images/moveUp.png
+++ b/bundles/org.eclipse.orion.client.ui/web/images/go-up.png
Binary files differ
diff --git a/bundles/org.eclipse.orion.client.ui/web/navigate/table.js b/bundles/org.eclipse.orion.client.ui/web/navigate/table.js
index 24d67d8..0d0af00 100644
--- a/bundles/org.eclipse.orion.client.ui/web/navigate/table.js
+++ b/bundles/org.eclipse.orion.client.ui/web/navigate/table.js
@@ -91,10 +91,10 @@ define(['require', 'i18n!orion/navigate/nls/messages', 'orion/browserCompatibili
mFileCommands.createFileCommands(serviceRegistry, commandRegistry, explorer, fileClient);
// define the command contributions - where things appear, first the groups
- commandRegistry.addCommandGroup("pageActions", "orion.new", 1000, messages["New"], null, null, "core-sprite-add-content"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
- commandRegistry.addCommandGroup("pageActions", "eclipse.new", 1000, messages["New"], null, null, "core-sprite-add-content"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
+ commandRegistry.addCommandGroup("pageActions", "orion.new", 1000, messages["New"], null, null, "core-sprite-addcontent"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
+ commandRegistry.addCommandGroup("pageActions", "eclipse.new", 1000, messages["New"], null, null, "core-sprite-addcontent"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
commandRegistry.addCommandGroup("pageActions", "orion.gitGroup", 200); //$NON-NLS-1$ //$NON-NLS-0$
- commandRegistry.addCommandGroup("selectionTools", "orion.selectionGroup", 500, messages["Actions"], null, null, "core-sprite-settings"); //$NON-NLS-1$ //$NON-NLS-0$
+ commandRegistry.addCommandGroup("selectionTools", "orion.selectionGroup", 500, messages["Actions"], null, null, "core-sprite-gear"); //$NON-NLS-1$ //$NON-NLS-0$
commandRegistry.addCommandGroup("selectionTools", "orion.importExportGroup", 100, null, "orion.selectionGroup"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
commandRegistry.addCommandGroup("selectionTools", "orion.newResources", 101, null, "orion.selectionGroup"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
// commands that don't appear but have keybindings
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/banner/footer.html b/bundles/org.eclipse.orion.client.ui/web/orion/banner/footer.html
index 6e56d50..af24fbd 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/banner/footer.html
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/banner/footer.html
@@ -1,6 +1,6 @@
<footer id="footerContent" class="layoutBlock footerLayout" role="contentinfo">
<!-- Requires some js code to bind the NLS variables -->
- <div class="logoFooter"></div>
+ <div class="commandSprite core-sprite-orion-logo" style="float: left;"></div>
<div class="footerBlock">${Orion is in Beta. Please try it out but BEWARE your data may be lost.}</div>
<div class="footerRightBlock">
<ul>
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html b/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html
index ceb19e5..20d5b06 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html
@@ -3,7 +3,7 @@
<div class="layoutLeft" style="padding-left:7px;padding-right:7px;margin-top:2px;" id="filterBox" style="visibility:hidden;">
</div>
<div class="layoutRight" style="padding-left:7px;padding-right:7px;margin-top:4px;" id="settingsTab" style="visibility:hidden;">
- <button class="layoutRight core-sprite-wrench commandImage" id="settingsAction" aria-live="off" style="visibility:hidden;"></button>
+ <button class="layoutRight core-sprite-wrench imageSprite" id="settingsAction" aria-live="off" style="visibility:hidden;"></button>
</div>
<div class="layoutRight status" id="statusPane" role="status" aria-live="off"></div>
<ul class="layoutRight commandList pageActions" id="pageNavigationActions"></ul>
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js b/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js
index d288924..3b5b816 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js
@@ -1,6 +1,6 @@
/*******************************************************************************
* @license
- * Copyright (c) 2009, 2012 IBM Corporation and others.
+ * Copyright (c) 2009, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials are made
* available under the terms of the Eclipse Public License v1.0
* (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
@@ -122,12 +122,14 @@ define(['i18n!orion/compare/nls/messages', 'require', 'orion/webui/littlelib', '
if(item.type){
switch (item.type) {
case "added": //$NON-NLS-0$
- _addClass(diffStatusIcon, "compareAdditionSprite"); //$NON-NLS-0$
+ _addClass(diffStatusIcon, "imageSprite"); //$NON-NLS-0$
+ _addClass(diffStatusIcon, "core-sprite-compare-addition"); //$NON-NLS-0$
displayName = item.name;
linkRef = require.toUrl("edit/edit.html") + "#" + item.fileURL; //$NON-NLS-1$ //$NON-NLS-0$
break;
case "removed": //$NON-NLS-0$
- _addClass(diffStatusIcon, "compareRemovalSprite"); //$NON-NLS-0$
+ _addClass(diffStatusIcon, "imageSprite"); //$NON-NLS-0$
+ _addClass(diffStatusIcon, "core-sprite-compare-removal"); //$NON-NLS-0$
displayName = item.name;
linkRef = require.toUrl("edit/edit.html") + "#" + item.fileURL; //$NON-NLS-1$ //$NON-NLS-0$
break;
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
index e77d4d6..7ae050e 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
@@ -418,7 +418,7 @@ define(['i18n!orion/navigate/nls/messages', 'require', 'orion/webui/littlelib',
for (i=0; i<favorites.length; i++) {
var stripped = stripPath(favorites[i].path);
if (!contains(sourceLocations, stripped)) {
- choices.push({name: favorites[i].name, imageClass: "core-sprite-makeFavorite", path: stripped, callback: callback}); //$NON-NLS-0$
+ choices.push({name: favorites[i].name, imageClass: "core-sprite-favorite", path: stripped, callback: callback}); //$NON-NLS-0$
}
}
if (favorites.length > 0) {
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
index 75058fb..268a693 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
@@ -52,7 +52,7 @@ define([
function setUserIcon() {
var userTrigger = document.getElementById('userTrigger');
var userTriggerClassName = userTrigger.className;
- userTriggerClassName = userTriggerClassName + ' core-sprite-silhouette-inverse';
+ userTriggerClassName = userTriggerClassName + ' imageSprite core-sprite-silhouette';
userTrigger.className = userTriggerClassName;
}
@@ -111,7 +111,7 @@ define([
var navDropDown = new DropDownMenu('centralNavigation', {
label: 'Develop',
- icon: 'core-sprite-hamburger-inverse'
+ icon: 'commandSprite core-sprite-hamburger'
});
var groupedContent = new GroupedContent();
navDropDown.addContent(groupedContent.getContentPane());
@@ -523,7 +523,7 @@ define([
function addSettings(settings) {
var navDropDown = new DropDownMenu('settingsTab', {
label: 'Develop',
- icon: 'core-sprite-wrench'
+ icon: 'imageSprite core-sprite-wrench'
}, false);
navDropDown.updateContent = settings.updateContent.bind(settings);
}
@@ -661,7 +661,7 @@ define([
var favoriteCommand = new mCommands.Command({
name: messages["Make Favorite"],
tooltip: messages['Add to the favorites list'],
- imageClass: "core-sprite-makeFavorite", //$NON-NLS-0$
+ imageClass: "core-sprite-favorite", //$NON-NLS-0$
id: "orion.makeFavorite", //$NON-NLS-0$
visibleWhen: function (item) {
var items = Array.isArray(item) ? item : [item];
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/status.js b/bundles/org.eclipse.orion.client.ui/web/orion/status.js
index f71ee04..1d9ac26 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/status.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/status.js
@@ -1,6 +1,6 @@
/*******************************************************************************
* @license
- * Copyright (c) 2009, 2012 IBM Corporation and others.
+ * Copyright (c) 2009, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials are made
* available under the terms of the Eclipse Public License v1.0
* (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
@@ -183,7 +183,7 @@ define(['require', 'orion/webui/littlelib', 'orion/globalCommands', 'orion/PageU
}
this._init();
var msg = status.Message || status;
- var imageClass = "core-sprite-info"; //$NON-NLS-0$
+ var imageClass = "core-sprite-information"; //$NON-NLS-0$
var extraClass = "progressInfo"; //$NON-NLS-0$
var image = document.createElement("span"); //$NON-NLS-0$
image.classList.add("imageSprite"); //$NON-NLS-0$
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OpenResourceDialog.js b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OpenResourceDialog.js
index b6c1032..8e04ca4 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OpenResourceDialog.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OpenResourceDialog.js
@@ -1,6 +1,6 @@
/*******************************************************************************
* @license
- * Copyright (c) 2010, 2012 IBM Corporation and others.
+ * Copyright (c) 2010, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials are made
* available under the terms of the Eclipse Public License v1.0
* (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
@@ -228,7 +228,7 @@ define(['i18n!orion/widgets/nls/messages', 'orion/crawler/searchCrawler', 'orion
OpenResourceDialog.prototype.showFavoritesImage = function(col) {
var image = new Image();
image.classList.add("modelDecorationSprite"); //$NON-NLS-0$
- image.classList.add("core-sprite-makeFavorite"); //$NON-NLS-0$
+ image.classList.add("core-sprite-favorite"); //$NON-NLS-0$
// without an image, chrome will draw a border (?)
image.src = require.toUrl("images/none.png"); //$NON-NLS-0$
image.title = messages['Favorite'];
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/mini-nav.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/mini-nav.js
index 0ab4f76..e373679 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/mini-nav.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/mini-nav.js
@@ -201,8 +201,8 @@ define(['require', 'i18n!orion/edit/nls/messages', 'orion/objects', 'orion/webui
var newActionsScope = this.newActionsScope;
var selectionActionsScope = this.selectionActionsScope;
var folderNavActionsScope = this.folderNavActionsScope;
- commandRegistry.addCommandGroup(newActionsScope, "orion.miniNavNewGroup", 1000, messages["New"], null, null, "core-sprite-add-content"); //$NON-NLS-1$ //$NON-NLS-0$
- commandRegistry.addCommandGroup(selectionActionsScope, "orion.miniNavSelectionGroup", 100, messages["Actions"], null, null, "core-sprite-settings"); //$NON-NLS-1$ //$NON-NLS-0$
+ commandRegistry.addCommandGroup(newActionsScope, "orion.miniNavNewGroup", 1000, messages["New"], null, null, "core-sprite-addcontent"); //$NON-NLS-1$ //$NON-NLS-0$
+ commandRegistry.addCommandGroup(selectionActionsScope, "orion.miniNavSelectionGroup", 100, messages["Actions"], null, null, "core-sprite-gear"); //$NON-NLS-1$ //$NON-NLS-0$
commandRegistry.registerSelectionService(selectionActionsScope, this.selection);
// commands that don't appear but have keybindings