tkh_admin_panel 0.2.5 → 0.2.5.1

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.
data/CHANGELOG.md CHANGED
@@ -2,6 +2,11 @@
2
2
 
3
3
 
4
4
 
5
+ ## 0.2.5.1
6
+
7
+ * Removed conditions in using the Setting model in admin layout
8
+
9
+
5
10
  ## 0.2.5
6
11
 
7
12
  * Fixed info in footer and place an hr tag above it
@@ -3,15 +3,7 @@
3
3
  <head>
4
4
  <meta charset="utf-8">
5
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
6
- <title>
7
- <% if defined?(Setting) && !Setting.first.site_name.blank? %>
8
- <%= t("admin_panel_for") + ' ' + Setting.first.site_name %>
9
- <% elsif defined?(APP_SETTINGS) && APP_SETTINGS['site_name'] %>
10
- <%= t("admin_panel_for") + ' ' + APP_SETTINGS['site_name'] %>
11
- <% else %>
12
- <%= t 'admin_panel' %>
13
- <% end %>
14
- </title>
6
+ <title><%= t("admin_panel_for") + ' ' + Setting.first.try(:site_name) %></title>
15
7
  <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
16
8
  <!--[if lt IE 9]>
17
9
  <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
@@ -32,15 +24,7 @@
32
24
  <div class="row-fluid">
33
25
  <div class="span12">
34
26
  <%= render 'shared/login_info' %>
35
- <h1>
36
- <% if defined?(Setting) && !Setting.first.site_name.blank? %>
37
- <%= (t("admin_panel_for") + ' ' + link_to(Setting.first.site_name, root_path)).html_safe %>
38
- <% elsif defined?(APP_SETTINGS) && APP_SETTINGS['site_name'] %>
39
- <%= t("admin_panel_for") + ' ' + APP_SETTINGS['site_name'] %>
40
- <% else %>
41
- <%= t 'admin_panel' %>
42
- <% end %>
43
- </h1>
27
+ <h1><%= (t("admin_panel_for") + ' ' + link_to(Setting.first.try(:site_name), root_path)).html_safe %></h1>
44
28
 
45
29
  <% flash.each do |name, msg| %>
46
30
  <div class="alert alert-<%= name == :notice ? "success" : "error" %>">
@@ -1,3 +1,3 @@
1
1
  module TkhAdminPanel
2
- VERSION = "0.2.5"
2
+ VERSION = "0.2.5.1"
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.5
4
+ version: 0.2.5.1
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-08 00:00:00.000000000 Z
12
+ date: 2013-01-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties