Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others

Conflicts:
	app/assets/javascripts/application.js

app/views/admin/_menu.html.erb

@@ -6,14 +6,14 @@
 
     <li <%= "class=active" if controller_name == "tags" %>>
       <%= link_to admin_tags_path do %>
-        <i class="icon-tag"></i>
+        <span class="icon-tag"></span>
         <%= t("admin.menu.debate_topics") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "proposals" %>>
       <%= link_to admin_proposals_path do %>
-        <i class="icon-proposals"></i>
+        <span class="icon-proposals"></span>
         <%= t("admin.menu.hidden_proposals") %>
       <% end %>
     </li>
@@ -21,7 +21,7 @@
     <% if feature?(:debates) %>
       <li <%= "class=active" if controller_name == "debates" %>>
         <%= link_to admin_debates_path do %>
-          <i class="icon-debates"></i>
+          <span class="icon-debates"></span>
           <%= t("admin.menu.hidden_debates") %>
         <% end %>
       </li>
@@ -29,7 +29,7 @@
 
     <li <%= "class=active" if controller_name == "comments" %>>
       <%= link_to admin_comments_path do %>
-        <i class="icon-comments"></i>
+        <span class="icon-comments"></span>
         <%= t("admin.menu.hidden_comments") %>
       <% end %>
     </li>
@@ -37,7 +37,7 @@
     <% if feature?(:spending_proposals) %>
       <li <%= "class=active" if controller_name == "spending_proposals" %>>
         <%= link_to admin_spending_proposals_path do %>
-          <i class="icon-budget"></i>
+          <span class="icon-budget"></span>
           <%= t("admin.menu.spending_proposals") %>
         <% end %>
       </li>
@@ -45,63 +45,63 @@
 
     <li <%= "class=active" if controller_name == "users" %>>
       <%= link_to admin_users_path do %>
-        <i class="icon-eye"></i>
+        <span class="icon-eye"></span>
         <%= t("admin.menu.hidden_users") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "verifications" %>>
       <%= link_to admin_verifications_path do %>
-        <i class="icon-eye"></i>
+        <span class="icon-eye"></span>
         <%= t("admin.menu.incomplete_verifications") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "organizations" %>>
       <%= link_to admin_organizations_path do %>
-        <i class="icon-organizations"></i>
+        <span class="icon-organizations"></span>
         <%= t("admin.menu.organizations") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "officials" %>>
       <%= link_to admin_officials_path do %>
-        <i class="icon-user"></i>
+        <span class="icon-user"></span>
         <%= t("admin.menu.officials") %>
       <% end %>
     </li>
 
     <li <%= 'class=active' if controller_name == 'moderators' %>>
       <%= link_to admin_moderators_path do %>
-        <i class="icon-user"></i>
+        <span class="icon-user"></span>
         <%= t('admin.menu.moderators') %>
       <% end %>
     </li>
 
     <li <%= 'class=active' if controller_name == 'valuators' %>>
       <%= link_to admin_valuators_path do %>
-        <i class="icon-user"></i>
+        <span class="icon-user"></span>
         <%= t('admin.menu.valuators') %>
       <% end %>
     </li>
 
     <li <%= 'class=active' if controller_name == 'activity' %>>
       <%= link_to admin_activity_path do %>
-        <i class="icon-eye"></i>
+        <span class="icon-eye"></span>
         <%= t('admin.menu.activity') %>
       <% end %>
     </li>
 
     <li <%= 'class=active' if controller_name == 'settings' %>>
       <%= link_to admin_settings_path do %>
-        <i class="icon-settings"></i>
+        <span class="icon-settings"></span>
         <%= t("admin.menu.settings") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "stats" %>>
       <%= link_to admin_stats_path do %>
-        <i class="icon-stats"></i>
+        <span class="icon-stats"></span>
         <%= t("admin.menu.stats") %>
       <% end %>
     </li>

app/views/admin/organizations/index.html.erb

@@ -28,7 +28,7 @@
     <td><%= organization.responsible_name %></td>
     <% if organization.verified? %>
       <td class="verified">
-        <i class="icon-check"></i>
+        <span class="icon-check"></span>
         <%= t("admin.organizations.index.verified") %>
       </td>
     <% end %>
@@ -42,7 +42,7 @@
     <% end %>
     <% if organization.rejected? %>
       <td class="rejected">
