decidim-sortitions 0.27.4 → 0.28.0.rc5

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

@@ -1,12 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<h2 class="process-title-summary">
-  <%= t ".title" %>
-</h2>
-
-<%= decidim_form_for(@form, html: { class: "form new_sortition" }) do |f| %>
-  <%= render partial: "form", object: f %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create"), data: { confirm: t(".confirm") } %>
+<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, html: { class: "form-defaults form new_sortition" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".create"), data: { confirm: t(".confirm") }, class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,56 +1,52 @@
 <% add_decidim_page_title(translated_attribute(sortition.title)) %>
 <div class="card" id="sortition">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= decidim_html_escape(translated_attribute(sortition.title)) %>
     </h2>
   </div>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list sortition">
-        <thead>
-          <tr>
-            <th><%= t("models.sortition.fields.request_timestamp", scope: "decidim.sortitions.admin") %></th>
-            <th><%= t("models.sortition.fields.dice", scope: "decidim.sortitions.admin") %></th>
-            <th><%= t("models.sortition.fields.target_items", scope: "decidim.sortitions.admin") %></th>
-            <th><%= t("models.sortition.fields.category", scope: "decidim.sortitions.admin") %></th>
-            <th><%= t("models.sortition.fields.decidim_proposals_component", scope: "decidim.sortitions.admin") %></th>
-            <th><%= t("models.sortition.fields.seed", scope: "decidim.sortitions.admin") %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td><%= l sortition.request_timestamp, format: :long %></td>
-            <td><%= sortition.dice %></td>
-            <td><%= sortition.target_items %></td>
-            <td><%= sortition_category sortition %></td>
-            <td><%= translated_attribute sortition.decidim_proposals_component.name %></td>
-            <td><%= sortition.seed %></td>
-            <td></td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
+  <div class="table-scroll">
+    <table class="table-list sortition">
+      <thead>
+        <tr>
+          <th><%= t("models.sortition.fields.request_timestamp", scope: "decidim.sortitions.admin") %></th>
+          <th><%= t("models.sortition.fields.dice", scope: "decidim.sortitions.admin") %></th>
+          <th><%= t("models.sortition.fields.target_items", scope: "decidim.sortitions.admin") %></th>
+          <th><%= t("models.sortition.fields.category", scope: "decidim.sortitions.admin") %></th>
+          <th><%= t("models.sortition.fields.decidim_proposals_component", scope: "decidim.sortitions.admin") %></th>
+          <th><%= t("models.sortition.fields.seed", scope: "decidim.sortitions.admin") %></th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><%= l sortition.request_timestamp, format: :long %></td>
+          <td><%= sortition.dice %></td>
+          <td><%= sortition.target_items %></td>
+          <td><%= sortition_category sortition %></td>
+          <td><%= translated_attribute sortition.decidim_proposals_component.name %></td>
+          <td><%= sortition.seed %></td>
+          <td></td>
+        </tr>
+      </tbody>
+    </table>
   </div>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list proposals">
-        <thead>
+  <div class="table-scroll">
+    <table class="table-list proposals">
+      <thead>
+        <tr>
+          <th><%= t ".selected_proposals" %></th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% sortition.proposals.each do |proposal| %>
           <tr>
-            <th><%= t ".selected_proposals" %></th>
-            <th></th>
+            <td><%= decidim_html_escape(present(proposal).title).html_safe %></td>
+            <td></td>
           </tr>
-        </thead>
-        <tbody>
-          <% sortition.proposals.each do |proposal| %>
-            <tr>
-              <td><%= decidim_html_escape(present(proposal).title).html_safe %></td>
-              <td></td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>

data/app/views/decidim/sortitions/sortitions/_proposal.html.erb

@@ -1 +1 @@
-<%= card_for proposal %>
+<%= card_for proposal, url_extra_params: { included_in: sortition.to_gid } %>

data/app/views/decidim/sortitions/sortitions/_results_count.html.erb

@@ -1,8 +1,8 @@
-<div id="sortition-<%= sortition.id %>-results-count" class="card__support__data">
-  <span class="extra__suport-number">
+<div id="sortition-<%= sortition.id %>-results-count">
+  <span class="sortition__aside__count-number">
     <%= sortition.selected_proposals.count %>
   </span>
-  <span class="extra__suport-text">
+  <span class="sortition__aside__count-text">
     <%= t(".count", count: sortition.selected_proposals.count) %>
   </span>
 </div>

data/app/views/decidim/sortitions/sortitions/_sortitions.html.erb

