decidim-core 0.28.5 → 0.29.0.rc1

data/app/services/decidim/download_your_data_exporter.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require "decidim/seven_zip_wrapper"
+require "seven_zip_ruby"
+require "zip"
+require_relative "zip_stream/writer"
 
 module Decidim
   # Public: Generates a 7z(seven zip) file with data files ready to be persisted
@@ -8,6 +10,8 @@ module Decidim
   #
   # In fact, the 7z file wraps a ZIP file which finally contains the data files.
   class DownloadYourDataExporter
+    include ::Decidim::ZipStream::Writer
+
     DEFAULT_EXPORT_FORMAT = "CSV"
     ZIP_FILE_NAME = "download-your-data.zip"
 
@@ -25,25 +29,36 @@ module Decidim
     end
 
     def export
-      tmpdir = Dir.mktmpdir("temporary-download-your-data-dir")
-      user_data, user_attachments = data_and_attachments_for_user
-      save_user_data(tmpdir, user_data)
-      save_user_attachments(tmpdir, user_attachments)
-
-      SevenZipWrapper.compress_and_encrypt(filename: @path, password: @password, input_directory: tmpdir)
+      dirname = File.dirname(@path)
+      FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+      File.open(@path, "wb") do |file|
+        SevenZipRuby::Writer.open(file, password: @password) do |szw|
+          szw.header_encryption = true
+          szw.add_data(data, ZIP_FILE_NAME)
+        end
+      end
     end
 
     private
 
-    attr_reader :user, :export_format
+    def data
+      buffer = Zip::OutputStream.write_buffer do |out|
+        user_data, attachments = data_for(@user, @export_format)
 
-    def data_and_attachments_for_user
+        add_user_data_to_zip_stream(out, user_data)
+        add_attachments_to_zip_stream(out, attachments)
+      end
+
+      buffer.string
+    end
+
+    def data_for(user, format)
       export_data = []
       export_attachments = []
 
       download_your_data_entities.each do |object|
         klass = Object.const_get(object)
-        export_data << [klass.model_name.name.parameterize.pluralize, Exporters.find_exporter(export_format).new(klass.user_collection(user), klass.export_serializer).export]
+        export_data << [klass.model_name.name.parameterize.pluralize, Exporters.find_exporter(format).new(klass.user_collection(user), klass.export_serializer).export]
         attachments = klass.download_your_data_images(user)
         export_attachments << [klass.model_name.name.parameterize.pluralize, attachments.flatten] unless attachments.nil?
       end
@@ -54,31 +69,5 @@ module Decidim
     def download_your_data_entities
       @download_your_data_entities ||= DownloadYourDataSerializers.data_entities
     end
-
-    def save_user_data(tmpdir, user_data)
-      user_data.each do |entity, exporter_data|
-        next if exporter_data.read == "\n"
-
-        file_name = File.join(tmpdir, "#{entity}-#{exporter_data.filename}")
-        File.write(file_name, exporter_data.read)
-      end
-    end
-
-    def save_user_attachments(tmpdir, user_attachments)
-      user_attachments.each do |entity, attachment_block|
-        attachment_block.each do |attachment|
-          next unless attachment.attached?
-
-          blobs = attachment.is_a?(ActiveStorage::Attached::One) ? [attachment.blob] : attachment.blobs
-          blobs.each do |blob|
-            Dir.mkdir(File.join(tmpdir, entity.parameterize))
-            file_name = File.join(tmpdir, entity.parameterize, blob.filename.to_s)
-            blob.open do |blob_file|
-              File.write(file_name, blob_file.read.force_encoding("UTF-8"))
-            end
-          end
-        end
-      end
-    end
   end
 end

data/app/services/decidim/email_notification_generator.rb

@@ -36,29 +36,20 @@ module Decidim
       return unless resource
       return unless event_class.types.include?(:email)
 
-      send_to_followers
-      send_to_affected_users
-    end
+      followers.each do |recipient|
+        next unless ["all", "followed-only"].include?(recipient.notification_types)
 
-    private
+        send_email_to(recipient, user_role: :follower)
+      end
 
-    def send_to_affected_users
       affected_users.each do |recipient|
         next unless ["all", "own-only"].include?(recipient.notification_types)
-        next if recipient.deleted? || recipient.blocked?
 
         send_email_to(recipient, user_role: :affected_user)
       end
     end
 
-    def send_to_followers
-      followers.each do |recipient|
-        next unless ["all", "followed-only"].include?(recipient.notification_types)
-        next if recipient.deleted? || recipient.blocked?
-
-        send_email_to(recipient, user_role: :follower)
-      end
-    end
+    private
 
     attr_reader :event, :event_class, :resource, :followers, :affected_users, :extra
 

data/app/services/decidim/log/diff_changeset_calculator.rb

@@ -20,7 +20,7 @@ module Decidim
     class DiffChangesetCalculator
       # original_changeset - a `changeset` from a PaperTrail::Version instance
       # fields_mapping - a Hash mapping attribute names and a type to render them
-      # i18n_labels_scope - a String representing the I18n scope where the attribtue
+      # i18n_labels_scope - a String representing the I18n scope where the attribute
       #   labels can be found
       def initialize(original_changeset, fields_mapping, i18n_labels_scope)
         @original_changeset = original_changeset
@@ -119,7 +119,7 @@ module Decidim
       # Generates the label for the given attribute. If the `locale` is set,
       # it appends the locale at the end: `AttributeName (LocaleName)`.
       #
-      # attribute - A Symbol representing the attribute name. It will retrive
+      # attribute - A Symbol representing the attribute name. It will retrieve
       #   this key from the I18n scope set at `i18n_labels_scope`.
       # locale - a String representing the name of the locale.
       #

data/app/services/decidim/notifications_digest_sending_decider.rb

@@ -3,7 +3,7 @@
 module Decidim
   class NotificationsDigestSendingDecider
     class << self
-      def must_notify?(user, time: Time.now.utc)
+      def must_notify?(user, time = Time.now.utc)
         return true if user.digest_sent_at.blank?
 
         # Note that we are checking whether the notifications were sent at any

data/app/services/decidim/open_data_exporter.rb

@@ -51,14 +51,13 @@ module Decidim
             headers.push(*exporter.headers)
             exported = exporter.export
 
-            tmpdir = Dir::Tmpname.create(export_manifest.name.to_s) do
-              # just get an empty file name
-            end
-            filename = File.join(tmpdir, "#{component.id}.csv")
-            Dir.mkdir(tmpdir)
-            File.write(filename, exported.read)
-
-            collection.push(filename)
+            tmpfile = Tempfile.new("#{export_manifest.name}-#{component.id}-")
+            tmpfile.write(exported.read)
+            # Do not delete the file when the reference is deleted
+            ObjectSpace.undefine_finalizer(tmpfile)
+            tmpfile.close
+
+            collection.push(tmpfile.path)
           end
         end
       end

data/app/services/decidim/zip_stream/writer.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ZipStream
+    module Writer
+      def add_user_data_to_zip_stream(out, user_data)
+        user_data.each do |element|
+          filename_file = element.last.filename(element.first.parameterize)
+
+          out.put_next_entry(filename_file)
+          if element.last.read.presence
+            out.write element.last.read
+          else
+            out.write "No data"
+          end
+        end
+      end
+
+      def add_attachments_to_zip_stream(out, export_attachments)
+        export_attachments.each do |attachment_block|
+          next if attachment_block.last.nil?
+
+          folder_name = attachment_block.first.parameterize
+          attachment_block.last.each do |attachment|
+            next unless attachment.attached?
+
+            blobs = attachment.is_a?(ActiveStorage::Attached::One) ? [attachment.blob] : attachment.blobs
+            blobs.each do |blob|
+              out.put_next_entry("#{folder_name}/#{blob.filename}")
+              blob.open do |f|
+                out << f.read
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/uploaders/decidim/organization_favicon_uploader.rb

@@ -26,7 +26,7 @@ module Decidim
     end
 
     def extension_allowlist
-      %w(png jpg jpeg ico)
+      %w(png jpg jpeg webp ico)
     end
   end
 end

data/app/uploaders/decidim/record_image_uploader.rb

@@ -5,11 +5,11 @@ module Decidim
   # limited content types than the defaults.
   class RecordImageUploader < ImageUploader
     def content_type_allowlist
-      %w(image/jpeg image/png)
+      %w(image/jpeg image/png image/webp)
     end
 
     def extension_allowlist
-      %w(jpeg jpg png)
+      %w(jpeg jpg png webp)
     end
   end
 end

data/app/validators/organization_present_validator.rb

@@ -8,7 +8,7 @@ class OrganizationPresentValidator < ActiveModel::Validations::FileContentTypeVa
     return if record.is_a?(Decidim::Organization)
     return if record.respond_to?(:organization) && record.organization.is_a?(Decidim::Organization)
 
-    record.errors.add attribute, I18n.t("carrierwave.errors.not_inside_organization")
+    record.errors.add attribute, I18n.t("decidim.errors.files.not_inside_organization")
   end
 
   def check_validity!; end

data/app/validators/passthru_validator.rb

@@ -69,7 +69,7 @@ class PassthruValidator < ActiveModel::EachValidator
   def validation_record_context(dummy, record)
     if dummy.is_a?(Decidim::Form)
       dummy.with_context(
-        current_organization: record.try(:current_organization) || record.try(:ganization),
+        current_organization: record.try(:current_organization) || record.try(:organization),
         current_participatory_space: record.try(:current_participatory_space) || record.try(:participatory_space),
         current_component: record.try(:current_component) || record.try(:component)
       )

data/app/validators/uploader_image_dimensions_validator.rb

@@ -28,7 +28,7 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     return unless uploader.validable_dimensions
     return if (image = extract_image(file)).blank?
 
-    record.errors.add attribute, I18n.t("carrierwave.errors.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
+    record.errors.add attribute, I18n.t("decidim.errors.files.file_resolution_too_large") if image.dimensions.any? { |dimension| dimension > uploader.max_image_height_or_width }
   rescue MiniMagick::Error
     # The error may happen because of many reasons but most commonly the image
     # exceeds the default maximum dimensions set for ImageMagick when the
@@ -40,7 +40,7 @@ class UploaderImageDimensionsValidator < ActiveModel::Validations::FileContentTy
     # Note that the error can also happen because of other reasons than only
     # the image dimensions being too large. But as we do not really know the
     # reason every time, we default to that error.
-    record.errors.add attribute, I18n.t("carrierwave.errors.file_cannot_be_processed")
+    record.errors.add attribute, I18n.t("decidim.errors.files.file_cannot_be_processed")
   end
 
   def extract_image(file)

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

@@ -4,7 +4,7 @@
 <%= render layout: "layouts/decidim/shared/layout_user_profile" do %>
   <% if current_user.unconfirmed_email.present? %>
     <%# NOTE: announcement cell clean_body method will purge the button %>
-    <div id="email-change-pending" class="flash secondary" data-announcement>
+    <div id="email-change-pending" class="flash warning" data-announcement>
       <div class="flash__message flex-none block leading-relaxed">
         <p>
           <strong><%= t("decidim.account.email_change.title") %></strong>

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

@@ -1,14 +1,13 @@
 <div class="flex justify-center">
   <h1 class="title-decorator my-12">
     <%= wizard_header_title %>
-    <%= "(#{similar_resources_count})" if local_assigns[:similar_resources_count] %>
   </h1>
 </div>
 
 <ol id="wizard-steps" class="wizard-steps">
   <% (1..total_steps).each do |wizard_step| %>
     <% attributes = @current_step == wizard_step ? { "aria-current": "step" } : {} %>
-    <%= content_tag :li, t(wizard_step, scope: "decidim.amendments.wizard_step_form.steps"), attributes %>
+    <%= content_tag :li, t(wizard_step, scope: "decidim.amendments.wizard_step_form.steps"), attributes.merge(class: "w-1/2") %>
   <% end %>
 </ol>
 

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

@@ -12,7 +12,9 @@
 </button>
 
 <div id="dropdown-menu-documents-<%= attachment_collection.id %>" class="documents__collection-content" aria-hidden="true">
-  <p><%= decidim_escape_translated(attachment_collection.description) %></p>
+  <% if (description = attachment_collection.description).present? %>
+    <p><%= decidim_escape_translated(description) %></p>
+  <% end %>
 
   <div class="documents__container">
     <% documents.each do |document| %>

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

@@ -0,0 +1,4 @@
+<% documents = collection.documents_visible_for(current_user) %>
+<% if documents.any? %>
+  <%= render partial: "decidim/application/collection", formats: [:html], locals: { attachment_collection: collection, documents: } %>
+<% end %>

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

@@ -8,16 +8,30 @@
     <% end %>
     <div class="card__list-metadata">
       <div><%= icon "file-text-line" %><%= document.file_type %></div>
-      <div><%= icon "scales-2-line" %><%= number_to_human_size(document.file_size) %></div>
+      <% if document.file? %>
+        <div><%= icon "scales-2-line" %><%= number_to_human_size(document.file_size) %></div>
+      <% end %>
     </div>
   </div>
-  <%= link_to document.url,
-              target: "_blank",
-              rel: "noopener noreferrer",
-              class: "button button__sm button__transparent-secondary flex-none",
-              title: t("decidim.application.document.download"),
-              data: { "external-link": false } do %>
-    <%= t("decidim.application.document.download") %>
-    <%= icon "download-line" %>
+  <% if document.file? %>
+    <%= link_to document.url,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                class: "button button__sm button__transparent-secondary flex-none",
+                title: t("decidim.application.document.download"),
+                data: { "external-link": false } do %>
+      <%= t("decidim.application.document.download") %>
+      <%= icon "download-line" %>
+    <% end %>
+  <% else %>
+    <%= link_to document.url,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                class: "button button__sm button__transparent-secondary flex-none",
+                title: t("decidim.application.document.visit_link"),
+                data: { "external-link": true } do %>
+      <%= t("decidim.application.document.visit_link") %>
+    <% end %>
+
   <% end %>
 </div>

data/app/views/decidim/block_user_mailer/notify.html.erb

@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t ".hello" %></p>
 
-<p class="email-instructions"><%= t ".body_1", organization_name: h(@organization.name) %></p>
+<p class="email-instructions"><%= t ".body_1", organization_name: organization_name(@organization) %></p>
 
 <p class="email-instructions"><%= t ".body_2", justification: h(@justification) %></p>
 
-<p class="email-closing"><%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
+<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>

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

@@ -14,7 +14,7 @@
     <div class="form__wrapper">
       <%= f.hidden_field :invitation_token %>
 
-      <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization.name), required: "required", autocomplete: "nickname" %>
+      <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help", organization: current_organization_name), required: "required", autocomplete: "nickname" %>
 
       <% if f.object.class.require_password_on_accepting %>
         <%= render partial: "decidim/account/password_fields", locals: { form: f, user: :user } %>
