Merge pull request #3563 from hennevogel/bugfix/3552

Fix code of conduct during the registration

app/views/conference_registrations/_registration_info.html.haml

@@ -1,8 +1,11 @@
 - if @conference.code_of_conduct.present?
+  %h4
+    Code of Conduct for
+    = @conference.short_title
+  = markdown @conference.code_of_conduct
   - if @registration.accepted_code_of_conduct
     = icon 'fa-solid', 'square-check'
-    I have read and accepted the
+    I have read and accepted the Code of Conduct
-    = link_to "Code of Conduct", code_of_conduct_conference_path(@conference.short_title)
   - else
     .checkbox
       %label

app/views/conference_registrations/show.html.haml

@@ -21,23 +21,20 @@
           .fa-stack
             .fa-solid.fa-square-dashed
             .fa-solid.fa-handshake
-          Code of Conduct
+          = link_to code_of_conduct_conference_path(@conference.short_title) do
+            Code of Conduct
         %ul.fa-ul
           - if @registration.accepted_code_of_conduct
             %li.text-info
               %span.fa-li
                 = icon('fa-solid', 'check')
-              You have accepted the
+              You have accepted the Code of Conduct
-              = link_to 'Code of Conduct', '#',
-                data: { toggle: 'modal', target: '#modal-code-of-conduct'}
           - else
             %li.text-warning
               %span.fa-li
                 = icon('fa-solid', 'circle-exclamation')
-              You need to accept the
+              You need to accept the Code of Conduct. Please
-              = link_to 'Code of Conduct', '#',
+              = link_to 'edit your Registration.', edit_conference_conference_registration_path(@conference.short_title), disabled: @conference.end_date < Date.today
-                data: { toggle: 'modal', target: '#modal-code-of-conduct'}
-          = render 'conferences/code_of_conduct'
   - if @conference.surveys.for_registration.any?
     .row
       .col-md-12