More groups pseudonyms clamav and useraccounts work

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

@@ -18,47 +18,42 @@
     <%= $modul %>
 
     <%  my $btn = l('SAVE'); %>
+    <br><br>
+    <form action="/smanager/clamav" method="POST">
 
-    <form action="/smanager/hostentriesd" method="POST">
-    %#= form_for 'clamav' => (method => 'POST') => begin
-        <div>
-            <div>
-            <%= l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD' %>
-            </div>
-            <div>
-             % param 'FilesystemScan' => $clm_datas->{FilesystemScan} unless param 'FilesystemScan';
-             <%= select_field 'FilesystemScan' =>  [[ (l 'clm_DAILY') => 'daily'], [ (l 'clm_NEVER') => 'disabled'], [ (l 'clm_WEEKLY') => 'weekly']] %>
+        <div class="row g-3 align-items-center">
+            <div class="col-auto">
+                <h6><%= l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD' %>:</h6>
+                % param 'FilesystemScan' => $clm_datas->{FilesystemScan} unless param 'FilesystemScan';
+                <%= select_field 'FilesystemScan' =>  [[ (l 'clm_DAILY') => 'daily'], [ (l 'clm_NEVER') => 'disabled'], [ (l 'clm_WEEKLY') => 'weekly']], class => "form-select" %>
             </div>
         </div>
-    
-        <div>
-            <div>
-                <%= l 'clm_LABEL_QUARANTINE' %>
-            </div>
-            <div>
+        <br>
+        <div class="row g-3 align-items-center">
+            <br>
+            <div class="col-auto">
+                <h6><%= l 'clm_LABEL_QUARANTINE' %>:</h6>
                 % param 'Quarantine' => $clm_datas->{Quarantine} unless param 'Quarantine';
-                <%= select_field 'Quarantine' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']] %>
+                <%= select_field 'Quarantine' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "form-select" %>
             <br>
             </div>
         </div>
 
         <div>
             <div>
-                <%= l 'clm_LABEL_CLAM_VERSIONS' %>
+                <h6><%= l 'clm_LABEL_CLAM_VERSIONS' %>:</h6>
             </div>
             <div>
                 <%= $clm_datas->{clam_versions} %>
-            <br>
             </div>
         </div>
-    
+        <br>
         <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/groups.html.ep

@@ -5,29 +5,29 @@
 <div class="card-body">
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $grp_datas
-    </p>
+    <div>
+        %= dumper $c->current_route
+        %= dumper $grp_datas
+    </div>
     % }
 
     % if ( stash 'error' ) {
-        <br><div class="">
-        %= $c->render_to_string(inline => stash 'error') 
-    </div>
-    %}
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => stash 'error') %>
+        </div>
+    % }
 
     <h1><%= $title%></h1>
 
     % if ($grp_datas->{trt} eq 'ADD') {
-    %= include 'partials/_grp_add'
-    %} elsif ($grp_datas->{trt} eq 'DEL') {
+        %= include 'partials/_grp_add'
+    % } elsif ($grp_datas->{trt} eq 'DEL') {
         %= include 'partials/_grp_del'
-    %} elsif ($grp_datas->{trt} eq 'UPD') {
+    % } elsif ($grp_datas->{trt} eq 'UPD') {
         %= include 'partials/_grp_upd'
-        %} else {
+    % } else {
         %= include 'partials/_grp_list'
-        %}
+    % }
 
 </div>
 %end

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

@@ -1,4 +1,4 @@
-<div class="container-sm">
+<div>
     <br>
     <!-- <h2><%#= l 'grp_FORM_TITLE' %></h2> -->
 
@@ -48,12 +48,12 @@
         <br>
 
         <div>
-        <%= l 'GROUP_MEMBERS' %>
+            <%= l 'GROUP_MEMBERS' %>
         </div>
 
         <br>
         <div>
-            %= check_box 'groupMembers' => 'admin'
+            <%= check_box 'groupMembers' => 'admin' %>
             &nbspAdministrator (admin)
             <br>
             % my $users = $c->gen_users_list();

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

@@ -1,4 +1,4 @@
-<div class="container-sm">
+<div>
 
     % my $btn = l('REMOVE');
 

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

@@ -19,55 +19,51 @@
     <br>
     <h2><%=l 'grp_CURRENT_LIST' %></h2>
     <br><br>
