decidim-system 0.27.9 → 0.28.0.rc4

data/app/views/decidim/system/organizations/edit.html.erb

@@ -5,40 +5,43 @@
 <% end %>
 
 <%= decidim_form_for(@form) do |f| %>
-  <div class="field">
+  <div class="form__wrapper">
     <%= f.text_field :name, autofocus: true %>
-  </div>
 
-  <div class="field">
     <%= f.text_field :host %>
-  </div>
 
-  <div class="field">
-    <%= f.text_area :secondary_hosts %>
-    <p class="help-text"><%= t(".secondary_hosts_hint") %></p>
-  </div>
+    <%= f.text_area :secondary_hosts, help_text: t(".secondary_hosts_hint") %>
 
-  <div class="field">
-    <%= f.label :force_authentication %>
-    <%= f.check_box :force_users_to_authenticate_before_access_organization %>
-  </div>
+    <%= field_set_tag f.label(:force_authentication, nil, for: nil) do %>
+      <%= f.check_box :force_users_to_authenticate_before_access_organization, label_options: { class: "form__wrapper-checkbox-label" } %>
+    <% end %>
 
-  <div class="field">
-    <%= f.label :users_registration_mode %>
-    <%= f.collection_radio_buttons :users_registration_mode,
-                                   Decidim::Organization.users_registration_modes,
-                                   :first,
-                                   ->(mode) { t("decidim.system.organizations.users_registration_mode.#{mode.first}") } %>
-  </div>
+    <%= field_set_tag f.label(:users_registration_mode, nil, for: nil) do %>
+      <%= f.collection_radio_buttons :users_registration_mode,
+                                     Decidim::Organization.users_registration_modes,
+                                     :first,
+                                     ->(mode) { t("decidim.system.organizations.users_registration_mode.#{mode.first}") } do |builder|
+                                      builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.radio_button(id: nil) + builder.text }
+                                    end %>
+    <% end %>
 
-  <div class="field">
-    <%= f.label :available_authorizations %>
-    <%= f.collection_check_boxes :available_authorizations, Decidim.authorization_workflows, :name, :description %>
-  </div>
+    <%= field_set_tag f.label(:available_authorizations, nil, for: nil) do %>
+      <%= f.collection_check_boxes :available_authorizations, Decidim.authorization_workflows, :name, :description do |builder|
+        builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.check_box(id: nil) + builder.text }
+      end %>
+    <% end %>
 
-  <%= render partial: "advanced_settings", locals: { f: f } %>
+    <%= render partial: "advanced_settings", locals: { f: } %>
+  </div>
 
-  <div class="actions">
-    <%= f.submit t("decidim.system.actions.save") %>
+  <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+    <% if @organization.users.first&.invitation_pending? %>
+      <%= link_to t(".resend_invitation"),
+                  resend_invitation_organization_path(@organization),
+                  method: :post,
+                  class: "button button__sm md:button__lg button__transparent-secondary",
+                  data: { confirm: t(".confirm_resend_invitation") } %>
+    <% end %>
+    <%= f.submit t("decidim.system.actions.save"), class: "button button__sm md:button__lg button__primary" %>
   </div>
 <% end %>

data/app/views/decidim/system/organizations/index.html.erb

@@ -1,10 +1,9 @@
 <% add_decidim_page_title(t(".title")) %>
 
 <% provide :title do %>
-  <h2><%= t ".title" %></h2>
+  <h1 class="h1"><%= t ".title" %></h1>
 <% end %>
 
-<div class="actions title">
-  <%= link_to t("actions.new", scope: "decidim.system", name: t("models.organization.name", scope: "decidim.system")), [:new, :organization], class: "new" %>
-</div>
+<%= link_to t("actions.new_organization", scope: "decidim.system"), [:new, :organization], class: "button button__sm md:button__lg button__primary" %>
+
 <%= render partial: "decidim/system/shared/organizations_list", locals: { organizations: @organizations } %>

data/app/views/decidim/system/organizations/new.html.erb

@@ -1,38 +1,24 @@
 <% add_decidim_page_title(t(".title")) %>
 
 <% provide :title do %>
-  <h2><%= t ".title" %></h2>
+  <h1 class="h1"><%= t ".title" %></h1>
 <% end %>
 
 <%= decidim_form_for(@form) do |f| %>
-  <div class="field">
+  <div class="form__wrapper">
     <%= f.text_field :name, autofocus: true %>
-  </div>
 
-  <div class="field">
-    <%= f.text_field :reference_prefix %>
-    <p class="help-text"><%= t(".reference_prefix_hint") %></p>
-  </div>
+    <%= f.text_field :reference_prefix, help_text: t(".reference_prefix_hint") %>
 