@@ -1,14 +1,13 @@
-<div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
-  <div class="column">
-    <%= order_selector available_orders, i18n_scope: "decidim.sortitions.sortitions.orders" %>
-  </div>
+<% if @sortitions.any? %>
+  <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.sortitions.sortitions.sortitions_count", count: @sortitions.total_count) %></h2>
+
+  <%= order_selector available_orders, i18n_scope: "decidim.sortitions.sortitions.orders" %>
 
-  <div class="column">
-    <%= render partial: "decidim/shared/results_per_page" %>
+  <div class="card__list-list">
+    <%= render @sortitions %>
   </div>
-</div>
 
-<div class="row small-up-1 medium-up-2 card-grid">
-  <%= render @sortitions %>
-</div>
-<%= decidim_paginate @sortitions %>
+  <%= decidim_paginate @sortitions %>
+<% else %>
+  <%= cell "decidim/announcement", t("empty", scope: "decidim.sortitions.sortitions.index") %>
+<% end %>

data/app/views/decidim/sortitions/sortitions/_tags.html.erb

@@ -1,4 +1,3 @@
-
 <ul class="tags tags--sortition">
   <li>
     <%= link_to t("filters.active", scope: "decidim.sortitions.sortitions"),

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

@@ -1,18 +1,15 @@
-<div class="row columns">
-  <div class="title-action">
-    <h2 id="sortitions-count" class="title-action__title section-heading">
-      <%= render partial: "sortitions_count" %>
-    </h2>
-  </div>
-</div>
-<div class="row">
-  <div class="columns mediumlarge-4 large-3">
-    <%= render partial: "filters_small_view" %>
-    <div class="card card--secondary show-for-mediumlarge">
-      <%= render partial: "filters" %>
-    </div>
-  </div>
-  <div id="sortitions" class="columns mediumlarge-8 large-9" aria-live="polite">
+<% add_decidim_page_title component_name %>
+
+<% content_for :aside do %>
+  <h1 class="title-decorator"><%= component_name %></h1>
+
+  <%= render layout: "decidim/shared/filters", locals: { filter_sections: filter_sections_sortitions, search_variable: :search_text_cont, skip_to_id: "sortitions" } do %>
+    <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
+  <% end %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+  <section id="sortitions" class="layout-main__section layout-main__heading">
     <%= render partial: "sortitions" %>
-  </div>
-</div>
+  </section>
+<% end %>

data/app/views/decidim/sortitions/sortitions/index.js.erb

@@ -1,10 +1,5 @@
 var $sortitions = $('#sortitions');
-var $sortitionsCount = $('#sortitions-count');
 var $orderFilterInput = $('.order_filter');
 
 $sortitions.html('<%= j(render partial: "sortitions").strip.html_safe %>');
-$sortitionsCount.html('<%= j(render partial: "sortitions_count").strip.html_safe %>');
 $orderFilterInput.val('<%= order %>');
-
-var $dropdownMenu = $('.dropdown.menu', $sortitions);
-$dropdownMenu.foundation();

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

@@ -1,139 +1,144 @@
 <% add_decidim_meta_tags({
-  description: decidim_sanitize_editor(translated_attribute(sortition.additional_info)),
-  title: decidim_html_escape(translated_attribute(sortition.title)),
-  url: sortition_url(sortition.to_param)
-}) %>
+                           description: decidim_sanitize_editor(translated_attribute(sortition.additional_info)),
+                           title: decidim_html_escape(translated_attribute(sortition.title)),
+                           url: sortition_url(sortition.to_param)
+                         }) %>
 
-<div class="row column">
-  <div class="callout success">
-    <p><%= t ".introduction", reference: sortition.id, target_items: sortition.target_items %></p>
-  </div>
-</div>
+<%
+edit_link(
+  resource_locator(sortition).edit,
+  :update,
+  :sortition,
+  sortition:
+)
+%>
 
-<div class="row column view-header">
+<%= append_javascript_pack_tag "decidim_sortitions" %>
+<%= append_stylesheet_pack_tag "decidim_sortitions" %>
 
-  <div class="m-bottom">
-    <%= link_to :sortitions, class: "small hollow" do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= t(".back") %>
-    <% end %>
-  </div>
+<%= render layout: "layouts/decidim/shared/layout_item", locals: { back_path: :sortitions, commentable: sortition } do %>
+  <%= cell("decidim/announcement", t("introduction", scope: "decidim.sortitions.sortitions.show", reference: sortition.id, target_items: sortition.target_items), callout_class: "secondary") %>
 
