decidim-admin 0.27.4 → 0.28.0.rc5

data/app/views/decidim/admin/newsletters/select_recipients_to_deliver.html.erb

@@ -1,76 +1,74 @@
-<%= decidim_form_for(@form, url: deliver_newsletter_path(@newsletter), method: :post, html: { class: "form newsletter_deliver" }, data: { "recipients-count-newsletter-path": recipients_count_newsletter_path(@newsletter) }) do |f| %>
-  <div class="card">
-
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
-    </div>
-    <div class="card-section">
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: deliver_newsletter_path(@newsletter), method: :post, html: { class: "form form-defaults newsletter_deliver" }, data: { "recipients-count-newsletter-path": recipients_count_newsletter_path(@newsletter) }) do |f| %>
       <%= cell("decidim/announcement", newsletter_attention_callout_announcement, callout_class: "warning") %>
-
-      <div class="card">
-        <div class="card-divider">
-          <h2 class="card-title"><%= t ".select_users" %></h2>
-        </div>
-        <div class="card-section">
-          <div class="row">
-            <% if current_user.admin? %>
+      <%= cell("decidim/announcement", newsletter_recipients_count_callout_announcement, callout_class: "warning") %>
+      <div class="form__wrapper">
+        <div class="card mb-2">
+          <div class="card-divider">
+            <h2 class="card-title"><%= t ".select_users" %></h2>
+          </div>
+          <div class="card-section">
+            <div class="row column">
+              <% if current_user.admin? %>
+                <div class="grid-x grid-padding-x">
+                  <div class="cell small-12" id="send_newsletter_to_all_users">
+                    <%= f.check_box :send_to_all_users, help_text: t(".all_users_help") %>
+                  </div>
+                </div>
+                <hr class="mt-s mb-s">
+              <% end %>
               <div class="grid-x grid-padding-x">
-                <div class="cell small-12" id="send_newsletter_to_all_users">
-                  <%= f.check_box :send_to_all_users, label: t(".send_to_all_users") %>
-                  <p class="help-text"><%= t ".all_users_help" %></p>
+                <div class="cell small-12 medium-6" id="send_newsletter_to_followers">
+                  <%= f.check_box :send_to_participants, help_text: t(".participants_help") %>
+                </div>
+
+                <div class="cell small-12 medium-6" id="send_newsletter_to_participants">
+                  <%= f.check_box :send_to_followers, help_text: t(".followers_help") %>
                 </div>
-              </div>
-              <hr class="reset mt-s mb-s">
-            <% end %>
-            <div class="grid-x grid-padding-x">
-              <div class="cell small-12 medium-6" id="send_newsletter_to_followers">
-                <%= f.check_box :send_to_participants, label: t(".send_to_participants") %>
-                <p class="help-text"><%= t ".participants_help" %></p>
-              </div>
-              <div class="cell small-12 medium-6" id="send_newsletter_to_participants">
-                <%= f.check_box :send_to_followers, label: t(".send_to_followers") %>
-                <p class="help-text"><%= t ".followers_help" %></p>
               </div>
             </div>
           </div>
         </div>
-      </div>
-
-      <div class="card" id="participatory_spaces_for_select">
-        <div class="card-divider">
-          <h2 class="card-title"><%= t ".select_spaces" %></h2>
-        </div>
-        <div class="card-section">
-          <div class="row">
-            <%= participatory_spaces_for_select f %>
-          </div>
-        </div>
-      </div>
 
-      <% if current_user.admin? %>
-        <div class="card">
+        <div class="card mb-2" id="participatory_spaces_for_select">
           <div class="card-divider">
-            <h2 class="card-title"><%= t ".select_scopes" %></h2>
+            <h2 class="card-title"><%= t ".select_spaces" %></h2>
           </div>
           <div class="card-section">
-            <div class="row">
-              <%= scopes_picker_filter f, :scope_ids %>
-              <p class="help-text"><%= t ".scopes_help" %></p>
+            <div class="row column">
+              <%= participatory_spaces_for_select f %>
             </div>
           </div>
         </div>
