decidim-budgets 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3debe1a36f353528b0a6f984a08b394a0a139206
-  data.tar.gz: 0a521313f8811adf0ce0fda874a59243a6f89924
+  metadata.gz: 9807a5d16469bb8cac02ef1e5319d89615d8675f
+  data.tar.gz: 29af156a2f599e0ca52f00ca53dcc80c1776f745
 SHA512:
-  metadata.gz: 025f22841ce01de2247d3d60a303d44eb4029fa48db20bad3592cba101bbdcf8e64c9413c803cb2b463bb27a6782479af88988e62171965fb7d510c4661964a0
-  data.tar.gz: 73662198661b01573401e304e8e2179abdfdfa34401c29828683a07fbf11cda6f8e86f979bf67db8f66b8ea7f199e05df30289f5626cbc4777dd8d405e2fa694
+  metadata.gz: 713b3582ae9cae421b38b2b1e2ccefb185bc29ad0a0722d764159f8e9e9e2383e99a272499a924b96bac2ea1a74a512e84cb54980c31b6a21c934cc3a5c06a50
+  data.tar.gz: 585d6f983b02afc003ddbf682c489a49a418c784fb269239286a8e7d0777175d43175b4a0813dac311c59a83a2f1f6648f7a2389c64baeb6614b6100649a2469

data/app/assets/stylesheets/decidim/budgets/_budgets.scss

@@ -1 +1 @@
-@import "budget/*";
+@import "budget/*";

data/app/forms/decidim/budgets/admin/project_form.rb

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

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

@@ -16,9 +16,9 @@
       <%= form.number_field :budget %>
     </div>
 
-    <% if !current_participatory_process.scope %>
+    <% if current_participatory_process.has_subscopes? %>
       <div class="row column" >
-        <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+        <%= 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 %>
 
@@ -36,4 +36,4 @@
       <% end %>
     </div>
   </div>
-</div>
+</div>

data/app/views/decidim/budgets/projects/_budget_excess.html.erb

@@ -11,4 +11,4 @@
       <button data-close class="button expanded"><%= t('.ok') %></button>
     </div>
   </div>
-</div>
+</div>

data/app/views/decidim/budgets/projects/_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) %>
   <% end %>
 
   <% if current_feature.categories.any? %>

data/app/views/decidim/budgets/projects/_filters_small_view.html.erb

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

data/app/views/decidim/budgets/projects/_project.html.erb

@@ -6,7 +6,7 @@
           <%= translated_attribute project.title %>
         </h5>
       <% end %>
-      <%= render partial: "decidim/budgets/projects/tags", locals: { project: project } %>
+      <%= render partial: "decidim/shared/tags", locals: { resource: project, tags_class_extra: "tags--project" } %>
     </div>
   </div>
   <% if current_user.present? %>

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

@@ -1,3 +1,5 @@
+<%= render partial: "decidim/shared/feature_announcement" %>
+
 <% if current_user.present? && current_settings.votes_enabled? %>
   <div class="row column">
     <%= render partial: "budget_summary", locals: { include_heading: true } %>

data/app/views/decidim/budgets/projects/show.html.erb

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

data/config/i18n-tasks.yml

@@ -6,6 +6,7 @@ ignore_unused:
 - "decidim.features.budgets.actions.*"
 - "activemodel.attributes.project.*"
 - "decidim.resource_links.*"
-
+ignore_missing:
+  - decidim.scopes.global
 search:
   strict: false

data/config/locales/ca.yml

@@ -73,6 +73,7 @@ ca:
         filters:
           category: Categoria
           category_prompt: Selecciona una categoria
+          scope_prompt: Seleccioneu un àmbit
           scopes: Àmbits
           search: Cerca
         filters_small_view:
@@ -126,4 +127,4 @@ ca:
         project_proposals: 'Propostes incloses en aquest projecte:'
   index:
     confirmed_orders_count: Nombre de vots
-  total_budget: Pressupost total
+  total_budget: Pressupost total

data/config/locales/en.yml

