From ef0db5499c579c06fead8cd55ebbbd34431af13f Mon Sep 17 00:00:00 2001 From: Gabriel Silva Date: Wed, 18 Nov 2015 19:45:20 +0000 Subject: [PATCH] Adjusts task and organization rating layouts --- app/views/tasks/_task.html.erb | 7 ++++--- plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb | 17 +++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/views/tasks/_task.html.erb b/app/views/tasks/_task.html.erb index d1a4cd2..6c3f1ed 100644 --- a/app/views/tasks/_task.html.erb +++ b/app/views/tasks/_task.html.erb @@ -2,6 +2,10 @@ <%= render :partial => 'task_icon', :locals => {:task => task} %> +
<%= show_time(task.created_at) %>
+ + <%= render :partial => 'task_title', :locals => {:task => task} %> + <% if !@view_only && profile.organization? && @responsible_candidates.present? %>
<%= _('Assign to:') %> @@ -41,9 +45,6 @@ <% end %>
-
<%= show_time(task.created_at) %>
- - <%= render :partial => 'task_title', :locals => {:task => task} %>
<%= task_information(task) %> diff --git a/plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb b/plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb index 781b569..e2d821c 100644 --- a/plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb +++ b/plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb @@ -1,6 +1,14 @@
+
+ <%= _("Comment:")%> + <%= "\"#{task.body}\""%>\ +
+ + <% rating = OrganizationRating.find(task.organization_rating_id) %> + <%= @plugins.dispatch(:organization_ratings_plugin_extra_fields_show_data, rating).collect{ |content| instance_exec(&content) }.join("") %> + + <%="* "+_("The rating score is not moderated")%>
- <% rating = OrganizationRating.find(task.organization_rating_id) %> <% (1..5).each do |star_number| %> <% if star_number <= rating.value %>
@@ -9,11 +17,4 @@ <% end %> <% end %>
-
- -
- <%= _("Comment:")%> - <%= "\"#{task.body}\""%>\ -
- <%= @plugins.dispatch(:organization_ratings_plugin_extra_fields_show_data, rating).collect{ |content| instance_exec(&content) }.join("") %>
-- libgit2 0.21.2