decidim-core 0.28.1 → 0.29.0.rc1

data/app/cells/decidim/profile_sidebar/show.erb

@@ -1,7 +1,7 @@
 <div class="card profile--sidebar">
   <%= image_tag profile_user.avatar_url(:profile), class: "card__image card__image--larger", alt: "avatar #{profile_user.name}" %>
-  <div class="card__content">
-    <h1 class="profile--sidebar--title">
+  <div>
+    <h1>
       <strong><%= profile_user.name %></strong>
       <br>
       <span>
@@ -14,12 +14,12 @@
         &nbsp;
       <% end %>
       <% if can_contact_user? %>
-        <span class="user-contact_link">
+        <span>
           <%= link_to_current_or_new_conversation_with(profile_holder) %>
         </span>
       <% end %>
     </h1>
-    <div class="mb-s">
+    <div>
       <small><%= decidim_html_escape(profile_user.about.to_s) %></small>
     </div>
     <% if profile_user.personal_url.present? %>
@@ -27,7 +27,7 @@
     <% end %>
   </div>
   <% if profile_user.badge.present? %>
-    <div class="badge-card__content">
+    <div>
       <span>
         <%= icon profile_user.badge, class: "author__verified", aria_label: t("decidim.profiles.show.officialized"), role: "img" %>
       </span>
@@ -37,29 +37,29 @@
     </div>
   <% end %>
   <%= render_hook(:user_profile_bottom) %>
-  <div class="card__footer card__footer--transparent">
-    <div class="p-s text-center">
+  <div>
+    <div class="text-center">
       <% if profile_user_can_follow? %>
-        <div class="mr-s">
+        <div>
           <%= link_to profile_followers_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.followers") %>
             <div><strong><%= profile_user.followers_count %></strong></div>
           <% end %>
         </div>
-        <div class="ml-s">
+        <div>
           <%= link_to profile_following_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.following") %>
             <div><strong><%= profile_user.following_count %></strong></div>
           <% end %>
         </div>
       <% else %>
-        <div class="mr-s">
+        <div>
           <%= link_to profile_followers_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.followers") %>
             <div><%= profile_user.followers_count %></div>
           <% end %>
         </div>
-        <div class="ml-s">
+        <div>
           <%= link_to profile_members_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.members") %>
             <div><%= profile_user.members_count %></div>
@@ -70,20 +70,20 @@
   </div>
 
   <% if current_organization.badges_enabled? && badge_statuses.any? %>
-    <div class="card__footer card__footer--transparent">
-      <div class="card__support">
-        <div class="row column mb-s">
-          <strong class="muted"><%= t("decidim.profiles.sidebar.badges.title") %></strong>
-          <div class="badge-tip badge-tip--inline">
-            <div data-tooltip data-position="top" title="<%= t("decidim.profiles.sidebar.badges.info") %>" data-yeti-box="badges-tooltip" data-toggle="badges-tooltip" data-resize="badges-tooltip" class="has-tip" data-events="resize">
+    <div>
+      <div>
+        <div class="row column">
+          <strong><%= t("decidim.profiles.sidebar.badges.title") %></strong>
+          <div>
+            <div data-tooltip data-position="top" title="<%= t("decidim.profiles.sidebar.badges.info") %>" data-yeti-box="badges-tooltip" data-toggle="badges-tooltip" data-resize="badges-tooltip" data-events="resize">
               <%= icon "info", class: "icon--small", role: "img", "aria-hidden": true %>
             </div>
           </div>
         </div>
-        <div class="collapsible-list is-filtered row small-up-2 medium-up-4 collapse">
+        <div class="row collapse">
           <% badge_statuses.each do |status| %>
             <div class="column">
-              <div class="badge-container pr-xs">
+              <div>
                 <%= cell("decidim/badge", profile_holder, badge: status.badge, status:).call(:small) %>
               </div>
             </div>
@@ -95,7 +95,7 @@
 </div>
 
 <div class="row">
