decidim-admin 0.15.2 → 0.16.0

data/config/locales/tr-TR.yml

@@ -66,6 +66,7 @@ tr:
         show_statistics: İstatistikleri göster
         tos_version: Hizmet sürümü şartları
         twitter_handler: Twitter işleyicisi
+        user_groups_enabled: Kullanıcı gruplarını etkinleştir
         youtube_handler: YouTube işleyici
       scope:
         code: kod
@@ -82,14 +83,29 @@ tr:
         changed_notably: Gözle görülür değişiklikler oldu.
         content: içerik
         organization: organizasyon
+        show_in_footer: Altbilgiyi göster
         slug: URL sümüklü böcek
         title: Başlık
+        weight: Ağırlık
+      static_page_topic:
+        description: Açıklama
+        show_in_footer: Altbilgiyi göster
+        title: Başlık
+        weight: Ağırlık
+      user_group_csv_verification:
+        file: Dosya
     errors:
       models:
         oauth_application:
           attributes:
             redirect_uri:
               must_be_ssl: Yönlendirme URI bir SSL URI'sı olmalıdır
+        organization:
+          attributes:
+            official_img_header:
+              allowed_file_content_types: Geçersiz resim dosyası
+            official_img_footer:
+              allowed_file_content_types: Geçersiz resim dosyası
   activerecord:
     attributes:
       decidim/static_page:
@@ -248,6 +264,11 @@ tr:
       exports:
         export_as: "%{name} olarak %{export_format}"
         notice: İhracatınız şu anda devam ediyor. Tamamlandığında bir e-posta alacaksınız.
+      help_sections:
+        error: Yardım bölümleri güncellenirken bir hata oluştu
+        form:
+          save: Kayıt etmek
+        success: Bölümler başarıyla güncellenmiş Yardım
       impersonatable_users:
         index:
           filter:
@@ -301,11 +322,12 @@ tr:
         areas: alanlar
         configuration: Yapılandırma
         dashboard: gösterge paneli
+        help_sections: Yardım bölümleri
         homepage: Anasayfa
         impersonations: impersonations
         newsletters: Haber bültenleri
         oauth_applications: OAuth uygulamaları
-        officializations: Officializations
+        participants: Katılımcılar
         scope_types: Kapsam türleri
         scopes: kapsamları
         settings: Ayarlar
@@ -545,6 +567,21 @@ tr:
         update:
           error: Bu kapsamı güncellerken bir hata oluştu.
           success: Kapsam başarıyla güncellendi
+      static_page_topics:
+        create:
+          error: Yeni bir konu oluştururken bir hata oluştu.
+          success: Konu başarıyla oluşturuldu.
+        destroy:
+          success: Konu başarıyla yok edildi
+        edit:
+          title: Konuyu düzenle
+          update: Konuyu güncelle
+        new:
+          create: Konu oluştur
+          title: Yeni Konu
+        update:
+          error: Bu konu güncellenirken bir hata oluştu.
+          success: Konu başarıyla güncellendi
       static_pages:
         actions:
           view: Genel sayfayı görüntüle
@@ -557,11 +594,18 @@ tr:
           changed_notably_help: İşaretlenirse, kullanıcılar yeni şartlar ve koşulları kabul etmek için bilgilendirileceklerdir.
           title: Sayfayı düzenle
           update: Güncelleştirme
+        form:
+          none: Yok
         index:
           last_notable_change: Son önemli değişiklik
         new:
-          create: yaratmak
+          create: Sayfa oluştur
           title: Yeni sayfa
+        topic:
+          destroy: Konuyu kaldır
+          edit: Konuyu düzenle
+          empty: Bu konunun altında sayfa yok
+          without_topic: Konu olmayan sayfalar
         update:
           error: Bu sayfa güncellenirken bir hata oluştu.
           success: Sayfa başarıyla güncellendi
@@ -573,13 +617,16 @@ tr:
         dashboard: gösterge paneli
         impersonatable_users: Impersonatable kullanıcılar
         impersonations: impersonations
-        officializations: Officializations
+        participants: Katılımcılar
         scope_types: Kapsam türleri
         scopes: kapsamları
         static_pages: Sayfalar
         user_groups: Kullanıcı Grupları
         users: Kullanıcılar
       user_group:
