moved to webjars

jamesward · Mar 27, 2013 · 803de61 · 803de61
1 parent 256b333
commit 803de61
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 56 deletions.
diff --git a/app/assets/stylesheets/main.less b/app/assets/stylesheets/main.less
@@ -0,0 +1,3 @@
+body {
+  margin-top: 50px;
+}
diff --git a/app/controllers/Application.java b/app/controllers/Application.java
@@ -1,6 +1,5 @@
 package controllers;
 
-
 import models.Bar;
 import org.codehaus.jackson.JsonNode;
 import play.data.Form;
@@ -12,19 +11,20 @@
 
 public class Application extends Controller {
 
-   public static Result index() {
-      return ok(index.render(Form.form(Bar.class)));
-   }
+    public static Result index() {
+        return ok(index.render(Form.form(Bar.class)));
+    }
 
-   public static Result addBar() {
-      Form<Bar> form = Form.form(Bar.class).bindFromRequest();
-      Bar bar = form.get();
-      bar.save();
-      return redirect(controllers.routes.Application.index());
-   }
+    public static Result addBar() {
+        Form<Bar> form = Form.form(Bar.class).bindFromRequest();
+        Bar bar = form.get();
+        bar.save();
+        return redirect(controllers.routes.Application.index());
+    }
 
-   public static Result listBars() {
-      JsonNode jsonNodes = toJson(Bar.find.all());
-      return ok(jsonNodes);
-   }
+    public static Result listBars() {
+        JsonNode jsonNodes = toJson(Bar.find.all());
+        return ok(jsonNodes);
+    }
+
 }
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
@@ -6,9 +6,20 @@
     <head>
         <title>@title</title>
         <link rel="shortcut icon" type="image/png" href="@routes.Assets.at("images/favicon.png")">
-        <script src="@routes.Assets.at("javascripts/jquery-1.7.1.min.js")" type="text/javascript"></script>
+        <link rel='stylesheet' href='@routes.WebJarAssets.at(controllers.WebJarAssets.locate("bootstrap.min.css"))'>
+        <link rel='stylesheet' href='@routes.Assets.at("stylesheets/main.min.css")'>
+        <script src='@routes.WebJarAssets.at(controllers.WebJarAssets.locate("jquery.min.js"))' type='text/javascript'></script>
     </head>
     <body>
-        @content
+        <div class="navbar navbar-fixed-top">
+            <div class="navbar-inner">
+                <div class="container-fluid">
+                    <a id="titleLink" class="brand" href="/">@title</a>
+                </div>
+            </div>
+        </div>
+        <div class="container">
+            @content
+        </div>
     </body>
 </html>
diff --git a/conf/routes b/conf/routes
@@ -9,3 +9,4 @@ POST    /bars                       controllers.Application.addBar
 
 # Map static resources from the /public folder to the /assets URL path
 GET     /assets/*file               controllers.Assets.at(path="/public", file)
+GET     /webjars/*file              controllers.WebJarAssets.at(file)
diff --git a/db/evolutions/default/1.sql b/db/evolutions/default/1.sql
diff --git a/db/evolutions/default/2.sql b/db/evolutions/default/2.sql
diff --git a/project/Build.scala b/project/Build.scala
@@ -5,18 +5,20 @@ import play.Project._
 
 object ApplicationBuild extends Build {
 
-    val appName         = "play2bars-java-ebean"
-    val appVersion      = "1.0-SNAPSHOT"
+  val appName         = "play2bars-java-ebean"
+  val appVersion      = "1.0-SNAPSHOT"
 
-    val appDependencies = Seq(
-      "postgresql" % "postgresql" % "9.0-801.jdbc3",
-      javaCore,
-      javaJdbc,
-      javaEbean
-    )
+  val appDependencies = Seq(
+    "postgresql" % "postgresql" % "9.0-801.jdbc3",
+    javaCore,
+    javaJdbc,
+    javaEbean,
+    "org.webjars" % "webjars-play" % "2.1.0-1",
+    "org.webjars" % "bootstrap" % "2.3.1"
+  )
 
-    val main = Project(appName, appVersion, appDependencies).settings(
-      // Add your own project settings here
-    )
+  val main = Project(appName, appVersion, appDependencies).settings(
+    // Add your own project settings here
+  )
 
 }
diff --git a/public/javascripts/jquery-1.7.1.min.js b/public/javascripts/jquery-1.7.1.min.js