decidim-decidim_awesome 0.12.4 → 0.13.1

data/app/views/decidim/decidim_awesome/admin/custom_redirects/_form.html.erb

@@ -1,21 +1,27 @@
-<div class="flex flex-col">
-    <div class="mb-6">
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
         <%= form.text_field :origin, class: "h-12 w-full" %>
         <p class="help-text">
-            <%= t(".origin_help") %>
+          <%= t(".origin_help") %>
         </p>
-    </div>
-    <div class="mb-6">
+      </div>
+      <div class="row column">
         <%= form.text_field :destination, class: "h-12 w-full" %>
         <p class="help-text">
-            <%= t(".destination_help") %>
+          <%= t(".destination_help") %>
         </p>
-    </div>
-    <%= form.check_box :active, class: "mb-6" %>
-    <div class="mb-6">
+      </div>
+      <div class="row column">
+        <%= form.check_box :active %>
+      </div>
+      <div class="row column">
         <%= form.check_box :pass_query %>
-    </div>
-    <p class="help-text">
+        <p class="help-text">
             <%= t(".pass_query_help").html_safe %>
-    </p>
+        </p>
+      </div>
+    </div>
+  </div>
 </div>

data/app/views/decidim/decidim_awesome/admin/custom_redirects/edit.html.erb

@@ -1,13 +1,17 @@
-<%= decidim_form_for(@form, url: custom_redirect_path, method: :patch, html: { class: "form-defaults form new_custom_redirect_" }) do |f| %>
-  <div class="card">
-    <div class="bg-gray-6 p-4 rounded-t">
-      <h2 class="card-title"><%= t ".title" %></h2>
-    </div>
-    <div class="card-section p-4">
+<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: custom_redirect_path, method: :patch, html: { class: "form-defaults form new_custom_redirect_" }) do |f| %>
       <%= render partial: "form", object: f %>
-    </div>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".save"), class: "button button__lg button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-  <div class="flex items-center justify-center mt-12 w-full text-white form-general-submit">
-    <%= f.submit t(".save"), class: "button button__lg button__secondary" %>
-  </div>
-<% end %>
+</div>

data/app/views/decidim/decidim_awesome/admin/custom_redirects/new.html.erb

@@ -1,13 +1,18 @@
-<%= decidim_form_for(@form, url: custom_redirects_path, html: { class: "form-defaults form new_custom_redirect_" }) do |f| %>
-  <div class="card">
-    <div class="bg-gray-6 p-4 rounded-t">
-      <h2 class="card-title"><%= t ".title" %></h2>
-    </div>
-    <div class="card-section p-4">
+<div class="item_show__header bg-gray-6 p-4 rounded-t">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form p-4">
+    <%= decidim_form_for(@form, url: custom_redirects_path, html: { class: "form-defaults form new_custom_redirect_" }) do |f| %>
       <%= render partial: "form", object: f %>
-    </div>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".save"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-  <div class="flex items-center justify-center mt-12 w-full text-white form-general-submit">
-    <%= f.submit t(".save"), class: "button button__lg button__secondary" %>
-  </div>
-<% end %>
+</div>

data/app/views/decidim/decidim_awesome/admin/shared/_filters_with_date.html.erb

@@ -1,4 +1,4 @@
-<div class="filters__section p-4 flex mb-0">
+<div class="filters__section">
   <div class="fcell filter dropdown__container">
     <!-- Label added to align the button vertically with other inputs -->
     <label class="form-label">&nbsp;</label>
@@ -17,8 +17,6 @@
     <%= search_form_for(query, url: url_for, html: { class: "form form-defaults" }) do |form| %>
       <%= hidden_field_tag :admins, params[:admins] %>
       <div class="form__wrapper">
-        <div class="card">
-          <div class="card-section">
             <div class="grid grid-cols-4 gap-x-4">
               <div class="row column search-field">
                 <%= form.label search_field_predicate, t("decidim.search.term_input_placeholder"), class: "form-label" %>
@@ -50,8 +48,6 @@
                 </button>
               </div>
             </div>
-          </div>
-        </div>
       </div>
     <% end %>
   </div>

data/app/views/decidim/decidim_awesome/map_component/map/_map_template.html.erb

@@ -69,15 +69,15 @@
   #awesome-map .dynamic-map {
     height: <%= map_height %>px;
   }
-  <% current_categories(categories).each do |category| %>
-    .awesome_map-category_<%= category[:id] %> {
-      background-color: <%= category[:color] %> !important;
+  <% current_taxonomies(taxonomies).each do |taxonomy| %>
+    .awesome_map-taxonomy_<%= taxonomy[:id] %> {
+      background-color: <%= taxonomy[:color] %> !important;
     }
   <% end %>
 </style>
 <script>
   window.AwesomeMap = window.AwesomeMap || {};
-  window.AwesomeMap.categories = <%= current_categories(categories).to_json.html_safe %>;
+  window.AwesomeMap.taxonomies = <%= current_taxonomies(taxonomies).to_json.html_safe %>;
   window.AwesomeMapProposalTexts = <%= Decidim::Proposals::ProposalState.pluck(:token).index_with { |state| t("decidim.proposals.answers.#{state}") }.to_json.html_safe %>;
   window.AwesomeMapMeetingTypes = <%= Decidim::Meetings::Meeting::TYPE_OF_MEETING.to_h { |type, _| [type, Decidim.icons.all[type.to_s]["icon"]] }.to_json.html_safe %>;
   window.AwesomeMapMeetingTexts = <%= Decidim::Meetings::Meeting::TYPE_OF_MEETING.to_h { |type, _| [type, t("decidim.meetings.meetings.filters.type_values.#{type}")] }.to_json.html_safe %>;

data/app/views/decidim/decidim_awesome/map_component/map/show.html.erb

@@ -10,7 +10,9 @@
 
   <section id="map-block" class="awesome-iframe layout-main__section">
     <%= awesome_map_for map_components do %>
-      <%= render partial: "map_template", locals: { categories: current_participatory_space.categories, map_height: current_component.settings.map_height } %>
+      <% tf = Decidim::TaxonomyFilter.where(id: current_component.settings.taxonomy_filters) %>
+      <% taxonomies = tf.map(&:root_taxonomy) %>
+      <%= render partial: "map_template", locals: { taxonomies: taxonomies, map_height: current_component.settings.map_height } %>
     <% end %>
   </section>
 </main>

data/app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb

@@ -9,7 +9,7 @@ window.DecidimAwesome.i18n = {
   "autosavedSuccess": "<%= j t(".autosaved_success") %>",
   "autosavedError": "<%= j t(".autosaved_error") %>",
   "autosavedRetrieved": "<%= j t(".autosaved_retrieved") %>",
-  "categories": "<%= j t(".categories") %>",
+  "taxonomies": "<%= j t(".taxonomies") %>",
   "hashtags": "<%= j t(".hashtags") %>",
   "proposals": "<%= j t(".proposals") %>",
   "meetings": "<%= j t(".meetings") %>",
@@ -19,7 +19,7 @@ window.DecidimAwesome.i18n = {
   "officialAuthor": "<%= j t("decidim.blogs.models.post.fields.official_blog_post") %>",
 }
 window.DecidimAwesome.formBuilderLangsLocation = "<%= decidim_decidim_awesome.form_builder_i18n_path(locale: nil) %>";
-<% if defined?(questionnaire) && questionnaire&.id %>
+<% if defined?(questionnaire) && (questionnaire rescue nil)&.id %>
   window.DecidimAwesome.current_questionnaire = "edit_questionnaire_<%= questionnaire.id %>";
   <% if defined? visitor_already_answered? %>
   window.DecidimAwesome.questionnaire_answered = <%= visitor_already_answered? %>;

data/config/i18n-tasks.yml

@@ -43,6 +43,7 @@ ignore_unused:
   - "layouts.decidim.decidim_awesome.admin.maintenance.titles.*"
   - "decidim.proposals.*"
   - "decidim.meetings.*"
+  - "decidim.download_your_data.show.admin_actions"
 
 ignore_missing:
   - decidim.participatory_processes.scopes.global

data/config/locales/ca.yml

@@ -108,10 +108,12 @@ ca:
             map_zoom: Zoom (qualsevol nombre entre 0 i 18)
             map_zoom_help: Només s’aplica si es defineix el punt central del mapa
             menu_amendments: Mostrar esmenes
-            menu_categories: Mostrar el menú de cerca per categories
             menu_hashtags: Mostrar el menú de cerca per hashtags
             menu_meetings: Mostrar trobades
             menu_merge_components: Unifica tots els components del mateix tipus al menú
+            menu_taxonomies: Mostrar el menú de cerca per taxonomies
+            taxonomy_filters: Selecciona els filtres pel component
+            taxonomy_filters_add: Afegeix un filtre
             truncate: Nombre màxim de caràcters per les descripcions emergents
           step:
             announcement: Anunci
@@ -603,6 +605,7 @@ ca:
           show_not_answered: Mostra les propostes pendents de contestar
           show_rejected: Mostra les propostes rebutjades
           show_withdrawn: Mostra les propostes retirades
+          taxonomies: Taxonomies
           text_settings: Configuració del text
           title: Títol
           truncate: Nombre màxim de caràcters per les descripcions emergents
@@ -679,6 +682,9 @@ ca:
             weight_2_short: 'G:'
             weight_3: Verd
             weight_3_short: 'V:'
+    download_your_data:
+      show:
+        admin_actions: Accions d'administrador
     meetings:
       meetings_map:
         view_meeting: Veure trobada
@@ -709,10 +715,10 @@ ca:
           autosaved_error: L'emmagatzematge local no està disponible al teu navegador, el formulari no es podrà desar automàticament.
           autosaved_retrieved: Les dades d'aquest formulari s'han recuperat d'una sessió anterior
           autosaved_success: Dades desades a l'emmagatzematge local
-          categories: Categories
           drag_and_drop_image: Afegeix imatges arrossegant-les i deixant-les anar o bé enganxant-les.
           hashtags: Hashtags
           items: elements
           meetings: Trobades
           proposals: Propostes
           select_deselect_all: Selecciona/Des-selecciona tot
+          taxonomies: Taxonomies

data/config/locales/cs.yml

@@ -108,10 +108,12 @@ cs:
             map_zoom: Zvětšení (libovolné číslo mezi 0 a 18)
             map_zoom_help: Použije se pouze v případě, že je definován střed mapy
             menu_amendments: Zobrazit pozměňovací návrhy
-            menu_categories: Zobrazit menu hledání kategorií
             menu_hashtags: Zobrazit nabídku hledání Hashtagu
             menu_meetings: Zobrazit schůzky
             menu_merge_components: Sloučit všechny komponenty stejného typu v menu
+            menu_taxonomies: Zobrazit nabídku vyhledávání taxonomie
+            taxonomy_filters: Vyberte filtry pro komponentu
+            taxonomy_filters_add: Přidat filtr
             truncate: Maximum znaků pro popisy vyskakovacích oken
           step:
             announcement: Oznámení
@@ -604,6 +606,7 @@ cs:
           show_not_answered: Zobrazit nezodpovězené návrhy
           show_rejected: Zobrazit odmítnuté návrhy
           show_withdrawn: Zobrazit stažené návrhy
+          taxonomies: Taxonomie
           text_settings: Nastavení textu
           title: Nadpis
           truncate: Maximum znaků pro popisy vyskakovacích oken
@@ -680,6 +683,9 @@ cs:
             weight_2_short: 'Y:'
             weight_3: Zelená
             weight_3_short: 'G:'
+    download_your_data:
+      show:
+        admin_actions: Akce administrátora
     meetings:
       meetings_map:
         view_meeting: Zobrazit schůzku
@@ -710,10 +716,10 @@ cs:
           autosaved_error: Místní úložiště není ve vašem prohlížeči podporováno, formulář nelze uložit automaticky.
           autosaved_retrieved: Údaje pro tento formulář byly obnoveny z předchozí relace
           autosaved_success: Data uložena v místním úložišti
-          categories: Kategorie
           drag_and_drop_image: Přidejte obrázky přetažením nebo vložením.
           hashtags: Hashtagy
           items: položky
           meetings: Schůzky
           proposals: Návrhy
           select_deselect_all: Vybrat/odebrat vše
+          taxonomies: Taxonomie

data/config/locales/de.yml

@@ -108,10 +108,12 @@ de:
             map_zoom: Zoom (beliebige Zahl zwischen 0 und 18)
             map_zoom_help: Gilt nur, wenn ein Kartenzentrum definiert ist
             menu_amendments: Änderungen anzeigen
-            menu_categories: Kategorie-Suchmenü anzeigen
             menu_hashtags: Hashtag-Suchmenü anzeigen
             menu_meetings: Veranstaltungen anzeigen
             menu_merge_components: Alle Komponenten desselben Typs im Menü zusammenführen
+            menu_taxonomies: Suchmenü für Klassifizierungen anzeigen
+            taxonomy_filters: Filter für die Komponente suchen
+            taxonomy_filters_add: Filter hinzufügen
             truncate: Maximale Zeichenanzahl für Popup-Beschreibungen
           step:
             announcement: Ankündigung
@@ -598,6 +600,7 @@ de:
           show_not_answered: Nicht beantwortete Vorschläge anzeigen
           show_rejected: Abgelehnte Vorschläge anzeigen
           show_withdrawn: Zurückgezogene Vorschläge anzeigen
+          taxonomies: Klassifizierungen
           text_settings: Text-Einstellungen
           title: Titel
           truncate: Maximale Zeichenanzahl für Popup-Beschreibungen
@@ -666,6 +669,9 @@ de:
             weight_2_short: 'Y:'
             weight_3: Grün
             weight_3_short: 'G:'
+    download_your_data:
+      show:
+        admin_actions: Admin-Aktionen
     meetings:
       meetings_map:
         view_meeting: Sitzung ansehen
@@ -696,10 +702,10 @@ de:
           autosaved_error: Automatisches Speichern fehlgeschlagen
           autosaved_retrieved: Text automatisch wiederhergestellt
           autosaved_success: Text automatisch gespeichert
-          categories: Kategorien
           drag_and_drop_image: Sie können Bilder per Drag & Drop ins Textfeld ziehen.
           hashtags: Hashtags
           items: Items
           meetings: Veranstaltungen
           proposals: Vorschläge
           select_deselect_all: Alles auswählen / Auswahl aufheben
+          taxonomies: Klassifizierungen

data/config/locales/en.yml

@@ -122,10 +122,12 @@ en:
             map_zoom: Zoom (any number betwen 0 and 18)
             map_zoom_help: Only applies if a map center is defined
             menu_amendments: Show amendments
-            menu_categories: Show Category search menu
             menu_hashtags: Show Hashtag search menu
             menu_meetings: Show meetings
             menu_merge_components: Merge all components of the same type in the menu
+            menu_taxonomies: Show Taxonomy search menu
+            taxonomy_filters: Select filters for the component
+            taxonomy_filters_add: Add filter
             truncate: Maximum characters for popup descriptions
           step:
             announcement: Announcement
@@ -724,6 +726,7 @@ en:
           show_not_answered: Show not answered proposals
           show_rejected: Show rejected proposals
           show_withdrawn: Show withdrawn proposals
+          taxonomies: Taxonomies
           text_settings: Text settings
           title: Title
           truncate: Maximum characters for popup descriptions
@@ -810,6 +813,9 @@ en:
             weight_2_short: 'Y:'
             weight_3: Green
             weight_3_short: 'G:'
+    download_your_data:
+      show:
+        admin_actions: Admin actions
     meetings:
       meetings_map:
         view_meeting: View meeting
@@ -842,10 +848,10 @@ en:
           autosaved_retrieved: Data for this form has been recovered from a previous
             session
           autosaved_success: Data saved in local storage
-          categories: Categories
           drag_and_drop_image: Add images by dragging & dropping or pasting them.
           hashtags: Hashtags
           items: items
           meetings: Meetings
           proposals: Proposals
           select_deselect_all: Select/deselect all
+          taxonomies: Taxonomies

data/config/locales/es.yml

@@ -108,10 +108,12 @@ es:
             map_zoom: Zoom (cualquier número entre 0 y 18)
             map_zoom_help: Solo aplica si se define el punto central del mapa
             menu_amendments: Mostrar enmiendas
-            menu_categories: Mostrar menú de búsqueda por categorías
             menu_hashtags: Mostrar el menú de búsqueda por hashtag
             menu_meetings: Mostrar encuentros
             menu_merge_components: Combinar todos los componentes del mismo tipo en el menú
+            menu_taxonomies: Mostrar menú de búsqueda por taxonomías
+            taxonomy_filters: Seleccionar filtros para el componente
+            taxonomy_filters_add: Añadir filtro
             truncate: Número máximo de caracteres para las descripciones emergentes
           step:
             announcement: Anuncio
@@ -604,6 +606,7 @@ es:
           show_not_answered: Muestra las propuestas pendientes de contestart
           show_rejected: Muestra las propuestas rechazadas
           show_withdrawn: Muestra las propuestas retiradas
+          taxonomies: Taxonomías
           text_settings: Ajustes del texto
           title: Título
           truncate: Número máximo de caracteres para las descripciones emergentes
@@ -680,6 +683,9 @@ es:
             weight_2_short: 'A:'
             weight_3: Verde
             weight_3_short: 'V:'
+    download_your_data:
+      show:
+        admin_actions: Acciones de Administrador
     meetings:
       meetings_map:
         view_meeting: Ver encuentro
@@ -710,10 +716,10 @@ es:
           autosaved_error: El almacenamiento local no es compatible con tu navegador, el formulario no se podrá guardar automáticamente.
           autosaved_retrieved: Los datos de este formulario se han recuperado de una sesión anterior
           autosaved_success: Datos guardados en el almacenamiento local
-          categories: Categorías
           drag_and_drop_image: Puedes añadir imágenes arrastrando y soltándolas o también pegándolas.
           hashtags: Hashtags
           items: elementos
           meetings: Encuentros
           proposals: Propuestas
           select_deselect_all: Seleccionar/deseleccionar todo
+          taxonomies: Taxonomías