Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

-added new login screen

Browse source
This commit is contained in:
martin 2011-01-29 13:47:06 -05:00
parent 43c66825b4
commit 7c70385528
5 changed files with 36 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/controllers/LoginController.php
View file

@ -10,6 +10,8 @@ class LoginController extends Zend_Controller_Action
public function indexAction() 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()) if(Zend_Auth::getInstance()->hasIdentity())
{ {
$this->_redirect('Nowplaying'); $this->_redirect('Nowplaying');

3
application/forms/Login.php
View file

@ -11,6 +11,7 @@ class Application_Form_Login extends Zend_Form
// Add username element // Add username element
$this->addElement('text', 'username', array( $this->addElement('text', 'username', array(
'label' => 'Username:', 'label' => 'Username:',
'class' => 'input_text',
'required' => true, 'required' => true,
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
@ -21,6 +22,7 @@ class Application_Form_Login extends Zend_Form
// Add password element // Add password element
$this->addElement('password', 'password', array( $this->addElement('password', 'password', array(
'label' => 'Password:', 'label' => 'Password:',
'class' => 'input_text',
'required' => true, 'required' => true,
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
@ -32,6 +34,7 @@ class Application_Form_Login extends Zend_Form
$this->addElement('submit', 'submit', array( $this->addElement('submit', 'submit', array(
'ignore' => true, 'ignore' => true,
'label' => 'Login', 'label' => 'Login',
'class' => 'ui-button ui-widget ui-state-default ui-button-text-only'
)); ));
} }

2
application/layouts/scripts/login.phtml
View file

@ -9,7 +9,7 @@
</head> </head>
<body> <body>
<div id="login"><?php echo $this->layout()->content ?></div> <?php echo $this->layout()->content ?>
</body> </body>
</html> </html>

15
application/views/scripts/login/index.phtml
View file

@ -1,3 +1,16 @@
<?php <?php
echo $this->form;
echo $this->errorMessage; echo $this->errorMessage;
?>
<div id="login-page">
<div class="login_box">
<div class="logobox">&nbsp;</div>
<h2>Login</h2>
<div id="login" class="login-content clearfix">
<p class="light">Please enter your user name and password</p>
<?php echo $this->form; ?>
</div>
</div>
<div class="footer"> Airtime&nbsp;1.6.0&nbsp;Copyright &copy; Sourcefabric o.p.s 2011. All rights reserved.<br/>
Maintained and distributed under GNU GPL v.2 by <a href="http://www.sourcefabric.org"> Sourcefabric o.p.s </a> </div>
</div>

35
public/css/styles.css
View file

@ -8,13 +8,17 @@ body {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
html, body {
body#login-page { height: 100%;
background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0;
margin: 60px 0 0 0;
padding: 0;
} }
#login-page {
background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0;
margin: 0;
padding: 0;
height:100%;
text-align:center;
}
h2 { h2 {
color: #000000; color: #000000;
@ -288,20 +292,16 @@ fieldset.plain {
text-indent: 3px; text-indent: 3px;
width:auto; width:auto;
} }
<<<<<<< HEAD
.auto-search { .auto-search {
background:#dddddd url(images/search_auto_bg.png) no-repeat 0 0; background:#dddddd url(images/search_auto_bg.png) no-repeat 0 0;
text-indent:25px; text-indent:25px;
} }
=======
>>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b
.input_text_area { .input_text_area {
background:#dddddd url("images/input_bg.png") repeat-x scroll 0 0 ; background:#dddddd url("images/input_bg.png") repeat-x scroll 0 0 ;
border: 1px solid #5b5b5b; border: 1px solid #5b5b5b;
font-size: 13px; font-size: 13px;
text-indent: 3px; text-indent: 3px;
} }
<<<<<<< HEAD
.input_select { .input_select {
background-color: #DDDDDD; background-color: #DDDDDD;
border: 1px solid #5b5b5b; border: 1px solid #5b5b5b;
@ -312,8 +312,6 @@ fieldset.plain {
padding: 2px 2px 2px 0; padding: 2px 2px 2px 0;
vertical-align: top; vertical-align: top;
} }
=======
>>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b
label { label {
font-size:13px; font-size:13px;
color:#5b5b5b; color:#5b5b5b;
@ -415,7 +413,6 @@ dl.inline-list dd {
border-width: 0px 1px 0 1px; border-width: 0px 1px 0 1px;
} }
<<<<<<< HEAD
.DataTables_sort_wrapper .ui-icon { .DataTables_sort_wrapper .ui-icon {
display: block; display: block;
float: left; float: left;
@ -473,8 +470,6 @@ dl.inline-list dd {
margin-right:3px; margin-right:3px;
} }
=======
>>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b
/*----END Data Table----*/ /*----END Data Table----*/
fieldset { fieldset {
@ -493,17 +488,17 @@ input[type="checkbox"] {
padding:0; padding:0;
width:13px; width:13px;
height:13px; height:13px;
<<<<<<< HEAD
} }
/*---//////////////////// LOGIN ////////////////////---*/ /*---//////////////////// LOGIN ////////////////////---*/
.login_box { .login_box {
margin:0 auto 0 auto; margin: 0 auto 0 auto;
text-align:center; text-align:center;
width:420px; width:420px;
border:1px solid #181818; border:1px solid #181818;
border-width: 0 0 1px 0; border-width: 0 0 1px 0;
padding:0; padding:0;
padding-top:60px;
} }
.login_box h2 { .login_box h2 {
@ -643,7 +638,7 @@ dt.block-display, dd.block-display {
height: 28px; height: 28px;
margin-top:12px; margin-top:12px;
} }
.sticky { /*.sticky {
padding:0; padding:0;
width:100%; width:100%;
z-index:2000; z-index:2000;
@ -651,6 +646,8 @@ dt.block-display, dd.block-display {
top:0; top:0;
left:0; left:0;
margin-bottom:140px; margin-bottom:140px;
======= }*/
>>>>>>> c9c41762fe7a0764d107228d207f6b5ea8506d8b .sticky {
padding:0;
width:100%;
} }