Skip to content

Upgrade/adminlte bs #627

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

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Upgrade/adminlte bs #627

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e6429d7
chore(deps): bump pdfmake and admin-lte in /agate-webapp
dependabot[bot] Oct 7, 2025
10273f2
Start changing paths and import new libs
Oct 10, 2025
2d3f5da
Used new classes - wip (replace all input-group-append)
Oct 10, 2025
e800c70
Used BS5 style El attributes
Oct 11, 2025
b3f9d47
Fixed modal in Profile page
Oct 11, 2025
7aa273b
Removed unused packages
Oct 11, 2025
ef8e687
Removed deprecated btn-block
Oct 11, 2025
16eb7be
Removed some deps and fixed login spinner
Oct 11, 2025
0bc691e
PR fixed + ued adminlte-rc4
Oct 13, 2025
c729c45
Approached the look to BS4
Oct 16, 2025
55d1556
Used old font
Oct 16, 2025
1457d4d
Added agate.scss to override adminLTE and BS classes
Oct 17, 2025
10af3c8
Updated the info color for cards
Oct 17, 2025
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
1,799 changes: 171 additions & 1,628 deletions agate-webapp/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions agate-webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"private": true,
"description": "Agate web UI",
"dependencies": {
"admin-lte": "^3.2.0",
"admin-lte": "^4.0.0-rc3",
"toastr": "^2.1.4",
"axios": "^1.12.0",
"jquery.redirect": "^1.2.0"
},
"devDependencies": {
"husky": "^9.1.7"
},
"engines": {
"node": ">=0.10.0"
"jquery": "^3.7.1",
"jquery.redirect": "^1.2.0",

"bootstrap": "^5.3.3",
"@popperjs/core": "^2.11.8",
"@fortawesome/fontawesome-free": "^6.5.2"
}
}
11 changes: 4 additions & 7 deletions agate-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,15 +190,12 @@
<includes>
<include>admin-lte/dist/**</include>
<include>admin-lte/plugins/bootstrap/**</include>
<include>admin-lte/plugins/chart.js/**</include>
<include>admin-lte/plugins/datatables/**</include>
<include>admin-lte/plugins/datatables-bs4/**</include>
<include>admin-lte/plugins/fontawesome-free/**</include>
<include>admin-lte/plugins/jquery/**</include>
<include>admin-lte/plugins/moment/**</include>
<include>admin-lte/plugins/toastr/**</include>
<include>toastr/build/**</include>
<include>@fortawesome/fontawesome-free/**</include>
<include>axios/dist/**</include>
<include>jquery/dist/**</include>
<include>jquery.redirect/**</include>
<include>bootstrap/dist/**</include>
</includes>
</resource>
</resources>
Expand Down
6 changes: 3 additions & 3 deletions agate-webapp/src/main/resources/_templates/authorize.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<input type="hidden" name="response_type" value="${responseType}">
<input type="hidden" name="state" value="${state}">
<input type="hidden" name="scope" value="${scope}">
<button type="submit" name="grant" class="btn btn-default" value="false">
<button type="submit" name="grant" class="btn btn-secondary" value="false">
<span><@message "oauth.decline"/></span>
</button>
<button type="submit" name="grant" class="btn btn-primary" value="true">
Expand All @@ -87,13 +87,13 @@
</div>
<#else>
<div class="alert alert-danger">
<h5><i class="icon fas fa-ban"></i> <@message "alert"/></h5>
<h5><i class="icon fa-solid fa-ban"></i> <@message "alert"/></h5>
<@message "oauth.application-access-denied"/>
</div>
</#if>
<#else>
<div class="alert alert-danger">
<h5><i class="icon fas fa-ban"></i> <@message "alert"/></h5>
<h5><i class="icon fa-solid fa-ban"></i> <@message "alert"/></h5>
<@message "oauth.unknown-client-application"/>
</div>
</#if>
Expand Down
14 changes: 3 additions & 11 deletions agate-webapp/src/main/resources/_templates/confirm.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,11 @@
<form id="form" method="post">
<div class="input-group mb-3">
<input name="password" type="password" class="form-control" placeholder="<@message "new-password"/>">
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-lock"></span>
</div>
</div>
<span class="input-group-text"><i class="fa-solid fa-lock"></i></span>
</div>
<div class="input-group mb-3">
<input name="password2" type="password" class="form-control" placeholder="<@message "repeat-new-password"/>">
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-lock"></span>
</div>
</div>
<span class="input-group-text"><i class="fa-solid fa-lock"></i></span>
</div>
<input name="key" type="hidden" value="${key}">
<div class="row">
Expand All @@ -63,7 +55,7 @@
</div>
<!-- /.col -->
<div class="col-6">
<button type="submit" class="btn btn-primary btn-block"><@message "submit"/></button>
<button type="submit" class="btn btn-primary w-100"><@message "submit"/></button>
</div>
<!-- /.col -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion agate-webapp/src/main/resources/_templates/error.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<h2 class="headline text-warning"> ${status!"404"}</h2>

<div class="error-content">
<h3><i class="fas fa-exclamation-triangle text-warning"></i>
<h3><i class="fa-solid fa-exclamation-triangle text-warning"></i>
<#if msg??>
<@message msg/>
<#else >
Expand Down
17 changes: 4 additions & 13 deletions agate-webapp/src/main/resources/_templates/forgot-password.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,11 @@
<form id="form" method="post">
<div class="input-group mb-3">
<input name="username" type="text" class="form-control" placeholder="<@message "sign-in-username"/>">
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-envelope"></span>
</div>
</div>
<span class="input-group-text"><i class="fa-solid fa-envelope"></i></span>
</div>
<div class="row">
<div class="col-6">
</div>
<!-- /.col -->
<div class="col-6">
<button type="submit" class="btn btn-primary btn-block"><@message "reset"/></button>
</div>
<!-- /.col -->

<div class="d-flex justify-content-end">
<button type="submit" class="btn btn-primary w-50"><@message "reset"/></button>
</div>
</form>

Expand Down
35 changes: 20 additions & 15 deletions agate-webapp/src/main/resources/_templates/index.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,42 @@
<title>${config.name!"Agate"}</title>
</head>
<body id="index-page" class="hold-transition layout-top-nav layout-navbar-fixed">
<div class="wrapper">

<div class="app-wrapper"><!-- was .wrapper -->

<!-- Navbar -->
<#-- IMPORTANT: update libs/top-navbar.ftl to use <nav class="app-header navbar ..."> and BS5 data-bs-* attrs -->
<#include "libs/top-navbar.ftl">
<!-- /.navbar -->

<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper">
<!-- Main -->
<main class="app-main"><!-- was .content-wrapper -->

<div class="jumbotron jumbotron-fluid">
<!-- Hero (BS5 replacement for jumbotron) -->
<section class="py-5 mb-4 bg-body-tertiary border-bottom">
<div class="container">
<h1 class="display-4"><@message "auth-portal-title"/></h1>
<p class="lead"><@message "auth-portal-text"/></p>
<h1 class="display-5 fw-semibold"><@message "auth-portal-title"/></h1>
<p class="lead mb-0"><@message "auth-portal-text"/></p>
</div>
</div>
</section>

<!-- Main content -->
<div class="content">
<!-- Content -->
<section class="app-content"><!-- was .content -->
<div class="container">

<@homeModel/>

</div><!-- /.container-fluid -->
</div>
<!-- /.content -->
</div>
<!-- /.content-wrapper -->
</div><!-- /.container -->
</section>
<!-- /.app-content -->

</main>
<!-- /.app-main -->

<#include "libs/footer.ftl">

</div>
<!-- ./wrapper -->
<!-- /.app-wrapper -->

<#include "libs/scripts.ftl">

Expand Down
2 changes: 1 addition & 1 deletion agate-webapp/src/main/resources/_templates/just-registered.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<#if canSignin>
<p><@message "just-registered-signin-callout"/></p>
<button type="button" onclick="location.href='signin';" class="btn btn-success btn-lg">
<i class="fas fa-sign-in-alt"></i> <@message "sign-in"/>
<i class="fa-solid fa-sign-in-alt"></i> <@message "sign-in"/>
</button>
<#else>
<p><@message "just-registered-callout"/></p>
Expand Down
6 changes: 3 additions & 3 deletions agate-webapp/src/main/resources/_templates/libs/footer.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!-- Main Footer -->
<footer class="main-footer d-print-none">
<footer class="app-footer d-print-none">
<!-- To the right -->
<#if config??>
<div class="float-right d-none d-sm-inline">
<div class="float-end d-none d-sm-inline">
<strong><@message "copyright"/> &copy; 2025 <a href="${config.portalUrl!"#"}">${config.name!""}</a>.</strong> <@message "all-rights-reserved"/>
</div>
</#if>
<#if !user?? || user.role == "agate-administrator">
<a href="${contextPath}/admin" title="<@message "administration"/>" class="float-right border-right pr-2 mr-2"><i class="fas fa-lock"></i></a>
<a href="${contextPath}/admin" title="<@message "administration"/>" class="float-right border-right pr-2 mr-2"><i class="fa-solid fa-lock"></i></a>
</#if>
<!-- Default to the left -->
<small><@message "powered-by"/> <a href="https://www.obiba.org">OBiBa Agate</a></small>
Expand Down
8 changes: 5 additions & 3 deletions agate-webapp/src/main/resources/_templates/libs/head.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
<link rel="shortcut icon" href="${faviconPath}" />

<!-- Font Awesome Icons -->
<link rel="stylesheet" href="${adminLTEPath}/plugins/fontawesome-free/css/all.min.css">
<link rel="stylesheet" href="${bootstrapPath}/css/bootstrap.min.css">

<link rel="stylesheet" href="${assetsPath}/libs/node_modules/@fortawesome/fontawesome-free/css/all.min.css">
<!-- Theme style -->
<link rel="stylesheet" href="${adminLTEPath}/dist/css/adminlte.min.css">
<!-- Font: Source Sans Pro -->
Expand Down Expand Up @@ -69,9 +71,9 @@
}
</style>
<!-- DataTables -->
<link rel="stylesheet" href="${adminLTEPath}/plugins/datatables-bs4/css/dataTables.bootstrap4.css">
<#--<link rel="stylesheet" href="${adminLTEPath}/plugins/datatables-bs4/css/dataTables.bootstrap4.css">-->
<!-- Toastr -->
<link rel="stylesheet" href="${adminLTEPath}/plugins/toastr/toastr.min.css">
<link rel="stylesheet" href="${toastrPath}/toastr.min.css">

<!-- Custom head -->
<#include "../models/head.ftl"/>
8 changes: 4 additions & 4 deletions agate-webapp/src/main/resources/_templates/libs/navbar-menus-right.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<#if username??>
<#if config?? && config.locales?size != 1>
<li class="nav-item dropdown">
<a id="userMenu" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle"> ${.lang?upper_case}</a>
<a id="userMenu" href="#" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle"> ${.lang?upper_case}</a>
<ul aria-labelledby="dropdownSubMenu1" class="dropdown-menu border-0 shadow">
<#list config.locales as locale>
<li><a href="#" onclick="agatejs.changeLanguage('${locale.language}')" class="dropdown-item">${locale.language?upper_case}</a></li>
Expand All @@ -14,11 +14,11 @@
<li class="nav-item">
<#if user??>
<a href="${contextPath}/profile" class="nav-link">
<i class="fas fa-user"></i> ${user.displayName}
<i class="fa-solid fa-user"></i> ${user.displayName}
</a>
<#else>
<a href="${contextPath}/profile" class="nav-link">
<i class="fas fa-user"></i> ${username}
<i class="fa-solid fa-user"></i> ${username}
</a>
</#if>
</li>
Expand All @@ -28,7 +28,7 @@
<#elseif config??>
<#if config.locales?size != 1>
<li class="nav-item dropdown">
<a id="userMenu" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle"> ${.lang?upper_case}</a>
<a id="userMenu" href="#" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle"> ${.lang?upper_case}</a>
<ul aria-labelledby="dropdownSubMenu1" class="dropdown-menu border-0 shadow">
<#list config.locales as locale>
<li><a id="lang-${locale.language}" href="#" onclick="agatejs.changeLanguage('${locale.language}')" class="dropdown-item">${locale.language?upper_case}</a></li>
Expand Down
9 changes: 3 additions & 6 deletions agate-webapp/src/main/resources/_templates/libs/scripts.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<!-- REQUIRED SCRIPTS -->

<!-- jQuery -->
<script src="${adminLTEPath}/plugins/jquery/jquery.min.js"></script>
<script src="${jqueryPath}/jquery.min.js"></script>
<!-- Bootstrap 4 -->
<script src="${adminLTEPath}/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
<script src="${bootstrapPath}/js/bootstrap.bundle.min.js"></script>
<!-- AdminLTE App -->
<script src="${adminLTEPath}/dist/js/adminlte.min.js"></script>
<!-- DataTables -->
<script src="${adminLTEPath}/plugins/datatables/jquery.dataTables.js"></script>
<script src="${adminLTEPath}/plugins/datatables-bs4/js/dataTables.bootstrap4.js"></script>
<!-- Toastr -->
<script src="${adminLTEPath}/plugins/toastr/toastr.min.js"></script>
<script src="${toastrPath}/toastr.min.js"></script>
<!-- Axios -->
<script src="${assetsPath}/libs/node_modules/axios/dist/axios.min.js"></script>

Expand Down
3 changes: 3 additions & 0 deletions agate-webapp/src/main/resources/_templates/libs/settings.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

<!-- Theme -->
<#assign adminLTEPath = "${assetsPath}/libs/node_modules/admin-lte"/>
<#assign bootstrapPath = "${assetsPath}/libs/node_modules/bootstrap/dist"/>
<#assign jqueryPath = "${assetsPath}/libs/node_modules/jquery/dist"/>
<#assign toastrPath = "${assetsPath}/libs/node_modules/toastr/build"/>

<!-- Home page settings -->
<#assign portalLink = "${config.portalUrl!contextPath}" + "/"/>
Expand Down
10 changes: 5 additions & 5 deletions agate-webapp/src/main/resources/_templates/libs/top-navbar.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<#include "navbar-menus.ftl">
<nav class="main-header navbar navbar-expand-md navbar-light navbar-white">
<nav class="app-header navbar navbar-expand-md bg-body py-0">
<div class="container">
<#if config??>
<a href="${portalLink}" class="navbar-brand">
<img src="${brandImageSrc}" alt="Logo" class="brand-image ${brandImageClass}"
style="opacity: .8">
style="opacity: .8; max-height: 3rem;">
<span class="brand-text ${brandTextClass}">
<#if brandTextEnabled>
${config.name!""}
Expand All @@ -13,11 +13,11 @@
</a>
<#else>
<img src="${brandImageSrc}" alt="Logo" class="brand-image ${brandImageClass}"
style="opacity: .8">
style="opacity: .8; max-height: 3rem;">
<span class="brand-text ${brandTextClass}"></span>
</#if>

<button class="navbar-toggler order-1" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<button class="navbar-toggler order-1" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

Expand All @@ -28,7 +28,7 @@
</ul>

<!-- Right navbar links -->
<ul class="order-1 order-md-3 navbar-nav navbar-no-expand ml-auto">
<ul class="order-1 order-md-3 navbar-nav navbar-no-expand ms-auto">
<@rightmenus></@rightmenus>
</ul>
</div>
Expand Down
Loading