-      <% end %>
-
-      <%= cell("decidim/announcement", newsletter_recipients_count_callout_announcement, callout_class: "warning") %>
 
-      <div class="button--double form-general-submit">
+        <% if current_user.admin? %>
+          <div class="card">
+            <div class="card-divider">
+              <h2 class="card-title"><%= t ".select_scopes" %></h2>
+            </div>
+            <div class="card-section">
+              <div class="row column">
+                <%= scopes_picker_filter f, :scope_ids, help_text: t(".scopes_help") %>
+              </div>
+            </div>
+          </div>
+        <% end %>
+      </div>
+      <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
         <% if allowed_to?(:update, :newsletter, newsletter: @newsletter) && !@newsletter.sent? %>
-          <%= link_to t("actions.edit", scope: "decidim.admin"), [:edit, @newsletter], class: "button" %>
+          <%= link_to t("actions.edit", scope: "decidim.admin"), [:edit, @newsletter], class: "button button__sm button__secondary" %>
         <% end %>
         <% unless @newsletter.sent? %>
-        <%= f.submit t(".deliver"),  class: "button alert", data: { confirm: t(".confirm_deliver") } %>
+        <%= f.submit t(".deliver"), class: "button button__sm button__secondary", data: { confirm: t(".confirm_deliver") } %>
         <% end %>
       </div>
-    </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,27 +1,34 @@
 <% add_decidim_page_title(t(".preview")) %>
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".preview" %></h2>
-  </div>
-  <div class="card-section">
-    <dl>
-      <dt><%= t ".subject" %></dt>
-      <dd><%= @email.subject %></dd>
-      <dt><%= t("models.newsletter.fields.sent_to", scope: "decidim.admin") %></dt>
-      <dd><%= selective_newsletter_to newsletter %></dd>
-    </dl>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".preview" %>
+  </h2>
+</div>
+<div class="form__wrapper">
+  <div class="card">
+    <div class="card-section p-4">
+      <div class="row column">
+        <dl>
+          <dt class="font-bold"><%= t ".subject" %></dt>
+          <dd><%= @email.subject %></dd>
+          <dt class="font-bold"><%= t("models.newsletter.fields.sent_to", scope: "decidim.admin") %></dt>
+          <dd><%= selective_newsletter_to newsletter %></dd>
+        </dl>
 
-    <iframe src="<%= preview_newsletter_path(@newsletter) %>" class="email-preview">
-    </iframe>
+        <iframe src="<%= preview_newsletter_path(@newsletter) %>" class="email-preview w-full">
+        </iframe>
+      </div>
+    </div>
   </div>
 </div>
-<div class="button--double form-general-submit">
+<div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
   <% if allowed_to?(:update, :newsletter, newsletter: @newsletter) %>
-    <% if  !@newsletter.sent? %>
-      <%= link_to t("actions.edit", scope: "decidim.admin"), [:edit, @newsletter], class: "button" %>
+    <% unless @newsletter.sent? %>
+      <%= link_to t("actions.edit", scope: "decidim.admin"), [:edit, @newsletter], class: "button button__sm button__secondary" %>
     <% end %>
+    <%= link_to t(".send_me_a_test_email"), send_to_user_newsletter_path(@newsletter), class: "button button__sm button__secondary hollow", method: :post %>
     <% unless @newsletter.sent? %>
-      <%= link_to t(".select_recipients_to_deliver"), select_recipients_to_deliver_newsletter_path(@newsletter), class: "button alert" %>
+      <%= link_to t(".select_recipients_to_deliver"), select_recipients_to_deliver_newsletter_path(@newsletter), class: "button button__sm button__secondary alert" %>
     <% end %>
   <% end %>
 </div>

data/app/views/decidim/admin/officializations/_show_email_modal.html.erb

