diff options
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/friends/picker.php | 98 | ||||
| -rw-r--r-- | views/default/friends/tablelist.php | 12 | 
2 files changed, 56 insertions, 54 deletions
diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php index 9702caf14..ed9d71c3e 100644 --- a/views/default/friends/picker.php +++ b/views/default/friends/picker.php @@ -30,13 +30,13 @@  				$vars['value'] = array($vars['value']);  			}  		} -
 -	// Initialise whether we're calling back or not
 -		if (isset($vars['callback'])) {
 -			$callback = $vars['callback'];
 -		} else {
 -			$callback = false;
 -		}
 + +	// Initialise whether we're calling back or not +		if (isset($vars['callback'])) { +			$callback = $vars['callback']; +		} else { +			$callback = false; +		}  	// We need to count the number of friends pickers on the page.  		global $friendspicker; @@ -60,28 +60,28 @@  				$users[$letter][$user->name] = $user;  			} -		
 -	if (!$callback) {
 +		 +	if (!$callback) {  ?>  <div class="friends_picker"> -<?php
 -
 -	if (isset($vars['content'])) echo $vars['content'];
 -
 -	
 -?>
 -
 -	<div id="friends_picker_placeholder<?php echo $friendspicker; ?>">
 -
 -<?php
 -	
 -	}
 -	
 -	if (!isset($vars['replacement'])) {
 -	
 +<?php + +	if (isset($vars['content'])) echo $vars['content']; + +	 +?> + +	<div id="friends_picker_placeholder<?php echo $friendspicker; ?>"> + +<?php +	 +	} +	 +	if (!isset($vars['replacement'])) { +	  ?> @@ -139,7 +139,7 @@  ?>  				</div>  			</td> -			<td style="width: 300px; padding: 5px;"> +			<td style="width: 200px; padding: 5px;">  <?php  					echo $friend->name; @@ -169,25 +169,25 @@  ?>  		</div>  	</div> -	</div>
 -	
 -<?php
 -	} else {
 -		echo $vars['replacement']; 
 -	}
 -	if (!$callback) {
 -
 -?>
 -	
  	</div> -</div>
 -
 -
 -<?php
 -
 -	}
 -
 -	if (!isset($vars['replacement'])) {
 +	 +<?php +	} else { +		echo $vars['replacement'];  +	} +	if (!$callback) { + +?> +	 +	</div> +</div> + + +<?php + +	} + +	if (!isset($vars['replacement'])) {  ?>  <script type="text/javascript"> @@ -209,10 +209,10 @@  ?>  	}); -</script>
 -
 -<?php
 -
 -	}
 -
 +</script> + +<?php + +	} +  ?>
\ No newline at end of file diff --git a/views/default/friends/tablelist.php b/views/default/friends/tablelist.php index 38f577a2d..a5f791f46 100644 --- a/views/default/friends/tablelist.php +++ b/views/default/friends/tablelist.php @@ -18,7 +18,7 @@  ?>
 -	<table>
 +	<table cellspacing="0" id="collectionMembersTable" style="margin:10px;">
  		<tr>
  <?php
 @@ -31,7 +31,7 @@  			<td style="width:25px">
  				<?php echo elgg_view("profile/icon",array('entity' => $entity, 'size' => 'tiny')); ?> 
  			</td>
 -			<td style="width: 300px; padding: 5px;">
 +			<td style="width: 200px; padding: 5px;">
  <?php
  					echo $entity->name;
 @@ -42,20 +42,22 @@  <?php
  				$column++;
 -				if ($column > 1) {
 +				if ($column == 3) {
  					echo "</tr><tr>";
  					$column = 0;
  				}
  			}
 -			if ($column > 0) echo "</tr>";
 +			
  ?>
 -	</table>
 +	
  <?php
  			}
 +		if ($column < 3 && $column != 0) echo "</tr>";	
 +		echo "</table>";
  		}
  ?>
\ No newline at end of file  | 
