Download as
Browse Code »

Commit 786d3c66ed5383d254fb57199ea171545885a6ae

Authored by Victor Costa
2 parents aadacf0e e9c22c7f
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Merge branch 'processed_tasks' into production 

Conflicts:
	app/views/tasks/processed.html.erb
	public/stylesheets/tasks.css
Showing 2 changed files with 13 additions and 8 deletions   Show diff stats
app/views/tasks/processed.html.erb
  Diff comments   View file @786d3c6
... ... @@ -11,7 +11,7 @@
11 11 <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
12 12 <div>
13 13 <%= labelled_select(_('Type of task')+': ', :filter_type, :first, :last, @filter_type, type_collection, {:id => 'filter-type'}) %>
14   - <%= 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] ]) %>
  14 + <%= 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] ]) %>
15 15 </div>
16 16  
17 17 <div>
... ... @@ -37,13 +37,10 @@
37 37 <% @tasks.each do |item| %>
38 38 <li class="task status-<%= item.status%>">
39 39 <div class="title">
40   - <strong><%= task_information(item) %></strong> <br/>
  40 + <%= task_information(item) %>
41 41 </div>
42   - <div>
43   - <span><%= _('Status: ') %></span>
44   - <span>
45   - <%= Task::Status.names[item.status] %>
46   - </span>
  42 + <div class="status">
  43 + <%= _(Task::Status.names[item.status]) %>
47 44 </div>
48 45 <small>
49 46 <%= _('Created:') +' '+ show_date(item.created_at) %>
... ...
public/stylesheets/tasks.css
  Diff comments   View file @786d3c6
... ... @@ -117,5 +117,13 @@
117 117 }
118 118  
119 119 .task-processed .task-list .task .title {
120   - border-bottom: 1px solid rgb(221, 221, 221);
  120 + border-bottom: 1px solid rgba(0, 0, 0, 0.1);
  121 + font-weight: bold;
  122 + color: rgb(44, 44, 44);
  123 +}
  124 +
  125 +.task-processed .task .status {
  126 + float: right;
  127 + color: rgb(156, 156, 156);
  128 + font-weight: bold;
121 129 }
... ...