Collected all core sprites into graphics and updated css accordingly. Removed unused core graphics. Moved plugin-specific graphics into respective plugins graphics directories.

git-svn-id: http://code.elgg.org/elgg/trunk@5700 36083f99-b078-4883-b0ff-0f9b5a30f544

44 files changed, 32 insertions, 45 deletions

diff --git a/_graphics/avatar_menu_arrows.gif b/_graphics/avatar_menu_arrows.gif
deleted file mode 100644
index 87a9409b0..000000000
--- a/_graphics/avatar_menu_arrows.gif
+++ /dev/null
diff --git a/_graphics/elgg_sprites.png b/_graphics/elgg_sprites.png
new file mode 100644
index 000000000..a02ab1c45
--- /dev/null
+++ b/_graphics/elgg_sprites.png
diff --git a/_graphics/elgg_toolbar_logout.gif b/_graphics/elgg_toolbar_logout.gif
deleted file mode 100644
index 4655d51d7..000000000
--- a/_graphics/elgg_toolbar_logout.gif
+++ /dev/null
diff --git a/_graphics/friends_picker_arrows.gif b/_graphics/friends_picker_arrows.gif
deleted file mode 100644
index fb6ba47cf..000000000
--- a/_graphics/friends_picker_arrows.gif
+++ /dev/null
diff --git a/_graphics/icon_bookmarkthis.gif b/_graphics/icon_bookmarkthis.gif
deleted file mode 100644
index 55c5e3e15..000000000
--- a/_graphics/icon_bookmarkthis.gif
+++ /dev/null
diff --git a/_graphics/icon_customise_drag.gif b/_graphics/icon_customise_drag.gif
deleted file mode 100644
index 010270426..000000000
--- a/_graphics/icon_customise_drag.gif
+++ /dev/null
diff --git a/_graphics/icon_customise_info.gif b/_graphics/icon_customise_info.gif
deleted file mode 100644
index ba57b42fe..000000000
--- a/_graphics/icon_customise_info.gif
+++ /dev/null
diff --git a/_graphics/icon_customise_remove.gif b/_graphics/icon_customise_remove.gif
deleted file mode 100644
index 98fccaa1c..000000000
--- a/_graphics/icon_customise_remove.gif
+++ /dev/null
diff --git a/_graphics/icon_customise_remove.png b/_graphics/icon_customise_remove.png
deleted file mode 100644
index 23e7e20cf..000000000
--- a/_graphics/icon_customise_remove.png
+++ /dev/null
diff --git a/_graphics/icon_delete.png b/_graphics/icon_delete.png
deleted file mode 100644
index 77a6a0110..000000000
--- a/_graphics/icon_delete.png
+++ /dev/null
diff --git a/_graphics/icon_gallery.gif b/_graphics/icon_gallery.gif
deleted file mode 100644
index 2c23d12c8..000000000
--- a/_graphics/icon_gallery.gif
+++ /dev/null
diff --git a/_graphics/icon_like.png b/_graphics/icon_like.png
deleted file mode 100644
index e610424c0..000000000
--- a/_graphics/icon_like.png
+++ /dev/null
diff --git a/_graphics/icon_odd.gif b/_graphics/icon_odd.gif
deleted file mode 100644
index 529cf968a..000000000
--- a/_graphics/icon_odd.gif
+++ /dev/null
diff --git a/_graphics/icon_reportthis.gif b/_graphics/icon_reportthis.gif
deleted file mode 100644
index 0590f96e6..000000000
--- a/_graphics/icon_reportthis.gif
+++ /dev/null
diff --git a/_graphics/icon_rss.gif b/_graphics/icon_rss.gif
deleted file mode 100644
index 2c27ed801..000000000
--- a/_graphics/icon_rss.gif
+++ /dev/null
diff --git a/_graphics/icon_rss.png b/_graphics/icon_rss.png
deleted file mode 100644
index 6e7b676b3..000000000
--- a/_graphics/icon_rss.png
+++ /dev/null
diff --git a/_graphics/icon_tag.gif b/_graphics/icon_tag.gif
deleted file mode 100644
index de08e0ab5..000000000
--- a/_graphics/icon_tag.gif
+++ /dev/null
diff --git a/_graphics/icon_tag.png b/_graphics/icon_tag.png
deleted file mode 100644
index fcceb5b08..000000000
--- a/_graphics/icon_tag.png
+++ /dev/null
diff --git a/_graphics/more_sprite.png b/_graphics/more_sprite.png
deleted file mode 100644
index 655cced05..000000000
--- a/_graphics/more_sprite.png
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_blog.gif b/_graphics/river_icons/river_icon_blog.gif
deleted file mode 100644
index 57feb91b0..000000000
--- a/_graphics/river_icons/river_icon_blog.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_bookmarks.gif b/_graphics/river_icons/river_icon_bookmarks.gif
deleted file mode 100644
index bdc98d4af..000000000
--- a/_graphics/river_icons/river_icon_bookmarks.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_comment.gif b/_graphics/river_icons/river_icon_comment.gif
deleted file mode 100644
index 99035406e..000000000
--- a/_graphics/river_icons/river_icon_comment.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_feed.gif b/_graphics/river_icons/river_icon_feed.gif
deleted file mode 100644
index 6b5659bc3..000000000
--- a/_graphics/river_icons/river_icon_feed.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_files.gif b/_graphics/river_icons/river_icon_files.gif
deleted file mode 100644
index 877a47c0c..000000000
--- a/_graphics/river_icons/river_icon_files.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_forum.gif b/_graphics/river_icons/river_icon_forum.gif
deleted file mode 100644
index 2a5b82704..000000000
--- a/_graphics/river_icons/river_icon_forum.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_friends.gif b/_graphics/river_icons/river_icon_friends.gif
deleted file mode 100644
index 5d3565054..000000000
--- a/_graphics/river_icons/river_icon_friends.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_messageboard.gif b/_graphics/river_icons/river_icon_messageboard.gif
deleted file mode 100644
index f051bee9d..000000000
--- a/_graphics/river_icons/river_icon_messageboard.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_pages.gif b/_graphics/river_icons/river_icon_pages.gif
deleted file mode 100644
index 2a474f8f0..000000000
--- a/_graphics/river_icons/river_icon_pages.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_plugin.gif b/_graphics/river_icons/river_icon_plugin.gif
deleted file mode 100644
index b4d2a153d..000000000
--- a/_graphics/river_icons/river_icon_plugin.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_privatemessage.gif b/_graphics/river_icons/river_icon_privatemessage.gif
deleted file mode 100644
index eb2527aef..000000000
--- a/_graphics/river_icons/river_icon_privatemessage.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_profile.gif b/_graphics/river_icons/river_icon_profile.gif
deleted file mode 100644
index b3f4efe20..000000000
--- a/_graphics/river_icons/river_icon_profile.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_status.gif b/_graphics/river_icons/river_icon_status.gif
deleted file mode 100644
index 5e480360f..000000000
--- a/_graphics/river_icons/river_icon_status.gif
+++ /dev/null
diff --git a/_graphics/river_icons/river_icon_thewire.gif b/_graphics/river_icons/river_icon_thewire.gif
deleted file mode 100644
index f7e9d6003..000000000
--- a/_graphics/river_icons/river_icon_thewire.gif
+++ /dev/null
diff --git a/_graphics/search.png b/_graphics/search.png
deleted file mode 100644
index 2d19b288d..000000000
--- a/_graphics/search.png
+++ /dev/null
diff --git a/_graphics/speech_bubble_tail.gif b/_graphics/speech_bubble_tail.gif
deleted file mode 100644
index 32b78d8e4..000000000
--- a/_graphics/speech_bubble_tail.gif
+++ /dev/null
diff --git a/_graphics/thewire_speech_bubble.gif b/_graphics/thewire_speech_bubble.gif
deleted file mode 100644
index d0e8606a1..000000000
--- a/_graphics/thewire_speech_bubble.gif
+++ /dev/null
diff --git a/_graphics/topbar_icons.png b/_graphics/topbar_icons.png
deleted file mode 100644
index 1d2602b0c..000000000
--- a/_graphics/topbar_icons.png
+++ /dev/null
diff --git a/mod/file/views/default/file/css.php b/mod/file/views/default/file/css.php
index 58b5684df..da9c6309e 100644
--- a/mod/file/views/default/file/css.php
+++ b/mod/file/views/default/file/css.php
@@ -103,7 +103,7 @@
 }
 .filerepo_user_gallery_link a {
 	padding:2px 25px 5px 0;
-	background: transparent url(<?php echo $vars['url']; ?>_graphics/icon_gallery.gif) no-repeat right top;
+	background: transparent url(<?php echo $vars['url']; ?>mod/file/graphics/icon_gallery.gif) no-repeat right top;
 	display:block;
 }
 .filerepo_user_gallery_link a:hover {
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index df8ba05ee..61e85e1c7 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -224,7 +224,7 @@
 	twitter panel within profile
 *************************************** */
 ul#twitter_update_list li {
-	background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/speech_bubble_tail.gif);
+	background-image: url(<?php echo $vars['url']; ?>mod/profile/graphics/speech_bubble_tail.gif);
 	background-position:right bottom;
 	background-repeat: no-repeat;
 	list-style-image:none;