-  <h2 class="heading2"><%= decidim_html_escape(translated_attribute(sortition.title)) %></h2>
-  <div class="author-data">
-    <%= render partial: "sortition_author", locals: { sortition: sortition } %>
-  </div>
-</div>
-
-<div class="row">
-  <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
-    <div class="card extra">
-      <div class="card__content">
-        <%= render partial: "results_count", locals: { sortition: sortition } %>
-      </div>
+  <section class="layout-main__section layout-main__heading">
+    <h1 class="h1 decorator mb-4">
+      <%= decidim_html_escape(translated_attribute(sortition.title)) %>
+    </h1>
+    <div class="layout-author">
+      <%= cell "decidim/author", present(sortition.author), context_actions: [:date], from: sortition, layout: :compact %>
+      <% if sortition.author&.deleted? %>
+        <span class="label alert">
+          <%= t("deleted", scope: "decidim.sortitions.sortitions.sortition_author") %>
+        </span>
+      <% end %>
     </div>
-    <%= resource_reference(sortition) %>
-    <%= render partial: "decidim/shared/share_modal" %>
-    <%= embed_modal_for sortition_widget_url(sortition, format: :js) %>
-  </div>
-
-  <div class="columns mediumlarge-8 mediumlarge-pull-4">
-    <div class="section">
+  </section>
+  <section class="layout-main__section">
+    <div class="editor-content">
       <%= decidim_sanitize_editor_admin translated_attribute sortition.additional_info %>
     </div>
-  </div>
-</div>
-
-<% if sortition.cancelled? %>
-<div class="row column">
-  <div class="title-action">
-    <h2 class="title-action__title section-heading"><%= t ".cancelled" %></h2>
-  </div>
-  <div class=section>
-    <div class="author-data">
-      <%= render partial: "sortition_cancel_author", locals: { sortition: sortition } %>
+  </section>
+  <section class="layout-main__section">
+    <h2 class="h3">
+      <%= t("witnesses", scope: "decidim.sortitions.sortitions.show") %>
+    </h2>
+    <div class="editor-content">
+      <%= decidim_sanitize_editor translated_attribute sortition.witnesses %>
     </div>
-  </div>
-  <div class=section>
-    <%= decidim_sanitize_editor translated_attribute sortition.cancel_reason %>
-  </div>
-</div>
-<% end %>
+  </section>
 
-<div class="row column">
-  <div class="title-action">
-    <h2 class="title-action__title section-heading"><%= t ".witnesses" %></h2>
-  </div>
-  <div class="section">
-    <%= decidim_sanitize_editor translated_attribute sortition.witnesses %>
-  </div>
-</div>
+  <% if sortition&.proposals %>
+    <section class="layout-main__section">
+      <h2 id="proposals-count" class="h3 mb-4">
+        <%= t("proposals_selected_by_sortition", scope: "decidim.sortitions.sortitions.show") %>
+      </h2>
+      <div id="proposals">
+        <%= render partial: "proposal", collection: sortition.proposals %>
+      </div>
+    </section>
+  <% end %>
 
-<% if sortition&.proposals %>
-  <div class="row columns">
-    <div class="title-action">
-      <h2 id="proposals-count" class="title-action__title section-heading">
-        <%= t ".proposals_selected_by_sortition" %>
+  <% if sortition.cancelled? %>
+    <section class="layout-main__section">
+      <h2 class="h3 mt-8 mb-4">
+        <%= t("cancelled", scope: "decidim.sortitions.sortitions.show") %>
       </h2>
-    </div>
-    <div class="row">
-      <div id="proposals" class="columns mediumlarge-12 large-12">
-        <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
-          <%= render partial: "proposal", collection: sortition.proposals %>
-        </div>
+      <div class="layout-author">
+        <%= cell "decidim/author", present(sortition.cancelled_by_user), context_actions: [:cancelled_on], from: sortition, layout: :compact %>
+        <% if sortition.cancelled_by_user&.deleted? %>
+          <span class="label alert">
+            <%= t("deleted", scope: "decidim.sortitions.sortitions.sortition_author") %>
+          </span>
+        <% end %>
       </div>
-    </div>
-  </div>
-<% end %>
+      <%= cell("decidim/announcement", decidim_sanitize_editor(translated_attribute(sortition.cancel_reason)), callout_class: "alert") %>
+    </section>
+  <% end %>
 
