decidim-core 0.31.5 → 0.32.0.rc2

data/app/packs/stylesheets/decidim/_header.scss

@@ -28,18 +28,14 @@ header {
     #flash-messages-container {
       @apply mt-40 md:mt-0;
     }
-
-    #menu-bar-container {
-      @apply mt-[140px] md:mt-0;
-    }
   }
 
-  #sticky-header-container {
-    @apply fixed w-full top-0 shadow-lg z-40 bg-white md:relative transition-top duration-300;
+  #header-container {
+    @apply w-full z-40 bg-white;
   }
 
   .main-bar {
-    @apply container grid grid-cols-4 md:grid-cols-8 lg:grid-cols-12 gap-4 items-center py-5 h-24;
+    @apply container flex justify-between gap-4 items-center py-5 h-20;
 
     &--focus-mode-back-button {
       @apply h-16 lg:h-24;
@@ -50,7 +46,7 @@ header {
     }
 
     &__container {
-      @apply relative w-full;
+      @apply relative w-full flex justify-between;
     }
 
     &__logo {
@@ -69,15 +65,23 @@ header {
       @apply hidden md:block col-span-2 col-start-5 xl:col-start-4;
 
       form {
-        @apply block relative rounded text-md border border-neutral-200 outline outline-1 outline-transparent rounded bg-background-2 leading-relaxed;
+        @apply block relative rounded text-md border border-neutral-200 outline outline-1 outline-transparent rounded bg-background-2 leading-none;
       }
 
       input[type="text"] {
-        @apply block bg-transparent w-full px-4 py-1.5;
+        @apply block bg-transparent w-full pl-4 pr-10 py-2 h-full;
+
+        &::placeholder {
+          @apply text-neutral-500 text-sm ltr:pl-0 rtl:pr-0;
+        }
       }
 
       button[type="submit"] {
-        @apply absolute ltr:right-2 rtl:left-2 inset-y-0 text-secondary px-2;
+        @apply absolute rtl:left-2 ltr:right-2 inset-y-0 text-secondary px-2;
+
+        svg {
+          @apply fill-neutral-500;
+        }
       }
     }
 
@@ -90,19 +94,23 @@ header {
     }
 
     &__menu-mobile {
-      @apply lg:hidden flex flex-row-reverse items-center;
+      @apply lg:hidden flex flex-row-reverse items-center gap-x-3;
     }
 
     &__links-desktop,
     > *:last-child:not(.main-bar__back-button) {
-      @apply col-span-1 md:col-start-8 lg:col-start-8 lg:col-span-5 justify-self-end;
+      @apply col-span-1 lg:col-start-8 lg:col-start-8 lg:col-span-5 justify-self-end;
     }
 
     &__links-desktop {
       @apply hidden lg:flex items-center justify-between text-center divide-x-2 divide-gray-3 ml-auto [&>*]:px-4 xl:[&>*]:px-6 first:[&>*]:pl-0 last:[&>*]:pr-0;
 
       &__item {
-        @apply flex flex-col items-center text-secondary px-2 py-1 rounded hover:underline hover:bg-background;
+        @apply flex items-center gap-x-2 text-secondary px-2 py-1 rounded;
+
+        &:hover {
+          @apply bg-secondary rounded-[4px] text-white;
+        }
 
         &-wrapper {
           @apply flex gap-x-4 xl:gap-x-6;
@@ -113,17 +121,76 @@ header {
         }
       }
 
+      .card__highlight-img {
+        svg {
+          @apply w-full h-full;
+        }
+      }
+
+      &__dropdown {
+        @apply flex items-end absolute top-0 right-0 bg-[rgba(0,0,0,0.25)] transition duration-300 z-30 h-screen cursor-auto;
+
+        .menu-bar {
+          &__main-dropdown {
+            @apply hidden sm:flex flex-col h-full sm:p-8;
+
+            &__left {
+              @apply w-full;
+            }
+          }
+
+          &__dropdown-menu {
+            @apply w-full;
+
+            li {
+              @apply py-3 sm:py-3.5 border-b border-t-0 last:border-0 border-gray-3 #{!important};
+
+              a {
+                @apply no-underline;
+              }
+            }
+          }
+        }
+
+        #main-dropdown-summary-desktop-close {
+          @apply self-end;
+        }
+      }
+
+      &__trigger {
+        @apply text-secondary cursor-pointer py-1 px-2 text-md leading-[22px] w-fit flex items-center gap-x-2;
+
+        span {
+          @apply text-secondary;
+        }
+
+        &:hover {
+          @apply bg-secondary rounded-[4px] text-white;
+
+          svg,
+          span {
+            @apply text-white;
+          }
+        }
+
+        &[aria-expended="true"] {
+          #content {
+            @apply bg-[rgb(0_0_0_/_0.5)];
+          }
+        }
+      }
+
       /* overwrite default dropdown styles */
       [data-target*="dropdown"] > span:only-of-type {
         @apply gap-0;
       }
 
       svg {
-        @apply w-5 h-5 fill-current;
+        @apply w-4 h-5 fill-current;
       }
 
       svg + span {
-        @apply text-sm first-letter:uppercase;
+        @apply text-md leading-[22px] first-letter:uppercase font-semibold whitespace-nowrap;
       }
     }
 
@@ -131,14 +198,23 @@ header {
       @apply fixed bottom-0 left-0 z-40 bg-white w-full px-4 py-3 flex justify-between text-secondary shadow-[0_-4px_6px_rgba(198,198,198,0.25)];
 
       &__trigger {
-        @apply flex flex-col items-center text-secondary cursor-pointer md:pl-4 md:border-l border-gray-3;
+        @apply flex items-center text-secondary cursor-pointer justify-evenly gap-x-1 px-2 py-1;
 
         svg {
           @apply w-6 h-6 fill-current;
         }
 
         span {
-          @apply text-sm first-letter:uppercase;
+          @apply text-secondary;
+        }
+
+        &:hover {
+          @apply bg-secondary rounded-[4px] text-white;
+
+          svg,
+          span {
+            @apply text-white;
+          }
         }
       }
 
@@ -146,10 +222,6 @@ header {
         @apply absolute top-full left-0 z-30 bg-white;
       }
 
-      &__dropdown-before {
-        @apply before:block before:absolute before:-top-10 before:right-12 before:content-[""] before:bg-white before:w-24 before:h-12 before:-mt-8;
-      }
-
       &__account {
         @apply fixed top-0 left-0 w-full h-full z-30 bg-white;
 
@@ -165,10 +237,6 @@ header {
           @apply text-md;
         }
 
-        .main-bar {
-          @apply border-b border-gray;
-        }
-
         .main-bar__avatar {
           @apply w-12 h-12;
         }
@@ -198,7 +266,7 @@ header {
         }
 
         svg + span {
-          @apply text-sm first-letter:uppercase w-auto;
+          @apply w-auto text-md leading-[22px] first-letter:uppercase font-semibold;
 
           flex-shrink: 0;
         }
@@ -246,23 +314,27 @@ header {
       @apply py-0 mx-0 w-full;
 
       &[aria-hidden="true"] {
-        @apply md:hidden;
+        @apply sm:hidden;
       }
     }
   }
 
   .menu-bar {
-    @apply container h-full flex justify-between items-center lg:relative last-of-type:[&>svg]:hidden;
+    @apply container h-full flex justify-between items-center sm:relative last-of-type:[&>svg]:hidden;
 
     &__container {
-      @apply bg-primary relative h-14;
+      @apply bg-primary relative h-14 flex justify-between;
     }
 
     &__breadcrumb-desktop {
-      @apply hidden lg:flex justify-between items-center gap-2.5 [&>*]:text-lg [&>*]:text-white;
+      @apply hidden lg:flex justify-between items-center [&>*]:text-md [&>*]:text-white gap-x-2;
+
+      .no-interactive {
+        @apply font-normal px-0;
+      }
 
       &__dropdown-trigger {
-        @apply flex rounded px-2 py-1 z-20;
+        @apply flex rounded py-1 z-20 font-semibold;
 
         &:hover {
           @apply z-10 relative before:content-[''] before:absolute before:w-[calc(100%+3rem+1px)] before:min-w-[10rem] before:h-40 before:left-1/2 before:top-1/2 before:-translate-x-1/2 before:-translate-y-1/4 before:-z-10;
@@ -274,7 +346,7 @@ header {
       }
 
       &__dropdown-wrapper {
-        @apply flex items-center cursor-pointer rounded hover:backdrop-brightness-75 focus:backdrop-brightness-75 focus:outline-none;
+        @apply flex items-center cursor-pointer underline;
       }
 
       &__dropdown-content {
@@ -355,6 +427,10 @@ header {
         }
       }
 
+      .menu-bar__breadcrumb-item {
+        @apply font-semibold underline;
+      }
+
       /* overwrite default dropdown styles */
       [id*="dropdown-menu"] {
         @apply mx-0 py-0 border-0;
@@ -381,19 +457,15 @@ header {
       }
     }
 
-    &__language-chooser {
-      @apply absolute top-full left-0 bg-white rounded w-full bg-gray-5;
-    }
-
     &__dropdown-menu {
-      @apply w-full md:w-1/4 bg-primary px-4 md:px-8 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-white;
+      @apply w-full sm:w-1/4 px-4 sm:px-0 pt-0 pb-3 sm:py-3 divide-y divide-gray-3 text-[var(--secondary)];
 
       > * {
-        @apply py-3 md:py-3.5;
+        @apply py-3 sm:py-3.5 sm:px-2;
       }
 
       a {
-        @apply flex items-center justify-start gap-1 font-semibold text-lg text-white;
+        @apply flex items-center justify-start gap-1 font-semibold text-xl text-[var(--secondary)] underline;
 
         span {
           @apply min-w-0 truncate;
@@ -403,13 +475,21 @@ header {
           @apply flex-none fill-current;
         }
       }
+
+      li:hover {
+        @apply bg-[var(--secondary)] rounded-[4px];
+
+        a {
+          @apply text-white;
+        }
+      }
     }
 
     &__main-dropdown {
-      @apply bg-white flex flex-row rounded-b shadow-lg text-black w-full lg:w-[1280px] h-screen md:h-auto;
+      @apply bg-white flex flex-row rounded-b shadow-lg text-black w-full lg:w-[530px] h-screen lg:h-auto;
 
       &__left {
-        @apply flex flex-col justify-between p-4 md:p-8 space-y-5 hidden md:block md:w-3/4;
+        @apply p-4 sm:py-8 sm:px-0 space-y-5 hidden sm:block sm:w-3/4;
 
         &-top {
           @apply border-b-4 border-gray-3 pb-3;
@@ -420,14 +500,14 @@ header {
         @apply w-full px-4;
 
         &-menu {
-          @apply w-full md:w-[100%] mt-0 grid md:grid-cols-2 gap-x-6 text-secondary;
+          @apply w-full lg:w-[100%] mt-0 grid lg:grid-cols-2 gap-x-6 text-secondary;
 
           > * {
-            @apply py-3 md:py-3.5 border-b last:border-0 border-gray-3;
+            @apply py-3 lg:py-3.5 border-b last:border-0 border-gray-3;
 
             /* since the grid has 2 columns, remove the border for these last 2 columns */
             &:nth-last-child(-n + 2) {
-              @apply md:border-0;
+              @apply lg:border-0;
             }
           }
 
@@ -446,7 +526,7 @@ header {
       }
 
       &__bottom {
-        @apply hidden md:flex;
+        @apply hidden lg:flex;
 
         &-right {
           @apply mr-2 mb-2;
@@ -466,6 +546,28 @@ header {
       }
     }
 
+    &__dropdown-desktop {
+      .card__highlight {
+        @apply flex-col ring-transparent rounded-lg shadow-[1px_4px_8px_3px_rgba(0,0,0,0.15)];
+
+        &-img {
+          @apply w-full aspect-[21/9] rounded-none rounded-tl-lg rounded-tr-lg;
+
+          svg {
+            @apply fill-primary;
+          }
+        }
+
+        &-text {
+          @apply w-full items-start text-start bg-background-2 rounded-bl-lg rounded-br-lg;
+
+          h3 {
+            @apply font-bold;
+          }
+        }
+      }
+    }
+
     &__secondary-dropdown {
       @apply absolute top-full left-0 lg:relative flex justify-between bg-white rounded-b shadow-lg text-black w-full lg:w-[1000px];
 

data/app/packs/stylesheets/decidim/_language_chooser.scss

@@ -0,0 +1,79 @@
+header {
+  .main-bar {
+    &__language-chooser {
+      &-desktop {
+        @apply hidden md:block;
+      }
+
+      > div[id*="dropdown-menu"] {
+        @apply bg-white shadow-[1px_4px_8px_3px_rgba(0,0,0,0.15)] overflow-auto max-h-[50vh] p-2 sm:w-fit z-[100];
+      }
+
+      &.focus-mode {
+        @apply border-none pr-0;
+      }
+
+      &-trigger {
+        @apply inline-flex border border-neutral-300 rounded px-4 py-[9px] gap-x-2 flex-row;
+
+        &[id*="dropdown-menu"] {
+          @apply py-[9px];
+        }
+
+        & > span,
+        & > svg:first-of-type {
+          @apply text-neutral-500;
+        }
+
+        & > svg:last-of-type,
+        & > svg:first-of-type {
+          @apply block;
+        }
+
+        & > svg:last-of-type {
+          @apply text-gray-2 ml-1;
+        }
+
+        svg + span {
+          @apply text-sm font-normal;
+        }
+      }
+
+      &-holder {
+        @apply items-center gap-x-1 flex;
+      }
+
+      &-list {
+        @apply flex flex-col space-y-2;
+      }
+
+      &-item {
+        @apply text-black text-left text-md hover:bg-secondary hover:text-white;
+
+        &:hover {
+          @apply rounded;
+        }
+
+        &-active {
+          @apply bg-neutral-200 rounded;
+
+          &:hover {
+            @apply bg-[var(--secondary)];
+          }
+        }
+      }
+
+      & > div {
+        @apply absolute;
+      }
+    }
+  }
+
+  .menu-bar__language-chooser-mobile {
+    .main-bar__language-chooser {
+      & > div[id*="dropdown-menu"] {
+        @apply w-full relative;
+      }
+    }
+  }
+}

data/app/packs/stylesheets/decidim/application.scss

@@ -9,6 +9,7 @@
 // On the other hand, the following styles match with specific routes
 @use "stylesheets/decidim/header";
 @use "stylesheets/decidim/footer";
+@use "stylesheets/decidim/language_chooser";
 @use "stylesheets/decidim/login";
 @use "stylesheets/decidim/pages";
 @use "stylesheets/decidim/notifications";

data/app/presenters/decidim/admin_log/participatory_space/member_presenter.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AdminLog
+    module ParticipatorySpace
+      # This class holds the logic to present a `Decidim::ParticipatorySpace::MemberPresenter`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    MemberPresenter.new(action_log, view_helpers).present
+      class MemberPresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          {
+            name: :string,
+            email: :string
+          }
+        end
+
+        def action_string
+          case action
+          when "create", "create_via_csv", "delete"
+            "decidim.admin_log.member.#{action}"
+          else
+            super
+          end
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.member"
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/admin_log/static_page_resource_presenter.rb

@@ -11,7 +11,7 @@ module Decidim
       #
       # Returns an HTML-safe String.
       def resource_path
-        @resource_path ||= h.decidim.page_path(resource)
+        @resource_path ||= h.decidim.page_path(resource, locale: I18n.locale)
       end
     end
   end

data/app/presenters/decidim/authorization_transfer_presenter.rb

@@ -20,7 +20,7 @@ module Decidim
     #      "Decidim::Bar" => "Bars: 456"
     #   }
     #
-    # @return [Hash<String => String>] The translated resource counts with the
+    # @return [Hash{String => String}] The translated resource counts with the
     #   resource type as its keys and the translated text with the record count
     #   as its values.
     def translated_record_counts

data/app/presenters/decidim/breadcrumb_root_menu_item_presenter.rb

@@ -9,16 +9,16 @@ module Decidim
 
     def render
       content_tag :li, class: link_wrapper_classes do
-        output = [arrow_link(label, url, link_options)]
+        output = [root_link(label, url, link_options)]
         output.push(@view.send(:simple_menu, **@menu_item.submenu).render) if @menu_item.submenu
 
         safe_join(output)
       end
     end
 
-    def arrow_link(text, url, args = {})
+    def root_link(text, url, args = {})
       link_to url, class: args.with_indifferent_access[:class] do
-        "<span>#{text}</span> #{icon("arrow-right-line")}".html_safe
+        "<span>#{text}</span>".html_safe
       end
     end
   end

data/app/presenters/decidim/log/user_presenter.rb

@@ -11,6 +11,7 @@ module Decidim
     # The only requirement for custom renderers is that they should respond to `present`.
     class UserPresenter
       include Decidim::SanitizeHelper
+
       # Public: Initializes the presenter.
       #
       # user - An instance of Decidim::User

data/app/presenters/decidim/log/value_types/access_mode_presenter.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Log
+    module ValueTypes
+      # This class presents the given value as an access mode. Check
+      # the `DefaultPresenter` for more info on how value
+      # presenters work.
+      class AccessModePresenter < DefaultPresenter
+        # Public: Presents the value as an access mode. If the access mode can
+        # be found, it shows its translated label. Otherwise it shows a fallback message.
+        #
+        # Returns an HTML-safe String.
+        def present
+          return unless value
+          return translated_access_mode if valid_access_mode?
+
+          I18n.t("not_found", id: value, scope: "decidim.log.value_types.access_mode_presenter")
+        end
+
+        private
+
+        def valid_access_mode?
+          access_modes.has_value?(value.to_i)
+        end
+
+        def translated_access_mode
+          I18n.t(access_mode_key, scope: "decidim.log.value_types.access_mode_presenter.access_modes")
+        end
+
+        def access_mode_key
+          access_modes.key(value.to_i)
+        end
+
+        def access_modes
+          # Access modes are consistent across participatory spaces (assemblies, processes, etc.)
+          # open: 0 - fully visible and accessible
+          # transparent: 1 - visible but content restricted
+          # restricted: 2 - not visible, requires permission
+          { open: 0, transparent: 1, restricted: 2 }
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/participatory_space/member_presenter.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatorySpace
+    #
+    # Decorator for participatory space members
+    #
+    class MemberPresenter < SimpleDelegator
+      delegate :profile_url, to: :user, allow_nil: true
+
+      def name
+        user ? user.name : full_name
+      end
+
+      def nickname
+        user.nickname if user
+      end
+
+      def avatar_url(variant = nil)
+        return user.avatar_url(variant) if user.present?
+
+        non_user_avatar_path(variant)
+      end
+
+      def non_user_avatar_path(variant = nil)
+        return non_user_avatar.default_url(variant) unless non_user_avatar.attached?
+
+        non_user_avatar.path(variant:)
+      end
+
+      def non_user_avatar
+        attached_uploader(:non_user_avatar)
+      end
+
+      def deleted?
+        false
+      end
+
+      private
+
+      def user
+        @user ||= if (user = __getobj__.user.presence)
+                    Decidim::UserPresenter.new(user)
+                  end
+      end
+    end
+  end
+end

data/app/presenters/decidim/resource_locator_presenter.rb

@@ -55,8 +55,9 @@ module Decidim
     # Returns a String.
     def show(options = {})
       options.merge!(options_for_polymorphic)
+      locale = options.delete(:locale) || I18n.locale
 
-      admin_route_proxy.send("#{member_route_name}_path", target, options)
+      normalize_locale_route(admin_route_proxy.send("#{member_route_name}_path", target, options), locale)
     end
 
     # Builds the admin edit path to the resource.
@@ -66,8 +67,9 @@ module Decidim
     # Returns a String.
     def edit(options = {})
       options.merge!(options_for_polymorphic)
+      locale = options.delete(:locale) || I18n.locale
 
-      admin_route_proxy.send("edit_#{member_route_name}_path", target, options)
+      normalize_locale_route(admin_route_proxy.send("edit_#{member_route_name}_path", target, options), locale)
     end
 
     private
@@ -112,8 +114,9 @@ module Decidim
 
     def admin_collection_route(route_type, options)
       options.merge!(options_for_polymorphic)
+      locale = options.delete(:locale) || I18n.locale
 
-      admin_route_proxy.send("#{collection_route_name}_#{route_type}", options)
+      normalize_locale_route(admin_route_proxy.send("#{collection_route_name}_#{route_type}", options), locale)
     end
 
     def manifest_for(record)
@@ -172,5 +175,21 @@ module Decidim
     def admin_route_proxy
       @admin_route_proxy ||= EngineRouter.admin_proxy(component || target)
     end
+
+    def normalize_locale_route(path, locale)
+      path = path.sub(/([?&])locale=[^&]*(?=&|\z)/, "\\1")
+      path = path.delete_suffix("?")
+      path = path.delete_suffix("&")
+      path = path.sub("?&", "?")
+
+      path = "/#{path}" unless path.start_with?("/")
+
+      locale_candidates = Regexp.union(I18n.available_locales.map(&:to_s).sort_by(&:length).reverse)
+      path = path.sub(%r{\A/#{locale_candidates}(?=/|\z)}, "")
+
+      path = "/" if path.empty?
+
+      "/#{locale}#{path}"
+    end
   end
 end