decidim-budgets 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa8f0db3125a7ddb93f9076d6e4fff7256cb1934
-  data.tar.gz: 109c2f3e91977e116a7d5baccf9fa142a78e100f
+  metadata.gz: 36a0cd87302d85abc1401b212ba7f792da11a7b2
+  data.tar.gz: 0ba3e53eca08d996c1d7ef4e515b113e60246815
 SHA512:
-  metadata.gz: 673eb952dde2972556bdcb286255d7a456f9f738764901f0c832adea7b8ea3d606b248cf4f6a33fc166ef4ed21b95f53c71d4f112745be53228e445acb7f04fd
-  data.tar.gz: 4e22d0bb6a0acc9a3c8820ef305eefb3a273521063908895e84f0b6a2c65c9a692e05986047949c5faaa54e396e2c9c522642be4e331d869552cfd7e215a8779
+  metadata.gz: 4f290147ea2a65b093245248598014046266abdeb3ee57fda81051f66297129b19b5d899867f74af9a93bf9a9bdf4af0295ac51c9fa814010993bc0e1e496c14
+  data.tar.gz: cefabce04a878a30200a62e6a5d4e28542f43bfd0e976324a6e45b6a0f6666f92e5e0edcfc713f3424b9c80cd65c4ebd79748e6aac158d0f7fb956906dd9b601

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

@@ -1,4 +1,16 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8">
-  <path d="M2 0v1h-.75c-.68 0-1.25.57-1.25 1.25v.5c0 .68.44 1.24 1.09 1.41l2.56.66c.14.04.34.29.34.44v.5c0 .14-.11.25-.25.25h-2.5c-.12 0-.21-.04-.25-.06v-.94h-1v1c0 .34.2.63.44.78.23.16.52.22.81.22h.75v1h1v-1h.75c.69 0 1.25-.56 1.25-1.25v-.5c0-.68-.44-1.24-1.09-1.41l-2.56-.66c-.14-.04-.34-.29-.34-.44v-.5c0-.14.11-.25.25-.25h2.5c.11 0 .21.04.25.06v.94h1v-1c0-.34-.2-.63-.44-.78-.23-.16-.52-.22-.81-.22h-.75v-1h-1z"
-  transform="translate(1)" />
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 36 36" style="enable-background:new 0 0 36 36;" xml:space="preserve">
+<g>
+	<path d="M18,36C8.1,36,0,27.9,0,18S8.1,0,18,0s18,8.1,18,18S27.9,36,18,36z M18,2C9.2,2,2,9.2,2,18s7.2,16,16,16s16-7.2,16-16
+		S26.8,2,18,2z"/>
+</g>
+<g>
+	<g>
+		<path d="M17.1,28.3c-5.3,0-9.9-4.4-9.9-9.8c0-5.5,4.9-9.5,9.3-9.5H18v9h9v0.9C27,23.2,22.7,28.3,17.1,28.3z M16,10.7
+			c-4,0.6-6.5,3.7-6.5,7.6c0,4.3,3.6,8,7.7,8c3.9,0,7-3.3,7.6-6.3H16V10.7z"/>
+	</g>
+	<path d="M30,16H20V6h0.6c4.5,0,9.4,4.4,9.4,8.9V16z M22,14h5.5C27,11,24,8.6,22,8V14z"/>
+</g>
+</svg>

data/app/assets/javascripts/decidim/budgets/progressFixed.js.es6

@@ -0,0 +1,23 @@
+$(() => {
+  const checkProgressPosition = () => {
+    let progressFix = document.querySelector("[data-progressbox-fixed]"),
+      progressRef = document.querySelector("[data-progress-reference]"),
+      progressVisibleClass = "is-progressbox-visible";
+
+    if (!progressRef) {
+      return;
+    }
+
+    let progressPosition = progressRef.getBoundingClientRect().bottom;
+    if (progressPosition > 0) {
+      progressFix.classList.remove(progressVisibleClass);
+    } else {
+      progressFix.classList.add(progressVisibleClass);
+    }
+  }
+
+  window.addEventListener("scroll", checkProgressPosition);
+
+  window.DecidimBudgets = window.DecidimBudgets || {};
+  window.DecidimBudgets.checkProgressPosition = checkProgressPosition;
+});

data/app/assets/javascripts/decidim/budgets/projects.js.es6