-<div class="row column">
-  <section class="extended" id="sortition-details">
-    <div class="row column">
-      <h4 class="section-heading"><%= t ".sortition_reproducibility_details" %></h4>
-    </div>
-    <div class=row>
-      <div class="columns small-centered mediumlarge-12 large-12 sortition-details">
-        <div class="sortition-details-item">
-          <span class="sortition-details-title sortition-details-text"><%= t ".dice_result" %></span>
-          <span class=sortition-details-text><%= sortition.dice %></span>
-        </div>
+  <section class="layout-main__section layout-main__buttons" data-buttons>
+    <%= cell "decidim/comments_button", nil %>
+  </section>
 
-        <div class="sortition-details-item">
-          <span class="sortition-details-title sortition-details-text"><%= t ".time_seed" %></span>
-          <span class=sortition-details-text><%= sortition.request_timestamp.to_i %></span>
+  <% content_for :aside do %>
+    <section class="layout-aside__section">
+      <%= render partial: "results_count", locals: { sortition: } %>
+    </section>
+    <section class="layout-aside__section">
+      <div class="text-sm text-gray-2 uppercase font-semibold mb-4 ">
+        <%= t("sortition_reproducibility_details", scope: "decidim.sortitions.sortitions.show") %>
+      </div>
+      <div class="sortition__aside-element bg-background p-4 rounded">
+        <div class="sortition__aside-element-item">
+          <span class="sortition__aside-element-item__title">
+            <%= t("dice_result", scope: "decidim.sortitions.sortitions.show") %>
+          </span>
+          <span class="sortition__aside-element-item__text">
+            <%= sortition.dice %>º
+          </span>
         </div>
-
-        <div class="sortition-details-item">
-          <span class="sortition-details-title sortition-details-text"><%= t ".mathematical_result" %></span>
-          <span class=sortition-details-text><%= sortition.seed %></span>
+        <div class="sortition__aside-element-item">
+          <span class="sortition__aside-element-item__title">
+            <%= t("time_seed", scope: "decidim.sortitions.sortitions.show") %>
+          </span>
+          <span class="sortition__aside-element-item__text">
+            <%= sortition.request_timestamp.to_i %>
+          </span>
         </div>
-
-        <div class="sortition-details-item">
-          <span class="sortition-details-title sortition-details-text"><%= t ".algorithm" %></span><br>
-          <span class=sortition-details-text>
-            <%= link_to Decidim::Sortitions.sortition_algorithm,
-                        Decidim::Sortitions.sortition_algorithm,
-                        target: "_blank",
-                        title: t(".algorithm") %>
+        <div class="sortition__aside-element-item">
+          <span class="sortition__aside-element-item__title">
+            <%= t("mathematical_result", scope: "decidim.sortitions.sortitions.show") %>
           </span>
+          <span class="sortition__aside-element-item__text">
+            <%= sortition.seed %>
+          </span>
+        </div>
+        <div class="sortition__aside-element-item">
+          <%= link_to t("algorithm", scope: "decidim.sortitions.sortitions.show"), Decidim::Sortitions.sortition_algorithm, class: "text-secondary sortition__aside-element-item__title underline" %>
         </div>
       </div>
-    </div>
-  </section>
-
-  <section class=extended>
-    <div class="row column">
-      <h4 class="section-heading"><%= t ".candidate_proposal_ids" %></h4>
-    </div>
-    <div class="row columns">
-      <%= t ".candidate_proposals_info", category_label: sortition_category_label(sortition) %>:
-    </div>
-    <div class=row>
-      <div class="columns small-centered mediumlarge-12 large-12">
-        <%= sortition_proposal_candidate_ids sortition %>
+    </section>
+    <section class="layout-aside__section">
+      <div class="text-sm text-gray-2 uppercase font-semibold mb-4">
+        <%= t("candidate_proposal_ids", scope: "decidim.sortitions.sortitions.show") %>
       </div>
-    </div>
-  </section>
-</div>
-
-<%= comments_for sortition %>
+      <div class="sortition__aside-element bg-background p-4 rounded">
+        <div class="sortition__aside-element-item">
+          <span class="sortition__aside-element-item__title">
+            <%= t("candidate_proposals_info", scope: "decidim.sortitions.sortitions.show", category_label: sortition_category_label(sortition)) %>
+          </span>
+          <span class="sortition__aside-element-item__numbers">
+            <%= sortition_proposal_candidate_ids sortition %>
+          </span>
+        </div>
+      </div>
+    </section>
+    <section class="layout-aside__section actions__secondary">
+      <%= cell "decidim/share_button", nil %>
+    </section>
+  <% end %>
+  <% content_for :item_footer do %>
+    <%= comments_for sortition %>
+    <ul class="metadata__container layout-main__section" data-metadata-footer>
+      <%= content_tag :li, resource_reference(sortition), class: "metadata__item" %>
+    </ul>
+  <% end %>
+<% end %>

