Skip to content

M
mytime
Commit aacb2406 authored by Prayas Jain's avatar Prayas Jain
Browse files
Options

Updated_UI_and_Css

parent aa1086d2
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 122 deletions
src/main/webapp/WEB-INF/css/custom-theme.css
View file @ aacb2406
...@@ -346,7 +346,7 @@ i.fa.fa-refresh:hover { ...@@ -346,7 +346,7 @@ i.fa.fa-refresh:hover {
/* Grid Styles */ /* Grid Styles */
.grid-full-view { .grid-full-view {
height: calc(100vh - 195px) !important; height: calc(100vh - 185px) !important;
} }
.grid-half-view { .grid-half-view {
height: calc(85vh - 215px) !important; height: calc(85vh - 215px) !important;
...@@ -356,6 +356,7 @@ i.fa.fa-refresh:hover { ...@@ -356,6 +356,7 @@ i.fa.fa-refresh:hover {
} }
.ui-grid { .ui-grid {
border: none !important; border: none !important;
/* height : 40px; */
} }
.ui-grid-viewport { .ui-grid-viewport {
/* border: 1px solid #cccccc; */ /* border: 1px solid #cccccc; */
...@@ -405,11 +406,12 @@ i.fa.fa-refresh:hover { ...@@ -405,11 +406,12 @@ i.fa.fa-refresh:hover {
.ui-grid-contents-wrapper .ui-grid-cell-contents { .ui-grid-contents-wrapper .ui-grid-cell-contents {
/* border-bottom: 1px solid #e5e5e5; */ /* border-bottom: 1px solid #e5e5e5; */
padding: 10px 8px; padding: 10px 8px;
word-break: break-word;
} }
.ui-grid-contents-wrapper .ui-grid-render-container-body .ui-grid-canvas .ui-grid-cell { .ui-grid-contents-wrapper .ui-grid-render-container-body .ui-grid-canvas .ui-grid-cell {
border: none; border: none;
height: 40px; height: 40px;
line-height: 20px; /* line-height: 20px; */
margin: 0; margin: 0;
} }
...@@ -417,16 +419,23 @@ i.fa.fa-refresh:hover { ...@@ -417,16 +419,23 @@ i.fa.fa-refresh:hover {
font-size: 13px; font-size: 13px;
padding: 0; padding: 0;
} }
.ui-grid-canvas .ui-grid-row {
height: auto !important;
}
.ui-grid-canvas .ui-grid-cell-contents {
line-height : normal;
white-space: normal;
}
.ui-grid-contents-wrapper .ui-grid-render-container-body .ui-grid-canvas .ui-grid-cell-contents, .ui-grid-contents-wrapper .ui-grid-render-container-body .ui-grid-canvas .ui-grid-cell:empty { .ui-grid-contents-wrapper .ui-grid-render-container-body .ui-grid-canvas .ui-grid-cell-contents, .ui-grid-contents-wrapper .ui-grid-render-container-body .ui-grid-canvas .ui-grid-cell:empty {
border-bottom: 1px solid #e5e5e5; /* border-bottom: 1px solid #e5e5e5; */
} }
.ui-grid-contents-wrapper .ui-grid-render-container-body .ui-grid-canvas .ui-grid-cell p { .ui-grid-contents-wrapper .ui-grid-render-container-body .ui-grid-canvas .ui-grid-cell p {
border-bottom: 1px solid #e5e5e5; /* border-bottom: 1px solid #e5e5e5; */
min-height: 40px; min-height: 40px;
padding-top: 6px; padding-top: 6px;
} }
.ui-grid-contents-wrapper .ui-grid-row:nth-child(even) .ui-grid-cell { .ui-grid-contents-wrapper .ui-grid-row:nth-child(even) .ui-grid-cell {
background-color: #fafafc; /* background-color: #fafafc; */
} }
.ui-grid-header-cell-row .ui-grid-column-menu-button { .ui-grid-header-cell-row .ui-grid-column-menu-button {
position: absolute; position: absolute;
...@@ -567,7 +576,7 @@ cursor: pointer; ...@@ -567,7 +576,7 @@ cursor: pointer;
} */ } */
.project-allocation .ui-grid-canvas .ui-grid-row div div:nth-child(3), .manage-accounts .ui-grid-canvas .ui-grid-row div div:nth-child(3){ .project-allocation .ui-grid-canvas .ui-grid-row div div:nth-child(3), .manage-accounts .ui-grid-canvas .ui-grid-row div div:nth-child(3){
border-bottom: solid 1px #e5e5e5; /* border-bottom: solid 1px #e5e5e5; */
line-height: normal; line-height: normal;
overflow: auto; overflow: auto;
padding: 5px 0; padding: 5px 0;
...@@ -575,3 +584,29 @@ cursor: pointer; ...@@ -575,3 +584,29 @@ cursor: pointer;
.project-allocation .ui-grid-canvas .ui-grid-row div div:nth-child(3) div:first-child, .manage-accounts .ui-grid-canvas .ui-grid-row div div:nth-child(3) div:first-child{ .project-allocation .ui-grid-canvas .ui-grid-row div div:nth-child(3) div:first-child, .manage-accounts .ui-grid-canvas .ui-grid-row div div:nth-child(3) div:first-child{
padding-top: 5px; padding-top: 5px;
} }
.login-reports-page {
margin : 0 0 15px 0;
}
.login-reports-page > .col-lg-12 > .row > .col-lg-2 {
margin-right: 40px;
}
.reports-btn > button {
background-color : #3f51b5;
}
.reports-btn > button:disabled {
background-color : #3f51b5;
}
.update-Teammate>h4 {
border-bottom: 1px solid #ccc;
padding-bottom : 5px;
}
.panel-default>.panel-heading {
color: #fff;
background-color: #3f51b5;
border-color: #ddd;
}
.update-Teammate .form-inline {
margin-bottom : 15px;
}
src/main/webapp/WEB-INF/templates/accounts.html
View file @ aacb2406
...@@ -15,13 +15,11 @@ ...@@ -15,13 +15,11 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row">
<div class="row col-lg-12"> <div class="col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination class="myGrid grid-full-view">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div class="watermark" ng-show="!gridOptions.data.length">No data available</div>
class="myGrid grid-full-view"> </div>
<div class="watermark" ng-show="!gridOptions.data.length">No
data available</div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
src/main/webapp/WEB-INF/templates/attendanceReport.html
View file @ aacb2406
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<div class="row col-lg-12" style="height: 15px;"></div> <div class="row col-lg-12" style="height: 15px;"></div>
</div> </div>
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-exporter <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-exporter
class="myGrid grid-half-view" style="width:99%;height:330px;"> class="myGrid grid-half-view">
<div class="watermark" ng-show="!gridOptions.data.length">No <div class="watermark" ng-show="!gridOptions.data.length">No
data available</div> data available</div>
</div> </div>
......
src/main/webapp/WEB-INF/templates/domains.html
View file @ aacb2406
...@@ -16,13 +16,17 @@ ...@@ -16,13 +16,17 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row col-lg-12" style="margin-left: 0px; margin-top: 10px"> <div class="row">
<div class="col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination
class="myGrid grid-full-view" style="width: 99%"> class="myGrid manage-accounts grid-full-view">
<div class="watermark" ng-show="!gridOptions.data.length">No <div class="watermark" ng-show="!gridOptions.data.length">No
data available</div> data available</div>
</div> </div>
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></div>
</div>
</div> </div>
\ No newline at end of file
src/main/webapp/WEB-INF/templates/employees.html
View file @ aacb2406
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<br />
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group"> <div class="form-group">
<div class="form-inline"> <div class="form-inline">
...@@ -46,10 +45,10 @@ ...@@ -46,10 +45,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" ng-show="isVisible">
<div class="form-inline col-lg-12" ng-show="isVisible"> <div class="form-inline col-lg-12">
<label class="control-label" for="avgHrs"> Average Login <span for="avgHrs"> <b>Average Login
hours:&nbsp;&nbsp; </label>{{avgLoginHrs}} hours:</b>&nbsp;&nbsp; </label>{{avgLoginHrs}}
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
src/main/webapp/WEB-INF/templates/projects.html
View file @ aacb2406
...@@ -31,38 +31,11 @@ ...@@ -31,38 +31,11 @@
</div> </div>
</div> </div>
<div class="row">
<div class="row col-lg-12"> <div class="col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination class="myGrid grid-full-view">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div class="watermark" ng-show="!gridOptions.data.length">No data available</div>
class="myGrid grid-full-view">
<div class="watermark" ng-show="!gridOptions.data.length">No
data available</div>
</div>
</div> </div>
<div class="row col-lg-12" style="height: 15px;"></div>
<div class="row col-lg-12">
<!-- <div class="col-lg-4 text-center">
<md-button class="md-raised md-primary"
style="width:182px;background: cadetblue;"
ng-click="getUnAssignedEmployees('UnAssigned', parentData)"> <i
class="fa fa-crosshairs fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i>Bench Employees</md-button>
</div> </div>
<div class="col-lg-4 text-center">
<md-button class="md-raised md-primary"
style="width:182px;background: cadetblue;"
ng-click="getAllocatedEmployees('allocated', parentData)"> <i
class="fa fa-product-hunt fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i>Project Allocations</md-button>
</div> -->
<!-- <div class="col-lg-4 text-center">
<md-button class="md-raised md-primary"
style="width:142px;background: cadetblue; margin: 0% 0% 0% 124%;"
ng-click="addProject('Assign', parentData)"> <i
class="fa fa-plus-circle fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i> Add
Project</md-button>
</div> -->
</div> </div>
</div> </div>
\ No newline at end of file
src/main/webapp/WEB-INF/templates/reports.html
View file @ aacb2406
...@@ -43,36 +43,29 @@ ...@@ -43,36 +43,29 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="login-reports-page">
<div class="form-inline col-lg-12"> <div class="form-inline col-lg-12">
<div class="row">
<div class="form-group col-lg-2 col-md-4 col-sm-6 col-xs-12"> <div class="form-group col-lg-2 col-md-4 col-sm-6 col-xs-12">
<label>Override Timings</label> <label>Override Timings</label>
<input type="checkbox" ng-value="isOverride" ng-model="isOverride" ng-change="showOrHide()"/> <input type="checkbox" ng-value="isOverride" ng-model="isOverride" ng-change="showOrHide()"/>
</div> </div>
<div class="form-group col-lg-1"></div> <div class="form-group col-lg-6">
<div class="form-group col-lg-4" ng-show="isOverride"> <div class="row">
<div class="form-group col-lg-6" ng-show="isOverride">
<label class="" for="fromTime"> From Time: <input type="time" ng-model="fromTime" id="Hours" <label class="" for="fromTime"> From Time: <input type="time" ng-model="fromTime" id="Hours"
placeholder="HH:mm aa"/> placeholder="HH:mm aa"/>
</label> </label>
</div> </div>
<div class="form-group col-lg-4" ng-show="isOverride"> <div class="form-group col-lg-6" ng-show="isOverride">
<label class="" for="toTime">To Time: <input type="time" ng-model="toTime" id="Hours" <label class="" for="toTime">To Time: <input type="time" ng-model="toTime" id="Hours"
placeholder="HH:mm aa"/> placeholder="HH:mm aa"/>
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<div class="form-horizontal"> <div class="form-group col-lg-4 reports-btn">
<div class="form-group">
<div class="form-inline col-lg-12 align-button">
<div class="form-group col-lg-9">
</div>
<div class="form-group col-lg-2">
<div excel-export export-data="exportData" file-name="{{fileName}}" ng-disabled = "!isDataAvailable"></div> <div excel-export export-data="exportData" file-name="{{fileName}}" ng-disabled = "!isDataAvailable"></div>
</div>
<div class="form-group col-lg-1">
<button class="btn btn-primary btn-ef btn-ef-3 btn-ef-3c mb-10" ng-click="print(pdfUrl)" ng-disabled = "!isDataAvailable" > Save as PDF <i class="fa fa-download"></i></button> <button class="btn btn-primary btn-ef btn-ef-3 btn-ef-3c mb-10" ng-click="print(pdfUrl)" ng-disabled = "!isDataAvailable" > Save as PDF <i class="fa fa-download"></i></button>
</div> </div>
</div> </div>
......
src/main/webapp/WEB-INF/templates/roles.html
View file @ aacb2406
...@@ -23,48 +23,11 @@ ...@@ -23,48 +23,11 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div> </div>
<div class="row col-lg-12"> <div class="row">
<div class="col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination <div id="gridTest" ui-grid="gridOptions" ui-grid-pagination class="myGrid grid-full-view">
class="myGrid grid-full-view"> <div class="watermark" ng-show="!gridOptions.data.length">No data available</div>
<div class="watermark" ng-show="!gridOptions.data.length">No
data available</div>
</div>
</div>
<div class="form-horizontal">
<div class="form-group">
<div class="form-inline col-lg-12">
<!-- <div class="form-group col-lg-3 col-md-4 col-sm-6 col-xs-12">
<div class="input-group"
style="">
<input type="text" ng-model="empSearchId" id="empSearchId"
ng-blur="validateEmpId()" class="form-control"
placeholder="Employee ID"
style="border-radius: 3px 0px 0px 3px;"> <span
class="input-group-btn">
<button class="btn btn-secondary" type="button"
ng-click="getEmployeeRole()"
style="border: 1px solid #ccc; border-radius: 0px 3px 3px 0px;">
<i class="fa fa-search fa-2x" style="font-size: 1.3em;"
aria-hidden="true"></i>
</button>
</span>
</div>
</div> -->
<!-- <div class="form-group col-lg-7 col-md-7 col-sm-7 col-xs-12"></div> -->
<!-- <div class="form-group col-lg-2" style="margin-top: 30px;margin-left: 355px;">
<label class="" for="submitBtn"><md-button
class="md-raised md-primary"
style="width:142px;background: cadetblue;margin:0px;"
ng-click="assignRole('Add', parentData)"> <i
class="fa fa-plus-circle fa-2x"
style="margin-top: 5px; font-size: 1.5em; float: left"></i> Add
Employee</md-button></label>
</div> -->
</div> </div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
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