-  <div class="field">
     <%= f.text_field :host %>
-  </div>
 
-  <div class="field">
-    <%= f.text_area :secondary_hosts %>
-    <p class="help-text"><%= t(".secondary_hosts_hint") %></p>
-  </div>
+    <%= f.text_area :secondary_hosts, help_text: t(".secondary_hosts_hint") %>
 
-  <div class="field">
     <%= f.text_field :organization_admin_name %>
-  </div>
 
-  <div class="field">
-    <%= f.email_field :organization_admin_email %>
-  </div>
+    <%= f.email_field :organization_admin_email, help_text: t(".organization_admin_email_hint") %>
 
-  <%= f.fields_for :locales do |fields| %>
-    <div class="field">
+    <%= f.fields_for :locales do |fields| %>
       <%= f.label :organization_locales, "", class: @form.respond_to?(:errors) && @form.errors[:default_locale].present? ? "is-invalid-label" : "" %>
       <table>
         <thead>
@@ -46,36 +32,37 @@
           <% localized_locales.each do |locale| %>
             <tr>
               <td><%= locale.name %></td>
-              <td><%= check_box_tag "organization[available_locales][#{locale.id}]", locale.id, @form.available_locales.include?(locale.id) %></td>
-              <td><%= radio_button_tag "organization[default_locale]", locale.id, @form.default_locale == locale.id %></td>
+              <td><%= check_box_tag "organization[available_locales][#{locale.id}]", locale.id, @form.available_locales.include?(locale.id), class: "!m-0" %></td>
+              <td><%= radio_button_tag "organization[default_locale]", locale.id, @form.default_locale == locale.id, class: "!m-0" %></td>
             </tr>
           <% end %>
         </tbody>
       </table>
-    </div>
-  <% end %>
+    <% end %>
 
-  <div class="field">
-    <%= f.label :force_authentication %>
-    <%= f.check_box :force_users_to_authenticate_before_access_organization %>
-  </div>
+    <%= field_set_tag f.label(:force_authentication, nil, for: nil) do %>
+      <%= f.check_box :force_users_to_authenticate_before_access_organization, label_options: { class: "form__wrapper-checkbox-label" } %>
+    <% end %>
 
-  <div class="field">
-    <%= f.label :users_registration_mode %>
-    <%= f.collection_radio_buttons :users_registration_mode,
-                                   Decidim::Organization.users_registration_modes,
-                                   :first,
-                                   ->(mode) { t("decidim.system.organizations.users_registration_mode.#{mode.first}") } %>
-  </div>
+    <%= field_set_tag f.label(:users_registration_mode, nil, for: nil) do %>
+      <%= f.collection_radio_buttons :users_registration_mode,
+                                     Decidim::Organization.users_registration_modes,
+                                     :first,
+                                     ->(mode) { t("decidim.system.organizations.users_registration_mode.#{mode.first}") } do |builder|
+                                      builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.radio_button(id: nil) + builder.text }
+                                    end %>
+    <% end %>
 
-  <div class="field">
-    <%= f.label :available_authorizations %>
-    <%= f.collection_check_boxes :available_authorizations, Decidim.authorization_workflows, :name, :description %>
-  </div>
+    <%= field_set_tag f.label(:available_authorizations, nil, for: nil) do %>
+      <%= f.collection_check_boxes :available_authorizations, Decidim.authorization_workflows, :name, :description do |builder|
+        builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.check_box(id: nil) + builder.text }
+      end %>
+    <% end %>
 
-  <%= render partial: "advanced_settings", locals: { f: f } %>
+    <%= render partial: "advanced_settings", locals: { f: } %>
+  </div>
 
-  <div class="actions">
-    <%= f.submit t("decidim.system.models.organization.actions.save_and_invite") %>
+  <div class="form__wrapper-block">
+    <%= f.submit t("decidim.system.models.organization.actions.save_and_invite"), class: "button button__sm md:button__lg button__primary" %>
   </div>
 <% end %>

data/app/views/decidim/system/shared/_admins_list.html.erb

@@ -0,0 +1,27 @@
+<table>
+  <thead>
+    <tr>
+      <th><%= t("models.admin.fields.email", scope: "decidim.system") %></th>
+      <th><%= t("models.admin.fields.created_at", scope: "decidim.system") %></th>
+      <th class="actions"><%= t("actions.title", scope: "decidim.system") %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% admins.each do |admin| %>
+      <tr>
+        <td>
+          <%= link_to admin.email, edit_admin_path(admin) %><br>
+        </td>
+        <td>
+          <%= l admin.created_at, format: :short %>
+        </td>
+        <td class="actions">
+          <%= link_to t("actions.edit", scope: "decidim.system"), edit_admin_path(admin) %>
+          <% unless current_admin?(admin) %>
+            <%= link_to t("actions.destroy", scope: "decidim.system"), admin, method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.system") } %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/decidim/system/shared/_notices.html.erb

@@ -1,11 +1,9 @@
 <%= display_flash_messages %>
 
 <% if Decidim::Organization.none? %>
-  <div class="flash callout warning">
-    <% guide = link_to t(".our_getting_started_guide"),
-                       "https://docs.decidim.org/",
-                       target: :blank %>
+  <% guide = link_to t(".our_getting_started_guide"),
+                     "https://docs.decidim.org/",
+                     target: :blank %>
 
-    <%= t(".no_organization_warning_html", guide: guide) %>
-  </div>
+  <%= cell "decidim/announcement", t(".no_organization_warning_html", guide:), callout_class: "warning" %>
 <% end %>

data/app/views/decidim/system/shared/_organizations_list.html.erb

@@ -1,4 +1,4 @@
-<table class="stack">
+<table>
   <thead>
     <tr>
       <th><%= t("models.organization.fields.name", scope: "decidim.system") %></th>
@@ -10,14 +10,21 @@
     <% organizations.each do |organization| %>
       <tr>
         <td>
-          <%= link_to organization.name, organization %><br>
+          <%= link_to organization.name, edit_organization_path(organization) %><br>
           <%= organization.host %>
         </td>
         <td>
           <%= l organization.created_at, format: :short %>
         </td>
         <td class="actions">
-          <%= link_to t("actions.edit", scope: "decidim.system"), [:edit, organization] %>
+          <% if organization.users.first&.invitation_pending? %>
+            <%= link_to t(".resend_invitation"),
+                        resend_invitation_organization_path(organization),
+                        method: :post,
+                        class: "button button__sm button__transparent-secondary no-underline",
+                        data: { confirm: t(".confirm_resend_invitation") } %>
+          <% end %>
+          <%= link_to t("actions.edit", scope: "decidim.system"), edit_organization_path(organization) %>
         </td>
       </tr>
     <% end %>

data/app/views/layouts/decidim/system/_header.html.erb

@@ -1,4 +1,4 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
-<%= stylesheet_pack_tag "decidim_system", media: "all" %>
-<%= javascript_pack_tag "decidim_system", defer: false %>
+<%= stylesheet_pack_tag "decidim_core", "decidim_system", media: "all" %>
+<%= javascript_pack_tag "decidim_core", "decidim_system", defer: false %>

data/app/views/layouts/decidim/system/_login_items.html.erb

@@ -1,8 +1,4 @@
-<div class="session-box">
-  <div class="admin-email">
-    <%= current_admin.email %>
-  </div>
-  <div class="sign-out">
-    <%= link_to(t(".logout"), destroy_admin_session_path, :method => :delete) %>
-  </div>
+<div class="flex items-center justify-between border-t border-black p-4">
+  <span><%= current_admin.email %></span>
+  <%= link_to(t(".logout"), destroy_admin_session_path, method: :delete, class: "button button__sm md:button__lg button__text-primary") %>
 </div>

data/app/views/layouts/decidim/system/_sidebar.html.erb

@@ -1,10 +1,6 @@
-<div class="title">
-  <h1>
-    <%= link_to root_path do %>
-      <%= title %>
-    <% end %>
-  </h1>
-</div>
+<%= link_to root_path, class: "hidden md:block bg-primary p-4 text-white font-bold text-lg" do %>
+  <%= title %>
+<% end %>
 
 <%= main_menu.render %>
 

data/app/views/layouts/decidim/system/application.html.erb

@@ -6,37 +6,33 @@
   <%= render partial: "layouts/decidim/system/header" %>
 </head>
 
-<body>
-  <div class="off-canvas-wrapper">
-    <div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
-      <div class="off-canvas position-left reveal-for-large" id="my-info" data-off-canvas data-position="left">
-        <div class="sidebar">
-          <%= render partial: "layouts/decidim/system/sidebar" %>
-        </div>
-      </div>
+<body class="text-black text-md form-defaults min-h-screen flex items-stretch">
+  <aside id="aside-system">
+    <%= render partial: "layouts/decidim/system/sidebar" %>
+  </aside>
 
-      <div class="off-canvas-content" data-off-canvas-content>
-        <div class="title-bar hide-for-large">
-          <div class="title-bar-left">
-            <button class="menu-icon" type="button" data-open="my-info"></button>
-            <span class="title-bar-title"><%= title %></span>
-          </div>
-        </div>
-        <div class="row main-content">
-          <div class="small-12 column">
-            <% if content_for?(:title) %>
-              <section class="page-title">
-                <%= content_for :title %>
-              </section>
-            <% end %>
+  <main class="grow">
+    <div class="flex md:hidden items-center gap-2 bg-primary p-4 text-white font-bold text-lg">
+      <button id="aside-trigger" class="flex-none md:hidden" data-component="dropdown" data-target="aside-system" data-disabled-md="true">
+        <%= icon "menu-line", class: "w-6 h-6 text-white fill-current" %>
+      </button>
 
-            <%= render "decidim/system/shared/notices" %>
-            <%= yield %>
-          </div>
-        </div>
-      </div>
+      <%= link_to root_path, class: "block" do %>
+        <%= title %>
+      <% end %>
     </div>
-  </div>
+
+    <div class="p-6 md:px-16 md:py-12 h-full w-full space-y-6">
+      <%= render "decidim/system/shared/notices" %>
+
+      <% if content_for?(:title) %>
+        <%= content_for :title %>
+      <% end %>
+
+      <%= yield %>
+    </div>
+  </main>
+
   <%= render partial: "decidim/shared/confirm_modal" %>
   <%= render partial: "layouts/decidim/system/js_configuration" %>
   <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>

data/app/views/layouts/decidim/system/login.html.erb

@@ -5,15 +5,16 @@
     <%= render partial: "layouts/decidim/system/header" %>
   </head>
 
-  <body class="login">
-    <div class="login-form-wrapper">
-      <div class="login-form">
-        <h1><%= t("decidim", scope: "decidim.system.titles") %></h1>
-        <%= render "decidim/system/shared/notices" %>
-        <div class="login-form-inner">
-          <%= yield %>
-        </div>
+  <body class="text-black text-md form-defaults bg-gray-3 h-screen w-screen grid place-items-center">
+    <%= render layout: "layouts/decidim/shared/layout_center" do %>
+
+      <div class="space-y-8 my-10">
+        <h1 class="h1 decorator"><%= t("decidim", scope: "decidim.system.titles") %></h1>
       </div>
-    </div>
+
+      <%= render "decidim/system/shared/notices" %>
+
+      <%= yield %>
+    <% end %>
   </body>
 </html>

data/config/locales/ar.yml

@@ -38,15 +38,11 @@ ar:
         confirm_destroy: هل أنت متأكد أنك تريد حذف هذا؟
         destroy: حذف
         edit: تعديل
-        new: الجديد
         save: حفظ
         title: أفعال
       admins:
         create:
           error: كانت هناك مشكلة في إنشاء مسؤول جديد.
-          success: تم إنشاء المشرف بنجاح
-        destroy:
-          success: تم حذف المشرف بنجاح
         edit:
           title: تحرير المشرف
           update: تحديث
@@ -55,11 +51,8 @@ ar:
         new:
           create: إنشاء
           title: المشرف الجديد
-        show:
-          edit: تعديل
         update:
           error: حدثت مشكلة أثناء تحديث هذا المشرف.
-          success: تم تحديث المشرف بنجاح
       dashboard:
         show:
           current_organizations: المنظمات الحالية
@@ -77,7 +70,6 @@ ar:
           fields:
             created_at: أنشئت في
             email: البريد الإلكتروني
-          name: مشرف
           validations:
             email_uniqueness: يوجد مشرف آخر بنفس البريد الإلكتروني بالفعل
         oauth_application:
@@ -85,7 +77,6 @@ ar:
             created_at: أنشئ في
             name: اسم تطبيق OAuth
             organization_name: المنظمة
-          name: تطبيق OAuth
         organization:
           actions:
             save_and_invite: إنشاء منظمة ودعوة المشرف
@@ -95,7 +86,6 @@ ar:
             name: اسم
             omniauth_settings: إعدادات Omniauth
             smtp_settings: إعدادات الـ SMTP
-          name: المنظمة
       oauth_applications:
         create:
           error: كانت هناك مشكلة في إنشاء هذا التطبيق.
@@ -123,7 +113,6 @@ ar:
           show: إظهار الإعدادات المتقدمة
         create:
           error: كانت هناك مشكلة في إنشاء منظمة جديدة.
-          success: تم إنشاء المنظمة بنجاح.
         edit:
           secondary_hosts_hint: أدخل كل واحد منهم في سطر جديد
         file_upload_settings:
@@ -178,7 +167,6 @@ ar:
         users_registration_mode:
           disabled: يمكن فقط الوصول باستخدام الحسابات الخارجية
           enabled: السماح للمشاركين بالتسجيل والدخول
-          existing: لا تسمح للمشاركين بالتسجيل ، لكن اسمح للمشاركين الحاليين بتسجيل الدخول
       shared:
         notices:
           no_organization_warning_html: يجب عليك إنشاء منظمة للبدء. تأكد من قراءة %{guide} قبل المتابعة.