-        <i class="icon-x"></i>
+        <span class="icon-x"></span>
         <%= t("admin.organizations.index.rejected") %>
       </td>
     <% end %>

app/views/admin/organizations/search.html.erb

@@ -24,7 +24,7 @@
     <td><%= organization.responsible_name %></td>
     <% if organization.verified? %>
       <td class="verified">
-        <i class="icon-check"></i>
+        <span class="icon-check"></span>
         <%= t("admin.organizations.index.verified") %>
       </td>
     <% end %>
@@ -38,7 +38,7 @@
     <% end %>
     <% if organization.rejected? %>
       <td class="rejected">
-        <i class="icon-x"></i>
+        <span class="icon-x"></span>
         <%= t("admin.organizations.index.rejected") %>
       </td>
     <% end %>

app/views/admin/spending_proposals/_written_by_author.html.erb

@@ -36,7 +36,7 @@
 <% end %>
 
 <% if @spending_proposal.external_url.present? %>
-  <p><%= text_with_links @spending_proposal.external_url %>&nbsp;<i class="icon-external small"></i></p>
+  <p><%= text_with_links @spending_proposal.external_url %>&nbsp;<span class="icon-external small"></span></p>
 <% end %>
 
 <%= safe_html_with_links @spending_proposal.description %>

app/views/admin/spending_proposals/edit.html.erb

@@ -1,12 +1,17 @@
-<%= link_to admin_spending_proposals_path(@spending_proposal), class: 'back' do %>
-  <i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
+<%= link_to admin_spending_proposal_path(@spending_proposal, SpendingProposal.filter_params(params)), class: 'back' do %>
+  <span class="icon-angle-left"></span> <%= t("admin.spending_proposals.show.back") %>
 <% end %>
 
 <%= render 'written_by_author' %>
 
 <h2 id="form"><%= t("admin.spending_proposals.edit.classification") %></h2>
 
