From 54e082338a6bb1014916c0d3ad8fdf63c1e2eed6 Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Fri, 17 Aug 2018 12:58:57 +0530
Subject: [PATCH 1/3] master ui changes

---
 Apollo/assets/views/activity.html                | 4 ++--
 Apollo/assets/views/add_income_expense.html      | 6 +++---
 Apollo/assets/views/certificate/certificate.html | 4 ++--
 Apollo/assets/views/status.html                  | 4 ++--
 Apollo/assets/views/subjectMaster.html           | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Apollo/assets/views/activity.html b/Apollo/assets/views/activity.html
index c596e0ed..f81656f0 100755
--- a/Apollo/assets/views/activity.html
+++ b/Apollo/assets/views/activity.html
@@ -85,12 +85,12 @@
                     <input type="submit" value="Submit" ladda="ldloading1.zoom_in" tabindex="9" class="btn btn-wide btn-success" data-style="zoom-in"/>
 
             </div>-->
-                <div class="col-md-2" style="padding-top: 2.3%;">
+                <div class="col-md-2" >
                     <div class="pull-right">
                         <!--<button type="submit" ladda="ldloading1.zoom_in" tabindex="4" class="btn btn-wide btn-success" data-style="zoom-in"/>
                         Submit
                     </button>-->
-                        <button type="submit" ladda="ldloading.zoom_in" tabindex="4" class="btn btn-wide btn-success" data-style="zoom-in">
+                        <button style="margin-top:20px;" type="submit" ladda="ldloading.zoom_in" tabindex="4" class="btn btn-wide btn-success" data-style="zoom-in">
                             Add
                         </button>
                     </div>
diff --git a/Apollo/assets/views/add_income_expense.html b/Apollo/assets/views/add_income_expense.html
index b53df057..6c5b0b92 100644
--- a/Apollo/assets/views/add_income_expense.html
+++ b/Apollo/assets/views/add_income_expense.html
@@ -36,9 +36,9 @@
                                         <span class="error text-small block" ng-if="Form.StatusName.$dirty && Form.StatusName.$error.required">Account Name is required</span>
                                         <span class="error text-small block" ng-if="Form.StatusName.$dirty && Form.StatusName.$error.pattern">Invalid Account Name </span>
                                     </div>
-                                    <div class="col-md-2" style="padding-top: 2.3%;">
+                                    <div class="col-md-2" >
                                         <div class="pull-right">
-                                            <button style="margin-top:-6px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in">
+                                            <button style="margin-top:20px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in">
                                        Add
                                     </button>
                                         </div>
@@ -68,7 +68,7 @@
                                 <span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"> </span>
                             </th>
                             <th>Status</th>
-                            <th></th>
+                            <th>Action</th>
                         </tr>
                     </thead>
                    <!--  {{statusInfo}} -->
diff --git a/Apollo/assets/views/certificate/certificate.html b/Apollo/assets/views/certificate/certificate.html
index 29766c2a..444e093e 100755
--- a/Apollo/assets/views/certificate/certificate.html
+++ b/Apollo/assets/views/certificate/certificate.html
@@ -65,9 +65,9 @@
                                 </div>
 
                             </div>-->
-                            <div class="col-md-2" style="padding-top: 2.3%;">
+                            <div class="col-md-2">
                                 <div class="pull-right">
-                                    <button style="margin-top:-6px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in" >
+                                    <button style="margin-top:20px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in" >
                                         Add
                                     </button>
                                     <!-- <button type="submit" class="btn btn-success btn-o" tabindex="8">
diff --git a/Apollo/assets/views/status.html b/Apollo/assets/views/status.html
index 75ad9c77..14360089 100755
--- a/Apollo/assets/views/status.html
+++ b/Apollo/assets/views/status.html
@@ -36,9 +36,9 @@
                                         <span class="error text-small block" ng-if="Form.StatusName.$dirty && Form.StatusName.$error.required">Status name is required</span>
                                         <span class="error text-small block" ng-if="Form.StatusName.$dirty && Form.StatusName.$error.pattern">Invalid Status name </span>
                                     </div>
-                                    <div class="col-md-2" style="padding-top: 2.3%;">
+                                    <div class="col-md-2" >
                                         <div class="pull-right">
-                                            <button style="margin-top:-6px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in">
+                                            <button style="margin-top:20px;" type="submit" ladda="ldloading1.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in">
                                        Add
                                     </button>
                                         </div>
