Skip to content
Browse files

Nuke jade stuff and make my own views.

  • Loading branch information...
1 parent 8f025f4 commit 1284875ef0417157073226bc7f0737a91db31512 @therealadam committed
View
14 index.ssp
@@ -0,0 +1,14 @@
+<html>
+ <head>
+ <title>Bootstrap 101 Template</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <!-- Bootstrap -->
+ <link href="css/bootstrap.min.css" rel="stylesheet" media="screen"/>
+ </head>
+ <body>
+ <h1>Hello, world!</h1>
+ Say <a href="hello-scalate">hey to Stella</a>.
+ <script src="http://code.jquery.com/jquery.js"></script>
+ <script src="js/bootstrap.min.js"></script>
+ </body>
+</html>
View
10 src/main/scala/stella/StellaServlet.scala
@@ -3,15 +3,11 @@ package stella
import org.scalatra._
import scalate.ScalateSupport
-class StellaServlet extends StellaByStarlightStack {
+class StellaServlet extends StellaByStarlightStack with ScalateSupport {
get("/") {
- <html>
- <body>
- <h1>Hello, world!</h1>
- Say <a href="hello-scalate">hey to Stella</a>.
- </body>
- </html>
+ contentType = "text/html"
+ ssp("index")
}
}
View
12 src/main/webapp/WEB-INF/templates/layouts/default.jade
@@ -1,12 +0,0 @@
--@ val title: String
--@ val headline: String = title
--@ val body: String
-
-!!!
-html
- head
- title= title
- body
- #content
- h1= headline
- != body
View
4 src/main/webapp/WEB-INF/templates/views/hello-scalate.jade
@@ -1,4 +0,0 @@
-- attributes("title") = "Scalatra: a tiny, Sinatra-like web framework for Scala"
-- attributes("headline") = "Welcome to Scalatra"
-
-p= "Hello, Scalate!"
View
70 src/main/webapp/WEB-INF/templates/views/index.ssp
@@ -0,0 +1,70 @@
+<!doctype html>
+<html lang="en">
+ <head>
+ <title>Stella by Starlight</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <link href="css/bootstrap.min.css" rel="stylesheet" media="screen"/>
+ <style>
+ .container-narrow {
+ margin: 0 auto;
+ max-width: 700px;
+ }
+ .jumbotron {
+ margin: 60px 0;
+ text-align: center;
+ }
+ </style>
+ </head>
+ <body>
+ <div class="container-narrow">
+ <div class="masthead">
+ <ul class="nav nav-pills pull-right">
+ <li class="active"><a href="#dashboard">Dashboard</a></li>
+ <li><a href="#about">About</a></li>
+ </ul>
+ <h3 class="muted">Stella by Starlight</h3>
+ </div>
+
+ <hr/>
+
+ <div class="jumbotron">
+ <h1><a name="#dashboard">Everything is OK.</a></h1>
+ <p class="lead">Don't panic!</p>
+ </div>
+
+ <hr/>
+
+ <div class="row-fluid events">
+ <div class="span6">
+ <h4>An event</h4>
+ <p>Things about an event.</p>
+ <h4>An event</h4>
+ <p>Things about an event.</p>
+ <h4>An event</h4>
+ <p>Things about an event.</p>
+ </div>
+ <div class="span6">
+ <h4>An event</h4>
+ <p>Things about an event.</p>
+ <h4>An event</h4>
+ <p>Things about an event.</p>
+ <h4>An event</h4>
+ <p>Things about an event.</p>
+ </div>
+ </div>
+
+ <hr/>
+
+ <div class="footer">
+ <p><a name="about">About Stella</a></p>
+
+ <p>Stella by Starlight is named after a Charles Mingus song. It's a little weekend prototype that uses Scala, Scalatra, Bootstrap, and D3 to make interesting things.</p>
+
+ <p>&copy; 2013 Adam Keys</p>
+ </div>
+ </div>
+
+ <script src="http://code.jquery.com/jquery.js"></script>
+ <script src="js/bootstrap.min.js"></script>
+ </body>
+</html>

0 comments on commit 1284875

Please sign in to comment.
Something went wrong with that request. Please try again.