Fix users panels - missing css file - override default font size for Brian

root/usr/share/smanager/themes/AdminLTE/public/koozali/css/adminlte.koozali.css

@@ -1,3 +1,6 @@
+html {
+    font-size: 14px;
+}
 
 #busy-indicator {
     display: none;
@@ -50,8 +53,8 @@
 }
 
 .login-page {
-    min-height: 10vh;
-    vertical-align: top !important;
+    min-height: 60vh !important ;
+    vertical-align: top !important ;
 }
 
 .nav-icon {

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

@@ -4,83 +4,97 @@
 
 <div class="card-body">
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+        <pre>
+            <%=  dumper $c->current_route %>
+            <%=  dumper $bac_datas %>
+        </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
+        <br>
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error') %>
+        </div>
     %}
 
     <h1><%= $title%></h1>
 
-    <h2>
-    %=l 'bac_ENABLE_DISABLE_TAPE'
-    </h2><br>
+    <br>
 
-    %= $c->render_to_string(inline => (l 'bac_TAPE_CONFIG_DESC'))
+    <h2><%= l 'bac_ENABLE_DISABLE_TAPE' %></h2>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+    <br>
 
-    <p>
-    <span class="">
-    %=l 'bac_ENABLE_TAPE_BACKUP'
-    </span>
-    <span class="">
-    % if ( $bac_datas->{status} eq 'checked' ) {
-    <input type='checkbox' name='Tapebackup' checked >
-    %} else {
-    %= check_box 'Tapebackup'
-    %}
-    </span>
-    </p>
+    <div>
+        <%= $c->render_to_string(inline => (l 'bac_TAPE_CONFIG_DESC')) %>
+    </div>
+
+    <br>
+
+    <form action="/smanager/backupd" method="POST">
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'bac_ENABLE_TAPE_BACKUP' %>
+            </div>
+            <div class="col-auto">
+            % if ( $bac_datas->{status} eq 'checked' ) {
+                <input type='checkbox' name='Tapebackup' checked >
+            % } else {
+                <input type='checkbox' name='Tapebackup'>
+            % }
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'bac_TAPE_BACKUP_TIME' %>
+            </div>
+            <div class="col-auto">
+                % param 'BackupHour' => $bac_datas->{backupHour} unless param 'BackupHour';
+                <%=  text_field 'BackupHour', size => '2' %>
+                % param 'BackupMin' => $bac_datas->{backupMin} unless param 'BackupMin';
+                <%=  text_field 'BackupMin', size => '2' %>
+            </div>
+            <div class="col-auto">
+                % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM';
+                <%=  select_field 'BackupAMPM' => ['AM', 'PM'], class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
 
 
-    <p>
-    <span class="">
-    %=l 'bac_TAPE_BACKUP_TIME'
-    </span>
-    <span class="">
-    % param 'BackupHour' => $bac_datas->{backupHour} unless param 'BackupHour';
-    %= text_field 'BackupHour', size => '2'
-    % param 'BackupMin' => $bac_datas->{backupMin} unless param 'BackupMin';
-    %= text_field 'BackupMin', size => '2'
-    </span>
-    <!--span class="">
-    %=l 'AM/PM:'
-    <!--/span-->
-    <span class="">
-    % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM';
-    %= select_field 'BackupAMPM' => ['AM', 'PM'], class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%= l 'bac_LOAD_TAPE_REMINDER_TIME' %>
+            </div>
+            <div class="col-auto">
+                % param 'ReminderHour' => $bac_datas->{reminderHour} unless param 'ReminderHour';
+                <%=  text_field 'ReminderHour', size => '2' %>
+                % param 'ReminderMin' => $bac_datas->{reminderMin} unless param 'ReminderMin';
+                <%=  text_field 'ReminderMin', size => '2' %>
+            </div>
+            <div class="col-auto">
+                % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM';
+                <%=  select_field 'ReminderAMPM' => ['AM', 'PM'], class => "form-select" %>
+            </div>
+        </div>
 
-    <p>
-    <span class="">
-    %=l 'bac_LOAD_TAPE_REMINDER_TIME'
-    </span>
-    <span class="">
-    % param 'ReminderHour' => $bac_datas->{reminderHour} unless param 'ReminderHour';
-    %= text_field 'ReminderHour', size => '2'
-    % param 'ReminderMin' => $bac_datas->{reminderMin} unless param 'ReminderMin';
-    %= text_field 'ReminderMin', size => '2'
-    </span>
-    <!--span class="">
-    %=l 'AM/PM:'
-    <!--/span-->
-    <span class="">
-    % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM';
-    %= select_field 'ReminderAMPM' => ['AM', 'PM'], class => ""
-    </span>
-    </p><br>
+        <br>
 
