10 files changed, 86 insertions, 41 deletions

diff --git a/views/default/forms/admin/plugins/change_state.php b/views/default/forms/admin/plugins/change_state.php
new file mode 100644
index 000000000..ba5d873e7
--- /dev/null
+++ b/views/default/forms/admin/plugins/change_state.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Activate/deactive all plugins specified by guids array
+ *
+ * @uses $vars['guids']  Array of GUIDs
+ * @uses $vars['action'] 'activate' or 'deactivate'
+ */
+
+$guids = elgg_extract('guids', $vars, array());
+$guids = implode(',', $guids);
+
+echo elgg_view('input/hidden', array(
+	'name' => 'guids',
+	'value' => $guids,
+));
+
+echo elgg_view('input/submit', array(
+	'value' => elgg_echo("admin:plugins:{$vars['action']}_all"),
+	'class' => 'elgg-button elgg-button-action'
+));
diff --git a/views/default/forms/admin/plugins/filter.php b/views/default/forms/admin/plugins/filter.php
new file mode 100644
index 000000000..d00906e6a
--- /dev/null
+++ b/views/default/forms/admin/plugins/filter.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Category filter for plugins
+ *
+ * @uses $vars['category']
+ * @uses $vars['category_options']
+ * @uses $vvars['sort']
+ */
+
+echo elgg_view('input/dropdown', array(
+	'name' => 'category',
+	'options_values' => $vars['category_options'],
+	'value' => $vars['category'],
+));
+
+echo elgg_view('input/hidden', array(
+	'name' => 'sort',
+	'value' => $vars['sort'],
+));
+
+echo elgg_view('input/submit', array(
+	'value' => elgg_echo('filter'),
+	'class' => 'elgg-button elgg-button-action',
+));
diff --git a/views/default/forms/admin/plugins/simple_update_states.php b/views/default/forms/admin/plugins/simple_update_states.php
deleted file mode 100644
index cc1c1a710..000000000
--- a/views/default/forms/admin/plugins/simple_update_states.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php 
-/**
- * Elgg administration simple plugin screen
- *
- * Shows an alphabetical list of "simple" plugins.
- *
- * @package Elgg
- * @subpackage Core
- */
-
-elgg_generate_plugin_entities();
-$installed_plugins = elgg_get_plugins('any');
-$plugin_list = array();
-
-foreach ($installed_plugins as $plugin) {
-	if (!$plugin->isValid()) {
-		continue;
-	}
-	$interface = $plugin->getManifest()->getAdminInterface();
-	if ($interface == 'simple') {
-		$plugin_list[$plugin->getManifest()->getName()] = $plugin;
-	}
-}
-
-ksort($plugin_list);
-
-echo elgg_view_entity_list($plugin_list, 0, 0, 0, false, false, false);
-echo elgg_view('input/submit', array('value' => elgg_echo('save')));
diff --git a/views/default/forms/admin/plugins/sort.php b/views/default/forms/admin/plugins/sort.php
new file mode 100644
index 000000000..284e085e6
--- /dev/null
+++ b/views/default/forms/admin/plugins/sort.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Sort plugins form body
+ *
+ * @uses $vars['sort']
+ * @uses $vars['sort_options']
+ * @uses $vars['category']
+ */
+
+echo elgg_view('input/dropdown', array(
+	'name' => 'sort',
+	'options_values' => $vars['sort_options'],
+	'value' => $vars['sort'],
+));
+
+echo elgg_view('input/hidden', array(
+	'name' => 'category',
+	'value' => $vars['category'],
+));
+
+echo elgg_view('input/submit', array(
+	'value' => elgg_echo('sort'),
+	'class' => 'elgg-button elgg-button-action'
+));
diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 857a54e1f..3deec66bd 100644
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -8,11 +8,10 @@
 $master_image = $vars['entity']->getIcon('master');
 
 ?>
-<div>
+<div class="clearfix">
 	<img id="user-avatar" class="mrl" src="<?php echo $master_image; ?>" alt="<?php echo elgg_echo('avatar'); ?>" />
 </div>