+        csv_verify:
+          invalid: CSV dosyasını okurken bir hata oluştu.
+          success: CSV dosyası başarıyla yüklendi, kriterleri karşılayan kullanıcı gruplarını doğrularız. Bu biraz zaman alabilir.
         reject:
           invalid: Bu kullanıcı grubunu reddederken bir hata oluştu.
           success: Kullanıcı grubu başarıyla reddedildi
@@ -599,6 +646,12 @@ tr:
             pending: kadar
             rejected: Reddedilen
             verified: Doğrulanmış
+          verify_via_csv: CSV ile doğrulayın
+      user_groups_csv_verifications:
+        new:
+          explanation: CSV dosyanızı yükleyin. Dosyanın ilk sütunundaki kullanıcı gruplarının resmi e-postalarının, başlıksız olarak olması gerekir. Sadece e-postalarını onaylayan ve CSV dosyasında görünen bir e-postaya sahip olan kullanıcı grupları doğrulanacaktır.
+          title: CSV dosyanızı yükleyin
+          upload: Yükleme
       users:
         create:
           error: Bu kullanıcıyı davet ederken bir hata oluştu.

data/config/locales/uk.yml

@@ -304,7 +304,6 @@ uk:
         impersonations: Виступи в ролі учасника
         newsletters: Розсилання новин
         oauth_applications: Додатки OAuth
-        officializations: Надання службового статусу
         scope_types: Різновиди обсягу
         scopes: Обсяги
         settings: Налаштування
@@ -555,7 +554,6 @@ uk:
         index:
           last_notable_change: Остання помітна зміна
         new:
-          create: Додати
           title: Створити сторінку
         update:
           error: При спробі оновити цю сторінку сталася помилка.
@@ -568,7 +566,6 @@ uk:
         dashboard: Приладна дошка
         impersonatable_users: Учасники, в ролі яких можна виступати
         impersonations: Виступи в ролі учасника
-        officializations: Надання службового статусу
         scope_types: Різновиди обсягу
         scopes: Обсяги
         static_pages: Сторінки

data/config/routes.rb

@@ -18,6 +18,7 @@ Decidim::Admin::Engine.routes.draw do
     end
 
     resources :static_pages
+    resources :static_page_topics, except: [:index]
     resources :scope_types, except: [:show]
     resources :scopes, except: [:show] do
       resources :scopes, except: [:show]
@@ -62,8 +63,13 @@ Decidim::Admin::Engine.routes.draw do
         put :verify
         put :reject
       end
+      collection do
+        resource :user_groups_csv_verification, only: [:new, :create], path: "csv_verification"
+      end
     end
 
+    resource :help_sections, only: [:show, :update]
+
     resources :oauth_applications
 
     root to: "dashboard#show"

data/lib/decidim/admin/engine.rb

@@ -44,7 +44,10 @@ module Decidim
                     decidim_admin.static_pages_path,
                     icon_name: "book",
                     position: 4,
-                    active: :inclusive,
+                    active: [%w(
+                      decidim/admin/static_pages
+                      decidim/admin/static_page_topics
+                    ), []],
                     if: allowed_to?(:read, :static_page)
 
           menu.item I18n.t("menu.users", scope: "decidim.admin"),

data/lib/decidim/admin/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.15.2"
+      "0.16.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -136,28 +136,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -185,6 +185,7 @@ files:
 - app/assets/javascripts/decidim/admin/subform_toggler.component.js.es6
 - app/assets/javascripts/decidim/admin/tab_focus.js.es6
 - app/assets/javascripts/decidim/admin/toggle_nav.js.es6
+- app/assets/javascripts/decidim/admin/welcome_notification.js.es6
 - app/assets/stylesheets/decidim/admin/_decidim.scss
 - app/assets/stylesheets/decidim/admin/_variables.scss
 - app/assets/stylesheets/decidim/admin/application.scss.erb
@@ -275,6 +276,7 @@ files:
 - app/commands/decidim/admin/create_scope.rb
 - app/commands/decidim/admin/create_scope_type.rb
 - app/commands/decidim/admin/create_static_page.rb
+- app/commands/decidim/admin/create_static_page_topic.rb
 - app/commands/decidim/admin/deliver_newsletter.rb
 - app/commands/decidim/admin/destroy_area.rb
 - app/commands/decidim/admin/destroy_category.rb
@@ -284,10 +286,12 @@ files:
 - app/commands/decidim/admin/destroy_participatory_space_private_user.rb
 - app/commands/decidim/admin/destroy_scope.rb
 - app/commands/decidim/admin/destroy_static_page.rb
+- app/commands/decidim/admin/destroy_static_page_topic.rb
 - app/commands/decidim/admin/hide_resource.rb
 - app/commands/decidim/admin/impersonate_user.rb
 - app/commands/decidim/admin/invite_admin.rb
 - app/commands/decidim/admin/officialize_user.rb
+- app/commands/decidim/admin/process_user_group_verification_csv.rb
 - app/commands/decidim/admin/promote_managed_user.rb
 - app/commands/decidim/admin/publish_component.rb
 - app/commands/decidim/admin/reject_user_group.rb
@@ -304,6 +308,7 @@ files:
 - app/commands/decidim/admin/update_component.rb
 - app/commands/decidim/admin/update_component_permissions.rb
 - app/commands/decidim/admin/update_content_block.rb
+- app/commands/decidim/admin/update_help_sections.rb
 - app/commands/decidim/admin/update_newsletter.rb
 - app/commands/decidim/admin/update_oauth_application.rb
 - app/commands/decidim/admin/update_organization.rb
@@ -312,10 +317,12 @@ files:
 - app/commands/decidim/admin/update_scope.rb
 - app/commands/decidim/admin/update_scope_type.rb
 - app/commands/decidim/admin/update_static_page.rb
+- app/commands/decidim/admin/update_static_page_topic.rb
 - app/commands/decidim/admin/update_user_groups.rb
 - app/commands/decidim/admin/verify_user_group.rb
 - app/constraints/decidim/admin/organization_dashboard_constraint.rb
 - app/controllers/concerns/decidim/admin/participatory_space_admin_context.rb
+- app/controllers/concerns/decidim/admin/user_groups.rb
 - app/controllers/decidim/admin/application_controller.rb
 - app/controllers/decidim/admin/area_types_controller.rb
 - app/controllers/decidim/admin/areas_controller.rb
@@ -329,6 +336,7 @@ files:
 - app/controllers/decidim/admin/concerns/has_private_users.rb
 - app/controllers/decidim/admin/dashboard_controller.rb
 - app/controllers/decidim/admin/exports_controller.rb
+- app/controllers/decidim/admin/help_sections_controller.rb
 - app/controllers/decidim/admin/impersonatable_users_controller.rb
 - app/controllers/decidim/admin/impersonations_controller.rb
 - app/controllers/decidim/admin/logs_controller.rb
@@ -344,13 +352,13 @@ files:
 - app/controllers/decidim/admin/organization_homepage_controller.rb
 - app/controllers/decidim/admin/scope_types_controller.rb
 - app/controllers/decidim/admin/scopes_controller.rb
+- app/controllers/decidim/admin/static_page_topics_controller.rb
 - app/controllers/decidim/admin/static_pages_controller.rb
 - app/controllers/decidim/admin/user_groups_controller.rb
+- app/controllers/decidim/admin/user_groups_csv_verifications_controller.rb
 - app/controllers/decidim/admin/users_controller.rb
 - app/events/decidim/attachment_created_event.rb
 - app/events/decidim/component_published_event.rb
-- app/events/decidim/participatory_process_step_activated_event.rb
-- app/events/decidim/participatory_process_step_changed_event.rb
 - app/forms/decidim/admin/area_form.rb
 - app/forms/decidim/admin/area_type_form.rb
 - app/forms/decidim/admin/attachment_collection_form.rb
@@ -358,6 +366,8 @@ files:
 - app/forms/decidim/admin/category_form.rb
 - app/forms/decidim/admin/component_form.rb
 - app/forms/decidim/admin/content_block_form.rb
+- app/forms/decidim/admin/help_section_form.rb
+- app/forms/decidim/admin/help_sections_form.rb
 - app/forms/decidim/admin/impersonate_user_form.rb
 - app/forms/decidim/admin/managed_user_promotion_form.rb
 - app/forms/decidim/admin/newsletter_form.rb
@@ -371,6 +381,8 @@ files:
 - app/forms/decidim/admin/scope_form.rb
 - app/forms/decidim/admin/scope_type_form.rb
 - app/forms/decidim/admin/static_page_form.rb
