layout.erb in juici-0.0.1.alpha1

- old
+ new
@@ -1,35 +1,44 @@
 <!doctype html>
 <html>
   <head>
-    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/styles/juici.css" rel="stylesheet">
-    <% if @page # This will 404 a ton of page XXX %>
-      <link href="/styles/<%= @page %>.css" rel="stylesheet">
-    <% end %>
+    <meta charset="UTF-8">
+  <% if ::Juici.env == "development" %>
+    <link href="/vendor/bootstrap.css" rel="stylesheet">
+    <script src="/vendor/jquery.js"></script>
+    <script src="/vendor/bootstrap.js"></script>
+  <% else %>
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap.min.css" rel="stylesheet">
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
-    <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/js/bootstrap.min.js"></script>
+    <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js"></script>
+  <% end %>
+    <link href="/styles/juici.css" rel="stylesheet">
+    <% styles.each do |style| %>
+      <link href="/styles/<%= style %>.css" rel="stylesheet">
+    <% end rescue nil%>
     <title>JuiCI</title>
     <% if @redirect_to %>
-      <meta http-equiv="Refresh" content="0; url=<%= URI.escape(@redirect_to) %>" />
+      <meta http-equiv="Refresh" content="0; url=<%= @redirect_to %>" />
     <% end %>
   </head>
   <body>
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="container-fluid">
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="<%= "active" if @page == :index %>"><a class="brand" href="/">JuiCI</a></li>
-              <li class="<%= "active" if @page == :builds && @action == :new %>"><a href="/builds/new">New Build</a></li>
-              <li class="<%= "active" if @page == :about %>"><a href="/about">About</a></li>
-              <li class="<%= "active" if @page == :support %>"><a href="/support">Support</a></li>
+              <% active rescue active = nil %>
+              <li class="main <%= "active" if active == :index %>"><a href="/">JuiCI</a></li>
+              <li class="<%= "active" if active == :new_build %>"><a href="/builds/new">New Build</a></li>
+              <li class="<%= "active" if active == :about %>"><a href="/about">About</a></li>
+              <li class="<%= "active" if active == :support %>"><a href="/support">Support</a></li>
+              <li class="<%= "active" if active == :queue %>"><a href="/queue">Build Queue</a></li>
             </ul>
           </div><!--/.nav-collapse -->
         </div>
       </div>
     </div>
-    <div class="container">
+    <div class="container-fluid">
       <%= yield %>
     </div>
   </body>
 </html>