From 5192d77adb42b80265296f551417a7672dbe7c85 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 29 Mar 2017 10:45:36 +0530
Subject: [PATCH] changes by surender in view pages

---
 application/views/addNew.php             |  6 +++---
 application/views/addRawMaterial.php     |  8 ++++----
 application/views/addemployee.php        | 14 +++++++-------
 application/views/editOld.php            |  9 +++++----
 application/views/editOldRawmaterial.php |  4 ++--
 application/views/editOldemployee.php    |  8 ++++----
 application/views/employeeListing.php    |  6 +++---
 application/views/users.php              |  2 +-
 application/views/viewrawmaterial.php    | 21 +++++++++++----------
 9 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/application/views/addNew.php b/application/views/addNew.php
index e8662662..9ebb47e4 100644
--- a/application/views/addNew.php
+++ b/application/views/addNew.php
@@ -22,7 +22,7 @@
                 
                 <div class="box box-primary">
                     <div class="box-header">
-                        <center><h3 class="box-title">Enter User Details</h3></center>
+                        <center><h3 class="box-title">Add User Details</h3></center>
                     </div><!-- /.box-header -->
                     <!-- form start -->
                     
@@ -87,8 +87,8 @@
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-primary" value="Submit" />
-                            <input type="reset" class="btn btn-default" value="Reset" />
+                            <input type="submit" class="btn btn-info" value="Submit" />
+                            <input type="reset" class="btn btn-info" value="Cancel" />
                         </div>
                     </form>
                 </div>
diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php
index 4131cb33..9505771c 100644
--- a/application/views/addRawMaterial.php
+++ b/application/views/addRawMaterial.php
@@ -2,7 +2,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>Add Raw Material </center>
+        <center>Raw Material List </center>
         
       </h1>
 	 
@@ -22,7 +22,7 @@
                 
                 <div class="box box-primary">
                     <div class="box-header">
-                        <center><h3 class="box-title">Enter Raw Material Details</h3></center>
+                        <center><h3 class="box-title">Add Raw Material Details</h3></center>
                     </div><!-- /.box-header -->
                     <!-- form start -->
                     
@@ -90,8 +90,8 @@
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-primary" value="Submit" />
-                            <input type="reset" class="btn btn-default" value="Reset" />
+                            <input type="submit" class="btn btn-info" value="Submit" />
+                            <input type="reset" class="btn btn-info" value="Cancel" />
                         </div>
                     </form>
                 </div>
diff --git a/application/views/addemployee.php b/application/views/addemployee.php
index 65299da5..a434af27 100644
--- a/application/views/addemployee.php
+++ b/application/views/addemployee.php
@@ -2,7 +2,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <CENTER>EMPLOYEE DETAILS<CENTER>
+          <CENTER> Employee Details</CENTER>
          
       </h1>
 	  
@@ -10,7 +10,7 @@
     
     <section class="content">
 	<div style="text-align:right;">
-    <a href="<?php echo base_url() ?>employeeListing" class="btn btn-info" value="Back"/>Back</a>
+    <a href="<?php echo base_url() ?>employeeListing" class="btn btn-info" value="Back">Back</a>
 	</div>
 	<br/>
         <div class="row">
@@ -22,7 +22,7 @@
                 
                 <div class="box box-primary">
                     <div class="box-header">
-                        <CENTER><h3 class="box-title">Enter Employee Details</h3></CENTER>
+                        <CENTER><h3 class="box-title">Add Employee Details</h3></CENTER>
                     </div><!-- /.box-header -->
                     <!-- form start -->
                     
@@ -47,7 +47,7 @@
                                 <div class="col-md-6">
                                     <div class="form-group">
                                         <label for="LastName">Last Name</label>
-                                        <input type="text" class="form-control required " id="LastName" pattern="[A-Za-z]{10} name="LastName" maxlength="255">
+                                        <input type="text" class="form-control required " id="LastName" pattern="[A-Za-z]{10}" name="LastName" maxlength="255">
                                     </div>
                                 </div>
 								 <div class="col-md-6">
@@ -66,7 +66,7 @@
                                     
 									 <div class="col-md-6">
                                     <div class="form-group">
