Merged members plugin's new layout.

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

4 files changed, 46 insertions, 95 deletions

diff --git a/mod/members/views/default/members/css.php b/mod/members/views/default/members/css.php
index 048d71bad..3b8cc1cf0 100644
--- a/mod/members/views/default/members/css.php
+++ b/mod/members/views/default/members/css.php
@@ -1,54 +1,23 @@
 <?php
-
-	/**
-	 * Elgg Members 
-	 * 
-	 * @package Members
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-
+/**
+ * Elgg Members Css
+ * 
+ * @package Members
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
 ?>
 
-/* new members page */
-.members .search_listing {
-	border:2px solid #cccccc;
-	margin:0 0 5px 0;
-}
-.members .search_listing:hover {
-	background:#dedede;
+.members_list {
+
 }
 .members .group_count {
 	font-weight: bold;
 	color: #666666;
 	margin:0 0 5px 4px;
 }
-.members .search_listing_info {
-	color:#666666;
-}
-
-.members .profile_status {
-	-webkit-border-radius: 4px; 
-	-moz-border-radius: 4px;
-	background:#bbdaf7;
-	line-height:1.2em;
-	padding:2px 4px;
-}
-.members .profile_status span {
-	font-size:90%;
-	color:#666666;
-}
-.members  p.owner_timestamp {
-	padding-left:3px;
-}
-.members .pagination {
-	border:2px solid #cccccc;
-	margin:5px 0 5px 0;
-}
-
-
 #memberssearchform {
 	border-bottom: 1px solid #cccccc;
 	margin-bottom: 10px;
@@ -60,5 +29,4 @@
 }
 #memberssearchform .search_input {
 	width:176px;
-}
-
+}
\ No newline at end of file
diff --git a/mod/members/views/default/members/members_sort_menu.php b/mod/members/views/default/members/members_navigation.php
index e9ad96039..6abe6f348 100644
--- a/mod/members/views/default/members/members_sort_menu.php
+++ b/mod/members/views/default/members/members_navigation.php
@@ -1,29 +1,23 @@
-<?php
-
-	/**
-	 * A simple view to provide the user with group filters and the number of group on the site
-	 **/
-	 
-	 $members = $vars['count'];
-	 if(!$num_groups)
-	 	$num_groups = 0;
-	 	
-	 $filter = $vars['filter'];
-	 
-	 //url
-	 $url = $vars['url'] . "mod/members/index.php";
-
-?>
-<div id="elgg_horizontal_tabbed_nav">
-<ul>
-	<li <?php if($filter == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('members:label:newest'); ?></a></li>
-	<li <?php if($filter == "pop") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=pop"><?php echo elgg_echo('members:label:popular'); ?></a></li>
-	<li <?php if($filter == "active") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=active"><?php echo elgg_echo('members:label:active'); ?></a></li>
-</ul>
-</div>
-
-<div class="group_count">
-	<?php
-		echo $members . " " . elgg_echo("members:active");
-	?>
+<?php

+

+	/**

+	 * A simple view to provide the user with group filters and the number of group on the site

+	 **/

+	 

+	 $members = $vars['count'];

+	 if(!$num_groups)

+	 	$num_groups = 0;

+	 	

+	 $filter = $vars['filter'];

+	 

+	 //url

+	 $url = $vars['url'] . "mod/members/index.php";

+

+?>

+<div class="elgg_horizontal_tabbed_nav margin_top">

+<ul>

+	<li <?php if($filter == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('members:label:newest'); ?></a></li>

+	<li <?php if($filter == "pop") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=pop"><?php echo elgg_echo('members:label:popular'); ?></a></li>

+	<li <?php if($filter == "active") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=active"><?php echo elgg_echo('members:label:active'); ?></a></li>

+</ul>

 </div>
\ No newline at end of file
diff --git a/mod/members/views/default/members/online.php b/mod/members/views/default/members/online.php
deleted file mode 100644
index cfbe062b4..000000000
--- a/mod/members/views/default/members/online.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-	/**
-	 * Show members online
-	 **/
-	 
-	 echo "<div class=\"members_online\">";
-	 echo get_online_users();
-	 echo "</div>";
-	 
-?>
\ No newline at end of file
diff --git a/mod/members/views/default/members/search.php b/mod/members/views/default/members/search.php
index 69d8c06bf..f908d92c4 100644
--- a/mod/members/views/default/members/search.php
+++ b/mod/members/views/default/members/search.php
@@ -1,19 +1,19 @@
 <?php
+/**
+ * Elgg Members search
+ * 
+ * @package Members
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
 
-	/**
-	 * Simple member search
-	 **/
-
-$tag_string = elgg_echo('members:search:tags');
-$name_string = elgg_echo('members:search:name');
-
-?>
-
-<div class="sidebarBox">
+<div class="SidebarBox">
 
 <h3><?php echo elgg_echo('members:searchtag'); ?></h3>
 <form id="memberssearchform" action="<?php echo $vars['url']; ?>mod/members/index.php?" method="get">
-	<input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search_input" />
+	<input type="text" name="tag" value="Member tags" onclick="if (this.value=='Member tags') { this.value='' }" class="search_input" />
 	<input type="hidden" name="subtype" value="" />
 	<input type="hidden" name="object" value="user" />
 	<input type="hidden" name="filter" value="search_tags" />	
@@ -22,7 +22,7 @@ $name_string = elgg_echo('members:search:name');
 
 <h3><?php echo elgg_echo('members:searchname'); ?></h3>
 <form id="memberssearchform" action="<?php echo $vars['url']; ?>mod/members/index.php?" method="get">
-	<input type="text" name="tag" value="<?php echo $name_string; ?>" onclick="if (this.value=='<?php echo $name_string; ?>') { this.value='' }" class="search_input" />
+	<input type="text" name="tag" value="Members name" onclick="if (this.value=='Members name') { this.value='' }" class="search_input" />
 	<input type="hidden" name="subtype" value="" />
 	<input type="hidden" name="object" value="user" />
 	<input type="hidden" name="filter" value="search" />