decidim-conferences 0.28.4 → 0.28.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040603c6aeb63cc76a35fa359b76aa9707de26ddc67277994fc7ceef5e4e04fc
-  data.tar.gz: ddcfa0eb3534e322a57b8c4cd1da0542c7abeb12e5f809ba7b8eb42be4ae5d87
+  metadata.gz: 990d72a44756dcb32fb0bbf413558a22352d97331eb59b44d280f9b8e4a0cd47
+  data.tar.gz: 9b8ca058ecec8486c955abce1036113013762c3ce564b9e5afcb3c53fb6c7abe
 SHA512:
-  metadata.gz: 951c929096cfd644b07e8586f0c3e927414fb08800ae44f3d269f1c868a08c2d11f71c8deae95aea7bb6c99ba20bf609047dda28cba4f8eae1c6041f8c6c9f97
-  data.tar.gz: dedb930878ff2916c1288c129cd5372827ed516beec76da8227ff36e7dd20cbae248dbdee64a53957a59671fea35ca72b30eff9e75a870bc11fff3689d3260b2
+  metadata.gz: 1edfc7e86efae9d46b977ea253ce9ac31bcc6194189fc52fb5ffd653899a970c0c1df8049071812bf61e76677cd7c126d519592ccf167aea7e38f66366b718ab
+  data.tar.gz: ce86a61a52e8cff75f692eabee4c50c510a12fb8610df98e8aa1938c6588a90e5aa3f97892291b689aef2ea9f470a23122d5a7f1a60b60f4ce3086b109c179bd

data/app/forms/decidim/conferences/admin/conference_form.rb

@@ -12,10 +12,10 @@ module Decidim
 
         translatable_attribute :title, String
         translatable_attribute :slogan, String
-        translatable_attribute :short_description, String
-        translatable_attribute :description, String
-        translatable_attribute :objectives, String
-        translatable_attribute :registration_terms, String
+        translatable_attribute :short_description, Decidim::Attributes::RichText
+        translatable_attribute :description, Decidim::Attributes::RichText
+        translatable_attribute :objectives, Decidim::Attributes::RichText
+        translatable_attribute :registration_terms, Decidim::Attributes::RichText
 
         mimic :conference
 

data/app/forms/decidim/conferences/admin/conference_speaker_form.rb

@@ -10,7 +10,7 @@ module Decidim
 
         translatable_attribute :position, String
         translatable_attribute :affiliation, String
-        translatable_attribute :short_bio, String
+        translatable_attribute :short_bio, Decidim::Attributes::RichText
 
         mimic :conference_speaker
 

data/app/forms/decidim/conferences/admin/registration_type_form.rb

@@ -11,7 +11,7 @@ module Decidim
         mimic :conference_registration_type
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
 
         attribute :weight, Integer
         attribute :price, Decimal

data/app/mailers/decidim/conferences/admin/send_conference_diploma_mailer.rb

@@ -33,14 +33,18 @@ module Decidim
         private
 
         def add_diploma_attachment
-          diploma = WickedPdf.new.pdf_from_string(
+          diploma = WickedPdf.new.pdf_from_string(pdf_content, orientation: "Landscape")
+
+          attachments["conference-#{@user.nickname.parameterize}-diploma.pdf"] = diploma
+        end
+
+        def pdf_content
+          Premailer.new(
             render_to_string(pdf: "conference-diploma",
                              template: "decidim/conferences/admin/send_conference_diploma_mailer/diploma_user",
                              layout: "decidim/diploma"),
-            orientation: "Landscape"
-          )
-
-          attachments["conference-#{@user.nickname.parameterize}-diploma.pdf"] = diploma
+            with_html_string: true
+          ).to_inline_css
         end
       end
     end

data/app/models/decidim/conference.rb

@@ -136,7 +136,7 @@ module Decidim
     end
 
     def user_roles(role_name = nil)
-      roles = Decidim::ConferenceUserRole.where(conference: self)
+      roles = Decidim::ConferenceUserRole.order_by_name.where(conference: self)
       return roles if role_name.blank?
 
       roles.where(role: role_name)

data/app/permissions/decidim/conferences/permissions.rb

