From 4fdd27018732e6f4cf853e74b484a88d4c623f77 Mon Sep 17 00:00:00 2001
From: Jan Brasna <1784648+janbrasna@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:03:36 +0200
Subject: [PATCH] Update Speaker Request form (#14874)

---
 .../press/templates/press/speaker-request.html  |  7 +++----
 media/js/libs/modernizr.custom.inputtypes.js    |  3 ---
 media/js/press/speaker-request.js               | 17 -----------------
 media/static-bundles.json                       |  7 -------
 4 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 media/js/libs/modernizr.custom.inputtypes.js
 delete mode 100644 media/js/press/speaker-request.js

diff --git a/bedrock/press/templates/press/speaker-request.html b/bedrock/press/templates/press/speaker-request.html
index 7327cd4784f..bfb8d010a25 100644
--- a/bedrock/press/templates/press/speaker-request.html
+++ b/bedrock/press/templates/press/speaker-request.html
@@ -170,7 +170,7 @@ <h2>
       </div>
 
       <div class="mzp-c-field {% if form.sr_event_speakers_confirmed.errors %}mzp-is-error{% endif %}">
-        <label class="mzp-c-field-label" or="sr_event_speakers_confirmed">Confirmed Speakers</label>
+        <label class="mzp-c-field-label" for="sr_event_speakers_confirmed">Confirmed Speakers</label>
         {{ field_with_attrs(form.sr_event_speakers_confirmed, class='mzp-c-field-control'|safe) }}
         <div class="mzp-c-field-info">{{ form.sr_event_speakers_confirmed.errors }}</div>
       </div>
@@ -216,7 +216,7 @@ <h2>
       </div>
 
       <div class="mzp-c-field {% if form.sr_presentation_topic.errors %}mzp-is-error{% endif %}">
-        <legend class="mzp-c-field-label">Topic of Presentation</legend>
+        <label class="mzp-c-field-label" for="sr_presentation_topic">Topic of Presentation</label>
         {{ field_with_attrs(form.sr_presentation_topic, class='mzp-c-field-control'|safe) }}
         <div class="mzp-c-field-info">{{ form.sr_presentation_topic.errors }}</div>
       </div>
@@ -232,7 +232,7 @@ <h2>
     <fieldset class="mzp-c-field-set">
       <legend class="mzp-c-form-subtitle">Additional Information</legend>
 
-      <div class="mzp-c-field {% if form.sr_attachment.errors %}mzp-is-error{% endif %}" id="sr_attachment">
+      <div class="mzp-c-field {% if form.sr_attachment.errors %}mzp-is-error{% endif %}">
         <label class="mzp-c-field-label" for="sr_attachment">PDF Attachment</label>
         {{ field_with_attrs(form.sr_attachment, class='mzp-c-field-control'|safe) }}
         <div class="mzp-c-field-info">
@@ -261,5 +261,4 @@ <h2>
   {% block email_form %}{% endblock %}
 
   {% block js %}
-  {{ js_bundle('press_speaker_request') }}
   {% endblock  %}
diff --git a/media/js/libs/modernizr.custom.inputtypes.js b/media/js/libs/modernizr.custom.inputtypes.js
deleted file mode 100644
index 15fdc538d07..00000000000
--- a/media/js/libs/modernizr.custom.inputtypes.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! modernizr 3.6.0 (Custom Build) | MIT *
- * https://modernizr.com/download/?-inputtypes-setclasses !*/
- !function(e,t,n){function a(e,t){return typeof e===t}function s(){var e,t,n,s,i,o,c;for(var u in r)if(r.hasOwnProperty(u)){if(e=[],t=r[u],t.name&&(e.push(t.name.toLowerCase()),t.options&&t.options.aliases&&t.options.aliases.length))for(n=0;n<t.options.aliases.length;n++)e.push(t.options.aliases[n].toLowerCase());for(s=a(t.fn,"function")?t.fn():t.fn,i=0;i<e.length;i++)o=e[i],c=o.split("."),1===c.length?Modernizr[c[0]]=s:(!Modernizr[c[0]]||Modernizr[c[0]]instanceof Boolean||(Modernizr[c[0]]=new Boolean(Modernizr[c[0]])),Modernizr[c[0]][c[1]]=s),l.push((s?"":"no-")+c.join("-"))}}function i(e){var t=u.className,n=Modernizr._config.classPrefix||"";if(f&&(t=t.baseVal),Modernizr._config.enableJSClass){var a=new RegExp("(^|\\s)"+n+"no-js(\\s|$)");t=t.replace(a,"$1"+n+"js$2")}Modernizr._config.enableClasses&&(t+=" "+n+e.join(" "+n),f?u.className.baseVal=t:u.className=t)}function o(){return"function"!=typeof t.createElement?t.createElement(arguments[0]):f?t.createElementNS.call(t,"http://www.w3.org/2000/svg",arguments[0]):t.createElement.apply(t,arguments)}var l=[],r=[],c={_version:"3.6.0",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,t){var n=this;setTimeout(function(){t(n[e])},0)},addTest:function(e,t,n){r.push({name:e,fn:t,options:n})},addAsyncTest:function(e){r.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=c,Modernizr=new Modernizr;var u=t.documentElement,f="svg"===u.nodeName.toLowerCase(),p=o("input"),d="search tel url email datetime date month week time datetime-local number range color".split(" "),m={};Modernizr.inputtypes=function(e){for(var a,s,i,o=e.length,l="1)",r=0;o>r;r++)p.setAttribute("type",a=e[r]),i="text"!==p.type&&"style"in p,i&&(p.value=l,p.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(a)&&p.style.WebkitAppearance!==n?(u.appendChild(p),s=t.defaultView,i=s.getComputedStyle&&"textfield"!==s.getComputedStyle(p,null).WebkitAppearance&&0!==p.offsetHeight,u.removeChild(p)):/^(search|tel)$/.test(a)||(i=/^(url|email)$/.test(a)?p.checkValidity&&p.checkValidity()===!1:p.value!=l)),m[e[r]]=!!i;return m}(d),s(),i(l),delete c.addTest,delete c.addAsyncTest;for(var h=0;h<Modernizr._q.length;h++)Modernizr._q[h]();e.Modernizr=Modernizr}(window,document);
diff --git a/media/js/press/speaker-request.js b/media/js/press/speaker-request.js
deleted file mode 100644
index 7a9539951e8..00000000000
--- a/media/js/press/speaker-request.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-(function () {
-    'use strict';
-
-    if (window.Modernizr.inputtypes.date) {
-        document.querySelector('.date-note').style.display = 'none';
-    }
-
-    if (window.Modernizr.inputtypes.time) {
-        document.querySelector('.time-note').style.display = 'none';
-    }
-})();
diff --git a/media/static-bundles.json b/media/static-bundles.json
index fd89d2ecbd2..5f3940f50cc 100644
--- a/media/static-bundles.json
+++ b/media/static-bundles.json
@@ -1665,13 +1665,6 @@
       ],
       "name": "annual_report_modal"
     },
-    {
-      "files": [
-        "js/libs/modernizr.custom.inputtypes.js",
-        "js/press/speaker-request.js"
-      ],
-      "name": "press_speaker_request"
-    },
     {
       "files": [
         "js/pocket/mobile-nav.es6.js",