@@ -250,7 +250,7 @@ ul#twitter_update_list li span a {
 	display:inline !important;
 }
 p.visit_twitter a {
-    background:url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/twitter16px.png) left no-repeat;
+    background:url(<?php echo $vars['url']; ?>mod/profile/graphics/twitter16px.png) left no-repeat;
     padding:0 0 0 20px;
     margin:0;
 }
@@ -336,17 +336,17 @@ p.visit_twitter a {
 	bottom:0;
 }
 .avatar_menu_arrow {
-	background: url(<?php echo $vars['url']; ?>_graphics/avatar_menu_arrows.gif) no-repeat left top;
+	background: url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat -150px top;
 	width:15px;
 	height:15px;
 }
 .avatar_menu_arrow_on {
-	background: url(<?php echo $vars['url']; ?>_graphics/avatar_menu_arrows.gif) no-repeat left -16px;
+	background: url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat -150px -16px;
 	width:15px;
 	height:15px;
 }
 .avatar_menu_arrow_hover {
-	background: url(<?php echo $vars['url']; ?>_graphics/avatar_menu_arrows.gif) no-repeat left -32px;
+	background: url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat -150px -32px;
 	width:15px;
 	height:15px;
 }
diff --git a/mod/twitter/graphics/twitter.png b/mod/twitter/graphics/twitter.png
deleted file mode 100644
index de51c6953..000000000
--- a/mod/twitter/graphics/twitter.png
+++ /dev/null
diff --git a/_graphics/twitter16px.png b/mod/twitter/graphics/twitter16px.png
index de51c6953..de51c6953 100644
--- a/_graphics/twitter16px.png
+++ b/mod/twitter/graphics/twitter16px.png
diff --git a/mod/twitter/views/default/twitter/css.php b/mod/twitter/views/default/twitter/css.php
index 96b4d415f..1d9f03144 100644
--- a/mod/twitter/views/default/twitter/css.php
+++ b/mod/twitter/views/default/twitter/css.php
@@ -35,7 +35,7 @@
 	display:block;
 }
 p.visit_twitter a {
-    background:url(<?php echo $vars['url']; ?>mod/twitter/graphics/twitter.png) left no-repeat;
+    background:url(<?php echo $vars['url']; ?>mod/twitter/graphics/twitter16px.png) left no-repeat;
     padding:0 0 0 20px;
     margin:0;
 }
