Fixes #3856 adds elgg-foot to forms missing it in /views/default/forms and updated...

diff --git a/views/default/forms/account/settings.php b/views/default/forms/account/settings.php
index 824b2280be9790fbb146d2e7ccfba19a5826dd34..3967207ce301915772df8b40d750af6f22b33779 100644 (file)
--- a/views/default/forms/account/settings.php
+++ b/views/default/forms/account/settings.php
@@ -5,4 +5,6 @@
  * This form is extended by Elgg with the views in core/settings/account.
  * Plugins can additionally extend it and then register for the
  * 'usersettings:save', 'user' plugin hook.
+ *
+ * This view is included by "forms/usersettings/save"
  */

diff --git a/views/default/forms/login.php b/views/default/forms/login.php
index 5cfdcd4c6923ba416733f213b5decc27edf3a809..91e9cda424d80adc33b8572b27e0e1334882b392 100644 (file)
--- a/views/default/forms/login.php
+++ b/views/default/forms/login.php
@@ -18,7 +18,7 @@
 
 <?php echo elgg_view('login/extend'); ?>
 
-<div>
+<div class="elgg-foot">
        <?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
 
        <label class="right mtm">
@@ -31,15 +31,15 @@
                echo elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true'));
        }
        ?>
-</div>
 
-<ul class="elgg-menu elgg-menu-footer">
-<?php
-       if (elgg_get_config('allow_registration')) {
-               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(); ?>forgotpassword">
-               <?php echo elgg_echo('user:password:lost'); ?>
-       </a></li>
-</ul>
\ No newline at end of file
+       <ul class="elgg-menu elgg-menu-footer mtm">
+       <?php
+               if (elgg_get_config('allow_registration')) {
+                       echo '<li><a class="registration_link" href="' . elgg_get_site_url() . 'register">' . elgg_echo('register') . '</a></li>';
+               }
+       ?>
+               <li><a href="<?php echo elgg_get_site_url(); ?>forgotpassword">
+                       <?php echo elgg_echo('user:password:lost'); ?>
+               </a></li>
+       </ul>
+</div>

diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php
index c3d8f231fe0e611910f02ed1ef914949f5b30e85..dc7b2fef7d293547a1712cd7cda7d26f9b9f5c8d 100644 (file)
--- a/views/default/forms/plugins/settings/save.php
+++ b/views/default/forms/plugins/settings/save.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Used to show plugin user settings.
+ * Used to show plugin settings for both users and admins.
  *
  * @package Elgg.Core
  * @subpackage Plugins

diff --git a/views/default/forms/plugins/usersettings/save.php b/views/default/forms/plugins/usersettings/save.php
index bf243ae6ba807a9ca373093a6fd8ca86f38590ae..ced88f818443ae46ab208200d5dd7845c7fa76b9 100644 (file)
--- a/views/default/forms/plugins/usersettings/save.php
+++ b/views/default/forms/plugins/usersettings/save.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Plugin user settings
+ *
+ * Calls the plugin admin settings form body with type set to 'user'
+ * 
+ * @package Elgg.Core
+ * @subpackage Plugins
+ */
+
 $vars['type'] = 'user';
 
 // Can't use elgg_view_form() because it overrides the $vars['action'] parameter

diff --git a/views/default/forms/register.php b/views/default/forms/register.php
index 4e0a521ab2e2523156287d3edfd29720cc502bb0..6e18cd53d800b703409cb15f13fd3013d3774f1c 100644 (file)
--- a/views/default/forms/register.php
+++ b/views/default/forms/register.php
@@ -70,9 +70,11 @@ echo elgg_view('register/extend');
 // Add captcha hook
 echo elgg_view('input/captcha');
 
+echo '<div class="elgg-foot">';
 echo elgg_view('input/hidden', array('name' => 'friend_guid', 'value' => $vars['friend_guid']));
 echo elgg_view('input/hidden', array('name' => 'invitecode', 'value' => $vars['invitecode']));
 echo elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('register')));
+echo '</div>';
 ?>
 <script type="text/javascript">
        $(function() {

diff --git a/views/default/forms/usersettings/save.php b/views/default/forms/usersettings/save.php
index ea53f25715ee5762b3913812d22d93f2badb206c..71323083f3b1615622ec7d5429c2aa5f6465b8b4 100644 (file)
--- a/views/default/forms/usersettings/save.php
+++ b/views/default/forms/usersettings/save.php
@@ -1,5 +1,11 @@
 <?php
-$form_body = elgg_view("forms/account/settings");
+/**
+ * User account settings.
+ *
+ * Plugins should extend "forms/account/settings" to add to the settings.
+ */
+
+$form_body = elgg_view("forms/account/settings", $vars);
 
 $form_body .= '<div class="elgg-foot">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));