-    %   my $numGroups = @$groups;
+    % my $numGroups = @$groups;
     %   if ($numGroups == 0){
-        %=l 'ACCOUNT_GROUP_NONE'
-    %   } else {
-    <table class="table table-bordered user-table-max-wdith">
-    <thead>
-        <tr>
-            <th class="col-sm"><%= l 'GROUP' %></th>
-            <th class="col-sm"><%= l 'DESCRIPTION' %></th>
-            <th class="user-valign-center col-sm" colspan="2"><%= l 'ACTION' %></th>
-        </tr>
-    </thead>
-    <tbody>
+        <%= l 'ACCOUNT_GROUP_NONE' %>
+    % } else {
+        <table class="table table-bordered user-table-max-width">
+            <thead>
+                <tr>
+                    <th class="col-sm"><%= l 'GROUP' %></th>
+                    <th class="col-sm"><%= l 'DESCRIPTION' %></th>
+                    <th class="col-sm user-valign-center" colspan="2"><%= l 'ACTION' %></th>
+                </tr>
+            </thead>
+            <tbody>
+                % foreach my $group ( @$groups ) {
+                    <tr>
+                        <td><%= $group->key %></td>
+                        <td><%= $group->prop('Description') %></td>
 
-    %    foreach my $group ( @$groups )
-    %    {
-        <tr>
-            <td><%= $group->key %></td>
-            <td><%= $group->prop('Description') %></td>
+                            % my $modify_text = l('MODIFY');  # Localized text
+                            % my $csrf_token = "TOKEN";  # CSRF token for security
+                            % my $group_name = $group->key;  # group name extracted from the data structure
+                            % my $actionModify = qq{
+                                % <a href="groups2?CsrfDef=$csrf_token&trt=UPD&group=$group_name">
+                                %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                                %       $modify_text
+                                %   </button>
+                                % </a>
+                            %};
+                            % my $remove_text = l('REMOVE');  # Localized text
+                            % my $csrf_token = "TOKEN";  # CSRF token for security
+                            % my $group_name = $group->key;  # group name extracted from the data structure
+                            % my $actionRemove = qq{
+                                % <a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name">
+                                %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                                %       $remove_text
+                                %   </button>
+                                % </a>
+                            %};
 
-                %my $modify_text = l('MODIFY');  # Localized text
-                %my $csrf_token = "TOKEN";  # CSRF token for security
-                %my $group_name = $group->key;  # group name extracted from the data structure
-                %my $actionModify = qq{
-                    %<a href="groups2?CsrfDef=$csrf_token&trt=UPD&group=$group_name">
-                    %   <button type='button' class="btn btn-primary" title='$modify_text' >
-                    %       $modify_text
-                    %   </button>
-                    %</a>
-                %};
-                %my $remove_text = l('REMOVE');  # Localized text
-                %my $csrf_token = "TOKEN";  # CSRF token for security
-                %my $group_name = $group->key;  # group name extracted from the data structure
-                %my $actionRemove = qq{
-                    %<a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name">
-                    %   <button type='button' class="btn btn-primary" title='$remove_text' > 
-                    %       $remove_text
-                    %   </button>
-                    %</a>
-                %};
-
-            <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
-            <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
-        </tr>
-    %    }
-        </tbody>
+                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                        <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
+                    </tr>
+                % }
+            </tbody>
         </table>
-    <%} %>
-
-
+    % }
 
 </div>

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

@@ -1,41 +1,48 @@
 <div>
 
-    %   my $btn = l('ADD');
-
-    %= form_for '/pseudonyms2' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'pse_TITLE_CREATE'
-    </h2>
+    % my $btn = l('ADD');
     <br>
-    %= $c->render_to_string(inline => l('pse_VALID_PSEUDONYM_NAMES'));
-    </p>
+    <h2><%= l 'pse_TITLE_CREATE' %></h2>
+    <br>
+    <form action="/smanager/pseudonyms2" method="POST">
 
-    <p>
-    <span class="">
-    %=l 'pse_PSEUDONYM_NAME', class => ""
-    </span>
-    <span class="">
-    %= text_field 'Pseudonym', class => ""
-    </span>
-    </p>
+        <div class="row g-3 align-items-center">
+            <div class="col-auto">
+                <%=  $c->render_to_string(inline => l('pse_VALID_PSEUDONYM_NAMES')); %>
+                <br>
+            </div>
+            <br>
+            <div class="col-md-2">
+              <label for="inputPseudonymName" class="col-form-label"><%= l 'pse_PSEUDONYM_NAME' %></label>
+            </div>
 
-    <p>
-    <span class="">
-    %=l 'pse_SELECT_ACCOUNT', class => ""
-    </span>
-    <span class="">
-    %= select_field 'Account' => $c->existing_accounts_list(), class => ""
-    </span>
-    </p>
+            <div class="col-auto">
+                <input type="text" name="pseudonymDesc" id="inputPseudonymDesc" class="form-control" aria-describedby="PseudonymDesc"  >
+            </div>
+        </div>
 
-    <p>
-    <br><br>
-    %= submit_button "$btn", class => ""
-    </p>
+        <br><br>
 
-    %= hidden_field 'trt' => $pse_datas->{trt}
+        <div class="row g-3 align-items-center">
+            <div class="col-md-2">
+                <%=l 'pse_SELECT_ACCOUNT' %>
+            </div>
 
