decidim-results 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e87f3b4a655ec87ba8ed404f0237dca5b971586
-  data.tar.gz: e349dc188dd9b5f9ceb058d3c743509b187054e2
+  metadata.gz: aeb2b7c606a8af81848a7180086ad201a4e8c4fd
+  data.tar.gz: a26b0f2352010b97f67435e04574a55da56001e0
 SHA512:
-  metadata.gz: 4af6cfb80daee17b9079e84f7470282e57e8137f3902d5578071a848788d143fefb6135e094e6b6e592d4f7f90935546572f0f0880ebf82dc51d5aeffc3e6942
-  data.tar.gz: ad3cff5a527eed0dc1a672ea0527ae9e1b1858b283f03de858d3cd80c8fb7edc0a83685f568b97d88fd6e5a9d02bcab28307f6efeb303dd29702206491929814
+  metadata.gz: b5fba1ad7200a3a1a4fdccf91ab38f09e71f58844f7f9a457151466ab14944568b5a3f91809097de61ff392df747a1779d7c5a6c259202eb13823eb6b5b6cf6d
+  data.tar.gz: 4c3094fb4a01c02a26d155a5fe4d8466aa70afd3992172b7d120e8242ad0ccbe63cb54982240f69412c803a954859fe14b9c62db4b5d5a5fcec019213225d39d

data/app/assets/images/decidim/results/icon.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zM16 22.48a1 1 0 0 1-.68-.28l-4.08-4a1 1 0 0 1 1.36-1.39l3.4 3.3 8-8.8a1 1 0 0 1 1.44 1.31l-8.69 9.55a1 1 0 0 1-.69.32z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zM16 22.48a1 1 0 0 1-.68-.28l-4.08-4a1 1 0 0 1 1.36-1.39l3.4 3.3 8-8.8a1 1 0 0 1 1.44 1.31l-8.69 9.55a1 1 0 0 1-.69.32z"/></svg>

data/app/forms/decidim/results/admin/result_form.rb

@@ -41,7 +41,7 @@ module Decidim
         end
 
         def scope
-          @scope ||= process_scope || organization_scopes.where(id: decidim_scope_id).first
+          @scope ||= organization_scopes.where(id: decidim_scope_id).first || process_scope
         end
 
         def category

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

@@ -12,9 +12,9 @@
       <%= form.translated :editor, :description %>
     </div>
 
-    <% if !@form.process_scope %>
-    <div class="row column">
-        <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+    <% if current_participatory_process.has_subscopes? %>
+      <div class="row column">
+        <%= form.scopes_select :decidim_scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope) %>
       </div>
     <% end %>
 
@@ -31,4 +31,4 @@
       <% end %>
     </div>
   </div>
-</div>
+</div>

data/app/views/decidim/results/results/_filters.html.erb

@@ -12,8 +12,8 @@
     </div>
   </div>
 
-  <% if current_organization.scopes.any? && !current_participatory_process.scope %>
-    <%= form.collection_check_boxes :scope_id, search_organization_scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
+  <% if current_participatory_process.has_subscopes? %>
+    <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(include_root: true), multiple: true %>
   <% end %>
 
   <% if current_feature.categories.any? %>

data/app/views/decidim/results/results/_filters_small_view.html.erb

@@ -15,4 +15,4 @@
   <div class="filters">
     <%= render partial: "filters" %>
   </div>
-</div>
+</div>

data/app/views/decidim/results/results/_results.html.erb

@@ -9,7 +9,7 @@
             <h5 class="card__title"><%= translated_attribute result.title %></h5>
           <% end %>
           <%== translated_attribute result.description %>
-          <%= render partial: "tags", locals: { result: result } %>
+          <%= render partial: "decidim/shared/tags", locals: { resource: result, tags_class_extra: "tags--result" } %>
         </div>
       </article>
     </div>

data/app/views/decidim/results/results/index.html.erb

@@ -1,3 +1,5 @@
+<%= render partial: "decidim/shared/feature_announcement" %>
+
 <div class="row columns">
   <div class="title-action">
     <h2 id="proposals-count" class="title-action__title section-heading">

data/app/views/decidim/results/results/index.js.erb

@@ -1,2 +1,5 @@
 var $results = $('#results');
 $results.html('<%= j(render partial: "results") %>');
+
+var $dropdownMenu = $('.dropdown.menu', $results);
+$dropdownMenu.foundation();

data/app/views/decidim/results/results/show.html.erb

@@ -45,7 +45,7 @@
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <%== translated_attribute result.description %>
-      <%= render partial: "tags", locals: { result: result } %>
+      <%= render partial: "decidim/shared/tags", locals: { resource: result, tags_class_extra: "tags--result" } %>
     </div>
     <%= linked_resources_for result, :proposals, "included_proposals" %>
     <%= linked_resources_for result, :meetings, "meetings_through_proposals" %>