@@ -1,31 +1,30 @@
-<div class="reveal" id="show-email-modal" data-reveal>
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".title") %></h3>
-    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>"
-      type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-
-  <div class="row">
-    <div class="columns medium-4 medium-centered">
-      <p><%= t(".description") %></p>
+<%= decidim_modal id: "show-email-modal" do %>
+  <div data-dialog-container>
+    <%= icon "information-line" %>
+    <h3 class="h3" id="dialog-title-show-email-modal" tabindex="-1" data-dialog-title>
+      <%= t(".title") %>
+    </h3>
+    <div id="dialog-desc-show-email-modal" class="my-8">
+      <%= t(".description") %>
 
       <div class="show_email">
         <h4><%= t(".full_name") %></h4>
-        <div><p id="user_full_name"></p></div>
-        <h4><%= t(".email_address") %></h4>
+        <div>
+          <p id="user_full_name"></p>
+        </div>
+        <h4>
+          <%= t(".email_address") %>
+        </h4>
         <div>
           <p id="user_email"></p>
           <p><%= t(".hidden") %></p>
         </div>
       </div>
-
-      <div class="button--double form-general-submit">
-        <button class="button" data-open="user_email" data-open-url="">
-          <%= t(".show") %>
-        </button>
-      </div>
     </div>
   </div>
-</div>
+  <div data-dialog-actions>
+    <button class="button button__sm button__secondary" data-open="user_email" data-remote-url="">
+      <%= t(".show") %>
+    </button>
+  </div>
+<% end %>

data/app/views/decidim/admin/officializations/index.html.erb

@@ -1,70 +1,63 @@
 <% add_decidim_page_title(t("decidim.admin.titles.participants")) %>
