lib/shortener/server/views/layout.haml in short-0.5.2 vs lib/shortener/server/views/layout.haml in short-0.5.3

@@ -1,24 +1,33 @@
 !!!
 %html
   %head
     %title Shortener
-    %link{rel: 'stylesheet', type: 'text/css', href: '/patched.bootstrap.min.css'}
-    %script{src: '/jquery.min.js', type: 'text/javascript'}
-    %script{src: 'site.js', type: 'text/javascript'}
+    %script{src: '//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js', type: 'text/javascript'}
+    %link{rel: 'stylesheet', type: 'text/css', href: '/css/bootstrap.min.css'}
+    %link{rel: 'stylesheet', type: 'text/css', href: '/css/bootstrap-responsive.min.css'}
+    %link{rel: 'stylesheet', type: 'text/css', href: '/css/shortener.css'}
+    %link{rel: 'stylesheet', type: 'text/css', href: '/css/colorbox.css'}
+    %script{src: '/js/site.js', type: 'text/javascript'}
+    %script{src: '/js/jquery.colorbox.js', type: 'text/javascript'}
+    %script{src: '/js/bootstrap.min.js', type: 'text/javascript'}
+    %script{src: '/js/jquery.tablesorter.min.js', type: 'text/javascript'}
   %body{:'padding-top' => '60px'}
 
-    %div.topbar
-      %div.topbar-inner
+    %div.navbar
+      %div.navbar-inner
         %div.container
           %a{class: 'brand', href: "/"} Shortener
           %ul.nav
             %li
+              %form{:id => 'nav-add-form',:name => "shortener", :action => "/add", :method => "post", :class => 'navbar-search pull-left'}
+                %input{:type => "text", :name => "shortener[url]", :class => "search-query span2", placeholder: 'Shorten'}
+            %li
               %a{href: '/index'} Index
             %li
-              %a{href: '/add'} Add
+              %a.colorbox{href: '/add'} Advanced Add
             - if $conf.s3_available
               %li
-                %a{href: '/upload'} Upload
+                %a.colorbox{href: '/upload'} Upload
 
     #main.container(style="margin-top: 40px;")
       = yield