From b0d87e5edfcb44015ee2d90b10da53fa8abc61df Mon Sep 17 00:00:00 2001
From: Corby Krick <skweeker@skweeker.net>
Date: Sun, 24 Mar 2013 16:31:45 -0500
Subject: [PATCH] Displaying errors on user login failures

---
 application/controllers/user.php |  6 ++--
 application/views/user/login.php | 52 +++++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/application/controllers/user.php b/application/controllers/user.php
index 93e1d631..285d0acd 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -305,13 +305,11 @@ class User extends CI_Controller {
 		$this->form_validation->set_rules('user_name', 'Username', 'required');
 		$this->form_validation->set_rules('user_password', 'Password', 'required');
 
-		$data = $query->row();
-
 
 		if ($this->form_validation->run() == FALSE)
 		{
 
-			//$data['page_title'] = Login;
+			$data['page_title'] = "Login";
 
 			$this->load->view('layout/header', $data);
 			$this->load->view('user/login');
@@ -324,7 +322,7 @@ class User extends CI_Controller {
 				$this->user_model->update_session($data->user_id);
 				redirect('dashboard');
 			} else {
-				$this->session->set_flashdata('notice', 'Incorrect username or password!');
+				$this->session->set_flashdata('error', 'Incorrect username or password!');
 				redirect('user/login');
 			}
 		}
diff --git a/application/views/user/login.php b/application/views/user/login.php
index b09a5df6..e6a28389 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -1,7 +1,57 @@
+<!-- JS -->
+
+	<script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
+	<script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+	<script type="text/javascript" src="<?php echo base_url() ;?>/js/jquery.jclock.js"></script>
+	<script type="text/javascript" src="<?php echo base_url() ;?>/js/radiohelpers.js"></script>
+
+	<link rel="stylesheet" type="text/css" href="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.css" media="screen" />
+
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+			$(".qsobox").fancybox({
+				'autoDimensions'	: false,
+				'width'         	: 700,
+				'height'        	: 300,
+				'transitionIn'		: 'fade',
+				'transitionOut'		: 'fade',
+				'type'				: 'iframe'
+			});
+
+			$(function($) {
+		      var options = {
+		        utc: true
+		      }
+		      $('.input_time').jclock(options);
+		    });
+		});
+
+	</script>
+
 <div id="container">
+
+
+<?php if($this->session->flashdata('notice') != '') { ?>
+<div class="alert-message info">
+        <?php echo $this->session->flashdata('notice'); ?>
+</div>
+<?php } ?>
+
+<?php if($this->session->flashdata('error') != '') { ?>
+<div class="alert-message error">
+        <?php echo $this->session->flashdata('error'); ?>
+</div>
+<?php } ?>
+
+<?php if(validation_errors()) { ?>
+<div class="alert-message error">
+        <?php echo validation_errors(); ?>
+</div>
+<?php } ?>
+
 <h2>Log in</h2>
 
-<?php echo validation_errors(); ?>
 
 <form method="post" action="<?php echo site_url('user/login'); ?>" name="users">
 <table>