-<div class="card with-overflow" id='user-groups'>
-  <div class="card-divider">
-    <h2 class="card-title"><%= t "decidim.admin.titles.participants" %></h2>
+<div class="card" id="user-groups">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title"><%= t "decidim.admin.titles.participants" %></h2>
   </div>
   <%= admin_filter_selector %>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th><%= sort_link(query, :name, t(".name"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :nickname, t(".nickname"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :created_at, t(".created_at"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :officialized_at, t(".status"), default_order: :desc) %></th>
-            <th><%= t(".badge") %></th>
-            <th><%= sort_link(query, :user_moderation_report_count, t(".reports"), default_order: :desc) %></th>
-            <th><%= t(".actions") %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @users.each do |user| %>
-            <tr data-user-id="<%= user.id %>">
-              <% if user.nickname.present? %>
-                <td><%= link_to user.name, decidim.profile_path(user.nickname) %></td>
-                <td><%= link_to user.nickname, decidim.profile_path(user.nickname) %></td>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+      <tr>
+        <th><%= sort_link(query, :name, t(".name"), default_order: :desc) %></th>
+        <th><%= sort_link(query, :nickname, t(".nickname"), default_order: :desc) %></th>
+        <th><%= sort_link(query, :created_at, t(".created_at"), default_order: :desc) %></th>
+        <th><%= sort_link(query, :officialized_at, t(".status"), default_order: :desc) %></th>
+        <th><%= t(".badge") %></th>
+        <th><%= sort_link(query, :user_moderation_report_count, t(".reports"), default_order: :desc) %></th>
+        <th><%= t(".actions") %></th>
+      </tr>
+      </thead>
+      <tbody>
+      <% @users.each do |user| %>
+        <tr data-user-id="<%= user.id %>">
+          <td><%= link_to_if user.nickname.present?, user.name, decidim.profile_path(user.nickname) %></td>
+          <td><%= link_to_if user.nickname.present?, user.nickname, decidim.profile_path(user.nickname) %></td>
+          <td><%= l user.created_at, format: :short %></td>
+          <td><%= user.officialized? ? t(".officialized") : t(".not_officialized") %></td>
+          <td><%= translated_attribute(user.officialized_as) %></td>
+          <td><%= user.report_count %></td>
+
+          <td class="table-list__actions">
+            <% if allowed_to?(:block, :admin_user, user: user) %>
+              <% if user.blocked? %>
+                <%= icon_link_to "forbid-2-line", user_block_path(user_id: user.id), t(".unblock"), class: "action-icon action-icon--disabled", method: :delete %>
               <% else %>
-                <td><%= user.name %></td>
-                <td><%= user.nickname %></td>
+                <%= icon_link_to "forbid-2-line", new_user_block_path(user_id: user.id), t(".block"), class: "action-icon action-icon" %>
               <% end %>
-              <td><%= l user.created_at, format: :short %></td>
-              <td><%= user.officialized? ? t(".officialized") : t(".not_officialized") %></td>
-              <td><%= translated_attribute(user.officialized_as) %></td>
-              <td><%= user.report_count %></td>
-
-              <td class="table-list__actions">
-                <% if allowed_to?(:block, :admin_user, user: user) %>
-                  <% if user.blocked? %>
-                    <%= icon_link_to "ban", user_block_path(user_id: user.id), t(".unblock"), class: "action-icon action-icon--disabled", method: :delete %>
-                  <% else %>
-                    <%= icon_link_to "ban", new_user_block_path(user_id: user.id), t(".block"), class: "action-icon action-icon" %>
-                  <% end %>
-                <% end %>
-                <% if allowed_to? :show_email, :user, user: user %>
-                  <%= icon_link_to "envelope-open", show_email_officialization_path(user_id: user.id), t(".show_email"), class: "action-icon action-icon--show-email", data: { full_name: user.name, toggle: "show-email-modal" } %>
-                <% end %>
-                <% unless user.blocked? %>
-                  <% unless current_user == user %>
-                    <%= icon_link_to "envelope-closed", current_or_new_conversation_path_with(user), t("decidim.contact"), class:"action-icon--new" %>
-                  <% end %>
-                  <% if user.officialized? %>
-                    <%= icon "circle-check", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".officialize") %>
-                    <%= icon_link_to "pencil", new_officialization_path(user_id: user.id), t(".reofficialize"), class: "action-icon--new" %>
-                    <%= icon_link_to "circle-x", officialization_path(user.id), t(".unofficialize"), method: :delete, class: "action-icon--reject" %>
-                  <% else %>
-                    <%= icon_link_to "circle-check", new_officialization_path(user_id: user.id), t(".officialize"), class: "action-icon--verify" %>
-                    <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".reofficialize") %>
-                    <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".unofficialize") %>
-                  <% end %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate @users, theme: "decidim" %>
-    </div>
+            <% end %>
+            <% if allowed_to? :show_email, :user, user: user %>
+              <%= icon_link_to "mail-open-line", show_email_officialization_path(user_id: user.id), t(".show_email"), class: "action-icon action-icon--show-email", data: { full_name: user.name, dialog_open: "show-email-modal" } %>
+            <% end %>
+            <% unless user.blocked? %>
+              <% unless current_user == user %>
+                <%= icon_link_to "mail-line", current_or_new_conversation_path_with(user), t("decidim.contact"), class: "action-icon--new" %>
+              <% end %>
+              <% if user.officialized? %>
+                <%= icon "checkbox-circle-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".officialize") %>
+                <%= icon_link_to "pencil-line", new_officialization_path(user_id: user.id), t(".reofficialize"), class: "action-icon--new" %>
+                <%= icon_link_to "delete-bin-line", officialization_path(user.id), t(".unofficialize"), method: :delete, class: "action-icon--reject" %>
+              <% else %>
+                <%= icon_link_to "checkbox-circle-line", new_officialization_path(user_id: user.id), t(".officialize"), class: "action-icon--verify" %>
+                <%= icon "pencil-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".reofficialize") %>
+                <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".unofficialize") %>
+              <% end %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
+<%= decidim_paginate @users %>
 <%= render "show_email_modal" %>

data/app/views/decidim/admin/officializations/new.html.erb

@@ -1,19 +1,27 @@
 <% add_decidim_page_title(t(".title", name: user.name)) %>
