app/views/layouts/admin.html.erb in tkh_admin_panel-0.0.2 vs app/views/layouts/admin.html.erb in tkh_admin_panel-0.0.3
- old
+ new
@@ -19,34 +19,39 @@
</head>
<body>
<div class="container-fluid">
- <div class="row-fluid">
-
- <div id="main-content" class="span12">
- <p>
- <%= I18n.locale == :en ? link_to('switch to Spanish', locale: :es) : link_to('switch to English', locale: :en) %>
- </p>
+ <div class="row-fluid">
+ <div class="span12">
+ <p><b><%= I18n.locale == :en ? link_to('switch to Spanish', locale: :es) : link_to('switch to English', locale: :en) %></b></p>
<h1>Admin Panel<%= " for #{SETTINGS['site_name']}" if SETTINGS['site_name'] %></h1>
+
<% flash.each do |name, msg| %>
<div class="alert alert-<%= name == :notice ? "success" : "error" %>">
<a class="close" data-dismiss="alert">×</a>
<%= msg %>
</div>
<% end %>
-
+ </div>
+ </div>
+
+ <div class="row-fluid">
+ <div id="main-content" class="span9">
<%= yield %>
</div>
-
+ <div id="sidebar" class="span3">
+ <%= yield :admin_sidebar %>
+ </div>
</div><!--/row-->
</div> <!-- /container -->
- <div id="footer">
- <div id="ohlala-name">
- <p><%= SETTINGS['web_firm_name'] || "Ten Thousand Hours" %></p>
- </div>
- <p><%= SETTINGS['web_firm_short_url'] || "swami@TenThousandHours.eu" %></p>
+ <div class="row-fluid">
+ <footer class="span12">
+ <p><b><%= SETTINGS['web_shop_name'] || "Ten Thousand Hours" %></b><br />
+ <%= SETTINGS['web_shop_short_url'] ? link_to(SETTINGS['web_shop_short_url'], SETTINGS['web_shop_url']) : link_to("http://TenThousandHours.eu", 'http://TenThousandHours.eu') %><br />
+ <%= SETTINGS['web_shop_email'] ? link_to(SETTINGS['web_shop_email'], 'mailto:' + SETTINGS['web_shop_email']) : link_to("swami@TenThousandHours.eu", 'mailto:http://TenThousandHours.eu') %><br /></p>
+ </footer>
</div>
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->