-    %= hidden_field 'Function' => $bac_datas->{'function'}
-    %= submit_button $c->l('bac_UPDATE_CONF'), class => ""
+        <%=  hidden_field 'Function' => $bac_datas->{'function'} %>
+
+        % my $btn = l('bac_UPDATE_CONF');
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary" value="<%=$c->l('bac_UPDATE_CONF')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
-    % end
 </div>
 % end

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

@@ -5,34 +5,44 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+    <pre>
+        <%= dumper $c->current_route %>
+        <%= dumper $bac_datas %>
+    </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
+    % }
 
     <h1><%= $title%></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
-
-    <h2>
-    %=l 'bac_RESTORE_CONF_FROM_TAPE'
-    </h2>
-
-    %= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_TAPE_DESC'))
-
     <br>
 
-    %= hidden_field 'Function' => $bac_datas->{'function'}
+    <form action="/smanager/backupd" method="POST">
 
-    %= submit_button $c->l('bac_RESTORE_FROM_TAPE'), class => ""
+        <h2><%=l 'bac_RESTORE_CONF_FROM_TAPE' %></h2>
+
+        <br>
+
+        <%= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_TAPE_DESC')) %>
+
+        <br>
+
+        <%= hidden_field 'Function' => $bac_datas->{'function'} %>
+
+        % my $btn = l('bac_RESTORE_FROM_TAPE');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary" value="<%=$c->l('bac_RESTORE_FROM_TAPE')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+    <form>
 
-    % end
 </div>
 % end

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

@@ -5,54 +5,68 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $bac_datas
-    </p>
+    <pre>
+     <%=  dumper $c->current_route %>
+     <%=  dumper $bac_datas %>
+    </pre>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
+        <br><div class="text-danger">
+         <%=  $c->render_to_string(inline => stash 'error') %>
     </div>
     %}
 
-    <h1><%= $title%></h1>
+    <h1><%=  $title%></h1>
 
-    %= form_for '/backup' => (method => 'POST') => begin
-
-    <h2>
-    %=l 'bac_CONFIGURE_WORKSTN_BACKUP'
-    </h2>
-
-    %= $c->render_to_string(inline => (l 'bac_WORKSTN_BACKUP_DESC'))
-
-    %=l 'bac_WORKSTN_BACKUP_ENABLED'
-    <span class="">
-    %= $bac_datas->{status}
-    </span>
     <br>
 
-    %= $c->render_to_string(inline => $c->workstnBackupConfig())
+    <form action="/smanager/backup" method="POST">
 
-    <p>
-    <h3>
-    %= l 'bac_WORKSTATION_BACKUP_SETCONF'
-    </h3>
-    <br>
-    <span class="">
-    %=l 'bac_SELECT_VFS_TYPE'
-    </span>
-    <span class="">
-    % param 'VFSType' => $bac_datas->{vfstype} unless param 'VFSType';
-    %= select_field 'VFSType' => $c->get_VFSType_options(), class => ""
-    </span>
-    </p>
+        <h2><%= l 'bac_CONFIGURE_WORKSTN_BACKUP' %></h2>
 
-    %= hidden_field 'Function' => $bac_datas->{'function'} . '1'
-    %= submit_button $c->l('NEXT'), class => ""
+        <br>
 
-    % end
+        <%=  $c->render_to_string(inline => (l 'bac_WORKSTN_BACKUP_DESC')) %>
+
+        <br>
+
+        <div>
+            <%= l 'bac_WORKSTN_BACKUP_ENABLED' %>: <%=  $bac_datas->{status} %>
+        </div>
+
+        <br>
+
+        <%=  $c->render_to_string(inline => $c->workstnBackupConfig()) %>
+
+        <br>
+
+        <h3><%= l 'bac_WORKSTATION_BACKUP_SETCONF' %></h3>
+
+        <br>
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                 <%= l 'bac_SELECT_VFS_TYPE' %>
+            </div>
+            <div class="col-auto">
+                % param 'VFSType' => $bac_datas->{vfstype} unless param 'VFSType';
+                 <%=  select_field 'VFSType' => $c->get_VFSType_options(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        <%=  hidden_field 'Function' => $bac_datas->{'function'} . '1' %>
+
+        % my $btn = l('NEXT');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary" value="<%=$c->l('NEXT')%>"><%= $btn %></button>
+            </div>
+        </div>
+
+    </form>
 
 </div>
 

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

@@ -5,76 +5,99 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <div>
-        %= dumper $c->current_route
-        %= dumper $bac_datas
-    </div>
+    <pre>
+        <%=  dumper $c->current_route %>
+        <%=  dumper $bac_datas %>
+    </pre>
     % }
 
     % if ( stash 'warning' ) {
         <br>
-        <div>
-        %= $c->render_to_string(inline => stash 'warning') 
+        <div class="col-md-4 bg-info text-center">
+            <%=  $c->render_to_string(inline => stash 'warning') %>
         </div>
-    %}
+        <br>
+    % }
     % if ( stash 'error' ) {
         <br>
-        <div>
-        %= $c->render_to_string(inline => stash 'error') 
+        <div class="text-danger">
+            <%=  $c->render_to_string(inline => stash 'error')  %>
         </div>
-    %}
+        <br>
+    % }
 
     <h1><%= $title%></h1>
+
     <!--br>Still incomplete click here for previous version
     <a href="/server-manager/cgi-bin/backup" target='_blank'><b>(Previous Backup version)</b></a>
-    <br-->
-
-    <%= $c->render_to_string(inline => (l 'bac_BACKUP_DESC_DAR', $bac_datas->{module}, 
-        $bac_datas->{dumpsize}, $bac_datas->{tarsize})) %>
-
-    <form action="/smanager/backup" method="POST">
-        %#= form_for '/backup' => (method => 'POST') => begin
-    
-    <h2><%= l 'bac_BACKUP_CONFIG_STATUS' %></h2>
-
-    <div>
-    <%= l 'bac_TAPE_BACKUPS' %>,
-    <%= $c->l(uc($bac_datas->{'backupStatus'})).'.' %>
-
-    % if ( $bac_datas->{'backupStatus'} eq 'enabled' ) {
-        %= $c->l('bac_BACKUPS_RUN_AT')
-        %=  $bac_datas->{'backupTime'}
-        %= $c->l('bac_REMINDER_MESSAGE_AT')
-        %= $bac_datas->{'reminderTime'}
-    % }
-    </div>
-    
-    <div>
-
-    <%=l 'bac_WORKSTN_BACKUPS' %>,
-    <%= $c->l(uc($bac_datas->{'backupwkStatus'})) . '.' %>
-    % if ( $bac_datas->{'backupwkStatus'} eq 'enabled' ) {
-        <%= $c->l('bac_WKBACKUPS_RUN_AT') %>
-        <%= $bac_datas->{'backupwkTime'} %>
-    % }
-    </div>
-
-    <div>
-    <%= l 'bac_SELECT_AN_ACTION' %>
-    % param 'Function' => $bac_datas->{function} unless param 'Function';
-    <%= select_field 'Function' => $c->get_function_options() %>
-    </div>
+    -->
 
     <br>
 
-        <%  my $btn = $c->l('PERFORM'); %>
-         <div class="row g-3 align-items-center">
+    <%= $c->render_to_string(inline => (l 'bac_BACKUP_DESC_DAR', $bac_datas->{module},
+    $bac_datas->{dumpsize}, $bac_datas->{tarsize})) %>
+
+    <form action="/smanager/backup" method="POST">
+        <br>
+
+        <h2><%= l 'bac_BACKUP_CONFIG_STATUS' %></h2>
+
+        <br>
+
+        <div>
+            <div>
+                <%= l 'bac_TAPE_BACKUPS' %>: <%= $c->l(uc($bac_datas->{'backupStatus'})).'.' %>
+            </div>
+
+
+            % if ( $bac_datas->{'backupStatus'} eq 'enabled' ) {
+                <div>
+                    <%=  $c->l('bac_BACKUPS_RUN_AT') %>: <%=   $bac_datas->{'backupTime'} %>
+                </div>
+                <br>
+                <div>
+                    <%=  $c->l('bac_REMINDER_MESSAGE_AT') %>: <%=  $bac_datas->{'reminderTime'} %>
+                </div>
+            % }
+        </div>
+
+        <br>
+
+        <div>
+            <div>
+                <%=l 'bac_WORKSTN_BACKUPS' %>:  <%= $c->l(uc($bac_datas->{'backupwkStatus'})) . '.' %>
+            </div>
+            <div>
+                % if ( $bac_datas->{'backupwkStatus'} eq 'enabled' ) {
+                    <%= $c->l('bac_WKBACKUPS_RUN_AT') %>: <%= $bac_datas->{'backupwkTime'} %>
+                % }
+            </div>
+        </div>
+
+        <br>
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-1">
+                <%= l 'bac_SELECT_AN_ACTION' %>
+            </div>
+
+            <div class="col-auto">
+                % param 'Function' => $bac_datas->{function} unless param 'Function';
+                <%= select_field 'Function' => $c->get_function_options(), class => "form-select" %>
+            </div>
+        </div>
+
+        <br>
+
+        % my $btn = $c->l('PERFORM');
+
+        <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
             </div>
         </div>
-    % end
+
+    </form>
 
 </div>
-
 % end

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

@@ -5,5 +5,5 @@
 %#= stylesheet 'css/sme-jquery-overrides.css'
 
 %= stylesheet 'dist/css/adminlte.min.css'
-%= stylesheet 'dist/icons/font/bootstrap-icons.min.css'
-%#= stylesheet 'dist/css/overlayscrollbars.min.css' 
+%= stylesheet 'dist/font/bootstrap-icons.min.css'
+%#= stylesheet 'dist/css/overlayscrollbars.min.css'

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

@@ -6,8 +6,8 @@
 
     % if (config->{debug} == 1) {
         <pre>
-            <%=  dumper $c->current_route %>
-            <%=  dumper $mai_datas %>
+            <%= dumper $c->current_route %>
+            <%= dumper $mai_datas %>
         </pre>
     % }
 
@@ -15,7 +15,7 @@
     % if ( stash 'error' ) {
         <br>
         <div class="text-danger">
-            <%=  $c->render_to_string(inline => stash 'error') %>
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
     % }
 
@@ -135,14 +135,8 @@
             </div>
         </div>
 
-
-
-
-
-
         <br>
 
-
         % my $btn = l('SAVE');
         <%= hidden_field 'trt' => 'DEL' %>
 

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

@@ -28,7 +28,7 @@
     %}
     <br />
     % my $btn = l('ADD');
-    % my $network_db = esmith::NetworksDB->open();
+    % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db";
 
    % if (config->{debug} == 1) {
     <div>

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

@@ -1,20 +1,20 @@
 
-<div class="container-sm">
+<div>
     <br>
     <h2><%= l 'usr_P2_TITLE' %></h2>
     <br>
     <%= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC')) %>
     <br><br>
-    
-    % my $btn = l('ADD');  
+
+    % my $btn = l('ADD');
 
     <form action="/smanager/useraccountsd" method="POST">
         %#= form_for '/useraccountsd' => (method => 'POST') => begin
-    
+
         % 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="inputAccountName" class="col-form-label"><%= l 'usr_ACCOUNT_NAME' %></label>
@@ -28,7 +28,7 @@
               </span>
             </div>
         </div>
-    
+
         % } else {
             <!-- If not user set Button Save not Add -->
             % $btn = l('SAVE');
@@ -40,12 +40,12 @@
                 <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>
@@ -60,9 +60,9 @@
             </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>
@@ -77,10 +77,10 @@
             </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>
@@ -95,10 +95,10 @@
             </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>
@@ -113,10 +113,10 @@
             </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>
@@ -131,9 +131,9 @@
             </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>
@@ -148,9 +148,9 @@
             </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>
@@ -165,9 +165,9 @@
             </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>
@@ -177,9 +177,9 @@
             </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>
@@ -194,10 +194,10 @@
             </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>
@@ -207,10 +207,10 @@
             </div>
         </div>
         <br>
-    
+
         <!-- fix from here -->
-    
-        
+
+
         <!-- Begin if ipsec needs fixing -->
         % if (  $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) {
             % my $btn2 = $c->l('DOWNLOAD');
@@ -222,22 +222,22 @@
             % 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 user-table-max-wdith">
                 <thead>
                   <tr>
@@ -247,7 +247,7 @@
                   </tr>
                 </thead>
                     <tbody>
-                        
+
                         % foreach my $g ( @groups) {
                             % my $user = $usr_datas->{user};
                             % my $groupname  = $g->key();
@@ -256,7 +256,7 @@
                                 % if ( $user and $c->is_user_in_group($user, $groupname) ) {
                                 %     $checked = 'checked';
                                 % }
-            
+
                             <tr>
                                 <td>
                                 % if ( $checked eq 'checked' ) {
@@ -269,26 +269,26 @@
                                 <td><%= $description %></td>
                             </tr>
                             % }
-        
+
                         </tbody>
                     </table>
-            
+
             % }
         <!-- Groups End -->
         </div>
-    
+
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
                 <button type="submit" class="btn btn-primary"><%= $btn %></button>
             </div>
         </div>
-    
+
         %= hidden_field 'trt' => $usr_datas->{trt}
-    
+
         % if ( $usr_datas->{trt} eq 'UPD' ) {
                 %= hidden_field 'user' => $usr_datas->{user}
         % }
-        
+
     </form>
     %#end
 </div>

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

@@ -1,13 +1,12 @@
-% content_for 'module' => begin
 
-<div class="container-sm">
-    <br>
-    <h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
-     
-    <br><br>
- 
+
+<h2><%= l 'usr_MODIFY_ADMIN_TITLE' %></h2>
+
+<div>
+  <br><br>
+
     <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">
@@ -17,10 +16,11 @@
               <input disabled type="text" id="disabledTextInput" class="form-control" placeholder="<%= $usr_datas->{user} %>">
             </div>
         </div>
-    
+
         <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>
@@ -35,9 +35,9 @@
             </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>
@@ -51,22 +51,24 @@
               </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"
+                <%= 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>
@@ -80,21 +82,26 @@
               </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"
+                    <%= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => "form-select" %>
             </div>
             <br>
         </div>
 
+        <br>
+
         % my $btn = l('SAVE');
+        %= hidden_field 'trt' => $usr_datas->{trt}
+        %= hidden_field 'user' => $usr_datas->{user}
 
         <div class="row g-3 align-items-center">
             <div class="col-md-2">
@@ -103,13 +110,6 @@
         </div>
 
 
-        trt: <%= dumper $usr_datas->{trt} %>
-        user: <%= dumper $usr_datas->{user} %>
-        
-        %= hidden_field 'trt' => $usr_datas->{trt}
-        %= hidden_field 'user' => $usr_datas->{user}
-        
-    %# end
     </form>
 </div>
 

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

@@ -6,36 +6,62 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-        <p>
-            %= dumper $c->current_route
-        </p>
+        <pre>
+            <%= dumper $c->current_route %>
+        </pre>
     % }
     % if ( stash 'error' ) {
-        <br><div class="">
-            %= $c->render_to_string(inline => stash 'error') 
+        <br>
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
         </div>
-    %}
-    <h1><%=$title %></h1><br>
-    <p>If the Webmail panel does not appear after logging in, then please check your password.</p><br />
+    % }
+
+    <h1><%=$title %></h1>
+    <br>
+
+    <div>
+        If the Webmail panel does not appear after logging in, then please check your password.
+    </div>
+
+    <br>
 
     % my $thisdomain = $c->req->url->to_abs->host;
     % my $url = $c->stash('modul');