-<h2 class="process-title-summary">
-  <%= t(".title", name: user.name) %>
-</h2>
-
-<%= decidim_form_for(@form, html: { class: "form new_officialization" }, url: officializations_path, method: :post) do |f| %>
-  <div class="card">
-    <div class="card-section">
-      <div class="row column">
-        <%= f.hidden_field :user_id %>
-        <%= f.translated :text_field, :officialized_as, label: t(".badge") %>
-      </div>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title", name: user.name) %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <div class="form__wrapper">
+      <%= decidim_form_for(@form, html: { class: "form form-defaults new_officialization" }, url: officializations_path, method: :post) do |f| %>
+        <div class="card pt-4">
+          <div class="card-section">
+            <div class="row column">
+              <%= f.hidden_field :user_id %>
+              <%= f.translated :text_field, :officialized_as, label: t(".badge") %>
+            </div>
+          </div>
+        </div>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <%= f.submit t(".officialize"), class: "button button__sm button__secondary" %>
+          </div>
+        </div>
+      <% end %>
     </div>
   </div>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".officialize") %>
-  </div>
-<% end %>
+</div>

data/app/views/decidim/admin/officializations/show_email.html.erb

@@ -1,2 +1 @@
 <%= link_to user.email, "mailto:#{user.email}" %>
-<script>$("#show-email-modal button[data-open=user_email]").hide()</script>

data/app/views/decidim/admin/organization/_form.html.erb

@@ -1,108 +1,94 @@
-<div class="row">
-  <div class="columns xlarge-6">
-    <%= form.text_field :name %>
-  </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <div class="columns">
+          <%= form.text_field :name %>
+        </div>
 
-  <div class="columns xlarge-6">
-    <div class="label--tabs">
-      <label for="organization_social_handlers">
-        <%= t(".social_handlers") %>
-      </label>
-      <ul class="tabs tabs--lang" data-tabs id="organization_social_handlers">
-        <% Decidim::Organization::SOCIAL_HANDLERS.each do |handler| %>
-          <li class="tabs-title <% if handler == Decidim::Organization::SOCIAL_HANDLERS.first %> is-active <% end %>">
-            <a href="#<%= handler %>" <% if handler == Decidim::Organization::SOCIAL_HANDLERS.first %> aria-selected="true" <% end %>>
-              <%= t(".#{handler}") %>
-            </a>
-          </li>
-        <% end %>
-      </ul>
-    </div>
-    <div class="tabs-content" data-tabs-content="organization_social_handlers">
-      <% Decidim::Organization::SOCIAL_HANDLERS.each do |handler| %>
-        <div class="tabs-panel <% if handler == Decidim::Organization::SOCIAL_HANDLERS.first %> is-active <% end %>" id="<%= handler %>">
-          <%= form.text_field "#{handler}_handler", label: false %>
+        <div class="columns">
+          <div class="label--tabs">
+            <label for="organization_social_handlers">
+              <%= t(".social_handlers") %>
+            </label>
+            <ul class="tabs tabs--lang" data-tabs id="organization_social_handlers">
+              <% Decidim::Organization::SOCIAL_HANDLERS.each do |handler| %>
+                <li class="tabs-title <% if handler == Decidim::Organization::SOCIAL_HANDLERS.first %> is-active <% end %>">
+                  <a href="#<%= handler %>" <% if handler == Decidim::Organization::SOCIAL_HANDLERS.first %> aria-selected="true" <% end %>>
+                    <%= t(".#{handler}") %>
+                  </a>
+                </li>
+              <% end %>
+            </ul>
+          </div>
+          <div class="tabs-content" data-tabs-content="organization_social_handlers">
+            <% Decidim::Organization::SOCIAL_HANDLERS.each do |handler| %>
+              <div class="tabs-panel <% if handler == Decidim::Organization::SOCIAL_HANDLERS.first %> is-active <% end %>" id="<%= handler %>">
+                <%= form.text_field "#{handler}_handler", label: false %>
+              </div>
+            <% end %>
+          </div>
         </div>
-      <% end %>
-    </div>
-  </div>
-</div>
+      </div>
 
-<div class="row column">
-  <%= form.collection_select :default_locale, localized_locales(current_organization.available_locales), :id, :name %>
-</div>
+      <div class="row column">
+        <%= form.collection_select :default_locale, localized_locales(current_organization.available_locales), :id, :name %>
+      </div>
 