-                                        <label for="EmailId">Email Id</label>
+                                        <label for="EmailId">Email ID</label>
                                         <input type="email" class="form-control email required " id="EmailId"  name="EmailId" maxlength="255">
                                     </div>
                                 </div>
@@ -160,8 +160,8 @@
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-primary" value="Submit" />
-                            <input type="reset" class="btn btn-default" value="Reset" />
+                            <input type="submit" class="btn btn-info" value="Submit" />
+                            <input type="reset" class="btn btn-info" value="Cancel" />
                         </div>
                     </form>
                 </div>
diff --git a/application/views/editOld.php b/application/views/editOld.php
index 51c39e42..cc4c10a7 100644
--- a/application/views/editOld.php
+++ b/application/views/editOld.php
@@ -34,7 +34,7 @@ if(!empty($userInfo))
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php echo base_url() ?>userListing" class="btn btn-info" value="Back"/>Back</a>
+    <a href="<?php echo base_url() ?>userListing" class="btn btn-info" value="Back">Back</a>
 	</div>
 	<br/>
         <div class="row">
@@ -46,7 +46,7 @@ if(!empty($userInfo))
                 
                 <div class="box box-primary">
                     <div class="box-header">
-                        <center><h3 class="box-title">View User Details</h3></center>
+                        <center><h3 class="box-title">Edit User Details</h3></center>
                     </div><!-- /.box-header -->
                     <!-- form start -->
                     
@@ -112,13 +112,14 @@ if(!empty($userInfo))
 							
 							 
                             </div>
-                        </div><!-- /.box-body -->
+                        <!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
                             <input type="submit" class="btn btn-info" value="Submit" />
                             <input type="reset" class="btn btn-info" value="Cancel" />
                         </div>
                     </form>
+            </div>
                 </div>
             </div>
             <div class="col-md-4">
@@ -150,7 +151,7 @@ if(!empty($userInfo))
                     </div>
                 </div>
             </div>
-        </div>    
+          
     </section>
 </div>
 
diff --git a/application/views/editOldRawmaterial.php b/application/views/editOldRawmaterial.php
index d7305bfe..c4d48a7e 100644
--- a/application/views/editOldRawmaterial.php
+++ b/application/views/editOldRawmaterial.php
@@ -27,7 +27,7 @@ if(!empty($userRecords))
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-       <center> RAW MATERIAL DETAILS</center>
+       <center>Raw Material List</center>
         
       </h1>
     </section>
@@ -107,7 +107,7 @@ if(!empty($userRecords))
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-primary" value="Submit" />
+                            <input type="submit" class="btn btn-info" value="Submit" />
                            <!-- <input type="reset" class="btn btn-default" value="Reset" />-->
                         </div>
                     </form>
diff --git a/application/views/editOldemployee.php b/application/views/editOldemployee.php
index eac0f87e..d265ae2b 100644
--- a/application/views/editOldemployee.php
+++ b/application/views/editOldemployee.php
@@ -67,7 +67,7 @@ if(!empty($userRecords))
                 
                 <div class="box box-primary">
                     <div class="box-header">
-                       <center> <h3 class="box-title">Enter Employee Details</h3></center>
+                       <center> <h3 class="box-title">Edit Employee Details</h3></center>
                     </div><!-- /.box-header -->
                     <!-- form start -->
                     
@@ -105,7 +105,7 @@ if(!empty($userRecords))
                                     
 									 <div class="col-md-6">
                                     <div class="form-group">
-                                        <label for="EmailId">Email Id</label>
+                                        <label for="EmailId">Email ID</label>
                                         <input type="email" class="form-control email required " id="EmailId"  name="EmailId" maxlength="255" value="<?php echo $EmailId;?>">
                                     </div>
                                 </div>
@@ -202,8 +202,8 @@ if(!empty($userRecords))
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-primary" value="Submit" />
-                            <input type="reset" class="btn btn-default" value="Reset" />
+                            <input type="submit" class="btn btn-info" value="Submit" />
+                            <input type="reset" class="btn btn-info" value="Cancel" />
                         </div>
 						</div>
                     </form>
