decidim 0.0.6 → 0.0.7

data/decidim-proposals/config/locales/es.yml

@@ -35,6 +35,8 @@ es:
         new: Nueva propuesta
         title: Acciones
       admin:
+        actions:
+          preview: Previsualizar
         models:
           proposal:
             name: Propuesta
@@ -83,6 +85,7 @@ es:
           activity: Actividad
           all: Todas
           category: Categoría
+          category_prompt: Selecciona una categoría
           citizenship: Ciudadanía
           official: Oficial
           origin: Origen

data/decidim-proposals/config/locales/eu.yml

@@ -2,29 +2,41 @@ eu:
   activemodel:
     attributes:
       proposal:
-        body: Testu-gorputza
+        body: Testua
         category_id: Kategoria
         scope_id: Esparrua
         title: Izenburua
         user_group_id: 'Sortu proposamen bat honako hau gisa:'
+      proposal_answer:
+        answer: Erantzuna
   decidim:
     features:
       proposals:
         actions:
           create: Sortu proposamenak
-          vote: Bozkatu
+          vote: Proiektuaren alde egin
         name: Proposamenak
         settings:
+          global:
+            comments_enabled: Iruzkinak gaituta
+            geocoding_enabled: Geokodeketa gaituta
+            official_proposals_enabled: Proposamen ofizialak gaituta
+            proposal_answering_enabled: Erantzun ofiziala gaitutako proposamenei
+            vote_limit: Boto-muga
           step:
+            comments_blocked: Iruzkinak blokeatuta
             creation_enabled: Gaitu proposamenen sorrera
+            proposal_answering_enabled: Erantzuna aktibatutako proposamenei
             votes_blocked: Bozketa blokeatuta
-            votes_enabled: Boto gaituak
+            votes_enabled: Botoak gaituta
     proposals:
       actions:
         answer: Erantzuna
         new: Proposamen berria
         title: Ekintzak
       admin:
+        actions:
+          preview: Aurreikusi
         models:
           proposal:
             name: Proposamena
@@ -32,7 +44,8 @@ eu:
           edit:
             accepted: Onartuta
             answer_proposal: Erantzuna proposamenari
-            rejected: Uko eginda
+            rejected: Baztertuta
+            title: 'Erantzun proposamen honi: %{title}'
         proposals:
           answer:
             invalid: Arazo bat izan da proposamen honi erantzutean.
@@ -50,7 +63,7 @@ eu:
       answers:
         accepted: Onartuta
         not_answered: Erantzun gabe
-        rejected: Uko eginda
+        rejected: Baztertuta
       create:
         error: Erroreak gertatu dira proposamena gordetzean.
         success: Proposamena zuzen sortu da.
@@ -65,17 +78,18 @@ eu:
       proposals:
         count:
           proposals_count:
-            one: Proposamen bat
+            one: 1 proposamen
             other: "%{count} proposamen"
         filters:
           accepted: Onartuta
           activity: Jarduera
           all: Guztiak
           category: Kategoria
+          category_prompt: Aukeratu kategoria bat
           citizenship: Herritarrak
           official: Ofiziala
           origin: Jatorria
-          rejected: Ezetsiak
+          rejected: Baztertuta
           related_to: Honekin lotuta
           scopes: Esparruak
           search: Bilatu
@@ -88,6 +102,7 @@ eu:
           unfold: Zabaldu
         index:
           new_proposal: Proposamen berria
+          view_proposal: Ikusi proposamena
         linked_proposals:
           proposal_votes:
             one: <span class="card--list__data__number">1</span>boto
@@ -99,25 +114,33 @@ eu:
           title: Proposamen berria
         orders:
           label: 'Antolatu proposamenak honen arabera:'
-          most_voted: Bozkatuena
-          random: Ausazkoa
-          recent: Berri-berria
+          most_voted: Bozkatuenak
+          random: Ausazkoa eran
+          recent: Berrienak
         proposal:
-          view_proposal: Proposamena ikusi
+          view_proposal: Ikusi proposamena
         show:
-          proposal_rejected_reason: 'Proposamen hau baztertu da honako arrazoi hauengatik:'
+          proposal_accepted_reason: 'Proposamen hau onartu da arrazoi hauengatik:'
+          proposal_rejected_reason: 'Proposamen hau baztertu da arrazoi hauengatik:'
+          report: Salatu
         vote_button:
           already_voted: Bozkatuta duzu
           no_votes_remaining: Ez da gelditzen botorik