@@ -80,6 +80,7 @@ en:
         filters:
           category: Category
           category_prompt: Select a category
+          scope_prompt: Select a scope
           scopes: Scopes
           search: Search
         filters_small_view:
@@ -114,10 +115,12 @@ en:
         name: Budgets
         settings:
           global:
+            announcement: Announcement
             comments_enabled: Comments enabled
             total_budget: Total budget
             vote_threshold_percent: Vote threshold percent
           step:
+            announcement: Announcement
             comments_blocked: Comments blocked
             show_votes: Show votes
             votes_enabled: Votes enabled

data/config/locales/es.yml

@@ -73,6 +73,7 @@ es:
         filters:
           category: Categoría
           category_prompt: Selecciona una categoría
+          scope_prompt: Seleccione un ámbito
           scopes: Ámbitos
           search: Buscar
         filters_small_view:
@@ -126,4 +127,4 @@ es:
         project_proposals: 'Propuestas incluidas en este proyecto:'
   index:
     confirmed_orders_count: Número de votos
-  total_budget: Presupuesto total
+  total_budget: Presupuesto total

data/config/locales/eu.yml

@@ -73,6 +73,7 @@ eu:
         filters:
           category: Kategoria
           category_prompt: Aukeratu kategoria bat
+          scope_prompt: Hautatu esparrua
           scopes: Esparruak
           search: Bilatu
         filters_small_view:
@@ -126,4 +127,4 @@ eu:
         project_proposals: 'Proiektu honetan jasotako proposamenak:'
   index:
     confirmed_orders_count: Boto-kopurua
-  total_budget: Guztizko aurrekontua
+  total_budget: Guztizko aurrekontua

data/config/locales/fi.yml

@@ -117,4 +117,4 @@ fi:
         success: Äänesi on peruttu onnistuneesti
   index:
     confirmed_orders_count: Tilauksien määrä
-  total_budget: Koko budjetti
+  total_budget: Koko budjetti

data/config/locales/fr.yml

@@ -126,4 +126,4 @@ fr:
         project_proposals: 'Propositions incluses dans ce projet:'
   index:
     confirmed_orders_count: Nombre de votes comptés
-  total_budget: Budget total
+  total_budget: Budget total

data/config/locales/it.yml

@@ -123,4 +123,4 @@ it:
         project_proposals: 'Proposte incluse in questo progetto:'
   index:
     confirmed_orders_count: Conteggio ordini
-  total_budget: Budget totale
+  total_budget: Budget totale

data/config/locales/nl.yml

@@ -2,4 +2,4 @@ nl:
   activemodel:
     attributes:
       project:
-        description: Beschrijving
+        description: Beschrijving

data/config/locales/pl.yml

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

data/lib/decidim/budgets/feature.rb

@@ -39,12 +39,14 @@ Decidim.register_feature(:budgets) do |feature|
     settings.attribute :total_budget, type: :integer, default: 100_000_000
     settings.attribute :vote_threshold_percent, type: :integer, default: 70
     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 :votes_enabled, type: :boolean, default: true
     settings.attribute :show_votes, 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-budgets
 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,42 +88,42 @@ 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-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
 description: A budgets component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -184,7 +184,6 @@ files:
 - app/views/decidim/budgets/projects/_project.html.erb
 - app/views/decidim/budgets/projects/_project_budget_button.html.erb
 - app/views/decidim/budgets/projects/_projects.html.erb
-- app/views/decidim/budgets/projects/_tags.html.erb
 - app/views/decidim/budgets/projects/index.html.erb
 - app/views/decidim/budgets/projects/index.js.erb
 - app/views/decidim/budgets/projects/show.html.erb
@@ -197,6 +196,7 @@ files:
 - config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/nl.yml
+- config/locales/pl.yml
 - db/migrate/20170127114122_create_projects.rb
 - db/migrate/20170130095615_create_orders.rb
 - db/migrate/20170130101825_create_line_items.rb

data/app/views/decidim/budgets/projects/_tags.html.erb

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