data/config/environment.rb

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

data/config/locales/ar.yml

@@ -40,7 +40,6 @@ ar:
         actions:
           destroy: إلغاء الفرز
           edit: تعديل
-          new: فرز جديد
           show: تفاصيل الفرز
         models:
           sortition:
@@ -54,13 +53,6 @@ ar:
               seed: بذرة
               target_items: عناصر للاختيار
               title: عنوان
-            name:
-              zero: Sortitions
-              one: Sortition
-              two: Sortitions
-              few: Sortitions
-              many: Sortitions
-              other: Sortitions
         sortitions:
           confirm_destroy:
             confirm_destroy: هل أنت متأكد أنك تريد إلغاء هذا التصنيف؟
@@ -68,17 +60,12 @@ ar:
             title: إلغاء التصنيف
           create:
             error: كانت هناك مشكلة في إنشاء فرز جديد.
-            success: تم إنشاء التصنيف بنجاح
-          destroy:
-            error: لا يمكن إلغاء التصنيف.
-            success: تم الغاء التصنيف بنجاح
           edit:
             title: تحديث المعلومات حول الفرز
             update: تحديث
           form:
             all_categories: جميع الفئات
             select_proposal_component: حدد مجموعة المقترحات
-            title: ترتيب جديد للمقترحات
           index:
             title: Sortitions
           new:
@@ -88,7 +75,6 @@ ar:
             selected_proposals: مقترحات مختارة للقرعة
           update:
             error: حدثت مشكلة أثناء تحديث التصنيف.
-            success: تم تحديث التصنيف بنجاح
       admin_log:
         sortition:
           create: "%{user_name} خلق %{resource_name} التصنيف في %{space_name}"
@@ -108,14 +94,7 @@ ar:
           all: الكل
           cancelled: ألغيت
           category: الفئة
-          category_prompt: اختر تصنيف
-          search: بحث
           state: الحالة
-        filters_small_view:
-          close_modal: إغلاق مشروط
-          filter: منقي
-          filter_by: مصنف بواسطة
-          unfold: كشف
         linked_sortitions:
           selected_proposals: مقترحات مختارة
         orders:
@@ -137,12 +116,12 @@ ar:
           candidate_proposal_ids: ترتيب المقترحات الترتيب ومعرفات
           candidate_proposals_info: 'تم تنفيذ التصنيف بين المقترحات التالية (%{category_label}) ، مع المعرفات التالية (بالخط العريض للمقترحات المختارة)  '
           category: من %{category} الفئة
-          dice_result: "(1) نتيجة النرد"
+          dice_result: (1) نتيجة النرد
           introduction: 'تحتوي هذه الصفحة على نتائج الفرز %{reference}. من خلال هذا sortition، %{target_items} تم اختيارها عشوائيا عدد من النتائج ومع التوزيع الاحتمالي على قدم المساواة من مجموعة من المقترحات المعروضة رفع الصوت عاليا. جنبًا إلى جنب مع النتائج ، توفر المعلومات المعروضة على هذه الصفحة جميع المعلومات المطلوبة لزيادة الضمانات وإعادة إنتاج النتائج. المفتاح لجودة هذا الفرز هو العشوائية المزدوجة التي يوفرها المتداول من الزهر (التحقق من قبل الشهود) والوقت الدقيق للترتيب الذي يوفر مدخلات لخوارزمية يولد اختيار عشوائي. إن البذر الزمني للفرز دقيق للغاية (بالثواني) بحيث يستحيل على البشر التحكم فيه ، مما يوفر مدخلات مزدوجة "لا يمكن السيطرة عليها" لضمان نتيجة عادلة.  '
           mathematical_result: النتيجة (1) × (2)
           proposals_selected_by_sortition: مقترحات مختارة من قبل الفرز
           sortition_reproducibility_details: تفاصيل استنساخ الفرز
-          time_seed: "(2) الوقت البذور"
+          time_seed: (2) الوقت البذور
           witnesses: شهود عيان
         sortition:
           random_seed: البذور عشوائي
@@ -153,7 +132,6 @@ ar:
             few: مقترحات مختارة
             many: مقترحات مختارة
             other: مقترحات مختارة
-          view: رأي
         sortition_author:
           deleted: مشارك محذوف
         sortition_cancel_author: