decidim-conferences 0.27.4 → 0.28.0.rc5

data/config/locales/zh-TW.yml

@@ -6,7 +6,6 @@ zh-TW:
         assemblies_ids: 相關大會
         available_slots: 可用時段
         banner_image: 橫幅圖片
-        consultations_ids: 相關咨詢
         copy_categories: 複製類別
         copy_components: 複製組件
         copy_features: 複製功能
@@ -34,6 +33,7 @@ zh-TW:
         slug: URL名稱
         start_date: 開始日期
         title: 標題
+        weight: 排序位置
       conference_media_link:
         date: 日期
         link: 連結
@@ -63,7 +63,6 @@ zh-TW:
         personal_url: 個人 URL
         position: 職位
         short_bio: 簡介
-        twitter_handle: Twitter 處理
         user_id: 使用者
       conference_user_role:
         email: 電子郵件
@@ -74,7 +73,7 @@ zh-TW:
         conference_registration_invite:
           attributes:
             email:
-              already_invited: 已發出邀請到此電子郵件
+              already_invited: 已發出邀請到此電子郵件.
   activerecord:
     models:
       decidim/conference:
@@ -87,7 +86,6 @@ zh-TW:
     admin:
       actions:
         confirm: 確認
-        new_conference: 新的會議
         send_diplomas: 發送出席證明書
       conference_copies:
         new:
@@ -150,7 +148,6 @@ zh-TW:
         form:
           title: 基本資訊
         index:
-          not_published: 未發佈
           published: 已發佈
         new:
           create: 建立
@@ -191,7 +188,6 @@ zh-TW:
           conference_invites: 邀請
           conference_speakers: 講者
           diploma: 出席證明書
-          info: 資訊
           media_links: 媒體連結
           moderations: 版主
           partners: 夥伴
@@ -202,7 +198,6 @@ zh-TW:
         conference:
           fields:
             created_at: 建立於
-            promoted: 重點顯示
             published: 已發佈
             title: 標題
         conference_speaker:
@@ -326,9 +321,6 @@ zh-TW:
         title: 講者
     conferences:
       admin:
-        conference_copies:
-          form:
-            slug_help: 'URL 標識符用於生成指向此會議的 URL。僅接受字母、數字和破折號，並且必須以字母開頭。例如：%{url}'
         conference_invites:
           create:
             error: 邀請參與者加入會議時發生問題。
@@ -345,7 +337,6 @@ zh-TW:
               all: 全部
               rejected: 已拒絕
               sent: 傳送
-            filter_by: 篩選條件
             invite_attendee: 邀請參與者
             invites: 邀請
             search: 搜尋
@@ -369,7 +360,6 @@ zh-TW:
             available_slots_help: 如果您有無限的可用名額，請將其設置為0。
             registrations_count:
               other: 已有 %{count} 個註冊。
-            slug_help: 'URL 標識符用於生成指向此會議的 URL。僅接受字母、數字和破折號，並且必須以字母開頭。例如：%{url}'
         diplomas:
           edit:
             save: 儲存
@@ -403,18 +393,11 @@ zh-TW:
           cancel: 取消
           confirm: 確認
         show:
-          free: 免費
           going: 正在出席
           no_slots_available: 無法預約
           registration: 註冊
       conference_program:
-        program_meeting:
-          content: 內容
-          location: 位置
-          speakers: 講者
-          streaming: 串流直播
         show:
-          day: 日
           program: 節目表
       conference_registration_mailer:
         confirmation:
@@ -429,16 +412,13 @@ zh-TW:
         create:
           invalid: 加入此會議時發生問題。
           success: 您已成功加入此會議。
-          unauthorized: 在註冊會議前，您需要先登錄。
         decline_invitation:
           invalid: 拒絕邀請出現問題。
           success: 您已成功拒絕邀請。
-          unauthorized: 在拒絕邀請前，您需要先登錄。
         destroy:
           invalid: 離開此會議時發生問題。
           success: 您已成功離開此會議。
       conference_speaker:
-        go_to_twitter: 轉到Twitter
         more_info: 更多資訊
         personal_website: 個人網址
         show:
@@ -447,18 +427,17 @@ zh-TW:
       conference_speaker_cell:
         personal_url:
           personal_website: 個人網址
-        twitter_handle:
-          go_to_twitter: 轉到Twitter
       conference_speakers:
         index:
-          speakers: 講者
+          speakers:
+            other: 講者
       conferences:
         partners:
           collaborators: 夥伴
           main_promotors: 組織者
         show:
           login_as: 您已登入為 %{name} <%{email}>
-          make_conference_registration: '請在此會議中完成註冊：'
+          make_conference_registration: 註冊參加會議
           register: 註冊
       content_blocks:
         highlighted_conferences:
@@ -501,37 +480,18 @@ zh-TW:
       pages:
         home:
           highlighted_conferences:
-            active_conferences: 正在進行的會議
-            conferences_button_title: 顯示所有會議的會議頁面連結
-      photo:
-        image:
-          attributes:
-            alt: 媒體圖片
-        show:
-          close_modal: 關閉視窗
-          photo: 圖片
-      photos_list:
-        show:
-          related_photos: 圖片
+            active_spaces: 正在進行的會議
       registration_types:
         index:
           choose_an_option: '選擇您的註冊選項:'
-          login_as: 您已登入為 %{name} <%{email}>
           no_registrations: 沒有註冊
           register: 登錄
           title: 註冊類型
-      shared:
-        conference_user_login:
-          already_account: 你已經在 Decidim 中擁有帳戶了嗎？
-          new_user: 新用戶?
-          sign_in: 登入以註冊參加會議
-          sign_up: 在 Decidim 建立一個帳號以註冊會議。
       show:
         details: 詳細資料
         introduction: 簡介
         objectives: 目標
         related_assemblies: 相關大會
-        related_consultations: 相關咨詢
         related_participatory_processes: 相關參與過程
     events:
       conferences:
@@ -590,9 +550,6 @@ zh-TW:
     decidim:
       conference_hero:
         register: 註冊
-      conference_widgets:
-        show:
-          take_part: 參與
       conferences:
         conference:
           more_info: 更多資訊
@@ -602,11 +559,7 @@ zh-TW:
         order_by_conferences:
           conferences:
             other: "%{count} 個會議"
-        promoted_conference:
-          more_info: 更多資訊
-          take_part: 參與
       conferences_nav:
-        conference_menu_item: 訊息
         conference_partners_menu_item: 夥伴
         conference_speaker_menu_item: 講者
         media: 媒體

data/db/migrate/20221116084952_add_weight_to_conferences.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddWeightToConferences < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_conferences, :weight, :integer, null: false, default: 0
+  end
+end

data/lib/decidim/api/conference_speaker_type.rb

@@ -10,7 +10,7 @@ module Decidim
       field :full_name, GraphQL::Types::String, "Full name of the speaker", null: true
       field :position, Decidim::Core::TranslatedFieldType, "Position of the speaker in the conference", null: true
       field :affiliation, Decidim::Core::TranslatedFieldType, "Affiliation of the speaker", null: true
-      field :twitter_handle, GraphQL::Types::String, "Twitter handle", null: true
+      field :twitter_handle, GraphQL::Types::String, "X handle", null: true
       field :short_bio, Decidim::Core::TranslatedFieldType, "Short biography of the speaker", null: true
       field :personal_url, GraphQL::Types::String, "Personal URL of the speaker", null: true
       field :avatar, GraphQL::Types::String, "Avatar of the speaker", null: true

data/lib/decidim/conferences/admin_engine.rb

@@ -3,6 +3,7 @@
 require "rails"
 require "active_support/all"
 require "decidim/core"
+require "decidim/conferences/menu"
 
 module Decidim
   module Conferences
@@ -46,12 +47,12 @@ module Decidim
             end
           end
 
-          resources :attachment_collections, controller: "conference_attachment_collections"
-          resources :attachments, controller: "conference_attachments"
+          resources :attachment_collections, controller: "conference_attachment_collections", except: [:show]
+          resources :attachments, controller: "conference_attachments", except: [:show]
         end
 
         scope "/conferences/:conference_slug" do
-          resources :categories
+          resources :categories, except: [:show]
 
           resources :components do
             resource :permissions, controller: "component_permissions"
@@ -88,149 +89,24 @@ module Decidim
         end
       end
 
-      initializer "decidim_conferences.admin_conferences_components_menu" do
-        Decidim.menu :admin_conferences_components_menu do |menu|
-          current_participatory_space.components.each do |component|
-            caption = translated_attribute(component.name)
-            if component.primary_stat.present?
-              caption += content_tag(:span, component.primary_stat, class: component.primary_stat.zero? ? "component-counter component-counter--off" : "component-counter")
-            end
-
-            menu.add_item [component.manifest_name, component.id].join("_"),
-                          caption.html_safe,
-                          manage_component_path(component),
-                          active: is_active_link?(manage_component_path(component)) ||
-                                  is_active_link?(decidim_admin_conferences.edit_component_path(current_participatory_space, component)) ||
-                                  is_active_link?(decidim_admin_conferences.edit_component_permissions_path(current_participatory_space, component)) ||
-                                  participatory_space_active_link?(component),
-                          if: component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name)
-          end
-        end
+      initializer "decidim_conferences_admin.components_menu" do
+        Decidim::Conferences::Menu.register_admin_conferences_components_menu!
       end
