decidim-consultations 0.24.2 → 0.25.0.rc3

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

@@ -31,5 +31,4 @@ edit_link(
   </div>
 <% end %>
 
-<%= javascript_include_tag "decidim/filters" %>
-<%= javascript_include_tag "decidim/results_listing" %>
+<%= javascript_pack_tag "decidim_consultations" %>

data/app/views/decidim/consultations/question_multiple_votes/_voting_rules.html.erb

@@ -26,4 +26,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/consultations/utils_multiple" %>
+<%= javascript_pack_tag "decidim_consultations" %>

data/app/views/decidim/consultations/questions/_right_column.html.erb

@@ -1,5 +1,5 @@
 <% add_decidim_meta_tags({
-  image_url: current_participatory_space.hero_image_url,
+  image_url: current_participatory_space.attached_uploader(:hero_image).path,
   description: translated_attribute(current_participatory_space.question_context),
   title: strip_tags(translated_attribute(current_participatory_space.title)),
   url: decidim_consultations.question_url(current_participatory_space),

data/app/views/decidim/consultations/questions/_vote_button.html.erb

@@ -96,5 +96,4 @@
 
 <%= render partial: "decidim/consultations/questions/vote_modal", locals: { question: question } %>
 <%= render partial: "decidim/consultations/questions/vote_modal_confirm", locals: { question: question } %>
-<%= javascript_include_tag "decidim/consultations/utils" %>
-<%= javascript_include_tag "decidim/consultations/vote_dialog" %>
+<%= javascript_pack_tag "decidim_consultations" %>

data/app/views/decidim/consultations/questions/show.html.erb

@@ -30,13 +30,12 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/consultations/show_more" %>
 <%= comments_for current_question if current_question.published? %>
 
 <%= content_for :question_header_details do %>
   <div id="question-header-details" class="row consultations-home-intro">
     <div class="columns medium-5">
-      <%= image_tag current_question.hero_image&.url, alt: t("question.hero_image", scope: "activemodel.attributes") if current_question.hero_image&.url %>
+      <%= image_tag current_question.attached_uploader(:hero_image).path, alt: t("question.hero_image", scope: "activemodel.attributes") if current_question.hero_image.attached? %>
     </div>
 
     <div class="columns medium-5">
@@ -56,3 +55,5 @@
     </div>
   </div>
 <% end %>
+
+<%= javascript_pack_tag "decidim_consultations" %>

data/app/views/layouts/decidim/_consultation_header.html.erb

@@ -2,7 +2,7 @@
 
 <div class="consultations-header consultations-home-banner row column">
   <div class="row column consultations-header__main"
-       style="background-image:url(<%= current_consultation.banner_image.url %>);">
+       style="background-image:url(<%= current_consultation.attached_uploader(:banner_image).path %>);">
     <div class="consultations-header__container row">
       <div class="columns mediumlarge-9 consultations-header__info">
         <div>

data/app/views/layouts/decidim/_question_components.html.erb

@@ -7,7 +7,7 @@
           <%= component_icon(current_component) %>
           <%= translated_attribute(current_component.name) %>
         <% else %>
-          <%= external_icon "decidim/pages/icon.svg", role: "img", "aria-hidden": true %>
+          <%= external_icon "media/images/decidim_pages.svg", role: "img", "aria-hidden": true %>
           <%= t ".question_menu_item" %>
         <% end %>
       </span>

data/app/views/layouts/decidim/_question_header.html.erb

@@ -1,6 +1,6 @@
 <div class="consultations-header row column">
   <div class="row column consultations-header__main"
-       style="background-image:url(<%= question.banner_image_url %>);">
+       style="background-image:url(<%= question.attached_uploader(:banner_image).path %>);">
     <div class="consultations-header__container row">
       <div class="columns mediumlarge-9 consultations-header__info">
         <div>

data/app/views/layouts/decidim/admin/consultation.html.erb

@@ -1,5 +1,5 @@
 <% content_for :sidebar_menu_nav do %>
-  <%= admin_consultation_menu.render do
+  <%= sidebar_menu(:admin_consultation_menu).render do
     public_page_link decidim_consultations.consultation_path(current_consultation)
   end %>
 <% end %>

data/app/views/layouts/decidim/admin/question.html.erb

@@ -1,86 +1,7 @@
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav secondary-nav--subnav">
-    <ul>
-      <%= public_page_link decidim_consultations.consultation_path(current_participatory_space.consultation) %>
-      <% if allowed_to?(:update, :consultation, consultation: current_participatory_space.consultation) %>
-        <li <% if is_active_link?(decidim_admin_consultations.edit_consultation_path(current_participatory_space.consultation)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("consultation", scope: "decidim.admin.menu.questions_submenu"),
-                                    decidim_admin_consultations.edit_consultation_path(current_participatory_space.consultation) %>
-        </li>
-      <% end %>
-
-        <li <% if is_active_link?(decidim_admin_consultations.consultation_questions_path(current_participatory_space.consultation)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("questions", scope: "decidim.admin.menu.consultations_submenu"),
-                                    decidim_admin_consultations.consultation_questions_path(current_participatory_space.consultation) %>
-
-        <ul>
-        <% if allowed_to?(:update, :question, question: current_participatory_space) %>
-          <li <% if is_active_link?(decidim_admin_consultations.edit_question_path(current_participatory_space)) %> class="is-active" <% end %>>
-            <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.questions_submenu"),
-                                      decidim_admin_consultations.edit_question_path(current_participatory_space) %>
-          </li>
-        <% end %>
-
-         <% if allowed_to?(:configure, :question, question: current_participatory_space) %>
-          <li <% if is_active_link?(decidim_admin_consultations.edit_question_configuration_path(current_participatory_space)) %> class="is-active" <% end %>>
-            <%= aria_selected_link_to t("configuration", scope: "decidim.admin.menu.questions_submenu"),
-                                      decidim_admin_consultations.edit_question_configuration_path(current_participatory_space) %>
-          </li>
-        <% end %>
-
-        <% if allowed_to? :read, :response %>
-          <li <% if is_active_link?(decidim_admin_consultations.responses_path(current_participatory_space)) || is_active_link?(decidim_admin_consultations.response_groups_path(current_participatory_space)) %> class="is-active" <% end %>>
-            <%= aria_selected_link_to t("responses", scope: "decidim.admin.menu.questions_submenu"),
-                                      decidim_admin_consultations.responses_path(current_participatory_space) %>
-          </li>
-        <% end %>
-
-        <% if allowed_to? :read, :component %>
-          <li <% if is_active_link?(decidim_admin_consultations.components_path(current_participatory_space)) %> class="is-active" <% end %>>
-            <%= aria_selected_link_to t("components", scope: "decidim.admin.menu.questions_submenu"),
-                                      decidim_admin_consultations.components_path(current_participatory_space) %>
-            <ul>
-              <% current_participatory_space.components.each do |component| %>
-                <% if component.manifest.admin_engine %>
-                  <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_consultations.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_consultations.edit_component_permissions_path(current_participatory_space, component)) %> class="is-active" <% end %>>
-                    <%= link_to manage_component_path(component) do %>
-                      <%= translated_attribute component.name %>
-                      <% if component.primary_stat.present? %>
-                        <span class="component-counter <%= "component-counter--off" if component.primary_stat.zero? %>">
-                          <%= component.primary_stat %>
-                        </span>
-                      <% end %>
-                    <% end %>
-                  </li>
-                <% end %>
-              <% end %>
-            </ul>
-          </li>
-        <% end %>
-
-        <% if allowed_to? :read, :category %>
-          <li <% if is_active_link?(decidim_admin_consultations.categories_path(current_participatory_space)) %> class="is-active" <% end %>>
-            <%= aria_selected_link_to t(".categories"),
-                                      decidim_admin_consultations.categories_path(current_participatory_space) %>
-          </li>
-        <% end %>
-
-        <% if allowed_to? :read, :attachment %>
-          <li <% if is_active_link?(decidim_admin_consultations.question_attachments_path(current_participatory_space)) %> class="is-active" <% end %>>
-            <%= aria_selected_link_to t(".attachments"),
-                                      decidim_admin_consultations.question_attachments_path(current_participatory_space) %>
-          </li>
-        <% end %>
-        </ul>
-      </li>
-
-      <li <% if is_active_link?(decidim_admin_consultations.results_consultation_path(current_participatory_space.consultation)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("results", scope: "decidim.admin.menu.consultations_submenu"),
-                                    decidim_admin_consultations.results_consultation_path(current_participatory_space.consultation) %>
-      </li>
-
-    </ul>
-  </div>
+<% content_for :sidebar_menu_nav do %>
+  <%= sidebar_menu(:admin_question_menu).render do
+    public_page_link decidim_consultations.consultation_path(current_participatory_space.consultation)
+  end %>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>

data/config/assets.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+base_path = File.expand_path("..", __dir__)
+
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Webpacker.register_entrypoints(
+  decidim_consultations: "#{base_path}/app/packs/entrypoints/decidim_consultations.js"
+)
+Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/consultations/consultations")

data/config/locales/ar.yml

@@ -128,6 +128,8 @@ ar:
           questions: الأسئلة
           results: النتائج
         questions_submenu:
+          attachments: مرفقات
+          categories: الاقسام
           components: المكونات
           configuration: الإعدادا
           consultation: تشاور
@@ -336,10 +338,6 @@ ar:
           title: ما هي المشاورات؟
     menu:
       consultations: المشاورات
-    pages:
-      home:
-        statistics:
-          consultations_count: المشاورات
     questions:
       next_button: السؤال التالي
       previous_button: السؤال السابق
@@ -374,10 +372,6 @@ ar:
           vote: صوِّت
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: مرفقات
-          categories: الاقسام
       consultation_voting_data:
         start_voting_date: يبدأ التصويت
       question_components:

data/config/locales/ca.yml

@@ -120,6 +120,8 @@ ca:
           questions: Preguntes
           results: Resultats
         questions_submenu:
+          attachments: Adjunts
+          categories: Categories
           components: Components
           configuration: Configuració
           consultation: Consulta
@@ -324,10 +326,6 @@ ca:
           title: Què són les consultes?
     menu:
       consultations: Consultes
-    pages:
-      home:
-        statistics:
-          consultations_count: Consultes
     questions:
       next_button: Següent qüestió
       previous_button: Qüestió anterior
@@ -362,12 +360,11 @@ ca:
       consultations:
         actions:
           vote: Vota
+    statistics:
+      consultations_count: Consultes
+      votes_count: Vots
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Adjunts
-          categories: Categories
       consultation_voting_data:
         start_voting_date: Comença la votació
       question_components:

data/config/locales/cs.yml

@@ -15,7 +15,7 @@ cs:
         title: Titul
       question:
         banner_image: Obrázek banneru
-        decidim_scope_id: Městská oblast
+        decidim_scope_id: Samosprávní oblast
         hashtag: Hashtag
         hero_image: Domácí obrázek
         i_frame_url: Adresa URL externího hlasování
@@ -29,7 +29,7 @@ cs:
         promoter_group: Skupina promotérů
         question_context: Kontext
         reference: Odkaz
-        scope: Městská oblast
+        scope: Samosprávní oblast
         slug: URL slug
         subtitle: Podtitul
         vote: Externí hlasovací systém
@@ -128,6 +128,8 @@ cs:
           questions: Otázky
           results: Výsledky
         questions_submenu:
+          attachments: Přílohy
+          categories: Kategorie
           components: Komponenty
           configuration: Nastavení
           consultation: Konzultace
@@ -344,10 +346,6 @@ cs:
           title: Co jsou konzultace?
     menu:
       consultations: Konzultace
-    pages:
-      home:
-        statistics:
-          consultations_count: Konzultace
     questions:
       next_button: Další otázka
       previous_button: Předchozí otázka
@@ -382,12 +380,11 @@ cs:
       consultations:
         actions:
           vote: Hlasovat
+    statistics:
+      consultations_count: Konzultace
+      votes_count: Hlasy
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Přílohy
-          categories: Kategorie
       consultation_voting_data:
         start_voting_date: Hlasování začíná
       question_components:

data/config/locales/de.yml

@@ -120,6 +120,8 @@ de:
           questions: Fragen
           results: Ergebnisse
         questions_submenu:
+          attachments: Anhänge
+          categories: Kategorien
           components: Komponenten
           configuration: Konfiguration
           consultation: Beratung
@@ -324,10 +326,6 @@ de:
           title: Was sind Konsultationen?
     menu:
       consultations: Konsultationen
-    pages:
-      home:
-        statistics:
-          consultations_count: Konsultationen
     questions:
       next_button: Nächste Frage
       previous_button: Vorherige Frage
@@ -362,12 +360,11 @@ de:
       consultations:
         actions:
           vote: Abstimmung
+    statistics:
+      consultations_count: Beratungen
+      votes_count: Stimmen
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Anhänge
-          categories: Kategorien
       consultation_voting_data:
         start_voting_date: Die Abstimmung beginnt
       question_components:

data/config/locales/el.yml

@@ -119,6 +119,8 @@ el:
           questions: Ερωτήσεις
           results: Αποτελέσματα
         questions_submenu:
+          attachments: Συνημμένα
+          categories: Κατηγορίες
           components: Στοιχεία
           configuration: Διαμόρφωση
           consultation: Διαβούλευση
@@ -321,10 +323,6 @@ el:
           title: Τι είναι οι διαβουλεύσεις;
     menu:
       consultations: Διαβουλεύσεις
-    pages:
-      home:
-        statistics:
-          consultations_count: Διαβουλεύσεις
     questions:
       next_button: Επόμενη ερώτηση
       previous_button: Προηγούμενη ερώτηση
@@ -361,10 +359,6 @@ el:
           vote: Ψηφοφορία
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Συνημμένα
-          categories: Κατηγορίες
       consultation_voting_data:
         start_voting_date: Η ψηφοφορία αρχίζει
       question_components:

data/config/locales/en.yml

@@ -121,6 +121,8 @@ en:
           questions: Questions
           results: Results
         questions_submenu:
+          attachments: Attachments
+          categories: Categories
           components: Components
           configuration: Configuration
           consultation: Consultation
@@ -325,10 +327,6 @@ en:
           title: What are consultations?
     menu:
       consultations: Consultations
-    pages:
-      home:
-        statistics:
-          consultations_count: Consultations
     questions:
       next_button: Next question
       previous_button: Previous question
@@ -362,13 +360,13 @@ en:
     resources:
       consultations:
         actions:
+          comment: Comment
           vote: Vote
+    statistics:
+      consultations_count: Consultations
+      votes_count: Votes
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Attachments
-          categories: Categories
       consultation_voting_data:
         start_voting_date: Voting begins
       question_components:

data/config/locales/es-MX.yml

@@ -120,6 +120,8 @@ es-MX:
           questions: Preguntas
           results: Resultados
         questions_submenu:
+          attachments: Archivos adjuntos
+          categories: Categorías
           components: Componentes
           configuration: Configuración
           consultation: Consulta
@@ -324,10 +326,6 @@ es-MX:
           title: '¿Qué son las consultas?'
     menu:
       consultations: Consultas
-    pages:
-      home:
-        statistics:
-          consultations_count: Consultas
     questions:
       next_button: Siguiente pregunta
       previous_button: Pregunta anterior
@@ -362,12 +360,11 @@ es-MX:
       consultations:
         actions:
           vote: Votar
+    statistics:
+      consultations_count: Consultas
+      votes_count: Votos
   layouts:
     decidim:
-      admin:
-        question:
-          attachments: Archivos adjuntos
-          categories: Categorías
       consultation_voting_data:
         start_voting_date: Empieza la votación
       question_components: