app/views/layouts/admin.html.erb in tkh_admin_panel-0.2.8 vs app/views/layouts/admin.html.erb in tkh_admin_panel-0.3
- old
+ new
@@ -14,19 +14,39 @@
<%= favicon_link_tag %>
<link href="images/apple-touch-icon.png" rel="apple-touch-icon">
<link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72">
<link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
<%= csrf_meta_tag %>
+ <% # This line ensures javascript code can access the current locale from Rails %>
<script type="text/javascript">var tkh_locale = '<%= I18n.locale.to_s %>';</script>
</head>
<body>
+ <div class="navbar navbar-fixed-top navbar-inverse">
+ <div class="navbar-inner">
+ <div class="container">
+ <ul class="nav">
+ <%= content_tag :li, link_to(Setting.first.try(:site_name), root_path) %>
+ <%= content_tag :li, link_to('blog', blog_path) %>
+ <li class='dropdown'>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= current_user.email %> <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <%= content_tag :li, link_to('logout', logout_path) %>
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
- <%= render 'shared/login_info' %>
- <h1><%= (t("admin_panel_for") + ' ' + link_to(Setting.first.try(:site_name), root_path)).html_safe %></h1>
+ <h1>
+ <%= t "admin_panel" %><br />
+ <%= image_tag 'admin-logo.png', alt: 'Ten Thousand Hours logo' %>
+ </h1>
<% flash.each do |name, msg| %>
<div class="alert alert-<%= name == :notice ? "success" : "error" %>">
<a class="close" data-dismiss="alert">×</a>
<%= msg %>