decidim 0.0.6 → 0.0.7

data/decidim-admin/spec/shared/manage_process_steps_examples.rb

@@ -13,27 +13,12 @@ RSpec.shared_examples "manage process steps examples" do
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
-    visit decidim_admin.participatory_process_path(participatory_process)
+    visit decidim_admin.edit_participatory_process_path(participatory_process)
     click_link "Steps"
   end
 
-  it "displays all fields from a single participatory process" do
-    within "#steps table" do
-      click_link translated(process_step.title)
-    end
-
-    within "dl" do
-      expect(page).to have_content(stripped translated(process_step.title, locale: :en))
-      expect(page).to have_content(stripped translated(process_step.title, locale: :es))
-      expect(page).to have_content(stripped translated(process_step.title, locale: :ca))
-      expect(page).to have_content(stripped translated(process_step.description, locale: :en))
-      expect(page).to have_content(stripped translated(process_step.description, locale: :es))
-      expect(page).to have_content(stripped translated(process_step.description, locale: :ca))
-    end
-  end
-
   it "creates a new participatory_process" do
-    find("#steps .actions .new").click
+    find(".card-title a.button").click
 
     within ".new_participatory_process_step" do
       fill_in_i18n(
@@ -57,7 +42,7 @@ RSpec.shared_examples "manage process steps examples" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -69,7 +54,7 @@ RSpec.shared_examples "manage process steps examples" do
   it "updates a participatory_process_step" do
     within "#steps" do
       within find("tr", text: translated(process_step.title)) do
-        click_link "Edit"
+        page.find('.action-icon--edit').click
       end
     end
 
@@ -85,7 +70,7 @@ RSpec.shared_examples "manage process steps examples" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -104,10 +89,10 @@ RSpec.shared_examples "manage process steps examples" do
 
     it "deletes a participatory_process_step" do
       within find("tr", text: translated(process_step2.title)) do
-        click_link "Destroy"
+        page.find('.action-icon--remove').click
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 
@@ -120,7 +105,7 @@ RSpec.shared_examples "manage process steps examples" do
   context "activating a step" do
     it "activates a step" do
       within find("tr", text: translated(process_step.title)) do
-        click_link "Activate"
+        page.find('.action-icon--activate').click
       end
 
       within find("tr", text: translated(process_step.title)) do

data/decidim-admin/spec/shared/manage_processes_examples.rb

@@ -7,7 +7,7 @@ RSpec.shared_examples "manage processes examples" do
 
       it "allows the user to preview the unpublished process" do
         within find("tr", text: translated(participatory_process.title)) do
-          click_link "Preview"
+          page.find('a.action-icon--preview').click
         end
 
         expect(page).to have_css(".process-header")
@@ -20,7 +20,7 @@ RSpec.shared_examples "manage processes examples" do
 
       it "allows the user to preview the unpublished process" do
         within find("tr", text: translated(participatory_process.title)) do
-          click_link "Preview"
+          page.find('a.action-icon--preview').click
         end
 
         expect(current_path).to eq decidim.participatory_process_path(participatory_process)
@@ -29,34 +29,8 @@ RSpec.shared_examples "manage processes examples" do
     end
   end
 
-  it "displays all fields from a single participatory process" do
-    within "table" do
-      click_link participatory_process.title["en"]
-    end
-
-    within "dl" do
-      expect(page).to have_content(stripped translated(participatory_process.title, locale: :en))
-      expect(page).to have_content(stripped translated(participatory_process.title, locale: :es))
-      expect(page).to have_content(stripped translated(participatory_process.title, locale: :ca))
-      expect(page).to have_content(stripped translated(participatory_process.subtitle, locale: :en))
-      expect(page).to have_content(stripped translated(participatory_process.subtitle, locale: :es))
-      expect(page).to have_content(stripped translated(participatory_process.subtitle, locale: :ca))
-      expect(page).to have_content(stripped translated(participatory_process.short_description, locale: :en))
-      expect(page).to have_content(stripped translated(participatory_process.short_description, locale: :es))
-      expect(page).to have_content(stripped translated(participatory_process.short_description, locale: :ca))
-      expect(page).to have_content(stripped translated(participatory_process.description, locale: :en))
-      expect(page).to have_content(stripped translated(participatory_process.description, locale: :es))
-      expect(page).to have_content(stripped translated(participatory_process.description, locale: :ca))
-      expect(page).to have_content(participatory_process.hashtag)
-      expect(page).to have_content(participatory_process.slug)
-      expect(page).to have_xpath("//img[@src=\"#{participatory_process.hero_image.url}\"]")
-      expect(page).to have_xpath("//img[@src=\"#{participatory_process.banner_image.url}\"]")
-    end
-  end
-
   it "updates an participatory_process" do
     click_link translated(participatory_process.title)
-    click_processes_menu_link "Settings"
 
     within ".edit_participatory_process" do
       fill_in_i18n(
@@ -71,12 +45,12 @@ RSpec.shared_examples "manage processes examples" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
-    within ".tabs-content" do
-      expect(page).to have_content("My new title")
+    within ".container" do
+      expect(page).to have_selector("input[value='My new title']")
       expect(page).not_to have_css("img[src*='#{image2_filename}']")
       expect(page).to have_css("img[src*='#{image3_filename}']")
     end
@@ -87,7 +61,6 @@ RSpec.shared_examples "manage processes examples" do
 
     before do
       click_link translated(participatory_process.title)
-      click_processes_menu_link "Settings"
     end
 
     it "publishes the process" do
@@ -106,7 +79,6 @@ RSpec.shared_examples "manage processes examples" do
 
     before do
       click_link translated(participatory_process.title)
-      click_processes_menu_link "Settings"
     end
 
     it "unpublishes the process" do

data/decidim-admin/spec/support/processes_menu_links_helpers.rb

@@ -5,7 +5,7 @@ module ProcessesMenuLinksHelpers
   #
   # text - a String with the name of the link that will be clicked
   def click_processes_menu_link(text)
-    within ".row .tabs.vertical" do
+    within ".secondary-nav--subnav" do
       click_link text
     end
   end

data/decidim-admin/yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

data/decidim-api/app/controllers/decidim/api/application_controller.rb

@@ -2,7 +2,8 @@
 module Decidim
   module Api
     # Base controller for `decidim-api`. All other controllers inherit from this.
-    class ApplicationController < ActionController::Base
+    class ApplicationController < ::DecidimController
+      skip_before_filter :verify_authenticity_token
       include NeedsOrganization
     end
   end

data/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb

@@ -57,7 +57,7 @@ module Decidim
         private
 
         def projects
-          @projects ||= Project.where(feature: current_feature)
+          @projects ||= Project.where(feature: current_feature).page(params[:page]).per(15)
         end
 
         def orders

data/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb

@@ -11,26 +11,32 @@ module Decidim
       def create
         authorize_action! "vote"
 
-        AddLineItem.call(current_order, project, current_user) do
-          on(:ok) do |order|
-            self.current_order = order
-            render "update_budget"
-          end
-
-          on(:invalid) do
-            render nothing: true, status: 422
+        respond_to do |format|
+          AddLineItem.call(current_order, project, current_user) do
+            on(:ok) do |order|
+              self.current_order = order
+              format.html { redirect_to :back }
+              format.js { render "update_budget" }
+            end
+
+            on(:invalid) do
+              render nothing: true, status: 422
+            end
           end
         end
       end
 
       def destroy
-        RemoveLineItem.call(current_order, project) do
-          on(:ok) do |_order|
-            render "update_budget"
-          end
-
-          on(:invalid) do
-            render nothing: true, status: 422
+        respond_to do |format|
+          RemoveLineItem.call(current_order, project) do
+            on(:ok) do |_order|
+              format.html { redirect_to :back }
+              format.js { render "update_budget" }
+            end
+
+            on(:invalid) do
+              render nothing: true, status: 422
+            end
           end
         end
       end

data/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb

@@ -1,29 +1,39 @@
-<div class="field" >
-  <%= form.translated :text_field, :title, autofocus: true %>
-</div>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
 
-<div class="field" >
-  <%= form.translated :editor, :description %>
-</div>
+  <div class="card-section">
+    <div class="row column" >
+      <%= form.translated :text_field, :title, autofocus: true %>
+    </div>
 
-<div class="field" >
-  <%= form.number_field :budget %>
-</div>
+    <div class="row column" >
+      <%= form.translated :editor, :description %>
+    </div>
 
-<% if !current_participatory_process.scope %>
-  <div class="field" >
-    <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
-  </div>
-<% end %>
+    <div class="row column" >
+      <%= form.number_field :budget %>
+    </div>
 
-<div class="field" >
-  <%= form.categories_select :decidim_category_id, current_participatory_process.categories, include_blank: true, disable_parents: false %>
-</div>
+    <% if !current_participatory_process.scope %>
+      <div class="row column" >
+        <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+      </div>
+    <% end %>
 
-<% if @form.proposals %>
-  <%= form.select :proposal_ids,
-                  @form.proposals,
-                  {},
-                  { multiple: true, class: "chosen-select" }
-  %>
-<% end %>
+    <div class="row column" >
+      <%= form.categories_select :decidim_category_id, current_participatory_process.categories, include_blank: true, disable_parents: false %>
+    </div>
+
+    <div class="row column">
+      <% if @form.proposals %>
+        <%= form.select :proposal_ids,
+                        @form.proposals,
+                        {},
+                        { multiple: true, class: "chosen-select" }
+        %>
+      <% end %>
+    </div>
+  </div>
+</div>

data/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb

@@ -1,9 +1,7 @@
-<h3><%= t ".title" %></h3>
+<%=  decidim_form_for(@form, html: { class: "form edit_project" })  do |f| %>
+  <%= render partial: 'form', object: f, locals: { title: t('.title') } %>
 
-<%= decidim_form_for(@form) do |f| %>
-  <%= render partial: 'form', object: f %>
-
-  <div class="actions">
+  <div class="button--double form-general-submit">
     <%= f.submit t(".update") %>
   </div>
 <% end %>

data/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb

@@ -1,37 +1,55 @@
-<h2><%= t(".title") %></h2>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+      <%= link_to t("actions.new", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_project_path, class: 'button tiny button--title' if can? :manage, current_feature %>
+    </h2>
+  </div>
 
-<dl>
-  <dt><%= t ".finished_orders" %>: </dt><dd><%= finished_orders.count %></dd>
-  <dt><%= t ".pending_orders" %>: </dt><dd><%= pending_orders.count %></dd>
-</dl>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.project.fields.title", scope: "decidim.budgets") %></th>
+            <th class="center"><%= t("index.confirmed_orders_count") %></th>
+            <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% projects.each do |project| %>
+            <tr data-id="<%= project.id %>">
+              <td>
+                <%= translated_attribute(project.title) %><br />
+              </td>
+              <td class='center'>
+               <%= project.confirmed_orders_count %>
+              </td>
+              <td class="table-list__actions">
+                <%= icon_link_to "eye", decidim_budgets.project_path(id: project, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.budgets"), target: :blank, class: "action-icon--preview" %>
 
-<div class="actions title">
-  <%= link_to t("actions.new", scope: "decidim.budgets", name: t("models.project.name", scope: "decidim.budgets.admin")), new_project_path, class: 'new' if can? :manage, current_feature %>
-</div>
+                <% if can? :update, current_feature %>
+                  <%= icon_link_to "pencil", edit_project_path(project), t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
+                <% end %>
+
+                <% if can? :update, current_feature %>
+                  <%= icon_link_to "paperclip", project_attachments_path(project), t("actions.attachments", scope: "decidim.budgets"), class: "action-icon--attachments" %>
+                <% end %>
 
-<table class="stack">
-  <thead>
-    <tr>
-      <th><%= t("models.project.fields.title", scope: "decidim.budgets") %></th>
-      <th class="center"><%= t("index.confirmed_orders_count") %></th>
-      <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% projects.each do |project| %>
-      <tr data-id="<%= project.id %>">
-        <td>
-          <%= link_to translated_attribute(project.title), decidim_budgets.project_path(id: project, feature_id: current_feature, participatory_process_id: current_participatory_process), target: :blank %><br />
-        </td>
-        <td class='center'>
-         <%= project.confirmed_orders_count %>
-        </td>
-        <td class="actions">
-          <%= link_to t("actions.edit", scope: "decidim.budgets"), edit_project_path(project) if can? :update, current_feature %>
-          <%= link_to t("actions.attachments", scope: "decidim.budgets"), project_attachments_path(project) if can? :update, current_feature %>
-          <%= link_to t("actions.destroy", scope: "decidim.budgets"), project_path(project), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } if can? :destroy, current_feature %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+                <% if can? :destroy, current_feature %>
+                  <%= icon_link_to "circle-x", project_path(project), t("actions.destroy", scope: "decidim.budgets"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+      <%= paginate projects, theme: "decidim" %>
+    </div>
+  </div>
+  <div class="card-divider">
+    <strong><%= t ".finished_orders" %>: </strong><span><%= finished_orders.count %></span>
+    <span>|</span>
+    <strong><%= t ".pending_orders" %>: </strong><span><%= pending_orders.count %></span>
+  </div>
+</div>

data/decidim-budgets/app/views/decidim/budgets/admin/projects/new.html.erb

@@ -1,9 +1,8 @@
-<h3><%= t ".title" %></h3>
+<%=  decidim_form_for(@form, html: { class: "form new_project" }) do |f| %>
+  <%= render partial: 'form', object: f, locals: { title: t('.title') }  %>
 
-<%= decidim_form_for(@form) do |f| %>
-  <%= render partial: 'form', object: f %>
-
-  <div class="actions">
+  <div class="button--double form-general-submit">
     <%= f.submit t(".create") %>
   </div>
 <% end %>
+

data/decidim-budgets/app/views/decidim/budgets/projects/_filters.html.erb

@@ -17,7 +17,7 @@
   <% end %>
 
   <% if current_feature.categories.any? %>
-    <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, include_blank: true %>
+    <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, prompt: t('.category_prompt')  %>
   <% end %>
 
   <%= form.hidden_field :random_seed %>

data/decidim-budgets/config/i18n-tasks.yml

@@ -5,3 +5,4 @@ ignore_unused:
 - "decidim.features.budgets.settings.*"
 - "decidim.features.budgets.actions.*"
 - "activemodel.attributes.project.*"
+- "decidim.resource_links.*"

data/decidim-budgets/config/locales/ca.yml

@@ -16,6 +16,7 @@ ca:
         destroy: Esborrar
         edit: Editar
         new: Nou %{name}
+        preview: Previsualitzar
         title: Accions
       admin:
         models:
@@ -71,6 +72,7 @@ ca:
             other: "%{count} projectes"
         filters:
           category: Categoria
+          category_prompt: Selecciona una categoria
           scopes: Àmbits
           search: Cerca
         filters_small_view:
@@ -118,6 +120,9 @@ ca:
       destroy:
         error: S'ha produït un error en cancel·lar el seu vot
         success: El seu vot ha estat cancel·lat correctament
+    resource_links:
+      included_proposals:
+        project_proposals: 'Propostes incloses en aquest projecte:'
   index:
     confirmed_orders_count: Nombre de vots
   total_budget: Pressupost total