Skip to content

M
mytime
Commit a1970e3f authored by Vanavaraju's avatar Vanavaraju
Browse files
Options

Removed inline styles and refactored css

parent ff6cf1a0
Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 70 deletions
src/main/webapp/WEB-INF/css/custom-theme.css
View file @ a1970e3f
......@@ -250,7 +250,7 @@ i.fa.fa-refresh:hover {
#main h1 {
border-bottom: 1px solid #ccc;
font-size: 22px;
margin: 0 0 18px 0;
margin: 0 0 16px 0;
padding-bottom: 10px;
}
#main i.fa-refresh {
......@@ -468,3 +468,20 @@ i.fa.fa-refresh:hover {
background: green;
}
.md-toolbar-tools, .md-toolbar {
background: #3f51b5 !important;
height: 50px !important;
min-height: 50px !important;
max-height: 50px !important;
}
.layout-row button {
background: #3f51b5 !important;
color: #fff !important;
}
/* .ui-grid-viewport {
height: auto !important;
max-height: calc(350px - 20px);
} */
md-toolbar._md-toolbar-transitions {
min-height: 50px !important;
}
\ No newline at end of file
src/main/webapp/WEB-INF/templates/attendanceReport.html
View file @ a1970e3f
......@@ -12,7 +12,6 @@
<div class="clearfix"></div>
</div>
</div>
<br />
<div class="">
<div class="row">
<div class="col-lg-2 col-xs-6">
......
src/main/webapp/WEB-INF/templates/charts.html
View file @ a1970e3f
<html>
<body>
<div class="md-padding" style="width: 100%; padding: 3px 0px 0px 0px;"
<div class="md-padding"
id="popupContainer" ng-controller="chartsController">
<div style="margin: 6% 0% -8% 61%">
<div class="text-right">
Report Type:<select ng-model="reportId" ng-change="clickMe()" ng-options="report.Id as report.Name for report in reports"></select>
</div>
<hc-pie-chart style="width: 100%; padding: 3px 0px 0px 0px;" title="Browser usage" data="pieData" options="chartOptions">Placeholder for pie chart</hc-pie-chart>
<hc-pie-chart title="Browser usage" data="pieData" options="chartOptions">Placeholder for pie chart</hc-pie-chart>
<div class="row col-lg-12" style="padding-top: 4%;margin-left:0px;">
<div class="row col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-exporter
class="myGrid" style="width:99%;height:224px;margin-left:0px;">
......
src/main/webapp/WEB-INF/templates/employees.html
View file @ a1970e3f
......@@ -55,7 +55,7 @@
<div class="form-group">
<div class="form-inline col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="grid" style="width: 99%; height: 362px; margin-left: 5px;">
class="grid">
<div class="watermark" ng-show="!gridOptions.data.length">Search
by Employee ID/Name/Email ID</div>
</div>
......
src/main/webapp/WEB-INF/templates/profile.html
View file @ a1970e3f
......@@ -11,48 +11,48 @@
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Employee ID</b>
<b>Employee ID</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.employeeId}}
{{profile.employeeId}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Employee Name</b>
<b>Employee Name</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.employeeName}}
{{profile.employeeName}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Email ID</b>
<b>Email ID</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.emailId}}
{{profile.emailId}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Designation</b>
<b>Designation</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.designation}}
{{profile.designation}}
</p>
</div>
......@@ -60,12 +60,12 @@
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Role</b>
<b>Role</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.role}}
{{profile.role}}
</p>
</div>
......@@ -73,24 +73,24 @@
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Mobile Number</b>
<b>Mobile Number</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.mobileNumber}}
{{profile.mobileNumber}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Alt Mobile Number</b>
<b>Alt Mobile Number</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.alternateMobileNumber}}
{{profile.alternateMobileNumber}}
</p>
</div>
......@@ -98,36 +98,36 @@
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Personal EmailId</b>
<b>Personal EmailId</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.personalEmailId}}
{{profile.personalEmailId}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Shift</b>
<b>Shift</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.shift}}
{{profile.shift}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Primary Skill</b>
<b>Primary Skill</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.baseTechnology}}
{{profile.baseTechnology}}
</p>
</div>
</div>
......@@ -136,108 +136,108 @@
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Technologies Known</b>
<b>Technologies Known</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.technologyKnown}}
{{profile.technologyKnown}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Work Location</b>
<b>Work Location</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.empLocation}}
{{profile.empLocation}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Functional Org</b>
<b>Functional Org</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.functionalGroup}}
{{profile.functionalGroup}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Domain</b>
<b>Domain</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.domain}}
{{profile.domain}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Employment Type</b>
<b>Employment Type</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.employmentType}}
{{profile.employmentType}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Employment Status</b>
<b>Employment Status</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.empStatus}}
{{profile.empStatus}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Date of Joining</b>
<b>Date of Joining</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.dateOfJoining | date:'dd-MMM-yyyy'}}
{{profile.dateOfJoining | date:'dd-MMM-yyyy'}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Passport Expiry Date</b>
<b>Passport Expiry Date</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.passportExpiryDate | date:'dd-MMM-yyyy'}}
{{profile.passportExpiryDate | date:'dd-MMM-yyyy'}}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-4 col-xs-6">
<p>
<b>Date of Birth</b>
<b>Date of Birth</b> <b class="right">:</b>
</p>
</div>
<div class="col-lg-7 col-xs-6">
<p>
<b>:</b> {{profile.dateOfBirth | date:'dd-MMM-yyyy'}}
{{profile.dateOfBirth | date:'dd-MMM-yyyy'}}
</p>
</div>
</div>
......
src/main/webapp/WEB-INF/templates/reports.html
View file @ a1970e3f
......@@ -11,11 +11,10 @@
<div class="clearfix"></div>
</div>
</div>
<br />
<div class="form-horizontal">
<div class="form-group">
<div class="form-inline col-lg-12">
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="col-lg-2 col-md-3 col-sm-6 col-xs-12">
<input type="text" ng-model="searchId" id="searchId"
placeholder="Employee ID" class="form-control" min-length="5"
ng-blur="validateEmpId()" />
......@@ -65,16 +64,6 @@
</div>
</div>
<div class="form-group">
<div class="form-inline col-lg-12">
<div class="wrapper col-lg-12" id="pdfReportPreview"
style="height: 415px; background-color: #888; overflow: scroll;">
<p id="reportMsg"
style="color: #fff; font-size: 1.35em; opacity: 0.5;text-align:center;vertical-align:middle;position:relative;top:50%;">
{{reportMsg}}</p>
</div>
</div>
</div>
<div class="form-horizontal">
<div class="form-group">
<div class="form-inline col-lg-12 align-button">
......@@ -89,4 +78,14 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-inline col-lg-12">
<div class="wrapper col-lg-12" id="pdfReportPreview"
style="height: 415px; background-color: #888; overflow: scroll;">
<p id="reportMsg"
style="color: #fff; font-size: 1.35em; opacity: 0.5;text-align:center;vertical-align:middle;position:relative;top:50%;">
{{reportMsg}}</p>
</div>
</div>
</div>
</div>
src/main/webapp/WEB-INF/templates/shiftdetails.html
View file @ a1970e3f
......@@ -16,12 +16,12 @@
<div class="">
<div class="row">
<div class="col-lg-2 col-xs-12">
<div class="col-lg-2 col-xs-3">
<p>
<b>Select Shift:</b>
</p>
</div>
<div class="col-lg-3 col-xs-12">
<div class="col-lg-3 col-xs-6">
<p>
<md-select ng-model="shiftValue" md-selected-text="getSelectedShift()" id="shiftValue" style="margin:0px;">
......@@ -29,16 +29,15 @@
ng-repeat="shiftValue in shifts">{{shiftValue}}</md-option> </md-optgroup> </md-select>
</p>
</div>
<div class="col-lg-2 col-xs-12">
<div class="col-lg-2 col-xs-3">
<md-button class="md-raised md-primary" ng-click="getShiftDetails()">
<i class="fa fa-search fa-1x"></i> Search</md-button>
</div>
<div class="col-lg-2"></div>
</div>
<div class="row col-lg-12" style="height: 15px;"></div>
<div class="row col-lg-12">
<div class="col-lg-12 col-xs-12 text-center">
<div class="col-lg-12 col-xs-12 text-left">
<p>
The following <b>{{shiftCount}}</b> employees work in the shift:<b> {{selectedshiftValue}}</b>
</p>
......
src/main/webapp/WEB-INF/templates/updateProfile.html
View file @ a1970e3f
<md-dialog aria-label="Role Template" style="width:400px;height:600px;">
<md-dialog aria-label="Role Template" style="width:400px;">
<form ng-cloak name="myForm">
<md-toolbar>
<div class="md-toolbar-tools"
style="background: cadetblue;">
<div class="md-toolbar-tools">
<h2>Update Profile </h2>
<span flex></span>
<md-button class="md-icon-button" ng-click="cancel()"> <i
class="fa fa-times fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i> </md-button>
class="fa fa-times fa-1x"></i> </md-button>
</div>
</md-toolbar>
<md-dialog-content>
......@@ -25,7 +23,7 @@
<md-optgroup label="skills"> <md-option ng-value="tech"
ng-repeat="tech in technologies">{{tech}}</md-option> </md-optgroup> </md-select>
<textarea rows="4" cols="10" class="form-control" id="technologyKnown" name="technologyKnown"
ng-model="technologyKnown" placeholder="Technologies Known" /> <br>
ng-model="technologyKnown" placeholder="Technologies Known" />
<div role="alert">
<span class="error" style="color: red;">{{alertMsg}}</span>
</div>
......@@ -34,8 +32,8 @@
</md-dialog-content>
<md-dialog-actions layout="row"> <md-button
class="md-raised" data-ng-click="validateFields()" style="width:120px;background: cadetblue;color:white;">
Update </md-button> <md-button class="md-raised" ng-click="cancel()" style="width:120px;background: cadetblue;color:white;">
class="md-raised" data-ng-click="validateFields()">
Update </md-button> <md-button class="md-raised" ng-click="cancel()">
Cancel </md-button> </md-dialog-actions>
</form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment