Download as
Browse Code »

Commit ef0db5499c579c06fead8cd55ebbbd34431af13f

Authored by Gabriel Silva
Committed by Tallys Martins
1 parent bd32f803
Exists in suggest_rejected_value

Adjusts task and organization rating layouts 

Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Showing 2 changed files with 13 additions and 11 deletions   Show diff stats
app/views/tasks/_task.html.erb
  Diff comments   View file @ef0db54
@@ -2,6 +2,10 @@ @@ -2,6 +2,10 @@
2 2
3 <%= render :partial => 'task_icon', :locals => {:task => task} %> 3 <%= render :partial => 'task_icon', :locals => {:task => task} %>
4 4
  5 + <div class="task_date"><%= show_time(task.created_at) %></div>
  6 +
  7 + <%= render :partial => 'task_title', :locals => {:task => task} %>
  8 +
5 <% if !@view_only && profile.organization? && @responsible_candidates.present? %> 9 <% if !@view_only && profile.organization? && @responsible_candidates.present? %>
6 <div class="task_responsible"> 10 <div class="task_responsible">
7 <span class="label"><%= _('Assign to:') %></span> 11 <span class="label"><%= _('Assign to:') %></span>
@@ -41,9 +45,6 @@ @@ -41,9 +45,6 @@
41 <% end %> 45 <% end %>
42 </div><!-- class="task_decisions" --> 46 </div><!-- class="task_decisions" -->
43 47
44 - <div class="task_date"><%= show_time(task.created_at) %></div>  
45 -  
46 - <%= render :partial => 'task_title', :locals => {:task => task} %>  
47 48
48 <div class="task_information"> 49 <div class="task_information">
49 <%= task_information(task) %> 50 <%= task_information(task) %>
plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb
  Diff comments   View file @ef0db54
1 <div class="organization-rating-comment-body"> 1 <div class="organization-rating-comment-body">
  2 + <div class="task-comment">
  3 + <%= _("Comment:")%>
  4 + <%= "\"#{task.body}\""%>\
  5 + </div>
  6 +
  7 + <% rating = OrganizationRating.find(task.organization_rating_id) %>
  8 + <%= @plugins.dispatch(:organization_ratings_plugin_extra_fields_show_data, rating).collect{ |content| instance_exec(&content) }.join("") %>
  9 +
  10 + <span class="rating-notice"><%="* "+_("The rating score is not moderated")%></span>
2 <div class="task-star-container"> 11 <div class="task-star-container">
3 - <% rating = OrganizationRating.find(task.organization_rating_id) %>  
4 <% (1..5).each do |star_number| %> 12 <% (1..5).each do |star_number| %>
5 <% if star_number <= rating.value %> 13 <% if star_number <= rating.value %>
6 <div class="medium-star-positive"></div> 14 <div class="medium-star-positive"></div>
@@ -9,11 +17,4 @@ @@ -9,11 +17,4 @@
9 <% end %> 17 <% end %>
10 <% end %> 18 <% end %>
11 </div> 19 </div>
12 - <br />  
13 -  
14 - <div class="task-comment">  
15 - <%= _("Comment:")%>  
16 - <%= "\"#{task.body}\""%>\  
17 - </div>  
18 - <%= @plugins.dispatch(:organization_ratings_plugin_extra_fields_show_data, rating).collect{ |content| instance_exec(&content) }.join("") %>  
19 </div> 20 </div>