toolbar logout icon changed to work as a single image resource (for caching purposes), delete icon on collections changed to work as a single image rollover

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

5 files changed, 16 insertions, 4 deletions

diff --git a/_graphics/elgg_toolbar_logout.gif b/_graphics/elgg_toolbar_logout.gif
index 93a86b3ed..4655d51d7 100644
--- a/_graphics/elgg_toolbar_logout.gif
+++ b/_graphics/elgg_toolbar_logout.gif
diff --git a/_graphics/elgg_toolbar_logout_over.gif b/_graphics/elgg_toolbar_logout_over.gif
deleted file mode 100644
index 5f1ceac97..000000000
--- a/_graphics/elgg_toolbar_logout_over.gif
+++ /dev/null
diff --git a/_graphics/icon_customise_remove.png b/_graphics/icon_customise_remove.png
new file mode 100644
index 000000000..23e7e20cf
--- /dev/null
+++ b/_graphics/icon_customise_remove.png
diff --git a/views/default/css.php b/views/default/css.php
index 1720e3067..ce07214e7 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -280,7 +280,7 @@ h6 { font-size: 0.8em; }
 	margin:0 0 0 10px;
 }
 * html #two_column_left_sidebar {
-	width:170px;
+	width:210px;
 	margin:20px 10px 20px 10px;
 }
 * html #two_column_left_sidebar_maincontent {
@@ -473,7 +473,7 @@ h6 { font-size: 0.8em; }
 #elgg_topbar_container_right a {
 	color:#eeeeee;
 	margin:0 5px 0 0;
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logout.gif) no-repeat right top;
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logout.gif) no-repeat top right;
 	padding:0 21px 0 0;
 	display:block;
 }
@@ -487,7 +487,7 @@ h6 { font-size: 0.8em; }
 	height: 22px;
 }
 #elgg_topbar_container_right a:hover {
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logout_over.gif) no-repeat right top;
+	background-position: right -21px;
 }
 
 #elgg_topbar_panel {
@@ -1791,6 +1791,18 @@ div.expandall p {
 	background: url("<?php echo $vars['url']; ?>_graphics/friends_picker_arrow_right.gif") no-repeat center;
 }	
 
+.friends_collections_controls a.delete_collection {
+	display:block;
+	cursor: pointer;
+	width:14px;
+	height:14px;
+	margin:0 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;
+}
+
 
 /* picker tabbed navigation */
 #friendsPickerNavigationTabs {
diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php
index e2f8d37b6..b4f015f16 100644
--- a/views/default/friends/collection.php
+++ b/views/default/friends/collection.php
@@ -28,7 +28,7 @@
         	

         	//as collections are private, check that the logged in user is the owner

         	if($coll->owner_guid == $_SESSION['user']->getGUID())

-        	    echo "<div class=\"friends_collections_controls\"> <a href=\"" . $vars['url'] . "action/friends/deletecollection?collection={$coll->id}\" class=\"delete_collection\"><img src=\"" . $vars['url'] ."_graphics/icon_customise_remove.gif\"/></a>";

+        	    echo "<div class=\"friends_collections_controls\"> <a href=\"" . $vars['url'] . "action/friends/deletecollection?collection={$coll->id}\" class=\"delete_collection\"> </a>";

         	    

 			echo "</div>";

 			echo $coll->name;