aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/layouts/admin.rhtml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/layouts/admin.rhtml')
-rw-r--r--app/views/layouts/admin.rhtml51
1 files changed, 25 insertions, 26 deletions
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index bc076bf40..447b24537 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -3,37 +3,36 @@
<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', frontpage_path %> admin:</strong>
- <%= link_to 'Summary', admin_general_index_path %>
- | <%= link_to 'Timeline', admin_timeline_path %>
- | <%= link_to 'Stats', admin_stats_path %>
- | <%= link_to 'Debug', admin_debug_path %>
- <strong>View:</strong>
- <%= link_to 'Authorities', admin_body_list_path %>
- | <%= link_to 'Requests', admin_request_list_path %>
- | <%= link_to 'Users', admin_user_list_path %>
- | <%= link_to 'Tracks', admin_track_list_path %>
- </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>