From 676dfbbc9753d17bea6a1fe8948b4a4922f7e69f Mon Sep 17 00:00:00 2001
From: fecaille <fabrice.ecaille@open-groupe.com>
Date: Fri, 11 Mar 2016 08:54:45 +0100
Subject: [PATCH] Changes JS compilation location + adds header and footer

---
 pom.xml                                       | 78 +++++++++----------
 .../resources/templates/fragments/header.html |  2 +-
 src/main/resources/templates/index.html       |  1 +
 3 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b45de9..a8f2197 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		
+
 		<jasmine.version>2.4.1</jasmine.version>
 		<jasmine-ajax.version>3.2.0</jasmine-ajax.version>
 
@@ -40,36 +40,36 @@
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
 		<!-- Security -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
 		<dependency>
-            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
-        </dependency>
-        <!-- Persistence -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-        </dependency>
-   		<!-- Testing -->
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.thymeleaf.extras</groupId>
+			<artifactId>thymeleaf-extras-springsecurity4</artifactId>
+		</dependency>
+		<!-- Persistence -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+		</dependency>
+		<!-- Testing -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -92,10 +92,10 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-		    <groupId>org.webjars</groupId>
-		    <artifactId>jquery-mockjax</artifactId>
-		    <version>1.5.3</version>
-		    <scope>test</scope>
+			<groupId>org.webjars</groupId>
+			<artifactId>jquery-mockjax</artifactId>
+			<version>1.5.3</version>
+			<scope>test</scope>
 		</dependency>
 		<!-- Monitoring -->
 		<dependency>
@@ -296,14 +296,14 @@
 						<preloadSource>/webjars/jquery.mockjax.js</preloadSource>
 						<preloadSource>${project.basedir}/src/test/resources/jasmine/config.js</preloadSource>
 					</preloadSources>
- 					<jsSrcDir>${project.build.directory}/classes/static/js</jsSrcDir>
+					<jsSrcDir>${project.build.directory}/classes/static/js</jsSrcDir>
 					<sourceIncludes>
 						<include>**/*.js</include>
 					</sourceIncludes>
- 					<sourceExcludes>
- 						<exclude>**/react-bootstrap.js</exclude>
- 						<exclude>**/app.render.js</exclude>
- 					</sourceExcludes>
+					<sourceExcludes>
+						<exclude>**/react-bootstrap.js</exclude>
+						<exclude>**/app.render.js</exclude>
+					</sourceExcludes>
 					<jsTestSrcDir>${project.basedir}/src/test/resources/static/js</jsTestSrcDir>
 					<specIncludes>
 						<include>**/*.spec.js</include>
diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html
index 8ebe728..34ca60a 100644
--- a/src/main/resources/templates/fragments/header.html
+++ b/src/main/resources/templates/fragments/header.html
@@ -6,7 +6,7 @@
 <body>
 	<div class="container" th:fragment="header">
 		<div class="row">
-			<div class="navbar navbar-inverse">
+			<div class="navbar navbar-inverse navbar-fixed-top">
 				<div class="container">
 					<div class="navbar-header">
 						<button type="button" class="navbar-toggle" data-toggle="collapse"
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index f6ed107..9abf25c 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -20,5 +20,6 @@
 	<script src="/js/comments.js"></script>
 	<script src="/js/app.js"></script>
 	<script src="/js/app.render.js"></script>
+	<script src="/js/test.js"></script>
 </body>
 </html>
\ No newline at end of file