Merge pull request #37 from dgouyette/master

JSF use webjars to handle jquery's and bootstrap resources
agoncal · Jun 2, 2013 · 18b7831 · 18b7831
2 parents b89cb90 + e1ec0c1
commit 18b7831
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11,154 deletions.
diff --git a/pom.xml b/pom.xml
@@ -50,6 +50,18 @@
     </dependencyManagement>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>bootstrap</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+            <version>1.9.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>

diff --git a/src/main/webapp/WEB-INF/layouts/template.xhtml b/src/main/webapp/WEB-INF/layouts/template.xhtml
@@ -15,8 +15,8 @@
         <title>
             <ui:insert name="title">Default title</ui:insert>
         </title>
-        <h:outputStylesheet name="css/bootstrap-2.0.4.css"/>
-        <h:outputStylesheet name="css/style.css"/>
+        <h:outputStylesheet  library="webjars/bootstrap/2.3.2/css"  name="bootstrap.min.css"/>
+        <h:outputStylesheet library="css" name="style.css"/>
         <style type="text/css">
             body {
                 padding-top: 60px;
@@ -28,7 +28,7 @@
             }
         </style>
         <!-- Don't move this line up otherwise there is a display bug -->
-        <h:outputStylesheet name="css/bootstrap-responsive-2.0.4.css" rel="stylesheet"/>
+        <h:outputStylesheet library="webjars/bootstrap/2.3.2/css" name="bootstrap-responsive.css" rel="stylesheet"/>
 
         <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
         <!--[if lt IE 9]>
@@ -196,8 +196,8 @@
         <!-- Le javascript
        ================================================== -->
         <!-- Placed at the end of the document so the pages load faster -->
-        <h:outputScript name="js/jquery-1.7.2.min.js"/>
-        <h:outputScript name="js/bootstrap-2.0.4.js"/>
+        <h:outputScript name="webjars/jquery/1.9.1/jquery.min.js"/>
+        <h:outputScript library="webjars/bootstrap/2.3.2/js" name="bootstrap.min.js"/>
     </h:body>
 </f:view>
 </html>