From 7c703855283e7fd79332416096d5b7d7ce4a8d78 Mon Sep 17 00:00:00 2001 From: martin Date: Sat, 29 Jan 2011 13:47:06 -0500 Subject: [PATCH] -added new login screen --- application/controllers/LoginController.php | 2 ++ application/forms/Login.php | 3 ++ application/layouts/scripts/login.phtml | 2 +- application/views/scripts/login/index.phtml | 15 ++++++++- public/css/styles.css | 35 ++++++++++----------- 5 files changed, 36 insertions(+), 21 deletions(-) diff --git a/application/controllers/LoginController.php b/application/controllers/LoginController.php index 18a27cef3..fc2e847bf 100644 --- a/application/controllers/LoginController.php +++ b/application/controllers/LoginController.php @@ -10,6 +10,8 @@ class LoginController extends Zend_Controller_Action public function indexAction() { + $this->view->headLink()->appendStylesheet('/css/redmond/jquery-ui-1.8.8.custom.css'); + $this->view->headLink()->appendStylesheet('/css/styles.css'); if(Zend_Auth::getInstance()->hasIdentity()) { $this->_redirect('Nowplaying'); diff --git a/application/forms/Login.php b/application/forms/Login.php index 82aa7c67b..4a4cfbd4b 100644 --- a/application/forms/Login.php +++ b/application/forms/Login.php @@ -11,6 +11,7 @@ class Application_Form_Login extends Zend_Form // Add username element $this->addElement('text', 'username', array( 'label' => 'Username:', + 'class' => 'input_text', 'required' => true, 'filters' => array('StringTrim'), 'validators' => array( @@ -21,6 +22,7 @@ class Application_Form_Login extends Zend_Form // Add password element $this->addElement('password', 'password', array( 'label' => 'Password:', + 'class' => 'input_text', 'required' => true, 'filters' => array('StringTrim'), 'validators' => array( @@ -32,6 +34,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' )); } diff --git a/application/layouts/scripts/login.phtml b/application/layouts/scripts/login.phtml index 39793ecd3..d11302abf 100644 --- a/application/layouts/scripts/login.phtml +++ b/application/layouts/scripts/login.phtml @@ -9,7 +9,7 @@ -
layout()->content ?>
+layout()->content ?> diff --git a/application/views/scripts/login/index.phtml b/application/views/scripts/login/index.phtml index c9df1898e..2e8ebc6b4 100644 --- a/application/views/scripts/login/index.phtml +++ b/application/views/scripts/login/index.phtml @@ -1,3 +1,16 @@ form; echo $this->errorMessage; +?> +
+ +
Airtime 1.6.0 Copyright © Sourcefabric o.p.s 2011. All rights reserved.
+ Maintained and distributed under GNU GPL v.2 by Sourcefabric o.p.s
+
diff --git a/public/css/styles.css b/public/css/styles.css index 0dac4cfad..76fbcf215 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -8,13 +8,17 @@ body { margin: 0; padding: 0; } - -body#login-page { - background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0; - margin: 60px 0 0 0; - padding: 0; +html, body { +height: 100%; } +#login-page { + background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0; + margin: 0; + padding: 0; + height:100%; + text-align:center; +} h2 { color: #000000; @@ -288,20 +292,16 @@ fieldset.plain { text-indent: 3px; width:auto; } -<<<<<<< HEAD .auto-search { background:#dddddd url(images/search_auto_bg.png) no-repeat 0 0; text-indent:25px; } -======= ->>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b .input_text_area { background:#dddddd url("images/input_bg.png") repeat-x scroll 0 0 ; border: 1px solid #5b5b5b; font-size: 13px; text-indent: 3px; } -<<<<<<< HEAD .input_select { background-color: #DDDDDD; border: 1px solid #5b5b5b; @@ -312,8 +312,6 @@ fieldset.plain { padding: 2px 2px 2px 0; vertical-align: top; } -======= ->>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b label { font-size:13px; color:#5b5b5b; @@ -415,7 +413,6 @@ dl.inline-list dd { border-width: 0px 1px 0 1px; } -<<<<<<< HEAD .DataTables_sort_wrapper .ui-icon { display: block; float: left; @@ -473,8 +470,6 @@ dl.inline-list dd { margin-right:3px; } -======= ->>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b /*----END Data Table----*/ fieldset { @@ -493,17 +488,17 @@ input[type="checkbox"] { padding:0; width:13px; height:13px; -<<<<<<< HEAD } /*---//////////////////// LOGIN ////////////////////---*/ .login_box { - margin:0 auto 0 auto; + margin: 0 auto 0 auto; text-align:center; width:420px; border:1px solid #181818; border-width: 0 0 1px 0; padding:0; + padding-top:60px; } .login_box h2 { @@ -643,7 +638,7 @@ dt.block-display, dd.block-display { height: 28px; margin-top:12px; } -.sticky { +/*.sticky { padding:0; width:100%; z-index:2000; @@ -651,6 +646,8 @@ dt.block-display, dd.block-display { top:0; left:0; margin-bottom:140px; -======= ->>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b +}*/ +.sticky { + padding:0; + width:100%; } \ No newline at end of file