decidim 0.0.7 → 0.0.8.1

data/decidim-pages/README.md

@@ -18,7 +18,7 @@ $ bundle
 ```
 
 ## Contributing
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).
 
 ## License
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).

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

@@ -15,7 +15,7 @@ ca:
             body: Cos
         pages:
           edit:
-            save: Desa la pàgina
+            save: Actualitzar
             title: Editar pàgina
           update:
             invalid: Hi ha hagut errors en desar la pàgina.

data/decidim-pages/config/locales/en.yml

@@ -16,7 +16,7 @@ en:
             body: Body
         pages:
           edit:
-            save: Save page
+            save: Update
             title: Edit page
           update:
             invalid: There's been errors when saving the page.

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

@@ -15,7 +15,7 @@ es:
             body: Cuerpo
         pages:
           edit:
-            save: Guardar página
+            save: Actualizar
             title: Editar página
           update:
             invalid: Ha habido errores al guardar la página.

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

@@ -15,7 +15,6 @@ eu:
             body: Testu-gorputza
         pages:
           edit:
-            save: Gorde orria
             title: Editatu orria
           update:
             invalid: Erroreak gertatu dira orria gordetzean.

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

@@ -15,7 +15,6 @@ fi:
             body: Runko
         pages:
           edit:
-            save: Tallenna sivu
             title: Muokkaa sivua
           update:
             invalid: Sivun tallennuksessa oli virheitä.

data/decidim-pages/config/locales/fr.yml

@@ -0,0 +1,5 @@
+fr:
+  decidim:
+    features:
+      pages:
+        name: Page

data/decidim-pages/config/locales/nl.yml

@@ -0,0 +1,5 @@
+nl:
+  decidim:
+    features:
+      pages:
+        name: Pagina

data/decidim-proposals/README.md

@@ -18,7 +18,7 @@ $ bundle
 ```
 
 ## Contributing
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).
 
 ## License
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).

data/decidim-proposals/app/controllers/decidim/proposals/proposal_widgets_controller.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalWidgetsController < Decidim::WidgetsController
+      helper_method :model, :current_participatory_process
+      helper Proposals::ApplicationHelper
+
+      private
+
+      def model
+        @model ||= Proposal.where(feature: params[:feature_id]).find(params[:proposal_id])
+      end
+
+      def current_participatory_process
+        @current_participatory_process ||= model.feature.participatory_process
+      end
+
+      def iframe_url
+        @iframe_url ||= proposal_proposal_widget_url(model)
+      end
+    end
+  end
+end

data/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb

@@ -4,6 +4,7 @@ module Decidim
   module Proposals
     # Exposes the proposal resource so users can view and create them.
     class ProposalsController < Decidim::Proposals::ApplicationController
+      helper Decidim::WidgetUrlsHelper
       include FormFactory
       include FilterResource
 
@@ -19,9 +20,6 @@ module Decidim
                      .includes(:category)
                      .includes(:scope)
 
-        @proposals = @proposals.page(params[:page]).per(12)
-        @proposals = reorder(@proposals)
-
         @voted_proposals = if current_user
                              ProposalVote.where(
                                author: current_user,
@@ -30,6 +28,10 @@ module Decidim
                            else
                              []
                            end
+
+        @proposals = @proposals.page(params[:page]).per(12)
+        @proposals = reorder(@proposals)
+
       end
 
       def show
@@ -63,8 +65,15 @@ module Decidim
 
       private
 
+      # Gets how the proposals should be ordered based on the choice made by the user.
+      #
+      # Note that when votes are active and hidden at the same time, the "most_voted"
+      # option is not available, so it's replaced to "random" to avoid people
+      # changing the URL manually.
       def order
-        @order = params[:order] || "random"
+        return @order if @order
+        @order = "random" if current_settings.votes_enabled? && current_settings.votes_hidden? && params[:order] == "most_voted"
+        @order ||= params[:order] || "random"
       end
 
       # Returns: A random float number between -1 and 1 to be used as a random seed at the database.

data/decidim-proposals/app/helpers/decidim/proposals/application_helper.rb

@@ -27,6 +27,21 @@ module Decidim
 
         I18n.t(value, scope: "decidim.proposals.answers")
       end
+
+      # Public: The css class applied based on the proposal state.
+      #
+      # state - The String state of the proposal.
+      #
+      # Returns a String.
+      def proposal_state_css_class(state)
+        if state == "accepted"
+          "text-success"
+        elsif state == "rejected"
+          "text-alert"
+        else
+          "text-warning"
+        end
+      end
     end
   end
 end

data/decidim-proposals/app/helpers/decidim/proposals/proposal_order_helper.rb

@@ -7,7 +7,7 @@ module Decidim
       def order_fields
         @order_fields ||= begin
           order_fields = [:random, :recent]
-          order_fields << :most_voted if current_settings.votes_enabled?
+          order_fields << :most_voted if current_settings.votes_enabled? && !current_settings.votes_hidden?
           order_fields
         end
       end

data/decidim-proposals/app/views/decidim/proposals/admin/proposals/index.html.erb

@@ -40,17 +40,14 @@
                 <% end %>
               </td>
               <td>
-                <% if proposal.state.nil? %>
-                  <% if can? :update, proposal %>
-                    <%= link_to t("actions.answer", scope: "decidim.proposals"), edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), class: "button tiny" %>
-                  <% end %>
-                <% else %>
-                  <strong class="<%= proposal.state == 'accepted' ? 'text-success' : 'text-alert' %>">
-                    <%= humanize_proposal_state proposal.state %>
-                  </strong>
-                <% end %>
+                <strong class="<%= proposal_state_css_class proposal.state %>">
+                  <%= humanize_proposal_state proposal.state %>
+                </strong>
               </td>
               <td class="table-list__actions">
