Collected all core sprites into graphics and updated css accordingly. Removed unused...

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

diff --git a/_graphics/avatar_menu_arrows.gif b/_graphics/avatar_menu_arrows.gif
deleted file mode 100644 (file)
index 87a9409..0000000
Binary files a/_graphics/avatar_menu_arrows.gif and /dev/null differ

diff --git a/_graphics/elgg_sprites.png b/_graphics/elgg_sprites.png
new file mode 100644 (file)
index 0000000..a02ab1c
Binary files /dev/null and b/_graphics/elgg_sprites.png differ

diff --git a/_graphics/elgg_toolbar_logout.gif b/_graphics/elgg_toolbar_logout.gif
deleted file mode 100644 (file)
index 4655d51..0000000
Binary files a/_graphics/elgg_toolbar_logout.gif and /dev/null differ

diff --git a/_graphics/friends_picker_arrows.gif b/_graphics/friends_picker_arrows.gif
deleted file mode 100644 (file)
index fb6ba47..0000000
Binary files a/_graphics/friends_picker_arrows.gif and /dev/null differ

diff --git a/_graphics/icon_bookmarkthis.gif b/_graphics/icon_bookmarkthis.gif
deleted file mode 100644 (file)
index 55c5e3e..0000000
Binary files a/_graphics/icon_bookmarkthis.gif and /dev/null differ

diff --git a/_graphics/icon_customise_drag.gif b/_graphics/icon_customise_drag.gif
deleted file mode 100644 (file)
index 0102704..0000000
Binary files a/_graphics/icon_customise_drag.gif and /dev/null differ

diff --git a/_graphics/icon_customise_info.gif b/_graphics/icon_customise_info.gif
deleted file mode 100644 (file)
index ba57b42..0000000
Binary files a/_graphics/icon_customise_info.gif and /dev/null differ

diff --git a/_graphics/icon_customise_remove.gif b/_graphics/icon_customise_remove.gif
deleted file mode 100644 (file)
index 98fccaa..0000000
Binary files a/_graphics/icon_customise_remove.gif and /dev/null differ

diff --git a/_graphics/icon_customise_remove.png b/_graphics/icon_customise_remove.png
deleted file mode 100644 (file)
index 23e7e20..0000000
Binary files a/_graphics/icon_customise_remove.png and /dev/null differ

diff --git a/_graphics/icon_delete.png b/_graphics/icon_delete.png
deleted file mode 100644 (file)
index 77a6a01..0000000
Binary files a/_graphics/icon_delete.png and /dev/null differ

diff --git a/_graphics/icon_gallery.gif b/_graphics/icon_gallery.gif
deleted file mode 100644 (file)
index 2c23d12..0000000
Binary files a/_graphics/icon_gallery.gif and /dev/null differ

diff --git a/_graphics/icon_like.png b/_graphics/icon_like.png
deleted file mode 100644 (file)
index e610424..0000000
Binary files a/_graphics/icon_like.png and /dev/null differ

diff --git a/_graphics/icon_odd.gif b/_graphics/icon_odd.gif
deleted file mode 100644 (file)
index 529cf96..0000000
Binary files a/_graphics/icon_odd.gif and /dev/null differ

diff --git a/_graphics/icon_reportthis.gif b/_graphics/icon_reportthis.gif
deleted file mode 100644 (file)
index 0590f96..0000000
Binary files a/_graphics/icon_reportthis.gif and /dev/null differ

diff --git a/_graphics/icon_rss.gif b/_graphics/icon_rss.gif
deleted file mode 100644 (file)
index 2c27ed8..0000000
Binary files a/_graphics/icon_rss.gif and /dev/null differ

diff --git a/_graphics/icon_rss.png b/_graphics/icon_rss.png
deleted file mode 100644 (file)
index 6e7b676..0000000
Binary files a/_graphics/icon_rss.png and /dev/null differ

diff --git a/_graphics/icon_tag.gif b/_graphics/icon_tag.gif
deleted file mode 100644 (file)
index de08e0a..0000000
Binary files a/_graphics/icon_tag.gif and /dev/null differ

diff --git a/_graphics/icon_tag.png b/_graphics/icon_tag.png
deleted file mode 100644 (file)
index fcceb5b..0000000
Binary files a/_graphics/icon_tag.png and /dev/null differ

