diff --git a/views/tasks/_task.html.erb b/views/tasks/_task.html.erb deleted file mode 100644 index 1bc8b09..0000000 --- a/views/tasks/_task.html.erb +++ /dev/null @@ -1,70 +0,0 @@ -
- - <% if task.respond_to?(:proposal_source) %> -
<%= _('Source') %>: <%= task.proposal_source %>
- <% end %> - <%= render :partial => 'task_icon', :locals => {:task => task} %> - - <% if !@view_only && profile.organization? && @responsible_candidates.present? %> -
- <%= _('Assign to:') %> - - <% change_responsible_url = url_for :action => :change_responsible, :controller => :tasks %> - <%= select_tag "tasks[#{task.id}][responsible]", options_from_collection_for_select(@responsible_candidates, :id, :name, task.responsible.present? ? task.responsible.id : nil), :include_blank => true, :onchange => "change_task_responsible(this);", 'data-old-responsible' => task.responsible.present? ? task.responsible.id : nil, 'data-task' => task.id, 'data-url' => change_responsible_url %> - -
- <% end %> - - <% if @view_only && task.responsible.present? %> -
- <%= _('Assigned to:') %> - <%= task.responsible.name %> -
- <% end %> - -
- <% unless @view_only %> - <%= - labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept', - :id => "decision-finish-#{task.id}", - :class => 'task_accept_radio', - :disabled => task.accept_disabled?, - :task_id => "#{task.id}") + - labelled_radio_button(_("Reject"), "tasks[#{task.id}][decision]", 'cancel', task.default_decision == 'reject', - :id => "decision-cancel-#{task.id}", - :class => 'task_reject_radio', - :disabled => task.reject_disabled?, - :task_id => "#{task.id}") + - labelled_radio_button(_("Skip"), "tasks[#{task.id}][decision]", 'skip', task.default_decision == 'skip', - :id => "decision-skip-#{task.id}", - :class => 'task_skip_radio', - :disabled => task.skip_disabled?, - :task_id => "#{task.id}") - %> - <% end %> -
- -
<%= show_time(task.created_at) %>
- - <%= render :partial => 'task_title', :locals => {:task => task} %> - -
- <%= task_information(task) %> -
- - <%= fields_for "tasks[#{task.id}][task]", task do |f| %> - <% if task.accept_details %> - - <% end %> - - <% if task.reject_details %> - - <% end %> - - <% end %> - -
diff --git a/views/tasks/processed.html.erb b/views/tasks/processed.html.erb deleted file mode 100644 index 4a9d705..0000000 --- a/views/tasks/processed.html.erb +++ /dev/null @@ -1,91 +0,0 @@ -<%= stylesheet_link_tag 'tasks' %> - -
-

<%= _("%s's processed tasks") % profile.name %>

- -
-<% - type_collection = [[nil, _('All')]] + @task_types -%> - <%= form_tag '#', :method => 'get' do %> - <%= field_set_tag _('Filter'), :class => 'filter_fields' do %> -
- <%= labelled_select(_('Type of task')+': ', 'filter[type]', :first, :last, @filter[:type], type_collection, {:id => 'filter-type'}) %> - <%= labelled_select(_('Status:'), 'filter[status]', :last, :first, @filter[:status], [[_('Any'), nil], [_(Task::Status.names[Task::Status::CANCELLED]), 2], [_(Task::Status.names[Task::Status::FINISHED]), 3] ]) %> -
- -
- <%= labelled_text_field(_('Text Filter:'), 'filter[text]', @filter[:text]) %> -
- -
- <%= labelled_text_field(_('Requestor:'), 'filter[requestor]', @filter[:requestor]) %> - <%= labelled_text_field(_('Closed by:'), 'filter[closed_by]', @filter[:closed_by]) %> -
- - <%= labelled_form_field(_('Creation date'), date_range_field('filter[created_from]', 'filter[created_until]', @filter[:created_from], @filter[:created_until], '%Y-%m-%d', { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_created_from', :to_id => 'filter_created_until' })) %> - <%= labelled_form_field(_('Processed date'), date_range_field('filter[closed_from]', 'filter[closed_until]', @filter[:closed_from], @filter[:closed_until], '%Y-%m-%d', { :change_month => true, :change_year => true, :date_format => 'yy-mm-dd' }, { :size => 14, :from_id => 'filter_closed_from', :to_id => 'filter_closed_until' })) %> - -
- <%= submit_button(:search, _('Search')) %> -
- <% end %> - <% end %> -
- -

-<% if @tasks.empty? %> - <%= _('No processed tasks.') %> -<% else %> -

- <%= pagination_links(@tasks)%> -<% end %> -

- -<% button_bar do %> - <%= button(:back, _('Back'), :action => 'index') %> -<% end %> - -
diff --git a/views/tasks/proposals_discussion_plugin/_proposal_task.html.erb b/views/tasks/proposals_discussion_plugin/_proposal_task.html.erb new file mode 100644 index 0000000..6ae1208 --- /dev/null +++ b/views/tasks/proposals_discussion_plugin/_proposal_task.html.erb @@ -0,0 +1,68 @@ +
+ +
<%= _('Source') %>: <%= task.proposal_source %>
+ <%= render :partial => 'task_icon', :locals => {:task => task} %> + + <% if !@view_only && profile.organization? && @responsible_candidates.present? %> +
+ <%= _('Assign to:') %> + + <% change_responsible_url = url_for :action => :change_responsible, :controller => :tasks %> + <%= select_tag "tasks[#{task.id}][responsible]", options_from_collection_for_select(@responsible_candidates, :id, :name, task.responsible.present? ? task.responsible.id : nil), :include_blank => true, :onchange => "change_task_responsible(this);", 'data-old-responsible' => task.responsible.present? ? task.responsible.id : nil, 'data-task' => task.id, 'data-url' => change_responsible_url %> + +
+ <% end %> + + <% if @view_only && task.responsible.present? %> +
+ <%= _('Assigned to:') %> + <%= task.responsible.name %> +
+ <% end %> + +
+ <% unless @view_only %> + <%= + labelled_radio_button(_("Accept"), "tasks[#{task.id}][decision]", 'finish', task.default_decision == 'accept', + :id => "decision-finish-#{task.id}", + :class => 'task_accept_radio', + :disabled => task.accept_disabled?, + :task_id => "#{task.id}") + + labelled_radio_button(_("Reject"), "tasks[#{task.id}][decision]", 'cancel', task.default_decision == 'reject', + :id => "decision-cancel-#{task.id}", + :class => 'task_reject_radio', + :disabled => task.reject_disabled?, + :task_id => "#{task.id}") + + labelled_radio_button(_("Skip"), "tasks[#{task.id}][decision]", 'skip', task.default_decision == 'skip', + :id => "decision-skip-#{task.id}", + :class => 'task_skip_radio', + :disabled => task.skip_disabled?, + :task_id => "#{task.id}") + %> + <% end %> +
+ +
<%= show_time(task.created_at) %>
+ + <%= render :partial => 'task_title', :locals => {:task => task} %> + +
+ <%= task_information(task) %> +
+ + <%= fields_for "tasks[#{task.id}][task]", task do |f| %> + <% if task.accept_details %> + + <% end %> + + <% if task.reject_details %> + + <% end %> + + <% end %> + +
diff --git a/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb b/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb new file mode 100644 index 0000000..6d3894f --- /dev/null +++ b/views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb @@ -0,0 +1,37 @@ +
+ <%= _('Source') %>: <%= task.proposal_source %> +
+
+ <%= task_information(task) %> +
+
+ <%= _(Task::Status.names[task.status]) %> +
+
+ + <%= _('Created:') %> + <%= show_date(task.created_at) %> + +
+<% if task.proposal_evaluation.present? %> +
+ <%= _('Moderator') %>: + <%= link_to(task.proposal_evaluation.evaluated_by.name, task.proposal_evaluation.evaluated_by.url) %> +   —   + + <%= _('Moderated at') %>: + <%= show_time(task.proposal_evaluation.created_at) %> + +
+<% end %> +<% if task.closed_by.present? %> +
+ <%= _('Evaluator') %>: + <%= link_to(task.closed_by.name, task.closed_by.url) %> +   —   + + <%= _('Evaluated at') %>: + <%= show_time(task.end_date) %> + +
+<% end %> -- libgit2 0.21.2