* Mon Aug 11 2025 Brian Read <brianr@koozali.org> 11.0.0-113.sme

- Re-factor all template files to make them nicely formatted [SME: 13103]
2025-08-12 06:20:31 +01:00
parent 6475521528
commit 74c9beb587
114 changed files with 5301 additions and 5274 deletions
--- a/root/usr/share/smanager/themes/default/templates/back_workstn_configure1.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/back_workstn_configure1.html.ep
@@ -55,14 +55,14 @@
        %= l 'bac_local removable disk'
      </span><span class=data>
        % param 'BackupwkFolder' => $bac_datas->{mount} unless param 'BackupwkFolder';
-	%= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => 'input'
+        %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype} ), class => 'input';
      </span><br>
    % } elsif ( $bac_datas->{vfstype} eq 'mnt') {
    <span class=label>
      %= l 'bac_Mounted disk'
    </span><span class=data>
      % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder';
-	%= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => 'input'
+      %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype} ), class => 'input';
    </span><br>
    % } else {
    <span class=label>
--- a/root/usr/share/smanager/themes/default/templates/back_workstn_restore.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/back_workstn_restore.html.ep
@@ -28,7 +28,7 @@
    % if ($bac_datas->{status} ne 'enabled') {
      %= $c->render_to_string( inline => ( l 'bac_CONFIGURATION_TO_BE_DONE' ) )
    % } else {
-	%= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_WORKSTN_DESC') . ' ' . $c->get_shared_folder_to_verify())
+    %= $c->render_to_string( inline => ( l 'bac_RESTORE_CONF_FROM_WORKSTN_DESC' ) . ' ' . $c->get_shared_folder_to_verify() );
  % }

  <br><br><span class=label>
--- a/root/usr/share/smanager/themes/default/templates/back_workstn_restore1.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/back_workstn_restore1.html.ep
@@ -1,8 +1,8 @@
 % layout 'default', title => "Sme server 2 - restore";
-
+%= stylesheet '/css/backup.css'
 % content_for 'module' => begin
-
  <div id='module' class='module back_workstn_restore1-panel'>
+    %= javascript '/js/backup_workstation_restore.js'
    % if (config->{debug} == 1) {
      <p>
        %= dumper $c->current_route
@@ -23,9 +23,32 @@
    <h2>
      %= l 'bac_WORKSTN_RESTORE'
    </h2>
+
+    <fieldset>
+      <div id="status-container">
+        <div><strong>Stage:</strong> <span id="stage">-</span></div>
+        <div id="progress-bar" aria-label="progress bar" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+          <div id="progress-bar-inner">0%</div>
+        </div>
+
+        <div id="message-log-container">
+          <h3>Console Output:</h3>
+          <div id="message-log"></div>
+        </div>
+
+        <div id="completion-status"></div>
+      </div>
+    </fieldset>
+
+    <!--
    <p>
+      <fieldset>
        %= $c->render_to_string( inline => $bac_datas->{restore_log} )
-	</p><p>
+      </fieldset>
+    </p>
+    -->
+
+    <p>
      %= l 'bac_YOU_MUST_REBOOT'
    </p>
    %= hidden_field 'Function' => $bac_datas->{'function'}
--- a/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore.html.ep
@@ -22,7 +22,7 @@

    <h2><%= l 'bac_WORKSTN_SEL_RESTORE' %></h2>

-    %= $c->render_to_string(inline => (l 'bac_WORKSTN_SEL_REST_DESC') . ' ' . $c->get_shared_folder_to_verify())
+    %= $c->render_to_string( inline => ( l 'bac_WORKSTN_SEL_REST_DESC' ) . ' ' . $c->get_shared_folder_to_verify() );

    <h3><%= l 'bac_BACKUP_CHOICE' %></h3>

--- a/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore1.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore1.html.ep
@@ -28,7 +28,7 @@
    <br><span class=label>
      %= l 'bac_SELECT_FILES_TO_RESTORE'
    </span><span class=data>
-	%= select_field 'Restorefiles' => $c->get_Restorefiles_options($bac_datas->{'filterexp'},$bac_datas->{'backupset'}), class => 'input', multiple => 1, size => 15
+      %= select_field 'Restorefiles' => $c->get_Restorefiles_options( $bac_datas->{'filterexp'}, $bac_datas->{'backupset'} ), class => 'input', multiple => 1, size => 15;
    </span><br>

    <br><span class=label>
--- a/root/usr/share/smanager/themes/default/templates/back_workstn_verify.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/back_workstn_verify.html.ep
@@ -26,7 +26,7 @@
    % if ($bac_datas->{status} ne 'enabled') {
      %= $c->render_to_string( inline => ( l 'bac_CONFIGURATION_TO_BE_DONE' ) )
    % } else {
-	%= $c->render_to_string(inline => (l 'bac_VERIFY_WORKSTN_BACKUP_DESC') . ' ' . $c->get_shared_folder_to_verify())
+    %= $c->render_to_string( inline => ( l 'bac_VERIFY_WORKSTN_BACKUP_DESC' ) . ' ' . $c->get_shared_folder_to_verify() );
  % }
  <br><br><span class=label>
    %= l 'bac_SELECT_BACKUP_FILE'
--- a/root/usr/share/smanager/themes/default/templates/backdown.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/backdown.html.ep
@@ -1,11 +1,14 @@
 <%
-
  my $backups    = esmith::BackupHistoryDB->open;    # no UTF8
  my $now        = time();
-    my $backup_rec = $backups->new_record($now, {
-	type => 'backup_record', BackupType => 'desktop',
+  my $backup_rec = $backups->new_record(
+    $now,
+    {
+      type           => 'backup_record',
+      BackupType     => 'desktop',
      StartEpochTime => $now,
-	});
+    }
+  );

  # Dump the current mysql tables so that they are part of the image.
  # The events handle cases where mysqld is not enabled, and/or is not running.
@@ -48,7 +51,8 @@
      $c->write_chunk( $buffer, $cb );
    };
    $c->$cb;
-	} else {
+  }
+  else {
    $c->render( text => "Failed to execute command: $!", status => 500 );
  }

