More cleanup and add card support

This commit is contained in:
John Crisp 2025-04-18 15:11:03 +02:00
parent 767cf3bc19
commit b42afb227a
69 changed files with 279 additions and 189 deletions

View File

@ -2,7 +2,7 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div id="" class="">
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - backup - verify";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - backup - verify";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,7 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -2,7 +2,7 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,9 @@
% layout 'AdminLTE', title => "Sme server 2 - clamav";
% content_for 'module' => begin
<div>
<div class="card-body">
%if (config->{debug} == 1) {
<p>(DBG)route: <%= $c->current_route %><br>
(DBG)FsS stat: <%= $clm_datas->{FilesystemScan}%> <br>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - err 400";
% content_for 'module' => begin
<div>
<div class="card-body">
<div class="text-danger">
%= l 'CSRF_VALIDATION_FAILURE'
</div>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - datetime";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
<p><%= $title %></p>
<%= $modul %>
<p>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - directory";
% content_for 'module' => begin
<div>
<div class="card-body">
%if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - domains";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - emailaccess";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - emaildeliver";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - emailfilter";
% content_for 'module' => begin
<div>
<div class="card-body"
% if (config->{debug} == 1) {
<p>

View File

@ -5,7 +5,7 @@
% use constant FALSE => 0;
% use constant TRUE => 1;
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -5,9 +5,9 @@
% use constant FALSE => 0;
% use constant TRUE => 1;
<div>
<div class="card-body">
% if (config->{debug} == TRUE) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $mai_datas

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,7 @@
% content_for 'module' => begin
<div>
<div class="card-body">
<p>
<br>dev<br>
Oups !!!

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - groups";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - hostentries";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - ibays";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -8,7 +8,7 @@
</p>
% }
<div>
<div class="card-body">
% if ( stash 'error' ) {
<br>
@ -18,11 +18,10 @@
% }
<h3><%= $title %> </h3>
<!-- <h3>template: initial.html.ep</h3> -->
<!-- <H1>Initial AdminLTE</H1> -->
<p>
<!-- <h3>template: initial.html.ep</h3> -->
<!-- <H1>Initial AdminLTE</H1> -->
%= $modul
</p>
</div>

View File

@ -13,8 +13,8 @@
%= content_for 'head_contrib'
% if (config 'hasJquery') {
%= include 'partials/_js_imports'
%= include 'common_js'
%= include 'partials/_js_imports'
%= include 'common_js'
% }
%= content_for 'refresh'
@ -25,11 +25,12 @@
<!-- Custom overrides? -->
% if ($c->current_route eq 'nutups') {
%= include 'partials/_nutups_overrides'
%= include 'partials/_nutups_overrides'
% }
</head>
<body class="sidebar-expand-lg bg-body-tertiary">
@ -47,133 +48,154 @@
<div class="app-wrapper">
<!-- Should create a new separate header partial -->
<!-- Should create a new separate header partial?? -->
<!--begin::Header-->
<nav id="koozali_grad" class="app-header navbar navbar-expand bg-success-subtle" data-bs-theme="light">
<!--begin::Container-->
<div class="container-fluid">
<!--begin::Start Navbar Links-->
<!-- Top bar links -->
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" data-lte-toggle="sidebar" href="#" role="button">
<i class="bi bi-list"></i>
</a>
</li>
<li class="nav-item d-none d-md-block"><a href="/smanager" class="nav-link">Home</a></li>
% if ( not defined $c->session->{username} ) {
<li class="nav-item d-none d-md-block"><a href="login" class="nav-link">Login</a></li>
% } else {
<li class="nav-item d-none d-md-block"><a href="logout" class="nav-link">Logout</a></li>
% }
<li class="nav-item d-none d-md-block">
%= include 'partials/_flag_icon'
</li>
</ul>
<!--end::Start Navbar Links-->
<!-- this can do direct to header so always available-->
% if ($c->is_logged_in && scalar @{SrvMngr::theme_list( $c )} > 1) {
%= include 'partials/_swt_theme'
% }
</div>
<!--end::Container-->
</nav>
<nav id="koozali_grad" class="app-header navbar navbar-expand bg-success-subtle" data-bs-theme="light">
<!--begin::Container-->
<div class="container-fluid">
<!--begin::Start Navbar Links-->
<!-- Top bar links -->
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" data-lte-toggle="sidebar" href="#" role="button">
<i class="bi bi-list"></i>
</a>
</li>
<li class="nav-item d-none d-md-block"><a href="/smanager" class="nav-link">Home</a></li>
% if ( not defined $c->session->{username} ) {
<li class="nav-item d-none d-md-block"><a href="login" class="nav-link">Login</a></li>
% } else {
<li class="nav-item d-none d-md-block"><a href="logout" class="nav-link">Logout</a></li>
% }
<li class="nav-item d-none d-md-block">
%= include 'partials/_flag_icon'
</li>
</ul>
<!--end::Start Navbar Links-->
<!-- this can do direct to header so always available-->
% if ($c->is_logged_in && scalar @{SrvMngr::theme_list( $c )} > 1) {
%= include 'partials/_swt_theme'
% }
</div>
<!--end::Container-->
</nav>
<!--end::Header-->
<!--begin::Sidebar-->
<aside class="app-sidebar bg-success-subtle" data-bs-theme="light">
<!--begin::Sidebar Brand-->
<div class="sidebar-brand sidebar-dark-primary">
<!--begin::Brand Link-->
<a href="../index.html" class="brand-link">
<!--begin::Brand Image-->
<img src="koozali/assets/img/Koozali_EyeIcon.png" alt="Koozali Logo"
class="brand-image opacity-75 shadow" />
<!--end::Brand Image-->
<!--begin::Brand Text-->
<span class="brand-text fw-light">Koozali</span>
<!--end::Brand Text-->
</a>
<!--end::Brand Link-->
</div>
<!--end::Sidebar Brand-->
<!--begin::Sidebar Wrapper-->
<div class="sidebar-wrapper">
<nav class="mt-2">
<!--begin::Sidebar Menu-->
<ul class="nav sidebar-menu flex-column" data-lte-toggle="treeview" role="menu" data-accordion="false">
<aside class="app-sidebar bg-success-subtle" data-bs-theme="light">
<!--begin::Sidebar Brand-->
<div class="sidebar-brand sidebar-dark-primary">
<!--begin::Brand Link-->
<a href="../index.html" class="brand-link">
<!--begin::Brand Image-->
<img src="koozali/assets/img/Koozali_EyeIcon.png" alt="Koozali Logo"
class="brand-image opacity-75 shadow" />
<!--end::Brand Image-->
<!--begin::Brand Text-->
<span class="brand-text fw-light">Koozali</span>
<!--end::Brand Text-->
</a>
<!--end::Brand Link-->
</div>
<!--end::Sidebar Brand-->
<!--begin::Sidebar Wrapper-->
<div class="sidebar-wrapper">
<nav class="mt-2">
<!--begin::Sidebar Menu-->
<ul class="nav sidebar-menu flex-column" data-lte-toggle="treeview" role="menu" data-accordion="false">
%= include 'partials/_sidebar_support_menu'
% if ( $c->is_logged_in ) {
%= include 'partials/_sidebar_user_menu'
% }
% if ( $c->is_admin ) {
%= include 'partials/_sidebar_main_menu'
% }
</ul>
<!--end::Sidebar Menu-->
</nav>
</div>
<!--end::Sidebar Wrapper-->
</aside>
%= include 'partials/_sidebar_support_menu'
% if ( $c->is_logged_in ) {
%= include 'partials/_sidebar_user_menu'
% }
% if ( $c->is_admin ) {
%= include 'partials/_sidebar_main_menu'
% }
</ul>
<!--end::Sidebar Menu-->
</nav>
</div>
<!--end::Sidebar Wrapper-->
</aside>
<!--end::Sidebar-->
<!--begin::App Main-->
<main class="app-main">
<!-- Can add a header row here? -->
<!-- %= include 'partials/_app_content_header' -->
<main class="app-main">
<!-- Can add a header row here? -->
<!-- %= include 'partials/_app_content_header' -->
<!--begin::App Content-->
<div class="app-content">
<!--begin::Container-->
<div class="container-fluid">
<!--begin::Rows-->
<!-- Add breadcrumb here -->
%= include 'partials/_app_content_breadcrumb'
<!-- We can add extra rows in the main panel here -->
<!-- %#= include 'partials/_app_content_first_row' -->
<!-- %#= include 'partials/_app_content_demo_row' -->
<!--end::Rows-->
<br>
<!-- This is the main page content depening on the calling module -->
<!-- nameofpanel.html.ep -->
<!-- That will also include it's own _partials -->
%#= dumper $c->current_route
% if ($c->current_route ne 'login') {
%= include 'partials/_panel_card_top'
%= include 'partials/_panel_card_header'
% }
%= content 'module'
<!--begin::App Content-->
<div class="app-content">
<!--begin::Container-->
<div class="container-fluid">
<!--begin::Rows-->
<!-- Add breadcrumb here -->
%= include 'partials/_app_content_breadcrumb'
<! We can add extra rows in the main panel here -->
<!-- %#= include 'partials/_app_content_first_row' -->
<!-- %#= include 'partials/_app_content_demo_row' -->
<!--end::Rows-->
<br>
<!-- This is the main page content depening on the calling module -->
%= content 'module'
% if ($c->current_route ne 'login') {
%= include 'partials/_panel_card_footer'
%= include 'partials/_panel_card_bottom'
% }
</div>
</div>
</div>
<!--end::App Content-->
</main>
<!--end::App Content-->
</main>
<!--end::App Main-->
<!-- This is the original footer - move content to new one -->
<!-- %= include 'partials/_footer' -->
<!--begin::Footer-->
<footer class="app-footer">
<!--begin::To the end-->
<div class="float-end d-none d-sm-inline">Anything you want</div>
<!--end::To the end-->
<!--begin::Copyright-->
<strong>
Copyright &copy; 2014-2025&nbsp;
<a href="https://adminlte.io" class="text-decoration-none">AdminLTE.io</a>.
</strong>
All rights reserved.
<!--end::Copyright-->
</footer>
<footer class="app-footer">
<!--begin::To the end-->
<div class="float-end d-none d-sm-inline">Anything you want</div>
<!--end::To the end-->
<!--begin::Copyright-->
<strong>
Copyright &copy; 2014-2025&nbsp;
<a href="https://adminlte.io" class="text-decoration-none">AdminLTE.io</a>.
</strong>
All rights reserved.
<!--end::Copyright-->
</footer>
<!--end::Footer-->
</div>
<!--end::App Wrapper-->

View File

@ -6,9 +6,11 @@
% content_for 'module' => begin
<!-- needs moving -->
%= stylesheet '/css/letsencrypt.css'
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<pre>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - localnetworks";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -1,8 +1,11 @@
% layout 'AdminLTE', title => 'Sme server 2 - Manual';
% content_for 'module' => begin
<div id="" class="">
<p><h1><%= $title %></h1></p>
<div class="card-body">
<p>
<h1><%= $title %></h1>
</p>
%= $c->render_to_string( inline => stash 'modul' )
</div>

View File

@ -2,9 +2,11 @@
% content_for 'module' => begin
<!-- should be moved? -->
%= stylesheet '/css/module.css'
<div id="" class="">
<div class="card-body">
% if (config->{debug} == 1) {
<p>
<strong>Debug Info:</strong>

View File

@ -2,8 +2,9 @@
% content_for 'module' => begin
<div id="" class="">
<p><br>dev<br> Oups !!!
<div class="card-body">
<p>
<br>dev<br> Oups !!!
The page you were requesting
"<%= $self->req->url->path || '/' %>"
could not be found.

View File

@ -1,6 +1,7 @@
% layout 'AdminLTE', title => 'Sme server 2 - Error P';
<div id="" class="">
<p><br><br>
<div class="card-body">
<p>
<br><br>
The page you were requesting
"<%= $self->req->url->path || '/' %>"
could not be found.

View File

@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id="" class="">
<div class="card-body">
<p><br>dev<br> Oups !!!
The page you were requesting
"<%= $self->req->url->path || '/' %>"

View File

@ -6,7 +6,7 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<pre>

View File

@ -1,4 +1,4 @@
<!-- card footer -->
<div class="card-footer">Footer</div>
<div class="card-footer">Card Footer</div>
<!-- /.card-footer-->

View File

@ -1,7 +1,7 @@
<div class="card-header">
<h3 class="card-title">Card Title <%= $title%></h3>
<h3 class="card-title">Card Title - <%= $title%></h3>
%= include 'partials/_panel_card_tools'
%= include 'partials/_panel_card_tools'
</div>

View File

@ -1,5 +1,7 @@
<!--
<div class="card-tools">
<button type="button" class="btn btn-tool" data-lte-toggle="card-collapse"
title="Collapse">
<i data-lte-icon="expand" class="bi bi-plus-lg"></i>
@ -9,4 +11,5 @@
title="Remove">
<i class="bi bi-x-lg"></i>
</button>
</div>
</div>
-->

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - Port Forwards";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - printers";
% content_for 'module' => begin
<div id="" class="">
<div class="card-body">
%if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,9 @@
% layout 'AdminLTE', title => "Sme server 2 - proxy";
% content_for 'module' => begin
<div id="" class="">
<div class="card-body">
%if (config->{debug} == 1) {
<p>(DBG)route: <%= $c->current_route %><br>
(DBG)ht stat: <%= $prx_datas->{http_proxy_status}%> <br>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - pseudonyms";
% content_for 'module' => begin
<div class="">
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,12 @@
% layout 'AdminLTE', title => "Sme server 2 - qmailanalog";
% content_for 'module' => begin
<!-- should be moved -->
%= javascript '/js/qmailanalog.js'
<div>
<div class="card-body">
%if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - quota";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id="" class="">
<div class="card-body">
%if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - remoteaccess";
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -6,8 +6,7 @@
%#= include 'partials/_panel_card_top'
%#= include 'partials/_panel_card_header'
<div>
<div class="card-body">
<h1> <%= $title %> </h1>
<!-- Header text -->

View File

@ -3,7 +3,8 @@
% content_for 'module' => begin
<div id="" class="">
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -1,10 +1,12 @@
% layout 'AdminLTE', title => 'Sme server 2 - Support';
% content_for 'module' => begin
<div id="" class="">
<div class="card-body">
<p> < %= $title % ></p>
<br>
<%= $modul %>
<br>
</div>
%end

View File

@ -2,8 +2,8 @@
% content_for 'module' => begin
%= include 'partials/_panel_card_top'
%= include 'partials/_panel_card_header'
%#= include 'partials/_panel_card_top'
%#= include 'partials/_panel_card_header'
<div class="card-body">
<!-- /.card-body -->
@ -43,8 +43,8 @@
</div>
%= include 'partials/_panel_card_footer'
%= include 'partials/_panel_card_bottom'
%#= include 'partials/_panel_card_footer'
%#= include 'partials/_panel_card_bottom'
%end

View File

@ -2,7 +2,7 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,9 @@
% layout 'AdminLTE', title => "Sme server 2 - viewlogfiles";
% content_for 'module' => begin
<div>
<div class="card-body">
%if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>

View File

@ -2,7 +2,7 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>

View File

@ -1,7 +1,9 @@
% layout 'AdminLTE', title => 'Sme server 2 - IndexT';
% content_for 'module' => begin
<div>
<div class="card-body">
<p>Index on line - Welcome page
<br>
</p>

View File

@ -2,7 +2,7 @@
% content_for 'module' => begin
<div>
<div class="card-body">
<p><br>dev<br> What else !!!
The page you were requesting
"<%= $self->req->url->path || '/' %>"

View File

@ -1,7 +1,8 @@
% layout 'AdminLTE', title => "Sme server 2 - workgroup";
% content_for 'module' => begin
<div>
<div class="card-body">
%if (config->{debug} == 1) {
<p>

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -6,7 +6,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -2,7 +2,8 @@
% content_for 'module' => begin
<div>
<div class="card-body">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route

View File

@ -1,6 +1,6 @@
%define name smeserver-manager-AdminLTE
%define version 11.0.0
%define release 7
%define release 8
Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
Name: %{name}
Version: %{version}
@ -26,6 +26,11 @@ AdminLTE is an html framework for admin consoles
wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
%changelog
* Fri Apr 18 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-8.sme
- More cleanup
- Add Card support across all panels except login
- Disabled minimise and remove Card icons
* Thu Apr 17 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-7.sme
- Clean up review template (but footer in the wrong place)
- Fix typo tabel