Pulled in the interface changes.

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

14 files changed, 51 insertions, 79 deletions

diff --git a/views/default/admin/main.php b/views/default/admin/main.php
index fc143244d..e345f56d6 100644
--- a/views/default/admin/main.php
+++ b/views/default/admin/main.php
@@ -9,4 +9,4 @@
  */
 
 // Description of what's going on
-echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("admin:description"))) . "</p>";
+echo elgg_view('output/longtext', array('value' => elgg_echo("admin:description")));
diff --git a/views/default/admin/main_opt/plugins.php b/views/default/admin/main_opt/plugins.php
index b1e2f0078..b8ae611d3 100644
--- a/views/default/admin/main_opt/plugins.php
+++ b/views/default/admin/main_opt/plugins.php
@@ -10,7 +10,7 @@
 
 global $CONFIG;
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('admin:plugins'); ?> </h2>
 	<p><?php echo elgg_echo('admin:plugins:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/admin/plugins/"; ?>"><?php echo elgg_echo('admin:plugins:opt:linktext'); ?></a></p>
diff --git a/views/default/admin/main_opt/site.php b/views/default/admin/main_opt/site.php
index 7c34015ba..e21dcc3fe 100644
--- a/views/default/admin/main_opt/site.php
+++ b/views/default/admin/main_opt/site.php
@@ -8,7 +8,7 @@
  * @link http://elgg.org/
  */
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('admin:site'); ?> </h2>
 	<p><?php echo elgg_echo('admin:site:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/admin/site/"; ?>"><?php echo elgg_echo('admin:site:opt:linktext'); ?></a></p>
diff --git a/views/default/admin/main_opt/statistics.php b/views/default/admin/main_opt/statistics.php
index fec4c3f20..5b063b82e 100644
--- a/views/default/admin/main_opt/statistics.php
+++ b/views/default/admin/main_opt/statistics.php
@@ -8,7 +8,7 @@
  * @link http://elgg.org/
  */
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('admin:statistics'); ?> </h2>
 	<p><?php echo elgg_echo('admin:statistics:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/admin/statistics/"; ?>"><?php echo elgg_echo('admin:statistics:opt:linktext'); ?></a></p>
diff --git a/views/default/admin/main_opt/user.php b/views/default/admin/main_opt/user.php
index e82f97625..f1dc28e5e 100644
--- a/views/default/admin/main_opt/user.php
+++ b/views/default/admin/main_opt/user.php
@@ -8,7 +8,7 @@
  * @link http://elgg.org/
  */
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('admin:user'); ?> </h2>
 	<p><?php echo elgg_echo('admin:user:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/admin/user/"; ?>"><?php echo elgg_echo('admin:user:opt:linktext'); ?></a></p>
diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index f73530f44..70e5d2683 100644
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -15,7 +15,7 @@ $token = generate_action_token($ts);
 
 // Description of what's going on
 $buttons = " <a class='enableallplugins' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')."</a>  <a class='disableallplugins' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')."</a> ";
-echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . $buttons . elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description"))) . "<div class='clearfloat'></div></span></div>";
+echo $buttons . elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description")));
 
 $limit = get_input('limit', 10);
 $offset = get_input('offset', 0);
@@ -33,20 +33,6 @@ foreach($plugin_list as $key => $foo) {
 // Display list of plugins
 $n = 0;
 foreach ($installed_plugins as $plugin => $data) {
-	//if (($n>=$offset) && ($n < $offset+$limit))
-		echo elgg_view("admin/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data, 'maxorder' => $max, 'order' => array_search($plugin, $plugin_list)));
-
+	echo elgg_view("admin/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data, 'maxorder' => $max, 'order' => array_search($plugin, $plugin_list)));
 	$n++;
-}
-
-// Diplay nav
-/*
-if ($count)
-{
-	echo elgg_view('navigation/pagination',array(
-										'baseurl' => $_SERVER['REQUEST_URI'],
-										'offset' => $offset,
-										'count' => $count,
-												));
-}
-*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/views/default/admin/plugins_opt/plugin.php b/views/default/admin/plugins_opt/plugin.php
index 33718f2ac..d813b8c01 100644
--- a/views/default/admin/plugins_opt/plugin.php
+++ b/views/default/admin/plugins_opt/plugin.php
@@ -26,7 +26,7 @@ if ($manifest['elgg_version']) {
 $ts = time();
 $token = generate_action_token($ts);
 ?>
-<div class="plugin_details <?php if ($active) echo "active"; else echo "not-active" ?>">
+<div class="plugin_details <?php if ($active) echo "active"; else echo "not_active" ?>">
 	<div class="admin_plugin_reorder">
 <?php
 			if ($vars['order'] > 10) {
@@ -56,7 +56,7 @@ $token = generate_action_token($ts);
 	<h3><?php echo $plugin; ?><?php if (elgg_view("settings/{$plugin}/edit")) { ?> <a class="pluginsettings_link">[<?php echo elgg_echo('settings'); ?>]</a><?php } ?></h3>
 
 	<?php if (elgg_view("settings/{$plugin}/edit")) { ?>
-	<div class="pluginsettings">
+	<div class="pluginsettings hidden">
 			<div id="<?php echo $plugin; ?>_settings">
 				<?php echo elgg_view("object/plugin", array('plugin' => $plugin, 'entity' => find_plugin_settings($plugin))) ?>
 			</div>
@@ -77,7 +77,7 @@ $token = generate_action_token($ts);
 
 	<p><a class="manifest_details"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></p>
 
-	<div class="manifest_file">
+	<div class="manifest_file hidden">
 
 	<?php if ($manifest) { ?>
 		<?php if ((!$version_check_valid) || (!isset($manifest['elgg_version']))) { ?>
diff --git a/views/default/admin/site.php b/views/default/admin/site.php
index 67cfca5a1..0893e4970 100644
--- a/views/default/admin/site.php
+++ b/views/default/admin/site.php
@@ -11,8 +11,6 @@
 global $CONFIG;
 
 // Description of what's going on
-echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("admin:site:description"))) . " ";
+echo elgg_view('output/longtext', array('value' => elgg_echo("admin:site:description")));
 
-echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic")); // Always want to do this first.
-
-echo "</div>";
\ No newline at end of file
+echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic")); // Always want to do this first.
\ No newline at end of file
diff --git a/views/default/admin/statistics_opt/basic.php b/views/default/admin/statistics_opt/basic.php
index eed94c76b..f89314fef 100644
--- a/views/default/admin/statistics_opt/basic.php
+++ b/views/default/admin/statistics_opt/basic.php
@@ -19,9 +19,9 @@ $version = get_version();
 $release = get_version(true);
 
 ?>
-<div class="admin_statistics">
+<div class="admin_settings site_stats">
 	<h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3>
-	<table>
+	<table class="styled">
 		<tr class="odd">
 			<td class="column_one"><b><?php echo elgg_echo('admin:statistics:label:version'); ?> :</b></td>
 			<td><?php echo elgg_echo('admin:statistics:label:version:release'); ?> - <?php echo $release; ?>, <?php echo elgg_echo('admin:statistics:label:version:version'); ?> - <?php echo $version; ?></td>
diff --git a/views/default/admin/statistics_opt/numentities.php b/views/default/admin/statistics_opt/numentities.php
index 9f67512e1..4336c5a82 100644
--- a/views/default/admin/statistics_opt/numentities.php
+++ b/views/default/admin/statistics_opt/numentities.php
@@ -12,9 +12,9 @@
 $entity_stats = get_entity_statistics();
 $even_odd = "";
 ?>
-<div class="admin_statistics">
+<div class="admin_settings site_entities">
 	<h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3>
-	<table>
+	<table class="styled">
 		<?php
 			foreach ($entity_stats as $k => $entry) {
 				arsort($entry);
diff --git a/views/default/admin/statistics_opt/online.php b/views/default/admin/statistics_opt/online.php
index 70a2979c1..b30e8a396 100644
--- a/views/default/admin/statistics_opt/online.php
+++ b/views/default/admin/statistics_opt/online.php
@@ -9,12 +9,16 @@
  */
 
 // users online
-get_context('search');
-$users_online = get_online_users();
-get_context('admin');
-?>
-
-<div class="admin_users_online">
-	<h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
-	<?php echo $users_online; ?>
-</div>
+if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) {
+	get_context('search');
+	$users_online = get_online_users();
+	get_context('admin');
+	?>
+	
+	<div class="admin_settings users_online">
+		<h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
+		<?php echo $users_online; ?>
+	</div>
+<?php
+}
+?>
\ No newline at end of file
diff --git a/views/default/admin/user.php b/views/default/admin/user.php
index 409afbe88..eb07d120e 100644
--- a/views/default/admin/user.php
+++ b/views/default/admin/user.php
@@ -8,11 +8,12 @@
  * @link http://elgg.org/
  */
 
-// Description of what's going on
-echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . elgg_view('output/longtext', array('value' => elgg_echo("admin:user:description"))) . "</span></div>";
-
-echo elgg_view("admin/user_opt/adduser");
-
+// Intro
+echo elgg_view('output/longtext', array('value' => elgg_echo("admin:user:description")));
+//echo elgg_view("admin/user_opt/adduser");
+// add a new user form
+echo elgg_view('account/forms/useradd', array('show_admin'=>true));
+// search for a user
 echo elgg_view("admin/user_opt/search");
 
 if ($vars['list']) {
diff --git a/views/default/admin/user_opt/adduser.php b/views/default/admin/user_opt/adduser.php
index 759678bc1..e69de29bb 100644
--- a/views/default/admin/user_opt/adduser.php
+++ b/views/default/admin/user_opt/adduser.php
@@ -1,18 +0,0 @@
-<?php
-/**
- * Add a user.
- * Form to add a new user.
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-?>
-
-<div class="admin_adduser_link">
-	<a href="#" onclick="$('#add_user_showhide').toggle()"><?php echo elgg_echo('admin:user:adduser:label'); ?></a>
-</div>
-<div id="add_user_showhide" style="display:none" >
-<?php echo elgg_view('account/forms/useradd', array('show_admin'=>true)); ?>
-</div>
\ No newline at end of file
diff --git a/views/default/admin/user_opt/search.php b/views/default/admin/user_opt/search.php
index 2e337755b..f853dcf3c 100644
--- a/views/default/admin/user_opt/search.php
+++ b/views/default/admin/user_opt/search.php
@@ -7,18 +7,19 @@
  * @author Curverider Ltd
  * @link http://elgg.org/
  */
+ 
+if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) { 
 ?>
-<div id="search-box">
-	<form action="<?php echo $vars['url']; ?>pg/search/" method="get">
-	<b><?php echo elgg_echo('admin:user:label:search'); ?></b>
-	<?php
-
-		echo elgg_view('input/text',array('internalname' => 'q'));
-
-	?>
-	<input type="hidden" name="entity_type" value="user" />
-	<input type="hidden" name="search_type" value="entities" />
-	<input type="submit" name="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>"
-		value="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>" />
-	</form>
-</div>
+	<div class="admin_settings user_search">
+		<form action="<?php echo $vars['url']; ?>pg/search/" method="get">
+			<h3><?php echo elgg_echo('admin:user:label:search'); ?></h3>
+			<?php echo elgg_view('input/text',array('internalname' => 'q')); ?>
+			<input type="hidden" name="entity_type" value="user" />
+			<input type="hidden" name="search_type" value="entities" />
+			<input type="submit" name="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>"
+				value="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>" />
+		</form>
+	</div>
+<?php
+}
+?>
\ No newline at end of file