diff --git a/views/default/css.php b/views/default/css.php
index e2a8d59b5..1b47158c9 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -226,15 +226,15 @@ h2 {
 	width:14px;
 	height:14px;
 	float:right;
-	background-image:url(<?php echo $vars['url']; ?>_graphics/icon_rss.png);
+	background-image:url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png);
 	background-repeat: no-repeat;
-	background-position: left top;
+	background-position: -250px top;
 	text-indent: -1000em;
 }
 .tags {
-	background-image:url(<?php echo $vars['url']; ?>_graphics/icon_tag.png);
+	background-image:url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png);
 	background-repeat: no-repeat;
-	background-position: left 2px;
+	background-position: left -198px;
 	padding:1px 0 0 16px;
 	font-size: 90%;
 }
@@ -388,19 +388,19 @@ h2 {
 	color:#71cbff;
 }
 #elgg_topbar_contents a.settings {
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/topbar_icons.png) no-repeat left -41px;
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat -300px -41px;
 	padding-left:20px !important;
 	float:right;
 	margin-right:30px;
 }
 #elgg_topbar_contents a.admin {
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/topbar_icons.png) no-repeat left -41px;
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat -300px -41px;
 	padding-left:20px !important;
 	float:right;
 	margin-right:30px;
 }
 #elgg_topbar_contents a.help {
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/topbar_icons.png) no-repeat 0 -133px;
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat -300px -133px;
 	padding-left:18px !important;
 	float:right;
 	margin-right:30px;
@@ -431,21 +431,21 @@ h2 {
 	margin:0;
 	padding:2px 4px 2px 26px;
 	width:198px;
-	background-image: url(<?php echo $vars['url']; ?>_graphics/search.png);
-	background-position: 3px 0;
+	background-image: url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png);
+	background-position: 2px -220px;
 	background-repeat: no-repeat;
 }
 #elgg_header_contents #elgg_search input.search_input:focus {
 	background-color:white;
 	color:#0054A7;
 	border:1px solid white;
-	background-position: 3px -37px;
+	background-position: 2px -257px;
 }
 #elgg_header_contents #elgg_search input.search_input:active {
 	background-color:white;
 	color:#0054A7;
 	border:1px solid white;
