Move recaptcha js from form_button.html to base.html

Author: vsalvino

coderedcms/templates/coderedcms/includes/form_button.html

@@ -21,26 +21,6 @@
   >
   {{ button_text|default:page.button_text }}
 </button>
-<script>
-  function recaptchaSubmit(formId) {
-    var form = document.getElementById(formId);
-    if (form.reportValidity()) {
-      grecaptcha.ready(function() {
-        grecaptcha.execute(
-          '{{ ls.recaptcha_public_key }}',
-          {action: 'submit'}
-        ).then(function(token) {
-          // Set value for every token input on the page.
-          document.getElementsByName("g-recaptcha-response").forEach(
-            function(el) {el.value = token}
-          );
-          var form = document.getElementById(formId);
-          form.submit();
-        });
-      });
-    }
-  }
-</script>
 {% else %}
 <button type="submit" class="btn {{page.button_size}} {{page.button_style}} {{page.button_css_class}}">
   {{ button_text|default:page.button_text }}

coderedcms/templates/coderedcms/pages/base.html

@@ -191,6 +191,25 @@ <h2 class="text-center my-5">{% trans "Related" %}</h2>
   {% with settings.coderedcms.LayoutSettings as ls %}
   {% if ls.spam_service == ls.SpamService.RECAPTCHA_V3 %}
   <script src="https://www.google.com/recaptcha/api.js?render={{ ls.recaptcha_public_key }}"></script>
+  <script>
+    function recaptchaSubmit(formId) {
+      var form = document.getElementById(formId);
+      if (form.reportValidity()) {
+        grecaptcha.ready(function() {
+          grecaptcha.execute(
+            '{{ ls.recaptcha_public_key }}',
+            {action: 'submit'}
+          ).then(function(token) {
+            // Set value for every token input on the page.
+            document.getElementsByName("g-recaptcha-response").forEach(
+              function(el) {el.value = token}
+            );
+            document.getElementById(formId).submit();
+          });
+        });
+      }
+    }
+  </script>
   {% elif ls.spam_service == ls.SpamService.RECAPTCHA_V2 %}
   <script src="https://www.google.com/recaptcha/api.js"></script>
   {% endif %}