diff options
| -rw-r--r-- | views/default/account/forms/forgotten_password.php | 5 | ||||
| -rw-r--r-- | views/default/account/forms/register.php | 2 | ||||
| -rw-r--r-- | views/default/admin/plugins_opt/plugin.php | 4 | ||||
| -rw-r--r-- | views/default/input/form.php | 7 | ||||
| -rw-r--r-- | views/default/js/initialise_elgg.php | 16 |
5 files changed, 14 insertions, 20 deletions
diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php index b360bcc63..407f8e71c 100644 --- 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 0265ce187..756efbb7e 100644 --- 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 d813b8c01..dabf25c55 100644 --- 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 945d74d20..af5ffe0e2 100644 --- 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 50aa8f5fd..fdbcbbd07 100644 --- 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"); |