Skip to content

Q
QLNS_N01
Commit afbac0e6 authored by Phạm Duy Phi's avatar Phạm Duy Phi
Browse files
Options

Merge branch 'master' into phipham 

# Conflicts:
#	pom.xml
#	src/main/resources/public/index.html
#	src/main/resources/public/js/app.js
#	src/main/resources/public/widgets.html
parents 6ea15217 53b79821
Hide whitespace changes
Inline Side-by-side
Showing with 666 additions and 100 deletions
pom.xml
View file @ afbac0e6
......@@ -15,9 +15,12 @@
<description>Quản trị văn phòng sử dụng springboot API</description>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<<<<<<< HEAD
=======
<java.version>1.8</java.version>
>>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
</properties>
<dependencies>
......@@ -58,6 +61,22 @@
<artifactId>log4j</artifactId>
<version>1.2.12</version>
</dependency>
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> ed09ed47f5d092a7753469913def1ab676073023
=======
<!-- <dependency>-->
<!-- <groupId>org.springframework.security</groupId>-->
<!-- <artifactId>spring-security-config</artifactId>-->
<!-- <version>${spring-security.version}</version>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
>>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
>>>>>>> master
</dependencies>
<build>
......
src/main/resources/public/blank-page.html
View file @ afbac0e6
......@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>Components</span>
<span>Project</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
......@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small>
</a>
......
src/main/resources/public/buttons.html
View file @ afbac0e6
......@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>Components</span>
<span>Project</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
......@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small>
</a>
</li>
......
src/main/resources/public/compose.html
View file @ afbac0e6
......@@ -43,7 +43,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!--//Metis Menu -->
</head>
<body class="cbp-spmenu-push">
<body class="cbp-spmenu-push" ng-app="myApp">
<div class="main-content">
<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
<!--left-fixed -navigation-->
......@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>Components</span>
<span>Project</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
......@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small>
</a>
......@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
......@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
<li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
<li><a href="404.html"><i class="fa fa-angle-right"></i> 404 Error</a></li>
<li><a href="500.html"><i class="fa fa-angle-right"></i> 500 Error</a></li>
<li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul>
</li>
......@@ -340,7 +337,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- main content start-->
<div id="page-wrapper">
<div class="main-page compose">
<h2 class="title1">Compose Mail Page</h2>
<div ui-view="content">
<!-- Content222-->
</div>
<div class="col-md-4 compose-left">
<div class="folder widget-shadow">
<ul>
......@@ -435,20 +434,15 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</div>
</div>
<!--footer-->
<div class="footer">
<p>&copy; 2018 Glance Design Dashboard. All Rights Reserved | Design by <a href="https://w3layouts.com/" target="_blank">w3layouts</a></p>
</div>
<!--//footer-->
</div>
<!-- side nav js -->
<script src='js/SidebarNav.min.js' type='text/javascript'></script>
<script>
$('.sidebar-menu').SidebarNav()
</script>
<!-- //side nav js -->
<!-- Classie --><!-- for toggle left push menu script -->
<script src="js/classie.js"></script>
<script>
var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
......@@ -468,14 +462,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
}
}
</script>
<!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script>
<!--//scrolling js-->
<!-- Bootstrap Core JavaScript -->
<script src="js/bootstrap.js"> </script>
</body>
......
src/main/resources/public/css/style.css
View file @ afbac0e6
......@@ -70,6 +70,7 @@ span.dashboard_text {
left:0px;
width: 100%;
z-index: 100;
height: 65px;
}
.header-section {
background:#FFF;
......@@ -835,7 +836,7 @@ ul.dropdown-menu {
.profile_details ul li{
list-style-type:none;
position:relative;
margin-right: 30px;
}
.profile_details li a i.fa.lnr {
position: absolute;
......@@ -8565,4 +8566,29 @@ tr:nth-child(n+3) td:nth-child(odd):not(:first-child){
font-family: sans-serif;
font-size: 16px;
text-align: center;
}
.topnav .search-container {
float: right;
}
.topnav input[type=text] {
padding: 6px;
margin-top: 8px;
font-size: 17px;
border: none;
}
.topnav .search-container button {
float: right;
padding: 6px 10px;
margin-top: 8px;
margin-right: 16px;
background: #ddd;
font-size: 17px;
border: none;
cursor: pointer;
}
.topnav .search-container button:hover {
background: #ccc;
}
\ No newline at end of file
src/main/resources/public/forms.html
View file @ afbac0e6
......@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>Components</span>
<span>Project</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
......@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small>
</a>
</li>
......@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
......@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
<li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
<li><a href="404.html"><i class="fa fa-angle-right"></i> 404 Error</a></li>
<li><a href="500.html"><i class="fa fa-angle-right"></i> 500 Error</a></li>
<li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul>
</li>
......@@ -681,7 +678,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script>
<!--//scrolling js-->
......
src/main/resources/public/general.html
View file @ afbac0e6
......@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>Components</span>
<span>Project</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
......@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small>
</a>
......@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
......@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
<li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
<li><a href="404.html"><i class="fa fa-angle-right"></i> 404 Error</a></li>
<li><a href="500.html"><i class="fa fa-angle-right"></i> 500 Error</a></li>
<li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul>
</li>
......@@ -633,7 +630,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script>
<!--//scrolling js-->
......
src/main/resources/public/grids.html
View file @ afbac0e6
......@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small>
</a>
</li>
......
src/main/resources/public/icons.html
View file @ afbac0e6
......@@ -43,7 +43,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!--//Metis Menu -->
</head>
<body class="cbp-spmenu-push">
<body class="cbp-spmenu-push" ng-app="myApp">
<div class="main-content">
<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
<!--left-fixed -navigation-->
......@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>Components</span>
<span>Project</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
......@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small>
</a>
......
src/main/resources/public/inbox.html
View file @ afbac0e6
......@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
......@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
<li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
<li><a href="404.html"><i class="fa fa-angle-right"></i> 404 Error</a></li>
<li><a href="500.html"><i class="fa fa-angle-right"></i> 500 Error</a></li>
<li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul>
</li>
......@@ -1293,7 +1290,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script>
<!--//scrolling js-->
......
src/main/resources/public/index.html
View file @ afbac0e6
......@@ -224,7 +224,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>Components</span>
<span>Project</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
......@@ -248,8 +248,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small>
</a>
</li>
......@@ -507,8 +507,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- main content start-->
<div id="page-wrapper">
<div class="main-page">
<div ui-view="content">
<!-- Content222-->
<div ui-view="layout">
Content222
</div>
</div>
</div>
......@@ -694,6 +694,27 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
});
}
</script>
<<<<<<< HEAD
=======
<<<<<<< HEAD
<!-- new added graphs chart js-->
>>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
=======
>>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
<script src="js/classie.js"></script>
<script>
var menuLeft = document.getElementById('cbp-spmenu-s1'),
showLeftPush = document.getElementById('showLeftPush'),
body = document.body;
showLeftPush.onclick = function () {
classie.toggle(this, 'active');
classie.toggle(body, 'cbp-spmenu-push-toright');
classie.toggle(menuLeft, 'cbp-spmenu-open');
disableOther('showLeftPush');
};
>>>>>>> master
<div ui-view="layout">
barChartData.datasets.forEach(function (dataset, datasetIndex) {
......
src/main/resources/public/js/app.js
View file @ afbac0e6
/**
*
*/
<<<<<<< HEAD
// angular.module("myApp", ["ui.router", "ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> master
// angular.module("myApp", ["ui.router", 'ngRoute']).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
<<<<<<< HEAD
=======
>>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
=======
angular.module("myApp", ["ngAnimate", "ui.router", "ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
>>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
>>>>>>> master
$locationProvider.hashPrefix('');
......@@ -122,8 +134,36 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
}
}
})
<<<<<<< HEAD
.state("employees", {
prarent:'layout3',
=======
=======
$urlRouterProvider.otherwise("/employees");
$stateProvider
.state("layout1", {
abstract: true,
views: {
"layout": {
templateUrl: "layout/layout1.html"
}
}
})
.state("layout2", {
abstract: true,
views: {
"layout": {
templateUrl: "layout/layout2.html"
}
}
})
>>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
.state("employees", {
parent: 'layout1',
>>>>>>> master
url: "/employees",
views: {
"content": {
......@@ -133,6 +173,7 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
}
})
.state("createEmployee", {
parent: 'layout1',
url: "/createEmployee",
params: {
emp: null
......@@ -226,10 +267,65 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
}
})
});
<<<<<<< HEAD
angular
.module('myApp')
.filter('lmto', lmto);
=======
=======
.state("timeSheet", {
parent: 'layout2',
url: "/timesheet",
views: {
"content": {
templateUrl: "/pages/timesheet/timeSheet.html",
controller: "timeSheetController"
}
}
})
.state("timeSheetDetail", {
parent: 'layout2',
url: "/timesheetdetail/:id",
views: {
"content": {
templateUrl: "/pages/timesheet/timeSheetDetail.html",
controller: "timeSheetDetailController"
}
}
})
.state("leaveForm", {
parent: 'layout2',
url: "/leaveform",
views: {
"content": {
templateUrl: "/pages/leaveform/leaveForm.html",
controller: "leaveFormController"
}
}
})
.state("leaveFormDetail", {
parent: 'layout2',
url: "/leaveformdetail/:id",
views: {
"content": {
templateUrl: "/pages/leaveform/leaveFormDetail.html",
controller: "leaveFormDetailController"
}
}
})
});
angular
.module('myApp')
.filter('lmto', lmto);
>>>>>>> master
<<<<<<< HEAD
function lmto() {
return function(items,limit,offset){
if(items.length > 0) {
......@@ -239,3 +335,18 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
}
};
}
<<<<<<< HEAD
=======
>>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
=======
function lmto() {
return function (items, limit, offset) {
if (items.length > 0) {
return items.slice(offset, offset + limit);
} else {
return [];
}
};
}
>>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
>>>>>>> master
src/main/resources/public/layout/layout1.html 0 → 100644
View file @ afbac0e6
<div>
<a ui-sref="employees"></a>
<!-- <a ui-sref="report"></a>-->
<!-- <a ui-sref="project"></a>-->
<div ui-view="content">
</div>
</div>
src/main/resources/public/layout/layout2.html 0 → 100644
View file @ afbac0e6
<div>
<div ui-view="content">
layout 2
</div>
</div>
src/main/resources/public/login.html
View file @ afbac0e6
......@@ -92,8 +92,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small>
</a>
</li>
......@@ -112,9 +112,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
......@@ -133,8 +131,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
<li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
<li><a href="404.html"><i class="fa fa-angle-right"></i> 404 Error</a></li>
<li><a href="500.html"><i class="fa fa-angle-right"></i> 500 Error</a></li>
<li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul>
</li>
......@@ -402,7 +399,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script>
<!--//scrolling js-->
......
src/main/resources/public/media.html
View file @ afbac0e6
......@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small>
</a>
</li>
......@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
......@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
<li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
<li><a href="404.html"><i class="fa fa-angle-right"></i> 404 Error</a></li>
<li><a href="500.html"><i class="fa fa-angle-right"></i> 500 Error</a></li>
<li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul>
</li>
......@@ -624,7 +621,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script>
<!--//scrolling js-->
......
src/main/resources/public/signup.html
View file @ afbac0e6
......@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small>
</a>
</li>
......
src/main/resources/public/timesheet.html 0 → 100644
View file @ afbac0e6
<!--
Author: W3layouts
Author URL: http://w3layouts.com
License: Creative Commons Attribution 3.0 Unported
License URL: http://creativecommons.org/licenses/by/3.0/
-->
<!DOCTYPE HTML>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="keywords" content="Glance Design Dashboard Responsive web template, Bootstrap Web Templates, Flat Web Templates, Android Compatible web template,
SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, SonyEricsson, Motorola web design"/>
<script type="application/x-javascript"> addEventListener("load", function () {
setTimeout(hideURLbar, 0);
}, false);
function hideURLbar() {
window.scrollTo(0, 1);
} </script>
<!-- Bootstrap Core CSS -->
<link href="css/bootstrap.css" rel='stylesheet' type='text/css'/>
<!-- Custom CSS -->
<link href="css/style.css" rel='stylesheet' type='text/css'/>
<!-- font-awesome icons CSS -->
<link href="css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="css/Footer-with-social-icons.css">
<link href='css/SidebarNav.min.css' media='all' rel='stylesheet' type='text/css'/>
<script src="js/jquery-1.11.1.min.js"></script>
<script src="js/modernizr.custom.js"></script>
<link href="//fonts.googleapis.com/css?family=PT+Sans:400,400i,700,700i&amp;subset=cyrillic,cyrillic-ext,latin-ext"
rel="stylesheet">
<script src="js/Chart.js"></script>
<script src="js/metisMenu.min.js"></script>
<script src="js/custom.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular.js"></script>
<script src="js/angular-route.js"></script>
<script src="js/angular-ui-router.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-animate.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.6.1/angular-sanitize.js"></script>
<script src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-1.3.3.js"></script>
<script src="js/app.js"></script>
<script src="pages/employee/employeeController.js"></script>
<script src="pages/employee/createEmployeeController.js"></script>
<link data-require="bootstrap-css@2.3.2" data-semver="2.3.2" rel="stylesheet"
href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css"/>
`
<!-- end anguarjs app-->
<link href="css/custom.css" rel="stylesheet">
<!-- //calendar -->
</head>
<body class="cbp-spmenu-push" ng-app="myApp">
<div class="main-content">
<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
<!--left-fixed -navigation-->
<aside class="sidebar-left">
<nav class="navbar navbar-inverse">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".collapse" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<h1><a class="navbar-brand" href="index.html"><span class="fa fa-area-chart"></span> Glance<span class="dashboard_text">Design dashboard</span></a></h1>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="sidebar-menu">
<li class="header">MAIN NAVIGATION</li>
<li class="treeview">
<a href="index.html">
<span class="glyphicon glyphicon-user"></span> <span>Employee</span>
</a>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>Components</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
<li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
</ul>
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>UI Elements</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="general.html"><i class="fa fa-angle-right"></i> General</a></li>
<li><a href="icons.html"><i class="fa fa-angle-right"></i> Icons</a></li>
<li><a href="buttons.html"><i class="fa fa-angle-right"></i> Buttons</a></li>
<li><a href="typography.html"><i class="fa fa-angle-right"></i> Typography</a></li>
</ul>
</li>
<li>
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>TimeSheet</span>
</a>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-edit"></i> <span>Forms</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="forms.html"><i class="fa fa-angle-right"></i> General Forms</a></li>
<li><a href="validation.html"><i class="fa fa-angle-right"></i> Form Validations</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-envelope"></i> <span>Mailbox</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="inbox.html"><i class="fa fa-angle-right"></i> Mail Inbox</a></li>
<li><a href="compose.html"><i class="fa fa-angle-right"></i> Compose Mail </a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-folder"></i> <span>Examples</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
<li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
<li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul>
</li>
<li class="header">LABELS</li>
<li><a href="#"><i class="fa fa-angle-right text-red"></i> <span>Important</span></a></li>
<li><a href="#"><i class="fa fa-angle-right text-yellow"></i> <span>Warning</span></a></li>
<li><a href="#"><i class="fa fa-angle-right text-aqua"></i> <span>Information</span></a></li>
</ul>
</div>
<!-- /.navbar-collapse -->
</nav>
</aside>
</div>
<!--left-fixed -navigation-->
<!-- header-starts -->
<div class="sticky-header header-section ">
<div class="header-left">
<!--toggle button start-->
<button id="showLeftPush"><i class="fa fa-bars"></i></button>
<!--toggle button end-->
<div class="profile_details_left"><!--notifications of menu start -->
<ul class="nofitications-dropdown">
<li class="dropdown head-dpdn">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-envelope"></i><span class="badge">4</span></a>
<ul class="dropdown-menu">
<li>
<div class="notification_header">
<h3>You have 3 new messages</h3>
</div>
</li>
<li><a href="#">
<div class="user_img"><img src="images/1.jpg" alt=""></div>
<div class="notification_desc">
<p>Lorem ipsum dolor amet</p>
<p><span>1 hour ago</span></p>
</div>
<div class="clearfix"></div>
</a></li>
<li class="odd"><a href="#">
<div class="user_img"><img src="images/4.jpg" alt=""></div>
<div class="notification_desc">
<p>Lorem ipsum dolor amet </p>
<p><span>1 hour ago</span></p>
</div>
<div class="clearfix"></div>
</a></li>
<li><a href="#">
<div class="user_img"><img src="images/3.jpg" alt=""></div>
<div class="notification_desc">
<p>Lorem ipsum dolor amet </p>
<p><span>1 hour ago</span></p>
</div>
<div class="clearfix"></div>
</a></li>
<li>
<div class="notification_bottom">
<a href="#">See all messages</a>
</div>
</li>
</ul>
</li>
<li class="dropdown head-dpdn">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell"></i><span class="badge blue">4</span></a>
<ul class="dropdown-menu">
<li>
<div class="notification_header">
<h3>You have 3 new notification</h3>
</div>
</li>
<li><a href="#">
<div class="user_img"><img src="images/4.jpg" alt=""></div>
<div class="notification_desc">
<p>Lorem ipsum dolor amet</p>
<p><span>1 hour ago</span></p>
</div>
<div class="clearfix"></div>
</a></li>
<li class="odd"><a href="#">
<div class="user_img"><img src="images/1.jpg" alt=""></div>
<div class="notification_desc">
<p>Lorem ipsum dolor amet </p>
<p><span>1 hour ago</span></p>
</div>
<div class="clearfix"></div>
</a></li>
<li><a href="#">
<div class="user_img"><img src="images/3.jpg" alt=""></div>
<div class="notification_desc">
<p>Lorem ipsum dolor amet </p>
<p><span>1 hour ago</span></p>
</div>
<div class="clearfix"></div>
</a></li>
<li>
<div class="notification_bottom">
<a href="#">See all notifications</a>
</div>
</li>
</ul>
</li>
<li class="dropdown head-dpdn">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-tasks"></i><span class="badge blue1">8</span></a>
<ul class="dropdown-menu">
<li>
<div class="notification_header">
</div>
</li>
<li><a href="#">
<div class="task-info">
<span class="task-desc">Database update</span><span class="percentage">40%</span>
<div class="clearfix"></div>
</div>
<div class="progress progress-striped active">
<div class="bar yellow" style="width:40%;"></div>
</div>
</a></li>
<li><a href="#">
<div class="task-info">
<span class="task-desc">Dashboard done</span><span class="percentage">90%</span>
<div class="clearfix"></div>
</div>
<div class="progress progress-striped active">
<div class="bar green" style="width:90%;"></div>
</div>
</a></li>
<li><a href="#">
<div class="task-info">
<span class="task-desc">Mobile App</span><span class="percentage">33%</span>
<div class="clearfix"></div>
</div>
<div class="progress progress-striped active">
<div class="bar red" style="width: 33%;"></div>
</div>
</a></li>
<li><a href="#">
<div class="task-info">
<span class="task-desc">Issues fixed</span><span class="percentage">80%</span>
<div class="clearfix"></div>
</div>
<div class="progress progress-striped active">
<div class="bar blue" style="width: 80%;"></div>
</div>
</a></li>
<li>
<div class="notification_bottom">
<a href="#">See all pending tasks</a>
</div>
</li>
</ul>
</li>
</ul>
<div class="clearfix"> </div>
</div>
<div class="clearfix"> </div>
</div>
<div class="header-right">
<!--search-box-->
<div class="search-box">
<form class="input">
<input class="sb-search-input input__field--madoka" placeholder="Search..." type="search" id="input-31" />
<label class="input__label" for="input-31">
<svg class="graphic" width="100%" height="100%" viewBox="0 0 404 77" preserveAspectRatio="none">
</svg>
</label>
</form>
</div><!--//end-search-box-->
<div class="profile_details">
<ul>
<li class="dropdown profile_details_drop">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<div class="profile_img">
<span class="prfil-img"><img src="images/2.jpg" alt=""> </span>
<div class="user-name">
<p>Admin Name</p>
<span>Administrator</span>
</div>
<i class="fa fa-angle-down lnr"></i>
<i class="fa fa-angle-up lnr"></i>
<div class="clearfix"></div>
</div>
</a>
<ul class="dropdown-menu drp-mnu">
<li> <a href="#"><i class="fa fa-cog"></i> Settings</a> </li>
<li> <a href="#"><i class="fa fa-user"></i> My Account</a> </li>
<li> <a href="#"><i class="fa fa-suitcase"></i> Profile</a> </li>
<li> <a href="#"><i class="fa fa-sign-out"></i> Logout</a> </li>
</ul>
</li>
</ul>
</div>
<div class="clearfix"> </div>
</div>
<div class="clearfix"> </div>
</div>
<!-- //header-ends -->
<!-- main content start-->
<div id="page-wrapper">
<div class="main-page">
<div ui-view="layout1">
</div>
<div class="elements">
<!--photoday-section-->
<script src="js/scripts.js"></script>
<script src="js/bootstrap.js"> </script>
</div>
</div>
</div>
</div>
<!-- footer-->
<div class="content">
</div>
<footer id="myFooter">
<div class="container">
<div class="row">
<div class="col-sm-3 myCols">
<h5>Get started</h5>
<ul>
<li><a href="#">Home</a></li>
<li><a href="#">Sign up</a></li>
<li><a href="#">Downloads</a></li>
</ul>
</div>
<div class="col-sm-3 myCols">
<h5>About us</h5>
<ul>
<li><a href="#">Company Information</a></li>
<li><a href="#">Contact us</a></li>
<li><a href="#">Reviews</a></li>
</ul>
</div>
<div class="col-sm-3 myCols">
<h5>Support</h5>
<ul>
<li><a href="#">FAQ</a></li>
<li><a href="#">Help desk</a></li>
<li><a href="#">Forums</a></li>
</ul>
</div>
<div class="col-sm-3 myCols">
<h5>Legal</h5>
<ul>
<li><a href="#">Terms of Service</a></li>
<li><a href="#">Terms of Use</a></li>
<li><a href="#">Privacy Policy</a></li>
</ul>
</div>
</div>
</div>
<div class="social-networks">
<a href="#" class="twitter"><i class="fa fa-twitter"></i></a>
<a href="#" class="facebook"><i class="fa fa-facebook-official"></i></a>
<a href="#" class="google"><i class="fa fa-google-plus"></i></a>
</div>
<!--end footer-->
</body>
</html>
\ No newline at end of file
src/main/resources/public/typography.html
View file @ afbac0e6
......@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small>
</a>
</li>
......
src/main/resources/public/validation.html
View file @ afbac0e6
......@@ -70,13 +70,13 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview">
<a href="#">
<i class="fa fa-laptop"></i>
<span>Components</span>
<span>Project</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>
<li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>
</ul>
<!-- <ul class="treeview-menu">-->
<!-- <li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li>-->
<!-- <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>-->
<!-- </ul>-->
<li class="treeview">
<a href="#">
......@@ -92,8 +92,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul>
</li>
<li>
<a href="widgets.html">
<i class="fa fa-th"></i> <span>Widgets</span>
<a href="timesheet.html">
<i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small>
</a>
</li>
......@@ -112,9 +112,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<i class="fa fa-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li>
<li class="treeview">
<a href="#">
......@@ -133,8 +131,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li>
<li><a href="signup.html"><i class="fa fa-angle-right"></i> Register</a></li>
<li><a href="404.html"><i class="fa fa-angle-right"></i> 404 Error</a></li>
<li><a href="500.html"><i class="fa fa-angle-right"></i> 500 Error</a></li>
<li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul>
</li>
......@@ -493,10 +490,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
}
}
</script>
<!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script>
<!--//scrolling js-->
......
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