decidim-core 0.18.1 → 0.19.0

data/app/uploaders/decidim/avatar_uploader.rb

@@ -3,8 +3,6 @@
 module Decidim
   # This class deals with uploading avatars to a User.
   class AvatarUploader < ImageUploader
-    include CarrierWave::MiniMagick
-
     process :validate_dimensions
 
     version :profile do

data/app/uploaders/decidim/data_portability_uploader.rb

@@ -13,6 +13,7 @@ module Decidim
       default_path = "tmp/data-portability/"
 
       return File.join(Decidim.base_uploads_path, default_path) if Decidim.base_uploads_path.present?
+
       default_path
     end
   end

data/app/uploaders/decidim/homepage_image_uploader.rb

@@ -3,8 +3,6 @@
 module Decidim
   # This class deals with uploading hero images to organizations.
   class HomepageImageUploader < ImageUploader
-    include CarrierWave::MiniMagick
-
     version :big do
       process resize_to_fill: [1920, 666]
     end

data/app/uploaders/decidim/image_uploader.rb

@@ -5,7 +5,7 @@ module Decidim
   class ImageUploader < ApplicationUploader
     include CarrierWave::MiniMagick
 
-    process :validate_size, :validate_dimensions
+    process :validate_size, :validate_dimensions, :strip
     process quality: Decidim.image_uploader_quality
 
     # CarrierWave automatically calls this method and validates the content
@@ -16,6 +16,20 @@ module Decidim
       ]
     end
 
+    # Strips out all embedded information from the image
+    def strip
+      manipulate! do |img|
+        img.strip
+        img
+      end
+    end
+
+    # Add a white list of extensions which are allowed to be uploaded.
+    # For images you might use something like this:
+    def extension_white_list
+      %w(jpg jpeg gif png bmp ico)
+    end
+
     # A simple check to avoid DoS with maliciously crafted images, or just to
     # avoid reckless users that upload gigapixels images.
     #

data/app/uploaders/decidim/oauth_application_logo_uploader.rb

@@ -3,7 +3,6 @@
 module Decidim
   # This class deals with uploading hero images to ParticipatoryProcesses.
   class OAuthApplicationLogoUploader < ImageUploader
-    include CarrierWave::MiniMagick
     process resize_to_fit: [75, 75]
   end
 end

data/app/uploaders/decidim/official_image_footer_uploader.rb

@@ -3,7 +3,6 @@
 module Decidim
   # This class deals with uploading hero images to ParticipatoryProcesses.
   class OfficialImageFooterUploader < ImageUploader
-    include CarrierWave::MiniMagick
     process resize_to_fit: [600, 180]
   end
 end

data/app/uploaders/decidim/official_image_header_uploader.rb

@@ -3,7 +3,6 @@
 module Decidim
   # This class deals with uploading hero images to ParticipatoryProcesses.
   class OfficialImageHeaderUploader < ImageUploader
-    include CarrierWave::MiniMagick
     process resize_to_fit: [160, 160]
   end
 end

data/app/uploaders/decidim/open_data_uploader.rb

@@ -11,6 +11,7 @@ module Decidim
       default_path = "uploads/open-data"
 
       return File.join(Decidim.base_uploads_path, default_path) if Decidim.base_uploads_path.present?
+
       default_path
     end
   end

data/app/validators/etiquette_validator.rb

@@ -17,26 +17,31 @@ class EtiquetteValidator < ActiveModel::EachValidator
 
   def validate_caps(record, attribute, value)
     return if value.scan(/[A-Z]/).length < value.length / 4
+
     record.errors.add(attribute, options[:message] || :too_much_caps)
   end
 
   def validate_marks(record, attribute, value)
     return if value.scan(/[!?¡¿]{2,}/).empty?
+
     record.errors.add(attribute, options[:message] || :too_many_marks)
   end
 
   def validate_long_words(record, attribute, value)
     return if value.scan(/[A-z]{35,}/).empty?
+
     record.errors.add(attribute, options[:message] || :long_words)
   end
 
   def validate_caps_first(record, attribute, value)
     return if value.scan(/\A[a-z]{1}/).empty?
+
     record.errors.add(attribute, options[:message] || :must_start_with_caps)
   end
 
   def validate_length(record, attribute, value)
     return if value.length > 15
+
     record.errors.add(attribute, options[:message] || :too_short)
   end
 end

data/app/views/decidim/account/delete.html.erb

@@ -11,7 +11,7 @@
           <%= f.text_area :delete_reason, rows: 2, label: false %>
         </label>
       </div>