diff --git a/application/views/employeeListing.php b/application/views/employeeListing.php
index 73b6c44e..c92b088a 100644
--- a/application/views/employeeListing.php
+++ b/application/views/employeeListing.php
@@ -10,7 +10,7 @@
         <div class="row">
             <div class="col-xs-12 text-right">
                 <div class="form-group">
-                    <a class="btn btn-primary" href="<?php echo base_url(); ?>addemployee">Add sNew</a>
+                    <a class="btn btn-primary" href="<?php echo base_url(); ?>addemployee">Add New</a>
                 </div>
             </div>
         </div>
@@ -38,7 +38,7 @@
 					  <th>Last Name</th>
 					  <th>Date of Birth</th>
 					  <th>Contact Number</th>
-					  <th>Email Id</th>
+					  <th>Email ID</th>
 					  <th>Date of Joining</th>
 					  <th>Role</th>
 					  <th>Address1</th>
@@ -47,7 +47,7 @@
 					  <th>City</th>
 					  <th>State</th>
 					  <th>Pin</th>
-					  <th>Department Name</th>
+					  <th>DepartmentName</th>
 					   <th>User_Comments</th>
                       <th>Edit</th>
                       
diff --git a/application/views/users.php b/application/views/users.php
index 43fbece3..732c412f 100644
--- a/application/views/users.php
+++ b/application/views/users.php
@@ -18,7 +18,7 @@
             <div class="col-xs-12">
               <div class="box">
                 <div class="box-header">
-                    <center><h3 class="box-title">Users List</h3></center>
+                    <center><h3 class="box-title">User Management List</h3></center>
                     <div class="box-tools">
                         <form action="<?php echo base_url() ?>userListing" method="POST" id="searchList">
                             <div class="input-group">
diff --git a/application/views/viewrawmaterial.php b/application/views/viewrawmaterial.php
index 238fae40..eab52718 100644
--- a/application/views/viewrawmaterial.php
+++ b/application/views/viewrawmaterial.php
@@ -27,14 +27,14 @@ if(!empty($userRecords))
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>Raw Material Details</center>
+        <center>Raw Material List</center>
         
       </h1>
     </section>
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php echo base_url() ?>rawmaterialdetails/rawmaterialListing" class="btn btn-info" value="Back"/>Back</a>
+    <a href="<?php echo base_url() ?>rawmaterialdetails/rawmaterialListing" class="btn btn-info" value="Back">Back</a>
 	</div>
 	<br/>
         <div class="row">
@@ -60,7 +60,7 @@ if(!empty($userRecords))
 									 
 									<tbody>
 									<tr>
-									<td><label for="MaterialCode">MaterialCode</label></td>
+									<td><label for="MaterialCode">Material Code</label></td>
                                         <td><?php echo $MaterialCode; ?></td>
 									</tr>
 									
@@ -74,7 +74,7 @@ if(!empty($userRecords))
                                 
                                 
                                     <tr>
-                                      <td>  <label for="MaterialType">MaterialType</label></td>
+                                      <td>  <label for="MaterialType">Material Type</label></td>
                                         <td><?php echo $MaterialType;?></td>
                                     </tr>
                                
@@ -84,11 +84,11 @@ if(!empty($userRecords))
                                       <td>  <label for="SupplierID">Supplier ID</label></td>
                                          <td> <?php echo $SupplierID?></td>
                                     </tr>
-									
+									</tbody>
                                     </div>
-                                </div>
+                                 
                                     
-								   </tbody>
+								   
                             </div>
 							</table>
 							
@@ -98,7 +98,7 @@ if(!empty($userRecords))
                             <input type="submit" class="btn btn-primary" value="Submit" />
                             <input type="reset" class="btn btn-default" value="Reset" />
                         </div>-->
-                    </form>
+                    
                 </div>
             </div>
             <div class="col-md-4">
@@ -131,7 +131,8 @@ if(!empty($userRecords))
                 </div>
             </div>
         </div>    
-    </section>
+   
+</div>
+ </section>
 </div>
-
 <script src="<?php echo base_url(); ?>assets/js/editUser.js" type="text/javascript"></script>
\ No newline at end of file