-	background-position: 3px -37px;
+	background-position: 2px -257px;
 }
 #elgg_header_contents #elgg_search input.search_submit_button {
 	display:none;
@@ -524,14 +524,14 @@ li.navigation_more:hover a {
 	-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
 }
 li.navigation_more a.subnav span {
-	background-image: url(<?php echo $vars['url']; ?>_graphics/more_sprite.png);
+	background-image: url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png);
 	background-repeat: no-repeat;
-	background-position: 0 4px;
+	background-position: -150px -46px;
 	padding-left: 12px;
 }
 li.navigation_more:hover a.subnav span,
 li.navigation_more a.subnav:hover span {
-	background-position: 0 -16px;
+	background-position: -150px -66px;
 }
 li.navigation_more ul {
 	z-index: 7000;
@@ -1286,12 +1286,12 @@ a.action_button:focus {
 	cursor: pointer;
 	width:14px;
 	height:14px;
-	background: url("<?php echo $vars['url']; ?>_graphics/icon_delete.png") no-repeat 0 0;
+	background: url("<?php echo $vars['url']; ?>_graphics/elgg_sprites.png") no-repeat -200px top;
 	text-indent: -9000px;
 	text-align: left;
 }
 .delete_button a:hover {
-	background-position: 0 -16px;
+	background-position: -200px -16px;
 }
 
 
@@ -1408,33 +1408,21 @@ a.action_button:focus {
 	z-index:1;
 }
 .friends_picker_navigation_l {
-	background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat left top;
+	background: url("<?php echo $vars['url']; ?>_graphics/elgg_sprites.png") no-repeat left top;
 }
 .friends_picker_navigation_r {
-	background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat -60px top;
+	background: url("<?php echo $vars['url']; ?>_graphics/elgg_sprites.png") no-repeat -60px top;
 }
 .friends_picker_navigation_l:hover {
-	background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat left -44px;
+	background: url("<?php echo $vars['url']; ?>_graphics/elgg_sprites.png") no-repeat left -44px;
 }
 .friends_picker_navigation_r:hover {
-	background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrows.gif") no-repeat -60px -44px;
-}
-.friends_collections_controls a.delete_collection {
-	display:block;
-	cursor: pointer;
-	width:14px;
-	height:14px;
-	margin:2px 3px 0 0;
-	background: url("<?php echo $vars['url']; ?>_graphics/icon_customise_remove.png") no-repeat 0 0;
-}
-.friends_collections_controls a.delete_collection:hover {
-	background-position: 0 -16px;
+	background: url("<?php echo $vars['url']; ?>_graphics/elgg_sprites.png") no-repeat -60px -44px;
 }
 .friendspicker_savebuttons .submit_button,
 .friendspicker_savebuttons .cancel_button {
 	margin:5px 20px 5px 5px;
 }
-
 #collectionMembersTable {
 	background: #dedede;
 	-webkit-border-radius: 8px;
@@ -1453,7 +1441,7 @@ a.action_button:focus {
 }
 .likes_list_holder a.user_like {
 	cursor:pointer;
-	background: url(<?php echo $vars['url']; ?>_graphics/icon_like.png) no-repeat left -2px;
+	background: url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat left -100px;
 	text-indent: -9000em;
 	text-align: left;
 	display:block;
@@ -1463,12 +1451,12 @@ a.action_button:focus {
 	float:left;
 }
 .likes_list_holder a.user_like:hover {
-	background-position: left -32px;
+	background-position: left -130px;
 }
 .likes_list_holder .likes_list_button.link {
 	float:left;
 	text-align: left;
-	background: url(<?php echo $vars['url']; ?>_graphics/icon_like.png) no-repeat left -32px;
+	background: url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat left -130px;
 	padding-left:21px;
 	height:20px;
 }
diff --git a/views/default/output/rss_view.php b/views/default/output/rss_view.php
index 0dd1002b4..725f1619a 100644
--- a/views/default/output/rss_view.php
+++ b/views/default/output/rss_view.php
@@ -1,8 +1,7 @@
 <?php
 	/**
 	 * View to display the RSS link
+	 * @todo check this - it doesn't appear this view is ever called
 	 **/
 ?>
-<div class="sidebar_container">
-<p><a href=""><img src="<?php echo $vars['url']; ?>_graphics/icon_rss.gif" alt="RSS icon" /></a> RSS feed for the wire</p>
-</div>
\ No newline at end of file
+<div class="rss_link clearfloat"><a href="" title="RSS feed for the wire">RSS feed for the wire</a></div>
\ No newline at end of file