jro_apps/redmine Commit - r513:8e24c6458da0

app/controllers/projects_controller.rb +3 -2

               def roadmap
                 @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
+                conditions = ("1" == params[:completed] ? nil : [ "#{Version.table_name}.effective_date > ?", Date.today])
                 @versions = @project.versions.find(:all,
-                  :conditions => [ "#{Version.table_name}.effective_date>?", Date.today],
+                  :conditions => conditions,
                   :order => "#{Version.table_name}.effective_date ASC"
                 )
               end

app/helpers/projects_helper.rb +9 0

@@ -16,4 +16,13
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	module ProjectsHelper	18	module ProjectsHelper
		19	def link_to_version(version, options = {})
		20	return '' unless version && version.is_a?(Version)
		21	link_to version.name, {:controller => 'projects',
		22	:action => 'roadmap',
		23	:id => version.project_id,
		24	:completed => (version.completed? ? 1 : nil),
		25	:anchor => version.name
		26	}, options
		27	end
19	end	28	end

app/models/version.rb +4 0

                 effective_date
               end
+              def completed?
+                effective_date && effective_date <= Date.today
+              end
             private
               def check_integrity
                 raise "Can't delete version" if self.fixed_issues.find(:first)

app/views/projects/calendar.rhtml +1 -1

                     </span>
             		</div>
             		<% else %>
-                    <%= image_tag('milestone.png') %> <small><%= "#{l(:label_version)}: #{i.name}" %></small>
+                    <small><%= link_to_version i, :class => "icon icon-package" %></small>
             		<% end %>
             	<% end %>
                 </td>

app/views/projects/changelog.rhtml +2 -5

             <h2><%=l(:label_change_log)%></h2>
-            <div>
             <div class="rightbox" style="width:140px;">
             <% form_tag do %>
-            <p><strong><%=l(:label_tracker_plural)%></strong></p>
+            <p><strong><%=l(:label_tracker_plural)%></strong><br />
             <% @trackers.each do |tracker| %>
               <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
               <%= tracker.name %><br />
-            <% end %>
+            <% end %></p>
             <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
             <% end %>
             </div>
                 end %>
                 <li><%= link_to_issue issue %>: <%=h issue.subject %></li>
             <% end %>
-            </div>
  No newline at end of file

app/views/projects/gantt.rhtml +1 -1

                   	<%= link_to_issue i %><%= " (#{i.project.name})" unless @project && @project == i.project %>:
                   	<%=h i.subject %>
               	<% else %>
-                  	<strong><%= "#{l(:label_version)}: #{i.name}" %></strong>
+                  	<%= link_to_version i, :class => "icon icon-package" %>
               	<% end %>
               	</small></div>
                 <% top = top + 20

app/views/projects/roadmap.rhtml +12 -10

             <h2><%=l(:label_roadmap)%></h2>
-            <div>
+            <div class="rightbox">
-            <div class="rightbox" style="width:140px;">
             <% form_tag do %>
-            <p><strong><%=l(:label_tracker_plural)%></strong></p>
+            <p><strong><%=l(:label_tracker_plural)%></strong><br />
             <% @trackers.each do |tracker| %>
               <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
               <%= tracker.name %><br />
-            <% end %>
+            <% end %></p>
+            <p class="small"><label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label></p>
             <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
             <% end %>
             </div>
             <% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
             <% @versions.each do |version| %>
-                <h3 class="icon22 icon22-package"><%= version.name %></h3>
+                <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
+                <% if version.completed? %>
+                  <p><%= format_date(version.effective_date) %></p>
+                <% else %>
+                  <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
+                <% end %>
                 <p><%=h version.description %></p>
-                <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
                 <% issues = version.fixed_issues.find(:all,
-                                             :include => :status,
+                                             :include => [:status, :tracker],
                                              :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
-                                             :order => "position")
+                                             :order => "#{Tracker.table_name}.position")
                    total = issues.size
                    complete = issues.inject(0) {|c,i| i.status.is_closed? ? c + 1 : c }
                   <% end %>
                 </ul>
             <% end %>
-            </div>

lang/bg.yml +1 0

             label_start_to_end: start to end
             label_stay_logged_in: Stay logged in
             label_disabled: disabled
+            label_show_completed_versions: Show completed versions
             button_login: Вход
             button_submit: Изпращане

lang/de.yml +1 0

             label_start_to_end: start to end
             label_stay_logged_in: Stay logged in
             label_disabled: disabled
+            label_show_completed_versions: Show completed versions
             button_login: Einloggen
             button_submit: OK

lang/en.yml +1 0

             label_start_to_end: start to end
             label_stay_logged_in: Stay logged in
             label_disabled: disabled
+            label_show_completed_versions: Show completed versions
             button_login: Login
             button_submit: Submit

lang/es.yml +1 0

             label_start_to_end: start to end
             label_stay_logged_in: Stay logged in
             label_disabled: disabled
+            label_show_completed_versions: Show completed versions
             button_login: Conexión
             button_submit: Someter

lang/fr.yml +1 0

             label_start_to_end: début à fin
             label_stay_logged_in: Rester connecté
             label_disabled: désactivé
+            label_show_completed_versions: Voire les versions passées
             button_login: Connexion
             button_submit: Soumettre

lang/it.yml +1 0

             label_start_to_end: start to end
             label_stay_logged_in: Stay logged in
             label_disabled: disabled
+            label_show_completed_versions: Show completed versions
             button_login: Login
             button_submit: Invia

lang/ja.yml +1 0

             label_start_to_end: start to end
             label_stay_logged_in: Stay logged in
             label_disabled: disabled
+            label_show_completed_versions: Show completed versions
             button_login: ログイン
             button_submit: 変更

lang/pt.yml +1 0

             label_start_to_end: start to end
             label_stay_logged_in: Stay logged in
             label_disabled: disabled
+            label_show_completed_versions: Show completed versions
             button_login: Login
             button_submit: Enviar

lang/zh.yml +1 0

             label_start_to_end: start to end
             label_stay_logged_in: Stay logged in
             label_disabled: disabled
+            label_show_completed_versions: Show completed versions
             button_login: 登录
             button_submit: 提交

public/images/arrow_bw.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

public/images/arrow_from.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

public/images/arrow_to.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages