Permalink
Browse files

Merge pull request #4 from dozed/master

Worked on navigation bar, added dropdown for book and api.
  • Loading branch information...
2 parents 1688b05 + 864bab3 commit 54341dd3fd54aa68e16cc682e775e5f4dabfc1c1 @jlarmstrong jlarmstrong committed Feb 22, 2012
@@ -0,0 +1,26 @@
+-@ val title: String
+-@ val body: String
+-@ val headExtra: String
+
+!!!
+html<
+ head
+ title= title
+ link(rel="stylesheet" type="text/css" href={uri("/css/bootstrap.css")})
+ link(rel="stylesheet" type="text/css" href={uri("/css/scalatra.css")})
+ script(type="text/javascript" src={uri("/js/jquery-1.7.1.min.js")})
+ script(type="text/javascript" src={uri("/js/bootstrap-dropdown.js")})
+ != headExtra
+ body<
+ div.navbar.navbar-fixed-top
+ div.navbar-inner
+ div.container
+ = include("/_navigation.jade")
+ div.wrapper
+ div.container
+ div#overview
+ = include("/_logo.jade")
+ div#content<
+ != body
+
+ = include("/_google_analytics.page")
@@ -1,23 +0,0 @@
--@ val title: String
--@ val body: String
--@ val headExtra: String
-
-!!!
-%html<
- %head
- %title= title
- %link(rel="stylesheet" type="text/css" href={uri("/css/scalatra.css")})
- != headExtra
- %body<
- %div.navbar
- %div.navbar-inner
- %div.container
- = include("/_navigation.ssp.md")
- %div.wrapper
- %div.container
- %div#overview
- = include("/_logo.ssp.md")
- %div#content<
- != body
-
- = include("/_google_analytics.page")
View
@@ -0,0 +1,3 @@
+.logo
+ img(src="/images/logo-x.png" alt="Scalatra logo" border="0")
+ p A tiny <a href="http://sinatrarb.com/" class="grey">Sinatra</a>-like web framework for <a href="http://www.scala-lang.org/">Scala</a>.
View
@@ -1,5 +0,0 @@
-<div class="logo">
- <img src="/images/logo-x.png" alt="Scalatra logo" border="0" />
- <p>A tiny <a href="http://sinatrarb.com/" class="grey">Sinatra</a>-like web framework
- for <a href="http://www.scala-lang.org/">Scala</a>.</p>
-</div>
View
@@ -0,0 +1,26 @@
+
+ul.nav
+ li
+ a(href={uri("/")}) Home
+ li.dropdown#book
+ a(class="dropdown-toggle" data-toggle="dropdown" href="#book") Book <b class="caret"></b>
+
+ ul.dropdown-menu
+ li
+ a(href={uri("/2.1/book")}) 2.1
+ li
+ a(href={uri("/2.0/book")}) 2.0
+ li
+ a(href={uri("/community.html")}) Community
+ li
+ a(href="http://github.com/scalatra") Source
+ li
+ a(href={uri("/built-with.html")}) Built With
+ li.dropdown#api
+ a(class="dropdown-toggle" data-toggle="dropdown" href="#api") API <b class="caret"></b>
+
+ ul.dropdown-menu
+ li
+ a(href={uri("/2.1/api")}) 2.1
+ li
+ a(href={uri("/2.0/api")}) 2.0
View
@@ -1,6 +0,0 @@
-- [Home](${uri("/")})
-- [Book](${uri("/stable/book")})
-- [Community](${uri("/community.html")})
-- [Source](${uri("http://github.com/scalatra")})
-- [Built With](${uri("/built-with.html")})
-- [API](${uri("/stable/api")})
Oops, something went wrong.

0 comments on commit 54341dd

Please sign in to comment.