--- a/root/usr/share/smanager/themes/default/templates/backup.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/backup.html.ep
@@ -1,7 +1,6 @@
 % layout 'default', title => "Sme server 2 - backup";

 % content_for 'module' => begin
-
  <div id='module' class='module backup-panel'>
    % if (config->{debug} == 1) {
      <p>
--- a/root/usr/share/smanager/themes/default/templates/clamav.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/clamav.html.ep
@@ -19,7 +19,7 @@
        %= l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD'
      </span><span class=data>
        % param 'FilesystemScan' => $clm_datas->{FilesystemScan} unless param 'FilesystemScan';
-	%= select_field 'FilesystemScan' =>  [[ (l 'clm_DAILY') => 'daily'], [ (l 'clm_NEVER') => 'disabled'], [ (l 'clm_WEEKLY') => 'weekly']], class => 'input'
+        %= select_field 'FilesystemScan' => [ [ ( l 'clm_DAILY' ) => 'daily' ], [ ( l 'clm_NEVER' ) => 'disabled' ], [ ( l 'clm_WEEKLY' ) => 'weekly' ] ], class => 'input';
      </span>
    </p>
    <p>
@@ -27,7 +27,7 @@
        %= l 'clm_LABEL_QUARANTINE'
      </span><span class=data>
        % param 'Quarantine' => $clm_datas->{Quarantine} unless param 'Quarantine';
-	%= select_field 'Quarantine' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => 'input'
+        %= select_field 'Quarantine' => [ [ ( l 'ENABLED' ) => 'enabled' ], [ ( l 'DISABLED' ) => 'disabled' ] ], class => 'input';
        <br>
      </span>
    </p>
--- a/root/usr/share/smanager/themes/default/templates/datetime.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/datetime.html.ep
@@ -27,12 +27,12 @@
  <% my $btn = l('SAVE'); %>
  <br /><br />
  <span>
-			%= label_for 'real-time-clock' => $c->l('dat_The_time_is_currently'), class => 'datetime-clock-label'
+    %= label_for 'real-time-clock' => $c->l('dat_The_time_is_currently'), class => 'datetime-clock-label';
  </span><span class=data2>
    <!--
    <div id="real-time-clock"></div>
    -->
-			%= text_field 'clock', id => 'real-time-clock', readonly => 'readonly', class => 'datetime-clock' , value => $dat_data->{currentdatetime}
+    %= text_field 'clock', id => 'real-time-clock', readonly => 'readonly', class => 'datetime-clock', value => $dat_data->{currentdatetime};
  </span>
  % if ($dat_data->{ntpstatus} eq 'disabled') {
    <div class='datetime-set-ntp'>
@@ -74,7 +74,7 @@
        <div class=datetime-fields-col>
          % my $server_check = '^([a-zA-Z0-9][a-zA-Z0-9\.\-]{0,253}[a-zA-Z0-9]|(\d{1,3}\.){3}\d{1,3})$';
          % param 'ntpserver' => $dat_data->{ntpserver} unless param 'ntpserver';
-							%= text_field ntpserver => placeholder => 'e.g. smeserver.pool.ntp.org', id => 'ntpserver', pattern => $server_check, title => 'Enter a valid hostname or IPv4 address', required => 'required'
+          %= text_field ntpserver => placeholder => 'e.g. smeserver.pool.ntp.org', id => 'ntpserver', pattern => $server_check, title => 'Enter a valid hostname or IPv4 address', required => 'required';
          <button type="button" id="test-ntp-btn" class="btn btn-primary ml-2">Test Server</button>
          <span id="ntp-test-result" class="ntp-test-result ml-2"></span>
        </div>
@@ -106,7 +106,7 @@

            %= label_for day => $c->l('Day:')
            % param 'day' => ( $dat_data->{day} ) unless param 'day';
-								%= text_field day => id => 'day', size => 2, maxlength => 2, placeholder => 'DD', pattern => '^(0[1-9]|[12][0-9]|3[01])$', title => 'Day (01-31)', required => 'required', inputmode => 'numeric', autocomplete => 'off'
+            %= text_field day => id => 'day', size => 2, maxlength => 2, placeholder => 'DD', pattern => '^(0[1-9]|[12][0-9]|3[01])$', title => 'Day (01-31)', required => 'required', inputmode => 'numeric', autocomplete => 'off';
          </fieldset>

          <fieldset>
@@ -118,12 +118,12 @@

            %= label_for minute => $c->l('Minute:')
            % param 'minute' => ( $dat_data->{minute} ) unless param 'minute';
-								%= text_field minute => id => 'minute', size => 2, maxlength => 2, placeholder => 'MM', pattern => '^[0-5][0-9]$', title => 'Minute (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off'
+            %= text_field minute => id => 'minute', size => 2, maxlength => 2, placeholder => 'MM', pattern => '^[0-5][0-9]$', title => 'Minute (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off';
            &nbsp;

            %= label_for second => $c->l('Second:')
            % param 'second' => ( $dat_data->{second} ) unless param 'second';
-								%= text_field second => id => 'second', size => 2, maxlength => 2, placeholder => 'SS', pattern => '^[0-5][0-9]$', title => 'Second (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off'
+            %= text_field second => id => 'second', size => 2, maxlength => 2, placeholder => 'SS', pattern => '^[0-5][0-9]$', title => 'Second (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off';
          </fieldset>
        </div>
      </div>
--- a/root/usr/share/smanager/themes/default/templates/directory.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/directory.html.ep
@@ -13,8 +13,7 @@
  <h1><%= $title %></h1>
  <br>
  <%= $modul %>
-    <% 	my $btn = l('SAVE');
-     %>
+  <% 	my $btn = l('SAVE');  %>


  %= form_for 'directory' => ( method => 'POST' ) => begin
@@ -33,7 +32,7 @@
        %= l 'dir_DIRECTORY_ACCESS', class => 'label'
      </span><span class=data>
        % param 'access' => $dir_datas->{access} unless param 'access';
-	%= select_field 'access' =>  [[ (l 'NETWORKS_ALLOW_LOCAL') => 'private'], [ (l 'NETWORKS_ALLOW_PUBLIC') => 'public']], class => 'input', id => 'access'
+        %= select_field 'access' => [ [ ( l 'NETWORKS_ALLOW_LOCAL' ) => 'private' ], [ ( l 'NETWORKS_ALLOW_PUBLIC' ) => 'public' ] ], class => 'input', id => 'access';
      </span>
    </p>
    <p>
@@ -75,7 +74,7 @@
      <span class=label>
        %= l 'dir_EXISTING', class => 'label'
      </span><span class=data>
-	%= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]], class => 'input'
+        %= select_field 'existing' => [ [ ( l 'dir_LEAVE' ) => 'leave' ], [ ( l 'dir_UPDATE' ) => 'update' ] ], class => 'input';
      </span>
    </p>
    <p>
