Move more code to html and work on forms

root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure1.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore1.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore1.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore2.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify1.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/csrf_400.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/default.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/exception_development.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/groups.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/initial.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep

@@ -12,6 +12,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     %= content_for 'head_contrib'
+
     % if (config 'hasJquery') {
         %= include 'partials/_js_imports'
         %= include 'common_js'
@@ -28,8 +29,6 @@
     %= include 'partials/_nutups_overrides'
 % }
 
-
-
 </head>
 
 <body class="sidebar-expand-lg bg-body-tertiary">
@@ -47,9 +46,12 @@
     <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-->
@@ -72,12 +74,12 @@
                     </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>
@@ -87,6 +89,7 @@
 
 
         <!--begin::Sidebar-->
+
             <aside class="app-sidebar bg-success-subtle" data-bs-theme="light">
                 <!--begin::Sidebar Brand-->
                 <div class="sidebar-brand sidebar-dark-primary">
@@ -126,10 +129,12 @@
                 </div>
                 <!--end::Sidebar Wrapper-->
             </aside>
+
         <!--end::Sidebar-->
 
 
         <!--begin::App Main-->
+
             <main class="app-main">
     
             <!-- Can add a header row here? -->
@@ -143,15 +148,29 @@
                         <!-- Add breadcrumb here -->
                         %= include 'partials/_app_content_breadcrumb'
     
-                    <! We can add extra rows in the main panel here -->
+                        <!-- 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'
+
+                        % if ($c->current_route ne 'login') {
+                            %= include 'partials/_panel_card_footer'
+                            %= include 'partials/_panel_card_bottom'
+                        % }    
                     </div>
                 </div>
                 <!--end::App Content-->
@@ -159,6 +178,7 @@
             </main>
         <!--end::App Main-->
 
+        <!-- This is the original footer - move content to new one -->
         <!--  %= include 'partials/_footer'  -->
 
         <!--begin::Footer-->

root/usr/share/smanager/themes/AdminLTE/templates/letsencrypt.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/localnetworks.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/manual.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/module.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/not_found.development.html.ep

@@ -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.

root/usr/share/smanager/themes/AdminLTE/templates/not_found.html.ep

@@ -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.

root/usr/share/smanager/themes/AdminLTE/templates/not_found.production.html.ep

@@ -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 || '/' %>"

root/usr/share/smanager/themes/AdminLTE/templates/nutups.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/partials/_footer.html.ep

@@ -1,7 +1,6 @@
-<div id="" class="">
+<div>
 <!--<HR class="">-->
 <a href="https://mojolicious.org" target="_blank"><img src="images/sme-mojo-logo-white.png" style="position:relative;"></a>
-<font class="">
     %   if ( $c->is_logged_in && $c->is_admin) {
         SME Server <%= session 'releaseVersion' %>-<%= $c->app->VERSION %> Manager II
         % my $mode;
@@ -11,4 +10,3 @@
     <br>Copyright 1999-2006 Mitel Corporation<br>
     %= session 'copyRight'
     <br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
-</font>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_footer.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_header.html.ep

@@ -1,6 +1,6 @@
 
                                 <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'
 

root/usr/share/smanager/themes/AdminLTE/templates/partials/_panel_card_tools.html.ep

@@ -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>
@@ -10,3 +12,4 @@
                                             <i class="bi bi-x-lg"></i>
                                         </button>
                                     </div>
+                                    -->

root/usr/share/smanager/themes/AdminLTE/templates/partials/_rvw_content.html.ep

@@ -0,0 +1,121 @@
+<div>
+    <table class="table table-bordered">
+        <thead>
+            <tr>
+            <th><%= l 'rvw_NETWORKING_PARAMS' %></th>
+            <th>&nbsp</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+            <td><%= l 'rvw_SERVER_MODE' %></td>
+            <td><%= $rvw_datas->{servermode} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK' %></td>
+            <td><%= $rvw_datas->{localip} %></td>
+            </tr>
+            
+            % if ( $rvw_datas->{publicip} ) {
+                <tr>
+                <td><%=l 'rvw_INTERNET_VISIBLE_ADDRESS' %></td>
+                <td><%= $rvw_datas->{publicip} %></td>
+                </tr>        
+            % }
+            
+            <tr>
+            <td><%= l 'rvw_GATEWAY'%></td>
+            <td>
+            <%= $rvw_datas->{gateway} %>
+            <%= $rvw_datas->{serveronly} %>
+            </td>
+            </tr>
+            
+            <tr>
+            <td>Local Networks (not translated?)</td>
+            <td><%= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );%> </td>
+            <tr>
+            
+            <tr>
+            <td><%= l 'rvw_DHCP_SERVER' %></td>
+            <td><%= $rvw_datas->{dhcpserver} %></td>
+            </tr>
+        </tbody>
+    </table>
+            
+    <table class="table table-bordered">
+        <thead>
+            <tr>
+            <th><%= l 'rvw_SERVER_NAMES' %></th>
+            <th>&nbsp</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+            <td><%= l 'rvw_DNS_SERVER' %></td>
+            <td><%= $rvw_datas->{dnsserver} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_WEB_SERVER' %></td>
+            <td><%= $rvw_datas->{webserver} %></tr>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_PROXY_SERVER' %></td>
+            <td><%= $rvw_datas->{proxyserver} %></tr>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_FTP_SERVER' %></td>
+            <td><%= $rvw_datas->{ftpserver} %></tr>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS' %></td>
+            <td><%= $rvw_datas->{smtpserver} %></tr>
+            </tr>
+        </tbody>
+    </table>
+            
+    <table class="table table-bordered">
+        <thead>
+            <tr>
+            <th><%= l 'rvw_DOMAIN_INFORMATION' %></th>
+            <th>&nbsp</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+            <td><%= l 'rvw_PRIMARY_DOMAIN' %></td>
+            <td><%= $rvw_datas->{domainname} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_VIRTUAL_DOMAINS' %></td>
+            <td><%= $rvw_datas->{virtualdomains} %></td>
+            </tr>
+            <tr>
+            <td><%= l 'rvw_PRIMARY_WEB_SITE' %></td>
+            <td><%= $rvw_datas->{primarywebsite} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_SERVER_MANAGER' %></td>
+            <td><%= $rvw_datas->{servermanager} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_USER_PASSWORD_PANEL' %></td>
+            <td><%= $rvw_datas->{usermanager} %></td>
+            </tr>
+            
+            <tr>
+            <td><%= l 'rvw_EMAIL_ADDRESSES' %></td>
+            <td><%= $rvw_datas->{emailaddresses} %></td>
+            </tr>
+      
+        </tbody>
+    </table>
+</div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_swt_theme.html.ep

@@ -1,40 +1,34 @@
 
 <!-- Both Theme drop downs but only the first works curently -->
 
-<div id="">
-    % my $btn = l('swt_THEME');
-    %= form_for $c->url_for('swttheme') => (method => 'POST') => begin
+<div>
+%# content_for 'module' => begin
+
 % my $value = $c->session->{'CurrentTheme'};
 % $value = session 'CurrentTheme';
-
-    % param 'Theme' => $value unless param 'Theme';
-    %= select_field 'Theme' => $c->theme_list(), class => ""
-    %= hidden_field 'From' => $c->tx->req->url
-    %= submit_button "$btn"
-</div>
-
-
-
-
-
-%# my $value = $c->session->{'CurrentTheme'};
-% $value = session 'CurrentTheme';
 % my $formUrl = $c->url_for('swttheme');
 % param 'Theme' => $value unless param 'Theme';
-% my @themes = $c->theme_list();
+
+%# my @themes = $c->theme_list();
+
+%#= dumper $c
+
+%#= my $size = keys ($c->theme_list)
+
+% my @themeList = $c->theme_list();
+%# = dumper @themeList
+% my @themes = $themeList[0];
 
 
+% param 'Theme' => $value unless param 'Theme';
 
 <form action="<%= $formUrl %>" method="POST" >
   <div class="row g-3 align-items-center">
       <div class="col-auto">
         <label class="visually-hidden" for="inlineFormSelectPref">Preference</label>
-        <select class="form-select" id="inlineFormSelectPref">
-          <option selected><%= $value %></option>
-          % foreach my $theme (@themes) {
-              <option value="<%= $theme %>"><%= $theme %></option>
-          % };
-        </select>
+
+        %= select_field 'Theme' => $c->theme_list(), class => "form-select"
+        
         %= hidden_field 'From' => $c->tx->req->url
       </div>
     
@@ -45,4 +39,7 @@
 </form>
 
 
-% end
+%# end
+</div>
+
+

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep

@@ -5,10 +5,9 @@
 
     %= form_for '/useraccounts' => (method => 'POST') => begin
 
-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
+<div>
+    <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+</div>
 
     % end    
 
@@ -40,7 +39,8 @@
                 %=l 'ACTION'
             </th>
         </tr>
-        </thead><tbody>
+    </thead>
+    <tbody>
         
     % foreach my $user (@$users) {
 
@@ -56,10 +56,11 @@
     %    my $password_set = $user->prop('PasswordSet');
      
              <tr>
-            %= t td => (class => "") => $username
-            %= t td => (class => "") => "$first  $last"
-            %= t td => (class => "") => $vpnaccess
-            %= t td => (class => "") => $fwd
+                 <td><%= $username %></td>
+                 <td><%=$first %>&nbsp<%=$last %></td>
+                 <td><%= $vpnaccess %></td>
+                 <td><%= $fwd %></td>
+     
                  % my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
                  % my $modify_text = l('MODIFY');  # Localized text
                  % my $csrf_token = "TOKEN";  # CSRF token for security
@@ -68,35 +69,35 @@
                  %if ($useraccounts_user_name eq 'admin')  { 
                      %$actionModify = qq{
                          %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
-                    %   <button type='button' class="" title='$modify_text'>
+                         %   <button type='button' class="btn btn-primary" title='$modify_text'>
                          %       $modify_text
                          %   </button>
-                    %</a>
+                         %</a>&nbsp;
                      %};                             
                      %$actionResetPw = qq{
                          %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name">
-                    %   <button type='button' class="" title='$password_text' >
+                         %   <button type='button' class="btn btn-primary" title='$password_text' >
                          %       $password_text
                          %   </button>
-                    %</a>
+                         %</a>&nbsp;
                      %};
                  %} else {
                      %$actionModify = qq{
                          %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
-                    %   <button type='button' class="" title='$modify_text' >
+                         %   <button type='button' class="btn btn-primary" title='$modify_text' >
                          %       $modify_text
                          %   </button>
-                    %</a>
+                         %</a>&nbsp;
                      %};
                  %}
                  %if ($password_set ne 'yes') {
                      %$actionLock = l('ACCOUNT_LOCKED');
                      %$actionResetPw = qq{
                          %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-                        %   <button type='button' class="" title="$password_text - currently unset" style = background:pink; >
+                             %   <button type='button' class="btn btn-primary" title="$password_text - currently unset" style = background:pink; >
                              %       $password_text
                              %   </button>
-                    %</a>
+                         %</a>&nbsp;
                      %};
                  %} elsif ($useraccounts_user_name ne 'admin') {
                      % my $lock_text = l('ACCOUNT LOCKED');  # Localized text
@@ -104,17 +105,17 @@
                      % my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
                      %$actionLock = qq{
                          %<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
-                        %   <button type='button' class="" title='$lock_text' >
+                             %   <button type='button' class="btn btn-primary" title='$lock_text' >
                              %       $lock_text
                              %   </button>
-                    %</a>
+                         %</a>&nbsp;
                          %};
                      %$actionResetPw = qq{
                          %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
-                    %   <button type='button' class="" title='$password_text' >
+                         %   <button type='button' class="btn btn-primary" title='$password_text' >
                          %       $password_text
                          %   </button>
-                    %</a>
+                         %</a>&nbsp;
                          %};
                  %}
                  %if ( $removable eq 'yes' )  { 
@@ -122,10 +123,10 @@
                      % my $csrf_token = "TOKEN";  # CSRF token for security
                      %$actionRemove = qq{
                          %<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
-                    %   <button type='button' class="" title='$remove_text' >
+                         %   <button type='button' class="btn btn-primary" title='$remove_text' >
                          %       $remove_text
                          %   </button>
-                    %</a>
+                         %</a>&nbsp;
                      %};
                  %}
                  
@@ -135,12 +136,12 @@
                  % $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
                  % $actionroundcube = qq{
                      %<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px">
-                %   <button type='button' class="" title='$roundcube_text' >
+                     %   <button type='button' class="btn btn-primary" title='$roundcube_text' >
                      %       $roundcube_text
                      %   </button>
-                %</a>
+                     %</a>&nbsp;
                  %};
-            <td class="">
+                 <td>          
                          <%= $c->render_to_string(inline => $actionModify) %>
                          <%= $c->render_to_string(inline => $actionResetPw) %>
                          <%= $c->render_to_string(inline => $actionLock) %>
@@ -157,3 +158,8 @@
         %= hidden_field 'trt' => $usr_datas->{trt}
 
 </div>
+
+
+<div>
+
+</div>

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep

@@ -141,7 +141,7 @@
     %=l 'usr_GROUP_MEMBERSHIPS'
     </span>
     <span class="">
-    <table class="tabel table-bordered">
+    <table class="table table-bordered">
     <thead>
       <tr>
         <th class="">

root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep

@@ -1,3 +1,99 @@
+% content_for 'module' => begin
+
+<div class="container-sm">
+<br>
+<h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
+
+    <%= l 'usr_ACCOUNT_NAME' %> : <%= $usr_datas->{user} %>
+
+ 
+
+<form>
+    % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
+
+    <div class="row g-3 align-items-center">
+        <div class="col-auto p-33">
+          <label for="inputFirstName" class="col-form-label"><%= l 'usr_FIRSTNAME' %></label>
+        </div>
+        <div class="col-auto p-3">
+          <input type="text" id="inputFirstName" class="form-control" aria-describedby="FirstName" value=<%= $usr_datas->{firstname} %> >
+        </div>
+        <div class="col-auto p-3">
+          <span id="passwordHelpInline" class="form-text">
+            First Name
+          </span>
+        </div>
+    </div>
+   
+
+   % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
+
+    <div class="row g-3 align-items-center">
+        <div class="col-auto p-33">
+          <label for="inputLastNAme" class="col-form-label"><%= l 'usr_LASTNAME' %></label>
+        </div>
+        <div class="col-auto p-3">
+          <input type="text" id="inputLastName" class="form-control" aria-describedby="LastName" value=<%= $usr_datas->{lastname} %>>
+        </div>
+        <div class="col-auto p-3">
+          <span id="passwordHelpInline" class="form-text">
+            Last Name
+          </span>
+        </div>
+    </div>
+    
+    % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
+
+    <div class="row g-3 align-items-center">
+        <div class="col-auto p-33">
+            <label for="inputEmailDelivery" class="col-form-label"><%= l 'usr_EMAIL_DELIVERY' %></label>
+        </div>
+        <div class="col-auto p-3">
+            %= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select"
+        </div>
+
+ 
+    % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
+
+    <div class="row g-3 align-items-center">
+        <div class="col-auto">
+          <label for="inputForwardAddress" class="col-form-label"><%= l 'usr_FORWARDING_ADDRESS' %></label>
+        </div>
+        <div class="col-auto">
+          <input type="password" id="inputPassword6" class="form-control" aria-describedby="passwordHelpInline">
+        </div>
+        <div class="col-auto">
+          <span id="passwordHelpInline" class="form-text">
+            Email forwarding address
+          </span>
+        </div>
+    </div>
+
+
+    % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
+
+        <div class="row g-3 align-items-center">
+        <div class="col-auto p-33">
+            <label for="inputVPNClientAccess" class="col-form-label"><%= l 'usr_VPN_CLIENT_ACCESS' %></label>
+        </div>
+        <div class="col-auto p-3">
+                %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select"
+        </div>
+
+    <div class="row g-3 align-items-center">
+        <div class="col-auto p-33">
+            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+    </div>
+
+</form>
+
+% end
+
+</div>
+
+
+
 <div>
 
     % my $btn = l('SAVE');

root/usr/share/smanager/themes/AdminLTE/templates/portforwarding.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/printers.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/proxy.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/pseudonyms.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/qmailanalog.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/quota.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/reboot.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/review.html.ep

@@ -1,182 +1,26 @@
 % layout 'AdminLTE', title => 'Sme server 2 - Review';
 
 % content_for 'module' => begin
-<div id="" class="">
+
+
+<div class="card-body">
+
     <h1> <%= $title %> </h1> 
-    <%= $modul %><br><br>
-
-    %= form_for 'review' => begin
-    <b>
-    %=l 'rvw_NETWORKING_PARAMS'
-    </b><br>
+    <!-- Header text -->
+    %= $modul
     
+    % if (config->{debug} == 1) {
     <p>
-    <span class="">
-    %=l 'rvw_SERVER_MODE'
-    </span>
-    %= $rvw_datas->{servermode}
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK'
-    </span>
-    %= $rvw_datas->{localip}
-    </p>
-
-    % if ( $rvw_datas->{publicip} ) {
-        <p><span class="">
-        %=l 'rvw_INTERNET_VISIBLE_ADDRESS'
-        </span>
-        %= $rvw_datas->{publicip}
+    %= dumper $c->current_route
+    %= dumper $rvw_datas
     </p>
     % }
     
-    <p>
-    <span class="">
-    %=l 'rvw_GATEWAY'
-    </span>
-    %= $rvw_datas->{gateway}
-    %= $rvw_datas->{serveronly}
-    </p>
-
-    <p>
-    <table width='100%'>
-    <tr>
-    <td class="">
-    <!--span class="">
-    %=l 'rvw_ADDITIONAL_LOCAL_NETWORKS'
-    <!--/span-->
-    </td>
-    <td>
-    %= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );
-    </td>
-    </tr>
-    </table>
-    </p>
-
-    <p>
-    <table width='100%'>
-    <tr>
-    <td class="">
-    <!--<p><span class="">-->
-    %=l 'rvw_DHCP_SERVER'
-    <!--</span>-->
-    </td>
-    <td>
-    %= $rvw_datas->{dhcpserver}
-    <!--</p>-->
-    </td>
-    </tr>
-    </table>
-    </p>
-
     <br><br>
-    <b>
-    %=l 'rvw_SERVER_NAMES'
-    </b>
-    <br>
 
-    <p>
-    <span class="">
-    %=l 'rvw_DNS_SERVER'
-    </span>
-    %= $rvw_datas->{dnsserver}
-    </p>
-    
-    <p>
-    <span class="">
-    %=l 'rvw_WEB_SERVER'
-    </span>
-    %= $rvw_datas->{webserver}
-    </p>
-    
-    <p>
-    <span class="">
-    %=l 'rvw_PROXY_SERVER'
-    </span>
-    %= $rvw_datas->{proxyserver}
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'rvw_FTP_SERVER'
-    </span>
-    %= $rvw_datas->{ftpserver}
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS'
-    </span>
-    %= $rvw_datas->{smtpserver}
-    </p>
-
-    <br><br>
-    <b>
-    %=l 'rvw_DOMAIN_INFORMATION'
-    </b>
-    <br>
-
-    <p>
-    <span class="">
-    %=l 'rvw_PRIMARY_DOMAIN'
-    </span>
-    %= $rvw_datas->{domainname}
-    </p>
-
-    <!---<p><span class="">-->
-    <p>
-    <table width='100%'>
-    <tr>
-    <td class="">
-    %=l 'rvw_VIRTUAL_DOMAINS'
-    </td>
-    <td>
-    <!--</span>-->
-    %= $rvw_datas->{virtualdomains}
-    </td>
-    </tr>
-    </table>
-    </p>
-    <!--</p>-->
-
-    <p>
-    <span class="">
-    %=l 'rvw_PRIMARY_WEB_SITE'
-    </span>
-    %= $rvw_datas->{primarywebsite}
-    </p>
-    
-    <p>
-    <span class="">
-    %=l 'rvw_SERVER_MANAGER'
-    </span>
-    %= $rvw_datas->{servermanager}
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'rvw_USER_PASSWORD_PANEL'
-    </span>
-    %= $rvw_datas->{usermanager}
-    </p>
-
-    <p>
-    <table width='100%'>
-    <tr>
-    <td class="">
-    %=l 'rvw_EMAIL_ADDRESSES'
-    </td>
-    <td>
-    %= $rvw_datas->{emailaddresses}
-    </td>
-    </tr>
-    </table>
-    </p>
-
-    % end
+    %= include 'partials/_rvw_content'
 
 </div>
 
+
 % end

root/usr/share/smanager/themes/AdminLTE/templates/roundcube.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/support.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/useraccounts.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/whatever.html.ep

@@ -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 || '/' %>"

root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/yumpostupg.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/yumremove.html.ep

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

root/usr/share/smanager/themes/AdminLTE/templates/yumupdate.html.ep

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

smeserver-manager-AdminLTE.spec

@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 6
+%define release 9
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -26,6 +26,20 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Sat Apr 19 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-9.sme
+- Starting to update forms
+- Moving as much formatting to simple html as possible
+- Use Mojo helpers for some parts eg theme chooser - may come back to that
+
+* 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
+
 * Wed Apr 16 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-6.sme
 - Remove old template
 - Update breadcrumbs