2 files changed, 16 insertions, 5 deletions
diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php
index b42b4467a..a9f2a392f 100644
--- a/views/default/friends/collection.php
+++ b/views/default/friends/collection.php
@@ -28,13 +28,13 @@
         	
         	//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'] . "mod/friends/edit.php?collection={$coll->id}\">" . elgg_echo('edit') . "</a>) (<a href=\"" . $vars['url'] . "action/friends/deletecollection?collection={$coll->id}\">" . elgg_echo('delete') . "</a>)";
+        	    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>";
 			echo $coll->name;
 			echo " ({$count}) </h2>";
         	
-        	// Ben - this is where the friends picker view needs to go
+        	// individual collection panels
         	if($friends = $vars['collection']->entities){
         		$members = $vars['collection']->members;
 				echo elgg_view('friends/picker',array('entities' => $friends, 'value' => $members));
diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php
index 7a0c57c12..9f522ca29 100644
--- a/views/default/friends/picker.php
+++ b/views/default/friends/picker.php
@@ -57,6 +57,19 @@
 ?>
 
 <div class="friends_picker">
+
+
+
+<div id="friendsPickerNavigationTabs">
+<ul>
+<li class="selected"><a href="#">Collection members</a></li>
+<li><a href="#">Edit collection</a></li>
+</ul>
+</div>
+
+
+
+
 	<div class="friendsPicker_wrapper">
 	<div id="friendsPicker<?php echo $friendspicker; ?>">
 		<div class="friendsPicker_container">
@@ -144,16 +157,14 @@
 </div>
 
 <script type="text/javascript">
-	//jQuery(window).bind("load", function() {
 	$(document).ready(function () {
 		// initialise picker
 		$("div#friendsPicker<?php echo $friendspicker; ?>").friendsPicker();
 	});
 </script>
 <script>
-	//jQuery(window).bind("load", function() {
 	$(document).ready(function () {
-	// manually add class to corresponding tab for panels that have content - needs to be automated eventually
+	// manually add class to corresponding tab for panels that have content
 <?php
 	if (sizeof($activeletters) > 0)
 		$chararray = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';