-<%= form_for @spending_proposal, url: admin_spending_proposal_path(@spending_proposal) do |f| %>
+<%= form_for @spending_proposal,
+             url: admin_spending_proposal_path(@spending_proposal) do |f| %>
+
+  <% SpendingProposal.filter_params(params).each do |filter_name, filter_value| %>
+    <%= hidden_field_tag filter_name, filter_value %>
+  <% end %>
 
   <%= f.select(:administrator_id,
                @admins.collect{ |a| [a.name_and_email, a.id ] },
@@ -24,15 +29,11 @@
                     placeholder: t("admin.spending_proposals.edit.tags_placeholder"),
                     class: 'js-tag-list' %>
 
-  <div class="row collapse">
-    <%= f.label :valuator_ids, t("admin.spending_proposals.edit.assigned_valuators") %>
+  <%= f.label :valuator_ids, t("admin.spending_proposals.edit.assigned_valuators") %>
 
-    <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :email do |b| %>
-      <div class="small-12 medium-4 column end">
-        <%= b.label(title: b.object.name) { b.check_box + b.text } %>
-      </div>
-    <% end %>
-  </div>
+  <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :email do |b| %>
+      <%= b.label(title: valuator_label(b.object)) { b.check_box + truncate(b.object.description_or_email, length: 60) } %>
+  <% end %>
 
   <p class="clear">
     <%= f.submit(class: "button", value: t("admin.spending_proposals.edit.submit_button")) %>
@@ -41,4 +42,4 @@
 <% end %>
 
 <hr>
-<%= render 'valuation/spending_proposals/written_by_valuators' %>
+<%= render 'valuation/spending_proposals/written_by_valuators' %>

app/views/admin/spending_proposals/index.html.erb

@@ -37,7 +37,7 @@
         <strong><%= spending_proposal.id %></strong>
       </td>
       <td>
-        <%= link_to spending_proposal.title, admin_spending_proposal_path(spending_proposal) %>
+        <%= link_to spending_proposal.title, admin_spending_proposal_path(spending_proposal, SpendingProposal.filter_params(params)) %>
       </td>
       <td class="small">
         <% if spending_proposal.administrator.present? %>

app/views/admin/spending_proposals/show.html.erb

@@ -1,5 +1,5 @@
-<%= link_to :back, class: 'back' do %>
-  <i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
+<%= link_to admin_spending_proposals_path(SpendingProposal.filter_params(params)) do %>
+  <span class="icon-angle-left"></span> <%= t("admin.spending_proposals.show.back") %>
 <% end %>
 
 <%= render 'written_by_author' %>
@@ -8,7 +8,8 @@
 
 <p>
   <%= link_to t("admin.spending_proposals.show.edit_classification"),
-            edit_admin_spending_proposal_path(@spending_proposal, anchor: "form") %>
+                edit_admin_spending_proposal_path(@spending_proposal,
+                                                  {anchor: 'form'}.merge(SpendingProposal.filter_params(params))) %>
 </p>
 
 <p><strong><%= t("admin.spending_proposals.show.assigned_admin") %>:</strong>

app/views/admin/tags/index.html.erb

@@ -10,7 +10,7 @@
 
     <div class="is-featured small-12 medium-6 column">
       <%= f.label :featured do %>
-        <%= f.check_box :featured, label: false %>
+        <%= f.check_box :featured, title: t('admin.tags.mark_as_featured'), label: false %>
         <span class="checkbox"><%= t("admin.tags.mark_as_featured") %></span>
       <% end %>
     </div>
@@ -34,7 +34,7 @@
 
           <span class="float-left">
             <%= f.label "featured_#{tag.id}" do %>
-              <%= f.check_box :featured, label: false, id: "tag_featured_#{tag.id}", class: "inline-block" %>
+              <%= f.check_box :featured, title: t('admin.tags.mark_as_featured'), label: false, id: "tag_featured_#{tag.id}", class: "inline-block" %>
               <span class="checkbox inline-block"><%= t("admin.tags.mark_as_featured") %></span>
             <% end %>
           </span>

app/views/admin/valuators/_valuator.html.erb

@@ -1,7 +1,24 @@
-<span><%= valuator.name %></span>
-<span class="bullet">&nbsp;&bull;&nbsp;</span>
-<span><%= valuator.email %></span>
-<% unless valuator.persisted? %>
-  <%= link_to t('admin.valuators.valuator.add'),{ controller: "admin/valuators", action: :create, user_id: valuator.user_id },
-    method: :post, class: "button small success float-right" %>
-<% end %>
+<h3><%= t('admin.valuators.valuator.user_found') %>:</h3>
+<div class="row">
+  <div class="small-12 medium-12 column">
+    <h4>
+      <%= valuator.name %>
+      <span class="bullet">&nbsp;&bull;&nbsp;</span>
+      <%= valuator.email %>
+    </h4>
+  </div>
+
+  <% unless @valuator.persisted? %>
+    <%= form_for @valuator, url: admin_valuators_path do |f| %>
+      <div class="row">
+        <div class="small-12 medium-4 column ">
+          <%= f.text_field :description, label: false, placeholder: t('admin.valuators.valuator.description_placeholder') %>
+          <%= f.hidden_field :user_id %>
+        </div>
+        <div class="small-12 medium-2 column end" style="border:ddotted 10px red;">
+          <%= f.submit t('admin.valuators.valuator.add'), class: "button success float-left" %>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+</div>

app/views/admin/valuators/index.html.erb

@@ -16,7 +16,13 @@
 <ul id="valuators" class="admin-list">
   <% @valuators.each do |valuator| %>
     <li>
-      <%= render 'valuator', valuator: valuator %>
+      <span><%= valuator.name %></span>
+      <span class="bullet">&nbsp;&bull;&nbsp;</span>
+      <span><%= valuator.email %></span>
+      <% if valuator.description.present? %>
+        <span class="bullet">&nbsp;&bull;&nbsp;</span>
+        <span><%= valuator.description %></span>
+      <% end %>
     </li>
   <% end %>
 </ul>

app/views/admin/valuators/search.js.erb

@@ -1 +1 @@
-$("#search-result").html("<div class=\"panel column\"><%= j render 'valuator',  valuator: @valuator %></div>");
+$("#search-result").html("<%= j render 'valuator',  valuator: @valuator %>");

app/views/admin/valuators/user_not_found.js.erb

@@ -1 +1 @@
-$("#search-result").html("<div class=\"panel column\"><%= j t('admin.valuators.search.user_not_found') %></div>");
+$("#search-result").html("<h4><%= j t('admin.valuators.search.user_not_found') %></h4>");