decidim-templates 0.23.5 → 0.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c124f78b7202120a324bcdd0e2cd93f78c772fd43566c1519df48665189de481
-  data.tar.gz: 5e83d6dc749b42c216c787af557b681e5349939eefafa9e20830afb58835771c
+  metadata.gz: d57faab60878f78ed3c7c63faa1ac919674bf920080249ebbfb323bfa6e57df5
+  data.tar.gz: 6a850da108de14c4ceaf2d280ba6f8f077d65b0a5390ed881914f88a68422eb5
 SHA512:
-  metadata.gz: d4bd5abc5a44498ef089205a1dd7463ac498cec0252ed2b23ade492415e14025056730d0ab159ae7281ff03269a0b3f2d01bb2c7cec19479a28468f71e1953f3
-  data.tar.gz: 20e455c8c970bfae0d83d9422a318315989bc04fca16407464b22e6079c38477fd2702976aff0f0759b2c63ea2e94382ba373beffa6af656b7e20e70ff8e5fdd
+  metadata.gz: c9da2902f2187a731c23d051b713b2a687baeab2c9d60e6d021c24094af625532e6dcd0cd7ae3784f964e683bcc4290e5d345c30741e51df5d7a141b01ff496b
+  data.tar.gz: a250304aac44fe007f3557e9a4693c8b40db4be110780cdd7f5119fcca47a7d9c5e5575eb88c3699a3745f0f6f284f5744e2a7e857ba7d1286a4af54b5963dfd

data/app/controllers/decidim/templates/admin/questionnaire_templates/questionnaires_controller.rb

@@ -26,6 +26,10 @@ module Decidim
             nil
           end
 
+          def edit_questionnaire_title
+            t(:title, scope: "decidim.templates.admin.questionnaire_templates.form", questionnaire_for: translated_attribute(template.name))
+          end
+
           private
 
           def template

data/app/helpers/decidim/templates/admin/templates_menu_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    module Admin
+      module TemplatesMenuHelper
+        include Decidim::Admin::SidebarMenuHelper
+
+        def template_types_menu
+          @template_types_menu ||= sidebar_menu(:admin_template_types_menu)
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/templates/template.rb

@@ -15,7 +15,7 @@ module Decidim
                  foreign_key: "decidim_organization_id",
                  class_name: "Decidim::Organization"
 
-      belongs_to :templatable, foreign_key: "templatable_id", foreign_type: "templatable_type", polymorphic: true, optional: true
+      belongs_to :templatable, foreign_type: "templatable_type", polymorphic: true, optional: true
 
       before_destroy :destroy_templatable
 

data/app/views/decidim/templates/admin/questionnaire_templates/index.html.erb

@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <%= t ".title" %>
       <% if allowed_to?(:create, :template) %>
-        <%= link_to t("actions.new", scope: "decidim.admin", name: t("template.name", scope: "decidim.models").downcase), ["new", "questionnaire_template"], class: "button tiny button--title new" %>
+        <%= link_to t("actions.new", scope: "decidim.admin", name: t("template.name", scope: "decidim.models").downcase), [:new, :questionnaire_template], class: "button tiny button--title new" %>
       <% end %>
     </h2>
   </div>

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

@@ -1,13 +1,5 @@
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav secondary-nav--subnav">
-    <ul>
-      <% template_types.each_pair do |name, url| %>
-        <li <% if is_active_link?(url) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to name, url %>
-        </li>
-      <% end %>
-    </ul>
-  </div>
+<% content_for :sidebar_menu_nav do %>
+  <%= template_types_menu.render %>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>

data/config/locales/ca.yml

@@ -48,7 +48,7 @@ ca:
           form:
             save: Desar
             template_title: Informació de la plantilla
-            title: Qüestionari
+            title: Plantilla del qüestionari %{questionnaire_for}
           index:
             confirm_delete: Segur que vols eliminar aquesta plantilla?
             title: Plantilles de qüestionari

data/config/locales/cs.yml

@@ -48,7 +48,7 @@ cs:
           form:
             save: Uložit
             template_title: Informace o šabloně
-            title: Dotazník
+            title: Šablona dotazníku %{questionnaire_for}
           index:
             confirm_delete: Jste si jisti, že chcete odstranit tuto šablonu?
             title: Šablony dotazníků

data/config/locales/de.yml

@@ -48,7 +48,7 @@ de:
           form:
             save: Speichern
             template_title: Vorlageninformation
-            title: Fragebogen
+            title: Fragebogenvorlage %{questionnaire_for}
           index:
             confirm_delete: Möchten Sie diese Vorlage wirklich löschen?
             title: Fragebogenvorlagen

data/config/locales/en.yml

@@ -49,7 +49,7 @@ en:
           form:
             save: Save
             template_title: Template information
-            title: Questionnaire
+            title: Questionnaire template %{questionnaire_for}
           index:
             confirm_delete: Are you sure you want to delete this template?
             title: Questionnaire templates

data/config/locales/es-MX.yml

@@ -48,7 +48,7 @@ es-MX:
           form:
             save: Guardar
             template_title: Información de la plantilla
-            title: Cuestionario
+            title: Plantilla de cuestionario %{questionnaire_for}
           index:
             confirm_delete: '¿Seguro que quieres eliminar esta plantilla?'
             title: Plantillas de cuestionario

data/config/locales/es-PY.yml

@@ -48,7 +48,7 @@ es-PY:
           form:
             save: Guardar
             template_title: Información de la plantilla
-            title: Cuestionario
+            title: Plantilla de cuestionario %{questionnaire_for}
           index:
             confirm_delete: '¿Seguro que quieres eliminar esta plantilla?'
             title: Plantillas de cuestionario

data/config/locales/es.yml

@@ -48,7 +48,7 @@ es:
           form:
             save: Guardar
             template_title: Información de la plantilla
-            title: Cuestionario
+            title: Plantilla de cuestionario %{questionnaire_for}
           index:
             confirm_delete: '¿Seguro que quieres eliminar esta plantilla?'
             title: Plantillas de cuestionario

data/config/locales/fi-plain.yml

@@ -48,7 +48,7 @@ fi-pl:
           form:
             save: Tallenna
             template_title: Mallipohjan tiedot
-            title: Kysely
+            title: Kyselylomakemalli %{questionnaire_for}
           index:
             confirm_delete: Haluatko varmasti poistaa tämän mallipohjan?
             title: Kyselymallit

data/config/locales/fi.yml

@@ -48,7 +48,7 @@ fi:
           form:
             save: Tallenna
             template_title: Mallipohjan tiedot
-            title: Kysely
+            title: Kyselylomakemalli %{questionnaire_for}
           index:
             confirm_delete: Haluatko varmasti poistaa tämän mallipohjan?
             title: Kyselymallit

data/config/locales/fr-CA.yml

@@ -48,7 +48,7 @@ fr-CA:
           form:
             save: Sauvegarder
             template_title: Informations sur le modèle
-            title: Questionnaire
+            title: Modèle de questionnaire %{questionnaire_for}
           index:
             confirm_delete: Êtes-vous sûr de vouloir supprimer ce modèle?
             title: Modèles de questionnaire

data/config/locales/fr.yml

@@ -48,7 +48,7 @@ fr:
           form:
             save: Sauvegarder
             template_title: Informations sur le modèle
-            title: Questionnaire
+            title: Modèle de questionnaire %{questionnaire_for}
           index:
             confirm_delete: Êtes-vous sûr de vouloir supprimer ce modèle?
             title: Modèles de questionnaire

data/config/locales/gl.yml

@@ -48,7 +48,7 @@ gl:
           form:
             save: Gardar
             template_title: Información do padrón
-            title: Cuestionario
+            title: Padrón de cuestionario %{questionnaire_for}
           index:
             confirm_delete: Tes a certeza de querer eliminar este padrón?
             title: Padróns de cuestionario

data/config/locales/it.yml

@@ -48,7 +48,6 @@ it:
           form:
             save: Salva
             template_title: Informazioni del modello
-            title: Questionario
           index:
             confirm_delete: Sei sicuro di voler eliminare questo modello?
             title: Modelli di questionari

data/config/locales/ja.yml

@@ -48,7 +48,7 @@ ja:
           form:
             save: 保存
             template_title: テンプレート情報
-            title: アンケート
+            title: アンケートテンプレート %{questionnaire_for}
           index:
             confirm_delete: このテンプレートを削除してもよろしいですか？
             title: アンケートテンプレート

data/config/locales/nl.yml

@@ -48,7 +48,6 @@ nl:
           form:
             save: Opslaan
             template_title: Template informatie
-            title: Vragenlijst
           index:
             confirm_delete: Weet je zeker dat je dit template wilt verwijderen?
             title: Vragenlijst templates

data/config/locales/pl.yml

@@ -48,7 +48,7 @@ pl:
           form:
             save: Zapisz
             template_title: Informacje o szablonie
-            title: Kwestionariusz
+            title: Szablon kwestionariusza %{questionnaire_for}
           index:
             confirm_delete: Czy na pewno chcesz usunąć ten szablon?
             title: Szablony kwestionariusza

data/config/locales/ro-RO.yml

@@ -48,7 +48,7 @@ ro:
           form:
             save: Salveaza
             template_title: Informatii Sablon
-            title: Chestionar
+            title: Sablon chestionar %{questionnaire_for}
           index:
             confirm_delete: Sunteți sigur că doriți să ștergeți acest șablon?
             title: Şabloane chestionar

data/config/locales/sv.yml

@@ -20,6 +20,5 @@ sv:
             questionnaire: Enkät
           form:
             save: Spara
-            title: Enkät
           preview:
             current_step: Steg %{step} av

data/config/locales/tr-TR.yml

@@ -48,7 +48,7 @@ tr:
           form:
             save: Kaydet
             template_title: Şablon Bilgisi
-            title: Anket
+            title: '%{questionnaire_for} için anket şablonu'
           index:
             confirm_delete: Bu şablonu silmek istediğinizden emin misiniz?
             title: Anket şablonları

data/config/locales/zh-CN.yml

@@ -48,7 +48,6 @@ zh-CN:
           form:
             save: 保存
             template_title: 模板信息
-            title: Questionnaire
           index:
             confirm_delete: 您确定要删除此模板吗？
             title: 问卷模板

data/db/seeds.rb

@@ -18,7 +18,7 @@ if !Rails.env.production? || ENV["SEED"]
 
   questionnaire_template = Decidim::Templates::Template.create!(
     organization: organization,
-    name: Decidim::Faker::Localized.sentence(2),
+    name: Decidim::Faker::Localized.sentence(word_count: 2),
     description: Decidim::Faker::Localized.paragraph
   )
 
@@ -26,10 +26,10 @@ if !Rails.env.production? || ENV["SEED"]
     questionnaire_for: questionnaire_template,
     title: Decidim::Faker::Localized.paragraph,
     description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.paragraph(3)
+      Decidim::Faker::Localized.paragraph(sentence_count: 3)
     end,
     tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.paragraph(2)
+      Decidim::Faker::Localized.paragraph(sentence_count: 2)
     end
   )
 

data/lib/decidim/templates/admin_engine.rb

@@ -30,6 +30,22 @@ module Decidim
         root to: "questionnaire_templates#index"
       end
 
+      initializer "decidim_templates.action_controller" do |_app|
+        ActiveSupport.on_load :action_controller do
+          helper Decidim::Templates::Admin::TemplatesMenuHelper if respond_to?(:helper)
+        end
+      end
+
+      initializer "decidim_participatory_processes.admin_participatory_processes_menu" do
+        Decidim.menu :admin_template_types_menu do |menu|
+          template_types.each_pair do |name, url|
+            menu.item name, url,
+                      if: allowed_to?(:index, :templates),
+                      active: is_active_link?(url)
+          end
+        end
+      end
+
       initializer "decidim_templates.admin_mount_routes" do
         Decidim::Core::Engine.routes do
           mount Decidim::Templates::AdminEngine, at: "/admin/templates", as: "decidim_admin_templates"

data/lib/decidim/templates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-templates version.
   module Templates
     def self.version
-      "0.23.5"
+      "0.24.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-templates
 version: !ruby/object:Gem::Version
-  version: 0.23.5
+  version: 0.24.2
 platform: ruby
 authors:
 - Vera Rojman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 description: This module provides a solution to create templates for different Decidim
   models, such as Proposals and Questionnaires..
 email:
@@ -93,6 +93,7 @@ files:
 - app/controllers/decidim/templates/application_controller.rb
 - app/forms/decidim/templates/admin/template_form.rb
 - app/helpers/decidim/templates/admin/templates_helper.rb
+- app/helpers/decidim/templates/admin/templates_menu_helper.rb
 - app/helpers/decidim/templates/application_helper.rb
 - app/models/concerns/decidim/templates/templatable.rb
 - app/models/decidim/templates/application_record.rb
@@ -181,14 +182,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: A decidim templates module