diff options
Diffstat (limited to 'views/default/core')
-rw-r--r-- | views/default/core/account/login_box.php | 2 | ||||
-rw-r--r-- | views/default/core/account/login_dropdown.php | 21 |
2 files changed, 4 insertions, 19 deletions
diff --git a/views/default/core/account/login_box.php b/views/default/core/account/login_box.php index 40482c3df..40b5f5637 100644 --- a/views/default/core/account/login_box.php +++ b/views/default/core/account/login_box.php @@ -14,7 +14,7 @@ if (elgg_get_config('https_login')) { $title = elgg_echo('login'); $body = elgg_view_form('login', array('action' => "{$login_url}action/login")); -echo elgg_view_module('login', $title, $body); +echo elgg_view_module('aside', $title, $body); ?> diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php index 4bb373caf..d188364c0 100644 --- a/views/default/core/account/login_dropdown.php +++ b/views/default/core/account/login_dropdown.php @@ -9,13 +9,6 @@ if (elgg_is_logged_in()) { return true; } -/** - * @todo forms/login should take a "forward_to" argument, or something similar - * Enter description here ... - * @var unknown_type - */ -$form_body = elgg_view('forms/login'); - $login_url = elgg_get_site_url(); if (elgg_get_config('https_login')) { $login_url = str_replace("http", "https", elgg_get_site_url()); @@ -23,17 +16,9 @@ if (elgg_get_config('https_login')) { $body = elgg_view_form('login', array('action' => "{$login_url}action/login"), array('returntoreferer' => TRUE)); ?> - <div id="login-dropdown"> - <a href="#" class="elgg-toggle elgg-button-dropdown" id="elgg-toggler-login-dropdown-box"> + <a href="<?php echo $vars['url']; ?>pg/login" class="elgg-toggler elgg-toggles-login-dropdown-box elgg-button-dropdown"> <?php echo elgg_echo('login') ?> </a> - <?php echo elgg_view_module('dropdown', '', $body, array('id' => 'elgg-togglee-login-dropdown-box', 'class' => 'hidden')); ?> -</div> -<script> -$(function() { - $('.signin').live('click', function() { - e.preventDefault(); - }); -}); -</script>
\ No newline at end of file + <?php echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); ?> +</div>
\ No newline at end of file |