]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Updated walledgarden login.
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 23 Apr 2010 19:18:18 +0000 (19:18 +0000)
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 23 Apr 2010 19:18:18 +0000 (19:18 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@5864 36083f99-b078-4883-b0ff-0f9b5a30f544

mod/walledgarden/graphics/background_bottom.gif [new file with mode: 0644]
mod/walledgarden/graphics/background_extend.gif [new file with mode: 0644]
mod/walledgarden/graphics/background_top.gif [new file with mode: 0644]
mod/walledgarden/views/default/account/forms/login.php
mod/walledgarden/views/default/page_shells/walled_garden_index.php
mod/walledgarden/views/default/walledgarden/css.php

diff --git a/mod/walledgarden/graphics/background_bottom.gif b/mod/walledgarden/graphics/background_bottom.gif
new file mode 100644 (file)
index 0000000..7e25fbe
Binary files /dev/null and b/mod/walledgarden/graphics/background_bottom.gif differ
diff --git a/mod/walledgarden/graphics/background_extend.gif b/mod/walledgarden/graphics/background_extend.gif
new file mode 100644 (file)
index 0000000..09f7318
Binary files /dev/null and b/mod/walledgarden/graphics/background_extend.gif differ
diff --git a/mod/walledgarden/graphics/background_top.gif b/mod/walledgarden/graphics/background_top.gif
new file mode 100644 (file)
index 0000000..145bac9
Binary files /dev/null and b/mod/walledgarden/graphics/background_top.gif differ
index 7cb38faed857d2900749e23ba988effeafae77ce..1c3bbe51263fc382036a15a31f1173529ceb3712 100644 (file)
 <?php\r
-\r
-     /**\r
-        * Elgg login form for walled garden\r
-        */\r
+/**\r
+* Walled Garden Login Form\r
+*/\r
         \r
-       global $CONFIG;\r
-\r
-       //login form\r
-       $form_body = "<h2 class='master'>" . elgg_echo('login') . "</h2>";\r
-       $form_body .= "<label>".elgg_echo('username')."</label>".elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea username master'));\r
-       $form_body .= "<br /><label>".elgg_echo('password')."</label>".elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea password master' ));  \r
+global $CONFIG;\r
 \r
-       \r
-       $form_body .= "<br />" . elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div id=\"persistent_login\"><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></div>";\r
-       $form_body .= "<p class=\"loginbox\">";\r
-       $form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}account/register.php\">" . elgg_echo('register') . "</a> | " : "";\r
-       $form_body .= "<a href='#forgotten_password' class='forgotten_password_link'>" . elgg_echo('user:password:lost') . "</a></p>";  \r
+$form_body = "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea username')) . "</label>";\r
+$form_body .= "<br />";\r
+$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')) . "</label><br />";\r
+$form_body .= elgg_view('input/hidden', array('internalname' => 'returntoreferer', 'value' => 'true'));\r
+$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login')));\r
+$form_body .= "<div class='remember_me'><label><input type='checkbox' name='persistent' checked value='true' />".elgg_echo('user:persistent')."</label></div>";\r
+$form_body .= "<p class='lost_password'><a class='forgotten_password_link' href=\"{$login_url}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";\r
 \r
+$login_url = $vars['url'];\r
+if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {\r
+       $login_url = str_replace("http", "https", $vars['url']);\r
+}\r
+?>\r
 \r
-               \r
-       $login_url = $vars['url'];\r
-       if ((isset($CONFIG->https_login)) && ($CONFIG->https_login))\r
-               $login_url = str_replace("http", "https", $vars['url']);\r
+<h2><?php echo elgg_echo('login'); ?></h2>\r
+<?php\r
+       echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));\r
+       echo elgg_view('login/extend'); // view for plugins to extend\r
 ?>\r
-       \r
-       <div id="login-box">\r
-               <?php \r
-                       echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login"));\r
-                       echo elgg_view('login/extend'); //a view for plugins to extend\r
-               ?>                      \r
-               <div class="clearfloat"></div>\r
-       </div>\r
 \r
