RubyGems - decidim-admin - Versions diffs - 0.27.4 → 0.28.0.rc5 - Mend

decidim-admin 0.27.4 → 0.28.0.rc5

Files changed (510) hide show

data/app/views/layouts/decidim/admin/_application.html.erb CHANGED Viewed

@@ -13,19 +13,57 @@
     <%= render partial: "layouts/decidim/admin/header" %>
   </head>
   <body>
-    <%= render partial: "layouts/decidim/timeout_modal" %>
-    <%= render partial: "layouts/decidim/admin/template_top" %>
-    <div class="layout-nav">
-      <%= main_menu.render %>
-      <%= yield :secondary_nav if content_for? :secondary_nav %>
-      <%= yield :sidebar_menu_nav if content_for? :sidebar_menu_nav %>
-    </div>
-    <div class="layout-content">
-      <div class="container">
-        <%= yield %>
+    <main class="main">
+      <div class="layout-wrapper">
+        <div class="block md:hidden col-start-1 col-end-2">
+          <%= render partial: "layouts/decidim/admin/title_bar_responsive" %>
+        </div>
+        <div class="relative md:flex grow min-h-max w-full">
+          <div class="layout-nav">
+            <%= link_to decidim_admin.root_path, class: "logo hidden md:block", data: { "external-link": false }, aria: { label: t("decidim.accessibility.logo", organization: current_organization.name) } do %>
+              <% if current_organization.logo.present? %>
+                <%= image_tag current_organization.attached_uploader(:logo).path, alt: current_organization.name %>
+              <% else %>
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 134 109">
+                  <g fill="#fff">
+                  <path d="M0 44.664a18.345 18.345 0 0 1 1.44-7.14 18.633 18.633 0 0 1 4.116-6.053 19.014 19.014 0 0 1 6.165-4.048A19.326 19.326 0 0 1 18.997 26h15.205a3.842 3.842 0 0 1 2.684 1.093A3.696 3.696 0 0 1 38 29.726v74.548c0 .489-.098.973-.29 1.426-.19.452-.47.863-.822 1.208A3.856 3.856 0 0 1 34.202 108H18.997c-5.037-.002-9.867-1.965-13.429-5.458C2.006 99.048.003 94.312 0 89.37V44.664ZM80.202 0H49.798C47.7 0 46 1.684 46 3.76v101.48c0 2.076 1.7 3.76 3.798 3.76h30.404c2.097 0 3.798-1.684 3.798-3.76V3.76C84 1.683 82.3 0 80.202 0ZM134 89.506a18.157 18.157 0 0 1-3.205 10.276 18.896 18.896 0 0 1-8.528 6.811 19.477 19.477 0 0 1-10.978 1.05 19.165 19.165 0 0 1-9.726-5.064 18.352 18.352 0 0 1-5.198-9.472 18.043 18.043 0 0 1 1.082-10.688 18.614 18.614 0 0 1 6.998-8.302A19.363 19.363 0 0 1 115 71c5.04.002 9.873 1.952 13.435 5.422C132 79.892 134 84.599 134 89.506Z" />
+                  </g>
+                </svg>
+              <% end %>
+            <% end %>
+            <%= main_menu_modules.render %>
+            <%= main_menu.render %>
+          </div>
+          <div class="layout-content">
+            <div class="hidden md:block">
+              <%= render partial: "layouts/decidim/admin/title_bar" %>
+            </div>
+            <%= yield :secondary_nav if content_for? :secondary_nav %>
+            <%= yield :sidebar_menu_nav if content_for? :sidebar_menu_nav %>
+            <%= yield :aside_menu_nav if content_for? :aside_menu_nav %>
+            <%= render partial: "layouts/decidim/admin/breadcrumb" %>
+            <%= render partial: "layouts/decidim/admin/callouts_full" %>
+            <% if has_secondary_root_menu? %>
+              <div class="layout-content__container-sidebar" data-content>
+                <%= render "layouts/decidim/admin/sidebar_menu" do %>
+                  <%= yield %>
+                <% end %>
+              </div>
+            <% else %>
+              <div class="layout-content__container" data-content>
+                <%= admin_tabs(tab_menu_name).render if defined?(has_tab_menu?) && has_tab_menu? %>
+                <%= yield %>
+              </div>
+            <% end %>
+          </div>
+        </div>
       </div>
-    </div>
-    <%= render partial: "layouts/decidim/admin/template_bottom" %>
+    </main>
+    <%= render partial: "layouts/decidim/timeout_modal" %>
     <%= render partial: "decidim/shared/confirm_modal" %>
     <%= render partial: "layouts/decidim/admin/js_configuration" %>
     <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>