-          vote: Bozkatu
+          vote: Proiektuaren alde egin
           votes_blocked: Bozketa desaktibatu da
         votes_count:
           count:
-            one: BOTOA EMAN
-            other: ZENBAT BOTO
+            one: SOSTENGU
+            other: SOSTENGU
         votes_limit:
           vote_limit:
-            description: Nahi beste proposamen bozkatu ordez, gehienez ere %{limit} proposamen bozka ditzakezu.
-            left: Gainerakoa
-            title: Gehienez, %{limit} boto dituzu banatzeko
-            votes: Zenbat boto
+            description: Nahi beste proposamenari sostengua eman ordez, gehienez ere %{limit} proposamenen alde egin dezakezu.
+            left: Emateke
+            title: Gehienez, %{limit} boto eman ditzakezu
+            votes: Boto
+    resource_links:
+      included_proposals:
+        proposal_projects: 'Proiektu hauetatik sortutako proposamena:'
+        proposal_results: 'Emaitza hauetatik sortutako proposamena:'
+      proposals_from_meeting:
+        proposal_meetings: Proposamenarekin lotutako topaketak

data/decidim-proposals/config/locales/fi.yml

@@ -32,7 +32,6 @@ fi:
     proposals:
       actions:
         answer: Vastaa
-        new: Uusi ehdotus
         title: Toiminnot
       admin:
         models:

data/decidim-proposals/spec/shared/manage_proposals_examples.rb

@@ -13,9 +13,11 @@ RSpec.shared_examples "manage proposals" do
 
   context "previewing proposals" do
     it "allows the user to preview the proposal" do
-      new_window = window_opened_by { click_link proposal.title }
+      within find("tr", text: proposal.title) do
+        @new_window = window_opened_by { find("a.action-icon--preview").click }
+      end
 
-      within_window new_window do
+      within_window @new_window do
         expect(current_path).to eq decidim_proposals.proposal_path(id: proposal.id, participatory_process_id: participatory_process.id, feature_id: current_feature.id)
         expect(page).to have_content(translated(proposal.title))
       end
@@ -46,7 +48,7 @@ RSpec.shared_examples "manage proposals" do
           end
 
           it "can be related to a scope" do
-            find(".actions .new").click
+            click_link "New Proposal"
 
             within "form" do
               expect(page).to have_content(/Scope/i)
@@ -54,7 +56,7 @@ RSpec.shared_examples "manage proposals" do
           end
 
           it "creates a new proposal" do
-            find(".actions .new").click
+            click_link "New Proposal"
 
             within ".new_proposal" do
               fill_in :proposal_title, with: "Make decidim great again"
@@ -65,7 +67,7 @@ RSpec.shared_examples "manage proposals" do
               find("*[type=submit]").click
             end
 
-            within ".flash" do
+            within ".callout-wrapper" do
               expect(page).to have_content("successfully")
             end
 
@@ -86,7 +88,7 @@ RSpec.shared_examples "manage proposals" do
           end
 
           it "cannot be related to a scope" do
-            find(".actions .new").click
+            click_link "New Proposal"
 
             within "form" do
               expect(page).not_to have_content(/Scope/i)
@@ -94,7 +96,7 @@ RSpec.shared_examples "manage proposals" do
           end
 
           it "creates a new proposal related to the process scope" do
-            find(".actions .new").click
+            click_link "New Proposal"
 
             within ".new_proposal" do
               fill_in :proposal_title, with: "Make decidim great again"
@@ -103,7 +105,7 @@ RSpec.shared_examples "manage proposals" do
               find("*[type=submit]").click
             end
 
-            within ".flash" do
+            within ".callout-wrapper" do
               expect(page).to have_content("successfully")
             end
 
@@ -126,7 +128,7 @@ RSpec.shared_examples "manage proposals" do
             end
 
             it "creates a new proposal related to the process scope" do
-              find(".actions .new").click
+              click_link "New Proposal"
 
               within ".new_proposal" do
                 fill_in :proposal_title, with: "Make decidim great again"
@@ -136,7 +138,7 @@ RSpec.shared_examples "manage proposals" do
                 find("*[type=submit]").click
               end
 
-              within ".flash" do
+              within ".callout-wrapper" do
                 expect(page).to have_content("successfully")
               end
 
@@ -161,7 +163,7 @@ RSpec.shared_examples "manage proposals" do
 
       it "cannot create a new proposal" do
         visit_feature