@@ -24,7 +24,7 @@
     <div class="form__wrapper-block">
       <h4 class="h4"><%= t("tos_title", scope: "decidim.devise.registrations.new") %></h4>
 
-      <div class="tos-text">
+      <div>
         <% terms_of_service_summary_content_blocks.each do |content_block| %>
           <%= cell content_block.manifest.cell, content_block %>
         <% end %>

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

@@ -13,12 +13,12 @@
     <%= form_required_explanation %>
   </div>
 
-  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: decidim.omniauth_registrations_path(resource_name)) do |f| %>
+  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: omniauth_registrations_path(resource_name)) do |f| %>
 
     <div class="form__wrapper">
       <%= f.text_field :name, help_text: t("decidim.devise.omniauth_registrations.new.username_help"), autocomplete: "name", placeholder: "John Doe" %>
 
-      <%= f.text_field :nickname, help_text: t("decidim.devise.omniauth_registrations.new.nickname_help", organization: current_organization.name), autocomplete: "nickname", placeholder: "johndoe" %>
+      <%= f.text_field :nickname, help_text: t("decidim.devise.omniauth_registrations.new.nickname_help", organization: current_organization_name), autocomplete: "nickname", placeholder: "johndoe" %>
 
       <%= f.email_field :email, autocomplete: "email", placeholder: t("placeholder_email", scope: "decidim.devise.shared") %>
 

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

@@ -43,7 +43,7 @@
     <div id="card__tos" class="form__wrapper-block">
       <h2 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h2>
 
