save and cancel buttons added to collections

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

2 files changed, 12 insertions, 8 deletions

diff --git a/views/default/css.php b/views/default/css.php
index ce07214e7..c209e6d78 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1662,7 +1662,7 @@ div.expandall p {
 	margin: 0;
 	padding:0;
 	width: 685px;
-	height: 270px;
+	height: 300px;
 	/*clear: right;*/
 	background: white;
 }
diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php
index 279696c24..94211f49b 100644
--- a/views/default/friends/picker.php
+++ b/views/default/friends/picker.php
@@ -38,13 +38,13 @@
 			$callback = false;
 		}
 		
-	// We need to count the number of friends pickers on the page.

+	// We need to count the number of friends pickers on the page.
 		if (!isset($vars['friendspicker'])) {
 			global $friendspicker;
 			if (!isset($friendspicker)) $friendspicker = 0;
-			$friendspicker++;

-		} else {

-			$friendspicker = $vars['friendspicker'];

+			$friendspicker++;
+		} else {
+			$friendspicker = $vars['friendspicker'];
 		}
 
 		$users = array();
@@ -172,6 +172,11 @@
 		
 ?>
 		</div>
+		<!-- Collection members form -->
+		<form id="collectionMembersForm"> <!-- action="" method=""> -->
+		<input type="submit" class="submit_button" value="Save changes" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();"/>
+		<input type="button" class="cancel_button" value="Cancel" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" />
+		</form>
 	</div>
 	</div>
 	
@@ -182,7 +187,7 @@
 	if (!$callback) {
 
 ?>
-	
+			
 	</div>
 </div>
 
@@ -197,8 +202,7 @@
 <script type="text/javascript">
 		// initialise picker
 		$("div#friendsPicker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
-</script>

-$("div#friendsPicker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
+</script>
 <script>
 	$(document).ready(function () {
 	// manually add class to corresponding tab for panels that have content