chore: upgrade javascript libraries to newer versions in HTML files (#…

…10041) * Update bootstrap.min.js * update boostrap.min.css file in jans-casa * Update header.zul * Update header.zul * Update popper-1.16.min.js * fix underline and change button propertiest * fix css in table, tr and td * update style in admin properties * fix text color in casa plugins * update color text in plugins --------- Co-authored-by: Jose Gonzalez <[email protected]> Former-commit-id: eb52c85
JanssenProject · Nov 6, 2024 · 030ea25 · 030ea25
1 parent 5185f23
commit 030ea25
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 39 deletions.
diff --git a/jans-casa/app/src/main/resources/css-component-rules.properties b/jans-casa/app/src/main/resources/css-component-rules.properties
@@ -8,7 +8,7 @@ sectionsWrapper=ph3 ph4-l cust-sections-wrapper
 
 section=mb4 shadow-4 bg-blank cust-section
 
-panel=pa3 bb b--moon-gray cust-panel
+panel=p-3 border-bottom b-moon-gray cust-panel
 
 modalWindow=cust-modal-window
 
@@ -18,11 +18,11 @@ linkButton=pa0 bw0 br0 blue hover-dark-blue underline-hover bg-transparent btn c
 
 deleteButton=f7 bw0 br1 ph2 pv1 red bg-washed-red hover-white hover-bg-light-red btn cust-delete-button
 
-primaryButton=f7 bw0 br1 ph3 pv2 bg-bsgreen-success white hover-bsgreen-success hover-white btn cust-primary-button
+primaryButton=btn f7 border-0 rounded-0 px-3 py-2 bg-success text-white hover-bg-success hover-text-white cust-primary-button me-3
 
 secondaryButton=f7 bw0 br1 ph3 pv2 bg-orange2 white hover-bg-orange2 hover-white btn cust-misc-button
 
-tertiaryButton=f7 bw0 br1 ph3 pv2 dark-blue2 bg-moon-gray hover-dark-blue btn cust-cancel-button
+tertiaryButton=btn f7 border-0 rounded-0 px-3 py-2 bg-moon-gray hover-bg-moon-gray hover-dark-blue text-dark-blue cust-cancel-button z-button
 
 textInput=f7-cust ph2 pv1 ba br1 b--black-20 dark-gray text-field cust-text-input
 

diff --git a/jans-casa/app/src/main/resources/labels/admin.properties b/jans-casa/app/src/main/resources/labels/admin.properties
@@ -12,9 +12,9 @@ adm.main_subintro={
 <p class="f6">
 The following pages contain relevant guidelines for casa administration:
 <ul>
-<li><a class="dark-blue" href="#" target="_blank">Two-factor authentication in casa</a></li>
-<li><a class="dark-blue" href="#" target="_blank">Admin console config tasks</a></li>
-<li><a class="dark-blue" href="#" target="_blank">Troubleshooting</a></li>
+<li><a class="dark-blue text-decoration-none" href="#" target="_blank">Two-factor authentication in casa</a></li>
+<li><a class="dark-blue text-decoration-none" href="#" target="_blank">Admin console config tasks</a></li>
+<li><a class="dark-blue text-decoration-none" href="#" target="_blank">Troubleshooting</a></li>
 </ul>
 </p>
 }

diff --git a/jans-casa/app/src/main/webapp/admin.zul b/jans-casa/app/src/main/webapp/admin.zul
@@ -10,7 +10,7 @@
             <h1 class="f3 dark-blue2">${labels.adm.main_title}</h1>
             <p class="f6">${labels.adm.main_intro}</p>
             ${labels.adm.main_subintro}
-            <a href="${zkService.contextPath}/user.zul">Return to your credentials page</a>.
+            <a href="${zkService.contextPath}/user.zul" class="text-decoration-none">Return to your credentials page</a>.
         </div>
 
     </z:div>

diff --git a/jans-casa/app/src/main/webapp/admin/plugins.zul b/jans-casa/app/src/main/webapp/admin/plugins.zul
@@ -25,16 +25,16 @@
                     <h:table class="table table-hover table-sm" visible="@load(not empty vm.pluginList)">
                         <thead>
                             <tr>
-                                <th scope="col" class="w4-ns">${labels.adm.plugins_pluginId}</th>
-                                <th scope="col" class="dtc-ns">${labels.adm.plugins_implements}</th>
-                                <th scope="col" class="w3"></th>
+                                <th scope="col" class="w-23 w-sm-50 w-md-75 text-secondary">${labels.adm.plugins_pluginId}</th>
+                                <th scope="col" class="dtc-ns text-secondary">${labels.adm.plugins_implements}</th>
+                                <th scope="col" class="w-25 text-secondary"></th>
                             </tr>
                         </thead>
                         <h:tbody children="@load(vm.pluginList)" sclass="f7">
                             <zk:template name="children">
                                 <h:tr sclass="pointer" onClick="@('showPlugin', each.descriptor.pluginId)">
-                                    <td><z:label value="@load(c:cat3(each.descriptor.pluginId, ' ', each.descriptor.version))" /></td>
-                                    <td class="dn dtc-ns">
+                                    <td class="text-secondary w-30"><z:label value="@load(c:cat3(each.descriptor.pluginId, ' ', each.descriptor.version))" /></td>
+                                    <td class="dn dtc-ns text-secondary w-100">
                                         <z:div children="@load(each.extensions)">
                                             <zk:template name="children">
                                                 <z:label sclass="db" value="@load(each)" />
