Whitespace fixes for layouts erb files

[rails.git] / app / views / layouts / _header.html.erb

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 946f95febf22f23aee9ba1391a70c2ab247be514..65b1729f0464aeb6e9cf63d3f6e0ae6d7e10dc99 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -13,10 +13,12 @@
     <%= content_for :header %>
     <ul>
       <li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
     <%= content_for :header %>
     <ul>
       <li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">

-        <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink editlink",
+        <%= link_to t('layouts.edit'),
+                    edit_path,
+                    :class => "tab geolink editlink",

                     :id => 'editanchor',
                     :id => 'editanchor',

-                    :data => { :editor => preferred_editor }
-        %><a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>
+                    :data => { :editor => preferred_editor } %>
+        <a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>

         <ul class='dropdown-menu'>
           <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
             <li>
         <ul class='dropdown-menu'>
           <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
             <li>


@@ -54,7 +56,7 @@
       <li id="compact-secondary-nav" class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= t 'layouts.more' %> <b class="caret"></b></a>
         <ul class="dropdown-menu">
       <li id="compact-secondary-nav" class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= t 'layouts.more' %> <b class="caret"></b></a>
         <ul class="dropdown-menu">

-          <% if can? :index, Issue %>
+          <% if Settings.status != "database_offline" && can?(:index, Issue) %>

             <li class="<%= current_page_class(issues_path) %>">
               <%= link_to issues_path(:status => 'open') do %>
                 <%= open_issues_count %>
             <li class="<%= current_page_class(issues_path) %>">
               <%= link_to issues_path(:status => 'open') do %>
                 <%= open_issues_count %>


@@ -73,10 +75,14 @@
     <% if current_user && current_user.id %>
       <div class='dropdown user-menu logged-in'>
         <a class='dropdown-toggle' data-toggle='dropdown' href="#">
     <% if current_user && current_user.id %>
       <div class='dropdown user-menu logged-in'>
         <a class='dropdown-toggle' data-toggle='dropdown' href="#">

-          <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25)
-          %><%= render :partial => 'layouts/inbox'
-        %><span class="user-button"><span class='username'><%= current_user.display_name %></span>
-          <b class="caret"></b></span>
+          <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25) %>
+          <%= render :partial => 'layouts/inbox' %>
+          <span class="user-button">
+            <span class='username'>
+              <%= current_user.display_name %>
+            </span>
+            <b class="caret"></b>
+          </span>

         </a>
         <ul class='dropdown-menu'>
           <li>
         </a>
         <ul class='dropdown-menu'>
           <li>