@@ -1,3 +1,4 @@
+// = require ./progressFixed
 // = require_self
 
 $(() => {
@@ -5,7 +6,7 @@ $(() => {
   const $budgetSummaryTotal = $('.budget-summary__total');
   const $budgetExceedModal = $('#budget-excess');
 
-  const totalBudget = $budgetSummaryTotal.data('total-budget');
+  const totalBudget = parseInt($budgetSummaryTotal.attr('data-total-budget'), 10);
 
   const cancelEvent = (event) => {
     event.stopPropagation();
@@ -13,14 +14,14 @@ $(() => {
   };
 
   $projects.on('click', '.budget--list__action', (event) => {
-    const currentBudget = $('.budget-summary__progressbox').data('current-budget');
+    const currentBudget = parseInt($('.budget-summary__progressbox').attr('data-current-budget'), 10);
     const $currentTarget = $(event.currentTarget);
-    const projectBudget = $currentTarget.data('budget');
+    const projectBudget = parseInt($currentTarget.attr('data-budget'), 10);
 
     if ($currentTarget.attr('disabled')) {
       cancelEvent(event);
 
-    } else if ($currentTarget.data('add') && ((currentBudget + projectBudget) > totalBudget)) {
+    } else if ($currentTarget.attr('data-add') && ((currentBudget + projectBudget) > totalBudget)) {
       $budgetExceedModal.foundation('toggle');
       cancelEvent(event);
     }

data/app/assets/stylesheets/decidim/budgets/budget/_budget-list.scss

@@ -11,7 +11,7 @@
   }
 }
 .budget-list__data--added{
-  background-color: mix(white, $success, 80%);
+  background-color: tint($success, 80%);
 }
 
 .budget-list__number{

data/app/commands/decidim/budgets/add_line_item.rb

@@ -35,8 +35,10 @@ module Decidim
       end
 
       def add_line_item
-        order.projects << @project
-        order.save!
+        order.with_lock do
+          order.projects << @project
+          order.save!
+        end
       end
     end
   end

data/app/commands/decidim/budgets/admin/create_project.rb

@@ -33,7 +33,6 @@ module Decidim
             category: @form.category,
             feature: @form.current_feature,
             title: @form.title,
-            short_description: @form.short_description,
             description: @form.description,
             budget: @form.budget
           )

data/app/commands/decidim/budgets/admin/update_project.rb

@@ -37,7 +37,6 @@ module Decidim
             scope: form.scope,
             category: form.category,
             title: form.title,
-            short_description: form.short_description,
             description: form.description,
             budget: form.budget
           )

data/app/commands/decidim/budgets/checkout.rb

@@ -19,15 +19,19 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) unless @order&.can_checkout?
-        checkout!
+        return broadcast(:invalid, @order) unless checkout!
         broadcast(:ok, @order)
       end
 
       private
 
       def checkout!
-        @order.update_attributes!(checked_out_at: Time.current)
+        return unless @order
+
+        @order.with_lock do
+          @order.checked_out_at = Time.current
+          @order.save
+        end
       end
     end
   end

data/app/controllers/decidim/budgets/admin/application_controller.rb

@@ -8,6 +8,15 @@ module Decidim
       # Note that it inherits from `Decidim::Features::BaseController`, which
       # override its layout and provide all kinds of useful methods.
       class ApplicationController < Decidim::Admin::Features::BaseController
+        helper_method :projects, :project
+
+        def projects
+          @projects ||= Project.where(feature: current_feature)
+        end
+
+        def project
+          @project ||= projects.find(params[:id])
+        end
       end
     end
   end

data/app/controllers/decidim/budgets/admin/attachments_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module Decidim
+  module Budgets
+    module Admin
+      # Controller that allows managing all the attachments for a participatory
+      # process.
+      #
+      class AttachmentsController < Admin::ApplicationController
+        include Decidim::Admin::Concerns::HasAttachments
+
+        def after_destroy_path
+          projects_path
+        end
+
+        def attached_to
+          project
+        end
+
+        def project
+          @project ||= projects.find(params[:project_id])
+        end
+
+        def authorization_object
+          project.feature
+        end
+      end
+    end
+  end
+end

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

@@ -9,6 +9,8 @@ module Decidim
       helper_method :project
 
       def create
+        authorize_action! "vote"
+
         AddLineItem.call(current_order, project, current_user) do
           on(:ok) do |order|
             self.current_order = order

data/app/controllers/decidim/budgets/orders_controller.rb

@@ -7,6 +7,8 @@ module Decidim
       include NeedsCurrentOrder
 
       def checkout
+        authorize_action! "vote"
+
         Checkout.call(current_order, current_feature) do
           on(:ok) do
             flash[:notice] = I18n.t("orders.checkout.success", scope: "decidim")

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

@@ -8,15 +8,14 @@ module Decidim
         include TranslationsHelper
 
         translatable_attribute :title, String
-        translatable_attribute :short_description, String
         translatable_attribute :description, String
+
         attribute :budget, Integer
         attribute :decidim_scope_id, Integer
         attribute :decidim_category_id, Integer
         attribute :proposal_ids, Array[Integer]
 
         validates :title, translatable_presence: true
-        validates :short_description, translatable_presence: true
         validates :description, translatable_presence: true
         validates :budget, presence: true, numericality: { greater_than: 0 }
 

data/app/models/decidim/budgets/order.rb

@@ -16,9 +16,17 @@ module Decidim
       validates :user, presence: true, uniqueness: { scope: :feature }
       validate :user_belongs_to_organization
 
+      validates :total_budget, numericality: {
+        greater_than_or_equal_to: :minimum_budget
+      }, if: :checked_out?
+
+      validates :total_budget, numericality: {
+        less_than_or_equal_to: :maximum_budget
+      }
+
       # Public: Returns the sum of project budgets
       def total_budget
-        @total_budget ||= projects.sum(&:budget)
+        projects.to_a.sum(&:budget)
       end
 
       # Public: Returns true if the order has been checked out
@@ -38,9 +46,16 @@ module Decidim
 
       # Public: Returns the required minimum budget to checkout
       def minimum_budget
+        return 0 unless feature
         feature.settings.total_budget.to_f * (feature.settings.vote_threshold_percent.to_f / 100)
       end
 
+      # Public: Returns the required maximum budget to checkout
+      def maximum_budget
+        return 0 unless feature
+        feature.settings.total_budget.to_f
+      end
+
       private
 
       def user_belongs_to_organization

data/app/models/decidim/budgets/project.rb

@@ -8,8 +8,25 @@ module Decidim
       include Decidim::HasFeature
       include Decidim::HasScope
       include Decidim::HasCategory
+      include Decidim::HasAttachments
+      include Decidim::Comments::Commentable
 
       feature_manifest_name "budgets"
+
+      # Public: Overrides the `commentable?` Commentable concern method.
+      def commentable?
+        feature.settings.comments_enabled?
+      end
+
+      # Public: Overrides the `accepts_new_comments?` Commentable concern method.
+      def accepts_new_comments?
+         commentable? && !feature.active_step_settings.comments_blocked
+      end
+
+      # Public: Overrides the `comments_have_votes?` Commentable concern method.
+      def comments_have_votes?
+        true
+      end
     end
   end
 end

data/app/services/decidim/budgets/project_search.rb

@@ -17,7 +17,6 @@ module Decidim
         query
           .where(localized_search_text_in(:title), text: "%#{search_text}%")
           .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
-          .or(query.where(localized_search_text_in(:short_description), text: "%#{search_text}%"))
       end
 
       # Handle the scope_id filter

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

@@ -2,10 +2,6 @@
   <%= form.translated :text_field, :title, autofocus: true %>
 </div>
 
-<div class="field" >
-  <%= form.translated :editor, :short_description %>
-</div>
-
 <div class="field" >
   <%= form.translated :editor, :description %>
 </div>

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%= decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -19,6 +19,7 @@
         </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>

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%= decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

data/app/views/decidim/budgets/line_items/update_budget.js.erb

@@ -5,17 +5,19 @@ var $projectItem = $('#project-<%= project.id %>-item');
 var $projectBudgetButton = $('#project-<%= project.id %>-budget-button');
 var $budgetConfirm = $('#budget-confirm');
 
-$orderTotalBudget.html('<%= j(render partial: 'decidim/budgets/projects/order_total_budget') %>');
-$orderSelectedProjects.html('<%= j(render partial: 'decidim/budgets/projects/order_selected_projects') %>');
-$orderProgress.html('<%= j(render partial: 'decidim/budgets/projects/order_progress') %>');
-$budgetConfirm.html('<%= j(render partial: 'decidim/budgets/projects/budget_confirm') %>')
+morphdom($orderTotalBudget[0], '<%= j(render partial: 'decidim/budgets/projects/order_total_budget') %>');
+morphdom($orderSelectedProjects[0], '<%= j(render partial: 'decidim/budgets/projects/order_selected_projects') %>');
+morphdom($orderProgress[0], '<%= j(render partial: 'decidim/budgets/projects/order_progress') %>');
+morphdom($budgetConfirm[0], '<%= j(render partial: 'decidim/budgets/projects/budget_confirm') %>')
 
-$(document).foundation();
+$("#order-progress").foundation();
 
 if ($projectItem.length > 0) {
-  $projectItem.html('<%= j(render partial: 'decidim/budgets/projects/project', locals: { project: project }) %>');
+  morphdom($projectItem[0], '<%= j(render partial: 'decidim/budgets/projects/project', locals: { project: project }) %>');
 }
 
 if ($projectBudgetButton.length > 0) {
-  $projectBudgetButton.html('<%= j(render partial: 'decidim/budgets/projects/project_budget_button', locals: { project: project }) %>');
+  morphdom($projectBudgetButton[0], '<%= j(render partial: 'decidim/budgets/projects/project_budget_button', locals: { project: project }) %>');
 }
+
+window.DecidimBudgets.checkProgressPosition();

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

@@ -1,30 +1,32 @@
-<% if current_order.present? %>
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t('.title') %></h3>
-    <button class="close-button" data-close aria-label="<%= t('.cancel') %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <p><%= t('.description') %></p>
-  <div class="card card--secondary">
-    <ul class="card__content">
-      <% current_order.projects.each do |project| %>
-        <li class="budget-summary__selected-item">
-          <%= link_to translated_attribute(project.title), project %>
-          <strong class="budget-summary__selected-number">
-            <%= budget_to_currency project.budget %>
-          </strong>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-  <p class="text-center"><%= t('.are_you_sure') %></p>
+<div class="reveal" data-reveal id="budget-confirm">
+  <% if current_order.present? %>
+    <div class="reveal__header">
+      <h3 class="reveal__title"><%= t('.title') %></h3>
+      <button class="close-button" data-close aria-label="<%= t('.cancel') %>" type="button">
+        <span aria-hidden="true">&times;</span>
+      </button>
+    </div>
+    <p><%= t('.description') %></p>
+    <div class="card card--secondary">
+      <ul class="card__content">
+        <% current_order.projects.each do |project| %>
+          <li class="budget-summary__selected-item">
+            <%= link_to translated_attribute(project.title), project %>
+            <strong class="budget-summary__selected-number">
+              <%= budget_to_currency project.budget %>
+            </strong>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+    <p class="text-center"><%= t('.are_you_sure') %></p>
     <div class="row">
       <div class="columns medium-8 medium-offset-2">
         <%= button_to t('.confirm'), checkout_order_path, class: "button expanded" %>
       </div>
     </div>
-  <div class="text-center">
-    <button class="link" data-close><%= t('.cancel') %></button>
-  </div>
-<% end %>
+    <div class="text-center">
+      <button class="link" data-close><%= t('.cancel') %></button>
+    </div>
+  <% end %>
+</div>

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

@@ -20,27 +20,18 @@
       </span>
     </div>
 
-    <div id="order-progress">
-      <%= render partial: 'order_progress' %>
-    </div>
+    <%= render partial: 'order_progress' %>
 
     <div>
       <span class="mini-title">
         <%= t('.assigned') %>
-        <strong id="order-total-budget" class="mini-title__strong">
-          <%= render partial: 'order_total_budget' %>
-        </strong>
+        <%= render partial: 'order_total_budget' %>
       </span>
     </div>
   </div>
 
-  <div id="order-selected-projects">
-    <%= render partial: 'order_selected_projects' %>
-  </div>
+  <%= render partial: 'order_selected_projects' %>
 </div>
 
 <%= render partial: "budget_excess" %>
-
-<div class="reveal" data-reveal id="budget-confirm">
-  <%= render partial: "budget_confirm" %>
-</div>
+<%= render partial: "budget_confirm" %>

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

@@ -1,24 +1,8 @@
-<div class="budget-summary__progressbox" data-current-budget="<%= current_order ? current_order.total_budget : 0 %>">
-  <div class="progress budget-progress" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= feature_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
-    <div class="progress-meter progress-meter--minimum" style="width: <%= 100 - current_order_budget_percent %>%"></div>
-    <!--Change width and text dynamically.-->
-    <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
-      <p class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</p>
-    </div>
-  </div>
-  <% unless current_order_checked_out? %>
-    <% if current_order_can_be_checked_out? %>
-      <button class="button small button--sc" data-toggle="budget-confirm"><%= t('.vote') %></button>
-    <% else %>
-      <button class="button small button--sc" data-toggle="budget-confirm" disabled><%= t('.vote') %></button>
-    <% end %>
-  <% end %>
-</div>
-
-<div class="progressbox-fixed-wrapper" data-progressbox-fixed>
-  <div class="budget-summary__progressbox budget-summary__progressbox--fixed">
-    <div class="progress budget-progress budget-progress--fixed" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= feature_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
+<div id="order-progress">
+  <div class="budget-summary__progressbox" data-current-budget="<%= current_order ? current_order.total_budget : 0 %>">
+    <div class="progress budget-progress" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= feature_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
       <div class="progress-meter progress-meter--minimum" style="width: <%= 100 - current_order_budget_percent %>%"></div>
+      <!--Change width and text dynamically.-->
       <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
         <p class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</p>
       </div>
@@ -31,4 +15,22 @@
       <% end %>
     <% end %>
   </div>
-</div>
+
+  <div class="progressbox-fixed-wrapper" data-progressbox-fixed>
+    <div class="budget-summary__progressbox budget-summary__progressbox--fixed">
+      <div class="progress budget-progress budget-progress--fixed" role="progressbar" tabindex="0" aria-valuenow="<%= current_order_budget_percent %>" aria-valuemin="<%= feature_settings.vote_threshold_percent %>" aria-valuetext="<%= current_order_budget_percent %>%" aria-valuemax="100">
+        <div class="progress-meter progress-meter--minimum" style="width: <%= 100 - current_order_budget_percent %>%"></div>
+        <div class="progress-meter budget-progress__meter" style="width: <%= current_order_budget_percent %>%">
+          <p class="progress-meter-text progress-meter-text--right"><%= current_order_budget_percent %>%</p>
+        </div>
+      </div>
+      <% unless current_order_checked_out? %>
+        <% if current_order_can_be_checked_out? %>
+          <button class="button small button--sc" data-toggle="budget-confirm"><%= t('.vote') %></button>
+        <% else %>
+          <button class="button small button--sc" data-toggle="budget-confirm" disabled><%= t('.vote') %></button>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -1,25 +1,27 @@
-<% if current_order&.projects&.any? %>
-  <div class="card__content budget-summary__selected">
-    <button data-toggle="reveal-selected">
-      <strong><%= current_order.projects.size %> </strong><%= t('.selected_projects', count: current_order.projects.size) %>
-      <%= icon("caret-bottom", class:"icon--small", aria_label: t('.view'), role: "img") %>
-    </button>
-    <div id="reveal-selected" class="hide" data-toggler=".hide">
-      <ul class="budget-summary__selected-list">
-        <% current_order.projects.each do |project| %>
-          <li class="budget-summary__selected-item">
-            <%= link_to translated_attribute(project.title), project %>
-            <strong class="budget-summary__selected-number">
-              <%= budget_to_currency project.budget %>
-            </strong>
-            <% unless current_order_checked_out? %>
-              <%= button_to order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true }, form: { style: "display: inline" } do %>
-                <%= icon("trash", aria_label: t('.remove'), role: "img") %>
+<div id="order-selected-projects">
+  <% if current_order&.projects&.any? %>
+    <div class="card__content budget-summary__selected">
+      <button data-toggle="reveal-selected">
+        <strong><%= current_order.projects.size %> </strong><%= t('.selected_projects', count: current_order.projects.size) %>
+        <%= icon("caret-bottom", class:"icon--small", aria_label: t('.view'), role: "img") %>
+      </button>
+      <div id="reveal-selected" class="hide" data-toggler=".hide">
+        <ul class="budget-summary__selected-list">
+          <% current_order.projects.each do |project| %>
+            <li class="budget-summary__selected-item">
+              <%= link_to translated_attribute(project.title), project %>
+              <strong class="budget-summary__selected-number">
+                <%= budget_to_currency project.budget %>
+              </strong>
+              <% unless current_order_checked_out? %>
+                <%= button_to order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true }, form: { style: "display: inline" } do %>
+                  <%= icon("trash", aria_label: t('.remove'), role: "img") %>
+                <% end %>
               <% end %>
-            <% end %>
-          </li>
-        <% end %>
-      </ul>
+            </li>
+          <% end %>
+        </ul>
+      </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
+</div>

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

@@ -1 +1,3 @@
-<%= budget_to_currency current_order&.total_budget.to_f %>
+<strong id="order-total-budget" class="mini-title__strong">
+  <%= budget_to_currency current_order&.total_budget.to_f %>
+</strong>

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

@@ -1,40 +1,42 @@
-<div class="card--list__text">
-  <div>
-    <%= link_to project, class: "card__link" do %>
-      <h5 class="card__title budget-list__title">
-        <%= translated_attribute project.title %>
-      </h5>
-    <% end %>
-    <%= render partial: "decidim/budgets/projects/tags", locals: { project: project } %>
-  </div>
-</div>
-<% if current_user.present? %>
-  <% if current_order && current_order.projects.include?(project) %>
-    <div class="card--list__data budget-list__data budget-list__data--added">
-      <span class="card--list__data__number budget-list__number">
-        <%= budget_to_currency(project.budget) %>
-      </span>
-      <%= button_to order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: current_order_checked_out?, class: "button tiny budget--list__action success" do %>
-        <%= icon("check", class: "icon--small", aria_label: t('.remove'), role: "img") %>
+<div id="project-<%= project.id %>-item" class="card--list__item">
+  <div class="card--list__text">
+    <div>
+      <%= link_to project, class: "card__link" do %>
+        <h5 class="card__title budget-list__title">
+          <%= translated_attribute project.title %>
+        </h5>
       <% end %>
+      <%= render partial: "decidim/budgets/projects/tags", locals: { project: project } %>
     </div>
+  </div>
+  <% if current_user.present? %>
+    <% if current_order && current_order.projects.include?(project) %>
+      <div class="card--list__data budget-list__data budget-list__data--added">
+        <span class="card--list__data__number budget-list__number">
+          <%= budget_to_currency(project.budget) %>
+        </span>
+        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: current_order_checked_out?, class: "button tiny budget--list__action success" do %>
+          <%= icon("check", class: "icon--small", aria_label: t('.remove'), role: "img") %>
+        <% end %>
+      </div>
+    <% else %>
+      <div class="card--list__data budget-list__data">
+        <span class="card--list__data__number budget-list__number">
+          <%= budget_to_currency(project.budget) %>
+        </span>
+        <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: current_order_checked_out?, class: "button tiny hollow budget--list__action" do %>
+          <%= icon("check", class: "icon--small", aria_label: t('.add'), role: "img") %>
+        <% end %>
+      </div>
+    <% end %>
   <% else %>
     <div class="card--list__data budget-list__data">
       <span class="card--list__data__number budget-list__number">
         <%= budget_to_currency(project.budget) %>
       </span>
-      <%= button_to order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: current_order_checked_out?, class: "button tiny hollow budget--list__action" do %>
+      <a href="#" class="button tiny hollow budget--list__action disabled" data-toggle="loginModal">
         <%= icon("check", class: "icon--small", aria_label: t('.add'), role: "img") %>
-      <% end %>
+      </a>
     </div>
   <% end %>
-<% else %>
-  <div class="card--list__data budget-list__data">
-    <span class="card--list__data__number budget-list__number">
-      <%= budget_to_currency(project.budget) %>
-    </span>
-    <a href="#" class="button tiny hollow budget--list__action disabled" data-toggle="loginModal">
-      <%= icon("check", class: "icon--small", aria_label: t('.add'), role: "img") %>
-    </a>
-  </div>
-<% end %>
+</div>

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

@@ -1,8 +1,8 @@
 <% if current_user.present? %>
   <% if current_order && current_order.projects.include?(project) %>
-    <%= button_to t('.added'), order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: current_order_checked_out?, class: "button expanded button--sc success budget--list__action" %>
+    <%= action_authorized_button_to "vote", t('.added'), order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: current_order_checked_out?, class: "button expanded button--sc success budget--list__action" %>
   <% else %>
-    <%= button_to t('.add'), order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: current_order_checked_out?, class: "button expanded button--sc budget--list__action" %>
+    <%= action_authorized_button_to "vote", t('.add'), order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: current_order_checked_out?, class: "button expanded button--sc budget--list__action" %>
   <% end %>
 <% else %>
   <button class="button expanded button--sc disabled" data-toggle="loginModal"><%= t('.add') %></button>

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

@@ -1,8 +1,6 @@
 <div class="card card--list budget-list">
   <% projects.each do |project| %>
-    <div id="project-<%= project.id %>-item" class="card--list__item">
-      <%= render partial: 'project', locals: { project: project } %>
-    </div>
+    <%= render partial: 'project', locals: { project: project } %>
   <% end %>
 </div>
 <%= decidim_paginate projects, random_seed: random_seed %>

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

@@ -1,5 +1,3 @@
-<% content_for(:title, t(".title")) %>
-
 <% if current_user.present? %>
   <div class="row column">
     <%= render partial: "budget_summary", locals: { include_heading: true } %>
@@ -23,4 +21,3 @@
 
 <%= javascript_include_tag("decidim/filters") %>
 <%= javascript_include_tag("decidim/budgets/projects") %>
-<%= render partial: "decidim/shared/login_modal" %>

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

@@ -1,4 +1,7 @@
-<% content_for(:title, translated_attribute(project.title)) %>
+<% add_decidim_meta_tags(
+  title: translated_attribute(project.title),
+  description: translated_attribute(project.description)
+) %>
 
 <div class="row column view-header">
   <% if current_user.present? %>
@@ -27,22 +30,14 @@
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
-      <%== translated_attribute project.short_description %>
-      <%= render partial: "tags", locals: { project: project } %>
-    </div>
-    <div class="section">
-      <h3 class="section-heading"><%= t(".project_description") %></h3>
       <%== translated_attribute project.description %>
+      <%= render partial: "tags", locals: { project: project } %>
     </div>
     <%= linked_resources_for project, :proposals, "included_proposals" %>
   </div>
 </div>
 
-<%= content_for :expanded do %>
-  <% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
-    <%= comments_for project, votable: true %>
-  <% end %>
-<% end %>
+<%= comments_for project %>
 
+<%= attachments_for project %>
 <%= javascript_include_tag("decidim/budgets/projects") %>
-<%= render partial: "decidim/shared/login_modal" %>

data/config/i18n-tasks.yml

@@ -2,3 +2,5 @@ base_locale: en
 locales: [en]
 ignore_unused:
 - "decidim.features.budgets.name"
+- "decidim.features.budgets.settings.*"
+- "activemodel.attributes.project.*"

data/config/locales/ca.yml

@@ -1,7 +1,17 @@
 ca:
+  activemodel:
+    attributes:
+      project:
+        budget: Pressupost
+        decidim_category_id: Categoria
+        decidim_scope_id: Àmbit
+        description: Descripció
+        proposal_ids: Propostes relacionades
+        title: Títol
   decidim:
     budgets:
       actions:
+        attachments: Adjunts
         confirm_destroy: Estàs segur que vols eliminar aquest projecte?
         destroy: Esborrar
         edit: Editar
@@ -15,6 +25,8 @@ ca:
           create:
             invalid: Hi ha hagut un problema creant aquest projecte
             success: Projecte creat correctament
+          destroy:
+            success: Projecte eliminat correctament
           edit:
             title: Editar projecte
             update: Actualitzar projecte
@@ -32,7 +44,7 @@ ca:
             title: Títol
       projects:
         budget_confirm:
-          are_you_sure: Estàs d'acord? Un cop hagis confirmat el teu vot, no podràs canviar-lo.
+          are_you_sure: Hi estàs d'acord? Un cop hagis confirmat el teu vot, no podràs canviar-lo.
           cancel: Cancel·lar
           confirm: Confirmar
           description: Aquests són els projectes que has seleccionat per formar part del pressupost.
@@ -43,12 +55,13 @@ ca:
           ok: D'acord
           title: Pressupost superat
         budget_summary:
+          are_you_sure: Estàs segur de que vols cancel·lar el teu vot?
           assigned: 'Assignat:'
           cancel_order: eliminar el teu vot i començar de nou
           checked_out:
-            description: Ja has votat pel pressupost. Si ha canviat d'idea, pots %{cancel_link}.
+            description: Ja has votat pel pressupost. Si has canviat d'idea, pots %{cancel_link}.
             title: Vot pels pressupostos completat
-          description: "En quins projectes creus que hem de destinar el pressupost? Has d'assignar com a mínim %{minimum_budget} als projectes que desitges i votar amb les teves preferències per definir el pressupost."
+          description: En quins projectes creus que hem de destinar el pressupost? Has d'assignar com a mínim %{minimum_budget} als projectes que desitges i votar amb les teves preferències per definir el pressupost.
           title: Tu decideixes el pressupost
         count:
           projects_count:
@@ -58,8 +71,6 @@ ca:
           category: Categoria
           scopes: Àmbits
           search: Cerca
-        index:
-          title: Títol
         order_progress:
           vote: Votar
         order_selected_projects:
@@ -76,9 +87,22 @@ ca:
           added: Afegit
         show:
           budget: Pressupost
-          project_description: Descripció del projecte
           view_all_projects: Veure tots els projectes
     features:
       budgets:
         name: Pressupostos
+        settings:
+          global:
+            comments_enabled: Comentaris habilitats
+            total_budget: Pressupost total
+            vote_threshold_percent: Percentatge del pressupost mínim per fer el vot
+          step:
+            comments_blocked: Comentaris bloquejats
+    orders:
+      checkout:
+        error: S'ha produït un error en processar el teu vot
+        success: El teu vot s'ha tramitat amb èxit
+      destroy:
+        error: S'ha produït un error en cancel·lar el seu vot
+        success: El seu vot ha estat cancel·lat correctament
   total_budget: Pressupost total

data/config/locales/en.yml

@@ -1,8 +1,18 @@
 ---
 en:
+  activemodel:
+    attributes:
+      project:
+        budget: Budget
+        decidim_category_id: Category
+        decidim_scope_id: Scope
+        description: Description
+        proposal_ids: Related proposals
+        title: Title
   decidim:
     budgets:
       actions:
+        attachments: Attachments
         confirm_destroy: Are you sure you want to delete this project?
         destroy: Delete
         edit: Edit
@@ -35,14 +45,17 @@ en:
             title: Title
       projects:
         budget_confirm:
-          are_you_sure: Do you agree? Once you have confirmed your vote, you can not change it.
+          are_you_sure: Do you agree? Once you have confirmed your vote, you can not
+            change it.
           cancel: Cancel
           confirm: Confirm
           description: These are the projects you have chosen to be part of the budget.
           title: Confirm vote
         budget_excess:
           close: Close
-          description: This project exceeds the maximum budget and can not be added. If you want, you can delete a project you have already selected to add, or make your vote with your preferences.
+          description: This project exceeds the maximum budget and can not be added.
+            If you want, you can delete a project you have already selected to add,
+            or make your vote with your preferences.
           ok: OK
           title: Maximum budget exceeded
         budget_summary:
@@ -50,9 +63,12 @@ en:
           assigned: 'Assigned:'
           cancel_order: delete your vote and start over
           checked_out:
-            description: You've already voted for the budget. If you've changed your mind, you can %{cancel_link}.
+            description: You've already voted for the budget. If you've changed your
+              mind, you can %{cancel_link}.
             title: Budget vote completed
-          description: "What projects do you think we should allocate budget for? Assign at least %{minimum_budget} to the projects you want and vote with your preferences to define the budget."
+          description: What projects do you think we should allocate budget for? Assign
+            at least %{minimum_budget} to the projects you want and vote with your
+            preferences to define the budget.
           title: You decide the budget
         count:
           projects_count:
@@ -62,8 +78,6 @@ en:
           category: Category
           scopes: Scopes
           search: Search
-        index:
-          title: Title
         order_progress:
           vote: Vote
         order_selected_projects:
@@ -80,11 +94,17 @@ en:
           added: Added
         show:
           budget: Budget
-          project_description: Project description
           view_all_projects: View all projects
     features:
       budgets:
         name: Budgets
+        settings:
+          global:
+            comments_enabled: Comments enabled
+            total_budget: Total budget
+            vote_threshold_percent: Vote threshold percent
+          step:
+            comments_blocked: Comments blocked
     orders:
       checkout:
         error: An error ocurred while processing your vote

data/config/locales/es.yml

@@ -1,7 +1,17 @@
 es:
+  activemodel:
+    attributes:
+      project:
+        budget: Presupuesto
+        decidim_category_id: Categoría
+        decidim_scope_id: Ámbito
+        description: Descripción
+        proposal_ids: Propuestas relacionadas
+        title: Título
   decidim:
     budgets:
       actions:
+        attachments: Archivos adjuntos
         confirm_destroy: '¿Estás seguro de que deseas eliminar este proyecto?'
         destroy: Borrar
         edit: Editar
@@ -15,6 +25,8 @@ es:
           create:
             invalid: Ha habido un problema al crear este proyecto
             success: Proyecto creado con éxito
+          destroy:
+            success: Proyecto eliminado exitosamente
           edit:
             title: Editar proyecto
             update: Actualizar proyecto
@@ -43,12 +55,13 @@ es:
           ok: De acuerdo
           title: Presupuesto excedido
         budget_summary:
+          are_you_sure: '¿Estás seguro de que deseas cancelar tu voto?'
           assigned: 'Asignado:'
           cancel_order: eliminar tu voto y empezar de nuevo
           checked_out:
             description: Ya has votado para el presupuesto. Si has cambiado de idea, puedes %{cancel_link}.
             title: Voto enviado correctamente
-          description: "¿Qué proyectos crees que deberíamos asignar el presupuesto? Asigna por lo menos %{minimum_budget} a los proyectos que desees y vota para definir el presupuesto."
+          description: '¿Qué proyectos crees que deberíamos asignar el presupuesto? Asigna por lo menos %{minimum_budget} a los proyectos que desees y vota para definir el presupuesto.'
           title: Tú decides el presupuesto
         count:
           projects_count:
@@ -58,8 +71,6 @@ es:
           category: Categoría
           scopes: Ámbitos
           search: Buscar
-        index:
-          title: Título
         order_progress:
           vote: Votar
         order_selected_projects:
@@ -76,9 +87,22 @@ es:
           added: Añadido
         show:
           budget: Presupuesto
-          project_description: Descripción del proyecto
           view_all_projects: Ver todos los proyectos
     features:
       budgets:
         name: Presupuestos
+        settings:
+          global:
+            comments_enabled: Comentarios habilitados
+            total_budget: Presupuesto total
+            vote_threshold_percent: Porcentaje mínimo del presupuesto
+          step:
+            comments_blocked: Comentarios bloqueados
+    orders:
+      checkout:
+        error: Se ha producido un error al procesar tu voto
+        success: Tu voto se ha tramitado con éxito
+      destroy:
+        error: Ha habido un error al cancelar tu voto
+        success: Tu voto ha sido cancelado correctamente
   total_budget: Presupuesto total

data/config/locales/eu.yml

@@ -0,0 +1,5 @@
+eu:
+  activemodel:
+    attributes:
+      project:
+        budget: Aurrekontua

data/db/migrate/20170207101750_remove_short_description_from_decidim_projects.rb

@@ -0,0 +1,5 @@
+class RemoveShortDescriptionFromDecidimProjects < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :decidim_budgets_projects, :short_description
+  end
+end

data/lib/decidim/budgets/admin_engine.rb

@@ -10,7 +10,10 @@ module Decidim
       paths["db/migrate"] = nil
 
       routes do
-        resources :projects
+        resources :projects do
+          resources :attachments
+        end
+
         root to: "projects#index"
       end
 

data/lib/decidim/budgets/feature.rb

@@ -8,6 +8,8 @@ Decidim.register_feature(:budgets) do |feature|
   feature.icon = "decidim/budgets/icon.svg"
   feature.stylesheet = "decidim/budgets/budgets"
 
+  feature.actions = %(vote)
+
   feature.on(:before_destroy) do |instance|
     raise StandardError, "Can't remove this feature" if Decidim::Budgets::Project.where(feature: instance).any?
   end
@@ -20,11 +22,11 @@ Decidim.register_feature(:budgets) do |feature|
   feature.settings(:global) do |settings|
     settings.attribute :total_budget, type: :integer, default: 100_000_000
     settings.attribute :vote_threshold_percent, type: :integer, default: 70
-    settings.attribute :comments_always_enabled, type: :boolean, default: true
+    settings.attribute :comments_enabled, type: :boolean, default: true
   end
 
   feature.settings(:step) do |settings|
-    settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :comments_blocked, type: :boolean, default: false
   end
 
   feature.seeds do
@@ -34,6 +36,7 @@ Decidim.register_feature(:budgets) do |feature|
       feature = Decidim::Feature.create!(
         name: Decidim::Features::Namer.new(process.organization.available_locales, :budgets).i18n_name,
         manifest_name: :budgets,
+        published_at: Time.current,
         participatory_process: process
       )
 
@@ -46,12 +49,20 @@ Decidim.register_feature(:budgets) do |feature|
           description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(3)
           end,
-          short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(3)
-          end,
           budget: Faker::Number.number(8)
         )
-
+        Decidim::Attachment.create!(
+          title: Decidim::Faker::Localized.sentence(2),
+          description: Decidim::Faker::Localized.sentence(5),
+          file: File.new(Decidim::Dev.asset("city.jpeg")),
+          attached_to: project
+        )
+        Decidim::Attachment.create!(
+          title: Decidim::Faker::Localized.sentence(2),
+          description: Decidim::Faker::Localized.sentence(5),
+          file: File.new(Decidim::Dev.asset("Exampledocument.pdf")),
+          attached_to: project
+        )
         Decidim::Comments::Seed.comments_for(project)
       end
     end

data/lib/decidim/budgets/test/factories.rb

@@ -3,7 +3,7 @@ require "decidim/faker/localized"
 require "decidim/dev"
 
 FactoryGirl.define do
-  factory :budget_feature, class: Decidim::Feature do
+  factory :budget_feature, parent: :feature do
     name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :budgets).i18n_name }
     manifest_name :budgets
     participatory_process
