Merge branch 'master' into tracking_user_verifications_and_others

Conflicts:
	app/controllers/admin/stats_controller.rb
	db/dev_seeds.rb

app/views/admin/shared/_spending_proposal_search.html.erb

@@ -0,0 +1,10 @@
+<%= form_for(SpendingProposal.new, url: url, as: :spending_proposal, method: :get) do |f| %>
+  <div class="row">
+    <div class="small-12 medium-6 column">
+      <%= text_field_tag :search, "", placeholder: t("admin.shared.spending_proposal_search.placeholder") %>
+    </div>
+    <div class="form-inline small-12 medium-3 column end">
+      <%= f.submit t("admin.shared.spending_proposal_search.button"), class: "button success expanded" %>
+    </div>
+  </div>
+<% end %>

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

@@ -2,43 +2,71 @@
   <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| %>
 
   <% SpendingProposal.filter_params(params).each do |filter_name, filter_value| %>
-    <%= hidden_field_tag 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 ] },
-               { include_blank: t("admin.spending_proposals.edit.undefined") },
-               class: "small-12 medium-6") %>
+  <div class="row">
+    <div class="small-12 column">
+      <%= f.text_field :title, maxlength: SpendingProposal.title_max_length %>
+    </div>
 
-  <%= f.label :tag_list, t("admin.spending_proposals.edit.tags") %>
-  <div class="tags">
-    <% @tags.each do |tag| %>
-      <a class="js-add-tag-link"><%= tag.name %></a>
-    <% end %>
+    <div class="ckeditor small-12 column">
+      <%= f.cktext_area :description, maxlength: SpendingProposal.description_max_length, ckeditor: { language: I18n.locale } %>
+    </div>
+
+    <div class="small-12 column">
+      <%= f.text_field :external_url %>
+    </div>
+
+    <div class="small-12 column">
+      <%= f.select :geozone_id, geozone_select_options, include_blank: t("geozones.none") %>
+    </div>
+
+    <div class="small-12 column">
+      <%= f.text_field :association_name, placeholder: t("spending_proposals.form.association_name") %>
+    </div>
   </div>
-  <%= f.text_field :tag_list, value: @spending_proposal.tag_list.to_s,
-                    label: false,
-                    placeholder: t("admin.spending_proposals.edit.tags_placeholder"),
-                    class: 'js-tag-list' %>
 
-  <%= f.label :valuator_ids, t("admin.spending_proposals.edit.assigned_valuators") %>
+  <h2 id="classification"><%= t("admin.spending_proposals.edit.classification") %></h2>
 
-  <%= 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 %>
+  <div class="row">
+
+    <div class="small-12 column">
+      <%= f.select(:administrator_id,
+                     @admins.collect{ |a| [a.name_and_email, a.id ] },
+                     { include_blank: t("admin.spending_proposals.edit.undefined") }) %>
+    </div>
+
+
+    <div class="small-12 column">
+      <%= f.label :tag_list, t("admin.spending_proposals.edit.tags") %>
+      <div class="tags">
+        <% @tags.each do |tag| %>
+          <a class="js-add-tag-link"><%= tag.name %></a>
+        <% end %>
+      </div>
+      <%= f.text_field :tag_list, value: @spending_proposal.tag_list.to_s,
+                        label: false,
+                        placeholder: t("admin.spending_proposals.edit.tags_placeholder"),
+                        class: 'js-tag-list' %>
+    </div>
+
+    <div class="small-12 column">
+      <%= f.label :valuator_ids, t("admin.spending_proposals.edit.assigned_valuators") %>
+
+      <%= 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 %>
+    </div>
+  </div>
 
   <p class="clear">
     <%= f.submit(class: "button", value: t("admin.spending_proposals.edit.submit_button")) %>
   </p>
-
 <% end %>
 
 <hr>

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

@@ -2,21 +2,30 @@
 
 <div class="row margin">
   <%= form_tag admin_spending_proposals_path, method: :get, enforce_utf8: false do %>
