Fix modals

Author: JelteF

media/commitfest/css/commitfest.css

@@ -2,6 +2,10 @@
  * commitfest.postgresql.org specific styles
  */
 
+body {
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
 /* Bootstrap 5 inline delete/close buttons */
 .btn-outline-danger.btn-sm {
     font-size: 0.75rem;

media/commitfest/js/commitfest.js

@@ -180,7 +180,8 @@ function addAnnotation(threadid) {
     $("#annotateThreadList").find("option").remove();
     $("#annotateMessage").val("");
     $("#annotateMsgId").val("");
-    $("#annotateModal").modal();
+    const modal = new bootstrap.Modal(document.getElementById('annotateModal'));
+    modal.show();
     $("#annotateThreadList").focus();
     updateAnnotationMessages(threadid);
     $("#doAnnotateMessageButton").unbind("click");
@@ -204,7 +205,7 @@ function addAnnotation(threadid) {
                     alert(data);
                     $("#annotateMessageBody").removeClass("loading");
                 } else {
-                    $("#annotateModal").modal("hide");
+                    modal.hide();
                     location.reload();
                 }
             })
@@ -247,7 +248,8 @@ function deleteAnnotation(annid) {
 }
 
 function flagCommitted(committer) {
-    $("#commitModal").modal();
+    const modal = new bootstrap.Modal(document.getElementById('commitModal'));
+    modal.show();
     $("#committerSelect")[0].selectize.setValue(committer);
     $("#doCommitButton").unbind("click");
     $("#doCommitButton").click(() => {
@@ -305,6 +307,7 @@ function togglePatchFilterButton(buttonId, collapseId) {
  * Upstream user search dialog
  */
 function search_and_store_user() {
+    const modal = new bootstrap.Modal(document.getElementById('searchUserModal'));
     $("#doSelectUserButton").unbind("click");
     $("#doSelectUserButton").click(() => {
         if (!$("#searchUserList").val()) {
@@ -318,7 +321,7 @@ function search_and_store_user() {
             .success((data) => {
                 if (data === "OK") {
                     alert("User imported!");
-                    $("#searchUserModal").modal("hide");
+                    modal.hide();
                 } else {
                     alert(`Failed to import user: ${data}`);
                 }
@@ -330,7 +333,7 @@ function search_and_store_user() {
         return false;
     });
 
-    $("#searchUserModal").modal();
+    modal.show();
 }
 
 function findUsers() {

pgcommitfest/commitfest/templates/patch.html

@@ -220,8 +220,8 @@ <h4>Annotations</h4>
   <div class="modal-dialog modal-lg">
    <div class="modal-content">
     <div class="modal-header">
+     <h4 class="modal-title">Flag as committed</h4>
      <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-     <h3>Flag as committed</h3>
     </div>
     <div class="modal-body">
      <form class="form" style="margin-bottom: 5px;">
@@ -249,8 +249,8 @@ <h3>Flag as committed</h3>
  <div class="modal fade" id="annotateModal" role="dialog">
   <div class="modal-dialog modal-lg"><div class="modal-content">
    <div class="modal-header">
+    <h4 class="modal-title">Add annotation</h4>
     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-    <h3>Add annotation</h3>
    </div>
    <div id="annotateMessageBody" class="modal-body">
     <div>Pick one of the messages in this thread</div>