aboutsummaryrefslogtreecommitdiff
path: root/views/default/account/forms
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/account/forms')
-rw-r--r--views/default/account/forms/login.php46
-rw-r--r--views/default/account/forms/login_dropdown.php162
-rw-r--r--views/default/account/forms/login_walled_garden.php109
3 files changed, 22 insertions, 295 deletions
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index ceaaf66d0..8b4d88583 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -5,33 +5,31 @@
* @package Elgg
* @subpackage Core
*/
+?>
-$form_body = "<label>" . elgg_echo('loginusername') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea')) . "</label>";
-$form_body .= "<br />";
-$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')) . "</label><br />";
+<p class='loginbox'>
+ <label><?php echo elgg_echo('loginusername'); ?></label>
+ <?php echo elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea')); ?>
+ <label><?php echo elgg_echo('password'); ?></label>
+ <?php echo elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')); ?>
-$form_body .= elgg_view('input/hidden', array('internalname' => 'returntoreferer', 'value' => 'true'));
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login')));
-$form_body .= "<div class='persistent_login'><label><input type='checkbox' name='persistent' value='true' />".elgg_echo('user:persistent')."</label></div>";
+ <?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
-$form_body .= elgg_view('login/extend');
+ <span class='rememberme'>
+ <label>
+ <input type="checkbox" name="persistent" value="true" />
+ <?php echo elgg_echo('user:persistent'); ?>
+ </label>
+ </span>
-$form_body .= "<p class='loginbox'>";
-$form_body .= $CONFIG->allow_registration ? "<a href=\"".elgg_get_site_url()."pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
-$form_body .= "<a href=\"".elgg_get_site_url()."pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
+ <?php echo elgg_view('login/extend'); ?>
-$login_url = elgg_get_site_url();
-if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
- $login_url = str_replace("http", "https", elgg_get_site_url());
-}
+<?php
+ if ($CONFIG->allow_registration) {
+ echo '<a class="registration_link" href="' . elgg_get_site_url() . 'pg/register/">' . elgg_echo('register') . '</a> | ';
+ }
?>
-
-<div id="login">
-<h2><?php echo elgg_echo('login'); ?></h2>
- <?php
- echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
- ?>
-</div>
-<script type="text/javascript">
- $(document).ready(function() { $('input[name=username]').focus(); });
-</script> \ No newline at end of file
+ <a class="forgotten_password_link" href="<?php echo elgg_get_site_url(); ?>pages/account/forgotten_password.php">
+ <?php echo elgg_echo('user:password:lost'); ?>
+ </a>
+</p> \ No newline at end of file
diff --git a/views/default/account/forms/login_dropdown.php b/views/default/account/forms/login_dropdown.php
deleted file mode 100644
index 978507914..000000000
--- a/views/default/account/forms/login_dropdown.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/**
-* Elgg drop-down login form
-*
-*/
-
-if (!isloggedin()) {
- $form_body = "<p class='loginbox'><label>" . elgg_echo('loginusername') . "</label>" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea name'));
- $form_body .= "<label>" . elgg_echo('password') . "</label>" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea'));
- $form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <span class='remember'><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></span></p>";
-
- $form_body .= elgg_view('login/extend');
-
- $form_body .= "<p class='loginbox'>";
- $form_body .= $CONFIG->allow_registration ? "<a href=\"".elgg_get_site_url()."pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
- $form_body .= "<a href=\"".elgg_get_site_url()."pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
- $form_body .= "<input type='hidden' name='returntoreferer' value='true' />";
-
- $login_url = elgg_get_site_url();
- if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
- $login_url = str_replace("http", "https", elgg_get_site_url());
- }
-?>
-
- <div id="login_dropdown">
- <div id="signin_button" class="signin_button">
- <a href="<?php echo $CONFIG->url; ?>pg/login" class="signin"><span><?php echo elgg_echo('login') ?></span></a>
- </div>
- <fieldset id="signin_menu">
-<?php
- echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
-?>
- </fieldset>
- </div>
-
-<?php
-}
-?>
-
-<script type="text/javascript">
-$(document).ready(function() {
-
- $(".signin").click(function(e) {
- e.preventDefault();
- $("fieldset#signin_menu").toggle();
- $(".signin").toggleClass("menu_open");
- $('.login_textarea.name').focus();
- });
-
- $("fieldset#signin_menu").mouseup(function() {
- return false
- });
-
- $(document).mouseup(function(e) {
- if($(e.target).parent("a.signin").length==0) {
- $(".signin").removeClass("menu_open");
- $("fieldset#signin_menu").hide();
- }
- });
-
-});
-</script>
-
-<style type="text/css">
-/* DROPDOWN LOGIN BOX */
-#login_dropdown {
- float:right;
- position: absolute;
- top:10px;
- right:0;
- z-index: 9599;
-}
-#login_dropdown #signin_button {
- padding:10px 0px 12px;
- line-height:23px;
- text-align:right;
-}
-#login_dropdown #signin_button a.signin {
- padding:2px 6px 3px 6px;
- text-decoration:none;
- font-weight:bold;
- position:relative;
- margin-left:0;
- color:white;
- border:1px solid #71B9F7;
- -webkit-border-radius:4px;
- -moz-border-radius:4px;
- border-radius:4px;
-}
-#login_dropdown #signin_button a.signin span {
- padding:4px 0 6px 12px;
- background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
- background-position:-150px -51px;
- background-repeat:no-repeat;
-}
-#login_dropdown #signin_button a.signin:hover {
- background-color:#71B9F7;
- /* color:black; */
-}
-#login_dropdown #signin_button a.signin:hover span {
- /* background-position:-150px -71px; */
-}
-#login_dropdown #signin_button a.signin.menu_open {
- background:#cccccc !important;
- color:#666666 !important;
- border:1px solid #cccccc;
- outline:none;
-}
-#login_dropdown #signin_button a.signin.menu_open span {
- background-position:-150px -71px;
- color:#333333;
-}
-#login_dropdown #signin_menu {
- -moz-border-radius-topleft:5px;
- -moz-border-radius-bottomleft:5px;
- -moz-border-radius-bottomright:5px;
- -webkit-border-top-left-radius:5px;
- -webkit-border-bottom-left-radius:5px;
- -webkit-border-bottom-right-radius:5px;
- display:none;
- background-color:white;
- position:absolute;
- width:210px;
- z-index:100;
- border:5px solid #CCCCCC;
- text-align:left;
- padding:12px;
- top: 26px;
- right: 0px;
- margin-top:5px;
- margin-right: 0px;
- color:#333333;
- -webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
- -moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
-}
-#login_dropdown #signin_menu input[type=text],
-#login_dropdown #signin_menu input[type=password] {
- width:203px;
- margin:0 0 5px;
-}
-#login_dropdown #signin_menu p {
- margin:0;
-}
-#login_dropdown #signin_menu label {
- font-weight:normal;
- font-size: 100%;
-}
-#login_dropdown #signin_menu .submit_button {
- margin-right:15px;
-}
-
-/* ie7 fixes */
-*:first-child+html #login_dropdown #signin_button {
- line-height:10px;
-}
-*:first-child+html #login_dropdown #signin_button a.signin span {
- background-position:-150px -54px;
-}
-*:first-child+html #login_dropdown #signin_button a.signin.menu_open span {
- background-position:-150px -74px;
-}
-</style> \ No newline at end of file
diff --git a/views/default/account/forms/login_walled_garden.php b/views/default/account/forms/login_walled_garden.php
deleted file mode 100644
index 8f0faefe8..000000000
--- a/views/default/account/forms/login_walled_garden.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
-* Walled Garden Login Form
-*/
-
-global $CONFIG;
-
-$form_body = "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea username')) . "</label>";
-$form_body .= "<br />";
-$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')) . "</label><br />";
-$form_body .= elgg_view('input/hidden', array('internalname' => 'returntoreferer', 'value' => 'true'));
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login')));
-$form_body .= "<div class='remember_me'><label><input type='checkbox' name='persistent' checked value='true' />".elgg_echo('user:persistent')."</label></div>";
-
-$register = elgg_echo('register');
-$lost_password = elgg_echo('user:password:lost');
-$form_body .= '<p class="lost_password">';
-$form_body .= $CONFIG->allow_registration ? "<a class=\"registration_link\" href=\"".elgg_get_site_url()."pg/register/\">$register</a> | " : '';
-$form_body .= "<a class='forgotten_password_link' href=\"{$login_url}pages/account/forgotten_password.php\">$lost_password</a>";
-$form_body .= '</p>';
-
-$login_url = elgg_get_site_url();
-if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
- $login_url = str_replace("http", "https", elgg_get_site_url());
-}
-?>
-<h2><?php echo elgg_echo('login'); ?></h2>
-<?php
- echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));
- echo elgg_view('login/extend'); // view for plugins to extend
-?>
-
-<?php
-if ($CONFIG->allow_registration) {
- $title = elgg_echo('register');
- $body = elgg_view("account/forms/register", array(
- 'friend_guid' => (int) get_input('friend_guid', 0),
- 'invitecode' => get_input('invitecode'),
- ));
-
- echo <<<__HTML
-<div id="registration_form" class="hidden clearfix">
-<div id="hiddenform_body" class="clearfix">
- <h2>$title</h2>
- $body
-</div><div id="hiddenform_bottom"></div></div>
-__HTML;
-}
-?>
- <?php
- $lostpassword_form_body = "<p>" . elgg_echo('user:password:text') . "</p>";
- $lostpassword_form_body .= "<p class='margin_none'><label>". elgg_echo('username') . " "
- . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea lostusername')) . "</label></p>";
- $lostpassword_form_body .= elgg_view('input/captcha');
- $lostpassword_form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "<input class='action_button disabled cancel_request' type='reset' value='Cancel'></p>";
-
- ?>
-<div id="lostpassword_form" class="hidden clearfix">
- <div id="hiddenform_body" class="clearfix">
- <h2><?php echo elgg_echo('user:password:lost'); ?></h2>
- <?php
- echo elgg_view('input/form', array(
- 'action' => "action/user/requestnewpassword",
- 'body' => $lostpassword_form_body
- ));
- ?>
-</div><div id="hiddenform_bottom"></div></div>
-
-<script type="text/javascript">
-$(document).ready(function() {
- $('input.username').focus();
-
- // add cancel button to inline register form
- $('#registration_form').find('input.submit_button').after("<input class='action_button disabled cancel_request' type='reset' value='Cancel'>");
-
- function elgg_slide_hiddenform(activateLink, parentElement, toggleElement) {
- $(activateLink).closest(parentElement).find(toggleElement).animate({"width": "563px", duration: 400});
- $(activateLink).closest(parentElement).animate({"height": "256px", duration: 400}, function() {
- // ewwww dirty. Webkit has problems when showing images that were hidden.
- // forcing a reload of all the images.
- $('.visual_captcha img').each(function() { $(this).attr('src', $(this).attr('src')); });
- });
- return false;
- }
-
- $('a.registration_link').click(function(e) {
- e.preventDefault();
- elgg_slide_hiddenform(this, '.walledgardenlogin', '#registration_form');
- $('input.name').focus();
- });
-
- $('a.forgotten_password_link').click(function(e) {
- e.preventDefault();
- elgg_slide_hiddenform(this, '.walledgardenlogin', '#lostpassword_form');
- $('input.lostusername').focus();
- });
-
- $('input.cancel_request').click(function() {
- if ($('#lostpassword_form').is(':visible')) {
- $('#lostpassword_form').fadeOut(400);
- location.reload();
- } else if ($('#registration_form').is(':visible')) {
- $('#registration_form').fadeOut(400);
- location.reload();
- }
- return false;
- });
-});
-</script>