Merge pull request #98 from kishor10d/stucture_user

Restructured the user views into folders

Author: kishor10d

application/controllers/Error_404

@@ -34,7 +34,7 @@ class Errorr_404 extends CI_Controller
 
         if(!isset($isLoggedIn) || $isLoggedIn != TRUE)
         {
-            $this->load->view('login');
+            $this->load->view('users/login');
         }
         else
         {

application/controllers/Login.php

@@ -35,7 +35,7 @@ function isLoggedIn()
 
         if(!isset($isLoggedIn) || $isLoggedIn != TRUE)
         {
-            $this->load->view('login');
+            $this->load->view('users/login');
         }
         else
         {
@@ -109,7 +109,7 @@ public function forgotPassword()
 
         if(!isset($isLoggedIn) || $isLoggedIn != TRUE)
         {
-            $this->load->view('forgotPassword');
+            $this->load->view('users/forgotPassword');
         }
         else
         {
@@ -203,7 +203,7 @@ function resetPasswordConfirmUser($activation_id, $email)
 
         if ($is_correct == 1)
         {
-            $this->load->view('newPassword', $data);
+            $this->load->view('users/newPassword', $data);
         }
         else
         {

application/controllers/User.php

@@ -28,7 +28,7 @@ public function index()
     {
         $this->global['pageTitle'] = 'CodeInsect : Dashboard';
 
-        $this->loadViews("dashboard", $this->global, NULL , NULL);
+        $this->loadViews("general/dashboard", $this->global, NULL , NULL);
     }
 
     /**
@@ -55,7 +55,7 @@ function userListing()
 
             $this->global['pageTitle'] = 'CodeInsect : User Listing';
 
-            $this->loadViews("users", $this->global, $data, NULL);
+            $this->loadViews("users/users", $this->global, $data, NULL);
         }
     }
 
@@ -75,7 +75,7 @@ function addNew()
 
             $this->global['pageTitle'] = 'CodeInsect : Add New User';
 
-            $this->loadViews("addNew", $this->global, $data, NULL);
+            $this->loadViews("users/addNew", $this->global, $data, NULL);
         }
     }
 
@@ -171,7 +171,7 @@ function editOld($userId = NULL)
 
             $this->global['pageTitle'] = 'CodeInsect : Edit User';
 
-            $this->loadViews("editOld", $this->global, $data, NULL);
+            $this->loadViews("users/editOld", $this->global, $data, NULL);
         }
     }
 
@@ -271,7 +271,7 @@ function pageNotFound()
     {
         $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
 
-        $this->loadViews("404", $this->global, NULL, NULL);
+        $this->loadViews("general/404", $this->global, NULL, NULL);
     }
 
     /**
@@ -308,7 +308,7 @@ function loginHistoy($userId = NULL)
 
             $this->global['pageTitle'] = 'CodeInsect : User Login History';
 
-            $this->loadViews("loginHistory", $this->global, $data, NULL);
+            $this->loadViews("users/loginHistory", $this->global, $data, NULL);
         }        
     }
 
@@ -321,7 +321,7 @@ function profile($active = "details")
         $data["active"] = $active;
 
         $this->global['pageTitle'] = $active == "details" ? 'CodeInsect : My Profile' : 'CodeInsect : Change Password';
-        $this->loadViews("profile", $this->global, $data, NULL);
+        $this->loadViews("users/profile", $this->global, $data, NULL);
     }
 
     /**

application/libraries/BaseController.php

@@ -125,7 +125,7 @@ function loadThis() {
 		$this->global ['pageTitle'] = 'CodeInsect : Access Denied';
 
 		$this->load->view ( 'includes/header', $this->global );
-		$this->load->view ( 'access' );
+		$this->load->view ( 'general/access' );
 		$this->load->view ( 'includes/footer' );
 	}