@@ -3,6 +3,8 @@
 module Decidim
   module Conferences
     class Permissions < Decidim::DefaultPermissions
+      include Decidim::UserRoleChecker
+
       def permissions
         user_can_enter_space_area?
 
@@ -42,6 +44,7 @@ module Decidim
         user_can_export_conference_registrations?
         user_can_confirm_conference_registration?
         user_can_create_conference?
+        user_can_upload_images_in_conference?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
@@ -314,6 +317,11 @@ module Decidim
       def conference
         @conference ||= context.fetch(:current_participatory_space, nil) || context.fetch(:conference, nil)
       end
+
+      # Checks of assigned admins can upload images in the conference
+      def user_can_upload_images_in_conference?
+        allow! if user&.admin_terms_accepted? && user_has_any_role?(user, conference, broad_check: true) && (permission_action.subject == :editor_image)
+      end
     end
   end
 end

data/app/views/decidim/conferences/admin/media_links/new.html.erb

@@ -1,7 +1,7 @@
 <% add_decidim_page_title(t("media_links.new.title", scope: "decidim.admin")) %>
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("conference_speakers.new.title", scope: "decidim.admin") %>
+    <%= t("media_links.new.title", scope: "decidim.admin") %>
   </h1>
 </div>
 <div class="item__edit item__edit-1col">

data/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb

@@ -1,11 +1,14 @@
 <main class="conference-diploma">
   <div class="diploma__border">
     <div class="diploma__content">
-      <div class="small-11 small-centered">
-        <div class="diploma__logo small-4 small-centered">
-          <%= wicked_pdf_image_tag @conference.attached_uploader(:main_logo).variant_url(:thumb) %>
-        </div>
-        <div class="diploma__name small-10 small-centered">
+      <div>
+        <% logo = @conference.attached_uploader(:main_logo).variant(:thumb) %>
+        <% if logo %>
+          <div class="diploma__logo">
+            <%= image_tag "data:#{logo.blob.content_type};base64, #{Base64.encode64(logo.download.presence || "")}" %>
+          </div>
+        <% end %>
+        <div class="diploma__name">
           <h2><strong><%= translated_attribute(@conference.title) %></strong></h2>
           <h3><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.certificate_of_attendance") %></h3>
           <p><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.certificate_of_attendance_description", user: @user.name, title: translated_attribute(@conference.title), location: @conference.location, start: l(@conference.start_date, format: :decidim_short), end: l(@conference.end_date, format: :decidim_short) ).html_safe %></p>
@@ -13,9 +16,10 @@
         <hr class="mt-m mb-m">
         <div class="diploma__attendance">
           <strong><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.attendance_verified_by") %></strong>
-          <div>
-            <%= wicked_pdf_image_tag @conference.attached_uploader(:signature).variant_url(:thumb) %>
-          </div>
+          <% signature = @conference.attached_uploader(:signature).variant(:thumb) %>
+          <% if signature %>
+            <div><%= image_tag "data:#{signature.blob.content_type};base64, #{Base64.encode64(signature.download.presence || "")}" %></div>
+          <% end %>
           <%= l(@conference.sign_date, format: :decidim_short) %>, <%= @conference.signature_name %>
         </div>
       </div>

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

@@ -3,7 +3,7 @@
   <head>
       <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
       <meta name="viewport" content="width=device-width">
-      <%= wicked_pdf_stylesheet_pack_tag "decidim_conference_diploma" %>
+      <%= stylesheet_pack_tag "decidim_conference_diploma" %>
     </head>
   <body>
     <%= yield %>

data/config/initializers/wicked_pdf.rb

