kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Roadmap enhancements (closes #697, #698): 

* separate related issues from wiki contents
* leading h1 in version wiki pages is hidden (done using css, won't work with IE6)
* smaller wiki headings
* xhtml validation

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1168 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-02-21 19:49:47 +00:00
parent 7d10755072
commit ade572048a
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/projects/roadmap.rhtml
View File

@ -2,8 +2,8 @@
<% if @versions.empty? %> <% if @versions.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p> <p class="nodata"><%= l(:label_no_data) %></p>
<% end %> <% else %>
<div id="roadmap">
<% @versions.each do |version| %> <% @versions.each do |version| %>
<%= tag 'a', :name => version.name %> <%= tag 'a', :name => version.name %>
<h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3> <h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>
@ -16,8 +16,9 @@
:order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") unless @selected_tracker_ids.empty? :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") unless @selected_tracker_ids.empty?
issues ||= [] issues ||= []
%> %>
<ul>
<% if issues.size > 0 %> <% if issues.size > 0 %>
<fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
<ul>
<% issues.each do |issue| %> <% issues.each do |issue| %>
<li> <li>
<%= link = link_to_issue(issue) <%= link = link_to_issue(issue)
@ -25,19 +26,22 @@
<%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %> <%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
</li> </li>
<% end %> <% end %>
<% end %>
</ul> </ul>
</fieldset>
<% end %>
<% end %>
</div>
<% end %> <% end %>
<% content_for :sidebar do %> <% content_for :sidebar do %>
<% form_tag do %> <% form_tag do %>
<h3><%= l(:label_roadmap) %></h3> <h3><%= l(:label_roadmap) %></h3>
<% @trackers.each do |tracker| %> <% @trackers.each do |tracker| %>
<label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
<%= tracker.name %></label><br /> <%= tracker.name %></label><br />
<% end %> <% end %>
<br /> <br />
<label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %> <label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p> <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
<% end %> <% end %>

6
public/stylesheets/application.css
View File

@ -163,6 +163,12 @@ div#activity dt { margin-bottom: 1px; }
div#activity dt .time { color: #777; font-size: 80%; } div#activity dt .time { color: #777; font-size: 80%; }
div#activity dd .description { font-style: italic; } div#activity dd .description { font-style: italic; }
div#roadmap fieldset.related-issues { margin-bottom: 1em; }
div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }
div#roadmap .wiki h1:first-child { display: none; }
div#roadmap .wiki h1 { font-size: 120%; }
div#roadmap .wiki h2 { font-size: 110%; }
.autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;} .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
#user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; } #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }