More tidying user accounts files

Tidy User list
2025-04-25 14:30:30 +02:00 · 2025-04-24 11:34:16 +02:00
7 changed files with 464 additions and 400 deletions
--- 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;
+}
--- 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' 
+%#= stylesheet 'dist/css/overlayscrollbars.min.css' 
--- a/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/layouts/AdminLTE.html.ep
@@ -171,6 +171,7 @@
                            %= include 'partials/_panel_card_top'
                            %= include 'partials/_panel_card_header'
                        % }
+                        
                        %= content 'module'

                        % if ($c->current_route ne 'login') {
--- 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
@@ -5,10 +5,10 @@

    %= form_for '/useraccounts' => (method => 'POST') => begin

-<div>
-    <button type="submit" class="btn btn-primary"><%= $btn %> </button>
-</div>
-
+    <div>
+        <button type="submit" class="btn btn-primary"><%= $btn %> </button>
+    </div>
+    
    % end    

    <p>
@@ -16,6 +16,8 @@
    <br>
    </p>
    
+    %= dumper @$users
+
    %   my $numUsers = @$users;
    %   if ($numUsers == 0){
        %=l 'usr_NO_USER_ACCOUNTS'
@@ -35,7 +37,7 @@
            <th>
                %=l 'usr_FORWARDING_ADDRESS'
            </th>
-            <th>
+            <th  class="user-valign-center" colspan="5">
                %=l 'ACTION'
            </th>
        </tr>
@@ -66,40 +68,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 +110,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 +128,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 +141,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>
@@ -159,7 +159,3 @@

 </div>

-
-<div>
-
-</div>
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep
@@ -1,199 +1,325 @@
-<div>
+% content_for 'module' => begin

+<div class="container-sm">
+    <br>
+    <h2><%= l 'usr_P2_TITLE' %></h2>
+    <br>
+    <%= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC')) %>
+    <br><br>
+    
+    <!-- Are we add or modify ? -->
+    <!-- Add -->
+    <!-- No trt -->
+    <!-- Modify -->
+    <!-- trt =UPD user=XX -->
+    
    % my $btn = l('ADD');

-    %= form_for '/useraccountsd' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'usr_P2_TITLE'
-    </h2>
-    <br>
-    %= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC'))
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'usr_ACCOUNT_NAME'
-    </span>
-    <span class="">
-    % if ( $usr_datas->{trt} eq 'ADD' ) {
-        % param 'user' => $usr_datas->{user} unless param 'user';
-        %= text_field 'user', class => ""
-    % } else {
-        % $btn = l('SAVE');
-        %= $usr_datas->{user}, class => ""
-    % }
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'usr_FIRSTNAME'
-    </span>
-    <span class="">
-    % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
-    %= text_field 'FirstName', class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_LASTNAME'
-    </span>
-    <span class="">
-    % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
-    %= text_field 'LastName', class => ""
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'usr_DEPARTMENT'
-    </span><span class="">
-    % param 'Dept' => $usr_datas->{dept} unless param 'Dept';
-    %= text_field 'Dept', class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_COMPANY'
-    </span>
-    <span class="">
-    % param 'Company' => $usr_datas->{company} unless param 'Company';
-    %= text_field 'Company', class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_STREET_ADDRESS'
-    </span>
-    <span class="">
-    % param 'Street' => $usr_datas->{street} unless param 'Street';
-    %= text_field 'Street', class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_CITY'
-    </span>
-    <span class="">
-    % param 'City' => $usr_datas->{city} unless param 'City';
-    %= text_field 'City', class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_PHONE_NUMBER'
-    </span>
-    <span class="">
-    % param 'Phone' => $usr_datas->{phone} unless param 'Phone';
-    %= text_field 'Phone', class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_EMAIL_DELIVERY'
-    </span>
-    <span class="">
-    % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
-    %= select_field 'EmailForward' => $c->emailForward_list(), class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_FORWARDING_ADDRESS'
-    </span>
-    <span class="">
-    % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
-    %= text_field 'ForwardAddress', class => ""
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'usr_VPN_CLIENT_ACCESS'
-    </span>
-    <span class="">
-    % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
-    %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => ""
-    </span>
-    </p>
-
-    %   if (  $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) {
-    %   my $btn2 = $c->l('DOWNLOAD');
-    %= form_for '/useraccountso' => (method => 'POST') => begin
-    <p>
-    <span class="">
-    %=l 'usr_LABEL_IPSECRW_DOWNLOAD'
-    </span>
-    <span class="">
-    %= submit_button $btn2, class => ""
-    </span>
-    </p>
-    %= hidden_field 'trt' => 'CRT'
-        %= hidden_field 'user' => $usr_datas->{user}
-    %end
-    %   }
-
-    %   my @groups = @{$c->get_groups()};
-    %   if ( @groups ) {
-    <p>
-    <span class="">
-    %=l 'usr_GROUP_MEMBERSHIPS'
-    </span>
-    <span class="">
-    <table class="table table-bordered">
-    <thead>
-      <tr>
-        <th class="">
-            %=l 'usr_MEMBER'
-            </th><th class="">
-            %=l 'GROUP'
-            </th><th class="">
-            %=l 'DESCRIPTION'
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-        
-    %    foreach my $g ( @groups) {
-    %        my $user = $usr_datas->{user};
-    %        my $groupname  = $g->key();
-    %        my $description    = $g->prop('Description');
-    %        my $checked = '';
-    %        if ( $user and $c->is_user_in_group($user, $groupname) ) {
-    %            $checked = 'checked';
-    %        }
-        <tr>
-
-        <td>
-        % if ( $checked eq 'checked' ) {
-        <!-- % = check_box 'groupMemberships', value => $groupname, checked => $checked -->
-        <input type='checkbox' name='groupMemberships' checked value='<%= $groupname %>'>
-        %} else {
-        %= check_box 'groupMemberships' => $groupname
-        %}
-        </td>
-            <!-- t td => (class => "") => (check_box ' groupMemberships' => $groupname  $checked) -->
-            %= t td => (class => "") => $groupname
-            %= t td => (class => "") => "$description"
-        </tr>
-    %    }
-        </tbody>
-        </table>
-        </span>
-    </p>
-    %   }
-
-    <p>
-    <br><br>
-    %= submit_button $btn, class => ""
-    </p>
-
-    %= hidden_field 'trt' => $usr_datas->{trt}
-    % if ( $usr_datas->{trt} eq 'UPD' ) {
-            %= hidden_field 'user' => $usr_datas->{user}
-    % }
+    <form action="/smanager/useraccountsd" method="POST">
+        %#= form_for '/useraccountsd' => (method => 'POST') => begin
    
-    % end
+        % if ( $usr_datas->{trt} eq 'ADD' ) {
+    
+        % param 'user' => $usr_datas->{user} unless param 'user';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputLastNAme" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" id="inputUser" class="form-control" aria-describedby="LastName" value="<%= $usr_datas->{user} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                User
+              </span>
+            </div>
+        </div>
+    
+        %#= text_field 'user'
+    
+        % } else {
+            <!-- If not user set Button Save not Add -->
+            % $btn = l('SAVE');
+            <div class="row g-3 align-items-center">
+                <div class="col-md-2">
+                  <label for="inputLastNAme" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
+                </div>
+                <div class="col-auto">
+                  <input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $usr_datas->{user} %>">
+                </div>
+        
+            </div>
+        % }
+       
+        <br>
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputFirstName" class="col-form-label"><%= l 'usr_FIRSTNAME' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="FirstName" id="inputFirstName" class="form-control" aria-describedby="FirstName" value="<%= $usr_datas->{firstname} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                First Name
+              </span>
+            </div>
+        </div>
+        <br>
+    
+       % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputLastNAme" class="col-form-label"><%= l 'usr_LASTNAME' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="LastName" id="inputLastName" class="form-control" aria-describedby="LastName" value="<%= $usr_datas->{lastname} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Last Name
+              </span>
+            </div>
+        </div>
+        <br>
+    
+    
+        % param 'Dept' => $usr_datas->{dept} unless param 'Dept';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputDepartment" class="col-form-label"><%= l 'usr_DEPARTMENT' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="Dept" id="inputEmail" class="form-control" aria-describedby="Dept" value="<%= $usr_datas->{dept} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Department
+              </span>
+            </div>
+        </div>
+        <br>
+    
+    
+        % param 'Company' => $usr_datas->{company} unless param 'Company';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputCompany" class="col-form-label"><%= l 'usr_COMPANY' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="Company" id="inputCompany" class="form-control" aria-describedby="Company" value="<%= $usr_datas->{company} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Company
+              </span>
+            </div>
+        </div>
+        <br>
+    
+    
+        % param 'Street' => $usr_datas->{street} unless param 'Street';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputStreet" class="col-form-label"><%= l 'usr_STREET_ADDRESS' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="Street" id="inputCompany" class="form-control" aria-describedby="Street" value="<%= $usr_datas->{street} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Street
+              </span>
+            </div>
+        </div>
+        <br>
+        
+        % param 'City' => $usr_datas->{city} unless param 'City';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputCity" class="col-form-label"><%= l 'usr_CITY' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="City" id="inputCity" class="form-control" aria-describedby="City" value="<%= $usr_datas->{city} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                City
+              </span>
+            </div>
+        </div>
+        <br>
+       
+        
+       
+        % param 'Phone' => $usr_datas->{phone} unless param 'Phone';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputPhone" class="col-form-label"><%= l 'usr_PHONE_NUMBER' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="Phone" id="inputPhone" class="form-control" aria-describedby="City" value="<%= $usr_datas->{phone} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Phone
+              </span>
+            </div>
+        </div>
+        <br>
+    
+    
+        % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputEmailDelivery" class="col-form-label"><%= l 'usr_EMAIL_DELIVERY' %></label>
+            </div>
+            <div class="col-auto">
+                %= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select"
+            </div>
+        </div>
+        <br>
+    
+        % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputEmail" class="col-form-label"><%= l 'usr_FORWARDING_ADDRESS' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="email" name="ForwardAddresss" id="inputEmail" class="form-control" aria-describedby="Email" value=<%= $usr_datas->{forwardaddress} %>>
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Email forwarding address
+              </span>
+            </div>
+        </div>
+        <br>
+    
+    
+        % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputVPNClientAccess" class="col-form-label"><%= l 'usr_VPN_CLIENT_ACCESS' %></label>
+            </div>
+            <div class="col-auto">
+                %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select"
+            </div>
+        </div>
+        <br>
+    
+        <!-- fix from here -->
+    
+        
+        <!-- Begin if ipsec  -->
+        %   if (  $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) {
+        %   my $btn2 = $c->l('DOWNLOAD');
+        %= form_for '/useraccountso' => (method => 'POST') => begin
+        <p>
+        <span class="">
+        %=l 'usr_LABEL_IPSECRW_DOWNLOAD'
+        </span>
+        <span class="">
+        %= submit_button $btn2, class => ""
+        </span>
+        </p>
+        %= hidden_field 'trt' => 'CRT'
+            %= hidden_field 'user' => $usr_datas->{user}
+        %end
+        %   }
+        <!-- End if ipsec  -->
+    
+    
+        <!-- Groups begin -->
+        <div>
+            %   my @groups = @{$c->get_groups()};
+            
+            %#= dumper @groups
+        
+            %   if ( @groups ) {

+            <br><br>
+            
+            %=l 'usr_GROUP_MEMBERSHIPS'
+            
+            <br><br>
+            
+            <table class="table table-bordered">
+            <thead>
+              <tr>
+                <th>
+                    %=l 'usr_MEMBER'
+                    </th><th class="">
+                    %=l 'GROUP'
+                    </th><th class="">
+                    %=l 'DESCRIPTION'
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+                
+            %    foreach my $g ( @groups) {
+            %        my $user = $usr_datas->{user};
+            %        my $groupname  = $g->key();
+            %        my $description    = $g->prop('Description');
+            %        my $checked = '';
+            %        if ( $user and $c->is_user_in_group($user, $groupname) ) {
+            %            $checked = 'checked';
+            %        }
+                <tr>
+        
+                <td class="col-md-2">
+                % if ( $checked eq 'checked' ) {
+                <!-- % = check_box 'groupMemberships', value => $groupname, checked => $checked -->
+                <input type='checkbox' name='groupMemberships' checked value='<%= $groupname %>'>
+                %} else {
+                %= check_box 'groupMemberships' => $groupname
+                %}
+                </td>
+                    <!-- t td => (class => "") => (check_box ' groupMemberships' => $groupname  $checked) -->
+                    %= t td => (class => "") => $groupname
+                    %= t td => (class => "") => "$description"
+                </tr>
+            %    }
+                </tbody>
+                </table>
+        
+            %   }
+        <!-- Groups End -->
+        </div>
+    
+    
+        % $btn = l('SAVE');
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= l 'SAVE' %></button>
+            </div>
+        </div>
+    
+    
+        %= hidden_field 'trt' => $usr_datas->{trt}
+        
+    trt: <%= dumper $usr_datas->{trt} %>
+    user: <%= dumper $usr_datas->{user} %>
+    
+        % if ( $usr_datas->{trt} eq 'UPD' ) {
+                %= hidden_field 'user' => $usr_datas->{user}
+        % }
+        
+        % end
+    </form>
 </div>
+
+<!-- End of containers-sm -->
--- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep
+++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upds.html.ep
@@ -1,93 +1,111 @@
 % content_for 'module' => begin

 <div class="container-sm">
-<br>
-<h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
-
-    <%= l 'usr_ACCOUNT_NAME' %> : <%= $usr_datas->{user} %>
-
+    <br>
+    <h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
+    <br><br>
 

-<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>
+    <form action="/smanager/useraccountsd" method="POST">
+        %#= form_for '/useraccountsd' => (method => 'POST') => begin
+    
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputLastNAme" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
+            </div>
+            <div class="col-auto">
+              <input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $usr_datas->{user} %>">
+            </div>
        </div>
-        <div class="col-auto p-3">
-          <input type="text" id="inputFirstName" class="form-control" aria-describedby="FirstName" value=<%= $usr_datas->{firstname} %> >
+    
+        <br>
+        % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputFirstName" class="col-form-label"><%= l 'usr_FIRSTNAME' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="FirstName" id="inputFirstName" class="form-control" aria-describedby="FirstName" value="<%= $usr_datas->{firstname} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                First Name
+              </span>
+            </div>
        </div>
-        <div class="col-auto p-3">
-          <span id="passwordHelpInline" class="form-text">
-            First Name
-          </span>
+        <br>
+    
+       % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputLastNAme" class="col-form-label"><%= l 'usr_LASTNAME' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="text" name="LastName" id="inputLastName" class="form-control" aria-describedby="LastName" value="<%= $usr_datas->{lastname} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Last Name
+              </span>
+            </div>
        </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>
+        <br>
+    
+        % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputEmailDelivery" class="col-form-label"><%= l 'usr_EMAIL_DELIVERY' %></label>
+            </div>
+            <div class="col-auto">
+                %= select_field 'EmailForward' => $c->emailForward_list(), class => "form-select"
+            </div>
        </div>
-        <div class="col-auto p-3">
-          <input type="text" id="inputLastName" class="form-control" aria-describedby="LastName" value=<%= $usr_datas->{lastname} %>>
+        <br>
+        
+        % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+              <label for="inputEmail" class="col-form-label"><%= l 'usr_FORWARDING_ADDRESS' %></label>
+            </div>
+            <div class="col-auto">
+              <input type="email" name="ForwardAddress" id="inputEmail" class="form-control" aria-describedby="Email" value="<%= $usr_datas->{forwardaddress} %>" >
+            </div>
+            <div class="col-auto">
+              <span id="passwordHelpInline" class="form-text">
+                Email forwarding address
+              </span>
+            </div>
        </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"
+        <br>
+    
+        % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
+    
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <label for="inputVPNClientAccess" class="col-form-label"><%= l 'usr_VPN_CLIENT_ACCESS' %></label>
+            </div>
+            <div class="col-auto">
+                    %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select"
+            </div>
+            <br>
        </div>

-
-    % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
-
-    <div class="row g-3 align-items-center">
-        <div class="col-auto">
-          <label for="inputEmail" class="col-form-label"><%= l 'usr_FORWARDING_ADDRESS' %></label>
-        </div>
-        <div class="col-auto">
-          <input type="email" id="inputEmail" class="form-control" aria-describedby="Email" value=<%= $usr_datas->{forwardaddress} %>>
-        </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';
+        % my $btn = l('SAVE');

        <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 class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= l 'SAVE' %></button>
+            </div>
        </div>
+    </form>

-    % my $btn = l('SAVE');
-
-    <div class="row g-3 align-items-center">
-        <div class="col-auto p-33">
-            <button type="submit" class="btn btn-primary"><%= l 'SAVE' %></button>
-        </div>
-    </div>
-
-</form>
+trt: <%= dumper $usr_datas->{trt} %>
+user: <%= dumper $usr_datas->{user} %>

 %= hidden_field 'trt' => $usr_datas->{trt}
 %= hidden_field 'user' => $usr_datas->{user}
@@ -96,101 +114,3 @@

 </div>

-
-
-<div>
-
-    % my $btn = l('SAVE');
-
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'usr_MODIFY_ADMIN_TITLE'
-    </h2><br>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'usr_ACCOUNT_NAME'
-    </span>
-    <span class="">
-    % $btn = l('SAVE');
-    %= $usr_datas->{user}, class => ""
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'usr_FIRSTNAME'
-    </span>
-    <span class="">
-    % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
-    %= text_field 'FirstName', class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_LASTNAME'
-    </span>
-    <span class="">
-    % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
-    %= text_field 'LastName', class => ""
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'usr_EMAIL_DELIVERY'
-    </span>
-    <span class="">
-    % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
-    %= select_field 'EmailForward' => $c->emailForward_list(), class => ""
-    </span>
-    </p>
-    <p>
-    <span class="">
-    %=l 'usr_FORWARDING_ADDRESS'
-    </span>
-    <span class="">
-    % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
-    %= text_field 'ForwardAddress', class => ""
-    </span>
-    </p>
-
-    <p>
-    <span class="">
-    %=l 'usr_VPN_CLIENT_ACCESS'
-    </span>
-    <span class="">
-    % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
-    %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => ""
-    </span>
-    </p>
-
-    %   if ( $c->ipsec_for_acct eq 'OK' ) {
-    %   my $btn2 = $c->l('DOWNLOAD');
-    %= form_for '/useraccountso' => (method => 'POST') => begin
-    <p>
-    <span class="">
-    %=l 'usr_LABEL_IPSECRW_DOWNLOAD'
-    </span>
-    <span class="">
-    %= submit_button $btn2, class => ""
-    </span>
-    </p>
-    %= hidden_field 'trt' => 'CRT'
-        %= hidden_field 'user' => $usr_datas->{user}
-    %end
-    %   }
-
-    <p>
-    <br>
-    %= submit_button $btn, class => ""
-    </p>
-
-    %= hidden_field 'trt' => $usr_datas->{trt}
-        %= hidden_field 'user' => $usr_datas->{user}
-    
-    % end
-
-</div>
--- 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 13
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -26,7 +26,13 @@ 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
+* Fri Apr 25 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-13.sme
+- Tidy some useraccounts formatting but admin page will not save
+
+* 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
Author	SHA1	Message	Date
John Crisp	dbeacddd96	More tidying user accounts files	2025-04-25 14:30:30 +02:00
John Crisp	1a4c172969	Tidy User list	2025-04-24 11:34:16 +02:00