-  <div class="column medium-8 medium-centered">
+  <div class="column">
     <% if own_profile? %>
       <div class="text-center">
         <%= link_to decidim.account_path, class: "button" do %>

data/app/cells/decidim/profile_sidebar_cell.rb

@@ -3,15 +3,10 @@
 module Decidim
   class ProfileSidebarCell < Decidim::ProfileCell
     include Decidim::Messaging::ConversationHelper
-    include Decidim::IconHelper
     include Decidim::ViewHooksHelper
-    include Decidim::ApplicationHelper
-    include Decidim::SanitizeHelper
     include Decidim::CellsHelper
 
-    helper_method :profile_user, :logged_in?, :current_user
-
-    delegate :user_signed_in?, to: :controller
+    helper_method :profile_user
 
     def show
       render :show
@@ -19,10 +14,6 @@ module Decidim
 
     private
 
-    def logged_in?
-      current_user.present?
-    end
-
     def profile_user
       @profile_user ||= present(model)
     end

data/app/cells/decidim/progress_bar/show.erb

@@ -4,11 +4,13 @@
     <%= content_tag :span, total if total != 0 %>
   </div>
 
-  <%= content_tag :div, units_name_text, class: "progress-bar__units" if units_name %>
+  <div class="proposals__aside-progress">
+    <%= content_tag :div, units_name_text, class: "progress-bar__units" if units_name %>
 
-  <% if total != 0 %>
-    <div class="progress-bar" role="progressbar" tabindex="0" aria-label="<%= units_name.present? ? units_name_text : t("decidim.shared.progress") %>" aria-valuenow="<%= percentage %>" aria-valuemin="0" aria-valuetext="<%= percentage %> %" aria-valuemax="<%= total %>">
-      <div style="width: <%= percentage %>%"></div>
-    </div>
-  <% end %>
+    <% if total != 0 %>
+      <div class="progress-bar" role="progressbar" aria-label="<%= units_name.present? ? units_name_text : t("decidim.shared.progress") %>" aria-valuenow="<%= number_with_precision(percentage, separator: ".", precision: 2) %>" aria-valuemin="0" aria-valuemax="100" aria-valuetext="<%= number_to_percentage(percentage, precision: 2) %>">
+        <div style="width: <%= percentage %>%"></div>
+      </div>
+    <% end %>
+  </div>
 </div>

data/app/cells/decidim/progress_bar_cell.rb

@@ -29,6 +29,8 @@ module Decidim
   #      total: 10,
   #    )
   class ProgressBarCell < Decidim::ViewModel
+    include ActionView::Helpers::NumberHelper
+
     private
 
     def element_id

data/app/cells/decidim/public_participation/show.erb

@@ -1,4 +1,4 @@
-<label class="represent-user-group form__wrapper-checkbox-label">
+<label class="form__wrapper-checkbox-label">
   <%= check_box_tag :public_participation %>
   <%= checkbox_text %>
 </label>

data/app/cells/decidim/report_button/flag_modal.erb

@@ -10,7 +10,7 @@
           <%= f.collection_radio_buttons :reason, [
             [:spam, t("decidim.shared.flag_modal.spam")],
             [:offensive, t("decidim.shared.flag_modal.offensive")],
-            [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization.name)]
+            [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization_name)]
           ], :first, :last do |builder|
             builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.radio_button(id: nil) + builder.text }
           end %>
@@ -34,11 +34,15 @@
               <%= f.check_box :hide,
                               label: t("decidim.shared.flag_modal.hide_content"),
                               include_hidden: false,
+                              id: hide_checkbox_id,
                               data: {
                                 label_action: t("decidim.shared.flag_modal.hide"),
                                 label_report: t("decidim.shared.flag_modal.report"),
                                 hide: "true"
-                              }, id: hide_checkbox_id %>
+                              },
+                              label_options: {
+                                for: hide_checkbox_id
+                              } %>
             <% end %>
           <% end %>
 

data/app/cells/decidim/resource_types_filter/show.erb

@@ -1,5 +1,5 @@
 <div id="<%= id %>" class="filter-container">