diff --git a/Apollo/assets/views/subjectMaster.html b/Apollo/assets/views/subjectMaster.html
index 26c0df4c..7a1721bd 100755
--- a/Apollo/assets/views/subjectMaster.html
+++ b/Apollo/assets/views/subjectMaster.html
@@ -71,7 +71,7 @@
 
                                                     <th>Status</th>
 
-                                                    <th></th>
+                                                    <th>Action</th>
 
                                                 </tr>
                                                 </thead>
@@ -187,9 +187,9 @@
 
         </div>
 
-
+</br>
         <div class="row">
-            <div class="col-md-12">
+            <div class="col-md-11">
                 <div class="pull-right">
                      <button type="submit" ng-disabled="disableButton" tabindex="3"  class="btn btn-wide btn-success"
         data-style="zoom-in"> Submit </button>

From a3fd4d5fbb0c8f64268ec32543ee4115f4fc2083 Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Fri, 17 Aug 2018 15:13:17 +0530
Subject: [PATCH 2/3] EXAM ATTEN ISSUE FIXED

---
 Apollo/assets/views/hallticket/examAttendancePDF.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Apollo/assets/views/hallticket/examAttendancePDF.html b/Apollo/assets/views/hallticket/examAttendancePDF.html
index 34e1235d..5817053e 100644
--- a/Apollo/assets/views/hallticket/examAttendancePDF.html
+++ b/Apollo/assets/views/hallticket/examAttendancePDF.html
@@ -31,11 +31,10 @@
 		
 		<div id="student_list_AM">
 		<table width="100%" border="1" id = "attendanceTableAM" style="background-color:#fff;" ng-if="studentInfoAM_Length != 0">
-<<<<<<< HEAD
-				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGNATURE</th> </tr></thead>
-=======
-				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGN</th> </tr></thead>
->>>>>>> 145988e7a66409e847e30051cbe103b3fdcfb907
+
+
+				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STU SIGN</th> </tr></thead>
+
 				<tbody>
 					<tr ng-repeat="student in dataForExamAttendanceAM" >
 					<td>{{($index+1)}}</td> <td>{{student.Firstname}} {{student.Lastname}} </td><td>{{student.CourseName}}</td><td>{{student.Sem_Year}}</td><td>{{student.EnrollmentID}}</td><td>{{student.SubjectCode}}</td><td>{{student.SubjectName}}</td><td></td><td></td>
@@ -47,7 +46,7 @@
 		
 		<div id="student_list_PM">
 		<table width="100%" border="1" id = "attendanceTablePM" style="background-color:#fff;" ng-if="studentInfoPM_Length != 0">
-				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STUDENT SIGN</th> </tr></thead>
+				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STU SIGN</th> </tr></thead>
 				<tbody>
 					<tr ng-repeat="student in dataForExamAttendancePM" >
 					<td>{{($index+1)}}</td> <td>{{student.Firstname}} {{student.Lastname}} </td><td>{{student.CourseName}}</td><td>{{student.Sem_Year}}</td><td>{{student.EnrollmentID}}</td><td>{{student.SubjectCode}}</td><td>{{student.SubjectName}}</td><td></td><td></td>

From 9440184ddd2580611af1cfc7e3ddc6327790dbda Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Fri, 17 Aug 2018 15:17:50 +0530
Subject: [PATCH 3/3] ui change

---
 Apollo/assets/views/announcement/Announcement.html | 2 +-
 Apollo/assets/views/student/student_details.html   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Apollo/assets/views/announcement/Announcement.html b/Apollo/assets/views/announcement/Announcement.html
index 742906a4..85236cc2 100755
--- a/Apollo/assets/views/announcement/Announcement.html
+++ b/Apollo/assets/views/announcement/Announcement.html
@@ -68,7 +68,7 @@
                                             <th ng-click="sort('Active/De-Active')">Status
                                                 <span class="glyphicon sort-icon" ng-show="sortKey=='Active/De-Active'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                             </th>
-                                            <th></th>                                           
+                                            <th>Action</th>                                           
                                         </tr>
                                     </thead>
                                     <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html
index 36bf1167..68afc662 100755
--- a/Apollo/assets/views/student/student_details.html
+++ b/Apollo/assets/views/student/student_details.html
@@ -210,9 +210,10 @@
                                             <td>{{p.UniversityName}}</td>
                                             <td>{{p.CourseName}}</td>
                                             <td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
-                                                <span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
+                                                <span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE
+                                                    </span></td>
                                             <td>
-                                                <div id="containersPara">{{p.Comments}}</div>
+                                               {{p.Comments}}
                                             </td>
                                             <td style="text-align: center;">
                                                 <!--<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"