From ade572048a768c0ee330d444216469c0e9d97f42 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 21 Feb 2008 19:49:47 +0000
Subject: [PATCH] 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
---
app/views/projects/roadmap.rhtml | 16 ++++++++++------
public/stylesheets/application.css | 6 ++++++
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index fbfec4727..6a1b6b099 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -2,8 +2,8 @@
<% if @versions.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-
+<% else %>
+<div id="roadmap">
<% @versions.each do |version| %>
<%= tag 'a', :name => version.name %>
<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?
issues ||= []
%>
+ <% if issues.size > 0 %>
+ <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
<ul>
- <% if issues.size > 0 %>
<% issues.each do |issue| %>
<li>
<%= link = link_to_issue(issue)
@@ -25,19 +26,22 @@
<%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
</li>
<% end %>
- <% end %>
</ul>
+ </fieldset>
+ <% end %>
+<% end %>
+</div>
<% end %>
<% content_for :sidebar do %>
<% form_tag do %>
<h3><%= l(:label_roadmap) %></h3>
<% @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 />
<% end %>
<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>
<% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index bfc66f75e..cffcab26f 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -163,6 +163,12 @@ div#activity dt { margin-bottom: 1px; }
div#activity dt .time { color: #777; font-size: 80%; }
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;}
#user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
--
GitLab