diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/issue_statuses/_form.rhtml | 5 | ||||
| -rw-r--r-- | app/views/issue_statuses/list.rhtml | 7 | ||||
| -rw-r--r-- | app/views/issues/_attributes.rhtml | 2 | ||||
| -rw-r--r-- | app/views/issues/_form_update.rhtml | 2 | ||||
| -rw-r--r-- | app/views/issues/bulk_edit.rhtml | 2 | ||||
| -rw-r--r-- | app/views/issues/context_menu.rhtml | 3 | ||||
| -rw-r--r-- | app/views/settings/_issues.rhtml | 3 |
7 files changed, 23 insertions, 1 deletions
diff --git a/app/views/issue_statuses/_form.rhtml b/app/views/issue_statuses/_form.rhtml index b6a5bc19f..e36dec824 100644 --- a/app/views/issue_statuses/_form.rhtml +++ b/app/views/issue_statuses/_form.rhtml @@ -5,6 +5,11 @@ <p><label for="issue_status_name"><%=l(:field_name)%><span class="required"> *</span></label> <%= text_field 'issue_status', 'name' %></p> +<% if Issue.use_status_for_done_ratio? %> +<p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label> +<%= select 'issue_status', :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p> +<% end %> + <p><label for="issue_status_is_closed"><%=l(:field_is_closed)%></label> <%= check_box 'issue_status', 'is_closed' %></p> diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml index ca973153d..a98ed0cd8 100644 --- a/app/views/issue_statuses/list.rhtml +++ b/app/views/issue_statuses/list.rhtml @@ -1,5 +1,6 @@ <div class="contextual"> <%= link_to l(:label_issue_status_new), {:action => 'new'}, :class => 'icon icon-add' %> +<%= link_to(l(:label_update_issue_done_ratios), {:action => 'update_issue_done_ratio'}, :class => 'icon icon-multiple', :method => 'post', :confirm => l(:text_are_you_sure)) if Issue.use_status_for_done_ratio? %> </div> <h2><%=l(:label_issue_status_plural)%></h2> @@ -7,6 +8,9 @@ <table class="list"> <thead><tr> <th><%=l(:field_status)%></th> + <% if Issue.use_status_for_done_ratio? %> + <th><%=l(:field_done_ratio)%></th> + <% end %> <th><%=l(:field_is_default)%></th> <th><%=l(:field_is_closed)%></th> <th><%=l(:button_sort)%></th> @@ -16,6 +20,9 @@ <% for status in @issue_statuses %> <tr class="<%= cycle("odd", "even") %>"> <td><%= link_to status.name, :action => 'edit', :id => status %></td> + <% if Issue.use_status_for_done_ratio? %> + <td align="center"><%= h status.default_done_ratio %></td> + <% end %> <td align="center"><%= image_tag 'true.png' if status.is_default? %></td> <td align="center"><%= image_tag 'true.png' if status.is_closed? %></td> <td align="center" style="width:15%;"><%= reorder_links('issue_status', {:action => 'update', :id => status}) %></td> diff --git a/app/views/issues/_attributes.rhtml b/app/views/issues/_attributes.rhtml index 9adf0f153..f8fc8d672 100644 --- a/app/views/issues/_attributes.rhtml +++ b/app/views/issues/_attributes.rhtml @@ -34,7 +34,9 @@ <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p> <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p> <p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p> +<% if Issue.use_field_for_done_ratio? %> <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p> +<% end %> </div> <div style="clear:both;"> </div> diff --git a/app/views/issues/_form_update.rhtml b/app/views/issues/_form_update.rhtml index 5304ee23a..e29c41a7c 100644 --- a/app/views/issues/_form_update.rhtml +++ b/app/views/issues/_form_update.rhtml @@ -4,7 +4,9 @@ <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p> </div> <div class="splitcontentright"> +<% if Issue.use_field_for_done_ratio? %> <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p> +<% end %> <% unless @issue.assignable_versions.empty? %> <p><%= f.select :fixed_version_id, (@issue.assignable_versions.collect {|v| [v.name, v.id]}), :include_blank => true %></p> <% end %> diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml index f428566b2..b298c3c46 100644 --- a/app/views/issues/bulk_edit.rhtml +++ b/app/views/issues/bulk_edit.rhtml @@ -39,8 +39,10 @@ <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %></label> <label><%= l(:field_due_date) %>: <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %></label> +<% if Issue.use_field_for_done_ratio? %> <label><%= l(:field_done_ratio) %>: <%= select_tag 'done_ratio', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></label> +<% end %> </p> <% @custom_fields.each do |custom_field| %> diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml index 6cb05606a..4a1d0c310 100644 --- a/app/views/issues/context_menu.rhtml +++ b/app/views/issues/context_menu.rhtml @@ -77,6 +77,7 @@ </ul> </li> <% end -%> + <% if Issue.use_field_for_done_ratio? %> <li class="folder"> <a href="#" class="submenu"><%= l(:field_done_ratio) %></a> <ul> @@ -86,7 +87,7 @@ <% end -%> </ul> </li> - + <% end %> <% if !@issue.nil? %> <% if @can[:log_time] -%> <li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, diff --git a/app/views/settings/_issues.rhtml b/app/views/settings/_issues.rhtml index b0277fab3..725d57da6 100644 --- a/app/views/settings/_issues.rhtml +++ b/app/views/settings/_issues.rhtml @@ -11,6 +11,9 @@ <%= check_box_tag 'settings[display_subprojects_issues]', 1, Setting.display_subprojects_issues? %> </p> +<p><label><%= l(:setting_issue_done_ratio) %></label> +<%= select_tag 'settings[issue_done_ratio]', options_for_select(Issue::DONE_RATIO_OPTIONS.collect {|i| [l(i.to_sym), i]}, Setting.issue_done_ratio) %></p> + <p><label><%= l(:setting_issues_export_limit) %></label> <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p> </div> |