effective_mentorships 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 569706e1dab213ee7cb6102a5242270b5b7586ffdb8d12ce5997635eb2e589dd
-  data.tar.gz: 28d54e0d12f669d3f376496c40605d00e979d29c981737416c17455e53ca0989
+  metadata.gz: 0bac641b57e5bb8212e4d09422be2faf6aaf324e5815895ebc3fcc7ab8bb2bf7
+  data.tar.gz: 42304f4ed8f6771aa9db5340ff6616e042a22daeecf15833ce9e3b3a67b01bd5
 SHA512:
-  metadata.gz: 2372c9a3629dc4b2258309dc6b2353e930e3a2f804c9332a038154d2bbeca0189b76f79b52a5419c0d2216dcc4798ae2269c5b1d3eb08264e73dc679c9efc7aa
-  data.tar.gz: 58dd46785e9737b00690408040bdbdbbf04b194d0b34da1479647eb0aee8b4eed68a001f453c922c1acdbf7ae93d7147f018002633968564446839b7b7a18a07
+  metadata.gz: ece7cbf406a81a5d2cb8aced061e74a87262a1ab9be94c668695a9a99cab3bc0b731efafbeed6991000889ebfb6aaf3b3cefab536dac645aca501a2d0ba8b31a
+  data.tar.gz: 92b24f232c54179460330f88a2d466afec28ac7997a7ab3dc3000da0a02e8bf72fe842b94ebd45f3bc6d8e9c1484e7917d7d39acc2397c3ba1580e689b1ed92b

data/app/views/admin/mentorship_cycles/_form_mentorship_cycle.html.haml

@@ -27,15 +27,19 @@
   %h2 Content
 
   - if defined?(EffectiveArticleEditor)
-    = f.article_editor :rich_text_registration_content, label: "#{mentorship_registration_label} opt-in content", hint: "Will be displayed to the user when registering for this #{mentorship_cycle_label.downcase}"
+    = f.article_editor :rich_text_registration_content, label: "#{mentorship_registration_label} opt-in content", hint: "Will be displayed to the user when registering for this #{mentorship_cycle_label.downcase}."
   - else
-    = f.rich_text_area :rich_text_registration_content, label: "#{mentorship_registration_label} opt-in content", hint: "Will be displayed to the user when registering for this #{mentorship_cycle_label.downcase}"
+    = f.rich_text_area :rich_text_registration_content, label: "#{mentorship_registration_label} opt-in content", hint: "Will be displayed to the user when registering for this #{mentorship_cycle_label.downcase}."
 
   - if defined?(EffectiveArticleEditor)
-    = f.article_editor :rich_text_group_content, label: "#{mentorship_group_label} content", hint: "Will be displayed to the user when viewing their #{mentorship_group_label.downcase} for this #{mentorship_cycle_label.downcase}"
+    = f.article_editor :rich_text_agreement_content, label: "#{mentorship_registration_label} agreement", hint: "Will be displayed to the user above a checkbox to accept."
   - else
-    = f.rich_text_area :rich_text_group_content, label: "#{mentorship_group_label} opt-in content", hint: "Will be displayed to the user when viewing their #{mentorship_group_label.downcase} for this #{mentorship_cycle_label.downcase}"
+    = f.rich_text_area :rich_text_agreement_content, label: "#{mentorship_registration_label}  agreement", hint: "Will be displayed to the user above a checkbox to accept."
 
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :rich_text_group_content, label: "#{mentorship_group_label} content", hint: "Will be displayed to the user when viewing their #{mentorship_group_label.downcase} for this #{mentorship_cycle_label.downcase}."
+  - else
+    = f.rich_text_area :rich_text_group_content, label: "#{mentorship_group_label} opt-in content", hint: "Will be displayed to the user when viewing their #{mentorship_group_label.downcase} for this #{mentorship_cycle_label.downcase} and after opt-in."
 
   = f.submit do
     = f.save 'Save'

data/app/views/effective/mentorship_registrations/_fields.html.haml

@@ -1,6 +1,9 @@
 - unless local_assigns[:namespace] == :admin
   = f.hidden_field :mentorship_cycle_id
 
+- if f.object.mentorship_cycle.rich_text_registration_content.present?
+  = f.object.mentorship_cycle.rich_text_registration_content
+
 = f.radios :opt_in, :boolean, label: "Do you wish to register in the #{f.object.mentorship_cycle || et('effective_mentorships.name')}?"
 
 = f.hide_if(:opt_in, false) do
@@ -13,8 +16,9 @@
   = f.select :location, f.object.class.locations(), required: true
   = f.radios :venue, f.object.class.venues(), required: true
 
-  - if mentorship_cycle.rich_text_registration_content.present?
-    .my-4= mentorship_cycle.rich_text_registration_content
+  - if f.object.mentorship_cycle.rich_text_agreement_content.present?
+    = card do
+      = f.object.mentorship_cycle.rich_text_agreement_content
 
   = f.check_box :accept_declaration, label: "Yes, I accept the #{et('effective_mentorships.name')} agreement", required: true
 

data/app/views/effective/mentorship_registrations/_form.html.haml

@@ -3,9 +3,14 @@
 
 - url = (mentorship_registration.persisted? ? effective_mentorships.mentorship_cycle_mentorship_registration_path(mentorship_cycle, mentorship_registration) : effective_mentorships.mentorship_cycle_mentorship_registrations_path(mentorship_cycle, mentorship_registration))
 
-= card do
-  %h2= et('effective_mentorships.name')
+%h1= et('effective_mentorships.name')
+
+- if mentorship_registration.persisted? && mentorship_registration.opt_in?
+  - if mentorship_registration.mentorship_cycle.rich_text_group_content.present?
+    = card do
+      = mentorship_registration.mentorship_cycle.rich_text_group_content
 
+= card do
   = effective_form_with(model: mentorship_registration, url: url) do |f|
     = f.hidden_field :user_id, value: current_user.id
     = render('effective/mentorship_registrations/fields', f: f)

data/lib/effective_mentorships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMentorships
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mentorships
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2024-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails