Interface updates to js, and login, register, lost password

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

diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php
index b360bcc63442523b9c049e12ba144ccab82a886b..407f8e71c97901f198a861fd5451542be2d74a4f 100644 (file)
--- a/views/default/account/forms/forgotten_password.php
+++ b/views/default/account/forms/forgotten_password.php
@@ -21,8 +21,9 @@ $form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('requ
        <?php
                echo elgg_view('input/form', array(
                        'action' => "{$vars['url']}action/user/requestnewpassword",
-                       'body' => $form_body)
-               );
+                       'body' => $form_body,
+                       'class' => "margin_top"
+               ));
        ?>
        </div>
 </div>

diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index 0265ce1878e315887d0ae48330a2bd865d61f7b9..756efbb7e52cb932295208c2e83d2956a65a3861 100644 (file)
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -42,7 +42,7 @@ $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value
 <div id="elgg_content" class="clearfloat sidebar">
        <div id="elgg_page_contents" class="clearfloat register">
                <h2><?php echo elgg_echo('register'); ?></h2>
-               <?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body)) ?>
+               <?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body, 'class' => "margin_top")) ?>
        </div>
 </div>
 <script type="text/javascript">

diff --git a/views/default/admin/plugins_opt/plugin.php b/views/default/admin/plugins_opt/plugin.php
index d813b8c01d1c303b04767844a6a177b14f150165..dabf25c55e1e28cfb569a62591cc79c00331db2a 100644 (file)
--- a/views/default/admin/plugins_opt/plugin.php
+++ b/views/default/admin/plugins_opt/plugin.php
@@ -53,7 +53,7 @@ $token = generate_action_token($ts);
                <?php } ?>
        </div>
 
-       <h3><?php echo $plugin; ?><?php if (elgg_view("settings/{$plugin}/edit")) { ?> <a class="pluginsettings_link">[<?php echo elgg_echo('settings'); ?>]</a><?php } ?></h3>
+       <h3><?php echo $plugin; ?><?php if (elgg_view("settings/{$plugin}/edit")) { ?> <a class="pluginsettings_link" onclick="elgg_slide_toggle(this,'.plugin_details','.pluginsettings');">[<?php echo elgg_echo('settings'); ?>]</a><?php } ?></h3>
 
        <?php if (elgg_view("settings/{$plugin}/edit")) { ?>
        <div class="pluginsettings hidden">
@@ -75,7 +75,7 @@ $token = generate_action_token($ts);
 
        ?>
 
-       <p><a class="manifest_details"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></p>
+       <p><a class="manifest_details" onclick="elgg_slide_toggle(this,'.plugin_details','.manifest_file');"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></p>
 
        <div class="manifest_file hidden">
 

diff --git a/views/default/input/form.php b/views/default/input/form.php
index 945d74d20cfcf9ae00b16e970d56e11d83bf68a3..af5ffe0e26a9fdba6db1618dc05f3529c0bb1efd 100644 (file)
--- a/views/default/input/form.php
+++ b/views/default/input/form.php
@@ -42,6 +42,11 @@ if (isset($vars['method'])) {
 } else {
        $method = 'POST';
 }
+if (isset($vars['class'])) {
+       $class = $vars['class'];
+} else {
+       $class = '';
+}
 
 $method = strtolower($method);
 
@@ -51,7 +56,7 @@ if (!isset($vars['disable_security']) || $vars['disable_security'] != true) {
        $security_header = elgg_view('input/securitytoken');
 }
 ?>
-<form <?php if ($id) { ?>id="<?php echo $id; ?>" <?php } ?> <?php if ($name) { ?>name="<?php echo $name; ?>" <?php } ?> <?php echo $vars['js']; ?> action="<?php echo $action; ?>" method="<?php echo $method; ?>" <?php if ($enctype!="") echo "enctype=\"$enctype\""; ?>>
+<form <?php if ($id) { ?>id="<?php echo $id; ?>" <?php } ?> <?php if ($name) { ?>name="<?php echo $name; ?>" <?php } ?> <?php echo $vars['js']; ?> action="<?php echo $action; ?>" method="<?php echo $method; ?>" <?php if ($enctype!="") echo "enctype=\"$enctype\""; ?> class="<?php echo $class; ?>">
 <?php echo $security_header; ?>
 <?php echo $body; ?>
 </form>
\ No newline at end of file

diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 50aa8f5fde86be0cc8dd8156b46d14f1f174dd32..fdbcbbd073049d71c9d0fce5531ca53b1a7fb147 100644 (file)
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -5,7 +5,7 @@ $(document).ready(function () {
        $('a.toggle_box_contents').bind('click', toggleContent);
 
 /*  // replaced with elgg_slide_toggle
-       @todo - PH update new admin area and widget canvas with the new toggle function
+       @todo - PH update widget canvases with the new toggle function
        // toggle widget box edit panel
        $('a.toggle_box_edit_panel').click(function () {
                $(this.parentNode.parentNode).children(".collapsable_box_editpanel").slideToggle("fast");
@@ -16,19 +16,7 @@ $(document).ready(function () {
        $('a.toggle_customise_edit_panel').click(function () {
                $('div#customise_editpanel').slideToggle("fast");
                return false;
-       });
-
-       // toggle plugin's settings and more info on admin tools admin
-       $('a.pluginsettings_link').click(function () {
-               $(this.parentNode.parentNode).children(".pluginsettings").slideToggle("fast");
-               return false;
-       });
-       
-       $('a.manifest_details').click(function () {
-               $(this.parentNode.parentNode).children(".manifest_file").slideToggle("fast");
-               return false;
-       });
-       
+       });     
 
        $('a.collapsibleboxlink').click(function () {
                $(this.parentNode.parentNode).children(".collapsible_box").slideToggle("fast");