data/config/i18n-tasks.yml

@@ -5,5 +5,7 @@ ignore_unused:
 - "decidim.resource_links.*"
 - activerecord.attributes.*
 - activemodel.attributes.*
+ignore_missing:
+  - decidim.scopes.global
 search:
   strict: false

data/config/locales/ca.yml

@@ -62,6 +62,7 @@ ca:
         filters:
           category: Categoria
           category_prompt: Selecciona una categoria
+          scope_prompt: Seleccioneu un àmbit
           scopes: Àmbits
           search: Cerca
         filters_small_view:
@@ -76,4 +77,4 @@ ca:
             contributions: Aportacions
             meetings: Trobades
             proposals: Propostes
-            votes: Suports
+            votes: Suports

data/config/locales/en.yml

@@ -14,8 +14,10 @@ en:
         name: Results
         settings:
           global:
+            announcement: Announcement
             comments_enabled: Comments enabled
           step:
+            announcement: Announcement
             comments_blocked: Comments blocked
     resource_links:
       included_proposals:
@@ -63,6 +65,7 @@ en:
         filters:
           category: Category
           category_prompt: Select a category
+          scope_prompt: Select a scope
           scopes: Scopes
           search: Search
         filters_small_view:

data/config/locales/es.yml

@@ -62,6 +62,7 @@ es:
         filters:
           category: Categoría
           category_prompt: Selecciona una categoría
+          scope_prompt: Seleccione un ámbito
           scopes: Ámbitos
           search: Buscar
         filters_small_view:
@@ -76,4 +77,4 @@ es:
             contributions: Aportes
             meetings: Lista de encuentros
             proposals: Propuestas
-            votes: Soportes
+            votes: Soportes

data/config/locales/eu.yml

@@ -76,4 +76,4 @@ eu:
             contributions: Ekarpenak
             meetings: Topaketa-zerrenda
             proposals: Proposamenak
-            votes: Sostenguak
+            votes: Sostenguak

data/config/locales/fi.yml

@@ -71,4 +71,4 @@ fi:
             contributions: Kontribuutiot
             meetings: Tapaamiset
             proposals: Ehdotukset
-            votes: Kannatukset
+            votes: Kannatukset

data/config/locales/fr.yml

@@ -76,4 +76,4 @@ fr:
             contributions: Contributions
             meetings: Rencontre
             proposals: Propositions
-            votes: Soutiens
+            votes: Soutiens

data/config/locales/it.yml

@@ -75,4 +75,4 @@ it:
             comments: Commenti
             contributions: Contributi
             proposals: Proposte
-            votes: Voti
+            votes: Voti

data/config/locales/nl.yml

@@ -2,4 +2,4 @@ nl:
   activemodel:
     attributes:
       result:
-        title: Titel
+        title: Titel

data/config/locales/pl.yml

@@ -0,0 +1,5 @@
+pl:
+  decidim:
+    results:
+      actions:
+        new: Nowy

data/lib/decidim/results/feature.rb

@@ -27,10 +27,12 @@ Decidim.register_feature(:results) do |feature|
 
   feature.settings(:global) do |settings|
     settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
   feature.settings(:step) do |settings|
     settings.attribute :comments_blocked, type: :boolean, default: false
+    settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
   feature.seeds do |process|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-results
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,70 +88,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 description: A results component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -188,7 +188,6 @@ files:
 - app/views/decidim/results/results/_filters_small_view.html.erb
 - app/views/decidim/results/results/_linked_results.html.erb
 - app/views/decidim/results/results/_results.html.erb
-- app/views/decidim/results/results/_tags.html.erb
 - app/views/decidim/results/results/index.html.erb
 - app/views/decidim/results/results/index.js.erb
 - app/views/decidim/results/results/show.html.erb
@@ -201,6 +200,7 @@ files:
 - config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/nl.yml
+- config/locales/pl.yml
 - db/migrate/20170116104125_create_results.rb
 - db/migrate/20170129164553_remove_short_description_from_results.rb
 - db/migrate/20170215132624_add_reference_to_results.rb

data/app/views/decidim/results/results/_tags.html.erb

@@ -1,10 +0,0 @@
-<% if result.category.present? || result.scope.present? %>
-  <ul class="tags tags--result" >
-    <% if result.category.present? %>
-      <li><%= link_to translated_attribute(result.category.name), resource_locator(result).index(filter: { category_id: result.category.id }) %></li>
-    <% end %>
-    <% if !current_participatory_process.scope && result.scope.present? %>
-      <li><%= link_to result.scope.name, resource_locator(result).index(filter: { scope_id: [result.scope.id] }) %></li>
-    <% end %>
-  </ul>
-<% end %>