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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 666 additions and 100 deletions
pom.xml
View file @ afbac0e6
...@@ -15,9 +15,12 @@ ...@@ -15,9 +15,12 @@
<description>Quản trị văn phòng sử dụng springboot API</description> <description>Quản trị văn phòng sử dụng springboot API</description>
<properties> <properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<<<<<<< HEAD
=======
<java.version>1.8</java.version>
>>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
</properties> </properties>
<dependencies> <dependencies>
...@@ -58,6 +61,22 @@ ...@@ -58,6 +61,22 @@
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>1.2.12</version> <version>1.2.12</version>
</dependency> </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> </dependencies>
<build> <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 ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </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 ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </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 ...@@ -43,7 +43,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!--//Metis Menu --> <!--//Metis Menu -->
</head> </head>
<body class="cbp-spmenu-push"> <body class="cbp-spmenu-push" ng-app="myApp">
<div class="main-content"> <div class="main-content">
<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1"> <div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
<!--left-fixed -navigation--> <!--left-fixed -navigation-->
...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -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-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -340,7 +337,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -340,7 +337,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- main content start--> <!-- main content start-->
<div id="page-wrapper"> <div id="page-wrapper">
<div class="main-page compose"> <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="col-md-4 compose-left">
<div class="folder widget-shadow"> <div class="folder widget-shadow">
<ul> <ul>
...@@ -435,20 +434,15 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -435,20 +434,15 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</div> </div>
</div> </div>
<!--footer--> <!--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--> <!--//footer-->
</div> </div>
<!-- side nav js -->
<script src='js/SidebarNav.min.js' type='text/javascript'></script> <script src='js/SidebarNav.min.js' type='text/javascript'></script>
<script> <script>
$('.sidebar-menu').SidebarNav() $('.sidebar-menu').SidebarNav()
</script> </script>
<!-- //side nav js -->
<!-- Classie --><!-- for toggle left push menu script -->
<script src="js/classie.js"></script> <script src="js/classie.js"></script>
<script> <script>
var menuLeft = document.getElementById( 'cbp-spmenu-s1' ), var menuLeft = document.getElementById( 'cbp-spmenu-s1' ),
...@@ -468,14 +462,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -468,14 +462,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
} }
} }
</script> </script>
<!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js-->
<!-- Bootstrap Core JavaScript -->
<script src="js/bootstrap.js"> </script> <script src="js/bootstrap.js"> </script>
</body> </body>
......
src/main/resources/public/css/style.css
View file @ afbac0e6
...@@ -70,6 +70,7 @@ span.dashboard_text { ...@@ -70,6 +70,7 @@ span.dashboard_text {
left:0px; left:0px;
width: 100%; width: 100%;
z-index: 100; z-index: 100;
height: 65px;
} }
.header-section { .header-section {
background:#FFF; background:#FFF;
...@@ -835,7 +836,7 @@ ul.dropdown-menu { ...@@ -835,7 +836,7 @@ ul.dropdown-menu {
.profile_details ul li{ .profile_details ul li{
list-style-type:none; list-style-type:none;
position:relative; position:relative;
margin-right: 30px;
} }
.profile_details li a i.fa.lnr { .profile_details li a i.fa.lnr {
position: absolute; position: absolute;
...@@ -8565,4 +8566,29 @@ tr:nth-child(n+3) td:nth-child(odd):not(:first-child){ ...@@ -8565,4 +8566,29 @@ tr:nth-child(n+3) td:nth-child(odd):not(:first-child){
font-family: sans-serif; font-family: sans-serif;
font-size: 16px; font-size: 16px;
text-align: center; 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 ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -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-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -681,7 +678,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -681,7 +678,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script --> <!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js--> <!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//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 ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -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-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -633,7 +630,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -633,7 +630,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script --> <!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js--> <!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//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 ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </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 ...@@ -43,7 +43,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!--//Metis Menu --> <!--//Metis Menu -->
</head> </head>
<body class="cbp-spmenu-push"> <body class="cbp-spmenu-push" ng-app="myApp">
<div class="main-content"> <div class="main-content">
<div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1"> <div class="cbp-spmenu cbp-spmenu-vertical cbp-spmenu-left" id="cbp-spmenu-s1">
<!--left-fixed -navigation--> <!--left-fixed -navigation-->
...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -69,7 +69,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,7 +91,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Widgets</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </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 ...@@ -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-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -1293,7 +1290,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -1293,7 +1290,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script --> <!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js--> <!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//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 ...@@ -224,7 +224,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
...@@ -248,8 +248,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -248,8 +248,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
...@@ -507,8 +507,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -507,8 +507,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- main content start--> <!-- main content start-->
<div id="page-wrapper"> <div id="page-wrapper">
<div class="main-page"> <div class="main-page">
<div ui-view="content"> <div ui-view="layout">
<!-- Content222--> Content222
</div> </div>
</div> </div>
</div> </div>
...@@ -694,6 +694,27 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -694,6 +694,27 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
}); });
} }
</script> </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"> <div ui-view="layout">
barChartData.datasets.forEach(function (dataset, datasetIndex) { 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) { // 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", ["ui.router", 'ngRoute']).config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).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(''); $locationProvider.hashPrefix('');
...@@ -122,8 +134,36 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio ...@@ -122,8 +134,36 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
} }
} }
}) })
<<<<<<< HEAD
.state("employees", { .state("employees", {
prarent:'layout3', 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", url: "/employees",
views: { views: {
"content": { "content": {
...@@ -133,6 +173,7 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio ...@@ -133,6 +173,7 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
} }
}) })
.state("createEmployee", { .state("createEmployee", {
parent: 'layout1',
url: "/createEmployee", url: "/createEmployee",
params: { params: {
emp: null emp: null
...@@ -226,10 +267,65 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio ...@@ -226,10 +267,65 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio
} }
}) })
}); });
<<<<<<< HEAD
angular angular
.module('myApp') .module('myApp')
.filter('lmto', lmto); .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() { function lmto() {
return function(items,limit,offset){ return function(items,limit,offset){
if(items.length > 0) { if(items.length > 0) {
...@@ -239,3 +335,18 @@ angular.module("myApp", ["ngAnimate","ui.router","ui.bootstrap"]).config(functio ...@@ -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 ...@@ -92,8 +92,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
...@@ -112,9 +112,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -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-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -133,8 +131,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -133,8 +131,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -402,7 +399,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -402,7 +399,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script --> <!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js--> <!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//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 ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
...@@ -111,9 +111,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -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-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -132,8 +130,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -624,7 +621,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -624,7 +621,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<!-- //Classie --><!-- //for toggle left push menu script --> <!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js--> <!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//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 ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
......
src/main/resources/public/timesheet.html 0 → 100644
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/typography.html
View file @ afbac0e6
...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -91,8 +91,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>TimeSheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </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 ...@@ -70,13 +70,13 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-laptop"></i> <i class="fa fa-laptop"></i>
<span>Components</span> <span>Project</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <!-- <ul class="treeview-menu">-->
<li><a href="grids.html"><i class="fa fa-angle-right"></i> Grids</a></li> <!-- <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> <!-- <li><a href="media.html"><i class="fa fa-angle-right"></i> Media Css</a></li>-->
</ul> <!-- </ul>-->
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -92,8 +92,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -92,8 +92,8 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
</ul> </ul>
</li> </li>
<li> <li>
<a href="widgets.html"> <a href="timesheet.html">
<i class="fa fa-th"></i> <span>Widgets</span> <i class="fa fa-th"></i> <span>Timesheet</span>
<small class="label pull-right label-info">08</small> <small class="label pull-right label-info">08</small>
</a> </a>
</li> </li>
...@@ -112,9 +112,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -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-table"></i> <span>Tables</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu">
<li><a href="tables.html"><i class="fa fa-angle-right"></i> Simple tables</a></li>
</ul>
</li> </li>
<li class="treeview"> <li class="treeview">
<a href="#"> <a href="#">
...@@ -133,8 +131,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -133,8 +131,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="login.html"><i class="fa fa-angle-right"></i> Login</a></li> <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="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> <li><a href="blank-page.html"><i class="fa fa-angle-right"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
...@@ -493,10 +490,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony ...@@ -493,10 +490,7 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
} }
} }
</script> </script>
<!-- //Classie --><!-- //for toggle left push menu script -->
<!--scrolling js-->
<script src="js/jquery.nicescroll.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!--//scrolling js--> <!--//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