--- a/root/usr/share/smanager/themes/default/templates/login.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/login.html.ep
@@ -43,7 +43,7 @@
      <p><span class=label>
          %= l 'PASSWORD'
        </span><span class=input>
-    %= password_field 'Password', id => 'id_password', autocomplete => 'current-password', class=>'sme-password'
+          %= password_field 'Password', id => 'id_password', autocomplete => 'current-password', class => 'sme-password';
          % if (config 'hasJquery') {
            %# <a href='#' id='togglePassword' class='toggle-password tg-icon'> <img src="images/visible.png" height="16" alt="Visible"></a>
          % }
--- a/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep
@@ -71,7 +71,7 @@
      %= l 'iba_ALLOW_DYNAMIC_CONTENT'
    </span><span class=data>
      % param 'CgiBin' => $iba_datas->{CgiBin} unless param 'CgiBin';
-	%= select_field 'CgiBin' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
+      %= select_field 'CgiBin' => [ [ ( l 'DISABLED' ) => 'disabled' ], [ ( l 'ENABLED' ) => 'enabled' ] ], class => 'input';
      <br>
    </span>
  </p>
@@ -81,7 +81,7 @@
      %= l 'iba_HTTPS_Only'
    </span><span class=data>
      % param 'SSL' => $iba_datas->{SSL} unless param 'SSL';
