Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 13 commits into from
Nov 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dde54cf
Update bootstrap.min.js
mjatin-dev Oct 29, 2024
c2e385b
update boostrap.min.css file in jans-casa
mjatin-dev Nov 4, 2024
bc65152
Merge branch 'main' into jans-casa-7835
mjatin-dev Nov 4, 2024
ebf08b5
Update header.zul
mjatin-dev Nov 4, 2024
646c79c
Update header.zul
mjatin-dev Nov 4, 2024
79d53fa
Update popper-1.16.min.js
mjatin-dev Nov 4, 2024
9857670
fix underline and change button propertiest
mjatin-dev Nov 5, 2024
816025d
fix css in table, tr and td
mjatin-dev Nov 5, 2024
6a51d21
update style in admin properties
mjatin-dev Nov 5, 2024
0273b44
fix text color in casa plugins
mjatin-dev Nov 5, 2024
66f51b8
update color text in plugins
mjatin-dev Nov 5, 2024
1b3c7c2
Merge branch 'main' into jans-casa-7835
jgomer2001 Nov 5, 2024
891249b
Merge branch 'main' into jans-casa-7835
moabu Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions jans-casa/app/src/main/resources/css-component-rules.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions jans-casa/app/src/main/resources/labels/admin.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
}
Expand Down
2 changes: 1 addition & 1 deletion jans-casa/app/src/main/webapp/admin.zul
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
24 changes: 12 additions & 12 deletions jans-casa/app/src/main/webapp/admin/plugins.zul
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down Expand Up @@ -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">
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion jans-casa/app/src/main/webapp/back-home.zul
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
8 changes: 4 additions & 4 deletions jans-casa/app/src/main/webapp/header.zul
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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}
Expand Down
8 changes: 4 additions & 4 deletions jans-casa/app/src/main/webapp/scripts/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions jans-casa/app/src/main/webapp/scripts/popper-1.16.min.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions jans-casa/app/src/main/webapp/styles/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading