aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-14 11:48:45 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-14 11:48:45 +0000
commit2c5110ba04fb38d8585c76f43f8b49f37e822756 (patch)
tree2a1571c3911c5e23e08f7b7d2f822bc308b9f681
parent9403fb385bd5da4255359838f243b6fee291854d (diff)
downloadelgg-2c5110ba04fb38d8585c76f43f8b49f37e822756.tar.gz
elgg-2c5110ba04fb38d8585c76f43f8b49f37e822756.tar.bz2
friends picker table bug fixed and spacing adjusted on collections
git-svn-id: https://code.elgg.org/elgg/trunk@1918 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--views/default/friends/picker.php121
-rw-r--r--views/default/friends/tablelist.php129
2 files changed, 127 insertions, 123 deletions
diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php
index 2f51a02d7..db33ffc09 100644
--- a/views/default/friends/picker.php
+++ b/views/default/friends/picker.php
@@ -49,14 +49,14 @@
$users = array();
$activeletters = array();
-
- // Are we displaying form tags and submit buttons?
- // (If we've been given a target, then yes! Otherwise, no.)
- if (isset($vars['formtarget'])) {
- $formtarget = $vars['formtarget'];
- } else {
- $formtarget = false;
- }
+
+ // Are we displaying form tags and submit buttons?
+ // (If we've been given a target, then yes! Otherwise, no.)
+ if (isset($vars['formtarget'])) {
+ $formtarget = $vars['formtarget'];
+ } else {
+ $formtarget = false;
+ }
// Sort users by letter
if (is_array($vars['entities']) && sizeof($vars['entities']))
@@ -93,42 +93,42 @@
}
if (!isset($vars['replacement'])) {
-
+
if ($formtarget) {
?>
-
- <script language="text/javascript">
- $(function() { // onload...do
- $('#collectionMembersForm<?php echo $friendspicker; ?>').submit(function() {
- var inputs = [];
- $(':input', this).each(function() {
- if (this.type != 'checkbox' || (this.type == 'checkbox' && this.checked != false)) {
- inputs.push(this.name + '=' + escape(this.value));
- }
- });
- jQuery.ajax({
- type: "POST",
- data: inputs.join('&'),
- url: this.action,
- success: function(){
- $('a.collectionmembers<?php echo $friendspicker; ?>').click();
- }
-
- });
- return false;
- })
- })
-
- </script>
-
- <!-- Collection members form -->
+
+ <script language="text/javascript">
+ $(function() { // onload...do
+ $('#collectionMembersForm<?php echo $friendspicker; ?>').submit(function() {
+ var inputs = [];
+ $(':input', this).each(function() {
+ if (this.type != 'checkbox' || (this.type == 'checkbox' && this.checked != false)) {
+ inputs.push(this.name + '=' + escape(this.value));
+ }
+ });
+ jQuery.ajax({
+ type: "POST",
+ data: inputs.join('&'),
+ url: this.action,
+ success: function(){
+ $('a.collectionmembers<?php echo $friendspicker; ?>').click();
+ }
+
+ });
+ return false;
+ })
+ })
+
+ </script>
+
+ <!-- Collection members form -->
<form id="collectionMembersForm<?php echo $friendspicker; ?>" action="<?php echo $formtarget; ?>" method="post"> <!-- action="" method=""> -->
-
-<?php
-
- }
-
-?>
+
+<?php
+
+ }
+
+?>
<div class="friendsPicker_wrapper">
<div id="friendsPicker<?php echo $friendspicker; ?>">
@@ -193,7 +193,10 @@
<?php
$col++;
- if ($col == 3) echo "</tr>";
+ if ($col == 3){
+ echo "</tr>";
+ $col = 0;
+ }
}
if ($col < 3) echo "</tr>";
@@ -211,26 +214,26 @@
}
?>
- </div>
-
-<?php
-
- if ($formtarget) {
-
- if (isset($vars['formcontents']))
- echo $vars['formcontents'];
-
+ </div>
+
+<?php
+
+ if ($formtarget) {
+
+ if (isset($vars['formcontents']))
+ echo $vars['formcontents'];
+
?>
- <input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
+ <input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
<!-- onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" -->
<input type="button" class="cancel_button" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" />
- </form>
-
-<?php
-
- }
-
-?>
+ </form>
+
+<?php
+
+ }
+
+?>
</div>
</div>
diff --git a/views/default/friends/tablelist.php b/views/default/friends/tablelist.php
index c0c481e00..f59e02250 100644
--- a/views/default/friends/tablelist.php
+++ b/views/default/friends/tablelist.php
@@ -1,65 +1,66 @@
-<?php
-
- /**
- * Elgg friends picker
- * Lists the friends picker
- *
- * @package Elgg
- * @subpackage Core
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008
- * @link http://elgg.org/
- *
- * @uses $vars['entities'] The array of ElggUser objects
- */
-
- if (is_array($vars['entities'])) {
-
-?>
-
- <table cellspacing="0" id="collectionMembersTable" style="margin:10px;">
- <tr>
-<?php
-
- $column = 0;
- foreach($vars['entities'] as $entity) {
- if (!($entity instanceof ElggEntity)) $entity = get_entity($entity);
- if ($entity instanceof ElggEntity) {
-?>
-
- <td style="width:25px">
- <?php echo elgg_view("profile/icon",array('entity' => $entity, 'size' => 'tiny')); ?>
- </td>
- <td style="width: 200px; padding: 5px;">
-<?php
-
- echo $entity->name;
-
-?>
- </td>
-
-<?php
-
- $column++;
- if ($column == 3) {
- echo "</tr><tr>";
- $column = 0;
- }
-
- }
-
-
-?>
-
-
-
-<?php
- }
- if ($column < 3 && $column != 0) echo "</tr>";
- echo "</table>";
- }
-
- if (isset($vars['content'])) echo $vars['content'];
-
+<?php
+
+ /**
+ * Elgg friends picker
+ * Lists the friends picker
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008
+ * @link http://elgg.org/
+ *
+ * @uses $vars['entities'] The array of ElggUser objects
+ */
+
+ if (is_array($vars['entities'])) {
+
+?>
+
+ <table cellspacing="0" id="collectionMembersTable" style="margin:10px;">
+ <tr>
+<?php
+ $column = 0;
+ foreach($vars['entities'] as $entity) {
+ if (!($entity instanceof ElggEntity)) $entity = get_entity($entity);
+ if ($entity instanceof ElggEntity) {
+?>
+
+ <td style="width:25px;">
+ <div style="width: 25px; margin-bottom: 15px;">
+ <?php echo elgg_view("profile/icon",array('entity' => $entity, 'size' => 'tiny')); ?>
+ </div>
+ </td>
+ <td style="width: 200px; padding: 5px;">
+<?php
+
+ echo $entity->name;
+
+?>
+ </td>
+
+<?php
+
+ $column++;
+ if ($column == 3) {
+ echo "</tr><tr>";
+ $column = 0;
+ }
+
+ }
+
+
+?>
+
+
+
+<?php
+ }
+ if ($column < 3 && $column != 0) echo "</tr>";
+ echo "</table>";
+ }
+
+ if (isset($vars['content'])) echo $vars['content'];
+
?> \ No newline at end of file