admin.html.erb in tkh_admin_panel-0.9.19

- old
+ new

@@ -20,11 +20,11 @@
 	<body>
 
     <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <ul class="nav navbar-nav">
         <%= content_tag :li, link_to(Setting.first.try(:site_name), root_path) %>
-        <%= content_tag :li, link_to( 'blog', blog_path) %>
+        <%= content_tag :li, link_to( 'blog', blog_path) unless Setting.first.disable_blog? %>
       </ul>
       <ul class="nav navbar-nav navbar-right navbar-login-info">
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= current_user.email %> <b class="caret"></b></a>
           <ul class="dropdown-menu">
@@ -44,16 +44,11 @@
         </div>
       </div>
 
       <div class="row">
         <div class="col-xs-12 col-sm-9 col-lg-10">
-          <% flash.each do |name, msg| %>
-            <div class="alert alert-<%= name == :notice ? "success" : "danger" %>">
-              <a class="close" data-dismiss="alert">×</a>
-              <%= msg %>
-            </div>
-          <% end %>
+          <%= render 'shared/flash_messages' %>
           <%= yield %>
         </div>
 
         <div class="col-xs-12 col-sm-3 col-lg-2">
           <%= render 'shared/language_switcher' %>
@@ -75,15 +70,18 @@
     </div> <!-- /container -->
 
     <%= javascript_include_tag "admin" %>
 
     <% # the twitter typeahead javascript library needs all typeahead form fields to be present in DOM. this is an ugly hack %>
+    <% # FIXME - refactor this mess %>
     <% if controller.controller_name == 'pages' %>
       <%= javascript_include_tag 'admin/pages' %>
     <% elsif controller.controller_name == 'illustrations' %>
       <%= javascript_include_tag 'admin/illustrations' %>
     <% elsif controller.controller_name == 'menus' %>
       <%= javascript_include_tag 'admin/menus' %>
+    <% elsif controller.controller_name == 'courses' %>
+      <%= javascript_include_tag 'admin/courses' %>
     <% end %>
 
 	</body>
 </html>