-  <button id="dropdown-trigger-resource" data-component="dropdown" data-target="dropdown-menu-resource" data-auto-close="true" data-disabled-md="true">
+  <button id="dropdown-trigger-resource" data-component="dropdown" data-target="dropdown-menu-resource" data-auto-close="true">
     <% resource_types.each do |resource_type| %>
       <span data-value="<%= resource_type[0] %>" class="<%= "is-active" if filter_param == resource_type[0] %>">
         <%= text_with_resource_icon(*resource_type) %>
@@ -8,7 +8,7 @@
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>
   </button>
-  <%= filter_form_for filter, form_path, class: "new_filter", id: "dropdown-menu-resource" do |form| %>
+  <%= filter_form_for filter, form_path, :class => "new_filter", :id => "dropdown-menu-resource", "aria-hidden" => true do |form| %>
     <%= form.collection_radio_buttons(
           filter_param_key,
           resource_types,
@@ -16,7 +16,7 @@
           :last,
           { checked: filter_param }
         ) do |builder|
-            builder.label { builder.radio_button(class: "reset-defaults", hidden: true) + content_tag(:div, text_with_resource_icon(builder.value, builder.text), class: "filter") }
+            builder.label { builder.radio_button(class: "reset-defaults", hidden: true) + content_tag(:span, text_with_resource_icon(builder.value, builder.text), class: "filter") }
       end %>
   <% end %>
 </div>

data/app/cells/decidim/resource_types_filter_cell.rb

@@ -8,8 +8,6 @@ module Decidim
 
     include ActionView::Helpers::FormOptionsHelper
     include Decidim::FiltersHelper
-    include Decidim::LayoutHelper
-    include Decidim::IconHelper
 
     private
 

data/app/cells/decidim/scopes_picker/show.erb

@@ -1,6 +1,6 @@
 <div class="filters__section scope_id_scopes_picker_filter">
   <fieldset>
-    <legend class="mini-title"><%= legend_title %></legend>
+    <legend><%= legend_title %></legend>
     <div id="<%= picker_options_id %>" class="data-picker <%= picker_options_class %>" data-picker-name="<%= picker_options_name %>">
       <% if values_on_top? %>
         <%= render :scope_picker_values %>

data/app/cells/decidim/scopes_picker_cell.rb

@@ -3,7 +3,6 @@
 module Decidim
   # This cell is used to display scopes picker in a form
   class ScopesPickerCell < Decidim::ViewModel
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
     include ActionView::Helpers::FormOptionsHelper
     include Decidim::FiltersHelper

data/app/cells/decidim/search_results_cell.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This cell renders the reuslts of the global search page.
+  # This cell renders the results of the global search page.
   class SearchResultsCell < Decidim::ViewModel
     include Decidim::SearchesHelper
     include Decidim::CardHelper

data/app/cells/decidim/statistic/show.erb

@@ -1,7 +1,7 @@
 <div class="statistic <%= stat_dom_class %>" data-statistic>
-  <h3 class="statistic__title" title="<%= stat_title %>">
+  <span class="statistic__title" title="<%= stat_title %>">
     <%= stat_title %>
-  </h3>
+  </span>
   <span class="statistic__number">
     <%= stat_number %>
   </span>

data/app/cells/decidim/statistic_cell.rb

@@ -3,8 +3,6 @@
 module Decidim
   # This cell renders a Statistic of a Resource
   class StatisticCell < Decidim::ViewModel
-    include ActionView::Helpers::NumberHelper
-
     private
 
     def stat_number

data/app/cells/decidim/tab_panels/show.erb

@@ -3,7 +3,7 @@
     <ul class="tab-x-container tabs-<%= tabs.length %>">
       <% tabs.each_with_index do |tab, i| %>
         <li>