data/app/views/layouts/decidim/admin/_breadcrumb.html.erb ADDED Viewed

@@ -0,0 +1,26 @@
+<div class="process-title">
+  <div class="layout-content__container">
+    <div class="process-title-content">
+      <div class="process-title-content-breadcrumb-container-left">
+        <%= link_to decidim_admin.root_path, class: "process-title-content-icon-home", data: { "external-link": false }, aria: { label: "home" } do %>
+          <%= icon "home-gear-line" %>
+        <% end %>
+        <% breadcrumb_items(:admin).each_with_index do |item, i| %>
+          <span class="text-white">/</span>
+          <% item_label = decidim_html_escape(translated_attribute(item[:label])) %>
+          <% if item[:url].present? && !is_active_link?(item[:url], :exclusive) %>
+            <%= link_to(item_label, item[:url], class: "process-title-content-breadcrumb", data: { "external-link": false }, "aria-current": (item[:active] ? "page" : nil)) %>
+          <% else %>
+            <%= content_tag(:span, item_label, tabindex: "0", "aria-current": "page", class: "process-title-content-breadcrumb") %>
+          <% end %>
+        <% end %>
+      </div>
+      <% if content_for?(:breadcrumb_context_menu) %>
+        <div class="process-title-content-breadcrumb-container-right">
+          <%= yield :breadcrumb_context_menu %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/layouts/decidim/admin/_callouts_full.html.erb CHANGED Viewed

@@ -1,14 +1,3 @@
-<div class="callout-wrapper">
-  <% flash.each do |key, value| %>
-    <% if /_html\Z/.match?(key)
-         key = key.gsub(/_html\Z/, "")
-         value = decidim_sanitize(value)
-    end %>
-    <div class="callout <%= FoundationRailsHelper::FlashHelper::DEFAULT_KEY_MATCHING[key.to_sym] %> callout--full" data-closable>
-      <%= value %>
-      <button class="close-button" aria-label="Dismiss alert" type="button" data-close>
-        <span aria-hidden="true">&times;</span>
-      </button>
-    </div>
-  <% end %>
+<div class="callout-wrapper mb-0 mx-4">
+  <%= display_flash_messages %>
 </div>

data/app/views/layouts/decidim/admin/_header.html.erb CHANGED Viewed

@@ -1,6 +1,5 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
-<%= stylesheet_pack_tag "decidim_admin", media: "all" %>
-<%= javascript_pack_tag "decidim_admin", defer: false %>
-<%= organization_colors %>
+<%= stylesheet_pack_tag "decidim_core", "decidim_admin", media: "all" %>
+<%= javascript_pack_tag "decidim_core", "decidim_admin", defer: false %>
 <%= snippets.display(:head) %>

data/app/views/layouts/decidim/admin/_js_configuration.html.erb CHANGED Viewed

