no message

79cf6ecb · Phạm Duy Phi · 9ff00192 · 79cf6ecb
Commit 79cf6ecb authored Jun 16, 2019 by Phạm Duy Phi
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 25 deletions

src/main/resources/public/index.html src/main/resources/public/index.html +6 -25

No files found.
--- a/src/main/resources/public/index.html
+++ b/src/main/resources/public/index.html
@@ -7,7 +7,6 @@ License URL: http://creativecommons.org/licenses/by/3.0/
 <!doctype html>
 <html lang="en">
 <head>
-<<<<<<< HEAD
 <title>Quản trị văn phòng</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -115,7 +114,6 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
 </head>
 <body ng-app="myApp" class="cbp-spmenu-push">
 	<div ui-view="layout"></div>
-=======
    <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,
@@ -130,7 +128,6 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony

    <!-- Bootstrap Core CSS -->
    <link href="css/bootstrap.css" rel='stylesheet' type='text/css'/>
->>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85

    <!-- Custom CSS -->
    <link href="css/style.css" rel='stylesheet' type='text/css'/>
@@ -153,7 +150,6 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
    <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>
-<<<<<<< HEAD
    <script src="pages/project/groupproject/groupProjectController.js"></script>

    <script src="pages/timesheet/timeSheetController.js"></script>
@@ -184,7 +180,6 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
                x.style.display = "none";
                n.value = "Add Leave Form";
            }
-=======
    <script src="pages/employee/employeeController.js"></script>
 <!--    <script src="pages/project/projectController.js"></script>-->
    <script src="pages/leaveform/leaveFormController.js"></script>
@@ -203,7 +198,6 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
        #chartdiv {
            width: 100%;
            height: 295px;
->>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
        }
    </style>
    <!--pie-chart --><!-- index page sales reviews visitors pie chart -->
@@ -258,8 +252,6 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
            });
        });
    </script>
-<<<<<<< HEAD
-<<<<<<< HEAD

    <!-- Js -->
    <!-- Bootstrap core JavaScript-->
@@ -281,8 +273,6 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony

    <!-- Custom scripts for all pages-->
    <script src="common/js/sb-admin.min.js"></script>
-=======
->>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
 </head>
 <body class="cbp-spmenu-push" ng-app="myApp">
 <div class="main-content">
@@ -792,22 +782,14 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
                    window.myBar.update();
                });
            }
-
-<<<<<<< HEAD
+            
 <script src="js/main.js"></script>
 <script src="js/app.js"></script>
 <script src="pages/employee/employeeController.js"></script>
 <script src="pages/project/project/projectController.js"></script>
 <script src="pages/homepage/homeController.js"></script>
 <script src="pages/homepage/HomeService.js"></script>
-=======
        </script>
-<<<<<<< HEAD
-        <!-- new added graphs chart js-->
->>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
-=======
->>>>>>> 049511c3b37f668c637022150c53bd25d9b8e61d
-
        <script src="js/classie.js"></script>
        <script>
            var menuLeft = document.getElementById('cbp-spmenu-s1'),
@@ -822,10 +804,9 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
            };


-<<<<<<< HEAD
 <!-- Custom scripts for all pages-->
 <script src="common/js/sb-admin.min.js"></script>
-=======
+        <script>
            function disableOther(button) {
                if (button !== 'showLeftPush') {
                    classie.toggle(showLeftPush, 'disabled');
@@ -838,14 +819,14 @@ SmartPhone Compatible web template, free WebDesigns for Nokia, Samsung, LG, Sony
        <script src="js/bootstrap.js"></script>

    </footer>
->>>>>>> 14cbe76ccc34395abe463875cb178d2c872e3f85
 </div>
-=======
+

 </head>
 <body class="cbp-spmenu-push" ng-app="myApp">
 <div ui-view="layout"></div>
->>>>>>> fcb3554c9480d927d3ff072584217224ddd37db6
->>>>>>> master
+
+</body>
+</body>
 </body>
 </html>
\ No newline at end of file