-<div class="row column">
-  <%= form.time_zone_select :time_zone %>
-</div>
+      <div class="row column">
+        <%= form.time_zone_select :time_zone %>
+      </div>
 
-<div class="row">
-  <div class="columns xlarge-6">
-    <%= form.text_field :reference_prefix %>
-  </div>
-</div>
+      <div class="row column">
+        <%= form.text_field :reference_prefix %>
+      </div>
 
-<div class="row">
-  <div class="columns xlarge-6">
-    <%= form.check_box :badges_enabled %>
-  </div>
-</div>
+      <div class="row column">
+        <%= form.check_box :badges_enabled %>
+      </div>
 
-<div class="row">
-  <div class="columns xlarge-6">
-    <%= form.check_box :user_groups_enabled %>
-  </div>
-</div>
+      <div class="row column">
+        <%= form.check_box :user_groups_enabled %>
+      </div>
 
-<div class="row">
-  <div class="columns xlarge-6">
-    <%= form.check_box :enable_participatory_space_filters %>
-  </div>
-</div>
+      <div class="row column">
+        <%= form.check_box :enable_participatory_space_filters %>
+      </div>
 
-<% if Decidim.config.enable_machine_translations %>
-  <div class="row">
-    <div class="columns xlarge-6">
-      <%= form.check_box :enable_machine_translations %>
-    </div>
-  </div>
+      <% if Decidim.config.enable_machine_translations %>
+        <div class="row column">
+          <%= form.check_box :enable_machine_translations %>
+        </div>
 
-  <div class="row">
-    <div class="columns xlarge-6">
-      <%= form.label :machine_translation_display_priority, t("activemodel.attributes.organization.machine_translation_display_priority") %>
-      <%= form.collection_radio_buttons :machine_translation_display_priority, form.object.machine_translation_priorities, :first, :last %>
-    </div>
-  </div>
-<% end %>
+        <div class="row column">
+          <%= form.label :machine_translation_display_priority, t("activemodel.attributes.organization.machine_translation_display_priority") %>
+            <%= form.collection_radio_buttons :machine_translation_display_priority, form.object.machine_translation_priorities, :first, :last %>
+        </div>
+      <% end %>
 
-<div class="row">
-  <div class="columns xlarge-6">
-    <%= form.text_field :comments_max_length %>
-  </div>
-</div>
+      <div class="row column">
+        <%= form.text_field :comments_max_length %>
+      </div>
 
-<div class="row">
-  <div class="columns xlarge-6">
-    <%= form.check_box :rich_text_editor_in_public_views, help_text: t(".rich_text_editor_in_public_views_help") %>
-  </div>
-</div>
+      <div class="row column">
+        <%= form.check_box :rich_text_editor_in_public_views, help_text: t(".rich_text_editor_in_public_views_help") %>
+      </div>
+
+      <div class="row column" id="welcome-notification-details">
+        <%= form.check_box :send_welcome_notification %>
+        <div class="send-welcome-notification-details">
+          <%= form.check_box :customize_welcome_notification %>
 
-<div class="row" id="welcome-notification-details">
-  <div class="columns xlarge-6">
-    <%= form.check_box :send_welcome_notification %>
-    <div class="send-welcome-notification-details">
-      <%= form.check_box :customize_welcome_notification %>
+          <div class="customize-welcome-notification-details">
+            <%= form.translated :text_field, :welcome_notification_subject, aria: { label: :welcome_notification_subject } %>
+            <%= form.translated :editor, :welcome_notification_body, aria: { label: :welcome_notification_body } %>
+          </div>
+        </div>
+      </div>
 
-      <div class="customize-welcome-notification-details">
-        <%= form.translated :text_field, :welcome_notification_subject %>
-        <%= form.translated :editor, :welcome_notification_body %>
+      <div class="row column">
+        <%= form.translated :editor, :admin_terms_of_service_body, aria: { label: :admin_terms_of_service_body } %>
       </div>
     </div>
   </div>
 </div>
-
-<div class="row">
-  <div class="columns xlarge-6">
-    <%= form.translated :editor, :admin_terms_of_use_body %>
-  </div>
-</div>