@@ -72,18 +72,18 @@
                             <table class="table table-sm">
                                 <tbody class="f7">
                                     <tr>
-                                        <td>${labels.adm.plugins_pluginId}</td>
+                                        <td class="text-secondary">${labels.adm.plugins_pluginId}</td>
                                         <td><z:label sclass="dark-gray" value="@load(vm.pluginToShow.descriptor.pluginId)" /></td>
                                     </tr>
                                     <tr>
-                                        <td>${labels.adm.plugins_version}</td>
+                                        <td class="text-secondary">${labels.adm.plugins_version}</td>
                                         <td><z:label sclass="dark-gray" value="@load(vm.pluginToShow.descriptor.version)" /></td>
                                     </tr>
                                     <tr>
-                                        <td>${labels.adm.plugins_path}</td>
+                                        <td class="text-secondary">${labels.adm.plugins_path}</td>
                                         <td><z:label sclass="dark-gray" value="@load(vm.pluginToShow.path)" /></td>
                                     </tr>
-                                    <td>${labels.adm.plugins_implements}</td>
+                                    <td class="text-secondary">${labels.adm.plugins_implements}</td>
                                     <td>
                                         <z:div children="@load(vm.pluginToShow.extensions)">
                                             <zk:template name="children">
@@ -92,15 +92,15 @@
                                         </z:div>
                                     </td>
                                     <tr>
-                                        <td>${labels.adm.plugins_developer}</td>
+                                        <td class="text-secondary">${labels.adm.plugins_developer}</td>
                                         <td><z:label sclass="dark-gray" value="@load(empty vm.pluginToShow.descriptor.provider ? c:l('adm.plugins_nodata') : vm.pluginToShow.descriptor.provider)" /></td>
                                     </tr>
                                     <tr>
-                                        <td>${labels.adm.plugins_description}</td>
+                                        <td class="text-secondary">${labels.adm.plugins_description}</td>
                                         <td><z:label sclass="dark-gray" value="@load(empty vm.pluginToShow.descriptor.pluginDescription ? c:l('adm.plugins_nodata') : vm.pluginToShow.descriptor.pluginDescription)" /></td>
                                     </tr>
                                     <tr>
-                                        <td>${labels.adm.plugins_license}</td>
+                                        <td class="text-secondary">${labels.adm.plugins_license}</td>
                                         <td><z:label sclass="dark-gray" value="@load(empty vm.pluginToShow.descriptor.license ? c:l('adm.plugins_nodata') : vm.pluginToShow.descriptor.license)" /></td>
                                     </tr>
                                 </tbody>

diff --git a/jans-casa/app/src/main/webapp/back-home.zul b/jans-casa/app/src/main/webapp/back-home.zul
@@ -1,7 +1,7 @@
 <z:zk xmlns:z="http://www.zkoss.org/2005/zul" xmlns="native">
 
     <div class="${css.contentHeading} bg-green tc">
-        <a class="f6 na2 white hover-white db" href="${zkService.contextPath}/user.zul">
+        <a class="f6 na2 white hover-white db text-decoration-none" href="${zkService.contextPath}/user.zul">
             <i class="fas fa-arrow-left" />
             &amp;nbsp;<z:label value="${c:l(c:indexOf(desktop.requestPath, '/admin/') ge 0 ? 'adm.back_main' : 'general.back_main')}" />
         </a>

diff --git a/jans-casa/app/src/main/webapp/header.zul b/jans-casa/app/src/main/webapp/header.zul
@@ -26,9 +26,9 @@
         <!-- drop-down menu -->
         <nav class="ph3">
             <z:div class="dropdown" viewModel="@('io.jans.casa.ui.vm.HeaderViewModel')">
-                <a href="javascript:;" class="dropdown-toggle gray hover-dark-gray" role="button" id="dropdownMenu"
-                   data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                    <span class="pr1">
+                <a href="javascript:;" class="dropdown-toggle gray hover-dark-gray text-decoration-none" role="button" id="dropdownMenu"
+                   data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                    <span class="ps-2">
                         <z:zk if="${empty sessionContext.user.pictureURL}">
                             <i class="fas fa-user f2-cust pt1" />
                         </z:zk>
@@ -45,7 +45,7 @@
                         <i class="fas fa-chevron-down f7" style="padding-top:2px" />
                     </span>
                 </a>
-                <ul class="dropdown-menu dropdown-menu-right f7 shadow-5 br1 mt2 bw0 miw-2r w4" aria-labelledby="dropdownMenu">
+                <ul class="dropdown-menu dropdown-menu-end f7 shadow-5 br1 mt2 bw0 miw-2r w4" aria-labelledby="dropdownMenu">
                     <li class="pv1 pl2 pr3 bg-white-70">
                         <a class="link hover-green gray db" href="#" target="_blank">
                             <i class="fas fa-question-circle" />&amp;nbsp; ${labels.general.help}

diff --git a/jans-casa/app/src/main/webapp/scripts/bootstrap.min.js b/jans-casa/app/src/main/webapp/scripts/bootstrap.min.js
diff --git a/jans-casa/app/src/main/webapp/scripts/popper-1.16.min.js b/jans-casa/app/src/main/webapp/scripts/popper-1.16.min.js
diff --git a/jans-casa/app/src/main/webapp/styles/bootstrap.min.css b/jans-casa/app/src/main/webapp/styles/bootstrap.min.css