-      <div class="tos-text">
+      <div>
         <% terms_of_service_summary_content_blocks.each do |content_block| %>
           <%= cell content_block.manifest.cell, content_block %>
         <% end %>

data/app/views/decidim/devise/shared/_login_boxes.html.erb

@@ -1,6 +1,6 @@
 <div class="login__box-container">
   <button type="button" class="login__box" data-dialog-open="loginModal">
-    <%= icon "login-box-line", class: "login__box-icon" %>
+    <%= icon "user-line", class: "login__box-icon" %>
     <p class="login__box-title">
       <%= t("already_have_an_account?", scope: ) %>
     </p>

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

@@ -8,7 +8,7 @@
 
   <div class="login__info">
     <p>
-      <%= t("connect_your_account_html", scope: "decidim.doorkeeper.authorizations.new", organization: current_organization.name) %>
+      <%= t("connect_your_account_html", scope: "decidim.doorkeeper.authorizations.new", organization: current_organization_name) %>
     </p>
 
     <p><%= t("this_application_will_be_able_to", scope: "decidim.doorkeeper.authorizations.new") %></p>

data/app/views/decidim/endorsements/_identity.html.erb

@@ -1,4 +1,4 @@
-<button type="button" class="<%= selected ? "is-selected" : "" %>" data-user-identity data-method="<%= http_method.to_s.upcase %>" data-create_url="<%= create_url %>" data-destroy_url="<%= destroy_url %>">
+<button type="button" class="<%= "is-selected" if selected %>" data-user-identity data-method="<%= http_method.to_s.upcase %>" data-create_url="<%= create_url %>" data-destroy_url="<%= destroy_url %>">
   <%== cell "decidim/author", identity, skip_profile_link: true %>
   <%= icon("checkbox-circle-line") %>
 </button>

data/app/views/decidim/gamification/badges/index.html.erb

@@ -27,7 +27,7 @@
           </div>
         </div>
         <div class="col-span-7 ml-2">
-          <p><%= badge.description(current_organization.name) %></p>
+          <p><%= badge.description(current_organization_name) %></p>
           <p class="mt-4"><strong><%= t ".how" %></strong></p>
           <ol class="list-decimal">
             <% badge.conditions.each do |condition| %>

data/app/views/decidim/manifests/show.json.erb

@@ -8,22 +8,22 @@
   "background_color": "#FFFFFF",
   "icons": [
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :small %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :small %>",
       "sizes": "32x32",
       "type": "image/png"
     },
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :medium %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :medium %>",
       "sizes": "180x180",
       "type": "image/png"
     },
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :big %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :big %>",
       "sizes": "192x192",
       "type": "image/png"
     },
     {
-      "src": "<%= current_organization.attached_uploader(:favicon).variant_url :huge %>",
+      "src": "<%= current_organization.attached_uploader(:favicon).variant_path :huge %>",
       "sizes": "512x512",
       "type": "image/png"
     }

data/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb

@@ -12,10 +12,10 @@
           autocomplete="off"
           placeholder="<%= t("add_users_placeholder", scope: "decidim.messaging.conversations.add_conversation_users") %>"
           data-noresults="<%= t("no_results", scope: "decidim.messaging.conversations.add_conversation_users") %>"
-          data-selected="multiple-mentions-selected"
+          data-selected="conversation__modal-results"
           contenteditable="true"
           data-direct-messages-disabled="<%= t("participant_with_disabled_message_reception", scope: "decidim.messaging.conversations.add_conversation_users") %>">
     </div>
-    <ul class="conversation__modal-results multiple-mentions-selected"></ul>
+    <ul class="conversation__modal-results"></ul>
   </div>
 </div>

data/app/views/decidim/messaging/conversations/_error_modal.html.erb

@@ -1,6 +1,6 @@
-<div class="reveal" id="messageErrorModal" data-reveal>
-  <div class="reveal__header">
-    <h2 class="reveal__title"><%= error %></h2>
+<div id="messageErrorModal" data-reveal>
+  <div>
+    <h2><%= error %></h2>
     <button class="close-button" data-close aria-label="<%= t(".close") %>"
       type="button">
       <span aria-hidden="true">&times;</span>
@@ -13,8 +13,8 @@
     </p>
     <p><%= t(".correct_errors") %></p>
   </div>
