1 files changed, 25 insertions, 19 deletions
diff --git a/site/app/views/users/login.thtml b/site/app/views/users/login.thtml
index a3c6e83..106a27e 100644
--- a/site/app/views/users/login.thtml
+++ b/site/app/views/users/login.thtml
@@ -38,13 +38,13 @@
  * ***** END LICENSE BLOCK ***** */ 
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
     
+    <div id="content-main">
+
 <?php
     //banner warning messages for display
     if(isset($_GET['m'])) {
@@ -59,37 +59,40 @@
             $warn_msg = null;
         }
     }
-    if (!empty($warn_msg))
-        echo $this->renderElement('notification', array('type' => 'info', 'description' => $warn_msg));
+    if (!empty($warn_msg)): 
 ?>
+<div class="amo-form-error"><?=$warn_msg?></div>
+<?php endif; ?>
 
-<?php if ($loginerror)
-        echo $this->renderElement('notification', array('type' => 'error', 'description' => _('error_username_or_pw_wrong')));
-?>
+<?php if ($loginerror): ?>
+<div class="amo-form-error"><?php echo _('error_username_or_pw_wrong'); ?></div>
 <p></p>
-<form action="<?=$html->entities($html->url())?>" method="post" class="amo-form highlight">
+<?php endif; ?>
+<form action="<?=$html->entities($html->url())?>" method="post" class="amo-form corner-box">
     <?=$html->hiddenSession() ?>       
     <div>
         <? 
-        $redir = (isset($_GET['to'])) ? urldecode($_GET['to']) : urldecode(@$this->data['Login']['referer']);
+        $redir = (isset($_GET['to']) ? urldecode($_GET['to']) : $this->controller->referer('/', true));
         $redir = $html->entities($redir);
-        $redir = html_entity_decode($redir);
         echo $html->hidden('Login/referer', array('value' => $redir));
         ?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="LoginEmail"><?=_('user_form_email')?></label>
         <?=$html->input('Login/email') ?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="LoginPassword"><?=_('user_form_password')?></label>
         <?=$html->password('Login/password') ?>
     </div>
-    <div class="container">
+    
+    <div>
+        
         <?=$html->input('Login/remember', array('type' => 'checkbox', 'value' => '1', 'class' => 'amo-remember'))?>
         <label for="LoginRemember"><?=___('user_form_remember_me')?></label>
     </div>
-    <div class="container">
+    
+    <div>
         <?=$html->submit(_('user_form_submit_login'), array('class'=>'amo-submit')); ?>
     </div>
 </form>
@@ -98,8 +101,11 @@
     $(document).ready(function() { $('#LoginEmail').focus(); });
 </script>
 
+<div class="divider"><hr/></div>
+
 <ul>
     <li><?= $html->link(_('user_login_register_link'), '/users/register'); ?></li>
     <li><?= $html->link(_('user_pwreset_link'), '/users/pwreset',null,null,false); ?></li>
 </ul>
-</div><!-- /.primary -->
+    </div>
+</div><!-- /#content -->