Merge remote-tracking branch 'update/master' into github-pages

Update to Drupal 11 (from CornellCustomDev/CD-finder pr CornellCustomDev#19)

Author: nathanweeks

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/drupal:10-apache
+FROM docker.io/library/drupal:11-apache
 RUN composer require 'drupal/paragraphs:^1.19' \
  && composer require 'drupal/tome:^1.13' \
  && composer config --no-plugins allow-plugins.composer/installers true \

compose.yaml

@@ -8,8 +8,6 @@ services:
     volumes:
       - ./db:/mnt
       - ./html:/opt/drupal/html
-    profiles:
-      - drupal
 
   static:
     build: .

css/bootstrap.min.css

@@ -4,7 +4,7 @@ package: Custom
 
 type: module
 core: 8.x
-core_version_requirement: ^8 || ^9 || ^10
+core_version_requirement: ^8 || ^9 || ^10 || ^11
 dependencies:
   - paragraphs:paragraphs
 libraries:

db/drupal.sqlite

@@ -8,4 +8,4 @@ email_address: [email protected]
 email_name: Example
 main_header: Main Header
 button_select_all: Select All
-button_clear_selections: Clear Selections
+button_clear_selections: Clear Selections

finder.info.yml

@@ -30,11 +30,13 @@
         <li>\
         <div class='question-wrapper'>\
         <h4 id='question-{{id}}'>{{question}}</h4>\
-        <a class='control-indicator collapsed' data-toggle='collapse' aria-expanded='false' aria-controls='#explanation-{{id}}' href='#explanation-{{id}}''>\
+        <a class='control-indicator' data-bs-toggle='collapse' href='#explanation-{{id}}' role='button' aria-expanded='false' aria-controls='explanation-{{id}}'>\
             <span class='sr-only'>Expand {{question}}</span>\
         </a>\
         </div>\
-        <div class='explanation collapse' id='explanation-{{id}}'>{{{description}}}</div>\
+        <div class='collapse' id='explanation-{{id}}'>\
+            <div class='explanation'>{{{description}}}</div>\
+        </div>\
         <fieldset aria-labelledby='question-{{id}}'>\
         {{#choices}}\
             <div class='checkbox' facetid='{{id}}'>\
@@ -99,7 +101,7 @@
 
     // read the data from JSON endpoints
 
-    $.getJSON( "/rest/finder_settings", function( response ) {
+    $.getJSON( drupalSettings.path.baseUrl + "rest/finder_settings", function( response ) {
         //alert(JSON.stringify(response));
         $('#pagetitle').html(response.title.replace(/(?:\r\n|\r|\n)/g, '<br />'));
         $('#pagesubtitle').html(response.subtitle.replace(/(?:\r\n|\r|\n)/g, '<br />'));
@@ -108,6 +110,7 @@
         $('#pagechartheader').html(response.chart_header.replace(/(?:\r\n|\r|\n)/g, '<br />'));
         $('#pageemailformheader').html(response.email_form_header.replace(/(?:\r\n|\r|\n)/g, '<br />'));
         //$('#pageemailaddress').html(response.data.email_address);
+        contact_email = response.email_address;
         //$('#pageemailname').html(response.data.email_name);
         //$('#pageemailbody').html(response.email_body.replace(/(?:\r\n|\r|\n)/g, '<br />'));
         $('#pagemainheader').html(response.main_header.replace(/(?:\r\n|\r|\n)/g, '<br />'));
@@ -116,7 +119,7 @@
     });
 
 
-    $.getJSON( "/rest/facettree", function( response ) {
+    $.getJSON( drupalSettings.path.baseUrl + "rest/facettree", function( response ) {
 
         // JSON responses are automatically parsed.
 
@@ -207,7 +210,7 @@
 
 
     // load the services
-    $.getJSON( "/rest/servicelist", function( responseb ) {
+    $.getJSON( drupalSettings.path.baseUrl + "rest/servicelist", function( responseb ) {
         services = responseb;
         //servicelist = responseb.data;
 
@@ -568,11 +571,11 @@ function validateEmail(Email) {
             emailaddresses.push(email);
         }
         if ($("#emailtordmsg").prop("checked")) {
-            emailaddresses.push("[email protected]"); // [email protected]
+            emailaddresses.push(contact_email);
         }
         if (emailaddresses.length > 0) {
             var csrf_token;
-            $.getJSON( "/rest/session/token", function( response ) {
+            $.getJSON( drupalSettings.path.baseUrl + "rest/session/token", function( response ) {
                 csrf_token = response.data;
             });
 

finder.settings.yml

@@ -53,7 +53,7 @@
             $.error('TemplateName: ' + templateName + ' is already mapped.');
             return;
         }
-        templateMap[templateName] = $.trim(templateHtml);
+        templateMap[templateName] = templateHtml.trim();
     }
 
     /**
@@ -207,4 +207,4 @@
         });
     };
 
-}(jQuery, window));
+}(jQuery, window));