-       \r
+<div class="lostpassword_form margin_top hidden">\r
+       <?php\r
+       $lostpassword_form_body = "<p>" . elgg_echo('user:password:text') . "</p>";\r
+       $lostpassword_form_body .= "<p><label>". elgg_echo('username') . " "\r
+               . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea lostusername')) . "</label></p>";\r
+       $lostpassword_form_body .= elgg_view('input/captcha');\r
+       $lostpassword_form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "</p>";\r
+       \r
+       ?>\r
+       <h2><?php echo elgg_echo('user:password:lost'); ?></h2>\r
+       <?php\r
+               echo elgg_view('input/form', array(\r
+                       'action' => "{$vars['url']}action/user/requestnewpassword",\r
+                       'body' => $lostpassword_form_body,\r
+                       'class' => "margin_top"\r
+               ));\r
+       ?>\r
+</div>\r
+\r
 <script type="text/javascript"> \r
-       $(document).ready(function() { \r
-       \r
-               $('.login-textarea.username.master').focus(); // only put cursor in textfirld if master login\r
+$(document).ready(function() {         \r
+       $('input.username').focus();\r
        \r
-               $('.login-textarea.name').focus(function() {\r
-                       if (this.value=='<?php echo elgg_echo('username'); ?>') {\r
-                               this.value='';\r
-                       }\r
-               });\r
-               $('.login-textarea.name').blur(function() {\r
-                       if (this.value=='') {\r
-                               this.value='<?php echo elgg_echo('username'); ?>';\r
-                       }\r
-               });\r
-               $('.login-textarea.password').focus(function() {\r
-                       if (this.value=='<?php echo elgg_echo('password'); ?>') {\r
-                               this.value='';\r
-                       }\r
-               });\r
-               \r
-                       \r
-       //select all the a tag with name equal to modal\r
        $('a.forgotten_password_link').click(function(e) {\r
-               //Cancel the link behavior\r
                e.preventDefault();\r
-               \r
-               //Get the A tag\r
-               var id = $(this).attr('href');\r
-       \r
-               //Get the screen height and width\r
-               //var maskHeight = $(document).height();\r
-               //var maskWidth = $(window).width();\r
-       \r
-               //Set height and width to mask to fill up the whole screen\r
-               //$('#mask').css({'width':maskWidth,'height':maskHeight});\r
-               \r
-               //transition effect             \r
-               $('#mask').fadeIn(500); \r
-               $('#mask').fadeTo("slow",0.8);  \r
-       \r
-               //Get the window height and width\r
-               var winH = $(window).height();\r
-               var winW = $(window).width();\r
-              \r
-               //Set the popup window to center\r
-               $(id).css('top',  winH/4-$(id).height()/2);\r
-               $(id).css('left', (winW-20)/2-$(id).width()/2);\r
-       \r
-               //transition effect\r
-               $(id).fadeIn(1000); \r
-       \r
-       });\r
-       \r
-       //if close button is clicked\r
-       $('.window .close').click(function (e) {\r
-               //Cancel the link behaviour\r
-               e.preventDefault();\r
-               \r
-               $('#mask').hide();\r
-               $('.window').hide();\r
-       });             \r
-       \r
-       //if mask is clicked\r
-       $('#mask').click(function () {\r
-               $(this).hide();\r
-               $('.window').hide();\r
-       });     \r
-                       \r
+               elgg_slide_toggle(this, '.walledgardenlogin', '.lostpassword_form');\r
+               $('input.lostusername').focus();\r
+       });                     \r
 });                    \r
-</script>\r
-       \r
-       \r
-       \r
-       \r
-       
\ No newline at end of file
+</script>
\ No newline at end of file
index 33e3605a1717eee947f2588034b5f08d07a846d6..12b58c7da18efb3ebea32a3e955097054ee95115 100644 (file)
@@ -27,50 +27,14 @@ if (empty($vars['title'])) {
 }\r
 \r
 echo elgg_view('page_elements/html_begin', $vars);\r