-        expect(page).not_to have_selector(".actions .new")
+        expect(page).not_to have_content("New Proposal")
       end
     end
   end
@@ -199,7 +201,7 @@ RSpec.shared_examples "manage proposals" do
           click_button "Answer proposal"
         end
 
-        within ".flash" do
+        within ".callout-wrapper" do
           expect(page).to have_content("Proposal successfully answered")
         end
 
@@ -220,7 +222,7 @@ RSpec.shared_examples "manage proposals" do
           click_button "Answer proposal"
         end
 
-        within ".flash" do
+        within ".callout-wrapper" do
           expect(page).to have_content("Proposal successfully answered")
         end
 

data/decidim-results/README.md

@@ -8,7 +8,7 @@ results will be available as a Feature for a Participatory Process.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'decidim-results
+gem 'decidim-results'
 ```
 
 And then execute:

data/decidim-results/app/controllers/decidim/results/admin/results_controller.rb

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

data/decidim-results/app/views/decidim/results/admin/results/_form.html.erb

@@ -1,25 +1,34 @@
-<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>
 
-<% if !@form.process_scope %>
-  <div class="field" >
-    <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
-  </div>
-<% end %>
+    <div class="row column">
+      <%= form.translated :editor, :description %>
+    </div>
 
-<div class="field" >
-  <%= form.categories_select :decidim_category_id, current_participatory_process.categories, include_blank: true, disable_parents: false %>
-</div>
+    <% if !@form.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-results/app/views/decidim/results/admin/results/edit.html.erb

@@ -1,9 +1,8 @@
-<h3><%= t ".title" %></h3>
+<%=  decidim_form_for(@form, html: { class: "form edit_result" }) 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-results/app/views/decidim/results/admin/results/index.html.erb

@@ -1,27 +1,42 @@
-<h2><%= t(".title") %></h2>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+      <%= link_to t("actions.new", scope: "decidim.results", name: t("models.result.name", scope: "decidim.results.admin")), new_result_path, class: 'button tiny button--title' if can? :manage, current_feature %>
+    </h2>
+  </div>
 
-<div class="actions title">
-  <%= link_to t("actions.new", scope: "decidim.results", name: t("models.result.name", scope: "decidim.results.admin")), new_result_path, class: 'new' if can? :manage, current_feature %>
-</div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.result.fields.title", scope: "decidim.results") %></th>
+            <th class="actions"><%= t("actions.title", scope: "decidim.results") %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% results.each do |result| %>
+            <tr data-id="<%= result.id %>">
+              <td>
+                <%= translated_attribute(result.title) %><br />
+              </td>
+              <td class="table-list__actions">
+                <%= icon_link_to "eye", decidim_results.result_path(id: result, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.results"), class: "action-icon--preview", target: :blank %>
+
+                <% if can? :update, current_feature %>
+                  <%= icon_link_to "pencil", edit_result_path(result), t("actions.edit", scope: "decidim.results"), class: "action-icon--edit" %>
+                <% end %>
 
-<table class="stack">
-  <thead>
-    <tr>
-      <th><%= t("models.result.fields.title", scope: "decidim.results") %></th>
-      <th class="actions"><%= t("actions.title", scope: "decidim.results") %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% results.each do |result| %>
-      <tr data-id="<%= result.id %>">
-        <td>
-          <%= link_to translated_attribute(result.title), decidim_results.result_path(id: result, feature_id: current_feature, participatory_process_id: current_participatory_process), target: :blank %><br />
-        </td>
-        <td class="actions">
-          <%= link_to t("actions.edit", scope: "decidim.results"), edit_result_path(result) if can? :update, current_feature %>
-          <%= link_to t("actions.destroy", scope: "decidim.results"), result_path(result), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.results") } if can? :destroy, current_feature %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+                <% if can? :destroy, current_feature %>
+                  <%= icon_link_to "circle-x", result_path(result), t("actions.destroy", scope: "decidim.results"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.results") } %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+      <%= paginate results, theme: "decidim" %>
+    </div>
+  </div>
+</div>

data/decidim-results/app/views/decidim/results/admin/results/new.html.erb

@@ -1,9 +1,8 @@
-<h3><%= t ".title" %></h3>
+<%=  decidim_form_for(@form, html: { class: "form new_result" }) 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-results/app/views/decidim/results/results/_filters.html.erb

@@ -17,6 +17,6 @@
   <% 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 %>
 <% end %>