1 files changed, 26 insertions, 27 deletions
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index d85eecbf2..a58913892 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -1,39 +1,38 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html>
 <html lang="en-gb">
     <head>
       <meta http-equiv="content-type" content="text/html;charset=UTF-8" >
       <title><%= site_name %> admin<%= @title ? ":" : "" %> <%=@title%></title>
-      
-      <%= javascript_include_tag 'jquery.js', 'jquery-ui.min' %>
 
+      <%= javascript_include_tag '/javascripts/jquery.js', '/admin/javascripts/jquery-ui.min.js', '/admin/javascripts/bootstrap-collapse', '/admin/javascripts/bootstrap-tab', '/admin/javascripts/admin' %>
       <%= stylesheet_link_tag 'admin-theme/jquery-ui-1.8.15.custom.css', :rel => 'stylesheet'%>
-      <%= stylesheet_link_tag 'admin', :title => "Main", :rel => "stylesheet"  %>
+      <%= stylesheet_link_tag "/admin/stylesheets/admin", :title => "Main", :rel => "stylesheet" %>
+
     </head>
     <body class="admin">
+      <div id="main" class="container">
+        <%= render :partial => 'admin_general/admin_navbar' %>
+        <% if flash[:error] %>
+          <div class="row">
+            <div class="span12">
+              <div class="alert alert-error">
+                <%= flash[:error] %>
+              </div>
+            </div>
+          </div>
+        <% end %>
 
-    <p>
-    <strong><%= link_to 'Alaveteli', main_url('/') %> admin:</strong> 
-    <%= link_to 'Summary', admin_url("") %>
-    | <%= link_to 'Timeline', admin_url("timeline") %>
-    | <%= link_to 'Stats', admin_url("stats") %>
-    | <%= link_to 'Debug', admin_url("debug") %>
-    <strong>View:</strong>
-    <%= link_to 'Authorities', admin_url("body/list") %>
-    | <%= link_to 'Requests', admin_url("request/list") %>
-    | <%= link_to 'Users', admin_url("user/list") %>
-    | <%= link_to 'Tracks', admin_url("track/list") %>
-    </p>
-    <%= render :partial => 'general/locale_switcher' %>
-
-    <% if flash[:error] %>
-        <p id="error"><%= flash[:error] %></p>
-    <% end %>
-
-    <% if flash[:notice] %>
-        <p id="notice"><%= flash[:notice] %></p>
-    <% end %>
+        <% if flash[:notice] %>
+          <div class="row">
+            <div class="span12">
+              <div class="alert alert-info">
+                <%= flash[:notice] %>
+              </div>
+            </div>
+          </div>
+        <% end %>
 
-    <%= yield  %>
-    
+        <%= yield  %>
+      </div>
     </body>
 </html>