-	%= select_field 'SSL' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
+      %= select_field 'SSL' => [ [ ( l 'DISABLED' ) => 'disabled' ], [ ( l 'ENABLED' ) => 'enabled' ] ], class => 'input';
      <br>
    </span>
  </p>
--- a/root/usr/share/smanager/themes/default/templates/partials/_mai_DEL.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_mai_DEL.html.ep
@@ -65,7 +65,7 @@
        %= l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS'
      </span><span class=input>
        % param 'SMTPAUTHPROXY_status' => $mai_data->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status';
-		%= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => 'input'
+        %= select_field 'SMTPAUTHPROXY_status' => [ [ ( l 'DISABLED' ) => 'disabled' ], [ ( l 'ENABLED' ) => 'enabled' ] ], class => 'input';
    </span></p>

    <p><span class=label>
--- a/root/usr/share/smanager/themes/default/templates/partials/_mai_FIL.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_mai_FIL.html.ep
@@ -26,7 +26,7 @@
        %= l 'mai_LABEL_VIRUS_SCAN'
      </span><span class=input>
        % param 'VirusStatus' => $mai_data->{virusstatus} unless param 'VirusStatus';
-		%= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
+        %= select_field 'VirusStatus' => [ [ ( l 'DISABLED' ) => 'disabled' ], [ ( l 'ENABLED' ) => 'enabled' ] ], class => 'input';
      </span><br></p>

    %= l 'mai_DESC_SPAM_SCAN'
@@ -35,7 +35,7 @@
        %= l 'mai_LABEL_SPAM_SCAN'
      </span><span class=input>
        % param 'Spamstatus' => $mai_data->{spamstatus} unless param 'Spamstatus';
-		%= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
+        %= select_field 'Spamstatus' => [ [ ( l 'DISABLED' ) => 'disabled' ], [ ( l 'ENABLED' ) => 'enabled' ] ], class => 'input';
    </span></p>

    <p><span class=label>
@@ -63,7 +63,7 @@
        %= l 'mai_LABEL_SORTSPAM'
      </span><span class=input>
        % param 'SpamSortSpam' => $mai_data->{spamsortspam} unless param 'SpamSortSpam';
-		%= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
+        %= select_field 'SpamSortSpam' => [ [ ( l 'DISABLED' ) => 'disabled' ], [ ( l 'ENABLED' ) => 'enabled' ] ], class => 'input';
    </span></p>

    %= l 'mai_DESC_SPAM_SUBJECT'
@@ -72,7 +72,7 @@
        %= l 'mai_LABEL_SPAM_SUBJECTTAG'
      </span><span class=input>
        % param 'SpamSubjectTag' => $mai_data->{spamsubjecttag} unless param 'SpamSubjectTag';
-		%= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
+        %= select_field 'SpamSubjectTag' => [ [ ( l 'DISABLED' ) => 'disabled' ], [ ( l 'ENABLED' ) => 'enabled' ] ], class => 'input';
    </span></p>

    <p><span class=label>
@@ -88,7 +88,7 @@
        %= l 'mai_LABEL_CONTENT_TO_BLOCK'
      </span><span class=input>
        % param 'BlockExecutableContent' => $c->get_patterns_current_opt() unless param 'BlockExecutableContent';
-		%= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => 'input', multiple => "1"
+        %= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => 'input', multiple => "1";
    </span></p>

    %# ....
--- a/root/usr/share/smanager/themes/default/templates/partials/_mai_REC.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_mai_REC.html.ep
@@ -142,7 +142,7 @@
        %= l 'mai_LABEL_SORT_METHOD'
      </span><span class=input>
        % param 'SpecifyHeader' => $mai_data->{specifyheader} unless param 'SpecifyHeader';
-		%= select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => 'input'
+        %= select_field 'SpecifyHeader' => [ [ ( l 'mai_DEFAULT' ) => 'off' ], [ ( l 'mai_SPECIFY_BELOW' ) => 'on' ] ], class => 'input';
    </span></p>

    <p><span class=label>
--- a/root/usr/share/smanager/themes/default/templates/partials/_pse_upd.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_pse_upd.html.ep
@@ -35,7 +35,7 @@
          %= l 'pse_SELECT_INTERNAL', class => 'label'
        </span><span class=data>
          % param 'Internal' => $pse_datas->{internal} unless param 'Internal';
-	%= select_field 'Internal' => [ [(l 'YES') => 'YES'], [(l 'NO') => 'NO'] ], class => 'input'
+          %= select_field 'Internal' => [ [ ( l 'YES' ) => 'YES' ], [ ( l 'NO' ) => 'NO' ] ], class => 'input';
        </span>
      </p>

--- a/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep
@@ -16,7 +16,7 @@

    <p>
      % my $strength = uc( $usr_datas->{passwdstrength} );
-    <%= $c->render_to_string( inline => l('usr_'.$strength.'_PASSWORD_DESCRIPTION',$usr_datas->{passwdlength})) %>
+      <%= $c->render_to_string( inline => l( 'usr_' . $strength . '_PASSWORD_DESCRIPTION', $usr_datas->{passwdlength} ) ); %>
      <br /><br />
      <%= $c->render_to_string( inline => l('usr_PASSWORD_WIKI') ) %>
    </p>
--- a/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep
@@ -9,7 +9,7 @@

    <p>
      % my $strength = uc( $usr_datas->{passwdstrength} );
-    <%= $c->render_to_string( inline => l('usr_'.$strength.'_PASSWORD_DESCRIPTION',$usr_datas->{passwdlength})) %>
+      <%= $c->render_to_string( inline => l( 'usr_' . $strength . '_PASSWORD_DESCRIPTION', $usr_datas->{passwdlength} ) ); %>
      <br /><br />
      <%= $c->render_to_string( inline => l('usr_PASSWORD_WIKI') ) %>
    </p>
--- a/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep
@@ -105,7 +105,7 @@
      %= l 'usr_VPN_CLIENT_ACCESS'
    </span><span class=data>
      % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
-	%= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => 'input'
+      %= select_field 'VPNClientAccess' => [ [ ( l 'NO' ) => 'no' ], [ ( l 'YES' ) => 'yes' ] ], class => 'input';
    </span>
  </p>

--- a/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep
@@ -57,7 +57,7 @@
        %= l 'usr_VPN_CLIENT_ACCESS'
      </span><span class=data>
        % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess';
-	%= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => 'input'
+        %= select_field 'VPNClientAccess' => [ [ ( l 'NO' ) => 'no' ], [ ( l 'YES' ) => 'yes' ] ], class => 'input';
      </span>
    </p>

--- a/root/usr/share/smanager/themes/default/templates/proxy.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/proxy.html.ep
@@ -21,7 +21,7 @@
        %= l 'prx_HTTP_PROXY_STATUS_LABEL'
      </span><span class=data>
        % param 'http_proxy_status' => $prx_datas->{http_proxy_status} unless param 'http_proxy_status';
