Redmine 4.1.1
This commit is contained in:
parent
33e7b881a5
commit
3d976f1b3b
1593 changed files with 36180 additions and 19489 deletions
|
|
@ -1,9 +1,5 @@
|
|||
<% @gantt.view = self %>
|
||||
<div class="contextual">
|
||||
<% if !@query.new_record? && @query.editable_by?(User.current) %>
|
||||
<%= link_to l(:button_edit), edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
|
||||
<%= delete_link query_path(@query, :gantt => 1) %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<h2><%= @query.new_record? ? l(:label_gantt) : @query.name %></h2>
|
||||
|
|
@ -14,68 +10,97 @@
|
|||
:method => :get, :id => 'query_form') do %>
|
||||
<%= hidden_field_tag 'set_filter', '1' %>
|
||||
<%= hidden_field_tag 'gantt', '1' %>
|
||||
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
|
||||
<legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
|
||||
<div style="<%= @query.new_record? ? "" : "display: none;" %>">
|
||||
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset id="options" class="collapsible collapsed">
|
||||
<legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
|
||||
<div style="display: none;">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<fieldset>
|
||||
<legend><%= l(:label_related_issues) %></legend>
|
||||
<label for="draw_relations">
|
||||
<%= check_box 'query', 'draw_relations', :id => 'draw_relations' %>
|
||||
<% rels = [IssueRelation::TYPE_BLOCKS, IssueRelation::TYPE_PRECEDES] %>
|
||||
<% rels.each do |rel| %>
|
||||
<% color = Redmine::Helpers::Gantt::DRAW_TYPES[rel][:color] %>
|
||||
<%= content_tag(:span, ' '.html_safe,
|
||||
:style => "background-color: #{color}") %>
|
||||
<%= l(IssueRelation::TYPES[rel][:name]) %>
|
||||
<% end %>
|
||||
</label>
|
||||
</fieldset>
|
||||
</td>
|
||||
<td>
|
||||
<fieldset>
|
||||
<legend><%= l(:label_gantt_progress_line) %></legend>
|
||||
<label for="draw_progress_line">
|
||||
<%= check_box 'query', 'draw_progress_line', :id => 'draw_progress_line' %>
|
||||
<%= l(:label_display) %>
|
||||
</label>
|
||||
</fieldset>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<div id="query_form_with_buttons" class="hide-when-print">
|
||||
<div id="query_form_content">
|
||||
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
|
||||
<legend onclick="toggleFieldset(this);" class="icon icon-<%= @query.new_record? ? "expended" : "collapsed" %>"><%= l(:label_filter_plural) %></legend>
|
||||
<div style="<%= @query.new_record? ? "" : "display: none;" %>">
|
||||
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<fieldset id="options" class="collapsible collapsed">
|
||||
<legend onclick="toggleFieldset(this);" class="icon icon-collapsed"><%= l(:label_options) %></legend>
|
||||
<div style="display: none;">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<fieldset>
|
||||
<legend>
|
||||
<%= l(:field_column_names) %>
|
||||
</legend>
|
||||
<label for="draw_selected_columns">
|
||||
<%= check_box 'query', 'draw_selected_columns', :id => 'draw_selected_columns', 'data-enables' => 'span.query-columns select, span.query-columns input' %>
|
||||
<%= l(:label_display) %>
|
||||
</label>
|
||||
<%= render_query_columns_selection(@query) %>
|
||||
</fieldset>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<fieldset>
|
||||
<legend><%= l(:label_related_issues) %></legend>
|
||||
<label for="draw_relations">
|
||||
<%= check_box 'query', 'draw_relations', :id => 'draw_relations' %>
|
||||
<% rels = [IssueRelation::TYPE_BLOCKS, IssueRelation::TYPE_PRECEDES] %>
|
||||
<% rels.each do |rel| %>
|
||||
<% color = Redmine::Helpers::Gantt::DRAW_TYPES[rel][:color] %>
|
||||
<%= content_tag(:span, ' '.html_safe,
|
||||
:style => "background-color: #{color}") %>
|
||||
<%= l(IssueRelation::TYPES[rel][:name]) %>
|
||||
<% end %>
|
||||
</label>
|
||||
</fieldset>
|
||||
</td>
|
||||
<td>
|
||||
<fieldset>
|
||||
<legend><%= l(:label_gantt_progress_line) %></legend>
|
||||
<label for="draw_progress_line">
|
||||
<%= check_box 'query', 'draw_progress_line', :id => 'draw_progress_line' %>
|
||||
<%= l(:label_display) %>
|
||||
</label>
|
||||
</fieldset>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
<p class="contextual">
|
||||
<%= gantt_zoom_link(@gantt, :in) %>
|
||||
<%= gantt_zoom_link(@gantt, :out) %>
|
||||
<span>
|
||||
<%= gantt_zoom_link(@gantt, :in) %>
|
||||
<%= gantt_zoom_link(@gantt, :out) %>
|
||||
</span>
|
||||
<span>
|
||||
<%= link_to_previous_month(@gantt.year_from, @gantt.month_from, :accesskey => accesskey(:previous)) %> | <%= link_to_next_month(@gantt.year_from, @gantt.month_from, :accesskey => accesskey(:next)) %>
|
||||
</span>
|
||||
</p>
|
||||
|
||||
<p class="buttons">
|
||||
<%= text_field_tag 'months', @gantt.months, :size => 2 %>
|
||||
<%= l(:label_months_from) %>
|
||||
<%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
|
||||
<%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
|
||||
<%= hidden_field_tag 'zoom', @gantt.zoom %>
|
||||
<%= number_field_tag 'months', @gantt.months, :min => 1, :max => Setting.gantt_months_limit.to_i, :autocomplete => false %>
|
||||
<%= l(:label_months_from) %>
|
||||
<%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
|
||||
<%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
|
||||
<%= hidden_field_tag 'zoom', @gantt.zoom %>
|
||||
|
||||
<%= link_to_function l(:button_apply), '$("#query_form").submit()',
|
||||
:class => 'icon icon-checked' %>
|
||||
<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
|
||||
:class => 'icon icon-reload' %>
|
||||
<% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
|
||||
<%= link_to_function l(:button_save),
|
||||
"$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
|
||||
:class => 'icon icon-save' %>
|
||||
<%= link_to_function l(:button_apply), '$("#query_form").submit()',
|
||||
:class => 'icon icon-checked' %>
|
||||
<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
|
||||
:class => 'icon icon-reload' %>
|
||||
<% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
|
||||
<%= link_to_function l(:button_save),
|
||||
"$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
|
||||
:class => 'icon icon-save' %>
|
||||
<% end %>
|
||||
<% if !@query.new_record? && @query.editable_by?(User.current) %>
|
||||
<%= link_to l(:button_edit), edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
|
||||
<%= delete_link query_path(@query, :gantt => 1) %>
|
||||
<% end %>
|
||||
</p>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= error_messages_for 'query' %>
|
||||
|
|
@ -119,39 +144,63 @@
|
|||
<p class="warning"><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>
|
||||
<% end %>
|
||||
|
||||
<table style="width:100%; border:0; border-collapse: collapse;">
|
||||
<table class='gantt-table'>
|
||||
<tr>
|
||||
<td style="width:<%= subject_width %>px; padding:0px;" class="gantt_subjects_column">
|
||||
<td style="width:<%= @query.draw_selected_columns ? subject_width + 1 : subject_width + 2 %>px;" class="gantt_subjects_column">
|
||||
<%
|
||||
style = ""
|
||||
style += "position:relative;"
|
||||
style += "height: #{t_height + 24}px;"
|
||||
style += "width: #{subject_width + 1}px;"
|
||||
%>
|
||||
<%= content_tag(:div, :style => style, :class => "gantt_subjects_container") do %>
|
||||
<%= content_tag(:div, :style => style, :class => "gantt_subjects_container #{'draw_selected_columns' if @query.draw_selected_columns}") do %>
|
||||
<%
|
||||
style = ""
|
||||
style += "right:-2px;"
|
||||
style += "width: #{subject_width}px;"
|
||||
style += "width: #{subject_width + 1}px;"
|
||||
style += "height: #{headers_height}px;"
|
||||
style += 'background: #eee;'
|
||||
%>
|
||||
<%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
|
||||
<%
|
||||
style = ""
|
||||
style += "right:-2px;"
|
||||
style += "width: #{subject_width}px;"
|
||||
style += "z-index: 1;"
|
||||
style += "width: #{subject_width + 1}px;"
|
||||
style += "height: #{t_height}px;"
|
||||
style += 'border-left: 1px solid #c0c0c0;'
|
||||
style += 'overflow: hidden;'
|
||||
%>
|
||||
<%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %>
|
||||
<%= content_tag(:div, :class => "gantt_subjects") do %>
|
||||
<%= @gantt.subjects.html_safe %>
|
||||
<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
|
||||
<%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
|
||||
<%= @gantt.subjects.html_safe %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</td>
|
||||
|
||||
<% @query.columns.each do |column| %>
|
||||
<% next if Redmine::Helpers::Gantt::UNAVAILABLE_COLUMNS.include?(column.name) %>
|
||||
<td class="gantt_<%= column.name %>_column gantt_selected_column <%= 'last_gantt_selected_column' if @query.columns.last == column %>" id="<%= column.name %>">
|
||||
<%
|
||||
style = "position: relative;"
|
||||
style += "height: #{t_height + 24}px;"
|
||||
%>
|
||||
<%= content_tag(:div, :style => style, :class => "gantt_#{column.name}_container gantt_selected_column_container") do %>
|
||||
<%
|
||||
style = "height: #{t_height}px;"
|
||||
style += 'overflow: hidden;'
|
||||
%>
|
||||
<%= content_tag(:div, '', :style => style, :class => "gantt_hdr") %>
|
||||
<%
|
||||
style = "height: #{headers_height}px;"
|
||||
style += 'background: #eee;'
|
||||
%>
|
||||
<%= content_tag(:div, content_tag(:p, column.caption, :class => 'gantt_hdr_selected_column_name'), :style => style, :class => "gantt_hdr") %>
|
||||
<%= content_tag(:div, :class => "gantt_#{column.name} gantt_selected_column_content") do %>
|
||||
<%= @gantt.selected_column_content({:column => column, :top => headers_height + 8, :zoom => zoom, :g_width => g_width}).html_safe %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</td>
|
||||
<% end %>
|
||||
<td>
|
||||
<div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;" id="gantt_area">
|
||||
<%
|
||||
|
|
@ -266,7 +315,7 @@
|
|||
wday = 1 if wday > 7
|
||||
%>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<% ###### Days headers ####### %>
|
||||
<% if show_days %>
|
||||
|
|
@ -299,7 +348,10 @@
|
|||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<%= @gantt.lines.html_safe %>
|
||||
<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
|
||||
<%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
|
||||
<%= @gantt.lines.html_safe %>
|
||||
<% end %>
|
||||
|
||||
<% ###### Today red line (excluded from cache) ###### %>
|
||||
<% if User.current.today >= @gantt.date_from and User.current.today <= @gantt.date_to %>
|
||||
|
|
@ -329,20 +381,19 @@
|
|||
</tr>
|
||||
</table>
|
||||
|
||||
<table style="width:100%">
|
||||
<tr>
|
||||
<td style="text-align:left;">
|
||||
<%= link_to("\xc2\xab " + l(:label_previous),
|
||||
{:params => request.query_parameters.merge(@gantt.params_previous)},
|
||||
:accesskey => accesskey(:previous)) %>
|
||||
</td>
|
||||
<td style="text-align:right;">
|
||||
<%= link_to(l(:label_next) + " \xc2\xbb",
|
||||
{:params => request.query_parameters.merge(@gantt.params_next)},
|
||||
:accesskey => accesskey(:next)) %>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<span class="pagination">
|
||||
<ul class="pages">
|
||||
<li class="previous page">
|
||||
<%= link_to("\xc2\xab " + l(:label_previous),
|
||||
{:params => request.query_parameters.merge(@gantt.params_previous)},
|
||||
:accesskey => accesskey(:previous)) %>
|
||||
</li><li class="next page">
|
||||
<%= link_to(l(:label_next) + " \xc2\xbb",
|
||||
{:params => request.query_parameters.merge(@gantt.params_next)},
|
||||
:accesskey => accesskey(:next)) %>
|
||||
</li>
|
||||
</ul>
|
||||
</span>
|
||||
|
||||
<% other_formats_links do |f| %>
|
||||
<%= f.link_to_with_query_parameters 'PDF', @gantt.params %>
|
||||
|
|
@ -363,10 +414,17 @@
|
|||
|
||||
<%= javascript_tag do %>
|
||||
var issue_relation_type = <%= raw Redmine::Helpers::Gantt::DRAW_TYPES.to_json %>;
|
||||
$(document).ready(drawGanttHandler);
|
||||
$(window).resize(drawGanttHandler);
|
||||
$(function() {
|
||||
$("#draw_relations").change(drawGanttHandler);
|
||||
$("#draw_progress_line").change(drawGanttHandler);
|
||||
disable_unavailable_columns('<%= Redmine::Helpers::Gantt::UNAVAILABLE_COLUMNS.map(&:to_s).join(',') %>'.split(','));
|
||||
drawGanttHandler();
|
||||
resizableSubjectColumn();
|
||||
drawSelectedColumns();
|
||||
$("#draw_relations, #draw_progress_line, #draw_selected_columns").change(drawGanttHandler);
|
||||
$('div.gantt_subjects .expander').on('click', ganttEntryClick);
|
||||
});
|
||||
$(window).resize(function() {
|
||||
drawGanttHandler();
|
||||
resizableSubjectColumn();
|
||||
});
|
||||
<% end %>
|
||||
<%= context_menu %>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue