Changeset a151cadb204796478796e90e9f8e96e679cc66a0

Timestamp:

08/07/11 14:33:59 (10 months ago)

Author:

Xemle <xemle@phtagr.org>

Children:

907a0bad7bc78fb0dfa42ae4e77417288294d680

Parents:

b68035bccb671cc1bfb479f6e1968c3cf5579d7e

git-author:

Xemle <xemle@phtagr.org> / 2011-08-07T14:33:10Z+0200

git-committer:

Xemle <xemle@phtagr.org> / 2011-08-07T14:33:59Z+0200

Message:

Improve login screen

Files:

• controllers/users_controller.php (modified) (2 diffs)
• views/users/login.ctp (modified) (2 diffs)
• webroot/css/default/_form.sass (modified) (2 diffs)
• webroot/css/default/_layout.sass (modified) (1 diff)

controllers/users_controller.php

@@ -41 +41 @@
         ));
     }
+    $this->layout = 'backend';
   }
 
   function beforeRender() {
-    $this->layout = 'backend';
     parent::beforeRender();
   }
@@ -168 +168 @@
     }
     $this->set('register', $this->Option->getValue($this->getUser(), 'user.register.enable', 0));
+    $this->layout = 'default';
   }
 

views/users/login.ctp

@@ -1 +1 @@
 <?php echo $session->flash(); ?>
 
-<?php echo $form->create('User', array('action' => 'login')); ?>
+<?php echo $form->create('User', array('action' => 'login', 'class' => 'login')); ?>
 <fieldset>
 <legend><?php __('Login'); ?></legend>
@@ -11 +11 @@
 <?php 
   $signup = '';
+  echo $form->submit(__('Login', true));
+  echo $html->link(__('Forgot your password', true), 'password');
   if ($register) {
-    $signup = $html->link(__('Sign Up', true), 'register');
+    echo $html->link(__('Sign Up', true), 'register');
   }
-  echo $html->tag('ul', 
-    $html->tag('li', $form->submit(__('Login', true)), array('escape' => false))
-    . $html->tag('li', $html->link(__('Forgot your password', true), 'password'), array('escape' => false))
-    . $signup,
-    array('class' => 'buttons', 'escape' => false));
   echo $form->end();
+  $script = <<<'JS'
+(function($) {
+  $(document).ready(function() {
+    $(':submit').button();
+    $('.message').addClass("ui-widget ui-corner-all ui-state-highlight");
+  });
+})(jQuery);
+JS;
+  echo $this->Html->scriptBlock($script, array('inline' => false));
 ?>

webroot/css/default/_form.sass

@@ -35 +35 @@
     border: 0
     > legend
+      color: white
+      +column(6, true)
       font-family: Ubuntu-bold
-      width: 81.5%
-      border-bottom: 1px solid darken(white, 10%)
+      text-align: right
     > div
       padding: 5px 0
@@ -81 +82 @@
   > .submit, > div > .submit
     +prepend(6)
+
+form.login
+  +column(6)
+  +prepend(8)
+  margin: 20px 0 30px 0
+  legend
+    text-align: left
+    margin: 0
+    font-size: 15pt
+  fieldset
+    label
+      +column(6)
+      text-align: left
+    input[type=text],
+    input[type=password]
+      padding: 4px
+      clear: left
+      font-size: 15pt
+  > div.submit
+      display: inline-block
+      padding: 0 10px 0 0
+      input[type=submit]

webroot/css/default/_layout.sass

@@ -101 +101 @@
   display: block
   +border-radius(5px)
-  margin: 20px
   padding: 10px
   background-color: #efffd0
-  +linear-gradient(colour-stops(#efffd0, darken(#ffd, 20%)))
   border: 1px solid darken(#ffd, 20%)
-  +box-shadow(#cda, 2px, 2px, 1px)