-
-<div class="clearfloat"></div>
+<div>
 <?php
 $coords = array('x1', 'x2', 'y1', 'y2');
 foreach ($coords as $coord) {
@@ -24,6 +23,7 @@ echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity'
 echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
 
 ?>
+</div>
 <!-- grab the required js for icon cropping -->
 <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.imgareaselect-0.8.min.js"></script>
 <?php //@todo JS 1.8: no ?>
diff --git a/views/default/forms/avatar/upload.php b/views/default/forms/avatar/upload.php
index 08db1f7e0..b099b8c4c 100644
--- a/views/default/forms/avatar/upload.php
+++ b/views/default/forms/avatar/upload.php
@@ -5,11 +5,12 @@
  * @uses $vars['entity']
  */
 
-echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid));
 ?>
 <div>
 	<label><?php echo elgg_echo("avatar:upload"); ?></label><br />
 	<?php echo elgg_view("input/file",array('name' => 'avatar')); ?>
-<br />
+</div>
+<div class="elgg-form-footer">
+	<?php echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid)); ?>
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('upload'))); ?>
 </div>
diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php
index 6d674838a..40e574338 100644
--- a/views/default/forms/comments/add.php
+++ b/views/default/forms/comments/add.php
@@ -18,16 +18,20 @@ if (isset($vars['entity']) && elgg_is_logged_in()) {
 		echo elgg_view('input/submit', array('value' => elgg_echo('comment')));
 	} else {
 ?>
-		<div>
-			<label><?php echo elgg_echo("generic_comments:add"); ?></label>
-			<?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?>
-		</div>
+	<div>
+		<label><?php echo elgg_echo("generic_comments:add"); ?></label>
+		<?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?>
+	</div>
+	<div>
 <?php
 		echo elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post")));
+?>
+	</div>
+<?php
 	}
 	
 	echo elgg_view('input/hidden', array(
 		'name' => 'entity_guid',
 		'value' => $vars['entity']->getGUID()
 	));
-}
\ No newline at end of file
+}
diff --git a/views/default/forms/login.php b/views/default/forms/login.php
index 452c4c425..5cfdcd4c6 100644
--- a/views/default/forms/login.php
+++ b/views/default/forms/login.php
@@ -39,7 +39,7 @@
 		echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'register">' . elgg_echo('register') . '</a></li>';
 	}
 ?>
-	<li><a class="forgotten_password_link" href="<?php echo elgg_get_site_url(); ?>pages/account/forgotten_password.php">
+	<li><a class="forgotten_password_link" href="<?php echo elgg_get_site_url(); ?>forgotpassword">
 		<?php echo elgg_echo('user:password:lost'); ?>
 	</a></li>
 </ul>
\ No newline at end of file
diff --git a/views/default/forms/user/requestnewpassword.php b/views/default/forms/user/requestnewpassword.php
index f2f276417..970938327 100644
--- a/views/default/forms/user/requestnewpassword.php
+++ b/views/default/forms/user/requestnewpassword.php
@@ -11,7 +11,7 @@
 	<?php echo elgg_echo('user:password:text'); ?>
 </div>
 <div>
-	<label><?php echo elgg_echo('username'); ?></label>
+	<label><?php echo elgg_echo('username'); ?></label><br />
 	<?php echo elgg_view('input/text', array('name' => 'username')); ?>
 </div>
 <?php echo elgg_view('input/captcha'); ?>
diff --git a/views/default/forms/usersettings/save.php b/views/default/forms/usersettings/save.php
index 62593e699..35871144b 100644
--- a/views/default/forms/usersettings/save.php
+++ b/views/default/forms/usersettings/save.php
@@ -1,7 +1,7 @@
 <?php
 $form_body = elgg_view("forms/account/settings");
 
-$form_body .= '<div class="elgg-divide-top">';
+$form_body .= '<div class="elgg-form-footer-alt">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
 $form_body .= '</div>';