6 files changed, 34 insertions, 90 deletions

diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php
index eee5ef374..4e35e032f 100644
--- a/views/default/admin/appearance/menu_items.php
+++ b/views/default/admin/appearance/menu_items.php
@@ -6,80 +6,5 @@
  * @subpackage Core
  */
 
-$builder = new ElggMenuBuilder('site');
-$menu = $builder->getMenu('name');
-$menu_items = $menu['default'];
 
-$featured_menu_names = elgg_get_config('site_featured_menu_names');
-
-$dropdown_values = array();
-foreach ($menu_items as $item) {
-	$dropdown_values[$item->getName()] = $item->getTitle();
-}
-$dropdown_values[''] = elgg_echo('none');
-
-echo "<div class='admin_settings menuitems'><h3>".elgg_echo('admin:menu_items:configure')."</h3>";
-echo "<p class='margin-top'>".strip_tags(elgg_view('output/longtext', array('value' => elgg_echo("admin:menu_items:description"))))."</p>";
-$form_body = '';
-
-// @todo Could probably make this number configurable
-for ($i=0; $i<6; $i++) {
-	if (array_key_exists($i, $featured_menu_names)) {
-		$current_value = $featured_menu_names[$i];
-	} else {
-		$current_value = '';
-	}
-
-	$form_body .= elgg_view('input/pulldown', array(
-		'options_values' => $dropdown_values,
-		'internalname' => 'featured_menu_names[]',
-		'value' => $current_value
-	));
-}
-
-// add arbitrary links
-$form_body .= "<h3>".elgg_echo('admin:add_menu_item')."</h3>";
-$form_body .= elgg_view('output/longtext', array('value' => elgg_echo("admin:add_menu_item:description")));
-
-$custom_items = elgg_get_config('site_custom_menu_items');
-
-$name_str = elgg_echo('name');
-$url_str = elgg_echo('admin:plugins:label:website');
-
-$form_body .= '<ul class="custom_menuitems">';
-
-if (is_array($custom_items)) {
-	foreach ($custom_items as $title => $url) {
-		$name_input = elgg_view('input/text', array(
-			'internalname' => 'custom_menu_titles[]',
-			'value' => $title
-		));
-
-		$url_input = elgg_view('input/text', array(
-			'internalname' => 'custom_menu_urls[]',
-			'value' => $url
-		));
-
-		$form_body .= "<li class='custom_menuitem'>$name_str: $name_input $url_str: $url_input $delete</li>";
-	}
-}
-
-$new = elgg_echo('new');
-$name_input = elgg_view('input/text', array(
-	'internalname' => 'custom_menu_titles[]',
-));
-
-$url_input = elgg_view('input/text', array(
-	'internalname' => 'custom_menu_urls[]',
-));
-
-$form_body .= "<li class='custom_menuitem'>$name_str: $name_input $url_str: $url_input</li>
-</ul>";
-
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
-
-echo elgg_view('input/form', array(
-	'body' => $form_body,
-	'action' => "action/admin/menu/save"
-));
-echo "</div>";
\ No newline at end of file
+echo elgg_view_form('admin/menu/save');
diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php
index 66a9855bd..7077687cc 100644
--- a/views/default/admin/appearance/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
@@ -8,7 +8,6 @@ $list = elgg_view('admin/appearance/profile_fields/list');
 $reset = elgg_view_form('profile/fields/reset', array(), array());
 
 $body = <<<__HTML
-$title
 $add
 $list
 <div class="default_profile_reset">
diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php
index 785b5550d..0a4891145 100644
--- a/views/default/admin/components/plugin_settings.php
+++ b/views/default/admin/components/plugin_settings.php
@@ -11,9 +11,21 @@ $plugin_info = load_plugin_manifest($plugin);
 
 $form_body = elgg_view("settings/{$plugin}/edit", $vars);
 $form_body .= elgg_view('input/hidden', array('internalname' => 'plugin', 'value' => $plugin));
-$form_body .= "<div class='divider'></div>" . elgg_view('input/submit', array('value' => elgg_echo('save')));
-$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'elgg-action-button disabled'));
+$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
+//$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset')));
 
-echo elgg_view_title($plugin_info['name']);
-
-echo elgg_view('input/form', array('body' => $form_body, 'internalid' => 'plugin_settings', 'action' => "action/plugins/settings/save"));
\ No newline at end of file
+?>
+<div class="elgg-module elgg-inline-module">
+	<div class="elgg-head">
+		<h3><?php echo $plugin_info['name']; ?></h3>
+	</div>
+	<div class="elgg-body">
+		<?php
+			echo elgg_view('input/form', array(
+				'body' => $form_body,
+				'internalid' => 'plugin_settings',
+				'action' => "action/plugins/settings/save",
+			));
+		?>
+	</div>
+</div>
diff --git a/views/default/admin/overview/statistics.php b/views/default/admin/overview/statistics.php
index f96b7e02e..52bd4ddb2 100644
--- a/views/default/admin/overview/statistics.php
+++ b/views/default/admin/overview/statistics.php
@@ -22,7 +22,7 @@ echo elgg_view('admin/statistics/extend');
 		<h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3>
 	</div>
 	<div class="elgg-body">
-		<table class="elgg-table">
+		<table class="elgg-table-alt">
 			<tr class="odd">
 				<td><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>
@@ -46,7 +46,7 @@ $even_odd = "";
 		<h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3>
 	</div>
 	<div class="elgg-body">
-		<table class="elgg-table">
+		<table class="elgg-table-alt">
 		<?php
 			foreach ($entity_stats as $k => $entry) {
 				arsort($entry);
diff --git a/views/default/admin/users/newest.php b/views/default/admin/users/newest.php
index c224df215..25bd55cbc 100644
--- a/views/default/admin/users/newest.php
+++ b/views/default/admin/users/newest.php
@@ -8,7 +8,11 @@ $users = elgg_list_entities(array(
 
 ?>
 
-<div class="admin_settings members-list users_online">
-	<h3><?php echo elgg_echo('admin:users:newest'); ?></h3>
-	<?php echo $users; ?>
+<div class="elgg-module elgg-inline-module">
+	<div class="elgg-head">
+		<h3><?php echo elgg_echo('admin:users:newest'); ?></h3>
+	</div>
+	<div class="elgg-body">
+		<?php echo $users; ?>
+	</div>
 </div>
diff --git a/views/default/admin/users/online.php b/views/default/admin/users/online.php
index aa3515948..328132a4c 100644
--- a/views/default/admin/users/online.php
+++ b/views/default/admin/users/online.php
@@ -3,7 +3,11 @@
 $users_online = get_online_users();
 	
 ?>
-<div class="admin_settings members-list users_online">
-	<h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
-	<?php echo $users_online; ?>
+<div class="elgg-module elgg-inline-module">
+	<div class="elgg-head">
+		<h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
+	</div>
+	<div class="elgg-body">
+		<?php echo $users_online; ?>
+	</div>
 </div>