@@ -14,8 +14,6 @@ WickedPdf.config = {
   # Path to the wkhtmltopdf executable: This usually is not needed if using
   # one of the wkhtmltopdf-binary family of gems.
   # exe_path: '/usr/local/bin/wkhtmltopdf',
-  #   or
-  exe_path: Gem.bin_path("wkhtmltopdf-binary", "wkhtmltopdf")
 
   # Layout file to be used for all PDFs
   # (but can be overridden in `render :pdf` calls)

data/config/locales/ar.yml

@@ -63,6 +63,8 @@ ar:
         email: البريد الإلكتروني
         name: اسم
         role: وظيفة
+      partner:
+        logo: الشعار
   activerecord:
     models:
       decidim/conference:
@@ -116,13 +118,11 @@ ar:
         destroy:
           success: تم حذف رئيس المؤتمر بنجاح.
         edit:
-          title: تحديث المتحدث المؤتمر.
           update: تحديث
         index:
           conference_speakers_title: المتحدثون في المؤتمر
         new:
           create: إنشاء
-          title: رئيس المؤتمر الجديد.
         update:
           error: حدثت مشكلة أثناء تحديث متحدث المؤتمر هذا.
           success: تم تحديث مكبر صوت المؤتمر بنجاح.
@@ -133,11 +133,9 @@ ar:
         destroy:
           success: تمت إزالة مسؤول المؤتمر بنجاح.
         edit:
-          title: تحديث مسؤول المؤتمر.
           update: تحديث
         new:
           create: إنشاء
-          title: مشرف المؤتمر الجديد.
         update:
           error: حدثت مشكلة أثناء تحديث مشرف المؤتمر هذا.
           success: تم تحديث مشرف المؤتمر بنجاح.
@@ -166,20 +164,12 @@ ar:
       media_links:
         create:
           error: حدثت مشكلة أثناء إنشاء رابط وسائط جديد.
-          success: تم إنشاء رابط الوسائط بنجاح.
-        destroy:
-          success: تم حذف رابط الوسائط بنجاح.
         edit:
-          title: تحديث رابط الوسائط.
           update: تحديث
-        index:
-          media_links_title: روابط الوسائط
         new:
           create: إنشاء
-          title: وصلة الوسائط
         update:
           error: حدثت مشكلة أثناء تحديث رابط الوسائط هذا.
-          success: تم تحديث رابط الوسائط بنجاح.
       menu:
         conferences: المؤتمرات
         conferences_submenu:
@@ -191,14 +181,10 @@ ar:
           conference_admins: المشرفون على المؤتمر
           conference_invites: تدعو
           conference_speakers: مكبرات الصوت
-          diploma: شهادة حضور
           info: عن هذا المؤتمر
-          media_links: روابط الوسائط
           moderations: الإعتدال
           partners: شركاء
-          registration_types: أنواع التسجيل
           registrations: التسجيلات
-          user_registrations: تسجيلات المستخدم
       models:
         conference:
           fields:
@@ -227,7 +213,6 @@ ar:
             date: تاريخ
             link: حلقة الوصل
             title: عنوان
-          name: وصلة الوسائط
         partner:
           fields:
             link: حلقة الوصل
@@ -253,7 +238,6 @@ ar:
         destroy:
           success: تمت إزالة شريك المؤتمر بنجاح.
         edit:
-          title: تحديث شريك.
           update: تحديث
         new:
           create: إنشاء
@@ -275,7 +259,6 @@ ar:
         destroy:
           success: تمت إزالة نوع تسجيل المؤتمر بنجاح.
         edit:
-          title: تحديث نوع التسجيل.
           update: تحديث
         new:
           create: إنشاء
@@ -369,7 +352,6 @@ ar:
         diplomas:
           edit:
             save: حفظ
-            title: شهادة حضور
         invite_join_conference_mailer:
           invite:
             decline: رفض الدعوة "%{conference_title}"
@@ -388,7 +370,6 @@ ar:
             diploma_html: ستجد شهادة حضور المؤتمر <a href="%{url}">%{title}</a> في المرفقات.
           diploma_user:
             attendance_verified_by: تم التحقق من الحضور بواسطة
-            certificate_of_attendance: شهادة حضور
             certificate_of_attendance_description: هذا هو التأكيد على أن <strong>%{user}</strong> قد حضر وشارك في <strong>%{title}</strong> الذي عقد في <strong>%{location}</strong> في <strong>%{start} - %{end}</strong>
         send_diploma:
           error: حدثت مشكلة أثناء إرسال شهادات حضور المؤتمر.

data/config/locales/bg.yml

@@ -120,13 +120,11 @@ bg:
         destroy:
           success: Говорителят на конференцията беше изтрит успешно.
         edit:
-          title: Актуализиране на говорителя на конференцията.
           update: Актуализация
         index:
           conference_speakers_title: Говорители на конференция
         new:
           create: Създаване
-          title: Нов говорител на конференция.
         update:
           error: Възникна проблем при актуализирането на този говорител на конференцията.
           success: Говорителят на конференцията беше актуализиран успешно.
@@ -137,13 +135,11 @@ bg:
         destroy:
           success: Администраторът на конференцията беше премахнат успешно.
         edit:
-          title: Актуализиране на администратора на конференцията.
           update: Актуализация
         index:
           conference_admins_title: Администратори на конференция
         new:
           create: Създаване
-          title: Нов администратор на конференция.
         update:
           error: Възникна проблем при актуализирането на този администратор на конференцията.
           success: Администраторът на конференцията беше актуализиран успешно.
@@ -173,20 +169,12 @@ bg:
       media_links:
         create:
           error: Възникна проблем при създаването на нов медия линк.
-          success: Медийният линк беше създаден успешно.
-        destroy:
-          success: Медийният линк беше изтрит успешно.
         edit:
-          title: Актуализиране на медийния линк.
           update: Актуализация
-        index:
-          media_links_title: Медийни линкове
         new:
           create: Създаване
-          title: Медия линк
         update:
           error: Възникна проблем при актуализирането на този медия линк.
-          success: Медийният линк беше актуализиран успешно.
       menu:
         conferences: Конференции
         conferences_submenu:
@@ -198,15 +186,11 @@ bg:
           conference_admins: Администратори на конференция
           conference_invites: Покани
           conference_speakers: Говорители
-          diploma: Сертификати за присъствие
           info: Относно тази конференция
-          media_links: Медия линкове
           moderations: Модерации
           partners: Партньори
-          registration_types: Типове регистрация
           registrations: Регистрации
           see_conference: Виз конференцията
-          user_registrations: Потребителска регистрация
       models:
         conference:
           fields:
@@ -235,7 +219,6 @@ bg:
             date: Дата
             link: Линк
             title: Заглавие
-          name: Медия линк
         partner:
           fields:
             link: Линк
@@ -261,7 +244,6 @@ bg:
         destroy:
           success: Партньорът за конференцията беше премахнат успешно.
         edit:
-          title: Актуализиране на партньора.
           update: Актуализация
         new:
           create: Създаване
@@ -283,7 +265,6 @@ bg:
         destroy:
           success: Типът регистрация за конференцията беше премахнат успешно.
         edit:
-          title: Актуализиране на типа на регистрацията.
           update: Актуализация
         new:
           create: Създаване
@@ -384,7 +365,6 @@ bg:
         diplomas:
           edit:
             save: Запази
-            title: Сертификати за присъствие
         invite_join_conference_mailer:
           invite:
             decline: Отказ на поканата за „%{conference_title}“
@@ -404,7 +384,6 @@ bg:
             diploma_html: Ще намерите сертификата за присъствие на конференцията <a href="%{url}">%{title}</a> в прикачените файлове.
           diploma_user:
             attendance_verified_by: Присъствието е потвърдено от
-            certificate_of_attendance: Сертификати за присъствие
             certificate_of_attendance_description: С настоящото се удостоверява, че <strong>%{user}</strong> посети и взе участие в(ъв) <strong>%{title}</strong>, <strong>%{location}</strong> на <strong>%{start} — %{end}</strong>
         send_diploma:
           error: Възникна проблем при изпращането на сертификатите за присъствие на конференцията.

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1,14 @@
+---
+bs:
+  decidim:
+    admin:
+      models:
+        conference_user_role:
+          roles:
+            valuator: Procenjivač
+    events:
+      conferences:
+        role_assigned:
+          email_intro: Imenovani ste na funkciju %{role} konferencije %{resource_title}.
+          email_outro: Dobili ste ovo obaveštenje zbog toga što ste %{role} konferencije %{resource_title}.
+          email_subject: Imenovani ste na funkciju %{role} %{resource_title}.