From 1a4c172969c7938e87e08a3b4cd5d12906556365 Mon Sep 17 00:00:00 2001
From: John Crisp <jcrisp@safeandsoundit.co.uk>
Date: Thu, 24 Apr 2025 11:34:16 +0200
Subject: [PATCH] Tidy User list

---
 .../public/koozali/css/adminlte.koozali.css   | 15 ++++++
 .../AdminLTE/templates/common_css.html.ep     |  2 +-
 .../templates/partials/_usr_list.html.ep      | 46 +++++++++----------
 smeserver-manager-AdminLTE.spec               |  7 ++-
 4 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css b/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css
index e6016fe..0673ea0 100644
--- a/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css
+++ b/root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css
@@ -88,3 +88,18 @@
    cursor: default;                   /* Prevent text cursor */
 
 }
+
+
+/* TD and buttons in user lists */
+
+.user-td-no-right {
+    border-left-width: 0px;
+}
+
+.user-td-no-left {
+    border-left-width: 0px;
+}
+
+.user-valign-center {
+    text-align: center;
+}
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep
index 9a07318..f4fe3f1 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/common_css.html.ep
@@ -6,4 +6,4 @@
 
 %= stylesheet 'dist/css/adminlte.min.css'
 %= stylesheet 'dist/icons/font/bootstrap-icons.min.css'
-%= stylesheet 'dist/css/overlayscrollbars.min.css' 
\ No newline at end of file
+%#= stylesheet 'dist/css/overlayscrollbars.min.css' 
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
index d2cd118..fde2a31 100644
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep
@@ -35,7 +35,7 @@
             <th>
                 %=l 'usr_FORWARDING_ADDRESS'
             </th>
-            <th>
+            <th  class="user-valign-center" colspan="5">
                 %=l 'ACTION'
             </th>
         </tr>
@@ -66,40 +66,40 @@
                  % my $csrf_token = "TOKEN";  # CSRF token for security
                  % my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
                  % my $password_text = l("PASSWORD_RESET");
-                 %if ($useraccounts_user_name eq 'admin')  { 
+                 % if ($useraccounts_user_name eq 'admin')  { 
                      %$actionModify = qq{
                          %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
                          %   <button type='button' class="btn btn-primary" title='$modify_text'>
                          %       $modify_text
                          %   </button>
-                         %</a>&nbsp;
+                         %</a>
                      %};                             
                      %$actionResetPw = qq{
                          %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name">
                          %   <button type='button' class="btn btn-primary" title='$password_text' >
                          %       $password_text
                          %   </button>
-                         %</a>&nbsp;
+                         %</a>
                      %};
-                 %} else {
+                 % } else {
                      %$actionModify = qq{
                          %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
                          %   <button type='button' class="btn btn-primary" title='$modify_text' >
                          %       $modify_text
                          %   </button>
-                         %</a>&nbsp;
+                         %</a>
                      %};
-                 %}
-                 %if ($password_set ne 'yes') {
+                 % }
+                 % 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="btn btn-primary" title="$password_text - currently unset" style = background:pink; >
                              %       $password_text
                              %   </button>
-                         %</a>&nbsp;
+                         %</a>
                      %};
-                 %} elsif ($useraccounts_user_name ne 'admin') {
+                 % } elsif ($useraccounts_user_name ne 'admin') {
                      % my $lock_text = l('ACCOUNT LOCKED');  # Localized text
                      % my $csrf_token = "TOKEN";  # CSRF token for security
                      % my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
@@ -108,17 +108,17 @@
                              %   <button type='button' class="btn btn-primary" title='$lock_text' >
                              %       $lock_text
                              %   </button>
-                         %</a>&nbsp;
+                         %</a>
                          %};
                      %$actionResetPw = qq{
                          %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
                          %   <button type='button' class="btn btn-primary" title='$password_text' >
                          %       $password_text
                          %   </button>
-                         %</a>&nbsp;
+                         %</a>
                          %};
-                 %}
-                 %if ( $removable eq 'yes' )  { 
+                 % }
+                 % if ( $removable eq 'yes' )  { 
                      % my $remove_text = l('REMOVE');  # Localized text
                      % my $csrf_token = "TOKEN";  # CSRF token for security
                      %$actionRemove = qq{
@@ -126,9 +126,9 @@
                          %   <button type='button' class="btn btn-primary" title='$remove_text' >
                          %       $remove_text
                          %   </button>
-                         %</a>&nbsp;
+                         %</a>
                      %};
-                 %}
+                 % }
                  
                  % my $thisdomain = $c->req->url->to_abs->host;
                  % my $roundcube_text = l('Webmail');  # Localized text
@@ -139,15 +139,13 @@
                      %   <button type='button' class="btn btn-primary" title='$roundcube_text' >
                      %       $roundcube_text
                      %   </button>
-                     %</a>&nbsp;
+                     %</a>
                  %};
-                 <td>          
-                         <%= $c->render_to_string(inline => $actionModify) %>
-                         <%= $c->render_to_string(inline => $actionResetPw) %>
-                         <%= $c->render_to_string(inline => $actionLock) %>
-                         <%= $c->render_to_string(inline => $actionRemove) %>
-                         <%= $c->render_to_string(inline => $actionroundcube) %>
-                 </td>
+                 <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                 <td class="user-valign-center"><%= $c->render_to_string(inline => $actionResetPw) %></td>
+                 <td class="user-valign-center"><%= $c->render_to_string(inline => $actionLock) %></td>
+                 <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                 <td class="user-valign-center"><%= $c->render_to_string(inline => $actionroundcube) %></td>
              </tr>
         % }
         </tbody>
diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec
index 5a309b9..0589877 100644
--- a/smeserver-manager-AdminLTE.spec
+++ b/smeserver-manager-AdminLTE.spec
@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 11
+%define release 12
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -26,7 +26,10 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
-* Wed Apr 23 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.011.sme
+* Thu Apr 24 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0.12.sme
+- Tidy user list
+
+* Wed Apr 23 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-11.sme
 - Working sidebar scrolling
 
 * Sat Apr 19 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-10.sme