-    <div class="small-12 medium-4 column">
+    <div class="small-12 medium-3 column">
       <%= select_tag :administrator_id,
                       options_for_select(admin_select_options, params[:administrator_id]),
                       { prompt: t("admin.spending_proposals.index.administrator_filter_all"),
                         label: false,
                         class: "js-submit-on-change" } %>
     </div>
-    <div class="small-12 medium-4 column">
+
+    <div class="small-12 medium-3 column">
+      <%= select_tag :valuator_id,
+                      options_for_select(valuator_select_options, params[:valuator_id]),
+                      { prompt: t("admin.spending_proposals.index.valuator_filter_all"),
+                        label: false,
+                        class: "js-submit-on-change" } %>
+    </div>
+
+    <div class="small-12 medium-3 column">
       <%= select_tag :geozone_id,
                      options_for_select(geozone_select_options.unshift([t("geozones.none"), "all"]), params[:geozone_id]),
                      { prompt: t("admin.spending_proposals.index.geozone_filter_all"),
                        label: false,
                        class: "js-submit-on-change" } %>
     </div>
-    <div class="small-12 medium-4 column">
+    <div class="small-12 medium-3 column">
       <%= select_tag :tag_name,
                      options_for_select(spending_proposal_tags_select_options, params[:tag_name]),
                      { prompt: t("admin.spending_proposals.index.tags_filter_all"),

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

@@ -1,16 +1,16 @@
-<%= link_to admin_spending_proposals_path(SpendingProposal.filter_params(params)) do %>
+<%= link_to admin_spending_proposals_path(SpendingProposal.filter_params(params)), data: {no_turbolink: true} do %>
   <span class="icon-angle-left"></span> <%= t("admin.spending_proposals.show.back") %>
 <% end %>
 
 <%= render 'written_by_author' %>
 
-<h2 id="classification"><%= t("admin.spending_proposals.show.classification") %></h2>
+<%= link_to t("admin.spending_proposals.show.edit"),
+              edit_admin_spending_proposal_path(@spending_proposal,
+                                                SpendingProposal.filter_params(params)) %>
 
-<p>
-  <%= link_to t("admin.spending_proposals.show.edit_classification"),
-                edit_admin_spending_proposal_path(@spending_proposal,
-                                                  {anchor: 'form'}.merge(SpendingProposal.filter_params(params))) %>
-</p>
+<hr>
+
+<h2 id="classification"><%= t("admin.spending_proposals.show.classification") %></h2>
 
 <p><strong><%= t("admin.spending_proposals.show.assigned_admin") %>:</strong>
   <%= @spending_proposal.administrator.try(:name_and_email) || t("admin.spending_proposals.show.undefined") %>
@@ -31,12 +31,19 @@
   <% end %>
 </p>
 
+<p>
+  <%= link_to t("admin.spending_proposals.show.edit_classification"),
+                edit_admin_spending_proposal_path(@spending_proposal,
+                                                  {anchor: 'classification'}.merge(SpendingProposal.filter_params(params))) %>
+</p>
+
 <hr>
 
 <h2><%= t("admin.spending_proposals.show.dossier") %></h2>
 
+<%= render 'valuation/spending_proposals/written_by_valuators' %>
+
 <p>
   <%= link_to t("admin.spending_proposals.show.edit_dossier"), edit_valuation_spending_proposal_path(@spending_proposal) %>
 </p>
 
-<%= render 'valuation/spending_proposals/written_by_valuators' %>

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

@@ -84,6 +84,13 @@
             </span>
           </p>
         </div>
+
+        <div class="small-12 medium-3 column">
+          <p class="featured">
+            <%= t "admin.stats.show.summary.spending_proposals" %><br>
+            <span class="number"><%= number_with_delimiter(@spending_proposals) %></span>
+          </p>
+        </div>
       </div>
 
       <div class="small-12 column">
@@ -97,6 +104,12 @@
           <%= events_chart_tag event %>
         <% end %>
       </div>
+
+      <div class="small-12 column">
+        <h2><%= t "admin.stats.show.spending_proposals_title" %></h2>
+        <%= spending_proposals_chart_tag id: "spending_proposals" %>
+      </div>
+
     </div>
   </div>
 </div>