+- app/forms/decidim/admin/static_page_topic_form.rb
+- app/forms/decidim/admin/user_group_csv_verification_form.rb
 - app/frontend/components/autocomplete.component.test.tsx
 - app/frontend/components/autocomplete.component.tsx
 - app/frontend/entry.ts
@@ -390,6 +402,7 @@ files:
 - app/jobs/decidim/admin/expire_impersonation_job.rb
 - app/jobs/decidim/admin/newsletter_delivery_job.rb
 - app/jobs/decidim/admin/newsletter_job.rb
+- app/jobs/decidim/admin/verify_user_group_from_csv_job.rb
 - app/mailers/decidim/admin/application_mailer.rb
 - app/permissions/decidim/admin/permissions.rb
 - app/permissions/decidim/admin/user_manager_permissions.rb
@@ -431,6 +444,9 @@ files:
 - app/views/decidim/admin/devise/mailers/password_change.html.erb
 - app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
 - app/views/decidim/admin/exports/_dropdown.html.erb
+- app/views/decidim/admin/help_sections/_form.html.erb
+- app/views/decidim/admin/help_sections/show.erb
+- app/views/decidim/admin/help_sections/update.html.erb
 - app/views/decidim/admin/impersonatable_users/index.html.erb
 - app/views/decidim/admin/impersonations/_form.html.erb
 - app/views/decidim/admin/impersonations/_handler_form.html.erb
@@ -471,13 +487,18 @@ files:
 - app/views/decidim/admin/scopes/edit.html.erb
 - app/views/decidim/admin/scopes/index.html.erb
 - app/views/decidim/admin/scopes/new.html.erb
+- app/views/decidim/admin/static_page_topics/_form.html.erb
+- app/views/decidim/admin/static_page_topics/edit.html.erb
+- app/views/decidim/admin/static_page_topics/new.html.erb
 - app/views/decidim/admin/static_pages/_form.html.erb
 - app/views/decidim/admin/static_pages/_form_notable_changes.html.erb
+- app/views/decidim/admin/static_pages/_topic.html.erb
 - app/views/decidim/admin/static_pages/edit.html.erb
 - app/views/decidim/admin/static_pages/index.html.erb
 - app/views/decidim/admin/static_pages/new.html.erb
 - app/views/decidim/admin/static_pages/show.html.erb
 - app/views/decidim/admin/user_groups/index.html.erb
+- app/views/decidim/admin/user_groups_csv_verifications/new.html.erb
 - app/views/decidim/admin/users/_form.html.erb
 - app/views/decidim/admin/users/index.html.erb
 - app/views/decidim/admin/users/new.html.erb
@@ -561,7 +582,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim organization administration

data/app/events/decidim/participatory_process_step_activated_event.rb

@@ -1,23 +0,0 @@
-# frozen-string_literal: true
-
-module Decidim
-  class ParticipatoryProcessStepActivatedEvent < Decidim::Events::SimpleEvent
-    include Rails.application.routes.mounted_helpers
-
-    def resource_path
-      @resource_path ||= decidim_participatory_processes.participatory_process_participatory_process_steps_path(participatory_process_slug: participatory_space.slug)
-    end
-
-    def resource_url
-      @resource_url ||= decidim_participatory_processes
-                        .participatory_process_participatory_process_steps_url(
-                          participatory_process_slug: participatory_space.slug,
-                          host: participatory_space.organization.host
-                        )
-    end
-
-    def participatory_space
-      resource.participatory_process
-    end
-  end
-end

data/app/events/decidim/participatory_process_step_changed_event.rb

@@ -1,23 +0,0 @@
-# frozen-string_literal: true
-
-module Decidim
-  class ParticipatoryProcessStepChangedEvent < Decidim::Events::SimpleEvent
-    include Rails.application.routes.mounted_helpers
-
-    def resource_path
-      @resource_path ||= decidim_participatory_processes.participatory_process_participatory_process_steps_path(participatory_process_slug: participatory_space.slug)
-    end
-
-    def resource_url
-      @resource_url ||= decidim_participatory_processes
-                        .participatory_process_participatory_process_steps_url(
-                          participatory_process_slug: participatory_space.slug,
-                          host: participatory_space.organization.host
-                        )
-    end
-
-    def participatory_space
-      resource.participatory_process
-    end
-  end
-end