-      <input type="submit" class="button open-modal-button" value="<%= t(".confirm.title") %>" />
+      <input type="submit" class="button open-modal-button" value="<%= t(".confirm.title") %>">
     <% end %>
     <div class="tiny reveal" id="deleteConfirm" data-reveal>
       <%= decidim_form_for(@form, url: account_path, method: :delete, html: { class: "user-form delete-account-modal" }) do |f| %>
@@ -19,7 +19,7 @@
 
         <p><%= t(".confirm.question") %></p>
 
-        <input type="submit" class="button expanded" value="<%= t(".confirm.ok") %>" />
+        <input type="submit" class="button expanded" value="<%= t(".confirm.ok") %>">
 
         <button class="close-button" data-close aria-label="<%= t(".confirm.close") %>" type="button">
           <span aria-hidden="true">&times;</span>

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

@@ -1,6 +1,6 @@
 <div class="row">
   <%= decidim_form_for(@account, url: account_path, method: :put, html: { autocomplete: "nope" }) do |f| %>
-    <input autocomplete="off" name="hidden" type="password" style="display:none;" />
+    <input autocomplete="off" name="hidden" type="password" style="display:none;">
     <div class="columns large-4">
       <%= f.upload :avatar %>
     </div>

data/app/views/decidim/amendments/_edit_form_fields.html.erb

@@ -1,20 +1,23 @@
 <%= form.fields_for :emendation_params, form.object.emendation_params do |emendation_form| %>
-    <% form.object.amendable.attributes.each do |key, value| %>
-      <% key = key.to_sym %>
-      <% if form.object.amendable.amendable_fields.include?(key) %>
+  <% amendable.attributes.each do |key, value| %>
+    <% key = key.to_sym %>
+    <% if amendable.amendable_fields.include?(key) %>
 
-        <% if [:title, :body].include?(key) %>
-          <div class="field hashtags__container">
-            <%= emendation_form.form_field_for key, class: "js-hashtags",
-                hashtaggable: true, value: emendation_field_value(form, original, key) %>
-          </div>
-        <% end %>
+      <% if [:title, :body].include?(key) %>
+        <div class="field hashtags__container">
+          <%= emendation_form.form_field_for key,
+                                             class: "js-hashtags",
+                                             hashtaggable: true,
+                                             label: amendments_form_fields_label(key),
+                                             value: amendments_form_fields_value(original, key) %>
+        </div>
+      <% end %>
 
-        <% if form.object.errors[key].present? %>
-          <% form.object.errors.full_messages_for(key).each do |message| %>
-            <small class="form-error is-visible"><%= message %></small>
-          <% end %>
+      <% if form.object.errors[key].present? %>
+        <% form.object.errors.full_messages_for(key).each do |message| %>
+          <small class="form-error is-visible"><%= message %></small>
         <% end %>
+      <% end %>
 
     <% end %>
   <% end %>

data/app/views/decidim/amendments/_similar_emendation.html.erb

@@ -0,0 +1,24 @@
+<main class="column">
+  <article class="card card--proposal">
+    <div class="card__content">
+      <div class="card__header">
+        <%= link_to Decidim::ResourceLocatorPresenter.new(emendation).path, target: "_blank" do %>
+          <h5 class="card__title"><%= decidim_html_escape(present(emendation).title).html_safe %></h5>
+        <% end %>
+
+        <%= cell("decidim/coauthorships", emendation, has_actions: false, context: { current_user: current_user }) %>
+
+        <div class="tech-info tech-info--text-left">
+          <%= t("decidim.proposals.proposals.proposal.creation_date", date: l(emendation.created_at, format: :decidim_short)) %>
+        </div>
+        <%= resource_reference(emendation, class: "tech-info--text-left") %>
+      </div>
+
+      <%== cell("decidim/proposals/proposal_m", emendation).badge %>
+
+      <p><%= truncate(present(emendation).body(strip_tags: true), length: 100) %></p>
+
+      <%= cell "decidim/tags", emendation, context: { extra_classes: ["tags--proposal"] } %>
+    </div>
+  </article>
+</main>

data/app/views/decidim/amendments/compare_draft.html.erb

@@ -0,0 +1,21 @@
+<main class="wrapper">
+  <div class="row">
+    <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside ) %>
+
+    <div class="columns large-6">
+      <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_header, similar_resources_count: similar_emendations.size ) %>
+
+      <div class="row small-up-1 card-grid">
+        <% similar_emendations.each do |emendation| %>
+          <%= render partial: "similar_emendation", locals: { emendation: emendation } %>
+        <% end %>
+      </div>
+
+      <div class="row column text-center">
+        <%= link_to t(".continue"), edit_draft_amend_path(amendment), class: "button small" %>
+      </div>
+    </div>
+
+    <div class="columns large-3"></div>
+  </div>
+</main>

data/app/views/decidim/amendments/edit_draft.html.erb

@@ -0,0 +1,31 @@
+<main class="wrapper">
+  <div class="row">
+    <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside ) %>
+
+    <div class="columns large-6">
+      <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_header ) %>
+
+      <div class="card">
+        <div class="card__content">
+          <%= decidim_form_for(@form, url: update_draft_amend_path(amendment), method: :patch) do |form| %>
+            <%= render partial: "edit_form_fields", locals: { form: form, original: :emendation } %>
+
+            <% if current_organization.user_groups_enabled? && current_user.user_groups.verified.any? %>
+              <div class="field">
+                <%= user_group_select_field form, :user_group_id %>
+              </div>
+            <% end %>
+
+            <div class="row column flex-center">
+              <%= link_to t(".discard"), destroy_draft_amend_path(amendment), method: :delete, data: { confirm: t(".discard_confirmation") } %>
+
+              <%= form.submit t(".send"), class: "button  button--nomargin small", data: { disable: true } %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+
+    <div class="columns large-3"></div>
+  </div>
+</main>

data/app/views/decidim/amendments/new.html.erb

@@ -1,23 +1,10 @@
 <main class="wrapper">
   <div class="row">
-    <div class="columns large-3">
-      <div class="m-bottom">
-        <%= link_to :back do %>
-          <%= icon "chevron-left", class: "icon--small" %>
-          <%= t(".back") %>
-        <% end %>
-      </div>
-      <div class="section">
-        <p>
-          <%= t(".help_text", model_name: amendable.model_name.human.downcase ) %>
-          <strong>
-            <%= decidim_html_escape(amendable.title).html_safe %>
-          </strong>
-        </p>
-      </div>
-    </div>
+    <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside ) %>
+
     <div class="columns large-6">
-      <h2 class="section-heading"><%= t(".heading") %></h2>
+      <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_header ) %>
+
       <div class="card">
         <div class="card__content">
           <%= decidim_form_for(@form, url: amends_path, method: :post) do |form| %>
@@ -38,6 +25,7 @@
         </div>
       </div>
     </div>
+
     <div class="columns large-3"></div>
   </div>
 </main>

data/app/views/decidim/amendments/preview_draft.html.erb

@@ -0,0 +1,32 @@
+<main class="wrapper">
+  <div class="row">
+    <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside) %>
+
+    <div class="columns large-6">
+      <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_header) %>
+
+      <div class="card">
+        <div class="p-l">
+          <div class="row column view-header">
+            <h2 class="heading2"><%= present(emendation).title(links: true, html_escape: true) %></h2>
+            <%= cell("decidim/coauthorships", emendation) %>
+          </div>
+
+          <div class="row column">
+            <%= simple_format present(emendation).body(links: true, strip_tags: true) %>
+          </div>
+
+          <br><%= render partial: "attachments", locals: { attached_to: emendation } %>
+
+          <div class="row column flex-center">
+            <%= link_to t(".modify"), edit_draft_amend_path(amendment) %>
+
+            <%= button_to t(".publish"), publish_draft_amend_path(amendment), method: :post, class: "button button--nomargin small" %>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="columns large-3"></div>
+  </div>
+</main>

data/app/views/decidim/amendments/review.html.erb

@@ -1,6 +1,6 @@
 <main class="wrapper">
   <div class="row">
-    <div class="columns large-3">
+    <div class="columns">
       <div class="m-bottom">
         <%= link_to :back do %>
           <%= icon "chevron-left", class: "icon--small" %>
@@ -16,7 +16,10 @@
         </p>
       </div>
     </div>
-    <div class="columns large-6">
+    <div class="columns mediumlarge-6">
+      <%= cell("decidim/diff", emendation.versions.last) %>
+    </div>
+    <div class="columns mediumlarge-6">
       <h2 class="section-heading">
         <%= t(".heading") %>
       </h2>
@@ -34,6 +37,5 @@
         </div>
       </div>
     </div>
-    <div class="columns large-3"></div>
   </div>
 </main>

data/app/views/decidim/application/_document.html.erb

@@ -12,7 +12,7 @@
     </div>
   </div>
   <div class="card--list__data">