-  <div class="reveal__footer">
-    <div class="buttons button--double">
+  <div>
+    <div>
       <a class="button" role="button" href="#" data-close aria-label="<%= t(".ok") %>"><%= t(".ok") %></a>
     </div>
   </div>

data/app/views/decidim/newsletter_mailer/newsletter.html.erb

@@ -1,7 +1,7 @@
 <%= decidim_sanitize_newsletter cell.to_s %>
 
 <% content_for :note do %>
-  <%== t ".note", organization_name: h(@organization.name), link: @newsletter.notifications_settings_url %>
+  <%== t ".note", organization_name: organization_name(@organization), link: @newsletter.notifications_settings_url %>
 <% end %>
 
 <% content_for :unsubscribe do %>

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

@@ -8,7 +8,7 @@
 <%= decidim_sanitize_newsletter @cell.to_s %>
 
 <% content_for :note do %>
-  <%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>
+  <%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: current_organization_name, link: decidim.notifications_settings_url(host: @organization.host) %>
 <% end %>
 
 <% if @user.present? %>

data/app/views/decidim/newsletters_opt_in_mailer/notify.html.erb

@@ -1,6 +1,6 @@
 <p class="email-greeting"><%= t ".hello" %></p>
 
-<p class="email-instructions"><%= t ".body_1", organization_name: h(@organization.name) %></p>
+<p class="email-instructions"><%= t ".body_1", organization_name: organization_name(@organization) %></p>
 
 <p class="email-instructions"><%= t ".body_2" %></p>
 
@@ -20,4 +20,4 @@
 
 <p class="email-instructions"><%= t ".body_3" %></p>
 
-<p class="email-closing"><%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
+<p class="email-closing"><%= t(".greetings", organization_name: organization_name(@organization), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>

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

@@ -1,6 +1,6 @@
 <% add_decidim_page_title(t("decidim.offline.name")) %>
 
-<main id="offline-fallback-html" class="text-center my-8">
+<main id="offline-fallback-html" class="text-center mt-8">
   <div class="flex justify-center">
     <svg xmlns="http://www.w3.org/2000/svg" width="5rem" height="r5em" viewBox="0 0 25 25">
       <path

data/app/views/decidim/pages/_tabbed.html.erb

@@ -10,18 +10,18 @@
   </header>
 
   <div class="vertical-tabs">
-    <nav role="navigation" aria-label="<%= I18n.t("layouts.decidim.navigation.aria_label", title: translated_attribute(page.title)) %>">
-      <button id="dropdown-trigger-pages" data-component="dropdown" data-target="dropdown-menu-pages" data-open-md="true" data-auto-close="true">
+    <nav>
+      <button id="dropdown-trigger-pages" data-component="dropdown" data-target="dropdown-menu-pages" data-auto-close="true">
         <span>
           <%= translated_attribute(page.title) %>
         </span>
         <%= icon "arrow-down-s-line" %>
         <%= icon "arrow-up-s-line" %>
       </button>
-      <ul id="dropdown-menu-pages" class="vertical-tabs__list" role="menu">
+      <ul id="dropdown-menu-pages" class="vertical-tabs__list" aria-hidden="true">
         <% pages.each do |sibling| %>
-          <li class="<%= "is-active" if page == sibling %>" role="menuitem">
-            <%= link_to translated_attribute(sibling.title), page_path(sibling.slug), "aria-current": (page == sibling).to_s %>
+          <li class="<%= "is-active" if page == sibling %>">
+            <%= link_to translated_attribute(sibling.title), page_path(sibling.slug) %>
           </li>
         <% end %>
       </ul>

data/app/views/decidim/pages/index.html.erb

@@ -8,13 +8,12 @@ edit_link(
 %>
 
 <%= render layout:"layouts/decidim/shared/layout_center", locals: { columns: 8 } do %>
-
   <div class="text-center py-10">
     <h1 class="title-decorator inline-block text-left mb-12">
       <%= t "decidim.pages.index.title" %>
     </h1>
     <p class="text-lg text-gray-2">
-      <%= t("decidim.pages.index.subheading", name: current_organization.name) %>
+      <%= t("decidim.pages.index.subheading", name: current_organization_name) %>
     </p>
   </div>