-          <button id="trigger-<%= tab[:id] %>" class="tab-x" data-controls="panel-<%= tab[:id] %>" data-open="<%= "true" if i.zero? %>">
+          <button type="button" id="trigger-<%= tab[:id] %>" class="tab-x" data-controls="panel-<%= tab[:id] %>" data-open="<%= "true" if selected?(tab, i) %>">
             <%= icon tab[:icon], class: "text-gray fill-current" %><%= tab[:text] %> <% "tabs-1" %>
           </button>
         </li>

data/app/cells/decidim/tab_panels_cell.rb

@@ -17,8 +17,6 @@ module Decidim
   # The `model` is expected to be a resource with HasAttachments concern
   #
   class TabPanelsCell < Decidim::ViewModel
-    include IconHelper
-
     def show
       return if model.blank?
 
@@ -36,5 +34,17 @@ module Decidim
     def panels
       @panels ||= items.map { |item| item.slice(:id, :method, :args) }
     end
+
+    def selected_tab
+      @selected_tab ||= items.find { |item| item[:selected] }
+    end
+
+    def selected?(tab, index)
+      if selected_tab
+        tab[:id] == selected_tab[:id]
+      else
+        index.zero?
+      end
+    end
   end
 end

data/app/cells/decidim/tags_cell.rb

@@ -9,8 +9,6 @@ module Decidim
   #   <%= cell("decidim/category", model.category, context: {resource: model}) %>
   #
   class TagsCell < Decidim::ViewModel
-    include Decidim::SanitizeHelper
-
     def show
       render if category? || scope?
     end

data/app/cells/decidim/tos_page_cell.rb

@@ -7,11 +7,8 @@ module Decidim
   # - :sticky_form, the Accept updated TOS form in the TOS page.
   # - :refuse_btn_modal, the Modal with info when refusing the updated TOS.
   class TosPageCell < Decidim::ViewModel
-    include Decidim::SanitizeHelper
     include Cell::ViewModel::Partial
 
-    delegate :current_user, to: :controller, prefix: false
-
     def show
       return if model.nil?
       return unless current_user

data/app/cells/decidim/translation_bar/show.erb

@@ -1,4 +1,4 @@
-<div class="wrapper-mini translation-bar">
+<div>
   <div class="row column">
     <%= link %>
     <span class="translation-button-help"><%= help_text %></span>

data/app/cells/decidim/translation_bar_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   # This cell is used to render a button to toggle machine translations. It will
   # only render if the translations are enabled.
   class TranslationBarCell < Decidim::ViewModel
-    include Decidim::TranslatableAttributes
-
     def show
       return unless renderable?
 

data/app/cells/decidim/upload_modal/files.erb

@@ -19,7 +19,7 @@
     </div>
     <% end %>
 
-    <div class="active-uploads upload-modal__files" data-active-uploads="<%= modal_id %>">
+    <div class="upload-modal__files" data-active-uploads="<%= modal_id %>">
       <% attachments.each do |attachment| %>
         <% next if [Array, Hash].any? { |klass| attachment.is_a? klass } %>
 

data/app/cells/decidim/upload_modal/modal.erb

@@ -37,10 +37,10 @@
             <%= icon "upload-cloud-2-line", class: "w-8 h-8 text-gray fill-current" %>
             <%= t("decidim.forms.upload_help.dropzone") %>
           </span>
-          <button class="button button__sm button__secondary" data-select-file-button>
+          <label class="button button__sm button__secondary" for="files-<%= modal_id %>">
             <span><%= t("decidim.forms.upload.select_file") %></span>
             <%= icon "arrow-right-line", class: "fill-current" %>
-          </button>
+          </label>
         </div>
       </div>
     </div>
@@ -60,8 +60,7 @@
     <%= t("decidim.shared.confirm_modal.cancel") %>
   </button>
   <button type="button" class="button button__sm md:button__lg button__secondary" data-dropzone-save data-dialog-close="<%= modal_id %>" disabled>
-    <%= t("next", scope: "decidim.messaging.conversations.index") %>
-    <%= icon "arrow-right-line", class: "fill-current" %>
+    <%= t("save", scope: "decidim.forms.upload.labels") %>
   </button>
 </div>
 <% end %>

data/app/cells/decidim/upload_modal_cell.rb

@@ -3,10 +3,8 @@
 module Decidim
   # This cell creates the necessary elements for dynamic uploads.
   class UploadModalCell < Decidim::ViewModel
-    include LayoutHelper
     include Cell::ViewModel::Partial
     include ERB::Util
-    include Decidim::SanitizeHelper
 
     alias form model
 
@@ -154,7 +152,7 @@ module Decidim
     def determine_filename(attachment)
       return attachment.filename.to_s if attachment.is_a? ActiveStorage::Blob
       return blob(attachment).filename.to_s if blob(attachment).present?
-      return attachment.original_filename.to_s.presence || attachhment.path.split("/").last if attachment.is_a? ActionDispatch::Http::UploadedFile
+      return attachment.original_filename.to_s.presence || attachment.path.split("/").last if attachment.is_a? ActionDispatch::Http::UploadedFile
 
       attachment.url.split("/").last
     end

data/app/cells/decidim/user_conversation/new.erb

@@ -1,4 +1,4 @@
-<div class="conversation">
+<div>
   <%= render :conversation_header %>
 
   <div id="messages" class="space-y-6" data-scroll-last-child></div>

data/app/cells/decidim/user_conversation/show.erb

@@ -1,4 +1,4 @@
-<div class="conversation">
+<div>
   <%= render :conversation_header %>
 
   <div id="messages" class="space-y-6" data-scroll-last-child>

data/app/cells/decidim/user_conversation_cell.rb

@@ -3,7 +3,6 @@
 module Decidim
   class UserConversationCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
-    include Decidim::ApplicationHelper
     include Decidim::FormFactory
     include Decidim::Core::Engine.routes.url_helpers
 

data/app/cells/decidim/user_conversations/show.erb

@@ -1,4 +1,4 @@
-<div class="user-activity space-y-8">
+<div class="space-y-8">
   <%= cell("decidim/announcement", t("decidim.user_conversations.index.conversations_info")) %>
   <%= render :new_conversation_button %>
   <% if conversations.empty? %>

data/app/cells/decidim/user_conversations_cell.rb

@@ -6,7 +6,6 @@ module Decidim
     include CellsPaginateHelper
     include Decidim::Core::Engine.routes.url_helpers
     include ActionView::Helpers::DateHelper
-    include Decidim::ApplicationHelper
 
     delegate :nickname, to: :user
 

data/app/cells/decidim/user_group_pending_invitations_list_cell.rb

@@ -5,7 +5,6 @@ module Decidim
   # Lists the invitations to user groups the given user has.
   class UserGroupPendingInvitationsListCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::CardHelper
 

data/app/cells/decidim/user_group_pending_requests_list_cell.rb

@@ -5,7 +5,6 @@ module Decidim
   # Lists the pending join requests of the given user group.
   class UserGroupPendingRequestsListCell < Decidim::ViewModel
     include Decidim::CellsPaginateHelper
-    include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::CardHelper
 

data/app/cells/decidim/user_timeline/show.erb

@@ -1,4 +1,4 @@
-<div class="user-activity">
+<div>
   <div id="activities" class="columns small-12">
     <% if activities.length == 0 %>
       <%= cell("decidim/announcement", t("decidim.user_activity.index.no_activities_warning"), callout_class: "warning") %>

data/app/cells/decidim/version_cell.rb

@@ -3,11 +3,9 @@
 module Decidim
   class VersionCell < Decidim::ViewModel
     include Decidim::TraceabilityHelper
-    include Decidim::LayoutHelper
-    include Decidim::SanitizeHelper
 
     def resource_title
-      decidim_html_escape(translated_attribute(versioned_resource.title))
+      decidim_escape_translated(versioned_resource.title)
     end
 
     def current_version
@@ -34,8 +32,8 @@ module Decidim
       i18n("back_to_resource")
     end
 
-    def i18n(string, **params)
-      t(string, **params, scope: i18n_scope, default: t(string, **params, scope: default_i18n_scope))
+    def i18n(string, **)
+      t(string, **, scope: i18n_scope, default: t(string, **, scope: default_i18n_scope))
     end
 
     def i18n_scope