diff --git a/_graphics/more_sprite.png b/_graphics/more_sprite.png
deleted file mode 100644 (file)
index 655cced..0000000
Binary files a/_graphics/more_sprite.png and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_blog.gif b/_graphics/river_icons/river_icon_blog.gif
deleted file mode 100644 (file)
index 57feb91..0000000
Binary files a/_graphics/river_icons/river_icon_blog.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_bookmarks.gif b/_graphics/river_icons/river_icon_bookmarks.gif
deleted file mode 100644 (file)
index bdc98d4..0000000
Binary files a/_graphics/river_icons/river_icon_bookmarks.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_comment.gif b/_graphics/river_icons/river_icon_comment.gif
deleted file mode 100644 (file)
index 9903540..0000000
Binary files a/_graphics/river_icons/river_icon_comment.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_feed.gif b/_graphics/river_icons/river_icon_feed.gif
deleted file mode 100644 (file)
index 6b5659b..0000000
Binary files a/_graphics/river_icons/river_icon_feed.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_files.gif b/_graphics/river_icons/river_icon_files.gif
deleted file mode 100644 (file)
index 877a47c..0000000
Binary files a/_graphics/river_icons/river_icon_files.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_forum.gif b/_graphics/river_icons/river_icon_forum.gif
deleted file mode 100644 (file)
index 2a5b827..0000000
Binary files a/_graphics/river_icons/river_icon_forum.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_friends.gif b/_graphics/river_icons/river_icon_friends.gif
deleted file mode 100644 (file)
index 5d35650..0000000
Binary files a/_graphics/river_icons/river_icon_friends.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_messageboard.gif b/_graphics/river_icons/river_icon_messageboard.gif
deleted file mode 100644 (file)
index f051bee..0000000
Binary files a/_graphics/river_icons/river_icon_messageboard.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_pages.gif b/_graphics/river_icons/river_icon_pages.gif
deleted file mode 100644 (file)
index 2a474f8..0000000
Binary files a/_graphics/river_icons/river_icon_pages.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_plugin.gif b/_graphics/river_icons/river_icon_plugin.gif
deleted file mode 100644 (file)
index b4d2a15..0000000
Binary files a/_graphics/river_icons/river_icon_plugin.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_privatemessage.gif b/_graphics/river_icons/river_icon_privatemessage.gif
deleted file mode 100644 (file)
index eb2527a..0000000
Binary files a/_graphics/river_icons/river_icon_privatemessage.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_profile.gif b/_graphics/river_icons/river_icon_profile.gif
deleted file mode 100644 (file)
index b3f4efe..0000000
Binary files a/_graphics/river_icons/river_icon_profile.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_status.gif b/_graphics/river_icons/river_icon_status.gif
deleted file mode 100644 (file)
index 5e48036..0000000
Binary files a/_graphics/river_icons/river_icon_status.gif and /dev/null differ

diff --git a/_graphics/river_icons/river_icon_thewire.gif b/_graphics/river_icons/river_icon_thewire.gif
deleted file mode 100644 (file)
index f7e9d60..0000000
Binary files a/_graphics/river_icons/river_icon_thewire.gif and /dev/null differ

diff --git a/_graphics/search.png b/_graphics/search.png
deleted file mode 100644 (file)
index 2d19b28..0000000
Binary files a/_graphics/search.png and /dev/null differ

diff --git a/_graphics/speech_bubble_tail.gif b/_graphics/speech_bubble_tail.gif
deleted file mode 100644 (file)
index 32b78d8..0000000
Binary files a/_graphics/speech_bubble_tail.gif and /dev/null differ

diff --git a/_graphics/thewire_speech_bubble.gif b/_graphics/thewire_speech_bubble.gif
deleted file mode 100644 (file)
index d0e8606..0000000
Binary files a/_graphics/thewire_speech_bubble.gif and /dev/null differ

diff --git a/_graphics/topbar_icons.png b/_graphics/topbar_icons.png
deleted file mode 100644 (file)
index 1d2602b..0000000
Binary files a/_graphics/topbar_icons.png and /dev/null differ

diff --git a/mod/file/views/default/file/css.php b/mod/file/views/default/file/css.php
index 58b5684df1b2a0a297d08ed1834fb8996f0a0a97..da9c6309ea1d8e332e265e10048e27c38da38ae1 100644 (file)
--- 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 df8ba05ee94fff672a507059ea199d33e3c01aa4..61e85e1c7d24041df108f81d392124db78c1142c 100644 (file)
--- 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 (file)
index de51c69..0000000
Binary files a/mod/twitter/graphics/twitter.png and /dev/null differ

diff --git a/_graphics/twitter16px.png b/mod/twitter/graphics/twitter16px.png
similarity index 100%
rename from _graphics/twitter16px.png
rename to mod/twitter/graphics/twitter16px.png

diff --git a/mod/twitter/views/default/twitter/css.php b/mod/twitter/views/default/twitter/css.php
index 96b4d415f3ab13b913e3cb10ebc14153e05721ca..1d9f031443dacee24fe2552b6a530ec023e337a2 100644 (file)
--- 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 e2a8d59b5d86d1cc03befddd16b9f87b9ee9090a..1b47158c9b056643fe11357daed46f4d3d5af6fa 100644 (file)
--- 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 0dd1002b48df854ec251a92248a9fee7ed5f7bd7..725f1619a68ffa9962a7dfc7c8acde828ac3d213 100644 (file)
--- 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