+                <% if can? :update, proposal %>
+                  <%= icon_link_to "chat", edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), t("actions.answer", scope: "decidim.proposals"), class: "action-icon--edit-answer" %>
+                <% end %>
                 <%= icon_link_to "eye", decidim_proposals.proposal_path(id: proposal, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank %>
               </td>
             </tr>

data/decidim-proposals/app/views/decidim/proposals/proposal_widgets/show.html.erb

@@ -0,0 +1,25 @@
+<div class="column">
+  <article class="card card--proposal">
+    <div class="card__content">
+      <div class="card__header">
+        <%= link_to model do%>
+          <h5 class="card__title"><%= model.title %></h5>
+        <% end %>
+        <div class="card__author author-data author-data--small">
+          <div class="author-data__main">
+            <div class="author author--inline">
+              <span class="author__avatar author__avatar--small">
+                <%= image_tag model.author_avatar_url %>
+              </span>
+              <span class="author__name"><%= model.author_name %></span>
+              <%= l model.created_at, format: "%d/%m/%Y" %>
+            </div>
+          </div>
+        </div>
+      </div>
+      <%= render partial: "decidim/proposals/proposals/proposal_badge", locals: { proposal: model } %>
+      <p><%= truncate(model.body, length: 100) %></p>
+      <%= render partial: "decidim/proposals/proposals/tags", locals: { proposal: model } %>
+    </div>
+  </article>
+</div>

data/decidim-proposals/app/views/decidim/proposals/proposals/_vote_button.html.erb

@@ -1,8 +1,14 @@
 <div id="proposal-<%= proposal.id %>-vote-button">
   <% if !current_user %>
-    <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
-      <%= t('.vote') %>
-    </button>
+    <% if current_settings.votes_blocked? %>
+      <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled" data-toggle="loginModal">
+        <%= t('.votes_blocked') %>
+      </button>
+    <% else %>
+      <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
+        <%= t('.vote') %>
+       </button>
+    <% end %>
   <% else %>
     <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
       <% if vote_limit_enabled? %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_votes_count.html.erb

@@ -1,9 +1,10 @@
 <div id="proposal-<%= proposal.id %>-votes-count" class="card__support__data">
-  <span class="<%= votes_count_classes(from_proposals_list)[:number] %>">
-    <%= proposal.proposal_votes_count %>
-  </span>
-  <span class="<%= votes_count_classes(from_proposals_list)[:label]  %>">
-    <%= t('.count', count: proposal.proposal_votes_count) %>
-  </span>
-
+  <% if !current_settings.votes_hidden? %>
+    <span class="<%= votes_count_classes(from_proposals_list)[:number] %>">
+      <%= proposal.proposal_votes_count %>
+    </span>
+    <span class="<%= votes_count_classes(from_proposals_list)[:label]  %>">
+      <%= t('.count', count: proposal.proposal_votes_count) %>
+    </span>
+  <% end %>
 </div>

data/decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb

@@ -31,17 +31,14 @@
     <% if current_settings.votes_enabled? %>
       <div class="card extra">
         <div class="card__content">
-            <div id="proposal-<%= @proposal.id %>-votes-count">
-              <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
-            </div>
-            <div id="proposal-<%= @proposal.id %>-vote-button">
-              <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
-            </div>
+          <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
+          <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
         </div>
       </div>
     <% end %>
     <%= feature_reference(@proposal) %>
     <%= render partial: "decidim/shared/share_modal" %>
+    <%= embed_modal_for proposal_proposal_widget_url(@proposal, format: :js) %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">

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

@@ -13,7 +13,7 @@ ca:
     features:
       proposals:
         actions:
-          create: Crear propostes
+          create: Crear
           vote: Donar suport
         name: Propostes
         settings:
@@ -32,7 +32,7 @@ ca:
     proposals:
       actions:
         answer: Respondre
-        new: Nova proposta
+        new: Nova
         title: Accions
       admin:
         actions:
@@ -43,7 +43,7 @@ ca:
         proposal_answers:
           edit:
             accepted: Acceptada
-            answer_proposal: Resposta de la proposta
+            answer_proposal: Resposta
             rejected: Rebutjada
             title: Respondre a la proposta %{title}
         proposals:
@@ -58,8 +58,8 @@ ca:
           index:
             title: Propostes
           new:
-            create: Crear proposta
-            title: Nova proposta
+            create: Crear
+            title: Crear proposta
       answers:
         accepted: Acceptada
         not_answered: No resposta

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

@@ -14,7 +14,7 @@ en:
     features:
       proposals:
         actions:
-          create: Create proposals
+          create: Create
           vote: Vote
         name: Proposals
         settings:
@@ -30,10 +30,11 @@ en:
             proposal_answering_enabled: Proposal answering enabled
             votes_blocked: Votes blocked
             votes_enabled: Votes enabled
+            votes_hidden: Votes hidden (if votes are enabled, checking this will hide the number of votes)
     proposals:
       actions:
         answer: Answer
-        new: New Proposal
+        new: New
         title: Actions
       admin:
         actions:
@@ -44,7 +45,7 @@ en:
         proposal_answers:
           edit:
             accepted: Accepted
-            answer_proposal: Answer proposal
+            answer_proposal: Answer
             rejected: Rejected
             title: Answer for proposal %{title}
         proposals:
@@ -59,8 +60,8 @@ en:
           index:
             title: Proposals
           new:
-            create: Create proposal
-            title: New proposal
+            create: Create
+            title: Create proposal
       answers:
         accepted: Accepted
         not_answered: Not answered

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

@@ -13,7 +13,7 @@ es:
     features:
       proposals:
         actions:
-          create: Crear propuestas
+          create: Crear
           vote: Dar apoyo
         name: Propuestas
         settings:
@@ -32,7 +32,7 @@ es:
     proposals:
       actions:
         answer: Respuesta
-        new: Nueva propuesta
+        new: Nueva
         title: Acciones
       admin:
         actions:
@@ -43,7 +43,7 @@ es:
         proposal_answers:
           edit:
             accepted: Aceptada
-            answer_proposal: Respuesta a la propuesta
+            answer_proposal: Respuesta
             rejected: Rechazada
             title: Responder a la propuesta %{title}
         proposals:
@@ -58,8 +58,8 @@ es:
           index:
             title: Propuestas
           new:
-            create: Crear propuesta
-            title: Nueva propuesta
+            create: Crear
+            title: Crear propuesta
       answers:
         accepted: Aceptadas
         not_answered: No contestada

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

@@ -13,7 +13,6 @@ eu:
     features:
       proposals:
         actions:
-          create: Sortu proposamenak
           vote: Proiektuaren alde egin
         name: Proposamenak
         settings:
@@ -32,7 +31,6 @@ eu:
     proposals:
       actions:
         answer: Erantzuna
-        new: Proposamen berria
         title: Ekintzak
       admin:
         actions:
@@ -43,7 +41,6 @@ eu:
         proposal_answers:
           edit:
             accepted: Onartuta
-            answer_proposal: Erantzuna proposamenari
             rejected: Baztertuta
             title: 'Erantzun proposamen honi: %{title}'
         proposals:
@@ -57,9 +54,6 @@ eu:
             select_a_category: Aukeratu kategoria bat
           index:
             title: Proposamenak
-          new:
-            create: Sortu proposamena
-            title: Proposamen berria
       answers:
         accepted: Onartuta
         not_answered: Erantzun gabe