_header_area.html.erb in skylinecms-3.1.0

- old
+ new

@@ -1,8 +1,8 @@
 <div id="headerArea">
   <div id="header">
-  	<img src="<%= Skyline::Configuration.skyline_logo %>" alt="" />
+  	<img src="<%= Skyline::Configuration.skyline_logo %>" alt="" height="19"/>
 
     <div id="usernavigation">
       <%= t(:logged_in_as, :user => current_user.display_name, :scope => [:authentication])  %>
       (<%= link_to_remote t(:logout, :scope => [:authentication]), :url => skyline_authentication_path  ,:method => :delete  %>)
     </div>
@@ -12,13 +12,15 @@
     
   	<% if Skyline::Configuration.custom_logo %>
   	  <img src="/skyline/images/logo.png" alt="powered by Skyline"  style="position: absolute; right: 10px; top: 5px"/>
   	<% end %>
     <ul>
-      <li>
-        <%= link_to t(:pages, :scope => [:navigation,:mainnavigation]), skyline_articles_path(:type => Skyline::Page), :class => (current_menu_item == :pages ? "active" : nil) %>
-      </li>
+      <% if Skyline::Configuration.enable_pages %>
+        <li>
+          <%= link_to t(:pages, :scope => [:navigation,:mainnavigation]), skyline_articles_path(:type => Skyline::Page), :class => (current_menu_item == :pages ? "active" : nil) %>
+        </li>
+      <% end %>
       <% if (Skyline::Configuration.articles + Skyline::Configuration.content_classes).any? %>
         <li>
           <%= link_to t(:content_library, :scope => [:navigation,:mainnavigation]), {:controller => "/skyline/content", :action => "index"}, :class => (current_menu_item == :content_library ? "active" : nil) %>
         </li>      
       <% end %>
@@ -27,10 +29,10 @@
       </li>
       <% if @current_user.allow?(:settings_update) || @current_user.allow?(:user_show) %>
         <li class="has-children">
           <span <%= 'class="active"' if current_menu_item == :admin %>><%= t(:admin, :scope => [:navigation,:mainnavigation]) %></span>
           <ul>
-            <% if @current_user.allow?(:settings_update) %>
+            <% if @current_user.allow?(:settings_update) && Skyline::Content::Implementation.instance.has_settings? %>
               <li><%= link_to t(:settings, :scope => [:navigation,:mainnavigation]), skyline_settings_path %></li>
             <% end %>
             <% if @current_user.allow?(:user_show) %>            
               <li><%= link_to t(:users, :scope => [:navigation,:mainnavigation]), skyline_users_path %></li>
             <% end %>
\ No newline at end of file