tkh_admin_panel 0.2.8 → 0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -16,16 +16,36 @@
16
16
  <link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72">
17
17
  <link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
18
18
  <%= csrf_meta_tag %>
19
+ <% # This line ensures javascript code can access the current locale from Rails %>
19
20
  <script type="text/javascript">var tkh_locale = '<%= I18n.locale.to_s %>';</script>
20
21
  </head>
21
22
 
22
23
  <body>
23
24
 
25
+ <div class="navbar navbar-fixed-top navbar-inverse">
26
+ <div class="navbar-inner">
27
+ <div class="container">
28
+ <ul class="nav">
29
+ <%= content_tag :li, link_to(Setting.first.try(:site_name), root_path) %>
30
+ <%= content_tag :li, link_to('blog', blog_path) %>
31
+ <li class='dropdown'>
32
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= current_user.email %> <b class="caret"></b></a>
33
+ <ul class="dropdown-menu">
34
+ <%= content_tag :li, link_to('logout', logout_path) %>
35
+ </ul>
36
+ </li>
37
+ </ul>
38
+ </div>
39
+ </div>
40
+ </div>
41
+
24
42
  <div class="container-fluid">
25
43
  <div class="row-fluid">
26
44
  <div class="span12">
27
- <%= render 'shared/login_info' %>
28
- <h1><%= (t("admin_panel_for") + ' ' + link_to(Setting.first.try(:site_name), root_path)).html_safe %></h1>
45
+ <h1>
46
+ <%= t "admin_panel" %><br />
47
+ <%= image_tag 'admin-logo.png', alt: 'Ten Thousand Hours logo' %>
48
+ </h1>
29
49
 
30
50
  <% flash.each do |name, msg| %>
31
51
  <div class="alert alert-<%= name == :notice ? "success" : "error" %>">
@@ -8,7 +8,7 @@
8
8
  <strong>Enable comments in pages?:</strong> <%= @setting.enable_comments_in_pages? ? "<span class=\"label label-success\">✓</span>".html_safe : "<span class=\"label label-important\">X</span>".html_safe %><br />
9
9
  <strong>Blog enabled?:</strong> <%= @setting.disable_blog? ? "<span class=\"label label-important\">X</span>".html_safe : "<span class=\"label label-success\">✓</span>".html_safe %><br />
10
10
  <strong>Blog name:</strong> <%= @setting.blog_name %><br />
11
- <strong>Site name:</strong> <%= @setting.blog_tagline %><br />
11
+ <strong>Blog tagline:</strong> <%= @setting.blog_tagline %><br />
12
12
  <strong>Enable comments in blog?:</strong> <%= @setting.enable_comments_in_blog? ? "<span class=\"label label-success\">✓</span>".html_safe : "<span class=\"label label-important\">X</span>".html_safe %>
13
13
  </p>
14
14
 
@@ -1,3 +1,3 @@
1
1
  module TkhAdminPanel
2
- VERSION = "0.2.8"
2
+ VERSION = "0.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tkh_admin_panel
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.8
4
+ version: '0.3'
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-01-26 00:00:00.000000000 Z
12
+ date: 2013-01-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
@@ -89,10 +89,12 @@ files:
89
89
  - LICENSE
90
90
  - README.md
91
91
  - Rakefile
92
+ - app/assets/images/admin-logo.png
92
93
  - app/assets/javascripts/admin.js
93
94
  - app/assets/javascripts/custom.js.coffee
94
95
  - app/assets/stylesheets/admin.css.scss
95
96
  - app/assets/stylesheets/bootstrap_and_overrides.css.scss
97
+ - app/assets/stylesheets/united.css.scss
96
98
  - app/controllers/settings_controller.rb
97
99
  - app/mailers/admin_mailer.rb
98
100
  - app/models/setting.rb