-    % end    
+            <div class="col-auto">
+                <%= select_field 'Account' => $c->existing_accounts_list(), class => "form-select" %>
+            </div>
+        </div>
+
+            <br><br>
+
+            <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' => $pse_datas->{trt}
+
+    </form>
 
 </div>

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

@@ -1,25 +1,30 @@
 <div>
 
-    %   my $btn = l('REMOVE');
-    %= form_for '/pseudonyms2' => (method => 'POST') => begin
-    <p>
-    <h2>
-    %=l 'pse_REMOVE_PSEUDONYM'
-    </h2>
+    % my $btn = l('REMOVE');
 
-    <p>
-    %= $c->render_to_string(inline => l('pse_ABOUT_TO_REMOVE', $pse_datas->{pseudonym}));
+    <form action="/smanager/pseudonyms2" method="POST">
+        <h2><%= l 'pse_REMOVE_PSEUDONYM' %></h2>
 
-    </p>
+        <%#= $c->render_to_string(inline => l('pse_ABOUT_TO_REMOVE', $pse_datas->{pseudonym})); %>
 
-    <p>
-    <br>
-    %= submit_button "$btn", class => ""
-    </p>
+        Thisis the old test that needs fixing in the language files
+        <%= l('pse_ABOUT_TO_REMOVE') %>
+
+        <br>
+
+        You are about to remove the pseudonym: <%= $pse_datas->{pseudonym} %>
+
+        <h6>Are you sure you wish to continue?</h6>
+
+
+        <br><br>
+        <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' => $pse_datas->{trt}
         %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym}
-
-    % end    
-
+    </form>
 </div>

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

@@ -8,91 +8,81 @@
 
         %= hidden_field 'trt' => 'ADD'
 
-    <p><br>
-    %= submit_button "$btn", class => ""
-    </p>
+         <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
+    <br>
+    <h2><%= l 'pse_CURRENT_PSEUDONYMS' %></h2>
+    <br>
+    % my $numPseudonyms = @$pseudonyms;
+    % if ($numPseudonyms == 0) {
+        <%= l 'pse_ACCOUNT_PSEUDONYM_NONE' %>
+    % } else {
+    <table class="table table-bordered user-table-max-width">
+        <thead>
+            <tr>
+                    <th class="col-sm"><%= l 'pse_PSEUDONYM' %></th>
+                    <th class="col-sm"><%= l 'pse_USER_OR_GROUP' %></th>
+                    <th class="col-sm user-valign-center" colspan="2"><%= l 'ACTION' %></th>
+                <!-- <th class="" style="display: normal;"></th> -->
+            </tr>
+        </thead>
+        <tbody>
 
+            % foreach my $pseudonym ( @$pseudonyms ) {
+            % my $modifiable = $pseudonym->prop('Changeable') || 'yes';
+            % my $removable = $pseudonym->prop('Removable') || 'yes';
 
-    <p><h2>
-    %=l 'pse_CURRENT_PSEUDONYMS'
-    </h2><br>
-    %   my $numPseudonyms = @$pseudonyms;
-    %   if ($numPseudonyms == 0){
-        %=l 'pse_ACCOUNT_PSEUDONYM_NONE'
-    %   } else {
-    <table class="table table-bordered">
-    <thead>
-    <tr>
-            <th class="">
-            %=l 'pse_PSEUDONYM'
-            </th>
-            <th class="">
-            %=l 'pse_USER_OR_GROUP'
-            </th>
-            <th class="">
-            %=l 'ACTION'
-            </th>
+            % my $account = $pseudonym->prop('Account');
+            % $account = "Administrator" if ($account eq "admin");
+            % $account = $c->l("pse_EVERYONE") if ($account eq "shared");
 
-        <!-- <th class="" style="display: normal;"></th> -->
-    </tr>
-    </thead>
-    <tbody>
+            % my $visible = $pseudonym->prop('Visible');
+            % $account .= $c->l("pse_LOCAL_ONLY")
+            % if (defined $visible && $visible eq "internal");
 
-    %    foreach my $pseudonym ( @$pseudonyms )
-    %    {
-    %       my $modifiable = $pseudonym->prop('Changeable') || 'yes';
-    %       my $removable = $pseudonym->prop('Removable') || 'yes';
+                <tr>
+                    <td><%= $pseudonym->key%></td>
+                    <td><%= $account%></td>
 
-    %       my $account = $pseudonym->prop('Account');
-    %       $account = "Administrator" if ($account eq "admin");
-    %       $account = $c->l("pse_EVERYONE") if ($account eq "shared");
+                        % my ($actionModify, $actionRemove) = '&nbsp;';
+                        % if ($modifiable eq 'yes') {
+                            %my $modify_text = l('MODIFY');  # Localized text
+                            %my $csrf_token = "TOKEN";  # CSRF token for security
+                            %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
+                            %$actionModify = qq{
+                            % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=UPD&pseudonym=$pseudonyms_entry_name">
+                            %   <button type='button' class="btn btn-primary" title='$modify_text' >
+                            %   $modify_text
+                            %   </button>
+                            % </a>
+                            %};
+                        % }
 
-    %       my $visible = $pseudonym->prop('Visible');
-    %       $account .= $c->l("pse_LOCAL_ONLY")
-    %       if (defined $visible && $visible eq "internal");
+                        % if ($removable eq 'yes')  {
+                            %my $remove_text = l('REMOVE');  # Localized text
+                            %my $csrf_token = "TOKEN";  # CSRF token for security
+                            %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
+                            %$actionRemove = qq{
+                            % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=DEL&pseudonym=$pseudonyms_entry_name">
+                            %   <button type='button' class="btn btn-primary" title='$remove_text' >
+                            %   $remove_text
+                            %   </button>
+                            % </a>
+                            %};
+                        % }
 
-        <tr>
-            %= t td => (class => "") => $pseudonym->key
-            %= t td => (class => "") => $account
+                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionModify) %></td>
+                    <td class="user-valign-center"><%= $c->render_to_string(inline => $actionRemove) %></td>
 
-            <td class="">
-                %my ($actionModify, $actionRemove) = '&nbsp;'; 
-                %if ($modifiable eq 'yes') { 
-                    %my $modify_text = l('MODIFY');  # Localized text
-                    %my $csrf_token = "TOKEN";  # CSRF token for security
-                    %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
-                    %$actionModify = qq{
-                                        %       <a href="pseudonyms2?CsrfDef=$csrf_token&trt=UPD&pseudonym=$pseudonyms_entry_name">
-                    %   <button type='button' class="" title='$modify_text' >
-                    %       $modify_text
-                    %   </button>
-                                        %       </a>
-                    %};
-                %}
-
-                %if ($removable eq 'yes')  { 
-                    %my $remove_text = l('REMOVE');  # Localized text
-                    %my $csrf_token = "TOKEN";  # CSRF token for security
-                    %my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
-                    %$actionRemove = qq{
-                                        %       <a href="pseudonyms2?CsrfDef=$csrf_token&trt=DEL&pseudonym=$pseudonyms_entry_name">
-                    %   <button type='button' class="" title='$remove_text' >
-                    %       $remove_text
-                    %   </button>
-                                        %       </a>
-                    %};
-                %}
-                <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
-
-            </td>
-        </tr>
-    %    }
-        </tbody>
+                </tr>
+            % }
+            </tbody>
         </table>
-    <%} %>
-    </p>
-
+    % }
 
 </div>

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

@@ -25,17 +25,15 @@
 <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_field 'Theme' => $c->theme_list(), class => "form-select"
-        
+        <!--<label class="visually-hidden" for="inlineFormSelectPref">Preference</label> -->
+        %= select_field 'Theme' => $c->theme_list(), class => "form-select", id => "Preference"
         %= hidden_field 'From' => $c->tx->req->url
       </div>
 
-    <div class="col-auto">
-      <button type="submit" class="btn btn-primary">Theme</button>
-    </div>
-    </div>
+      <div class="col-auto">
+        <button type="submit" class="btn btn-primary">Theme</button>
+      </div>
+  </div>
 </form>
 
 

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

@@ -12,9 +12,10 @@
     % }
 
     % 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>
@@ -30,4 +31,5 @@
     % }
 
 </div>
+
 %end

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

@@ -2,28 +2,22 @@
 
 % content_for 'module' => begin
 
-%#= include 'partials/_panel_card_top'
-%#= include 'partials/_panel_card_header'
-
 <div class="card-body">
-<!-- /.card-body -->
-        
 
     % if (config->{debug} == 1) {
-    <p>
-    %= dumper $c->current_route
-    %= dumper $usr_datas
-    </p>
+        <div>
+            %= dumper $c->current_route
+            %= dumper $usr_datas
+        </div>
     % }
 
-  <h1><%= $title%></h1>
-  
     % if ( $notif ) {
-    <br>
-    <span class="">
-    <%= $c->render_to_string(inline => $notif) %>
-    </span>
-    %}
+        <div class="text-danger">
+            <%= $c->render_to_string(inline => $notif) %>
+        </div>
+    % }
+
+    <h1><%= $title%></h1>
 
     % if ($usr_datas->{trt} eq 'ADD' or $usr_datas->{trt} eq 'UPD') {
         %= include 'partials/_usr_upd'
@@ -43,8 +37,5 @@
 
 </div>
 
-%#= include 'partials/_panel_card_footer'
-%#= include 'partials/_panel_card_bottom'
-
 %end