-    % if (!$url) {
-    %   $url = $thisdomain."/roundcube";
-    %}
     % my $username = 'admin';
+
+    % if (!$url) {
+        % $url = $thisdomain."/roundcube";
+    % }
+
     % if ($url =~ /[?&]_user=([^&]+)/) {
-    %   $username = $1;
-    %}
+        % $username = $1;
+    % }
+
     % if (!($url =~ /https:/)) {
-    % $url = 'https://' . $url;
+        % $url = 'https://' . $url;
     %}
 
-    <div class="">
-        <a href="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>"><button class="" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %></button></a>
+    <div class="container-fluid">
+        <a href="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>">
+            <button class="" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %>
+            </button>
+        </a>
         <object id="" data="<%=$url %>" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
     </div>
 </div>
 
 
+<iframe width="100%" height="600" style="border:1px solid black;" src="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>">
+</iframe>
+
+    % my $btn = l('Full Window');
+
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <button type="submit" class="btn btn-primary"><%= $btn %></button>
+            </div>
+        </div>
+
+
 %end

smeserver-manager-AdminLTE.spec

@@ -1,6 +1,6 @@
 %define name smeserver-manager-AdminLTE
 %define version 11.0.0
-%define release 29
+%define release 31
 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2
 Name: %{name}
 Version: %{version}
@@ -18,6 +18,9 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: smeserver-devtools
 Requires: smeserver-release >= 11.0
 Requires: smeserver-manager >= 11.0.0
+Requires: smeserver-lib >= 11.0.0-13
+Requires: e-smith-manager >= 2.4.0-22
+
 AutoReqProv: no
 
 %description
@@ -26,6 +29,14 @@ AdminLTE is an html framework for admin consoles
 wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 
 %changelog
+* Mon Jun 09 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0.31.sme
+- Fix some issues with user panel
+- Fix missing bootstrap icons
+- Reduce font size to keep Brian happy
+ 
+* Mon Jun 09 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-30.sme
+- Add UTF8 support to network panel
+
 * Wed Jun 04 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-29.sme
 - Proxy panel done
 
@@ -127,10 +138,10 @@ wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip
 - Rename some partials more logically
 
 * Tue Mar 25 2025 Brian Read <brianr@koozali.org> 11.0.0-1.sme
-- New version for AdminLTE integration with no class or ids 
+- New version for AdminLTE integration with no class or ids
 
 %prep
-%setup 
+%setup
 
 %build
 perl createlinks