Skip to content

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

Merge branch 'dinhdam' of https://git.myitsol.com/hieunv/qlns_n01 

# Conflicts:
#	pom.xml
#	src/main/resources/public/index.html
#	src/main/resources/public/js/app.js
parents 0fe58fd7 049511c3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 608 additions and 1057 deletions
pom.xml
View file @ 53b79821
......@@ -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>
......@@ -64,9 +67,19 @@
<artifactId>log4j</artifactId>
<version>1.2.12</version>
</dependency>
<<<<<<< HEAD
=======
>>>>>>> ed09ed47f5d092a7753469913def1ab676073023
=======
<!-- <dependency>-->
<!-- <groupId>org.springframework.security</groupId>-->
<!-- <artifactId>spring-security-config</artifactId>-->
<!-- <version>${spring-security.version}</version>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
>>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
</dependencies>
<build>
......
src/main/resources/public/blank-page.html
View file @ 53b79821
......@@ -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 @ 53b79821
......@@ -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 @ 53b79821
......@@ -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 @ 53b79821
......@@ -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;
......@@ -8566,3 +8567,28 @@ tr:nth-child(n+3) td:nth-child(odd):not(:first-child){
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 @ 53b79821
......@@ -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 @ 53b79821
......@@ -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 @ 53b79821
......@@ -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 @ 53b79821
......@@ -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 @ 53b79821
......@@ -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 @ 53b79821
......@@ -257,7 +257,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">
......@@ -281,8 +281,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>
......@@ -541,8 +541,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>
......@@ -747,10 +747,12 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<script src="pages/homepage/HomeService.js"></script>
=======
</script>
<<<<<<< HEAD
<!-- new added graphs chart js-->
>>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
=======
>>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
<!-- Classie --><!-- for toggle left push menu script -->
<script src="js/classie.js"></script>
<script>
var menuLeft = document.getElementById('cbp-spmenu-s1'),
......
src/main/resources/public/js/app.js
View file @ 53b79821
......@@ -2,10 +2,14 @@
*
*/
<<<<<<< HEAD
<<<<<<< HEAD
// angular.module("myApp", ["ui.router", 'ngRoute']).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
=======
angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
>>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
=======
angular.module("myApp", ["ngAnimate", "ui.router", "ui.bootstrap"]).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
>>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
$locationProvider.hashPrefix('');
<<<<<<< HEAD
......@@ -125,10 +129,27 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
$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',
url: "/employees",
views: {
"content": {
......@@ -138,6 +159,7 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
}
})
.state("createEmployee", {
parent: 'layout1',
url: "/createEmployee",
params: {
emp: null
......@@ -205,15 +227,56 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
=======
.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
angular
.module('myApp')
.filter('lmto', lmto);
<<<<<<< HEAD
function lmto() {
return function(items,limit,offset){
if(items.length > 0) {
......@@ -224,3 +287,14 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
};
}
>>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
=======
function lmto() {
return function (items, limit, offset) {
if (items.length > 0) {
return items.slice(offset, offset + limit);
} else {
return [];
}
};
}
>>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
src/main/resources/public/layout/layout1.html 0 → 100644
View file @ 53b79821
<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 @ 53b79821
<div>
<div ui-view="content">
layout 2
</div>
</div>
src/main/resources/public/login.html
View file @ 53b79821
......@@ -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 @ 53b79821
......@@ -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 @ 53b79821
......@@ -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 @ 53b79821
This diff is collapsed.
src/main/resources/public/typography.html
View file @ 53b79821
......@@ -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 @ 53b79821
......@@ -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-->
......
src/main/resources/public/widgets.html deleted 100644 → 0
View file @ 0fe58fd7
This diff is collapsed.
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