@@ -26,9 +26,8 @@ FactoryGirl.define do
   factory :project, class: Decidim::Budgets::Project do
     title { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
-    short_description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
     budget { Faker::Number.number(8) }
-    feature { create(:budget_feature) }    
+    feature { create(:budget_feature) }
   end
 
   factory :order, class: Decidim::Budgets::Order do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-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.0.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,28 +88,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: decidim-admin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 description: ''
 email:
 - josepjaume@gmail.com
@@ -123,6 +137,7 @@ files:
 - Rakefile
 - app/assets/config/decidim_budgets_manifest.js
 - app/assets/images/decidim/budgets/icon.svg
+- app/assets/javascripts/decidim/budgets/progressFixed.js.es6
 - app/assets/javascripts/decidim/budgets/projects.js.es6
 - app/assets/stylesheets/decidim/budgets/_budgets.scss
 - app/assets/stylesheets/decidim/budgets/budget/_budget-list.scss
@@ -136,6 +151,7 @@ files:
 - app/commands/decidim/budgets/remove_line_item.rb
 - app/controllers/concerns/decidim/budgets/needs_current_order.rb
 - app/controllers/decidim/budgets/admin/application_controller.rb
+- app/controllers/decidim/budgets/admin/attachments_controller.rb
 - app/controllers/decidim/budgets/admin/projects_controller.rb
 - app/controllers/decidim/budgets/application_controller.rb
 - app/controllers/decidim/budgets/line_items_controller.rb
@@ -174,9 +190,11 @@ files:
 - config/locales/ca.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/eu.yml
 - db/migrate/20170127114122_create_projects.rb
 - db/migrate/20170130095615_create_orders.rb
 - db/migrate/20170130101825_create_line_items.rb
+- db/migrate/20170207101750_remove_short_description_from_decidim_projects.rb
 - lib/decidim/budgets.rb
 - lib/decidim/budgets/admin.rb
 - lib/decidim/budgets/admin_engine.rb