-echo elgg_view('messages/list', array('object' => $vars['sysmessages']));\r
-?>     \r
-       <style type="text/css">\r
-       /*\r
-body {background: white;}\r
-       #walledgardenlogin {\r
-               position:absolute;\r
-               bottom:0;\r
-               left:280px;\r
-               height:250px;\r
-               width:272px;\r
-       }\r
-       #walledgardenintro {\r
-               position: absolute;\r
-               bottom:15px;\r
-               left:25px;\r
-               height:215px;\r
-               width:232px;\r
-               padding:10px;\r
-               background-color: white;\r
-               -webkit-border-radius: 8px; \r
-               -moz-border-radius: 8px;\r
-       }\r
-       #walledgardenlogin #login-box {\r
-               background: none;\r
-       }\r
-       #walledgardenlogin #login-box h2 {\r
-               display:none;\r
-       }\r
-       #walledgardenlogin #login-box form {height:224px;padding:10px 10px 0;}\r
+echo "<div id='walledgarden_sysmessages'>".elgg_view('messages/list', array('object' => $vars['sysmessages']))."</div>";\r
        \r
-       .messages, .messages_error {\r
-               position: relative;\r
-               margin: auto;\r
-       }\r
-*/\r
-       \r
-       </style>\r
-<?php  \r
-               echo "<div style='margin:20px auto;position:relative;padding:20px;width:523px;height:355px;background: url({$vars['url']}_graphics/login_back.gif) no-repeat top left;'>";                              \r
-               echo "<div id='walledgardenintro'><h1>Welcome to:<br />" . $title . "</h1></div>";\r
-               echo "<div id='walledgardenlogin' class='whereamIused'>";\r
-               echo $vars['body'];\r
-               echo "</div></div>";\r
-               echo elgg_view('page_elements/html_end', $vars);\r
+echo "<div id='walledgarden_container'><div id='walledgarden' class='clearfloat'>";                            \r
+       echo "<div class='walledgardenintro clearfloat'><h1>Welcome to:<br />" . $title . "</h1></div>";\r
+       echo "<div class='walledgardenlogin clearfloat'>".$vars['body']."</div>";\r
+echo "</div>";\r
+echo "<div id='walledgarden_bottom'></div>";\r
+echo "</div>";\r
+echo elgg_view('page_elements/html_end', $vars);\r
 ?>\r
 \r
index 509e5f9dee4fbd6dbe373e825f5f945f260952ea..c7987af2fab6db56dc64376a2e196d5eb89af1ce 100644 (file)
@@ -1,11 +1,82 @@
 <?php
 /**
- * Elgg WalledGarden CSS
- * 
- * @package WalledGarden
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-?>
\ No newline at end of file
+* Elgg WalledGarden CSS
+*/
+?>
+#walledgarden_container {
+       margin:100px auto 0 auto;
+       position:relative;
+       padding:0;
+       width:563px;
+       background: url(<?php echo $vars['url']; ?>mod/walledgarden/graphics/background_extend.gif) repeat-y left top;
+}
+#walledgarden {
+       position: relative;
+       padding:0;
+       width:563px;
+       min-height:230px;
+       background: url(<?php echo $vars['url']; ?>mod/walledgarden/graphics/background_top.gif) no-repeat left top;
+}
+#walledgarden_bottom {
+       margin:0 auto;
+       background: url(<?php echo $vars['url']; ?>mod/walledgarden/graphics/background_bottom.gif) no-repeat left bottom;
+       width:563px;
+       height:54px;
+       position: relative;
+}
+.walledgardenintro {
+       float:left;
+       min-height:200px;
+       width:223px;
+       padding:15px;
+       margin:19px 0 0 23px;
+}
+.walledgardenlogin {
+       float:left;
+       min-height:200px;
+       width:223px;
+       padding:15px 15px 0 15px;
+       margin:19px 0 0 11px;
+}
+.walledgardenintro h1 {
+       color:#666666;
+       margin-top:80px;
+       line-height: 1.1em;
+}
+.walledgardenlogin h2 {
+       color:#666666;
+       border-bottom:1px solid #CCCCCC;
+       margin-bottom:5px;
+       padding-bottom:5px;
+}
+.walledgardenlogin form input.login_textarea {
+       margin:0 0 10px 0;
+       width:210px;
+}
+.walledgardenlogin form label {
+       color:#666666;
+}
+.walledgardenlogin .remember_me label {
+       font-size:1em;
+       font-weight:normal;
+}
+.walledgardenlogin .remember_me {
+       display:block;
+       float:right;
+       margin-left:0;
+       margin-top:-34px;
+       text-align:right;
+       width:100%;
+}
+.walledgardenlogin .lost_password {
+       margin-bottom: 10px;
+}
+.walledgardenlogin a.forgotten_password_link {
+       color:#999999;
+}
+#walledgarden_sysmessages #elgg_system_message {
+       width: 523px;
+       right:0;
+       margin:10px auto 0 auto;
+       position: relative;
+}
\ No newline at end of file