From e371bcad24aa64f0a5a3bcc22ad50794d60d44c1 Mon Sep 17 00:00:00 2001
From: Romano Licker <r.licker@finn.de>
Date: Fri, 7 Oct 2011 17:09:45 +0200
Subject: [PATCH] [#692] fixes admin-menu new design on ticket view filter /
 options / attachments fieldset redesign

---
 app/controllers/admin_controller.rb           |  4 +++
 .../ldap_auth_sources_controller.rb           |  1 +
 app/views/issues/_edit.rhtml                  |  2 +-
 app/views/issues/index.rhtml                  |  4 +--
 app/views/issues/show.rhtml                   |  4 +--
 app/views/layouts/admin.rhtml                 |  2 +-
 app/views/layouts/base.rhtml                  | 33 +++++++++----------
 public/stylesheets/application.css            |  9 +----
 8 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 4b0d4ff4..ab3e0d48 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -19,6 +19,10 @@ class AdminController < ApplicationController
 
   include SortHelper
 
+  menu_item :projects, :only => [:projects]
+  menu_item :plugins, :only => [:plugins]
+  menu_item :info, :only => [:info]
+
   def index
     @no_configuration_data = Redmine::DefaultData::Loader::no_data?
   end
diff --git a/app/controllers/ldap_auth_sources_controller.rb b/app/controllers/ldap_auth_sources_controller.rb
index 33c7a297..a637b4d2 100644
--- a/app/controllers/ldap_auth_sources_controller.rb
+++ b/app/controllers/ldap_auth_sources_controller.rb
@@ -14,6 +14,7 @@
 
 class LdapAuthSourcesController < AuthSourcesController
 
+  menu_item :ldap_authentication, :only => [:index]
   protected
 
   def auth_source_class
diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index d376b36a..04072a66 100644
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -38,7 +38,7 @@
     <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
     </fieldset>
 
-    <fieldset id="attachments" class="collapsible collapsed borders"><legend onclick="toggleFieldset(this);"><%=l(:label_attachment_plural)%></legend>
+    <fieldset id="attachments" class="header_collapsible collapsible collapsed"><legend onclick="toggleFieldset(this);"><%=l(:label_attachment_plural)%></legend>
       <div style="display: none;">
       <%= render :partial => 'attachments/form' %>
       </div>
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index c7cb5156..d9ace57e 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -17,13 +17,13 @@
 <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
     <%= hidden_field_tag('project_id', @project.to_param) if @project %>
 		<div id="query_form_content" class="hide-when-print">
-    <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
+    <fieldset id="filters" class="header_collapsible collapsible <%= @query.new_record? ? "" : "collapsed" %>">
     	<legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
     	<div class="filter-fields" style="<%= @query.new_record? ? "" : "display: none;" %>">
     		<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
     	</div>
     </fieldset>
-    <fieldset class="collapsible collapsed">
+    <fieldset id="column_options" class="header_collapsible collapsible collapsed">
     	<legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
     	<div style="display: none;">
     		<table>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index caed97e3..9c952bb8 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -1,5 +1,5 @@
 <div class="title-bar" id="upper-title-bar">
-  <div class="subject"><%= content_tag('h2', h(@issue.subject)) %></div>
+  <div class="subject"><%= content_tag('h2', h(@issue.tracker.name) + ' #' +@issue.id.to_s) %></div>
 
   <div class="title-bar-actions">
   <%= render :partial => 'action_menu' %>
@@ -11,7 +11,7 @@
     <%= avatar(@issue.author, :size => "40") %>
   </div>
   <h3>
-    <%= h(@issue.tracker.name) %> #<%= @issue.id %>
+    <%=h(@issue.subject)  %>
   </h3>
   <hr />
 
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index 93d35bf0..bf376abb 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -1,5 +1,5 @@
 <% @page_header_title = l(:label_administration) %>
-<% content_for :sidebar do %>
+<% content_for :main_menu do %>
 	<%= render :partial => 'admin/menu' %>
 <% end %>
 
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 324eb3da..5841d3e4 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -106,34 +106,33 @@
   </div>
       
   <% main_menu = render_main_menu(@project) %>
-  <% if has_content?(:sidebar) || !main_menu.blank? %>
+  <% if (side_displayed = has_content?(:sidebar) || has_content?(:main_menu) || !main_menu.blank?) %>
   <% display_sidebar = true %>
   <% else %>
   <% display_sidebar = false %>
   <% end %>
-  <div id="main" class="<%= display_sidebar ? '' : "nosidebar" %>">
-    <div id="main-menu">
-      <%= main_menu %>
-      <%= yield :main_menu %>
-    <% if display_sidebar %>
-      <!-- Sidebar -->
-      <div id="sidebar">        
-        <%= yield :sidebar %>
-        <%= call_hook :view_layouts_base_sidebar %>
+  <div id="main" class="<%= side_displayed ? '' : "nosidebar" %>">
+    <% if (side_displayed) %>
+      <div id="main-menu">
+        <%= main_menu %>
+        <%= yield :main_menu %>
+      <% if display_sidebar %>
+        <!-- Sidebar -->
+        <div id="sidebar">        
+          <%= yield :sidebar %>
+          <%= call_hook :view_layouts_base_sidebar %>
+        </div>
+      <% end %>
       </div>
+
+      <%= expand_current_menu %>
     <% end %>
-    </div>
-
-    <%= expand_current_menu %>
-
-    <div class="<%= display_sidebar ? '' : "nosidebar" %>" id="content">
+    <div class="<%= side_displayed ? '' : "nosidebar" %>" id="content">
       <%= render_flash_messages %>
       <%= yield %>
       <%= call_hook :view_layouts_base_content %>
       <div style="clear:both;">&nbsp;</div>
-
     </div>
-
   </div>
 
   <div id="footer">
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index fa3a9c76..c05fd089 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -253,7 +253,7 @@ blockquote blockquote { margin-left: 0;}
 acronym  { border-bottom: 1px dotted; cursor: help; }
 textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
-div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
+div.issue {padding:6px; margin-bottom:6px;}
 p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
 p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; } 
 p.footnote { font-size: 0.9em; margin-top: 0px; margin-bottom: 0px; }
@@ -266,9 +266,6 @@ div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;}
 #issue_tree table.issues { border: 0; }
 #issue_tree td.checkbox {display:none;}
 
-#content fieldset#filters {
-    padding-bottom:10px;
-  }
 fieldset#filters legend {
     -moz-border-radius-bottomleft:0px;
     -moz-border-radius-bottomright:0px;
@@ -322,10 +319,6 @@ fieldset.collapsible.header_collapsible legend {
     border-bottom-right-radius:0px;
 }
 
-fieldset.collapsible.header_collapsible legend:hover {
-  background-color:#d8d8d8;
-}
-
 fieldset.collapsible.collapsed.header_collapsible legend {
     background-image:url(../images/projectnavi_arrow_down.png);
     -moz-border-radius:5px;