[#692] fixes admin-menu

new design on ticket view
filter / options / attachments fieldset redesign
This commit is contained in:
Romano Licker 2011-10-07 17:09:45 +02:00 committed by Eric Davis
parent 0eeeb04c31
commit e371bcad24
8 changed files with 28 additions and 31 deletions

View File

@ -19,6 +19,10 @@ class AdminController < ApplicationController
include SortHelper include SortHelper
menu_item :projects, :only => [:projects]
menu_item :plugins, :only => [:plugins]
menu_item :info, :only => [:info]
def index def index
@no_configuration_data = Redmine::DefaultData::Loader::no_data? @no_configuration_data = Redmine::DefaultData::Loader::no_data?
end end

View File

@ -14,6 +14,7 @@
class LdapAuthSourcesController < AuthSourcesController class LdapAuthSourcesController < AuthSourcesController
menu_item :ldap_authentication, :only => [:index]
protected protected
def auth_source_class def auth_source_class

View File

@ -38,7 +38,7 @@
<%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %> <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
</fieldset> </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;"> <div style="display: none;">
<%= render :partial => 'attachments/form' %> <%= render :partial => 'attachments/form' %>
</div> </div>

View File

@ -17,13 +17,13 @@
<% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %> <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
<%= hidden_field_tag('project_id', @project.to_param) if @project %> <%= hidden_field_tag('project_id', @project.to_param) if @project %>
<div id="query_form_content" class="hide-when-print"> <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> <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
<div class="filter-fields" style="<%= @query.new_record? ? "" : "display: none;" %>"> <div class="filter-fields" style="<%= @query.new_record? ? "" : "display: none;" %>">
<%= render :partial => 'queries/filters', :locals => {:query => @query} %> <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
</div> </div>
</fieldset> </fieldset>
<fieldset class="collapsible collapsed"> <fieldset id="column_options" class="header_collapsible collapsible collapsed">
<legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend> <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
<div style="display: none;"> <div style="display: none;">
<table> <table>

View File

@ -1,5 +1,5 @@
<div class="title-bar" id="upper-title-bar"> <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"> <div class="title-bar-actions">
<%= render :partial => 'action_menu' %> <%= render :partial => 'action_menu' %>
@ -11,7 +11,7 @@
<%= avatar(@issue.author, :size => "40") %> <%= avatar(@issue.author, :size => "40") %>
</div> </div>
<h3> <h3>
<%= h(@issue.tracker.name) %> #<%= @issue.id %> <%=h(@issue.subject) %>
</h3> </h3>
<hr /> <hr />

View File

@ -1,5 +1,5 @@
<% @page_header_title = l(:label_administration) %> <% @page_header_title = l(:label_administration) %>
<% content_for :sidebar do %> <% content_for :main_menu do %>
<%= render :partial => 'admin/menu' %> <%= render :partial => 'admin/menu' %>
<% end %> <% end %>

View File

@ -106,34 +106,33 @@
</div> </div>
<% main_menu = render_main_menu(@project) %> <% 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 %> <% display_sidebar = true %>
<% else %> <% else %>
<% display_sidebar = false %> <% display_sidebar = false %>
<% end %> <% end %>
<div id="main" class="<%= display_sidebar ? '' : "nosidebar" %>"> <div id="main" class="<%= side_displayed ? '' : "nosidebar" %>">
<div id="main-menu"> <% if (side_displayed) %>
<%= main_menu %> <div id="main-menu">
<%= yield :main_menu %> <%= main_menu %>
<% if display_sidebar %> <%= yield :main_menu %>
<!-- Sidebar --> <% if display_sidebar %>
<div id="sidebar"> <!-- Sidebar -->
<%= yield :sidebar %> <div id="sidebar">
<%= call_hook :view_layouts_base_sidebar %> <%= yield :sidebar %>
<%= call_hook :view_layouts_base_sidebar %>
</div>
<% end %>
</div> </div>
<%= expand_current_menu %>
<% end %> <% end %>
</div> <div class="<%= side_displayed ? '' : "nosidebar" %>" id="content">
<%= expand_current_menu %>
<div class="<%= display_sidebar ? '' : "nosidebar" %>" id="content">
<%= render_flash_messages %> <%= render_flash_messages %>
<%= yield %> <%= yield %>
<%= call_hook :view_layouts_base_content %> <%= call_hook :view_layouts_base_content %>
<div style="clear:both;">&nbsp;</div> <div style="clear:both;">&nbsp;</div>
</div> </div>
</div> </div>
<div id="footer"> <div id="footer">

View File

@ -253,7 +253,7 @@ blockquote blockquote { margin-left: 0;}
acronym { border-bottom: 1px dotted; cursor: help; } acronym { border-bottom: 1px dotted; cursor: help; }
textarea.wiki-edit { width: 99%; } textarea.wiki-edit { width: 99%; }
li p {margin-top: 0;} 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.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.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; } 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 table.issues { border: 0; }
#issue_tree td.checkbox {display:none;} #issue_tree td.checkbox {display:none;}
#content fieldset#filters {
padding-bottom:10px;
}
fieldset#filters legend { fieldset#filters legend {
-moz-border-radius-bottomleft:0px; -moz-border-radius-bottomleft:0px;
-moz-border-radius-bottomright:0px; -moz-border-radius-bottomright:0px;
@ -322,10 +319,6 @@ fieldset.collapsible.header_collapsible legend {
border-bottom-right-radius:0px; border-bottom-right-radius:0px;
} }
fieldset.collapsible.header_collapsible legend:hover {
background-color:#d8d8d8;
}
fieldset.collapsible.collapsed.header_collapsible legend { fieldset.collapsible.collapsed.header_collapsible legend {
background-image:url(../images/projectnavi_arrow_down.png); background-image:url(../images/projectnavi_arrow_down.png);
-moz-border-radius:5px; -moz-border-radius:5px;