@@ -1,11 +1,9 @@
 <%
 js_configs = {
-  icons_path: Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg"),
+  icons_path: Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg"),
   messages: {
-    "selfxssWarning": {
-      title: t("decidim.security.selfxss_warning.title"),
-      description: t("decidim.security.selfxss_warning.description")
-    }
+    "selfxssWarning": t("decidim.security.selfxss_warning"),
+    editor: t("editor")
   }
 }
 character_messages = {

data/app/views/layouts/decidim/admin/_sidebar_menu.html.erb ADDED Viewed

@@ -0,0 +1,24 @@
+<div class="sidebar-menu__container">
+  <div class="sidebar-menu">
+    <div id="admin-sidebar-menu-settings">
+      <div class="hidden md:block">
+        <%= sidebar_menu(secondary_root_menu).render %>
+      </div>
+      <button data-component="dropdown" data-target="dropdown-menu-sidebar" data-auto-close="true" data-disabled-md="true" data-scroll-to-menu="true">
+        <span><%= t("menu", scope: "decidim.admin.titles") %></span>
+        <%= icon "arrow-down-s-line" %>
+        <%= icon "arrow-up-s-line" %>
+      </button>
+      <ul id="dropdown-menu-sidebar" class="md:hidden">
+        <%= sidebar_menu(secondary_root_menu).render %>
+      </ul>
+    </div>
+  </div>
+  <div class="item_show__wrapper">
+    <%= admin_tabs(tab_menu_name).render if defined?(has_tab_menu?) && has_tab_menu? %>
+    <%= yield %>
+  </div>
+</div>

data/app/views/layouts/decidim/admin/_title_bar.html.erb CHANGED Viewed

@@ -1,47 +1,46 @@
 <div class="title-bar">
-  <a href="#menu" class="menu-trigger"><%= icon "menu" %></a>
-  <%= link_to decidim.root_path, class: "logo", target: "_blank" do %>
-    <% if current_organization.logo.present? %>
-      <%= image_tag current_organization.attached_uploader(:logo).path, alt: current_organization.name %>
-    <% else %>
+  <div class="layout-content__container">
+    <span class="font-semibold text-sm">
       <%= current_organization.name %>
-    <% end %>
-  <% end %>
-  <div class='tool-bar'>
-    <% if available_locales.length > 1 %>
-    <div class="topbar__dropmenu language-choose">
-        <ul class="dropdown menu" data-dropdown-menu
-          data-autoclose="false"
-          data-disable-hover="true"
-          data-click-open="true"
-          data-close-on-click="true"
-          tabindex="-1">
-          <li class="is-dropdown-submenu-parent" tabindex="-1">
-            <%= link_to t("name", scope: "locale"), "#", id: "admin-user-menu-control", "aria-controls": "admin-user-menu", "aria-haspopup": "menu" %>
-            <ul class="menu is-dropdown-submenu" id="admin-user-menu" role="menu" aria-labelledby="admin-user-menu-control" tabindex="-1">
+    </span>
+    <div class="tool-bar">
+      <%= link_to decidim.root_path, class: "button__site", target: "_blank", data: { "external-link": false } do %>
+        <%= icon "eye-line" %>
+        <%= t("see_site", scope: "decidim.admin.menu") %>
+      <% end %>
+      <% if available_locales.length > 1 %>
+        <div class="topbar__dropmenu language-choose relative">
+          <%= button_tag id: "admin-menu-trigger", data: { component: "dropdown", target: "admin-dropdown-menu-language" }, class: "dropdown__trigger" do %>
+              <%= t("name", scope: "locale") %>
+              <%= icon "arrow-down-s-line" %>
+          <% end %>
+          <div id="admin-dropdown-menu-language" aria-hidden="true">
+            <ul class="dropdown dropdown__bottom">
               <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
-                <li><%= link_to(locale_name(locale), decidim.locale_path(locale: locale), method: :post, tabindex: "-1") %></li>
+                <li class="dropdown__item">
+                  <%= link_to(locale_name(locale), decidim.locale_path(locale:), method: :post, tabindex: "-1") %>
+                </li>
               <% end %>
             </ul>
-          </li>
-        </ul>
-      </div>
-    <% end %>
+          </div>
+        </div>
+      <% end %>
-    <div class="user-login">
-      <ul class="dropdown menu" data-dropdown-menu
-        data-autoclose="false"
-        data-disable-hover="true"
-        data-click-open="true"
-        data-close-on-click="true"
-        tabindex="-1">
-        <li class="is-dropdown-submenu-parent" tabindex="-1">
-          <%= link_to current_user.email, "#", id: "admin-language-menu-control", "aria-controls": "admin-language-menu", "aria-haspopup": "menu", "aria-label": t("layouts.decidim.user_menu.account", name: current_user.email) %>
-          <ul class="menu is-dropdown-submenu" id="admin-language-menu" role="menu" aria-labelledby="admin-language-menu-control" tabindex="-1">
-            <li><%= link_to(t("layouts.decidim.user_menu.sign_out"), decidim.destroy_user_session_path, method: :delete, tabindex: "-1") %></li>
+      <div class="user-login relative">
+        <%= button_tag current_user.email, id: "admin-dropdown-menu-login-trigger", data: { component: "dropdown", target: "admin-dropdown-menu-login" } , class: "dropdown__trigger" do %>
+          <%= current_user.email %>
+          <%= icon "arrow-down-s-line" %>
+        <% end %>
+        <div id="admin-dropdown-menu-login" aria-hidden="true">
+          <ul class="dropdown dropdown__bottom">
+            <li class="dropdown__item">
+              <%= link_to(t("layouts.decidim.user_menu.log_out"), decidim.destroy_user_session_path, method: :delete, tabindex: "-1") %>
+            </li>
           </ul>
-        </li>
-      </ul>
+        </div>
+      </div>
     </div>
   </div>
 </div>

data/app/views/layouts/decidim/admin/_title_bar_responsive.html.erb ADDED Viewed

@@ -0,0 +1,46 @@
+<div class="title-bar">
+  <div class="layout-content__container">
+    <a href="#menu" class="menu-trigger"><%= icon "menu-line", class: "fill-black" %></a>
+    <span class="font-semibold text-sm">
+      <%= current_organization.name %>
+    </span>
+    <div class="tool-bar">
+      <%= link_to decidim.root_path, class: "button__site", target: "_blank", data: { "external-link": false } do %>
+        <%= icon "eye-line" %>
+        <%= t("see_site", scope: "decidim.admin.menu") %>
+      <% end %>
+      <% if available_locales.length > 1 %>
+        <div class="topbar__dropmenu language-choose relative">
+          <%= button_tag id: "admin-menu-trigger-responsive", data: { component: "dropdown", target: "admin-dropdown-menu-language-responsive" }, class: "dropdown__trigger" do %>
+              <%= t("name", scope: "locale") %>
+              <%= icon "arrow-down-s-line" %>
+          <% end %>
+          <div id="admin-dropdown-menu-language-responsive" aria-hidden="true">
+            <ul class="dropdown dropdown__bottom">
+              <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
+                <li class="dropdown__item">
+                  <%= link_to(locale_name(locale), decidim.locale_path(locale:), method: :post, tabindex: "-1") %>
+                </li>
+              <% end %>
+            </ul>
+          </div>
+        </div>
+      <% end %>
+      <div class="user-login relative">
+        <%= button_tag current_user.email, id: "admin-dropdown-menu-login-trigger-responsive", data: { component: "dropdown", target: "admin-dropdown-menu-login-responsive" } , class: "dropdown__trigger" do %>
+          <%= current_user.email %>
+          <%= icon "arrow-down-s-line" %>
+        <% end %>
+        <div id="admin-dropdown-menu-login-responsive" aria-hidden="true">
+          <ul class="dropdown dropdown__bottom">
+            <li class="dropdown__item">
+              <%= link_to(t("layouts.decidim.user_menu.log_out"), decidim.destroy_user_session_path, method: :delete, tabindex: "-1") %>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/layouts/decidim/admin/global_moderations.html.erb CHANGED Viewed

@@ -1,7 +1,5 @@
 <% add_decidim_page_title(t(".title" )) %>
-<% content_for :sidebar_menu_nav do %>
-  <%= sidebar_menu(:admin_global_moderation_menu).render(title: t(".title" )) %>
-<% end %>
+<% add_secondary_root_menu(:admin_global_moderation_menu) %>
 <%= render "layouts/decidim/admin/application" do %>
   <%= yield %>

data/app/views/layouts/decidim/admin/newsletters.erb CHANGED Viewed

@@ -1,14 +1,3 @@
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav">
-    <div class="secondary-nav__title">
-      <%= t ".title" %>
-    </div>
-    <div class="secondary-nav__actions">
-      <%= link_to t("actions.newsletter.new", scope: "decidim.admin"), [:newsletter_templates], class: "button expanded small new" %>
-    </div>
-  </div>
-<% end %>
 <%= render "layouts/decidim/admin/application" do %>
   <%= yield %>
 <% end %>

data/app/views/layouts/decidim/admin/settings.html.erb CHANGED Viewed

@@ -1,6 +1,5 @@
-<% content_for :sidebar_menu_nav do %>
-  <%= sidebar_menu(:admin_settings_menu).render(title: t(".title") ) %>
-<% end %>
+<% add_secondary_root_menu(:admin_settings_menu) %>
 <%= render "layouts/decidim/admin/application" do %>
+  <%= yield :title %>
   <%= yield %>
 <% end %>

data/app/views/layouts/decidim/admin/users.html.erb CHANGED Viewed

@@ -1,6 +1,4 @@
-<% content_for :sidebar_menu_nav do %>
-  <%= sidebar_menu(:admin_user_menu).render(title: t(".title") ) %>
-<% end %>
+<% add_secondary_root_menu(:admin_user_menu) %>
 <%= render "layouts/decidim/admin/application" do %>
   <%= yield %>

data/config/environment.rb CHANGED Viewed

@@ -1 +1,3 @@
 # frozen_string_literal: true
+# Empty line for playing nice with tpope/vim-rails

data/config/locales/ar-SA.yml CHANGED Viewed

@@ -545,9 +545,6 @@ ar:
         edit:
           active_content_blocks: كتل المحتوى النشط
           inactive_content_blocks: كتل المحتوى غير النشطة
-      organization_homepage_content_blocks:
-        edit:
-          update: تحديث
       participatory_space_private_users:
         create:
           error: حدثت مشكلة أثناء إضافة مشارك خاص لهذه المساحة التشاركية.