Better Bootstrap use and fix dropdown actions

sakaicontrib · Apr 26, 2024 · ce5155a · ce5155a
1 parent c0fdfd0
commit ce5155a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 25 deletions.
diff --git a/tool/src/webapp/jsp/certviewAdmin.jsp b/tool/src/webapp/jsp/certviewAdmin.jsp
@@ -75,7 +75,7 @@
                     </nav>
                 </div>
             </div>
-            <table id="cList" class="table table-hover table-striped table-bordered" summary="Certificates">
+            <table id="cList" class="table table-hover table-striped table-bordered mt-2" summary="Certificates">
                 <thead>
                     <tr>
                         <th class="colCertificate"><spring:message code="form.label.certificate"/></th>
@@ -96,22 +96,25 @@
                             </td>
                             <td class="colActions colMin">
                                 <div class="btn-group pull-right">
-                                    <button id="" type="button" class="btn btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        <span class="sr-only"><spring:message code="form.actions" /></span>
+                                    <button type="button" class="btn btn-xs btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                                         <span><spring:message code="form.actions" /></span>
                                         <span class="caret"></span>
                                     </button>
-                                    <ul class="dropdown-menu row" role="menu">
-                                        <li class="dropdown-button">
-                                            <a href="first.form?certId=${cert.id}">
+                                    <ul class="dropdown-menu">
+                                        <li>
+                                            <a class="dropdown-item" href="first.form?certId=${cert.id}">
                                                 <spring:message code="form.actions.edit" />
                                             </a>
-                                            <c:if test="${cert.status == 'ACTIVE'}" >
-                                                <a id="report${cert.id}" href="reportView.form?certId=${cert.id}" onclick="SPNR.insertSpinnerInPreallocated( this, null, 'spinner_${cert.id}' );">
+                                        </li>
+                                        <c:if test="${cert.status == 'ACTIVE'}" >
+                                            <li>
+                                                <a class="dropdown-item" id="report${cert.id}" href="reportView.form?certId=${cert.id}" onclick="SPNR.insertSpinnerInPreallocated( this, null, 'spinner_${cert.id}' );">
                                                     <spring:message code="form.label.report.cell" />
                                                 </a>
-                                            </c:if>
-                                            <a href="#" onClick="deleteCert('${cert.id}')">
+                                            </li>
+                                        </c:if>
+                                        <li>
+                                            <a class="dropdown-item" href="#" onClick="deleteCert('${cert.id}')">
                                                 <spring:message code="form.actions.remove" />
                                             </a>
                                         </li>

diff --git a/tool/src/webapp/jsp/createCertificateFour.jsp b/tool/src/webapp/jsp/createCertificateFour.jsp
@@ -122,10 +122,10 @@
             </div>
         </span>
     </div>
-    <div>
-        <input id="save" type="button" value="<spring:message code='form.submit.activateCert' />" />
-        <input id="back" type="button" value="<spring:message code='form.submit.back' />" />
-        <input id="cancel" type="button" value="<spring:message code='form.submit.cancel' />" />
+    <div class="my-2">
+        <input id="save" class="btn btn-primary" type="button" value="<spring:message code='form.submit.activateCert' />" />
+        <input id="back" class="btn" type="button" value="<spring:message code='form.submit.back' />" />
+        <input id="cancel" class="btn" type="button" value="<spring:message code='form.submit.cancel' />" />
         <form:hidden path="submitValue" />
     </div>
 </form:form>

diff --git a/tool/src/webapp/jsp/createCertificateOne.jsp b/tool/src/webapp/jsp/createCertificateOne.jsp
@@ -61,9 +61,9 @@
         </tbody>
     </table>
 
-    <div>
-        <input id="continue" type="button" value="<spring:message code='form.submit.continue' />" />
-        <input id="cancel" type="button" value="<spring:message code='form.submit.cancel' />" />
+    <div class="my-2">
+        <input id="continue" class="btn btn-primary" type="button" value="<spring:message code='form.submit.continue' />" />
+        <input id="cancel" class="btn" type="button" value="<spring:message code='form.submit.cancel' />" />
         <form:hidden path="submitValue" />
     </div>
 </form:form>

diff --git a/tool/src/webapp/jsp/createCertificateThree.jsp b/tool/src/webapp/jsp/createCertificateThree.jsp
@@ -60,10 +60,10 @@
             </tbody>
         </table>
     </div>
-    <div>
-        <input id="continue" type="button" value="<spring:message code='form.submit.continue' />" />
-        <input id="back" type="button" value="<spring:message code='form.submit.back' />" />
-        <input id="cancel" type="button" value="<spring:message code='form.submit.cancel' />" />
+    <div class="my-2">
+        <input id="continue" class="btn btn-primary" type="button" value="<spring:message code='form.submit.continue' />" />
+        <input id="back" class="btn" type="button" value="<spring:message code='form.submit.back' />" />
+        <input id="cancel" class="btn" type="button" value="<spring:message code='form.submit.cancel' />" />
         <form:hidden path="submitValue" />
     </div>
 </form:form>

diff --git a/tool/src/webapp/jsp/createCertificateTwo.jsp b/tool/src/webapp/jsp/createCertificateTwo.jsp
@@ -85,10 +85,10 @@
             <spring:message code="form.label.showRequirements"/>
         </label>
     </div>
-    <div>
-        <input id="continue" type="button" value="<spring:message code='form.submit.continue' />" />
-        <input id="back" type="button" value="<spring:message code='form.submit.back' />" />
-        <input id="cancel" type="button" value="<spring:message code='form.submit.cancel' />" />
+    <div class="my-2">
+        <input id="continue" class="btn btn-primary" type="button" value="<spring:message code='form.submit.continue' />" />
+        <input id="back" type="button" class="btn" value="<spring:message code='form.submit.back' />" />
+        <input id="cancel" type="button" class="btn" value="<spring:message code='form.submit.cancel' />" />
         <form:hidden path="submitValue" />
     </div>
 </form:form>