Login view

application/controllers/UserController.php

@@ -7,6 +7,9 @@ class UserController extends Zend_Controller_Action
 	 */
     public function loginAction()
     {
+    	$this->view->headLink()
+    		->appendStylesheet('/themes/default/styles/signin.css', 'all');
+
     	$this->view->inlineScript()
     		->appendFile('/libs/jquery/jquery-1.10.1.min.js')
     		->appendFile('/libs/jquery/jquery.infieldlabel.min.js');
@@ -74,14 +77,14 @@ class UserController extends Zend_Controller_Action
     {
     	$this->_helper->layout()->disableLayout();
     	$this->_helper->viewRenderer->setNoRender(true);
-    
+
     	$lang = $this->getRequest()->getParam('lang', null);
-    
+
     	$auth = Zend_Auth::getInstance();
     	$identity = $auth->getIdentity();
-    
+
     	$identity->langtmp = $lang;
-    
+
     	$auth->getStorage()->write($identity);
     }
 

application/views/default/scripts/footer.phtml

@@ -1,9 +1,6 @@
-<<<<<<< .working
 <div class="container">
-<p class="text-muted credit"> &copy; <?=date('Y')?> <a href="http://www.scores-decisions.com">Scores & Décisions</a>.</p>
-</div>=======
-<p class="info">
-<a href="http://www.scores-decisions.com/">Scores & Décisions SAS</a>
-<img class='flag' id='fr' src="/themes/default/images/drapeaux/fr.png"/>
-<img class='flag' id='en' src="/themes/default/images/drapeaux/en.png"/>
-</p>>>>>>>> .merge-right.r987
+<p class="text-muted credit"> &copy; <?=date('Y')?> <a href="http://www.scores-decisions.com">Scores & Décisions</a>.
+<img class="flag" id="fr" src="/themes/default/images/drapeaux/fr.png"/>
+<img class="flag" id="en" src="/themes/default/images/drapeaux/en.png"/>
+</p>
+</div>

application/views/default/scripts/user/login.phtml

@@ -23,6 +23,10 @@
 
     </div>
 
+    <div id="footer">
+ 	<?php echo $this->render('footer.phtml'); ?>
+ 	</div>
+
 	<?php echo $this->inlineScript(); ?>
 </body>
 </html>

public/themes/default/styles/signin.css

@@ -0,0 +1,73 @@
+body {
+  background-color: #eee;
+}
+
+html,
+body {
+  height: 100%;
+  /* The html and body elements cannot have any padding or margin. */
+}
+
+/* Wrapper for page content to push down footer */
+#wrap {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  /* Negative indent footer by its height */
+  margin: 0 auto -60px;
+  /* Pad bottom by footer height */
+  padding: 0 0 60px;
+}
+
+#wrap > .container {
+  padding: 60px 15px 0;
+}
+.container .credit {
+  margin: 20px 0;
+}
+
+/* Set the fixed height of the footer here */
+#footer {
+  height: 60px;
+  background-color: #f5f5f5;
+}
+
+#footer > .container {
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+.form-signin {
+  max-width: 330px;
+  padding: 15px;
+  margin: 0 auto;
+}
+.form-signin .form-signin-heading,
+.form-signin .checkbox {
+  margin-bottom: 10px;
+}
+.form-signin .checkbox {
+  font-weight: normal;
+}
+.form-signin .form-control {
+  position: relative;
+  font-size: 16px;
+  height: auto;
+  padding: 10px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+.form-signin .form-control:focus {
+  z-index: 2;
+}
+.form-signin input[type="text"] {
+  margin-bottom: -1px;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.form-signin input[type="password"] {
+  margin-bottom: 10px;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}