Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-24 00:09:46 +01:00
Code Issues Packages Projects Releases Activity

Move sidebar content on versions index view (roadmap) into a separate partial (#35773).

Browse Source 
Patch by Mischa The Evil.


git-svn-id: http://svn.redmine.org/redmine/trunk@21195 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2021-08-19 09:49:49 +00:00
parent 1bfdccc30f
commit a0fa4491c0
2 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/views/versions/_sidebar.html.erb Normal file
View File

@@ -0,0 +1,53 @@
<%= form_tag({}, :method => :get) do %>
<h3><%= l(:label_roadmap) %></h3>
<ul>
<% @trackers.each do |tracker| %>
<li>
<label>
<%= check_box_tag("tracker_ids[]", tracker.id,
(@selected_tracker_ids.include? tracker.id.to_s),
:id => nil) %>
<%= tracker.name %>
</label>
</li>
<% end %>
</ul>
<p></p>
<ul>
<li>
<label for="completed">
<%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %>
</label>
</li>
<% if @project.descendants.active.any? %>
<li>
<%= hidden_field_tag 'with_subprojects', 0, :id => nil %>
<label>
<%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%>
</label>
</li>
<% end %>
</ul>
<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
<% end %>
<h3><%= l(:label_version_plural) %></h3>
<ul>
<% @versions.each do |version| %>
<li>
<%= link_to(format_version_name(version), "##{version_anchor(version)}") %>
</li>
<% end %>
</ul>
<% if @completed_versions.present? %>
<p>
<%= link_to_function l(:label_completed_versions),
'$("#toggle-completed-versions").toggleClass("icon-collapsed icon-expended"); $("#completed-versions").toggle()',
:id => 'toggle-completed-versions', :class => 'icon icon-collapsed collapsible' %>
<ul id = "completed-versions" style = "display:none;">
<% @completed_versions.each do |version| %>
<li><%= link_to_version version %></li>
<% end %>
</ul>
</p>
<% end %>

54
app/views/versions/index.html.erb
View File

@@ -50,59 +50,7 @@
<% end %>
<% content_for :sidebar do %>
<%= form_tag({}, :method => :get) do %>
<h3><%= l(:label_roadmap) %></h3>
<ul>
<% @trackers.each do |tracker| %>
<li>
<label>
<%= check_box_tag("tracker_ids[]", tracker.id,
(@selected_tracker_ids.include? tracker.id.to_s),
:id => nil) %>
<%= tracker.name %>
</label>
</li>
<% end %>
</ul>
<p></p>
<ul>
<li>
<label for="completed">
<%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %>
</label>
</li>
<% if @project.descendants.active.any? %>
<li>
<%= hidden_field_tag 'with_subprojects', 0, :id => nil %>
<label>
<%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%>
</label>
</li>
<% end %>
</ul>
<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
<% end %>
<h3><%= l(:label_version_plural) %></h3>
<ul>
<% @versions.each do |version| %>
<li>
<%= link_to(format_version_name(version), "##{version_anchor(version)}") %>
</li>
<% end %>
</ul>
<% if @completed_versions.present? %>
<p>
<%= link_to_function l(:label_completed_versions),
'$("#toggle-completed-versions").toggleClass("icon-collapsed icon-expended"); $("#completed-versions").toggle()',
:id => 'toggle-completed-versions', :class => 'icon icon-collapsed collapsible' %>
<ul id = "completed-versions" style = "display:none;">
<% @completed_versions.each do |version| %>
<li><%= link_to_version version %></li>
<% end %>
</ul>
</p>
<% end %>
<%= render :partial => 'versions/sidebar' %>
<% end %>
<% html_title(l(:label_roadmap)) %>