-      initializer "decidim_conferences.conferences_admin_registrations_menu" do
-        Decidim.menu :conferences_admin_registrations_menu do |menu|
-          menu.add_item :conference_registration_types,
-                        I18n.t("registration_types", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.conference_registration_types_path(current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.conference_registration_types_path(current_participatory_space)),
-                        if: allowed_to?(:read, :registration_type, conference: current_participatory_space)
-
-          menu.add_item :conference_conference_registrations,
-                        I18n.t("user_registrations", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.conference_conference_registrations_path(current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.conference_conference_registrations_path(current_participatory_space)),
-                        if: allowed_to?(:read, :conference_registration, conference: current_participatory_space)
 
-          menu.add_item :conference_conference_invites,
-                        I18n.t("conference_invites", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.conference_conference_invites_path(current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.conference_conference_invites_path(current_participatory_space)),
-                        if: allowed_to?(:read, :conference_invite, conference: current_participatory_space)
-
-          menu.add_item :edit_conference_diploma,
-                        I18n.t("diploma", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.edit_conference_diploma_path(current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.edit_conference_diploma_path(current_participatory_space)),
-                        if: allowed_to?(:update, :conference, conference: current_participatory_space)
-        end
+      initializer "decidim_conferences_admin.registrations_menu" do
+        Decidim::Conferences::Menu.register_conferences_admin_registrations_menu!
       end
-      initializer "decidim_conferences.conferences_admin_attachments_menu" do
-        Decidim.menu :conferences_admin_attachments_menu do |menu|
-          menu.add_item :conference_attachment_collections,
-                        I18n.t("attachment_collections", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.conference_attachment_collections_path(current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.conference_attachment_collections_path(current_participatory_space)),
-                        if: allowed_to?(:read, :attachment_collection, conference: current_participatory_space)
 
-          menu.add_item :conference_attachments,
-                        I18n.t("attachment_files", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.conference_attachments_path(current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.conference_attachments_path(current_participatory_space)),
-                        if: allowed_to?(:read, :attachment, conference: current_participatory_space)
-        end
+      initializer "decidim_conferences_admin.attachments_menu" do
+        Decidim::Conferences::Menu.register_conferences_admin_attachments_menu!
       end
-      initializer "decidim_conferences.conferences_admin_menu" do
-        Decidim.menu :conferences_admin_menu do |menu|
-          menu.add_item :edit_conference,
-                        I18n.t("info", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.edit_conference_path(current_participatory_space),
-                        position: 1,
-                        if: allowed_to?(:update, :conference, conference: current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.edit_conference_path(current_participatory_space))
-
-          menu.add_item :components,
-                        I18n.t("components", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.components_path(current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.components_path(current_participatory_space)),
-                        if: allowed_to?(:read, :component, conference: current_participatory_space),
-                        submenu: { target_menu: :admin_conferences_components_menu, options: { container_options: { id: "components-list" } } }
 
-          menu.add_item :categories,
-                        I18n.t("categories", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.categories_path(current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.categories_path(current_participatory_space)),
-                        if: allowed_to?(:read, :category, conference: current_participatory_space)
-
-          menu.add_item :attachments,
-                        I18n.t("attachments", scope: "decidim.admin.menu.conferences_submenu"),
-                        "#",
-                        active: is_active_link?(decidim_admin_conferences.conference_attachment_collections_path(current_participatory_space)) ||
-                                is_active_link?(decidim_admin_conferences.conference_attachments_path(current_participatory_space)),
-                        if: allowed_to?(:read, :attachment_collection, conference: current_participatory_space) ||
-                            allowed_to?(:read, :attachment, conference: current_participatory_space),
-                        submenu: { target_menu: :conferences_admin_attachments_menu }
-
-          menu.add_item :conference_media_links,
-                        I18n.t("media_links", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.conference_media_links_path(current_participatory_space),
-                        if: allowed_to?(:read, :media_link, conference: current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.conference_media_links_path(current_participatory_space))
-
-          menu.add_item :conference_partners,
-                        I18n.t("partners", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.conference_partners_path(current_participatory_space),
-                        if: allowed_to?(:read, :partner, conference: current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.conference_partners_path(current_participatory_space))
-
-          menu.add_item :conference_speakers,
-                        I18n.t("conference_speakers", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.conference_speakers_path(current_participatory_space),
-                        if: allowed_to?(:read, :conference_speaker, conference: current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.conference_speakers_path(current_participatory_space))
-
-          menu.add_item :registrations,
-                        I18n.t("registrations", scope: "decidim.admin.menu.conferences_submenu"),
-                        "#",
-                        active: false,
-                        if: allowed_to?(:read, :conference_invite, conference: current_participatory_space) ||
-                            allowed_to?(:read, :registration_type, conference: current_participatory_space) ||
-                            allowed_to?(:read, :conference_registration, conference: current_participatory_space),
-                        submenu: { target_menu: :conferences_admin_registrations_menu }
-
-          menu.add_item :conference_user_roles,
-                        I18n.t("conference_admins", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.conference_user_roles_path(current_participatory_space),
-                        if: allowed_to?(:read, :conference_user_role, conference: current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.conference_user_roles_path(current_participatory_space))
-
-          menu.add_item :moderations,
-                        I18n.t("moderations", scope: "decidim.admin.menu.conferences_submenu"),
-                        decidim_admin_conferences.moderations_path(current_participatory_space),
-                        if: allowed_to?(:read, :moderation, conference: current_participatory_space),
-                        active: is_active_link?(decidim_admin_conferences.moderations_path(current_participatory_space))
-        end
+      initializer "decidim_conferences_admin.conferences_menu" do
+        Decidim::Conferences::Menu.register_conferences_admin_menu!
       end
 
-      initializer "decidim_conferences.admin_menu" do
-        Decidim.menu :admin_menu do |menu|
-          menu.add_item :conferences,
-                        I18n.t("menu.conferences", scope: "decidim.admin"),
-                        decidim_admin_conferences.conferences_path,
-                        icon_name: "microphone",
-                        position: 2.8,
-                        active: :inclusive,
-                        if: allowed_to?(:enter, :space_area, space_name: :conferences)
-        end
+      initializer "decidim_conferences_admin.menu" do
+        Decidim::Conferences::Menu.register_admin_menu_modules!
       end
     end
   end

data/lib/decidim/conferences/content_blocks/registry_manager.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module ContentBlocks
+      class RegistryManager
+        def self.register!
+          Decidim.content_blocks.register(:homepage, :highlighted_conferences) do |content_block|
+            content_block.cell = "decidim/conferences/content_blocks/highlighted_conferences"
+            content_block.public_name_key = "decidim.conferences.content_blocks.highlighted_conferences.name"
+            content_block.settings_form_cell = "decidim/conferences/content_blocks/highlighted_conferences_settings_form"
+
+            content_block.settings do |settings|
+              settings.attribute :max_results, type: :integer, default: 6
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/decidim/conferences/engine.rb

@@ -6,6 +6,8 @@ require "decidim/core"
 require "wicked_pdf"
 
 require "decidim/conferences/query_extensions"
+require "decidim/conferences/content_blocks/registry_manager"
+require "decidim/conferences/menu"
 
 module Decidim
   module Conferences
@@ -28,7 +30,6 @@ module Decidim
           get :user, to: "conferences#user_diploma"
           resources :conference_speakers, only: :index, path: "speakers"
           resources :conference_program, only: :show, path: "program"
-          resource :conference_widget, only: :show, path: "embed"
           resources :registration_types, only: :index, path: "registration" do
             resource :conference_registration, only: [:create, :destroy] do
               collection do
@@ -50,33 +51,34 @@ module Decidim
         end
       end
 
+      initializer "decidim_conferences.register_icons" do
+        Decidim.icons.register(name: "Decidim::Conference", icon: "mic-line", description: "Conference", category: "activity", engine: :conferences)
+        Decidim.icons.register(name: "conference_speaker", icon: "user-voice-line", description: "Speaker", category: "conferences", engine: :conferences)
+
+        Decidim.icons.register(name: "film-line", icon: "film-line", category: "system", description: "", engine: :conferences)
+        Decidim.icons.register(name: "ticket-line", icon: "ticket-line", category: "system", description: "", engine: :conferences)
+        Decidim.icons.register(name: "user-follow-line", icon: "user-follow-line", category: "system", description: "", engine: :conferences)
+        Decidim.icons.register(name: "link-m", icon: "link-m", category: "system", description: "", engine: :conferences)
+      end
+
       initializer "decidim_conferences.add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Conferences::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Conferences::Engine.root}/app/views") # for partials
       end
 
-      initializer "decidim.stats" do
+      initializer "decidim_conferences.stats" do
         Decidim.stats.register :conferences_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, _start_at, _end_at|
-          Decidim::Conference.where(organization: organization).public_spaces.count
+          Decidim::Conference.where(organization:).public_spaces.count
         end
       end
 
       initializer "decidim_conferences.menu" do
-        Decidim.menu :menu do |menu|
-          menu.add_item :conferences,
-                        I18n.t("menu.conferences", scope: "decidim"),
-                        decidim_conferences.conferences_path,
-                        position: 2.8,
-                        if: Decidim::Conference.where(organization: current_organization).published.any?,
-                        active: :inclusive
-        end
+        Decidim::Conferences::Menu.register_menu!
+        Decidim::Conferences::Menu.register_home_content_block_menu!
       end
 
       initializer "decidim_conferences.content_blocks" do
-        Decidim.content_blocks.register(:homepage, :highlighted_conferences) do |content_block|
-          content_block.cell = "decidim/conferences/content_blocks/highlighted_conferences"
-          content_block.public_name_key = "decidim.conferences.content_blocks.highlighted_conferences.name"
-        end
+        Decidim::Conferences::ContentBlocks::RegistryManager.register!
       end
 
       initializer "decidim_conferences.query_extensions" do