From 970048280219ea6449c42d300dd20b5ece18adc7 Mon Sep 17 00:00:00 2001 From: pete Date: Tue, 20 Apr 2010 17:05:51 +0000 Subject: Added the beginnings of a drop-down login box for Elgg as an alternative to the front-page login box in the homepage sidebar. git-svn-id: http://code.elgg.org/elgg/trunk@5812 36083f99-b078-4883-b0ff-0f9b5a30f544 --- _graphics/elgg_sprites.png | Bin 12102 -> 12089 bytes index.php | 5 +- views/default/account/forms/login_dropdown.php | 153 +++++++++++++++++++++++++ views/default/css.php | 4 +- views/default/page_elements/elgg_header.php | 3 + 5 files changed, 162 insertions(+), 3 deletions(-) create mode 100644 views/default/account/forms/login_dropdown.php diff --git a/_graphics/elgg_sprites.png b/_graphics/elgg_sprites.png index e3b21ba4d..e94f9b2be 100644 Binary files a/_graphics/elgg_sprites.png and b/_graphics/elgg_sprites.png differ diff --git a/index.php b/index.php index 9f256c07e..14d3616e1 100644 --- a/index.php +++ b/index.php @@ -38,6 +38,9 @@ if (!trigger_plugin_hook('index', 'system', null, FALSE)) { set_context('main'); global $autofeed; $autofeed = FALSE; - $content .= elgg_view_layout('one_column_with_sidebar', $title, elgg_view('account/forms/login')); + // if drop-down login in header option not selected + $login_form = elgg_view('account/forms/login'); + + $content .= elgg_view_layout('one_column_with_sidebar', $title, $login_form); page_draw(null, $content); } diff --git a/views/default/account/forms/login_dropdown.php b/views/default/account/forms/login_dropdown.php new file mode 100644 index 000000000..be2bbb901 --- /dev/null +++ b/views/default/account/forms/login_dropdown.php @@ -0,0 +1,153 @@ +" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea name')); + $form_body .= "" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')); + $form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . "

"; + + $form_body .= elgg_view('login/extend'); + + $form_body .= "

"; + $form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "" . elgg_echo('register') . " | " : ""; + $form_body .= "" . elgg_echo('user:password:lost') . "

"; + $form_body .= ""; + + $login_url = $vars['url']; + if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) + $login_url = str_replace("http", "https", $vars['url']); +?> + +
+ +
+ $form_body, 'action' => "{$login_url}action/login")); +?> +
+
+ + + + + + \ No newline at end of file diff --git a/views/default/css.php b/views/default/css.php index 2afe89dbd..0cd6f2533 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -535,12 +535,12 @@ li.navigation_more:hover a { li.navigation_more a.subnav span { background-image: url(_graphics/elgg_sprites.png); background-repeat: no-repeat; - background-position: -150px -46px; + background-position: -150px -56px; padding-left: 12px; } li.navigation_more:hover a.subnav span, li.navigation_more a.subnav:hover span { - background-position: -150px -66px; + background-position: -150px -76px; } li.navigation_more ul { z-index: 7000; diff --git a/views/default/page_elements/elgg_header.php b/views/default/page_elements/elgg_header.php index e03ebabdc..d036fcf46 100644 --- a/views/default/page_elements/elgg_header.php +++ b/views/default/page_elements/elgg_header.php @@ -18,6 +18,9 @@ } ?>