Download as
Browse Code »

Commit 3d9ba6b1e932708115327733a840e813ad8905f3

Authored by Victor Costa
2 parents 786d3c66 6905648c
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'processed_tasks' into production 

Conflicts:
	app/views/tasks/processed.html.erb
	public/stylesheets/tasks.css
Showing 2 changed files with 26 additions and 4 deletions   Show diff stats
app/views/tasks/processed.html.erb
  Diff comments   View file @3d9ba6b
@@ -42,11 +42,23 @@ @@ -42,11 +42,23 @@
42 <div class="status"> 42 <div class="status">
43 <%= _(Task::Status.names[item.status]) %> 43 <%= _(Task::Status.names[item.status]) %>
44 </div> 44 </div>
45 - <small>  
46 - <%= _('Created:') +' '+ show_date(item.created_at) %> 45 + <div class="dates">
  46 + <span class="created">
  47 + <span class="label"><%= _('Created:') %></span>
  48 + <span class="value"><%= show_date(item.created_at) %></span>
  49 + </span>
47 &nbsp; &#151; &nbsp; 50 &nbsp; &#151; &nbsp;
48 - <%= _('Processed:') +' '+ show_date(item.end_date) %>  
49 - </small> 51 + <span class="processed">
  52 + <span class="label"><%= _('Processed:') %></span>
  53 + <span class="value"><%= show_date(item.end_date) %></span>
  54 + </span>
  55 + </div>
  56 + <% if item.closed_by.present? %>
  57 + <div class="closed-by">
  58 + <span class="label"><%= _('Closed by: ') %></span>
  59 + <span class="value"><%= link_to(item.closed_by.name, item.closed_by.url) %></span>
  60 + </div>
  61 + <% end %>
50 </li> 62 </li>
51 <% end %> 63 <% end %>
52 </ul> 64 </ul>
public/stylesheets/tasks.css
  Diff comments   View file @3d9ba6b
@@ -127,3 +127,13 @@ @@ -127,3 +127,13 @@
127 color: rgb(156, 156, 156); 127 color: rgb(156, 156, 156);
128 font-weight: bold; 128 font-weight: bold;
129 } 129 }
  130 +
  131 +.task-processed .task .dates {
  132 + font-size: 11px;
  133 +}
  134 +.task-processed .task .closed-by {
  135 + font-size: 11px;
  136 +}
  137 +.task-processed .task .label {
  138 + font-weight: bold
  139 +}