data/app/cells/decidim/versions_list_cell.rb

@@ -2,14 +2,12 @@
 
 module Decidim
   class VersionsListCell < Decidim::ViewModel
-    include Decidim::SanitizeHelper
-
     def versioned_resource
       model
     end
 
     def resource_title
-      decidim_html_escape(translated_attribute(versioned_resource.title))
+      decidim_escape_translated(versioned_resource.title)
     end
 
     def resource_path

data/app/cells/decidim/versions_list_item_cell.rb

@@ -2,8 +2,6 @@
 
 module Decidim
   class VersionsListItemCell < Decidim::ViewModel
-    include Decidim::LayoutHelper
-
     def version
       model
     end
@@ -28,8 +26,8 @@ module Decidim
       i18n("version_index", index:, total:)
     end
 
-    def i18n(string, **params)
-      t(string, **params, scope: i18n_scope, default: t(string, **params, scope: default_i18n_scope))
+    def i18n(string, **)
+      t(string, **, scope: i18n_scope, default: t(string, **, scope: default_i18n_scope))
     end
 
     def i18n_scope

data/app/cells/decidim/wizard_step_form/wizard_aside.erb

@@ -1,6 +1,6 @@
 <div class="columns large-3">
   <% if wizard_aside_back_url %>
-    <div class="m-bottom">
+    <div>
       <%= link_to wizard_aside_back_url do %>
         <%= icon "arrow-left-s-line", class: "icon--small", role: "img", "aria-hidden": true %>
         <%= i18n_wizard_aside_back %>
@@ -8,7 +8,7 @@
     </div>
   <% end %>
 
-  <div class="show-for-large">
+  <div>
     <%= wizard_stepper %>
   </div>
 </div>

data/app/cells/decidim/wizard_step_form/wizard_header.erb

@@ -6,13 +6,12 @@
 
 <h2>
   <%= wizard_header_title %>
-  <%= wizard_header_similar_resources_count %>
 </h2>
 
-<div class="hide-for-large m-bottom">
+<div>
   <%= wizard_header_see_steps %>
 
-  <div id="steps" class="is-hidden" data-toggler=".is-hidden">
+  <div id="steps" data-toggler="#steps">
     <%= wizard_stepper %>
   </div>
 </div>

data/app/cells/decidim/wizard_step_form_cell.rb

@@ -5,8 +5,6 @@ module Decidim
   # Is designed to be used by different models and so it does not try to compute
   # the information likely to change. Expects a Hash with all necessary data.
   class WizardStepFormCell < Decidim::ViewModel
-    include Decidim::LayoutHelper
-
     def show
       render view
     end
@@ -89,12 +87,6 @@ module Decidim
       view_options[:wizard_header_title]
     end
 
-    # Returns the similar resources count for the compare step.
-    def wizard_header_similar_resources_count
-      count = view_options[:wizard_header_similar_resources_count]
-      "(#{count})" if count
-    end
-
     # Returns the header see steps information, only visible for small screens.
     def wizard_header_see_steps
       content_tag(:span) do

data/app/commands/decidim/amendable/create_draft.rb

@@ -4,13 +4,14 @@ module Decidim
   module Amendable
     # A command with all the business logic when a user starts amending a resource.
     class CreateDraft < Decidim::Command
+      delegate :current_user, to: :form
+
       # Public: Initializes the command.
       #
-      # form         - A form object with the params.
+      # form - A form object with the params.
       def initialize(form)
         @form = form
         @amendable = form.amendable
-        @current_user = form.current_user
         @user_group = Decidim::UserGroup.find_by(id: form.user_group_id)
       end
 
@@ -33,7 +34,7 @@ module Decidim
 
       private
 
-      attr_reader :form, :amendable, :current_user, :user_group
+      attr_reader :form, :amendable, :user_group
 
       # Prevent PaperTrail from creating an additional version
       # in the amendment multi-step creation process (step 1: create)