-	%= select_field 'http_proxy_status' =>  [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => 'input', id => 'htproxstat'
+        %= select_field 'http_proxy_status' => [ [ ( l 'ENABLED' ) => 'enabled' ], [ ( l 'DISABLED' ) => 'disabled' ] ], class => 'input', id => 'htproxstat';
      </span>
    </p>
    % if ( $prx_datas->{smtp_proxy_status} ) {
@@ -32,7 +32,7 @@
          %= l 'prx_SMTP_PROXY_STATUS_LABEL'
        </span><span class=data>
          % param 'smtp_proxy_status' => $prx_datas->{smtp_proxy_status} unless param 'smtp_proxy_status';
-	    %= select_field 'smtp_proxy_status' => [[ (l 'ENABLED') => 'transparent'], [ (l 'DISABLED') => 'disabled'], [ (l 'prx_BLOCKED') => 'blocked']], class => 'input', id => 'smproxstat', default => $prx_datas->{smtp_proxy_status}
+          %= select_field 'smtp_proxy_status' => [ [ ( l 'ENABLED' ) => 'transparent' ], [ ( l 'DISABLED' ) => 'disabled' ], [ ( l 'prx_BLOCKED' ) => 'blocked' ] ], class => 'input', id => 'smproxstat', default => $prx_datas->{smtp_proxy_status};
          <br><br>
        </span>
      </p>
--- a/root/usr/share/smanager/themes/default/templates/qmailanalog.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/qmailanalog.html.ep
@@ -33,7 +33,7 @@
      <span class=label>
        %= label_for email_address => 'Email Address:'
      </span><span class=data>
-			%= email_field 'email_address', placeholder => 'Enter email address', id => 'email_address_group'
+        %= email_field 'email_address', placeholder => 'Enter email address', id => 'email_address_group';
      </span>
    </div>

--- a/root/usr/share/smanager/themes/default/templates/reboot.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/reboot.html.ep
@@ -34,7 +34,7 @@

  % end

-    %= hidden_field 'debug' => '0'
+  %= hidden_field 'debug' => '1'

 </div>
 % end
--- a/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep
@@ -134,7 +134,7 @@
  %= l 'rma_LABEL_SSH_ADMIN'
 </span><span class=data>
  % param 'SshPermitRootLogin' => $rma_datas->{sshPermitRootLogin} unless param 'SshPermitRootLogin';
-	%= select_field 'SshPermitRootLogin' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => 'input'
+  %= select_field 'SshPermitRootLogin' => [ [ ( l 'NO' ), 'no' ], [ ( l 'YES' ), 'yes' ] ], class => 'input';
 </span>
 <br>

@@ -142,7 +142,7 @@
  %= l 'rma_LABEL_SSH_PASSWORD_ACCESS'
 </span><span class=data>
  % param 'SshPasswordAuthentication' => $c->get_ssh_password_auth() unless param 'SshPasswordAuthentication';
-	%= select_field 'SshPasswordAuthentication' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => 'input'
+  %= select_field 'SshPasswordAuthentication' => [ [ ( l 'NO' ), 'no' ], [ ( l 'YES' ), 'yes' ] ], class => 'input';
 </span>
 <br>

--- a/root/usr/share/smanager/themes/default/templates/userpassword.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/userpassword.html.ep
@@ -28,7 +28,7 @@

    <p>
      % my $strength = uc( $pwd_datas->{passwdstrength} );
-    <%= $c->render_to_string( inline => l('pwd_'.$strength.'_PASSWORD_DESCRIPTION',$pwd_datas->{passwdlength})) %>
+      <%= $c->render_to_string( inline => l( 'pwd_' . $strength . '_PASSWORD_DESCRIPTION', $pwd_datas->{passwdlength} ) ); %>
      <br /><br />
      <%= $c->render_to_string( inline => l('pwd_PASSWORD_WIKI') ) %>
    </p>
--- a/root/usr/share/smanager/themes/default/templates/viewlogfiles.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/viewlogfiles.html.ep
@@ -54,7 +54,7 @@
        % if ($log_datas->{'default_op'} eq 'download') {
          % param 'Operation' => 'download';
        % }
-	%= select_field 'Operation' => [[(l 'log_VIEW') => 'view'],[(l 'DOWNLOAD') => 'download']], class => 'input'
+      %= select_field 'Operation' => [ [ ( l 'log_VIEW' ) => 'view' ], [ ( l 'DOWNLOAD' ) => 'download' ] ], class => 'input';
    </span>
  </p>

--- a/root/usr/share/smanager/themes/default/templates/workgroup.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/workgroup.html.ep
@@ -14,8 +14,7 @@
  <h1><%= $title %></h1>
  <br>
  <%= $modul %>
-    <% 	my $btn = l('SAVE');
-     %>
+  <% 	my $btn = l('SAVE');  %>

  %= form_for 'workgroup' => ( method => 'POST' ) => begin
    <p>
@@ -24,7 +23,7 @@
      <span class=label>
        %= l 'wkg_LABEL_WORKGROUP', class => 'label'
      </span><span class=data>
-	%= text_field 'Workgroup' =>  $wkg_datas->{Workgroup}, class => 'input' , pattern=>".{1,15}", title=>"Limited to 15 characters by the NETBIOS"
+        %= text_field 'Workgroup' => $wkg_datas->{Workgroup}, class => 'input', pattern => ".{1,15}", title => "Limited to 15 characters by the NETBIOS";
      </span>
    </p>
    <p>
@@ -43,7 +42,7 @@
        %= l 'wkg_LABEL_PDC', class => 'label'
      </span><span class=data>
        % param 'ServerRole' => $wkg_datas->{ServerRole} unless param 'ServerRole';
-	%= select_field 'ServerRole' =>  [[ (l 'YES') => 'PDC'], [ (l 'NO') => 'WS']], class => 'input'
+        %= select_field 'ServerRole' => [ [ ( l 'YES' ) => 'PDC' ], [ ( l 'NO' ) => 'WS' ] ], class => 'input';
      </span>
    </p>
    <p>
@@ -53,7 +52,7 @@
        %= l 'wkg_LABEL_ROAM', class => 'label'
      </span><span class=data>
        % param 'RoamingProfiles' => $wkg_datas->{RoamingProfiles} unless param 'RoamingProfiles';
-	%= select_field 'RoamingProfiles' =>  [[ (l 'YES') => 'yes'], [ (l 'NO') => 'no']], class => 'input'
+        %= select_field 'RoamingProfiles' => [ [ ( l 'YES' ) => 'yes' ], [ ( l 'NO' ) => 'no' ] ], class => 'input';
      </span>
    </p>
    <p>
--- a/root/usr/share/smanager/themes/default/templates/yumconfig.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/yumconfig.html.ep
@@ -34,7 +34,7 @@
        %= l 'yum_LABEL_YUM_PACKAGEFUNCTIONS'
      </span><span class=data>
        % param 'yum_PackageFunctions' => $c->get_status('PackageFunctions') unless param 'yum_PackageFunctions';
-	%= select_field 'yum_PackageFunctions' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
+        %= select_field 'yum_PackageFunctions' => [ [ $c->l('DISABLED') => 'disabled' ], [ $c->l('ENABLED') => 'enabled' ] ];
    </span></p>

    <br>
@@ -44,7 +44,7 @@
        %= l 'yum_LABEL_ENABLED_REPOSITORIES'
      </span><span class=data>
        % param 'SelectedRepositories' => $c->get_repository_current_options() unless param 'SelectedRepositories';
-	%= select_field 'SelectedRepositories' => $c->get_repository_options2(), class => 'input', multiple => '1'
+        %= select_field 'SelectedRepositories' => $c->get_repository_options2(), class => 'input', multiple => '1';
    </span></p>

    <br>
@@ -54,7 +54,7 @@
        %= l 'yum_LABEL_YUM_DELTARPMPROCESS'
      </span><span class=data>
        % param 'yum_DeltaRpmProcess' => $c->get_status('DeltaRpmProcess') unless param 'yum_DeltaRpmProcess';
-	%= select_field 'yum_DeltaRpmProcess' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
+        %= select_field 'yum_DeltaRpmProcess' => [ [ $c->l('DISABLED') => 'disabled' ], [ $c->l('ENABLED') => 'enabled' ] ];
    </span></p>

    <br>
@@ -64,7 +64,7 @@
        %= l 'yum_LABEL_YUM_DOWNLOADONLY'
      </span><span class=data>
        % param 'yum_DownloadOnly' => $c->get_status('DownloadOnly') unless param 'yum_DownloadOnly';
-	%= select_field 'yum_DownloadOnly' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
+        %= select_field 'yum_DownloadOnly' => [ [ $c->l('DISABLED') => 'disabled' ], [ $c->l('ENABLED') => 'enabled' ] ];
    </span></p>

    <br>
@@ -74,7 +74,7 @@
        %= l 'yum_LABEL_YUM_AUTOINSTALLUPDATES'
      </span><span class=data>
        % param 'yum_AutoInstallUpdates' => $c->get_status('AutoInstallUpdates') unless param 'yum_AutoInstallUpdates';
-	%= select_field 'yum_AutoInstallUpdates' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']]
+        %= select_field 'yum_AutoInstallUpdates' => [ [ $c->l('DISABLED') => 'disabled' ], [ $c->l('ENABLED') => 'enabled' ] ];
    </span></p>

    %= hidden_field 'trt' => 'CONF'
--- a/root/usr/share/smanager/themes/default/templates/yuminstall.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/yuminstall.html.ep
@@ -29,7 +29,7 @@
          %= l 'yum_LABEL_AVAILABLE_GROUPS'
        </span><span class=data>
          % param 'SelectedGroups' => $c->get_names2( 'updates', 'group' ) unless param 'SelectedGroups';
-	%= select_field 'SelectedGroups' => $c->get_options2('available', 'group'), class => 'input', multiple => "1"
+          %= select_field 'SelectedGroups' => $c->get_options2( 'available', 'group' ), class => 'input', multiple => "1";
      </span></p>
    % }
  <br>
@@ -39,7 +39,7 @@
        %= l 'yum_LABEL_AVAILABLE_PACKAGES'
      </span><span class=data>
        % param 'SelectedPackages' => $c->get_names2( 'updates', 'package' ) unless param 'SelectedPackages';
-	%= select_field 'SelectedPackages' => $c->get_options2('available', 'package'), class => 'input', multiple => "1"
+        %= select_field 'SelectedPackages' => $c->get_options2( 'available', 'package' ), class => 'input', multiple => "1";
    </span></p>
  % }