-    <%= link_to document.url, target: "_blank", class: "card--list__data__icon" do %>
+    <%= link_to document.url, target: "_blank", rel: "noopener", class: "card--list__data__icon" do %>
         <%= icon "cloud-download" %>
     <% end %>
   </div>

data/app/views/decidim/application/_photos.html.erb

@@ -5,7 +5,7 @@
       <% photos.in_groups_of(3, false).each do |group| %>
         <% group.each_with_index do |photo, index| %>
           <div class="columns small-6 medium-4 <%= (index == 2 || photo == group.last ? "end" : "") %>">
-            <%= link_to photo.big_url, target: "_blank" do %>
+            <%= link_to photo.big_url, target: "_blank", rel: "noopener" do %>
               <%= image_tag photo.thumbnail_url, class:"thumbnail", alt: strip_tags(translated_attribute(photo.title)) %>
             <% end %>
           </div>

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

@@ -1,5 +1,5 @@
 <div class="row data-portability">
   <strong><%= t(".download_data") %></strong>
   <p><%= t(".download_data_description", user_email: current_user.email).html_safe %></p>
-  <%= button_to t(".request_data"), export_data_portability_path, class: "button secondary", data: { disable: true } %>
+  <%= button_to t(".request_data"), export_data_portability_path, class: "button", data: { disable: true } %>
 </div>

data/app/views/decidim/devise/invitations/edit.html.erb

@@ -23,11 +23,11 @@
 
             <% if f.object.class.require_password_on_accepting %>
               <div class="field">
-                <%= f.password_field :password, required: "required" %></p>
+                <%= f.password_field :password, required: "required", minlength: ::Devise.password_length.min, maxlength: ::Devise.password_length.max %></p>
               </div>
 
               <div class="field">
-                <%= f.password_field :password_confirmation, required: "required" %></p>
+                <%= f.password_field :password_confirmation, required: "required", minlength: ::Devise.password_length.min, maxlength: ::Devise.password_length.max %></p>
               </div>
             <% end %>
           </div>

data/app/views/decidim/devise/sessions/new.html.erb

@@ -4,7 +4,7 @@
   <div class="row collapse">
     <div class="row collapse">
       <div class="columns large-8 large-centered text-center page-title">
-        <h1 class="heading1"><%= t("devise.sessions.new.sign_in") %></h1>
+        <h1><%= t("devise.sessions.new.sign_in") %></h1>
         <% if current_organization.sign_up_enabled? %>
           <p>
             <%= t(".are_you_new?") %>

data/app/views/decidim/doorkeeper/authorizations/new.html.erb

@@ -6,14 +6,14 @@
           <div class="card__content">
             <div class="row">
               <div class="columns medium-2 text-center">
-                <img src="<%= oauth_application.organization_logo.url %>" alt="<%= oauth_application.organization_name %>" width="75" height="75" />
+                <img src="<%= oauth_application.organization_logo.url %>" alt="<%= oauth_application.organization_name %>" width="75" height="75">
               </div>
               <div class="columns medium-10">
                 <h3 class="heading3"><%= t(".wants_to_use_your_account_html", application_name: oauth_application.name) %>
-                  <br />
+                  <br>
                   <%= t(".by_organization_link_html", link: link_to(oauth_application.organization_name, oauth_application.organization_url)) %>
                 </h3>
-                <br />
+                <br>
                 <p class="lead"><%= t(".connect_your_account_html", organization: current_organization.name) %></p>
                 <div>
                   <p><strong><%= t(".this_application_will_be_able_to") %></strong></p>

data/app/views/decidim/export_mailer/data_portability_export.html.erb

@@ -1,2 +1,2 @@
-<%= t(".click_button", date: l(Decidim.data_portability_expiry_time.from_now, format: :decidim_short) ).html_safe %><br />
+<%= t(".click_button", date: l(Decidim.data_portability_expiry_time.from_now, format: :decidim_short) ).html_safe %><br>
 <%= link_to t(".download"), download_file_data_portability_url(host: @organization.host, token: @token), class: "button expanded hollow button--sc" %>

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

@@ -5,3 +5,9 @@ var $count = $('#search-count');
 $results.html('<%= j(cell("decidim/search_results", @sections, params: params).show).strip.html_safe %>');
 $filters.html('<%= j(render partial: "filters").strip.html_safe %>');
 $count.html('<%= j(render partial: "count").strip.html_safe %>');
+
+if (window.Decidim.DataPicker) {
+  window.theDataPicker = new window.Decidim.DataPicker($(".data-picker"));
+}
+
+$(document).foundation();