From 1e4bcdf83106ed52d0a5aab3cb1ddee785331532 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 14 Sep 2011 17:50:00 -0400
Subject: [PATCH] CC-2814: Login error messages need to be highlighted

- done
- Recaptcha box and submit button is moved to center
---
 airtime_mvc/application/controllers/LoginController.php | 3 +++
 airtime_mvc/application/forms/Login.php                 | 2 +-
 airtime_mvc/application/views/scripts/login/index.phtml | 3 +--
 airtime_mvc/public/css/styles.css                       | 7 ++++++-
 airtime_mvc/public/js/airtime/login/login.js            | 5 ++++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index 7498a608b..d05eec225 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -18,6 +18,7 @@ class LoginController extends Zend_Controller_Action
         //uses separate layout without a navigation.
         $this->_helper->layout->setLayout('login');
         
+        $error = false;
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
         
@@ -73,12 +74,14 @@ class LoginController extends Zend_Controller_Action
                         Application_Model_Subjects::increaseLoginAttempts($username);
                         Application_Model_LoginAttempts::increaseAttempts($_SERVER['REMOTE_ADDR']);
                         $form = new Application_Form_Login();
+                        $error = true;
                     }
                 }
             }
         }
         
 		$this->view->message = $message;
+		$this->view->error = $error;
 		$this->view->form = $form;
 		$this->view->airtimeVersion = AIRTIME_VERSION;
 		$this->view->airtimeCopyright = AIRTIME_COPYRIGHT_DATE;
diff --git a/airtime_mvc/application/forms/Login.php b/airtime_mvc/application/forms/Login.php
index ead777f0d..52323a666 100644
--- a/airtime_mvc/application/forms/Login.php
+++ b/airtime_mvc/application/forms/Login.php
@@ -43,7 +43,7 @@ class Application_Form_Login extends Zend_Form
         $this->addElement('submit', 'submit', array(
             'ignore'   => true,
             'label'    => 'Login',
-            'class'      => 'ui-button ui-widget ui-state-default ui-button-text-only'
+            'class'      => 'ui-button ui-widget ui-state-default ui-button-text-only center'
         ));
 
     }
diff --git a/airtime_mvc/application/views/scripts/login/index.phtml b/airtime_mvc/application/views/scripts/login/index.phtml
index 090097f25..ea6c24e41 100644
--- a/airtime_mvc/application/views/scripts/login/index.phtml
+++ b/airtime_mvc/application/views/scripts/login/index.phtml
@@ -1,9 +1,8 @@
 <div class="login_box">
     <div class="logobox">&nbsp;</div>
         <h2>Login</h2>
-    
     <div id="login" class="login-content clearfix">
-        <p class="light"><?php echo $this->message; ?></p>
+        <p class="light" style='<?php echo $this->error?"color:#902d2d;font-size:11px;padding:2px 4px;background:#c6b4b4;margin-bottom:2px;border:1px solid #c83f3f;":""?>'><?php echo $this->message; ?></p>
         <?php echo $this->form; ?>
     </div>
 </div>
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index fa9ef6ae2..91c310945 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -1986,4 +1986,9 @@ dt.block-display.info-block {
 
 .stream-setting-content {
 	margin-top:-1px;
-}
\ No newline at end of file
+}
+
+.login-content dd .center {
+	margin-left: 42%;
+}
+
diff --git a/airtime_mvc/public/js/airtime/login/login.js b/airtime_mvc/public/js/airtime/login/login.js
index ad45c0a22..478b1a978 100644
--- a/airtime_mvc/public/js/airtime/login/login.js
+++ b/airtime_mvc/public/js/airtime/login/login.js
@@ -1,3 +1,6 @@
-$(document).ready(function(){
+$(window).load(function(){
     $("#username").focus()
+    
+    var captcha = $("#captcha-label").next()
+    captcha.css("padding-left", (((captcha.parents('div:eq(0)').width()-captcha.width())/2+"px")));
 })
\ No newline at end of file