--- a/root/usr/share/smanager/themes/default/templates/yumremove.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/yumremove.html.ep
@@ -29,7 +29,7 @@
      <p><span class=label>
          %= l 'yum_LABEL_INSTALLED_GROUPS'
        </span><span class=data>
-	%= select_field 'SelectedGroups' => $c->get_options2('installed', 'group'), class => 'input', multiple => "1"
+          %= select_field 'SelectedGroups' => $c->get_options2( 'installed', 'group' ), class => 'input', multiple => "1";
      </span></p>
    % }
  <br>
@@ -38,7 +38,7 @@
    <p><span class=label>
        %= l 'yum_LABEL_INSTALLED_PACKAGES'
      </span><span class=data>
-	%= select_field 'SelectedPackages' => $c->get_options2('installed', 'package'), class => 'input', multiple => "1"
+        %= select_field 'SelectedPackages' => $c->get_options2( 'installed', 'package' ), class => 'input', multiple => "1";
    </span></p>
  % }

--- a/root/usr/share/smanager/themes/default/templates/yumupdate.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/yumupdate.html.ep
@@ -26,7 +26,7 @@
        %= l 'yum_LABEL_AVAILABLE_UPDATES'
      </span><span class=data>
        % param 'SelectedPackages' => $c->get_names2( 'updates', 'package' ) unless param 'SelectedPackages';
-	%= select_field 'SelectedPackages' => $c->get_options2('updates', 'package'), class => 'input', multiple => "1"
+        %= select_field 'SelectedPackages' => $c->get_options2( 'updates', 'package' ), class => 'input', multiple => "1";
    </span></p>

    <!-- $c->print_skip_header() -->
--- a/smeserver-manager.spec
+++ b/smeserver-manager.spec
@@ -2,7 +2,7 @@ Summary: Sme Server Configuration : Manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 11.0.0
-%define release 112
+%define release 113
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -146,6 +146,9 @@ true
 %defattr(-,root,root)

 %changelog
+* Mon Aug 11 2025 Brian Read <brianr@koozali.org> 11.0.0-113.sme
+- Re-factor all template files to make them nicely formatted  [SME: 13103]
+
 * Thu Aug 07 2025 Brian Read <brianr@koozali.org> 11.0.0-112.sme
 - Fix sprintf fail in viewlogfiles when % in log line [SME: 13099]
 - Fix reboot/shutdown failure - reported by Massimo  - fixed by JC [SME: 13097]