delete test file

- Fix other buttons in lists for elinks [SME: 13113]

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

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module back_tape_configure-panel'>
+  <div id='module' class='module back_tape_configure-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -12,36 +12,36 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   <h2>
-    %=l 'bac_ENABLE_DISABLE_TAPE'
+    %= l 'bac_ENABLE_DISABLE_TAPE'
   </h2><br>
 
-    %= $c->render_to_string(inline => (l 'bac_TAPE_CONFIG_DESC'))
+  %= $c->render_to_string( inline => ( l 'bac_TAPE_CONFIG_DESC' ) )
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+  %= form_for '/backupd' => ( method => 'POST' ) => begin
 
     <p>
       <span class=label>
-	%=l 'bac_ENABLE_TAPE_BACKUP'
+        %= l 'bac_ENABLE_TAPE_BACKUP'
       </span><span class=data>
         % if ( $bac_datas->{status} eq 'checked' ) {
           <input type='checkbox' name='Tapebackup' checked >
-    %} else {
+        % } else {
         %= check_box 'Tapebackup'
-    %}
+      % }
     </span>
   </p>
 
 
   <p>
     <span class=label>
-	%=l 'bac_TAPE_BACKUP_TIME'
+      %= l 'bac_TAPE_BACKUP_TIME'
     </span><span class=data>
       % param 'BackupHour' => $bac_datas->{backupHour} unless param 'BackupHour';
       %= text_field 'BackupHour', size => '2'
@@ -49,16 +49,16 @@
       %= text_field 'BackupMin', size => '2'
     </span>
     <!--span class=label-->
-	%=l 'AM/PM:'
+    %= l 'AM/PM:'
     <!--/span--><span class=data>
       % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM';
-	%= select_field 'BackupAMPM' => ['AM', 'PM'], class => 'input'
+      %= select_field 'BackupAMPM' => [ 'AM', 'PM' ], class => 'input'
     </span>
   </p>
 
   <p>
     <span class=label>
-	%=l 'bac_LOAD_TAPE_REMINDER_TIME'
+      %= l 'bac_LOAD_TAPE_REMINDER_TIME'
     </span><span class=data>
       % param 'ReminderHour' => $bac_datas->{reminderHour} unless param 'ReminderHour';
       %= text_field 'ReminderHour', size => '2'
@@ -66,10 +66,10 @@
       %= text_field 'ReminderMin', size => '2'
     </span>
     <!--span class=label-->
-	%=l 'AM/PM:'
+    %= l 'AM/PM:'
     <!--/span--><span class=data>
       % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM';
-	%= select_field 'ReminderAMPM' => ['AM', 'PM'], class => 'input'
+      %= select_field 'ReminderAMPM' => [ 'AM', 'PM' ], class => 'input'
     </span>
   </p><br>
 

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

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module back_tape_restore-panel'>
+  <div id='module' class='module back_tape_restore-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -12,19 +12,19 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+  %= form_for '/backupd' => ( method => 'POST' ) => begin
 
     <h2>
-	%=l 'bac_RESTORE_CONF_FROM_TAPE'
+      %= l 'bac_RESTORE_CONF_FROM_TAPE'
     </h2>
 
-	%= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_TAPE_DESC'))
+    %= $c->render_to_string( inline => ( l 'bac_RESTORE_CONF_FROM_TAPE_DESC' ) )
 
     <br>
 

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

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module back_workstn_configure-panel'>
+  <div id='module' class='module back_workstn_configure-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -12,32 +12,32 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
-    %= form_for '/backup' => (method => 'POST') => begin
+  %= form_for '/backup' => ( method => 'POST' ) => begin
 
     <h2>
-	%=l 'bac_CONFIGURE_WORKSTN_BACKUP'
+      %= l 'bac_CONFIGURE_WORKSTN_BACKUP'
     </h2>
 
-	%= $c->render_to_string(inline => (l 'bac_WORKSTN_BACKUP_DESC'))
+    %= $c->render_to_string( inline => ( l 'bac_WORKSTN_BACKUP_DESC' ) )
 
-	%=l 'bac_WORKSTN_BACKUP_ENABLED'
+    %= l 'bac_WORKSTN_BACKUP_ENABLED'
     <span class=data>
       %= $bac_datas->{status}
     </span><br>
 
-	%= $c->render_to_string(inline => $c->workstnBackupConfig())
+    %= $c->render_to_string( inline => $c->workstnBackupConfig() )
 
     <p><h3>
         %= l 'bac_WORKSTATION_BACKUP_SETCONF'
       </h3><br>
       <span class=label>
-	%=l 'bac_SELECT_VFS_TYPE'
+        %= l 'bac_SELECT_VFS_TYPE'
       </span><span class=data>
         % param 'VFSType' => $bac_datas->{vfstype} unless param 'VFSType';
         %= select_field 'VFSType' => $c->get_VFSType_options(), class => 'input'

root/usr/share/smanager/themes/default/templates/back_workstn_configure1.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module back_workstn_configure1-panel'>
+  <div id='module' class='module back_workstn_configure1-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -12,29 +12,29 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   <h2>
-	%=l 'bac_CONFIGURE_WORKSTN_BACKUP'
+    %= l 'bac_CONFIGURE_WORKSTN_BACKUP'
   </h2>
 
-	%= $c->render_to_string(inline => (l 'bac_CONFIGURE_WORKSTN_BACKUP_DESC'))
+  %= $c->render_to_string( inline => ( l 'bac_CONFIGURE_WORKSTN_BACKUP_DESC' ) )
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+  %= form_for '/backupd' => ( method => 'POST' ) => begin
 
     <p>
       <span class=label>
-	%=l 'bac_ENABLE_WORKSTN_BACKUP'
+        %= l 'bac_ENABLE_WORKSTN_BACKUP'
       </span><span class=data>
         % if ( $bac_datas->{status} eq 'checked' ) {
           <input type='checkbox' name='Workstnbackup' checked >
-    %} else {
+        % } else {
         %= check_box 'Workstnbackup'
-    %}
+      % }
     </span>
 
   </p>
@@ -44,58 +44,58 @@
 
     % if ( $bac_datas->{vfstype} =~ m/cifs|nfs/s ) {
       <span class=label>
-	%=l 'bac_WORKSTN_NAME'
+        %= l 'bac_WORKSTN_NAME'
       </span><span class=data>
         % param 'BackupwkStation' => $bac_datas->{station} unless param 'BackupwkStation';
         %= text_field 'BackupwkStation', size => 20, class => 'input'
       </span><br>
-    %}
+    % }
     % if ( $bac_datas->{vfstype} eq 'usb' ) {
       <span class=label>
-	%=l 'bac_local removable disk'
+        %= 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'
+      %= 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>
-	%=l 'bac_SHARED_FOLDER_NAME'
+      %= l 'bac_SHARED_FOLDER_NAME'
     </span><span class=data>
       % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder';
       %= text_field 'BackupwkFolder', size => 20, class => 'input'
     </span><br>
-    %}
+    % }
     % if ( $bac_datas->{vfstype} eq 'cifs' ) {
       <span class=label>
-	%=l 'bac_WORKSTN_LOGIN'
+        %= l 'bac_WORKSTN_LOGIN'
       </span><span class=data>
         % param 'BackupwkLogin' => $bac_datas->{login} unless param 'BackupwkLogin';
         %= text_field 'BackupwkLogin', size => 12, class => 'input'
       </span><br><span class=label>
-	%=l 'bac_PASSWORD'
+        %= l 'bac_PASSWORD'
       </span><span class=data>
         % param 'BackupwkPassword' => $bac_datas->{password} unless param 'BackupwkPassword';
         %= password_field 'BackupwkPassword', size => 12, class => 'input'
       </span>
-    %}
+    % }
   </p><br><h3>
     %= l 'bac_WORKSTN_BACKUP_SETTINGS'
   </h3><br>
 
   <p><span class=label>
-	%=l 'bac_NUMBER_OF_SETS'
+      %= l 'bac_NUMBER_OF_SETS'
     </span><span class=data>
       % param 'SetsNumber' => $bac_datas->{setsNumber} unless param 'SetsNumber';
       %= text_field 'SetsNumber', size => '3'
     </span>
-	%=l 'bac_NUMBER_OF_FILES_IN_SET'
+    %= l 'bac_NUMBER_OF_FILES_IN_SET'
     <span class=data>
       % param 'Filesinset' => $bac_datas->{filesinset} unless param 'Filesinset';
       %= text_field 'Filesinset', size => '3'
@@ -103,43 +103,43 @@
 
   <p>
     <span class=label>
-	%=l 'bac_WORKSTN_BACKUP_TIME'
+      %= l 'bac_WORKSTN_BACKUP_TIME'
     </span><span class=data>
       % param 'BackupwkHour' => $bac_datas->{hour} unless param 'BackupwkHour';
       %= text_field 'BackupwkHour', size => '2'
       % param 'BackupwkMin' => $bac_datas->{min} unless param 'BackupwkMin';
       %= text_field 'BackupwkMin', size => '2'
     </span>
-	%=l 'AM/PM:'
+    %= l 'AM/PM:'
     <span class=data>
       % param 'BackupwkAMPM' => $bac_datas->{ampm} unless param 'BackupwkAMPM';
-	%= select_field 'BackupwkAMPM' => ['AM', 'PM'], class => 'input'
+      %= select_field 'BackupwkAMPM' => [ 'AM', 'PM' ], class => 'input'
     </span>
   </p>
 
   <p><span class=label>
-	%=l 'bac_WORKSTN_TIMEOUT'
+      %= l 'bac_WORKSTN_TIMEOUT'
     </span><span class=data>
       % param 'BackupwkTimeout' => $bac_datas->{timeout} unless param 'BackupwkTimeout';
       %= text_field 'BackupwkTimeout', size => '2'
     </span>
-	%=l 'bac_INC_ONLY_TIMEOUT'
+    %= l 'bac_INC_ONLY_TIMEOUT'
     <span class=data>
       % if ( $bac_datas->{incOnlyTimeout} eq 'checked' ) {
         <input type='checkbox' name='IncOnlyTimeout' checked  >
-    %} else {
+      % } else {
       %= check_box 'IncOnlyTimeout'
-    %}
+      % }
   </span></p>
 
   <p>
     <span class=label>
-	%=l 'bac_COMPRESSION_LEVEL'
+      %= l 'bac_COMPRESSION_LEVEL'
     </span><span class=data>
       % param 'Compression' => $bac_datas->{compression} unless param 'Compression';
       %= text_field 'Compression', size => '1'
     </span>
-	%=l 'bac_FULL_ONLY_ON'
+    %= l 'bac_FULL_ONLY_ON'
     <span class=data>
       % param 'Dof' => $bac_datas->{dof} unless param 'Dof';
       %= select_field 'Dof' => $c->get_dow_list(), class => 'input'
@@ -150,5 +150,5 @@
     %= hidden_field 'VFSType' => $bac_datas->{vfstype}
     %= submit_button $c->l('bac_UPDATE_CONF'), class => 'action'
     % end
-</div>
+  </div>
-% end
+  % end

root/usr/share/smanager/themes/default/templates/back_workstn_restore.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module back_workstn_restore-panel'>
+  <div id='module' class='module back_workstn_restore-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -12,27 +12,27 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+  %= form_for '/backupd' => ( method => 'POST' ) => begin
 
     <h2>
-	%=l 'bac_WORKSTN_RESTORE'
+      %= l 'bac_WORKSTN_RESTORE'
     </h2>
 
     <br><br>
     % if ($bac_datas->{status} ne 'enabled') {
-	%= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE'))
+      %= $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>
-	%=l 'bac_SELECT_BACKUP_FILE'
+    %= l 'bac_SELECT_BACKUP_FILE'
   </span><span class=data>
     %= select_field 'Backupset' => $c->get_Backupset_options(), class => 'input'
   </span><br><br>

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'>
-<div id='module' class='module back_workstn_restore1-panel'>
+    %= javascript '/js/backup_workstation_restore.js'
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -12,21 +12,44 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+  %= form_for '/backupd' => ( method => 'POST' ) => begin
 
     <h2>
-	%=l 'bac_WORKSTN_RESTORE'
+      %= 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>
-	%= $c->render_to_string(inline => $bac_datas->{restore_log})
+      <fieldset>
-	</p><p>
+        %= $c->render_to_string( inline => $bac_datas->{restore_log} )
-	%=l 'bac_YOU_MUST_REBOOT'
+      </fieldset>
+    </p>
+    -->
+
+    <p>
+      %= l 'bac_YOU_MUST_REBOOT'
     </p>
     %= hidden_field 'Function' => $bac_datas->{'function'}
     %= submit_button $c->l('bac_REBOOT'), class => 'action'

root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module back_workstn_sel_restore-panel'>
+  <div id='module' class='module back_workstn_sel_restore-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -12,28 +12,28 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+  %= form_for '/backupd' => ( method => 'POST' ) => begin
 
-    <h2><%=l 'bac_WORKSTN_SEL_RESTORE' %></h2>
+    <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>
+    <h3><%= l 'bac_BACKUP_CHOICE' %></h3>
 
     <br><span class=label>
-	%=l 'bac_SELECT_BACKUP_FILE'
+      %= l 'bac_SELECT_BACKUP_FILE'
     </span><span class=data>
       %= select_field 'Backupset' => $c->get_Restoreset_options(), class => 'input'
     </span><br>
 
     <br><span class=label>
-	%=l 'bac_FILTER_EXPRESSION'
+      %= l 'bac_FILTER_EXPRESSION'
     </span><span class=data>
       %= text_field 'Filterexp', size => 32, class => 'input'
     </span><br>

root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore1.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module back_workstn_sel_restore1-panel'>
+  <div id='module' class='module back_workstn_sel_restore1-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -12,27 +12,27 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
 
-    <h2><%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %></h2><br>
+  <h2><%= l 'bac_WORKSTN_SELECTIVE_RESTORE' %></h2><br>
 
-    %= $c->render_to_string(inline => (l 'bac_READ_COMPLETE'))
+  %= $c->render_to_string( inline => ( l 'bac_READ_COMPLETE' ) )
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+  %= form_for '/backupd' => ( method => 'POST' ) => begin
 
     <br><span class=label>
-	%=l 'bac_SELECT_FILES_TO_RESTORE'
+      %= 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>
-	%=l 'bac_SELECT_DATE_BEFORE'
+      %= l 'bac_SELECT_DATE_BEFORE'
     </span><span class=data>
       %= text_field 'Seldatebefore', size => 32, class => 'input'
     </span><br>

root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore2.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module back_workstn_sel_restore2-panel'>
+  <div id='module' class='module back_workstn_sel_restore2-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -12,17 +12,17 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
-    <h2><%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %></h2>
+  <h2><%= l 'bac_WORKSTN_SELECTIVE_RESTORE' %></h2>
   <br>
-    %= $c->render_to_string(inline => $bac_datas->{restore_log}) 
+  %= $c->render_to_string( inline => $bac_datas->{restore_log} )
   <br>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+  %= form_for '/backupd' => ( method => 'POST' ) => begin
     %= hidden_field 'Function' => $bac_datas->{'function'}
     %= submit_button $c->l('NEXT'), class => 'action'
 

root/usr/share/smanager/themes/default/templates/back_workstn_verify.html.ep

@@ -1,7 +1,7 @@
 % layout 'default', title => "Sme server 2 - backup - verify";
 % content_for 'module' => begin
 
-<div id='module' class='module back_workstn_verify-panel'>
+  <div id='module' class='module back_workstn_verify-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -11,36 +11,36 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   <h2>
-	%=l 'bac_VERIFY_WORKSTN_BACKUP_FILE'
+    %= l 'bac_VERIFY_WORKSTN_BACKUP_FILE'
   </h2>
 
-    %= form_for '/backup' => (method => 'POST') => begin
+  %= form_for '/backup' => ( method => 'POST' ) => begin
 
     % if ($bac_datas->{status} ne 'enabled') {
-	%= $c->render_to_string(inline => (l 'bac_CONFIGURATION_TO_BE_DONE'))
+      %= $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'
+    %= l 'bac_SELECT_BACKUP_FILE'
   </span><span class=data>
     %= select_field 'Backupset' => $c->get_Backupset_options(), class => 'input'
   </span><br>
 
   <p><span class=label>
-	%=l 'bac_CHECK_TO_VERIFY_FULL_RESTORE'
+      %= l 'bac_CHECK_TO_VERIFY_FULL_RESTORE'
     </span><span class=data>
       %= check_box 'Verifyall'
   </span></p><br>
 
-	%=l 'bac_CHECK_INTEGRITY_WARNING'
+  %= l 'bac_CHECK_INTEGRITY_WARNING'
 
   <br><br>
   %= hidden_field 'Function' => $bac_datas->{'function'} . '1'

root/usr/share/smanager/themes/default/templates/back_workstn_verify1.html.ep

@@ -1,7 +1,7 @@
 % layout 'default', title => "Sme server 2 - backup - verify";
 % content_for 'module' => begin
 
-<div id='module' class='module back_workstn_verify1-panel'>
+  <div id='module' class='module back_workstn_verify1-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -12,19 +12,19 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   <h2><%= l 'bac_VERIFY_WORKSTN_BACKUP_FILE' %></h2>
 
   <br>
-    %= $c->render_to_string(inline => $c->workstnVerify())
+  %= $c->render_to_string( inline => $c->workstnVerify() )
   <br>
 
-    %= form_for '/backupd' => (method => 'POST') => begin
+  %= form_for '/backupd' => ( method => 'POST' ) => begin
 
     %= hidden_field 'Function' => $bac_datas->{'function'}
 

root/usr/share/smanager/themes/default/templates/backdown.html.ep

@@ -1,18 +1,21 @@
 <%
-
   my $backups    = esmith::BackupHistoryDB->open;    # no UTF8
   my $now        = time();
-    my $backup_rec = $backups->new_record($now, {
+  my $backup_rec = $backups->new_record(
-	type => 'backup_record', BackupType => 'desktop',
+    $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.
-    my $status = system("/sbin/e-smith/signal-event", "pre-backup", "desktop");
+  my $status = system( "/sbin/e-smith/signal-event", "pre-backup", "desktop" );
   if ($status) {
-		$c->desktopBackupRecordStatus($backup_rec, 'pre-backup', $status);
+    $c->desktopBackupRecordStatus( $backup_rec, 'pre-backup', $status );
-		return ($c->l('bac_OPERATION_STATUS_REPORT').$c->l('bac_ERR_PRE_BACKUP'));
+    return ( $c->l('bac_OPERATION_STATUS_REPORT') . $c->l('bac_ERR_PRE_BACKUP') );
   }
 
   my $clvl = $c->stash('compressionlevel');
@@ -38,30 +41,31 @@
     $cb = sub {
       my $c      = shift;
       my $size   = 500 * 1024;
-		my $length = sysread($fh, my $buffer, $size);
+      my $length = sysread( $fh, my $buffer, $size );
       unless ($length) {
         close $fh;
         undef $cb;
         $c->finish;
         return;
       }
-		$c->write_chunk($buffer, $cb);
+      $c->write_chunk( $buffer, $cb );
     };
     $c->$cb;
-	} else {
+  }
-		$c->render(text => "Failed to execute command: $!", status => 500);
+  else {
+    $c->render( text => "Failed to execute command: $!", status => 500 );
   }
 
   # Remove the dumped tables.
-    $status = system("/sbin/e-smith/signal-event", "post-backup", "desktop");
+  $status = system( "/sbin/e-smith/signal-event", "post-backup", "desktop" );
   if ($status) {
-		$c->desktopBackupRecordStatus($backup_rec, 'post-backup', $status);
+    $c->desktopBackupRecordStatus( $backup_rec, 'post-backup', $status );
-		die ($c->l('bac_ERR_POST_BACKUP'),"\n");
+    die( $c->l('bac_ERR_POST_BACKUP'), "\n" );
   }
 
   $now = time();
-    $backup_rec->set_prop('EndEpochTime', "$now");
+  $backup_rec->set_prop( 'EndEpochTime', "$now" );
-    $backup_rec->set_prop('Result', "0");
+  $backup_rec->set_prop( 'Result',       "0" );
   
 %>
 1;

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

@@ -1,8 +1,7 @@
 % layout 'default', title => "Sme server 2 - backup";
 
 % content_for 'module' => begin
-
+  <div id='module' class='module backup-panel'>
-<div id='module' class='module backup-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -12,16 +11,16 @@
 
   % if ( stash 'warning' ) {
     <br><div class=sme-warning>
-    	%= $c->render_to_string(inline => stash 'warning') 
+      %= $c->render_to_string( inline => stash 'warning' )
     </div>
-    %}
+  % }
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <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-->
@@ -29,16 +28,16 @@
     <%= $c->render_to_string(inline => (l 'bac_BACKUP_DESC_DAR', $bac_datas->{module},
     $bac_datas->{dumpsize}, $bac_datas->{tarsize})) %>
 
-    %= form_for '/backup' => (method => 'POST') => begin
+    %= form_for '/backup' => ( method => 'POST' ) => begin
 
       <h2>
-	%=l 'bac_BACKUP_CONFIG_STATUS'
+        %= l 'bac_BACKUP_CONFIG_STATUS'
       </h2>
 
       <p><span class=label>
-	%=l 'bac_TAPE_BACKUPS',
+          %= l 'bac_TAPE_BACKUPS',
         </span><span class=data2>
-	%= $c->l(uc($bac_datas->{'backupStatus'})).'.'
+          %= $c->l( uc( $bac_datas->{'backupStatus'} ) ) . '.'
         </span>
         % if ( $bac_datas->{'backupStatus'} eq 'enabled' ) {
           %= $c->l('bac_BACKUPS_RUN_AT')
@@ -49,21 +48,21 @@
           <span class=data>
             %= $bac_datas->{'reminderTime'}
           </span>
-    %}
+        % }
       <p><span class=label>
-	%=l 'bac_WORKSTN_BACKUPS',
+          %= l 'bac_WORKSTN_BACKUPS',
         </span><span class=data2>
-	%= $c->l(uc($bac_datas->{'backupwkStatus'})).'.'
+          %= $c->l( uc( $bac_datas->{'backupwkStatus'} ) ) . '.'
         </span>
         % if ( $bac_datas->{'backupwkStatus'} eq 'enabled' ) {
           %= $c->l('bac_WKBACKUPS_RUN_AT')
           <b>
             %= $bac_datas->{'backupwkTime'}
           </b>
-    %}
+        % }
 
         <p><span class=label>
-	%=l 'bac_SELECT_AN_ACTION'
+            %= l 'bac_SELECT_AN_ACTION'
           </span><span class=data>
             % param 'Function' => $bac_datas->{function} unless param 'Function';
             %= select_field 'Function' => $c->get_function_options(), class => 'input'
@@ -74,6 +73,6 @@
 
         % end
 
-</div>
+      </div>
 
-% end
+      % end

root/usr/share/smanager/themes/default/templates/bugreport.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module bugreport-panel'>
+  <div id='module' class='module bugreport-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -15,55 +15,55 @@
   <!--br><%= $modul %><br-->
 
     <b>
-    %=l ('bugr_DO_NOT_PANIC')
+      %= l('bugr_DO_NOT_PANIC')
     </b>
     <p>
-    %=l ('bugr_SME_EXPERIENCE')
+      %= l('bugr_SME_EXPERIENCE')
     </p><p>
-    %=l ('bugr_USE_TEMPLATE')
+      %= l('bugr_USE_TEMPLATE')
-: <a href="https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs"
+      : <a href="https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs"
       target="_blank">https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs</a>.
   </p><p>
-    %=l ('bugr_PLEASE_REPORT_HERE')
+    %= l('bugr_PLEASE_REPORT_HERE')
-: <a href="https://bugs.koozali.org" target="_blank">https://bugs.koozali.org</a>.
+    : <a href="https://bugs.koozali.org" target="_blank">https://bugs.koozali.org</a>.
   </p><p>
-   %=l ('bugr_FOLLOWING_REPORT_MIGHT_HELP')
+    %= l('bugr_FOLLOWING_REPORT_MIGHT_HELP')
   </p><p>
-    %=l ('bugr_REPORT_CONTENT')
+    %= l('bugr_REPORT_CONTENT')
     <br><ul><li>
-    %=l ('bugr_SME_VERSION')
+        %= l('bugr_SME_VERSION')
       </li><li>
-    %=l ('bugr_SERVER_MODE')
+        %= l('bugr_SERVER_MODE')
       </li><li>
-    %=l ('bugr_PREVIOUS_SERVER_MODE')
+        %= l('bugr_PREVIOUS_SERVER_MODE')
       </li><li>
-    %=l ('bugr_KERNEL_AND_ARCH')
+        %= l('bugr_KERNEL_AND_ARCH')
       </li><li>
-    %=l ('bugr_INSTALLED_RPMS')
+        %= l('bugr_INSTALLED_RPMS')
       </li><li>
-    %=l ('bugr_ALTERED_TEMPLATES')
+        %= l('bugr_ALTERED_TEMPLATES')
       </li><li>
-    %=l ('bugr_ALTERED_EVENTS')
+        %= l('bugr_ALTERED_EVENTS')
       </li><li>
-    %=l ('bugr_YUM_REPOS')
+        %= l('bugr_YUM_REPOS')
       </li><br></ul>
-    %=l ('bugr_PRIVACY')
+    %= l('bugr_PRIVACY')
   </p>
 
   <% my $btn = l('bugr_CREATE_REPORT'); %>
 
-    %= form_for 'bugreport' => (method => 'POST') => begin
+  %= form_for 'bugreport' => ( method => 'POST' ) => begin
     %= submit_button "$btn", class => 'action'
   % end
 
   <p><b>
-    %=l ('bugr_DONATING')
+      %= l('bugr_DONATING')
     </b><br><br>
-    %=l ('bugr_AWARE_SME')
+    %= l('bugr_AWARE_SME')
     <br><br><b>
-    %=l ('bugr_YOUR_HELP')
+      %= l('bugr_YOUR_HELP')
     </b><br><br>
-    %=l ('bugr_CONSIDER_DONATING')
+    %= l('bugr_CONSIDER_DONATING')
     <br><br>
   </p>
 
@@ -75,8 +75,8 @@
   % end
 
   <br>
-    %=l ('bugr_THANK_YOU')
+  %= l('bugr_THANK_YOU')
 
 </div>
 
-%end
+% end

root/usr/share/smanager/themes/default/templates/bugreport2.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module bugreport2-panel'>
+  <div id='module' class='module bugreport2-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -17,7 +17,7 @@
 
   <% my $btn = l('bugr_Download this report'); %>
 
-    %= form_for 'bugreportD' => (method => 'POST') => begin
+  %= form_for 'bugreportD' => ( method => 'POST' ) => begin
     %= submit_button "$btn", class => 'action'
     %= hidden_field 'trt' => $bugr_datas->{trt}
   % end
@@ -27,8 +27,8 @@
   % $out .= "================== <br />";
   % $out .= "<img src='images/boot.svg' alt='boot timing image' width=95% >";
 
-   <br><%= $c->render_to_string(inline=>$out) %><br>
+  <br><%= $c->render_to_string( inline => $out ) %><br>
 
 </div>
 
-%end
+% end

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

@@ -1,39 +1,39 @@
 % layout 'default', title => "Sme server 2 - clamav";
 
 % content_for 'module' => begin
-<div id='module' class='module clamav-panel'>
+  <div id='module' class='module clamav-panel'>
-    %if (config->{debug} == 1) {
+    % if (config->{debug} == 1) {
       <p>(DBG)route: <%= $c->current_route %><br>
-	(DBG)FsS stat: <%= $clm_datas->{FilesystemScan}%> <br>
+        (DBG)FsS stat: <%= $clm_datas->{FilesystemScan} %> <br>
-	(DBG)Quar stat: <%=$clm_datas->{Quarantine} %>
+        (DBG)Quar stat: <%= $clm_datas->{Quarantine} %>
       </p>
-    %}
+    % }
   <h1><%= $title %></h1>
   <br>
   <%= $modul %>
   <% my $btn = l('SAVE'); %>
 
-    %= form_for 'clamav' => (method => 'POST') => begin
+  %= form_for 'clamav' => ( method => 'POST' ) => begin
     <p>
       <span class=label>
-	%=l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD'
+        %= 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>
       <span class=label>
-	%=l 'clm_LABEL_QUARANTINE'
+        %= 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>
     <p>
       <span class=label>
-	%=l 'clm_LABEL_CLAM_VERSIONS'
+        %= l 'clm_LABEL_CLAM_VERSIONS'
       </span><span class=data>
         %= $clm_datas->{clam_versions}
         <br>
@@ -42,4 +42,4 @@
     %= submit_button "$btn", class => 'action'
   % end
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/csrf_400.html.ep

@@ -1,10 +1,10 @@
 % layout 'default', title => "Sme server 2 - err 400";
 
 % content_for 'module' => begin
-<div id='module' class='module csrf_400-panel'>
+  <div id='module' class='module csrf_400-panel'>
     <div class=sme-error>
       %= l 'CSRF_VALIDATION_FAILURE'
     </div>
 
-</div>
+  </div>
 % end

root/usr/share/smanager/themes/default/templates/datetime.html.ep

@@ -8,48 +8,48 @@
       </p>
     % }
 
-		%if ($c->stash('first')) {
+  % if ($c->stash('first')) {
     <br><p>
-			%=$c->render_to_string(inline =>$c->l($c->stash('first')))
+      %= $c->render_to_string( inline => $c->l( $c->stash('first') ) )
     </p>
-		%} elsif ($c->stash('success')) {
+  % } elsif ($c->stash('success')) {
   <div class='success '>
-				%= $c->l($c->stash('success'));
+    %= $c->l( $c->stash('success') );
   </div>
-		%} elsif ($c->stash('error')) { 
+  % } elsif ($c->stash('error')) {
   <div class='sme-error'>
-				%= $c->l($c->stash('error'));
+    %= $c->l( $c->stash('error') );
   </div>
-		%}
+  % }
 
   <h1><%= $title %></h1><br>
   %= $modul
   <% 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'>
-				%=l 'dat_NTP_ENABLE_DESC'
+      %= l 'dat_NTP_ENABLE_DESC'
       <br>
     </div>
   % } else {
   % my $current_year = $dat_data->{year};
-			% my $year_options  = [ map { [ $_, $_ ] } ($current_year..($current_year+30)) ];
+  % my $year_options = [ map { [ $_, $_ ] } ( $current_year .. ( $current_year + 30 ) ) ];
-			% my $month_options = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (1..12) ];
+  % my $month_options = [ map { [ sprintf( '%02d', $_ ), sprintf( '%02d', $_ ) ] } ( 1 .. 12 ) ];
-			% my $hour_options  = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (0..23) ];
+  % my $hour_options = [ map { [ sprintf( '%02d', $_ ), sprintf( '%02d', $_ ) ] } ( 0 .. 23 ) ];
   % my $mode_options = [
   % [ $c->l('dat_ntp_server'), 'dat_ntp_server' ],
   % [ $c->l('dat_manually_set'), 'dat_manually_set' ]
   % ];
   <h2><%= $c->l('Time Configuration') %></h2>
-			%= form_for "datetimeu" => (method => 'post') => begin
+  %= form_for "datetimeu" => ( method => 'post' ) => begin
 
     %= hidden_field 'Old_ntpstatus' => $dat_data->{ntpstatus};
     %= hidden_field 'trt' => $dat_data->{trt};
@@ -58,7 +58,7 @@
       %= label_for time_mode => $c->l('Time Setting Mode:')
     </span><span class=data2>
       % param 'time_mode' => $dat_data->{time_mode} unless param 'time_mode';
-					%= select_field time_mode => ($mode_options, id => 'time_mode_select')
+      %= select_field time_mode => ( $mode_options, id => 'time_mode_select' )
     </span>
 
     <div id='ntp_section'>
@@ -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>
@@ -95,42 +95,42 @@
           <fieldset>
             <legend><%= $c->l('Date') %></legend>
             %= label_for year => $c->l('Year:')
-								% param 'year' => ($dat_data->{year}) unless param 'year';
+            % param 'year' => ( $dat_data->{year} ) unless param 'year';
-								%= select_field year => ($year_options, id => 'year'), required => 'required'
+            %= select_field year => ( $year_options, id => 'year' ), required => 'required'
             &nbsp;
 
             %= label_for month => $c->l('Month:')
-								% param 'month' => ($dat_data->{month}) unless param 'month';
+            % param 'month' => ( $dat_data->{month} ) unless param 'month';
-								%= select_field month => ($month_options, id => 'month'), required => 'required'
+            %= select_field month => ( $month_options, id => 'month' ), required => 'required'
             &nbsp;
 
             %= label_for day => $c->l('Day:')
-								% param 'day' => ($dat_data->{day}) unless param '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>
             <legend><%= $c->l('Time') %></legend>
             %= label_for hour => $c->l('Hour:')
-								% param 'hour' => ($dat_data->{hour}) unless param 'hour';
+            % param 'hour' => ( $dat_data->{hour} ) unless param 'hour';
-								%= select_field hour => ($hour_options, id => 'hour'), required => 'required'
+            %= select_field hour => ( $hour_options, id => 'hour' ), required => 'required'
             &nbsp;
 
             %= label_for minute => $c->l('Minute:')
-								% param 'minute' => ($dat_data->{minute}) unless param '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';
+            % 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>
       <div class='datetime-config-row'>
         <div class='datetime-label-col'>
           <span class='datetime-label'>
-								%=l 'dat_TZ'
+            %= l 'dat_TZ'
           </span>
         </div>
         <div class='datetime-fields-col' id='datetime_manual'>
@@ -142,6 +142,6 @@
     %= submit_button $btn, class => 'action'
   % end
   % }
-	</div>
+</div>
 % end
 1;

root/usr/share/smanager/themes/default/templates/default.html.ep

@@ -2,12 +2,12 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module default-panel'>
+  <div id='module' class='module default-panel'>
     <p><%= $title %></p>
     <%= $modul %>
     <p>
       %= link_to Initial => '/'
     </p>
-</div>
+  </div>
 
-%end
+% end

root/usr/share/smanager/themes/default/templates/directory.html.ep

@@ -1,23 +1,22 @@
 % layout 'default', title => "Sme server 2 - directory";
 
 % content_for 'module' => begin
-<div id='module' class='module directory-panel'>
+  <div id='module' class='module directory-panel'>
 
-    %if (config->{debug} == 1) {
+    % if (config->{debug} == 1) {
       <p>
         (DBG)route: <%= $c->current_route %><br>
-	(DBG)dir. access: <%= $dir_datas->{access}%><br>
+        (DBG)dir. access: <%= $dir_datas->{access} %><br>
       </p>
-    %}
+    % }
 
   <h1><%= $title %></h1>
   <br>
   <%= $modul %>
-    <% 	my $btn = l('SAVE');
+  <% 	my $btn = l('SAVE');  %>
-     %>
 
 
-    %= form_for 'directory' => (method => 'POST') => begin
+  %= form_for 'directory' => ( method => 'POST' ) => begin
     <br>
     <p>
       <span class=label>
@@ -27,55 +26,55 @@
       </span>
     </p>
     <p>
-	%=l 'dir_DESC_DIRECTORY_ACCESS', class => 'desc'
+      %= l 'dir_DESC_DIRECTORY_ACCESS', class => 'desc'
       <br>
       <span class=label>
-	%=l 'dir_DIRECTORY_ACCESS', class => 'label'
+        %= 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>
-	%=l 'dir_DESC_DEPARTMENT', class => 'desc'
+      %= l 'dir_DESC_DEPARTMENT', class => 'desc'
       <br><br>
       <span class=label>
-	%=l 'dir_DEPARTMENT', class => 'label'
+        %= l 'dir_DEPARTMENT', class => 'label'
       </span><span class=data>
         %= text_field 'department' => $dir_datas->{department}, class => 'input'
       </span>
     </p><p>
       <span class=label>
-	%=l 'dir_COMPANY', class => 'label'
+        %= l 'dir_COMPANY', class => 'label'
       </span><span class=data>
         %= text_field 'company', $dir_datas->{company}, class => 'input'
       </span>
     </p><p>
       <span class=label>
-	%=l 'dir_STREET', class => 'label'
+        %= l 'dir_STREET', class => 'label'
       </span><span class=data>
         %= text_field 'street' => $dir_datas->{street}, class => 'input'
       </span>
     </p><p>
       <span class=label>
-	%=l 'dir_CITY', class => 'label'
+        %= l 'dir_CITY', class => 'label'
       </span><span class=data>
         %= text_field 'city', $dir_datas->{city}, class => 'input'
       </span>
     </p><p>
       <span class=label>
-	%=l 'dir_PHONENUMBER', class => 'label'
+        %= l 'dir_PHONENUMBER', class => 'label'
       </span><span class=data>
         %= text_field 'phonenumber', $dir_datas->{phonenumber}, class => 'input'
       </span>
     </p>
     <p>
-	%=l 'dir_DESC_EXISTING', class => 'desc'
+      %= l 'dir_DESC_EXISTING', class => 'desc'
       <br><br>
       <span class=label>
-	%=l 'dir_EXISTING', 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>
@@ -85,4 +84,4 @@
   % end
 
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/domains.html.ep

@@ -1,7 +1,7 @@
 % layout 'default', title => "Sme server 2 - domains";
 
 % content_for 'module' => begin
-<div id='module' class='module domains-panel'>
+  <div id='module' class='module domains-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -12,21 +12,21 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   % if ($dom_datas->{trt} eq 'ADD' or $dom_datas->{trt} eq 'UPD') {
     %= include 'partials/_dom_upd'
-    %} elsif ($dom_datas->{trt} eq 'DEL') {
+  % } elsif ($dom_datas->{trt} eq 'DEL') {
   %= include 'partials/_dom_del'
-    %} elsif ($dom_datas->{trt} eq 'UP2') {
+  % } elsif ($dom_datas->{trt} eq 'UP2') {
   %= include 'partials/_dom_up2'
-    %} else {
+  % } else {
   %= include 'partials/_dom_list'
-    %}
+  % }
 
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/emailsettings.html.ep

@@ -5,10 +5,10 @@
 %# css specific to this panel:
 % content_for 'module' => begin
 
-% use constant FALSE => 0;
+  % use constant FALSE => 0;
-% use constant TRUE  => 1;
+  % use constant TRUE => 1;
 
-<div id="module" class="module Emailsettings-panel">
+  <div id="module" class="module Emailsettings-panel">
 
     % if (config->{debug} == 1) {
       <pre>
@@ -17,54 +17,54 @@
       </pre>
     % }
 
-    <h1><%=$title%></h1>
+  <h1><%= $title %></h1>
 
   % if ( stash('modul')) {
-	%= $c->render_to_string(inline => stash('modul') );
+    %= $c->render_to_string( inline => stash('modul') );
   % }
 
-   	%if ($c->stash('first')) {
+  % if ($c->stash('first')) {
     <br><p>
-		%=$c->render_to_string(inline =>$c->l($c->stash('first')))
+      %= $c->render_to_string( inline => $c->l( $c->stash('first') ) )
     </p>
 
-	%} elsif ($c->stash('success')) {
+  % } elsif ($c->stash('success')) {
   <div class='success '>
-				%= $c->l($c->stash('success'));
+    %= $c->l( $c->stash('success') );
   </div>
   <br />
 
-	%} elsif ($c->stash('error')) { 
+  % } elsif ($c->stash('error')) {
   <div class='sme-error'>
-				%= $c->l($c->stash('error'));
+    %= $c->l( $c->stash('error') );
   </div>
   <br />
-	%}
+  % }
 
-	%#Routing to partials according to trt parameter.
+  %# Routing to partials according to trt parameter.
-	%#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
+  %# This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
 
   % if ($mai_data->{trt} eq "FRONT") {
     %= include 'partials/_mai_FRONT'
-	%}
+  % }
 
   % if ($mai_data->{trt} eq "ACC") {
     %= include 'partials/_mai_ACC'
-	%}
+  % }
 
   % if ($mai_data->{trt} eq "FIL") {
     %= include 'partials/_mai_FIL'
-	%}
+  % }
 
   % if ($mai_data->{trt} eq "REC") {
     %= include 'partials/_mai_REC'
-	%}
+  % }
 
   % if ($mai_data->{trt} eq "DEL") {
     %= include 'partials/_mai_DEL'
-	%}
+  % }
 
 
 
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/embedded.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module module-panel'>
+  <div id='module' class='module module-panel'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -10,14 +10,14 @@
     % }
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-			%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
-    <h1> Embedded - <%=$title %></h1><br>
+  <h1> Embedded - <%= $title %></h1><br>
   <p>If the legacy panel does not appear, then you may not be logged into the original Server manager.<br />You can log in by clicking <a href="/server-manager" target='_blank'>here</a>. Or by clicking on the "Legacy SM" button at the top of the window.</p>
   % my $height = $c->stash('height') | '600px';
-    % if ($height !~ /px$/) { $height = $height.'px';}
+  % if ( $height !~ /px$/ ) { $height = $height . 'px'; }
-	<object id="legacy-embedded" class="legacy-embedded" data="<%=$c->stash('modul') %>" style="width:99%;height:<%= $height %>;" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
+  <object id="legacy-embedded" class="legacy-embedded" data="<%= $c->stash('modul') %>" style="width:99%;height:<%= $height %>;" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
 </div>
 
-%end
+% end

root/usr/share/smanager/themes/default/templates/exception_development.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id="central" class="sme-error module">
+  <div id="central" class="sme-error module">
     <p><br>dev<br> Oups !!!
       The page you were requesting
       "<%= $self->req->url->path || '/' %>"
@@ -12,6 +12,6 @@
     <p>
       %= link_to Back => '/'
     </p>
-</div>
+  </div>
 
 % end

root/usr/share/smanager/themes/default/templates/groups.html.ep

@@ -1,7 +1,7 @@
 % layout 'default', title => "Sme server 2 - groups";
 
 % content_for 'module' => begin
-<div id='module' class='module groups-panel'>
+  <div id='module' class='module groups-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -12,22 +12,22 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   % if ($grp_datas->{trt} eq 'ADD') {
     %= include 'partials/_grp_add'
-    %} elsif ($grp_datas->{trt} eq 'DEL') {
+  % } 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
+% end
 

root/usr/share/smanager/themes/default/templates/hostentries.html.ep

@@ -1,7 +1,7 @@
 % layout 'default', title => "Sme server 2 - hostentries";
 
 % content_for 'module' => begin
-<div id='module' class='module hostentries-panel'>
+  <div id='module' class='module hostentries-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -10,26 +10,26 @@
       </p>
     % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   % if ( $notif ) {
     <br>
     <span class=sme-error>
-	<%= $c->render_to_string(inline => $notif) %>
+      <%= $c->render_to_string( inline => $notif ) %>
     </span>
-    %}
+  % }
 
   % if ($hos_datas->{trt} eq 'ADD' or $hos_datas->{trt} eq 'UPD') {
     %= include 'partials/_hos_upd'
-    %} elsif ($hos_datas->{trt} eq 'DEL') {
+  % } elsif ($hos_datas->{trt} eq 'DEL') {
   %= include 'partials/_hos_del'
-    %} elsif ( $hos_datas->{trt} eq 'ALC' or $hos_datas->{trt} eq 'ULC') {
+  % } elsif ( $hos_datas->{trt} eq 'ALC' or $hos_datas->{trt} eq 'ULC') {
   %= include 'partials/_hos_ulc'
-    %} elsif ( $hos_datas->{trt} eq 'ARM' or $hos_datas->{trt} eq 'URM') {
+  % } elsif ( $hos_datas->{trt} eq 'ARM' or $hos_datas->{trt} eq 'URM') {
   %= include 'partials/_hos_urm'
-    %} else {
+  % } else {
   %= include 'partials/_hos_list'
-    %}
+  % }
 
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/ibays.html.ep

@@ -1,7 +1,7 @@
 % layout 'default', title => "Sme server 2 - ibays";
 
 % content_for 'module' => begin
-<div id='module' class='module ibays-panel'>
+  <div id='module' class='module ibays-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -12,28 +12,28 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   % if ( stash 'modul' ) {
-	%= $c->render_to_string(inline => stash 'modul' );
+    %= $c->render_to_string( inline => stash 'modul' );
   % }
 
   % if ($iba_datas->{trt} eq 'ADD') {
     %= include 'partials/_iba_upd'
-    %} elsif ($iba_datas->{trt} eq 'DEL') {
+  % } elsif ($iba_datas->{trt} eq 'DEL') {
   %= include 'partials/_iba_del'
-	%} elsif ($iba_datas->{trt} eq 'UPD') {
+  % } elsif ($iba_datas->{trt} eq 'UPD') {
   %= include 'partials/_iba_upd'
-		%} elsif ($iba_datas->{trt} eq 'PWD') {
+  % } elsif ($iba_datas->{trt} eq 'PWD') {
   %= include 'partials/_iba_pwd'
-		%} else {
+  % } else {
   %= include 'partials/_iba_list'
-		%}
+  % }
 
 </div>
-%end
+% end
 

root/usr/share/smanager/themes/default/templates/initial.html.ep

@@ -12,9 +12,9 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
   <h3>
     %= $title

root/usr/share/smanager/themes/default/templates/localnetworks.html.ep

@@ -1,7 +1,7 @@
 % layout 'default', title => "Sme server 2 - localnetworks";
 
 % content_for 'module' => begin
-<div id='module' class='module localnetworks-panel'>
+  <div id='module' class='module localnetworks-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -13,20 +13,20 @@
       </p>
     % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
   %= $modul
 
   % if ($ln_datas->{trt} eq 'ADD') {
     %= include 'partials/_ln_add'
-    %} elsif ($ln_datas->{trt} eq 'ADD1') {
+  % } elsif ($ln_datas->{trt} eq 'ADD1') {
   %= include 'partials/_ln_add'
-    %} elsif ($ln_datas->{trt} eq 'DEL') {
+  % } elsif ($ln_datas->{trt} eq 'DEL') {
   %= include 'partials/_ln_del'
-	%} elsif ($ln_datas->{trt} eq 'DEL1'){
+  % } elsif ($ln_datas->{trt} eq 'DEL1'){
   %= include 'partials/_ln_list'
-	%} else {
+  % } else {
   %= include 'partials/_ln_list'
-	%}
+  % }
 
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/login.html.ep

@@ -2,53 +2,53 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module login-panel'>
+  <div id='module' class='module login-panel'>
 
-    %if ( config 'debug' ) {
+    % if ( config 'debug' ) {
       <p>
         %= dumper $c->current_route
-	%if ( stash 'trt' ) {
+        % if ( stash 'trt' ) {
           %= dumper stash 'trt'
-	%}
+        % }
     </p>
-    %}
+  % }
 
-% if ( stash 'error' ) {
+  % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-%}
+  % }
 
-% my $btn = l('use_SIGNIN');
+  % my $btn = l('use_SIGNIN');
-% if ( $trt eq 'RESET' ) {
+  % if ( $trt eq 'RESET' ) {
     <br><div class=sme-error><h2>
-    	%= $c->render_to_string(inline => l 'use_DESC_RESET') 
+        %= $c->render_to_string( inline => l 'use_DESC_RESET' )
     </h2></div>
     % $btn = l('use_RESET');
-%}
+  % }
 
   <h1>
-    %=l 'use_TITLE'
+    %= l 'use_TITLE'
   </h1>
 
-    %= form_for '/login' => (method => 'POST') => begin
+  %= form_for '/login' => ( method => 'POST' ) => begin
 
     <p><span class=label>
-    %=l 'USER_NAME'
+        %= l 'USER_NAME'
       </span><span class=input>
         %= text_field 'Username'
     </span></p>
 
-% if ( $trt ne 'RESET' ) {
+    % if ( $trt ne 'RESET' ) {
       <p><span class=label>
-    %=l 'PASSWORD'
+          %= 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 href='#' id='togglePassword' class='toggle-password tg-icon'> <img src="images/visible.png" height="16" alt="Visible"></a>
           % }
     </span></p>
-%}
+  % }
 
   %= hidden_field 'From' => $c->tx->req->url
   %= hidden_field 'Trt' => $trt
@@ -57,13 +57,13 @@
   <div class='center'>
     %= submit_button "$btn", class => 'action'
   </div>
-    %if ( config 'pwdreset' ) {
+  % if ( config 'pwdreset' ) {
     <div class='center'><a href='login2'>
-        %=l 'use_FORGOT'
+        %= l 'use_FORGOT'
     </a></div>
-    %}
+  % }
 
   % end
 
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/manual.html.ep

@@ -1,9 +1,9 @@
 % layout 'default', title => 'Sme server 2 - Manual';
 
 % content_for 'module' => begin
-<div id='module' class='module manual-panel'>
+  <div id='module' class='module manual-panel'>
     <p><h1><%= $title %></h1></p>
     %= $c->render_to_string( inline => stash 'modul' )
-</div>
+  </div>
 
 % end

root/usr/share/smanager/themes/default/templates/module.html.ep

@@ -1,8 +1,8 @@
 % layout 'default', title => "Sme server 2 - module";
 
 % content_for 'module' => begin
-%= stylesheet '/css/module.css'
+  %= stylesheet '/css/module.css'
-<div id='module' class='module module-panel'>
+  <div id='module' class='module module-panel'>
     % if (config->{debug} == 1) {
       <p>
         <strong>Debug Info:</strong>
@@ -13,14 +13,14 @@
   % if (stash 'error') {
     <div class="sme-error">
       <strong>Error:</strong><br>
-            <%= $c->render_to_string(inline => stash 'error') %>
+      <%= $c->render_to_string( inline => stash 'error' ) %>
     </div>
   % }
 
   <h1><%= $title %></h1>
 
   <div class="module-content">
-        <%= $c->render_to_string(inline => stash 'modul') %>
+    <%= $c->render_to_string( inline => stash 'modul' ) %>
   </div>
 </div>
 

root/usr/share/smanager/themes/default/templates/not_found.development.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id="central" class="sme-error module">
+  <div id="central" class="sme-error module">
     <p><br>dev<br> Oups !!!
       The page you were requesting
       "<%= $self->req->url->path || '/' %>"
@@ -10,6 +10,6 @@
       <br>dev<br>
       %= link_to Initial => '/Initial'
     </p>
-</div>
+  </div>
 
 % end

root/usr/share/smanager/themes/default/templates/partials/_dom_del.html.ep

@@ -1,15 +1,15 @@
 <div id='dom_del'>
 
   % my $btn = l('REMOVE');
-    %= form_for '/domains2' => (method => 'POST') => begin
+  %= form_for '/domains2' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'dom_REMOVE_TITLE'
+        %= l 'dom_REMOVE_TITLE'
       </h2>
     </p>
 
     <p>
-	%= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description});
+      %= $c->l( 'dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description} );
     </p>
 
     <p><b>
@@ -26,4 +26,4 @@
 
       % end
 
-</div>
+    </div>

root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep

@@ -3,7 +3,7 @@
   % my $btn = l('dom_ADD_DOMAIN');
 
 
-    %= form_for '/domains' => (method => 'POST') => begin
+  %= form_for '/domains' => ( method => 'POST' ) => begin
 
     %= l('dom_FORM_DESCRIPTION');
 
@@ -17,73 +17,77 @@
   % end
 
   <h2>
-		%=l 'dom_CURRENT_DOMAINS'
+    %= l 'dom_CURRENT_DOMAINS'
   </h2>
   <table class="sme-border TableSort"><thead>
       <tr>
         <th class='sme-border'>
-			%=l 'DOMAIN_NAME'
+          %= l 'DOMAIN_NAME'
         </th>
         <th class='sme-border'>
-			%=l 'DESCRIPTION_BRIEF'
+          %= l 'DESCRIPTION_BRIEF'
         </th>
         <th class='sme-border'>
-			%=l 'dom_CONTENT'
+          %= l 'dom_CONTENT'
         </th>
         <th class='sme-border'>
-			%=l 'dom_LABEL_NAMESERVERS'
+          %= l 'dom_LABEL_NAMESERVERS'
         </th>
         <th class='sme-border'>
-			%=l 'ACTION'
+          %= l 'ACTION'
         </th>
       </tr>
     </thead><tbody>
 
       % foreach my $domain ( @$domains ) {
         <tr>
-            %= t td => (class => 'sme-border') => $domain->{Domain}
+          %= t td => ( class => 'sme-border' ) => $domain->{Domain}
-            %= t td => (class => 'sme-border') => $domain->{'Description'}
+          %= t td => ( class => 'sme-border' ) => $domain->{'Description'}
-            %= t td => (class => 'sme-border') => $domain->{'Content'}
+          %= t td => ( class => 'sme-border' ) => $domain->{'Content'}
-            %= t td => (class => 'sme-border') => l('dom_' . $domain->{'Nameservers'})
+          %= t td => ( class => 'sme-border' ) => l( 'dom_' . $domain->{'Nameservers'} )
 
           %# my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-modify-button' title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>";
-			%my $modify_text = l('MODIFY');  # Localized text
+          % my $modify_text = l('MODIFY'); # Localized text
-			%my $csrf_token = "TOKEN";  # CSRF token for security
+          % my $csrf_token = "TOKEN"; # CSRF token for security
-			%my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
+          % my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure
-			%my $actionModify = qq{
+          % my $actionModify = qq{
-                        %       <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name">
+            % <a href="domains2?CsrfDef=$csrf_token&trt=UPD&Domain=$domain_name"
-			%	<button type='button' class='sme-modify-button' title='$modify_text' >
+            % class="sme-modify-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-			%		$modify_text
+            % title="$modify_text" aria-label="$modify_text"
-			%	</button>
+            % style="background:white;">
+            % <span class="ui-icon ui-icon-pencil"></span>
+            % <span class="ui-button-text">$modify_text</span>
             % </a>
-			%};
+        % };
-			%my $removable = ($domain->{Removable} || 'yes');
+      % my $removable = ( $domain->{Removable} || 'yes' );
-			%my $actionRemove = '&nbsp;';
+      % my $actionRemove = '&nbsp;';
-			%if ($removable eq 'yes')  { 
+      % if ($removable eq 'yes') {
-					%my $remove_text = l('REMOVE');  # Localized text
+        % my $remove_text = l('REMOVE'); # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
+        % my $csrf_token = "TOKEN"; # CSRF token for security
-					%my $domain_name = $domain->{Domain};  # Domain name extracted from the data structure
+        % my $domain_name = $domain->{Domain}; # Domain name extracted from the data structure
-					%$actionRemove = qq{
+        % $actionRemove = qq{
-                                                %       <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name">
+          % <a href="domains2?CsrfDef=$csrf_token&trt=DEL&Domain=$domain_name"
-						%	<button type='button' class='sme-remove-button' title='$remove_text' >
+          % class="sme-remove-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-						%		$remove_text
+          % title="$remove_text" aria-label="$remove_text"
-						%	</button>
+          % style="background:white;">
+          % <span class="ui-icon ui-icon-delete"></span>
+          % <span class="ui-button-text">$remove_text</span>
           % </a>
-					%};
+      % };
     %# $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-remove-button' title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
-			%};
+    % };
     <td class='sme-border' style="min-width:15em">
-				<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
+      <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %>
     </td>
   </tr>
   % }
 
-	</tbody>
+</tbody>
-   	</table>
+</table>
 
-    %= hidden_field 'trt' => 'ADD'
+%= hidden_field 'trt' => 'ADD'
 
-    %= form_for '/domains' => (method => 'POST') => begin
+%= form_for '/domains' => ( method => 'POST' ) => begin
 
   <!-- <HR class="sectionbar">-->
   <br>
@@ -96,7 +100,7 @@
 
   <p>
     <span class=label>
-		%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
+      %= l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
     </span><span class=data>
       %= $dom_datas->{forwarder}
     </span>
@@ -105,18 +109,18 @@
   % if ($dom_datas->{forwarder2}) {
     <p>
       <span class=label>
-		%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY'
+        %= l 'dom_LABEL_CORPORATE_DNS_SECONDARY'
       </span><span class=data>
         %= $dom_datas->{forwarder2}
       </span>
     </p>
   % }
 
-		<p>
+<p>
   %= submit_button "$btn2", class => 'action'
-		</p>
+</p>
-		%= hidden_field 'trt' => 'UP2'
+%= hidden_field 'trt' => 'UP2'
-    % end
+% end
 
 
 

root/usr/share/smanager/themes/default/templates/partials/_dom_up2.html.ep

@@ -2,15 +2,15 @@
 
   % my $btn = l('SAVE');
 
-    %= form_for '/domains2' => (method => 'POST') => begin
+  %= form_for '/domains2' => ( method => 'POST' ) => begin
 
     <p><br>
-	%=l 'dom_DESC_CORPORATE_DNS'
+      %= l 'dom_DESC_CORPORATE_DNS'
     </p>
 
     <p>
       <span class=label>
-	%=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
+        %= l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
       </span><span class=data>
         % param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder';
         %= text_field 'Forwarder', class => 'input'
@@ -19,7 +19,7 @@
 
     <p>
       <span class=label>
-	%=l 'dom_LABEL_CORPORATE_DNS_SECONDARY', class => 'label'
+        %= l 'dom_LABEL_CORPORATE_DNS_SECONDARY', class => 'label'
       </span><span class=data>
         % param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2';
         %= text_field 'Forwarder2', class => 'input'
@@ -32,6 +32,6 @@
 
     %= hidden_field 'trt' => $dom_datas->{trt}
 
-    %end
+  % end
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_dom_upd.html.ep

@@ -2,13 +2,13 @@
 
   % my $btn = l('ADD');
 
-    %= form_for '/domains2' => (method => 'POST') => begin
+  %= form_for '/domains2' => ( method => 'POST' ) => begin
     <p>
       <h2>
         % if ( $dom_datas->{trt} eq "ADD" ) {
-	%=l 'dom_CREATE_TITLE'
+          %= l 'dom_CREATE_TITLE'
         % } else {
-	%=l 'dom_MODIFY_TITLE'
+        %= l 'dom_MODIFY_TITLE'
         % $btn = l('MODIFY');
       % }
     </h2>
@@ -16,7 +16,7 @@
 
   <p><br>
     <span class=label>
-	%=l 'DOMAIN_NAME', class => 'label'
+      %= l 'DOMAIN_NAME', class => 'label'
     </span><span class=data>
       % if ( $dom_datas->{trt} eq "ADD" ) {
         % param 'Domain' => $dom_datas->{domain} unless param 'Domain';
@@ -30,7 +30,7 @@
 
   <p><br>
     <span class=label>
-	%=l 'DESCRIPTION_BRIEF', class => 'label'
+      %= l 'DESCRIPTION_BRIEF', class => 'label'
     </span><span class=data>
       % param 'Description' => $dom_datas->{description} unless param 'Description';
       %= text_field 'Description', class => 'input'
@@ -38,10 +38,10 @@
   </p>
 
   <p><br>
-	%=l 'dom_CONTENT_FIELD_DESCRIPTION'
+    %= l 'dom_CONTENT_FIELD_DESCRIPTION'
     <br>
     <span class=label>
-	%= $c->l('dom_CONTENT', '');
+      %= $c->l( 'dom_CONTENT', '' );
     </span><span class=data>
       % param 'Content' => $dom_datas->{content} unless param 'Content';
       %= select_field 'Content', $c->content_options_list(), class => 'input'
@@ -49,10 +49,10 @@
   </p>
 
   <p><br>
-	%=l 'dom_DESC_NAMESERVERS'
+    %= l 'dom_DESC_NAMESERVERS'
     <br>
     <span class=label>
-	%=l 'dom_LABEL_NAMESERVERS', class => 'label'
+      %= l 'dom_LABEL_NAMESERVERS', class => 'label'
     </span><span class=data>
       % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers';
       %= select_field 'Nameservers', $c->nameserver_options_list(), class => 'input'
@@ -65,6 +65,6 @@
 
   %= hidden_field 'trt' => $dom_datas->{trt}
 
-    %end
+  % end
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep

@@ -1,14 +1,14 @@
 <div id="footer" class="module">
-<!--<HR class="sme-copyrightbar">-->
+  <!--<HR class="sme-copyrightbar">-->
-<a href="https://mojolicious.org" target="_blank"><img src="images/sme-mojo-logo-white.png" style="position:relative;"></a>
+  <a href="https://mojolicious.org" target="_blank"><img src="images/sme-mojo-logo-white.png" style="position:relative;"></a>
-<font class="sme-copyright">
+  <font class="sme-copyright">
-%	if ( $c->is_logged_in && $c->is_admin) {
+    % if ( $c->is_logged_in && $c->is_admin) {
       SME Server <%= session 'releaseVersion' %>-<%= $c->app->VERSION %> Manager II
       % my $mode;
-	% if (config->{mode} eq 'development'){ $mode = '-dev';} else { $mode = '';}
+      % if ( config->{mode} eq 'development' ) { $mode = '-dev'; } else { $mode = ''; }
       (Mojo:<%= Mojolicious->VERSION %><%= $mode %>)
-% }
+    % }
-<br>Copyright 1999-2006 Mitel Corporation<br>
+    <br>Copyright 1999-2006 Mitel Corporation<br>
-%= session 'copyRight'
+    %= session 'copyRight'
-<br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
+    <br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
-</font>
+  </font>

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

@@ -2,26 +2,26 @@
 
   % my $btn = l('ADD');
 
-    %= form_for '/groups2' => (method => 'POST') => begin
+  %= form_for '/groups2' => ( method => 'POST' ) => begin
     <p><h2>
-	%=l 'CREATE_GROUP'
+        %= l 'CREATE_GROUP'
       </h2><br><br>
-	%=l 'grp_GROUP_NAMING'
+      %= l 'grp_GROUP_NAMING'
     </p>
 
     <p>
       <span class=label>
-	%=l 'GROUP_NAME', class => 'label'
+        %= l 'GROUP_NAME', class => 'label'
       </span><span class=data>
         %= text_field 'groupName', class => 'input'
       </span>
     </p>
 
     <p>
-	%=l 'grp_GROUP_DESC_EXPL'
+      %= l 'grp_GROUP_DESC_EXPL'
       <br><br>
       <span class=label>
-	%=l 'grp_GROUP_DESC', class => 'label'
+        %= l 'grp_GROUP_DESC', class => 'label'
       </span><span class=data>
         %= text_field 'groupDesc', class => 'input'
       </span>
@@ -29,7 +29,7 @@
 
     <p>
       <span class=label>
-	%=l 'GROUP_MEMBERS', class => 'label'
+        %= l 'GROUP_MEMBERS', class => 'label'
       </span>
       <br>
       <span class=data>
@@ -40,7 +40,7 @@
         % foreach my $key ( sort keys %$users )
         % {
           %= check_box 'groupMembers' => $key
-	    %=$users->{$key}
+          %= $users->{$key}
           %= "(" . $key . ")"
           <br>
         % }

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

@@ -1,29 +1,29 @@
 <div id='grp_del'>
 
   % my $btn = l('REMOVE');
-    %= form_for '/groups2' => (method => 'POST') => begin
+  %= form_for '/groups2' => ( method => 'POST' ) => begin
     <p><h2>
-	%=l 'REMOVE_USER_GROUP'
+        %= l 'REMOVE_USER_GROUP'
       </h2>
 
       <p>
-	%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) 
+        %= l( 'grp_DELETE_DESCRIPTION', $grp_datas->{group} )
       </p>
 
       <p>
         % my $size = keys %$members;
         % if ( ! $size ){
-        %=l 'ACCOUNT_GROUP_NONE'
+          %= l 'ACCOUNT_GROUP_NONE'
         % } else {
-	%=l 'grp_GROUP_HAS_MEMBERS'
+        %= l 'grp_GROUP_HAS_MEMBERS'
         <br>
         <ul>
-    %    foreach my $key ( keys %$members)
+          % foreach my $key ( keys %$members )
           % {
             <li>
-            %=$key
+              %= $key
               (
-            %=$members->{$key}
+              %= $members->{$key}
               )
             </li>
           % }
@@ -34,15 +34,15 @@
     <p>
       % $size = keys %$ibays;
       % if ( $size ) {
-    	    %=l 'grp_IBAYS_WILL_BE_CHANGED'
+        %= l 'grp_IBAYS_WILL_BE_CHANGED'
         <br>
         <ul>
-    %		foreach my $key (sort ( keys %$ibays ))
+          % foreach my $key ( sort ( keys %$ibays ) )
           % {
             <li>
-        	    %=$key
+              %= $key
               (
-        	    %=$ibays->{$key}
+              %= $ibays->{$key}
               )
             </li>
           % }
@@ -60,4 +60,4 @@
 
     % end
 
-</div>
+  </div>

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

@@ -2,7 +2,7 @@
 
   % my $btn = l('GROUP_ADD');
 
-    %= form_for '/groups' => (method => 'POST') => begin
+  %= form_for '/groups' => ( method => 'POST' ) => begin
 
     %= hidden_field 'trt' => 'ADD'
 
@@ -13,60 +13,64 @@
 
 
   <p>	<h2>
-	%=l 'grp_CURRENT_LIST'
+      %= l 'grp_CURRENT_LIST'
     </h2><br><br>
     % my $numGroups = @$groups;
     % if ($numGroups == 0){
-        %=l 'ACCOUNT_GROUP_NONE'
+      %= l 'ACCOUNT_GROUP_NONE'
     % } else {
     <table class="sme-border TableSort"><thead>
         <tr>
           <th class='sme-border'>
-    	    %=l 'GROUP'
+            %= l 'GROUP'
           </th>
           <th class='sme-border'>
-    	    %=l 'DESCRIPTION'
+            %= l 'DESCRIPTION'
           </th>
           <th class='sme-border'>
-				%=l 'ACTION'
+            %= l 'ACTION'
           </th>
         </tr>
       </thead><tbody>
 
-    %    foreach my $group ( @$groups )
+        % foreach my $group (@$groups)
         % {
           <tr>
-            %= t td => (class => 'sme-border') => $group->key
+            %= t td => ( class => 'sme-border' ) => $group->key
-            %= t td => (class => 'sme-border') => $group->prop('Description')
+            %= t td => ( class => 'sme-border' ) => $group->prop('Description')
             <td class='sme-border' style="min-width:15em">
-				%my $modify_text = l('MODIFY');  # Localized text
+              % my $modify_text = l('MODIFY'); # Localized text
-				%my $csrf_token = "TOKEN";  # CSRF token for security
+              % my $csrf_token = "TOKEN"; # CSRF token for security
-				%my $group_name = $group->key;  # group name extracted from the data structure
+              % my $group_name = $group->key; # group name extracted from the data structure
-				%my $actionModify = qq{
+              % my $actionModify = qq{
-                                %       <a href="groups2?CsrfDef=$csrf_token&trt=UPD&group=$group_name">
+                % <a href="groups2?CsrfDef=$csrf_token&trt=UPD&group=$group_name"
-				%	<button type='button' class='sme-modify-button' title='$modify_text' >
+                % class="sme-modify-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-				%		$modify_text
+                % title="$modify_text" aria-label="$modify_text"
-				%	</button>
+                % style="background:white;">
+                % <span class="ui-icon ui-icon-pencil"></span>
+                % <span class="ui-button-text">$modify_text</span>
                 % </a>
-				%};
+            % };
-				%my $remove_text = l('REMOVE');  # Localized text
+          % my $remove_text = l('REMOVE'); # Localized text
-				%my $csrf_token = "TOKEN";  # CSRF token for security
+          % my $csrf_token = "TOKEN"; # CSRF token for security
-				%my $group_name = $group->key;  # group name extracted from the data structure
+          % my $group_name = $group->key; # group name extracted from the data structure
-				%my $actionRemove = qq{
+          % my $actionRemove = qq{
-                                %       <a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name">
+            % <a href="groups2?CsrfDef=$csrf_token&trt=DEL&group=$group_name"
-				%	<button type='button' class='sme-remove-button' title='$remove_text' > 
+            % class="sme-remove-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-				%		$remove_text
+            % title="$remove_text" aria-label="$remove_text"
-				%	</button>
+            % style="background:white;">
+            % <span class="ui-icon ui-icon-delete"></span>
+            % <span class="ui-button-text">$remove_text</span>
             % </a>
-				%};
+        % };
-				<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
+        <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %>
       </td>
     </tr>
     % }
   </tbody>
-    	</table>
+</table>
-	<%} %>
+<% } %>
-	</p>
+</p>
 
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_grp_upd.html.ep

@@ -2,25 +2,25 @@
 
   % my $btn = l('SAVE');
 
-    %= form_for '/groups2' => (method => 'POST') => begin
+  %= form_for '/groups2' => ( method => 'POST' ) => begin
 
     <p><h2>
-	%=l 'MODIFY_USER_GROUP'
+        %= l 'MODIFY_USER_GROUP'
       </h2><br></p>
 
     <p>
       <span class=label>
-	%=l 'GROUP_NAME', class => 'label'
+        %= l 'GROUP_NAME', class => 'label'
       </span><span class=data>
         %= $grp_datas->{group}, class => 'data'
       </span>
     </p>
 
     <p>
-	%=l 'grp_GROUP_DESC_EXPL'
+      %= l 'grp_GROUP_DESC_EXPL'
       <br><br>
       <span class=label>
-	%=l 'grp_GROUP_DESC', class => 'label'
+        %= l 'grp_GROUP_DESC', class => 'label'
       </span><span class=data>
         % param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc';
         %= text_field 'groupDesc', class => 'input'
@@ -29,15 +29,15 @@
 
     <p>
       <span class=label>
-	%=l 'GROUP_MEMBERS', class => 'label'
+        %= l 'GROUP_MEMBERS', class => 'label'
       </span>
       <br>
       <span class=data>
         % if ( $members->{'admin'} ) {
           %= check_box 'groupMembers', value => 'admin', checked => undef
-	%} else {
+        % } else {
         %= check_box 'groupMembers' => 'admin'
-	%}
+      % }
       Administrator (admin)
       <br>
 
@@ -47,10 +47,10 @@
         % if ( $members->{ $key } ) {
           <!-- % = check_box 'groupMembers', value => $key, checked => 'checked' -->
           <input type='checkbox' name='groupMembers' checked value='<%= $key %>'>
-	    %} else {
+        % } else {
         %= check_box 'groupMembers' => $key
-	    %}
+      % }
-	    %=$users->{$key} . " (" . $key . ")"
+      %= $users->{$key} . " (" . $key . ")"
       <br>
       % }
     </span>

root/usr/share/smanager/themes/default/templates/partials/_header.html.ep

@@ -2,9 +2,10 @@
 <div id="header2" class="hd2 module gradient-panel">
   <img src="images/KoozaliServerManager.png" alt="Koozali Logo" class="logo" >
   % if ( not defined $c->session->{username} ) {
-		<button type='button' class="login-button"><a class = "no-visited-state" target="_parent" href="login">Login</a></button>
+		<a class="login-button no-visited-state" target="_parent" href="/smanager/login">Login</a>
   % } else {
-		<button type='button' class="login-button"><a class = "no-visited-state" target="_parent" href="logout">Logout <%= $c->session->{username} %></a></button>
+  <!--><button type='button' class="login-button"><a class = "no-visited-state" target="_parent" href="/smanager/logout">Logout <%= $c->session->{username} %></a></button>-->
+		<a class="login-button no-visited-state" target="_parent" href="/smanager/logout">Logout <%= $c->session->{username} %></a>
   % }
   <div id="flag-container" class = "flag-style">
     <!--			 The flag icon will be inserted here -->

root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep

@@ -1,19 +1,19 @@
 <div id='hos_del'>
 
   % my $btn = l('REMOVE');
-    %= form_for '/hostentriesd' => (method => 'POST') => begin
+  %= form_for '/hostentriesd' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'hos_REMOVE_TITLE'
+        %= l 'hos_REMOVE_TITLE'
       </h2>
     </p>
 
     <p>
-	%= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname});
+      %= $c->l( 'hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname} );
     </p>
 
     <p><b>
-	%=l 'hos_ABOUT_TO_REMOVE'
+        %= l 'hos_ABOUT_TO_REMOVE'
     </b></p>
 
     <p>

root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep

@@ -2,7 +2,7 @@
 
   % my $btn = l('hos_ADD_HOSTNAME');
 
-    %= form_for '/hostentries' => (method => 'POST') => begin
+  %= form_for '/hostentries' => ( method => 'POST' ) => begin
 
     <p>
       %= submit_button "$btn", class => 'action'
@@ -16,69 +16,73 @@
   % foreach my $domain ( sort ( keys %dom_hos ) ) {
 
     <p><br><b>
-	%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
+        %= $c->l( 'hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain );
       </b><br></p>
 
     <table class="sme-border TableSort"><thead>
         <tr>
           <th class='sme-border'>
-    	    %=l 'hos_HOSTNAME'
+            %= l 'hos_HOSTNAME'
           </th>
           <th class='sme-border'>
-    	    %=l 'hos_HOSTTYPE'
+            %= l 'hos_HOSTTYPE'
           </th>
           <th class='sme-border'>
-    	    %=l 'IP_ADDRESS_OR_FQDN'
+            %= l 'IP_ADDRESS_OR_FQDN'
           </th>
           <th class='sme-border'>
-    	    %=l 'hos_ETHERNET_ADDRESS'
+            %= l 'hos_ETHERNET_ADDRESS'
           </th>
           <th class='sme-border'>
-    	    %=l 'COMMENT'
+            %= l 'COMMENT'
           </th>
           <th class='sme-border'>
-    	    %=l 'ACTION'
+            %= l 'ACTION'
           </th>
         </tr>
       </thead><tbody>
 
         % foreach (@{$dom_hos{$domain}{'HOSTS'}}) {
           <tr>
-            %= t td => (class => 'sme-border') => $_->{'HostName'};
+            %= t td => ( class => 'sme-border' ) => $_->{'HostName'};
-            %= t td => (class => 'sme-border') => $_->{'HostType'};
+            %= t td => ( class => 'sme-border' ) => $_->{'HostType'};
-            %= t td => (class => 'sme-border') => $_->{'IP'};
+            %= t td => ( class => 'sme-border' ) => $_->{'IP'};
-            %= t td => (class => 'sme-border') => $_->{'MACAddress'};
+            %= t td => ( class => 'sme-border' ) => $_->{'MACAddress'};
-            %= t td => (class => 'sme-border') => $_->{'Comment'};
+            %= t td => ( class => 'sme-border' ) => $_->{'Comment'};
             <td class='sme-border' style="min-width:15em">
-				%my ($actionModify, $actionRemove) = '&nbsp;';
+              % my ( $actionModify, $actionRemove ) = '&nbsp;';
-				%my $static = $_->{'static'} || "no";
+              % my $static = $_->{'static'} || "no";
-				%if ($static ne 'yes') {
+              % if ($static ne 'yes') {
-					%my $modify_text = l('MODIFY');  # Localized text
+                % my $modify_text = l('MODIFY'); # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
+                % my $csrf_token = "TOKEN"; # CSRF token for security
-					%my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
+                % my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure
-					%$actionModify = qq{
+                % $actionModify = qq{
-                                        %       <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name">
+                  % <a href="hostentriesd?CsrfDef=$csrf_token&trt=UPD&Hostname=$hostentries_name"
-					%	<button type='button' class='sme-modify-button' title='$modify_text' > 
+                  % class="sme-modify-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-					%		$modify_text
+                  % title="$modify_text" aria-label="$modify_text"
-					%	</button>
+                  % style="background:white;">
+                  % <span class="ui-icon ui-icon-pencil"></span>
+                  % <span class="ui-button-text">$modify_text</span>
                   % </a>
-					%};
+              % };
-					%my $remove_text = l('REMOVE');  # Localized text
+            % my $remove_text = l('REMOVE'); # Localized text
-					%$csrf_token = "TOKEN";  # CSRF token for security
+            % $csrf_token = "TOKEN"; # CSRF token for security
-					%#my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
+            %# my $hostentries_name = $_->{'HostName'};  # hostentries name extracted from the data structure
-					%$actionRemove = qq{
+            % $actionRemove = qq{
-                                        %       <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name">
+              % <a href="hostentriesd?CsrfDef=$csrf_token&trt=DEL&Hostname=$hostentries_name"
-					%	<button type='button' class='sme-remove-button' title='$remove_text' >
+              % class="sme-remove-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-					%		$remove_text
+              % title="$remove_text" aria-label="$remove_text"
-					%	</button>
+              % style="background:white;">
+              % <span class="ui-icon ui-icon-delete"></span>
+              % <span class="ui-button-text">$remove_text</span>
               % </a>
-					%};
+          % };
-				%}
+      % }
-				<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
+      <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %>
     </td>
   </tr>
   % }
-   	</tbody>
+</tbody>
-   	</table>
+</table>
-     %	}
+% }
 </div>

root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep

@@ -1,29 +1,29 @@
 <div id='hos_ulc'>
-<!--	UPDATE HOST TYPE -->
+  <!--	UPDATE HOST TYPE -->
 
   % my $btn = l('NEXT');
 
-    %= form_for '/hostentriesd' => (method => 'POST') => begin
+  %= form_for '/hostentriesd' => ( method => 'POST' ) => begin
     <p><h2>
         % if ( $hos_datas->{trt} eq "ALC" ) {
-	%=l 'hos_CREATE_TYPE'
+          %= l 'hos_CREATE_TYPE'
         % } else {
-	%=l 'hos_MODIFY_TYPE'
+        %= l 'hos_MODIFY_TYPE'
         % $btn = l('MODIFY');
       % }
   </h2></p>
 
   <p>
-	%=l 'hos_LOCAL_PAGE_DESCRIPTION'
+    %= l 'hos_LOCAL_PAGE_DESCRIPTION'
   </p>
 
   <p>
-	%=l 'hos_LOCAL_IP_DESCRIPTION'
+    %= l 'hos_LOCAL_IP_DESCRIPTION'
   </p>
 
   <p>
     <span class=label>
-	%=l 'hos_LOCAL_IP', class => 'label'
+      %= l 'hos_LOCAL_IP', class => 'label'
     </span><span class=data>
       % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip';
       %= text_field 'Internalip', class => 'input'
@@ -31,12 +31,12 @@
   </p>
 
   <p>
-	%=l 'hos_ETHERNET_ADDRESS_DESCRIPTION'
+    %= l 'hos_ETHERNET_ADDRESS_DESCRIPTION'
   </p>
 
   <p>
     <span class=label>
-	%=l 'hos_ETHERNET_ADDRESS', class => 'label'
+      %= l 'hos_ETHERNET_ADDRESS', class => 'label'
     </span><span class=data>
       % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress';
       %= text_field 'Macaddress', class => 'input'
@@ -51,10 +51,10 @@
   %= hidden_field 'Hostname' => $hos_datas->{hostname}
   %= hidden_field 'Name' => $hos_datas->{name}
   %= hidden_field 'Domain' => $hos_datas->{domain}
-	%= hidden_field 'Comment'=> $hos_datas->{comment}
+  %= hidden_field 'Comment' => $hos_datas->{comment}
-	%= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
+  %= hidden_field 'Hosttype' => $hos_datas->{hosttype}
   %= hidden_field 'Externalip' => $hos_datas->{externalip}
 
-    %end
+  % end
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep

@@ -2,23 +2,23 @@
 
   % my $btn = l('NEXT');
 
-    %= form_for '/hostentriesd' => (method => 'POST') => begin
+  %= form_for '/hostentriesd' => ( method => 'POST' ) => begin
     <p><h2>
         % if ( $hos_datas->{trt} eq "ADD" ) {
-	%=l 'hos_CREATE_TITLE'
+          %= l 'hos_CREATE_TITLE'
         % } else {
-	%=l 'hos_MODIFY_TITLE'
+        %= l 'hos_MODIFY_TITLE'
         % $btn = l('MODIFY');
       % }
   </h2></p>
 
   <p>
-	%=l 'hos_HOSTNAME_DESCRIPTION'
+    %= l 'hos_HOSTNAME_DESCRIPTION'
   </p>
 
   <p>
     <span class=label>
-	%=l 'hos_HOSTNAME', class => 'label'
+      %= l 'hos_HOSTNAME', class => 'label'
     </span><span class=data>
       % if ( $hos_datas->{trt} eq "ADD" ) {
         % param 'Name' => $hos_datas->{name} unless param 'Name';
@@ -32,7 +32,7 @@
 
   <p>
     <span class=label>
-	%=l 'DOMAIN', class => 'label'
+      %= l 'DOMAIN', class => 'label'
     </span><span class=data>
       % if ( $hos_datas->{trt} eq "ADD" ) {
         % param 'Domain' => $hos_datas->{domain} unless param 'Domain';
@@ -46,7 +46,7 @@
 
   <p>
     <span class=label>
-	%= $c->l('COMMENT', '');
+      %= $c->l( 'COMMENT', '' );
     </span><span class=data>
       % param 'Comment' => $hos_datas->{comment} unless param 'Comment';
       %= text_field 'Comment', class => 'input'
@@ -55,7 +55,7 @@
 
   <p>
     <span class=label>
-	%=l 'LOCATION', class => 'label'
+      %= l 'LOCATION', class => 'label'
     </span><span class=data>
       % param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype';
       %= select_field 'Hosttype', $c->hosttype_list(), class => 'input'
@@ -72,6 +72,6 @@
   %= hidden_field 'Externalip' => $hos_datas->{externalip}
   %= hidden_field 'Macaddress' => $hos_datas->{macaddress}
 
-    %end
+  % end
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep

@@ -1,17 +1,17 @@
 <div id='hos_urm'>
-<!--	UPDATE HOST TYPE -->
+  <!--	UPDATE HOST TYPE -->
 
   % my $btn = l('MODIFY');
 
-    %= form_for '/hostentriesd' => (method => 'POST') => begin
+  %= form_for '/hostentriesd' => ( method => 'POST' ) => begin
 
     <p>
-	%=l 'hos_REMOTE_PAGE_DESCRIPTION'
+      %= l 'hos_REMOTE_PAGE_DESCRIPTION'
     </p>
 
     <p>
       <span class=label>
-	%=l 'IP_ADDRESS_OR_FQDN', class => 'label'
+        %= l 'IP_ADDRESS_OR_FQDN', class => 'label'
       </span><span class=data>
         % param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip';
         %= text_field 'Externalip', class => 'input'
@@ -27,11 +27,11 @@
     %= hidden_field 'Hostname' => $hos_datas->{hostname}
     %= hidden_field 'Name' => $hos_datas->{name}
     %= hidden_field 'Domain' => $hos_datas->{domain}
-	%= hidden_field 'Comment'=> $hos_datas->{comment}
+    %= hidden_field 'Comment' => $hos_datas->{comment}
-	%= hidden_field 'Hosttype'=> $hos_datas->{hosttype}
+    %= hidden_field 'Hosttype' => $hos_datas->{hosttype}
     %= hidden_field 'Internalip' => $hos_datas->{internalip}
     %= hidden_field 'Macaddress' => $hos_datas->{macaddress}
 
-    %end
+  % end
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_iba_del.html.ep

@@ -1,13 +1,13 @@
 <div id='iba_del'>
 
   % my $btn = l('REMOVE');
-    %= form_for '/ibaysd' => (method => 'POST') => begin
+  %= form_for '/ibaysd' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'iba_REMOVE_TITLE'
+        %= l 'iba_REMOVE_TITLE'
       </h2>
       <br>
-	%= $c->render_to_string(inline => l('iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description}));
+      %= $c->render_to_string( inline => l( 'iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description} ) );
       <br>
     </p>
     <p>

root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep

@@ -3,7 +3,7 @@
 
   % my $btn = l('iba_ADD_IBAY');
 
-    %= form_for '/ibays' => (method => 'POST') => begin
+  %= form_for '/ibays' => ( method => 'POST' ) => begin
 
     <p>
       <br>
@@ -14,24 +14,24 @@
   % end
 
   <p>
-	%=l 'iba_FIRSTPAGE_DESC'
+    %= l 'iba_FIRSTPAGE_DESC'
     <br><br>
   </p>
 
   % my $numIbays = @$ibays;
   % if ($numIbays == 0){
-        %=l 'iba_NO_IBAYS'
+    %= l 'iba_NO_IBAYS'
   % } else {
   <table class="sme-border TableSort"><thead>
       <tr>
         <th class='sme-border'>
-    	    %=l 'NAME'
+          %= l 'NAME'
         </th>
         <th class='sme-border'>
-    	    %=l 'DESCRIPTION'
+          %= l 'DESCRIPTION'
         </th>
         <th class='sme-border'>
-				%=l 'ACTION'
+          %= l 'ACTION'
         </th>
       </tr>
     </thead><tbody>
@@ -44,68 +44,74 @@
         % qw(local-pw global-pw global-pw-remote);
 
         <tr>
-            %= t td => (class => 'sme-border') => $ibay->key
+          %= t td => ( class => 'sme-border' ) => $ibay->key
-            %= t td => (class => 'sme-border') => $ibay->prop('Name')
+          %= t td => ( class => 'sme-border' ) => $ibay->prop('Name')
           <td class='sme-border' style="min-width:15em">
-				%my ($actionModify, $actionResetPw, $actionRemove) = '&nbsp;';
+            % my ( $actionModify, $actionResetPw, $actionRemove ) = '&nbsp;';
-				%if ($modifiable eq 'yes') { 
+            % if ($modifiable eq 'yes') {
-					%my $modify_text = l('MODIFY');  # Localized text
+              % my $modify_text = l('MODIFY'); # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
+              % my $csrf_token = "TOKEN"; # CSRF token for security
-					%my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
+              % my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure
-					%$actionModify = qq{
+              % $actionModify = qq{
-                                        %       <a href="ibaysd?CsrfDef=$csrf_token&trt=UPD&ibay=$ibays_entry_name">
+                % <a href="ibaysd?CsrfDef=$csrf_token&trt=UPD&ibay=$ibays_entry_name"
-					%	<button type='button' class='sme-modify-button' title='$modify_text' > 
+                % class="sme-modify-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-					%		$modify_text
+                % title="$modify_text" aria-label="$modify_text"
-					%	</button>
+                % style="background:white;">
+                % <span class="ui-icon ui-icon-pencil"></span>
+                % <span class="ui-button-text">$modify_text</span>
                 % </a>
-					%};
+            % };
-				%}
+        % }
 
-				%if ($passwordable eq 'yes')  { 
+        % if ($passwordable eq 'yes') {
-					%my $password_text = l('PASSWORD_RESET');  # Localized text
+          % my $password_text = l('PASSWORD_RESET'); # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
+          % my $csrf_token = "TOKEN"; # CSRF token for security
-					%my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
+          % my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure
-					%if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
+          % if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
-						%$actionResetPw = qq{
+            % $actionResetPw = qq{
               % <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
                 % <button type='button' class='sme-password-button unset' title="$password_text - currently unset" style = background:pink; >
                   % $password_text
                   % </button>
                 % </a>
-						%};
+            % };
-					%} else {
+        % } else {
-						%$actionResetPw = qq{
+        % $actionResetPw = qq{
-                                                %       <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name">
+          % <a href="ibaysd?CsrfDef=$csrf_token&trt=PWD&ibay=$ibays_entry_name"
-						%	<button type='button' class='sme-password-button' title='$password_text' > 
+          % class="sme-password-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-						%		$password_text
+          % title="$password_text" aria-label="$password_text"
-						%	</button>
+          % style="background:white;">
+          % <span class="ui-icon ui-icon-refresh"></span>
+          % <span class="ui-button-text">$password_text</span>
           % </a>
-						%};
+      % };
-					%}
-					
-				%}
-
-				%if ($removable eq 'yes')  { 
-					%my $remove_text = l('REMOVE');  # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
-					%my $ibays_entry_name = $ibay->key;  # ibays_entry name extracted from the data structure
-					%$actionRemove = qq{
-                                        %       <a href="ibaysd?CsrfDef=$csrf_token&trt=DEL&ibay=$ibays_entry_name">
-					%	<button type='button' class='sme-remove-button' title='$remove_text' >
-					%		$remove_text
-					%	</button>
-                                        %       </a>
-					%};
-				%}
-				<%= $c->render_to_string(inline => $actionModify) %>
-				<%= $c->render_to_string(inline => $actionResetPw)%>
-				<%= $c->render_to_string(inline => $actionRemove) %>
-    	    </td>
-   	</tr>
       % }
-    	</tbody>
+
-    	</table>
+      % }
-	<%} %>
+
+      % if ($removable eq 'yes') {
+        % my $remove_text = l('REMOVE'); # Localized text
+        % my $csrf_token = "TOKEN"; # CSRF token for security
+        % my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure
+        % $actionRemove = qq{
+          % <a href="ibaysd?CsrfDef=$csrf_token&trt=DEL&ibay=$ibays_entry_name"
+          % class="sme-remove-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
+          % title="$remove_text" aria-label="$remove_text"
+          % style="background:white;">
+          % <span class="ui-icon ui-icon-delete"></span>
+          % <span class="ui-button-text">$remove_text</span>
+          % </a>
+      % };
+    % }
+    <%= $c->render_to_string( inline => $actionModify ) %>
+    <%= $c->render_to_string( inline => $actionResetPw ) %>
+    <%= $c->render_to_string( inline => $actionRemove ) %>
+  </td>
+</tr>
+% }
+</tbody>
+</table>
+<% } %>
 
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_iba_pwd.html.ep

@@ -2,30 +2,30 @@
 
   % my $btn = l('SAVE');
 
-    %= form_for '/ibaysd' => (method => 'POST') => begin
+  %= form_for '/ibaysd' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'PASSWORD_RESET'
+        %= l 'PASSWORD_RESET'
       </h2>
 
       <br><br>
-	%=l 'iba_PASSWORD_DESC'
+      %= l 'iba_PASSWORD_DESC'
       %= $iba_datas->{ibay}
     </p>
 
     <p>
       <span class=label>
-	%=l 'PASSWORD_NEW', class => 'label'
+        %= l 'PASSWORD_NEW', class => 'label'
       </span><span class=data>
-	%= password_field 'newPass', class => 'input' , class=>'sme-password'
+        %= password_field 'newPass', class => 'input', class => 'sme-password'
       </span>
     </p>
 
     <p>
       <span class=label>
-	%=l 'PASSWORD_VERIFY_NEW', class => 'label'
+        %= l 'PASSWORD_VERIFY_NEW', class => 'label'
       </span><span class=data>
-	%= password_field 'newPassVerify', class => 'input', class=>'sme-password'
+        %= password_field 'newPassVerify', class => 'input', class => 'sme-password'
       </span>
     </p>
 

root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep

@@ -3,18 +3,18 @@
 
   % my $btn = l('ADD');
 
-    %= form_for '/ibaysd' => (method => 'POST') => begin
+  %= form_for '/ibaysd' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'iba_ADD_TITLE'
+        %= l 'iba_ADD_TITLE'
       </h2>
       <br>
-	%=l 'iba_NAME_FIELD_DESC'
+      %= l 'iba_NAME_FIELD_DESC'
     </p>
 
     <p>
       <span class=label>
-	%=l 'iba_NAME_LABEL', class => 'label'
+        %= l 'iba_NAME_LABEL', class => 'label'
       </span><span class=data>
         % if ( $iba_datas->{trt} eq 'ADD' ) {
           % param 'ibay' => $iba_datas->{ibay} unless param 'ibay';
@@ -28,7 +28,7 @@
 
   <p>
     <span class=label>
-	%=l 'DESCRIPTION', class => 'label'
+      %= l 'DESCRIPTION', class => 'label'
     </span><span class=data>
       % param 'ibayDesc' => $iba_datas->{description} unless param 'ibayDesc';
       %= text_field 'ibayDesc', class => 'input'
@@ -37,7 +37,7 @@
 
   <p>
     <span class=label>
-	%=l 'GROUP'
+      %= l 'GROUP'
     </span><span class=data>
       % param 'group' => $iba_datas->{group} unless param 'group';
       %= select_field 'group' => $c->group_list_m(), class => 'input'
@@ -47,7 +47,7 @@
 
   <p>
     <span class=label>
-	%=l 'iba_USER_ACCESS'
+      %= l 'iba_USER_ACCESS'
     </span><span class=data>
       % param 'userAccess' => $iba_datas->{userAccess} unless param 'userAccess';
       %= select_field 'userAccess' => $c->userAccess_list_m(), class => 'input'
@@ -58,7 +58,7 @@
 
   <p>
     <span class=label>
-	%=l 'iba_PUBLIC_ACCESS'
+      %= l 'iba_PUBLIC_ACCESS'
     </span><span class=data>
       % param 'publicAccess' => $iba_datas->{publicAccess} unless param 'publicAccess';
       %= select_field 'publicAccess' => $c->publicAccess_list_m(), class => 'input'
@@ -68,20 +68,20 @@
 
   <p>
     <span class=label>
-	%=l 'iba_ALLOW_DYNAMIC_CONTENT'
+      %= 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>
 
   <p>
     <span class=label>
-	%=l 'iba_HTTPS_Only'
+      %= 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>

root/usr/share/smanager/themes/default/templates/partials/_info.html.ep

@@ -4,7 +4,7 @@
     <div class="sme-error module"><h5>
         Warning: you have not yet changed the default system password.</h5></div>
   <% } %>
-    <% if ( $c->is_unsafe ) { %>
+  <% if ( $c->is_unsafe && $c->is_logged_in && $c->is_admin) { %>
     <div class="sme-error module"><h5>
         Warning: a reconfigure and reboot is required before proceeding! Failure to do so now
         may leave your system in an unknown state!</h5></div>
@@ -21,5 +21,5 @@
         Please migrate IMMEDIATELY to Koozali SME Server 12 or higher version. Failure to upgrade may lead to the compromise of this server.
       </br>Please, consult <a href="https://wiki.koozali.org/SME_Server:Download" target="_blank">https://wiki.koozali.org/SME_Server:Download</a> to get the latest version
   </h5></div>
-    <% } %>
+<% } %>
 </div>

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

@@ -1,9 +1,9 @@
 <div id='ln_add'>
 
-	% my $retref= $c->stash("ret");
+  % my $retref = $c->stash("ret");
-	% my %ret = $retref ? %$retref : (ret => "");
+  % my %ret = $retref ? %$retref : ( ret => "" );
-	% my @vars = split(/,/, $ret{vars} // '');
+  % my @vars = split( /,/, $ret{vars} // '' );
-	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
+  % my ( $var1, $var2, $var3, $var4, $var5, $var6, $var7 ) = @vars;
 
   % if ($c->app->config->{debug}) {
     <p>
@@ -12,16 +12,16 @@
   % }
 
   % if ($ret{ret} eq "") {
-		%=l "ln_FIRSTPAGE_DESC"
+    %= l "ln_FIRSTPAGE_DESC"
   % } elsif (index($ret{ret},"SUCCESS") != -1) {
   <br>
   <div class='success'>
-		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+    %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) )
   </div>
   % } else {
   <br>
   <div class='sme-error'>
-		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+    %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) )
   </div>
   % }
   <br />
@@ -35,33 +35,33 @@
     </p>
   % }
 
-    %= form_for '/localnetworksb' => (method => 'POST') => begin
+  %= form_for '/localnetworksb' => ( method => 'POST' ) => begin
     <h2>
-		%=l "ln_ADD_TITLE"
+      %= l "ln_ADD_TITLE"
     </h2>
     <p>
-			%= $c->render_to_string(inline => l('ln_ADD_DESC'));
+      %= $c->render_to_string( inline => l('ln_ADD_DESC') );
     </p><br>
     <span class=label>
-				%=l "NETWORK"
+      %= l "NETWORK"
     </span><span class=data>
-				%=text_field  'networkAddress'
+      %= text_field 'networkAddress'
     </span><br><br>
     <span class=label>
-				%=l "ln_SUBNET_MASK"
+      %= l "ln_SUBNET_MASK"
     </span><span class=data>
-				%=text_field 'networkMask'
+      %= text_field 'networkMask'
     </span><br><br>
     <span class=label>
-				%=l "ROUTER"
+      %= l "ROUTER"
     </span>
     <span class=data>
-				%=text_field 'networkRouter'
+      %= text_field 'networkRouter'
     </span><br><br>
     <p>
       <br>
       %= submit_button "$btn", class => 'action'
     </p>
-	%end
+  % end
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_ln_del.html.ep

@@ -14,46 +14,46 @@
     </pre>
   % }
 
-    %= form_for '/localnetworkse' => (method => 'POST') => begin
+  %= form_for '/localnetworkse' => ( method => 'POST' ) => begin
     <h2>
-		%=l "ln_REMOVE_TITLE"
+      %= l "ln_REMOVE_TITLE"
     </h2>
     <p>
-				%=l "ln_REMOVE_DESC"
+      %= l "ln_REMOVE_DESC"
     </p><br>
     <span class=label>
-				%=l "NETWORK"
+      %= l "NETWORK"
     </span><span class=data>
-				%=$localnetwork
+      %= $localnetwork
     </span><br><br>
     <span class=label>
-				%=l "ln_SUBNET_MASK"
+      %= l "ln_SUBNET_MASK"
     </span><span class=data>
       %= $subnet
     </span><br><br>
     <span class=label>
-				%=l "ROUTER"
+      %= l "ROUTER"
     </span>
     <span class=data>
       %= $router
     </span><br><br>
     % if($deletehosts) {
       <br>
-			%=$c->l("ln_REMOVE_HOSTS_DESC")
+      %= $c->l("ln_REMOVE_HOSTS_DESC")
       <br>
       <span class=label>
         %= $c->l("ln_REMOVE_HOSTS_LABEL")
       </span>
       <span class= data>
-				%=check_box deletehost=>1, checked=>1
+        %= check_box deletehost => 1, checked => 1
       </span><br><br>
-			%}
+    % }
-			%= hidden_field localnetwork=>$localnetwork
+  %= hidden_field localnetwork => $localnetwork
   <p>
     <br>
     %= submit_button "$btn", class => 'action'
   </p>
 
-	%end
+  % end
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep

@@ -1,11 +1,11 @@
 <div id='ln_list'>
   % my $btn = l('ln_LOCALNETWORK_ADD');
-    %= form_for '/localnetworksa' => (method => 'POST') => begin
+  %= form_for '/localnetworksa' => ( method => 'POST' ) => begin
 
-	% my $retref= $c->stash("ret");
+    % my $retref = $c->stash("ret");
-	% my %ret = $retref ? %$retref : (ret => "");
+    % my %ret = $retref ? %$retref : ( ret => "" );
-	% my @vars = split(/,/, $ret{vars} // '');
+    % my @vars = split( /,/, $ret{vars} // '' );
-	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
+    % my ( $var1, $var2, $var3, $var4, $var5, $var6, $var7 ) = @vars;
 
     % if ($c->app->config->{debug}) {
       <pre>
@@ -14,16 +14,16 @@
     % }
 
   % if ($ret{ret} eq "") {
-		%=l "ln_FIRSTPAGE_DESC"
+    %= l "ln_FIRSTPAGE_DESC"
   % } elsif (index($ret{ret},"SUCCESS") != -1) {
   <br>
   <div class='success'>
-		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+    %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) )
   </div>
   % } else {
   <br>
   <div class='sme-error'>
-		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+    %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) )
   </div>
   % }
 
@@ -38,60 +38,62 @@
   <br>
   % my $numlocalnetworks = @$localnetworks;
   % if ($numlocalnetworks == 0){
-        %=l 'ln_LOCAL_NETWORK_NONE'
+    %= l 'ln_LOCAL_NETWORK_NONE'
   % } else {
   <br>
   <table class="sme-border TableSort"><thead>
       <tr>
         <th class='sme-border'>
-				%=l 'NETWORK'
+          %= l 'NETWORK'
         </th>
         <th class='sme-border'>
-				%=l 'ln_SUBNET_MASK'
+          %= l 'ln_SUBNET_MASK'
         </th>
 
         <th class='sme-border'>
-				%=l 'ln_NUMBER_OF_HOSTS'
+          %= l 'ln_NUMBER_OF_HOSTS'
         </th>
 
         <th class='sme-border'>
-				%=l 'ROUTER'
+          %= l 'ROUTER'
         </th>
 
         <th class='sme-border'>
-				%=l 'ACTION'
+          %= l 'ACTION'
         </th>
       </tr>
     </thead><tbody>
-		%    foreach my $localnetwork (@$localnetworks )
+      % foreach my $localnetwork (@$localnetworks)
       % {
         % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
         % my $removable = $localnetwork->prop('Removable') || "yes";
         % my $system = $localnetwork->prop('SystemLocalNetwork') || "no";
         % if ( $system eq "yes" ) { $removable = "no"; }
         <tr>
-					%= t td => (class => 'sme-border') => $localnetwork->key
+          %= t td => ( class => 'sme-border' ) => $localnetwork->key
-					%= t td => (class => 'sme-border') => $localnetwork->prop('Mask')
+          %= t td => ( class => 'sme-border' ) => $localnetwork->prop('Mask')
-					%= t td => (class => 'sme-border') => $num_hosts
+          %= t td => ( class => 'sme-border' ) => $num_hosts
-					%= t td => (class => 'sme-border') => $localnetwork->prop('Router')
+          %= t td => ( class => 'sme-border' ) => $localnetwork->prop('Router')
-					%my $actionRemove = '&nbsp;';
+          % my $actionRemove = '&nbsp;';
-					%if ($removable eq "yes") {
+          % if ($removable eq "yes") {
-						%my $remove_text = l('REMOVE');  # Localized text
+            % my $remove_text = l('REMOVE'); # Localized text
-						%my $local_network_entry = $localnetwork->key;
+            % my $local_network_entry = $localnetwork->key;
-						%my $csrf_token = "TOKEN";  # CSRF token for security
+            % my $csrf_token = "TOKEN"; # CSRF token for security
-						%$actionRemove = qq{
+            % $actionRemove = qq{
-                                                %       <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry">
+              % <a href="localnetworksd?CsrfDef=$csrf_token&trt=DEL&localnetwork=$local_network_entry"
-						%	<button type='button' class='sme-remove-button' title='$remove_text' >
+              % class="sme-remove-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-						%		$remove_text
+              % title="$remove_text" aria-label="$remove_text"
-						%	</button>
+              % style="background:white;">
+              % <span class="ui-icon ui-icon-delete"></span>
+              % <span class="ui-button-text">$remove_text</span>
               % </a>
-						%};
+          % };
       % }
-					<td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
+      <td class='sme-border'><%= $c->render_to_string( inline => $actionRemove ) %></td>
     </tr>
     % }
   </tbody>
-		</table>
+</table>
-			%= hidden_field 'trt' => $ln_datas->{trt}
+%= hidden_field 'trt' => $ln_datas->{trt}
-	%}
+% }
 </div>

root/usr/share/smanager/themes/default/templates/partials/_mai_ACC.html.ep

@@ -2,46 +2,46 @@
 %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20
 %#
 <div id="Emailsettings-ACC" class="partial Emailsettings-ACC">
-%#	<script>
+  %# <script>
-%#		window.onload = function() {
+    %# window.onload = function() {
-%#		SelectInput();
+      %# SelectInput();
-%#	};
+      %# };
-%#	</script>
+    %# </script>
   % if (config->{debug} == 1) {
     <pre>
 			%= dumper $mai_data
     </pre>
   % }
   % my $btn = l('SAVE');
-	% $c->param(Selected => undef); #This may need deleting for a params panel - only needed for a table
+  % $c->param( Selected => undef ); #This may need deleting for a params panel - only needed for a table
 
   <h2><%= $c->l('mai_DESC_STATE_ACCESS_BUTTON') %></h2><br>
-	%= form_for "emailsettingsu" => (method => 'POST') => begin
+  %= form_for "emailsettingsu" => ( method => 'POST' ) => begin
     % param 'trt' => $mai_data->{trt} unless param 'trt';
     %= hidden_field 'trt' => $mai_data->{trt}
     %# Inputs etc in here.
-		%=l 'mai_DESC_POP_ACCESS_CONTROL'
+    %= l 'mai_DESC_POP_ACCESS_CONTROL'
 
     <p><span class=label>
-		%=l 'mai_LABEL_POP_ACCESS_CONTROL'
+        %= l 'mai_LABEL_POP_ACCESS_CONTROL'
       </span><span class=input>
         % param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess';
         %= select_field 'POPAccess' => $c->get_pop_opt(), class => 'input'
     </span></p>
 
-		%=l 'mai_DESC_IMAP_ACCESS_CONTROL'
+    %= l 'mai_DESC_IMAP_ACCESS_CONTROL'
 
     <p><span class=label>
-		%=l 'mai_LABEL_IMAP_ACCESS_CONTROL'
+        %= l 'mai_LABEL_IMAP_ACCESS_CONTROL'
       </span><span class=input>
         % param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess';
         %= select_field 'IMAPAccess' => $c->get_imap_opt(), class => 'input'
     </span></p>
 
-		%=l 'mai_DESC_WEBMAIL'
+    %= l 'mai_DESC_WEBMAIL'
 
     <p><span class=label>
-		%=l 'mai_LABEL_WEBMAIL'
+        %= l 'mai_LABEL_WEBMAIL'
       </span><span class=input>
         % param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail';
         %= select_field 'WebMail' => $c->get_webmail_opt(), class => 'input'
@@ -50,5 +50,5 @@
     %# ....
     %# Probably finally by a submit.
     %= submit_button $btn, class => 'action'
-	%end    
+  % end
 </div>

root/usr/share/smanager/themes/default/templates/partials/_mai_DEL.html.ep

@@ -2,32 +2,32 @@
 %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20
 %#
 <div id="Emailsettings-DEL" class="partial Emailsettings-DEL">
-%#	<script>
+  %# <script>
-%#		window.onload = function() {
+    %# window.onload = function() {
-%#		SelectInput();
+      %# SelectInput();
-%#	};
+      %# };
-%#	</script>
+    %# </script>
   % if (config->{debug} == 1) {
     <pre>
 			%= dumper $mai_data
     </pre>
   % }
   % my $btn = l('SAVE');
-	% $c->param(Selected => undef); #This may need deleting for a params panel - only needed for a table
+  % $c->param( Selected => undef ); #This may need deleting for a params panel - only needed for a table
 
   <h2><%= $c->l('mai_DESC_STATE_DELIVERY_BUTTON') %></h2>
-	%= form_for "emailsettingsu" => (method => 'POST') => begin
+  %= form_for "emailsettingsu" => ( method => 'POST' ) => begin
     % param 'trt' => $mai_data->{trt} unless param 'trt';
     %= hidden_field 'trt' => $mai_data->{trt}
     %# Inputs etc in here.
     <h2>
-		%=l 'mai_TITLE_UNKNOWN'
+      %= l 'mai_TITLE_UNKNOWN'
     </h2>
 
-		%=l 'mai_DESC_UNKNOWN'
+    %= l 'mai_DESC_UNKNOWN'
 
     <p><span class=label>
-		%=l 'mai_LABEL_UNKNOWN'
+        %= l 'mai_LABEL_UNKNOWN'
       </span><span class=input>
         % param 'EmailUnknownUser' => $mai_data->{emailunknownuser} unless param 'EmailUnknownUser';
         %= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => 'input'
@@ -35,13 +35,13 @@
 
     <!--<hr class='menubar' />-->
     <h2>
-		%=l 'mai_TITLE_DELEGATE'
+      %= l 'mai_TITLE_DELEGATE'
     </h2>
 
-		%=l 'mai_DESC_DELEGATE'
+    %= l 'mai_DESC_DELEGATE'
 
     <p><span class=label>
-		%=l 'mai_LABEL_DELEGATE'
+        %= l 'mai_LABEL_DELEGATE'
       </span><span class=input>
         % param 'DelegateMailServer' => $mai_data->{delegatemailserver} unless param 'DelegateMailServer';
         %= text_field 'DelegateMailServer', class => 'input'
@@ -49,34 +49,34 @@
 
     <!--<hr class='sectionbar' />-->
     <h2>
-		%=l 'mai_TITLE_SMARTHOST'
+      %= l 'mai_TITLE_SMARTHOST'
     </h2>
 
-		%=l 'mai_DESC_SMARTHOST'
+    %= l 'mai_DESC_SMARTHOST'
 
     <p><span class=label>
-		%=l 'mai_LABEL_SMARTHOST'
+        %= l 'mai_LABEL_SMARTHOST'
       </span><span class=input>
         % param 'SMTPSmartHost' => $mai_data->{smtpsmarthost} unless param 'SMTPSmartHost';
         %= text_field 'SMTPSmartHost', class => 'input'
     </span></p>
 
     <p><span class=label>
-		%=l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS'
+        %= 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>
-		%=l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID'
+        %= l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID'
       </span><span class=input>
         % param 'SMTPAUTHPROXY_Userid' => $mai_data->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid';
         %= text_field 'SMTPAUTHPROXY_Userid', class => 'input'
     </span></p>
 
     <p><span class=label>
-		%=l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD'
+        %= l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD'
       </span><span class=input>
         % param 'SMTPAUTHPROXY_Passwd' => $mai_data->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd';
         %= password_field 'SMTPAUTHPROXY_Passwd', class => 'input'
@@ -86,5 +86,5 @@
     %# ....
     %# Probably finally by a submit.
     %= submit_button $btn, class => 'action'
-	%end    
+  % end
 </div>

root/usr/share/smanager/themes/default/templates/partials/_mai_FIL.html.ep

@@ -2,97 +2,97 @@
 %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20
 %#
 <div id="Emailsettings-FIL" class="partial Emailsettings-FIL">
-%#	<script>
+  %# <script>
-%#		window.onload = function() {
+    %# window.onload = function() {
-%#		SelectInput();
+      %# SelectInput();
-%#	};
+      %# };
-%#	</script>
+    %# </script>
   % if (config->{debug} == 1) {
     <pre>
 			%= dumper $mai_data
     </pre>
   % }
   % my $btn = l('SAVE');
-	% $c->param(Selected => undef); #This may need deleting for a params panel - only needed for a table
+  % $c->param( Selected => undef ); #This may need deleting for a params panel - only needed for a table
 
   <h2><%= $c->l('mai_DESC_STATE_FILTERING_BUTTON') %></h2><br>
-	%= form_for "emailsettingsu" => (method => 'POST') => begin
+  %= form_for "emailsettingsu" => ( method => 'POST' ) => begin
     % param 'trt' => $mai_data->{trt} unless param 'trt';
     %= hidden_field 'trt' => $mai_data->{trt}
     %# Inputs etc in here.
-		%=l 'mai_DESC_VIRUS_SCAN'
+    %= l 'mai_DESC_VIRUS_SCAN'
 
     <p><span class=label>
-		%=l 'mai_LABEL_VIRUS_SCAN'
+        %= 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'
+    %= l 'mai_DESC_SPAM_SCAN'
 
     <p><span class=label>
-		%=l 'mai_LABEL_SPAM_SCAN'
+        %= 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>
-		%=l 'mai_LABEL_SPAM_SENSITIVITY'
+        %= l 'mai_LABEL_SPAM_SENSITIVITY'
       </span><span class=input>
         % param 'SpamSensitivity' => $mai_data->{spamsensitivity} unless param 'SpamSensitivity';
         %= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => 'input'
     </span></p>
 
     <p><span class=label>
-		%=l 'mai_LABEL_SPAM_TAGLEVEL'
+        %= l 'mai_LABEL_SPAM_TAGLEVEL'
       </span><span class=input>
         % param 'SpamTagLevel' => $mai_data->{spamtaglevel} unless param 'SpamTagLevel';
         %= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => 'input'
     </span></p>
 
     <p><span class=label>
-		%=l 'mai_LABEL_SPAM_REJECTLEVEL'
+        %= l 'mai_LABEL_SPAM_REJECTLEVEL'
       </span><span class=input>
         % param 'SpamRejectLevel' => $mai_data->{spamrejectlevel} unless param 'SpamRejectLevel';
         %= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => 'input'
     </span></p>
 
     <p><span class=label>
-		%=l 'mai_LABEL_SORTSPAM'
+        %= 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'
+    %= l 'mai_DESC_SPAM_SUBJECT'
 
     <p><span class=label>
-		%=l 'mai_LABEL_SPAM_SUBJECTTAG'
+        %= 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>
-		%=l 'mai_LABEL_SPAM_SUBJECT'
+        %= l 'mai_LABEL_SPAM_SUBJECT'
       </span><span class=input>
         % param 'SpamSubject' => $mai_data->{spamsubject} unless param 'SpamSubject';
         %= text_field 'SpamSubject' => class => 'input'
     </span></p>
 
-		%=l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT'
+    %= l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT'
 
     <p><span class=label>
-		%=l 'mai_LABEL_CONTENT_TO_BLOCK'
+        %= 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>
 
     %# ....
     %# Probably finally by a submit.
     %= submit_button $btn, class => 'action'
-	%end    
+  % end
 </div>

root/usr/share/smanager/themes/default/templates/partials/_mai_FRONT.html.ep

@@ -2,38 +2,38 @@
 %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20
 %#
 <div id="Emailsettings-FRONT" class="partial Emailsettings-FRONT">
-%#	<script>
+  %# <script>
-%#		window.onload = function() {
+    %# window.onload = function() {
-%#		SelectInput();
+      %# SelectInput();
-%#	};
+      %# };
-%#	</script>
+    %# </script>
   % if (config->{debug} == 1) {
     <pre>
 			%= dumper $mai_data
 			<br> 
     </pre>
   % }
-	% $c->param(Selected => undef); #This may need deleting for a params panel - only needed for a table
+  % $c->param( Selected => undef ); #This may need deleting for a params panel - only needed for a table
   % my $btn = l('Modify');
   <fieldset>
     <legend><%= $c->l('mai_DESC_STATE_ACCESS_BUTTON') %></legend>
-		%= form_for 'emailsettings' => (method => 'POST') => begin
+    %= form_for 'emailsettings' => ( method => 'POST' ) => begin
       <p><span class=label>
-		%=l 'mai_LABEL_POP_ACCESS_CONTROL'
+          %= l 'mai_LABEL_POP_ACCESS_CONTROL'
         </span><span class=data2>
-		%= $c->get_current_pop3_access( TRUE )
+          %= $c->get_current_pop3_access(TRUE)
       </span></p>
 
       <p><span class=label>
-		%=l 'mai_LABEL_IMAP_ACCESS_CONTROL'
+          %= l 'mai_LABEL_IMAP_ACCESS_CONTROL'
         </span><span class=data2>
-		%= $c->get_current_imap_access( TRUE )
+          %= $c->get_current_imap_access(TRUE)
       </span></p>
 
       <p><span class=label>
-		%=l 'mai_LABEL_WEBMAIL'
+          %= l 'mai_LABEL_WEBMAIL'
         </span><span class=data2>
-		%= $c->get_current_webmail_status( TRUE )
+          %= $c->get_current_webmail_status(TRUE)
       </span></p>
 
       <br>
@@ -49,21 +49,21 @@
 
   <fieldset>
     <legend><%= $c->l('mai_DESC_STATE_FILTERING_BUTTON') %></legend>
-		%= form_for 'emailsettings' => (method => 'POST') => begin
+    %= form_for 'emailsettings' => ( method => 'POST' ) => begin
       <p><span class=label>
-		%=l 'mai_LABEL_VIRUS_SCAN'
+          %= l 'mai_LABEL_VIRUS_SCAN'
         </span><span class=data2>
           %= $c->get_virus_status(TRUE)
       </span></p>
 
       <p><span class=label>
-		%=l 'mai_LABEL_SPAM_SCAN'
+          %= l 'mai_LABEL_SPAM_SCAN'
         </span><span class=data2>
           %= $c->get_spam_status(TRUE)
       </span></p>
 
       <p><span class=label>
-		%=l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT'
+          %= l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT'
         </span><span class=data2>
           %= $c->get_patterns_status(TRUE)
       </span></p>
@@ -80,34 +80,34 @@
 
   <fieldset>
     <legend><%= $c->l('mai_DESC_STATE_RECEPTION_BUTTON') %></legend>
-		%= form_for 'emailsettings' => (method => 'POST') => begin
+    %= form_for 'emailsettings' => ( method => 'POST' ) => begin
       <p><span class=label>
-		%=l 'mai_LABEL_MODE'
+          %= l 'mai_LABEL_MODE'
         </span><span class=data2>
           %= $mai_data->{fetchmailmethod}
       </span></p>
 
       % my $smtp_mesg;
 
-		% $smtp_mesg=l('mai_SMTP_port_authenticate');
+      % $smtp_mesg = l('mai_SMTP_port_authenticate');
       <p><span class=label>
-			%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); 
+          %= sprintf( $smtp_mesg, $c->get_db_prop( 'qpsmtpd', 'TCPPort', 25 ) );
         </span><span class=data2>
-		%= $c->get_current_smtp_auth( TRUE )
+          %= $c->get_current_smtp_auth(TRUE)
       </span></p>
 
-		% $smtp_mesg=l('mai_SMTPS_SSL/TLS');
+      % $smtp_mesg = l('mai_SMTPS_SSL/TLS');
       <p><span class=label>
-			%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); 
+          %= sprintf( $smtp_mesg, $c->get_db_prop( 'sqpsmtpd', 'TCPPort', 465 ) );
         </span><span class=data2>
           %= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE )
       </span></p>
 
-		% $smtp_mesg=l 'mai_Submission_port';
+      % $smtp_mesg = l 'mai_Submission_port';
       <p><span class=label>
-			%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
+          %= sprintf( $smtp_mesg, $c->get_db_prop( 'uqpsmtpd', 'TCPPort', 587 ) );
         </span><span class=data2>
-		%= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE )
+          %= $c->get_current_smtp_ssl_auth( TRUE, 'u', FALSE )
       </span></p>
       <br />
 
@@ -122,21 +122,21 @@
 
   <fieldset>
     <legend><%= $c->l('mai_DESC_STATE_DELIVERY_BUTTON') %></legend>
-		%= form_for 'emailsettings' => (method => 'POST') => begin
+    %= form_for 'emailsettings' => ( method => 'POST' ) => begin
       <p><span class=label>
-		%=l 'mai_LABEL_UNKNOWN'
+          %= l 'mai_LABEL_UNKNOWN'
         </span><span class=data2>
-		%= $c->get_emailunknownuser_status( TRUE )
+          %= $c->get_emailunknownuser_status(TRUE)
       </span></p>
 
       <p><span class=label>
-		%=l 'mai_LABEL_DELEGATE'
+          %= l 'mai_LABEL_DELEGATE'
         </span><span class=data2>
           %= $c->get_value('DelegateMailServer')
       </span></p>
 
       <p><span class=label>
-		%=l 'mai_LABEL_SMARTHOST'
+          %= l 'mai_LABEL_SMARTHOST'
         </span><span class=data2>
           %= $c->get_value('SMTPSmartHost')
       </span></p>

root/usr/share/smanager/themes/default/templates/partials/_mai_REC.html.ep

@@ -2,28 +2,28 @@
 %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20
 %#
 <div id="Emailsettings-REC" class="partial Emailsettings-REC">
-%#	<script>
+  %# <script>
-%#		window.onload = function() {
+    %# window.onload = function() {
-%#		SelectInput();
+      %# SelectInput();
-%#	};
+      %# };
-%#	</script>
+    %# </script>
   % if (config->{debug} == 1) {
     <pre>
 			%= dumper $mai_data
     </pre>
   % }
   % my $btn = l('SAVE');
-	% $c->param(Selected => undef); #This may need deleting for a params panel - only needed for a table
+  % $c->param( Selected => undef ); #This may need deleting for a params panel - only needed for a table
 
   <h2><%= $c->l('mai_DESC_STATE_RECEPTION_BUTTON') %></h2><br>
-	%= form_for "emailsettingsu" => (method => 'POST') => begin
+  %= form_for "emailsettingsu" => ( method => 'POST' ) => begin
     % param 'trt' => $mai_data->{trt} unless param 'trt';
     %= hidden_field 'trt' => $mai_data->{trt}
     %# Inputs etc in here.
-		%=l 'mai_DESC_MODE'
+    %= l 'mai_DESC_MODE'
 
     <p><span class=label>
-		%=l 'mai_LABEL_MODE'
+        %= l 'mai_LABEL_MODE'
       </span><span class=input>
         % param 'FetchmailMethod' => $mai_data->{fetchmailmethod} unless param 'FetchmailMethod';
         <!--
@@ -36,7 +36,7 @@
         %= select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class => 'input'
     </span></p>
 
-		%#=l 'mai_DESC_SMTP_AUTH_CONTROL'
+    %# =l 'mai_DESC_SMTP_AUTH_CONTROL'
     <br />
     %= l "mai_SMTP_port_(25)"
     <br />
@@ -45,11 +45,11 @@
     %= l "mai_SMTP_Submission"
     <br />
 
-		% my $smtp_mesg=l('mai_SMTP_port_authenticate');
+    % my $smtp_mesg = l('mai_SMTP_port_authenticate');
     <p><span class=label>
-			%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); 
+        %= sprintf( $smtp_mesg, $c->get_db_prop( 'qpsmtpd', 'TCPPort', 25 ) );
       </span><span class=input>
-			% param 'SMTPAuth' => $c->get_current_smtp_auth( FALSE ) unless param 'SMTPAuth';
+        % param 'SMTPAuth' => $c->get_current_smtp_auth(FALSE) unless param 'SMTPAuth';
         <!--
         <pre>
 			%= dumper $c->get_smtp_auth_opt()
@@ -61,20 +61,20 @@
         %= select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => 'input'
     </span></p>
 
-		% my $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
+    % my $smtp_mesg = l('SMTPS SSL/TLS auth: port %u status:');
     <p><span class=label>
-			%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); 
+        %= sprintf( $smtp_mesg, $c->get_db_prop( 'sqpsmtpd', 'TCPPort', 465 ) );
       </span><span class=input>
-			% param 'sSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'s', TRUE) unless param 'sSMTPAuth';
+        % param 'sSMTPAuth' => $c->get_current_smtp_ssl_auth( FALSE, 's', TRUE ) unless param 'sSMTPAuth';
 
         %= select_field 'sSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => 'input'
     </span></p>
 
-		%my $smtp_mesg=l('Submission port %u status:');
+    % my $smtp_mesg = l('Submission port %u status:');
     <p><span class=label>
-			%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); 
+        %= sprintf( $smtp_mesg, $c->get_db_prop( 'uqpsmtpd', 'TCPPort', 587 ) );
       </span><span class=input>
-			% param 'uSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) unless param 'uSMTPAuth';
+        % param 'uSMTPAuth' => $c->get_current_smtp_ssl_auth( FALSE, 'u', TRUE ) unless param 'uSMTPAuth';
         <!--
         <pre>
 			%= dumper $c->get_smtp_ssl_auth_opt()
@@ -89,64 +89,64 @@
 
     <!--<hr class="sectionbar" />-->
     <h2>
-		%=l 'mai_TITLE_SECONDARY'
+      %= l 'mai_TITLE_SECONDARY'
     </h2><br>
 
-		%=l 'mai_DESC_SECONDARY'
+    %= l 'mai_DESC_SECONDARY'
 
     <p><span class=label>
-		%=l 'mai_LABEL_SECONDARY'
+        %= l 'mai_LABEL_SECONDARY'
       </span><span class=input>
         % param 'SecondaryMailServer' => $mai_data->{secondarymailserver} unless param 'SecondaryMailServer';
         %= text_field 'SecondaryMailServer', class => 'input'
     </span></p>
 
-		%=l 'mai_DESC_FETCH_PERIOD'
+    %= l 'mai_DESC_FETCH_PERIOD'
 
     <p><span class=label>
-		%=l 'mai_LABEL_FETCH_PERIOD'
+        %= l 'mai_LABEL_FETCH_PERIOD'
       </span><span class=input>
         % param 'FreqOffice' => $mai_data->{freqoffice} unless param 'FreqOffice';
         %= select_field 'FreqOffice' => $c->fetchmail_freq(), class => 'input'
     </span></p>
 
     <p><span class=label>
-		%=l 'mai_LABEL_FETCH_PERIOD_NIGHTS'
+        %= l 'mai_LABEL_FETCH_PERIOD_NIGHTS'
       </span><span class=input>
         % param 'FreqOutside' => $mai_data->{freqoutside} unless param 'FreqOutside';
         %= select_field 'FreqOutside' => $c->fetchmail_freq(), class => 'input'
     </span></p>
 
     <p><span class=label>
-		%=l 'mai_LABEL_FETCH_PERIOD_WEEKENDS'
+        %= l 'mai_LABEL_FETCH_PERIOD_WEEKENDS'
       </span><span class=input>
         % param 'FreqWeekend' => $mai_data->{freqweekend} unless param 'FreqWeekend';
         %= select_field 'FreqWeekend' => $c->fetchmail_freq(), class => 'input'
     </span></p>
 
     <p><span class=label>
-		%=l 'mai_LABEL_POP_ACCOUNT'
+        %= l 'mai_LABEL_POP_ACCOUNT'
       </span><span class=input>
         % param 'SecondaryMailAccount' => $mai_data->{secondarymailaccount} unless param 'SecondaryMailAccount';
         %= text_field 'SecondaryMailAccount', class => 'input'
     </span></p>
 
     <p><span class=label>
-		%=l 'mai_LABEL_POP_PASS'
+        %= l 'mai_LABEL_POP_PASS'
       </span><span class=input>
         % param 'SecondaryMailPassword' => $mai_data->{secondarymailpassword} unless param 'SecondaryMailPassword';
         %= password_field 'SecondaryMailPassword', class => 'input'
     </span></p>
 
     <p><span class=label>
-		%=l 'mai_LABEL_SORT_METHOD'
+        %= 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>
-		%=l 'mai_LABEL_SORT_HEADER'
+        %= l 'mai_LABEL_SORT_HEADER'
       </span><span class=input>
         % param 'SecondaryMailEnvelope' => $mai_data->{secondarymailenvelope} unless param 'SecondaryMailEnvelope';
         %= text_field 'SecondaryMailEnvelope', class => 'input'
@@ -155,5 +155,5 @@
     %# ....
     %# Probably finally by a submit.
     %= submit_button $btn, class => 'action'
-	%end    
+  % end
 </div>

root/usr/share/smanager/themes/default/templates/partials/_module.html.ep

@@ -30,11 +30,11 @@
 <div id="module">
   <p> < %= $title % ></p><br>
   <%= $modul %><br>
-Et eu humo modo paratus quadrum turpis validus. Abico appellatio augue qui refero valetudo vereor. Augue diam eu genitus ille letalis nobis typicus veniam.
+  Et eu humo modo paratus quadrum turpis validus. Abico appellatio augue qui refero valetudo vereor. Augue diam eu genitus ille letalis nobis typicus veniam.
 
-Dignissim dolus loquor lucidus probo proprius tation torqueo. Abluo luptatum quidem. Acsi aliquip eu ex iaceo natu populus quae scisco si.
+  Dignissim dolus loquor lucidus probo proprius tation torqueo. Abluo luptatum quidem. Acsi aliquip eu ex iaceo natu populus quae scisco si.
 
-Aliquam autem blandit decet in jus loquor quidne saluto te. Eu meus voco wisi. Abico defui euismod huic jumentum lobortis mos vulpes. Causa eros feugiat hendrerit illum luctus nimis quidem valetudo. Elit ex obruo tation usitas vero. Abigo dolus hendrerit huic iriure jumentum letalis lobortis melior nulla. Blandit causa immitto iriure metuo nutus pagus ut voco.
+  Aliquam autem blandit decet in jus loquor quidne saluto te. Eu meus voco wisi. Abico defui euismod huic jumentum lobortis mos vulpes. Causa eros feugiat hendrerit illum luctus nimis quidem valetudo. Elit ex obruo tation usitas vero. Abigo dolus hendrerit huic iriure jumentum letalis lobortis melior nulla. Blandit causa immitto iriure metuo nutus pagus ut voco.
   <br>
   <p>
     %= link_to Welcome => '/'

root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep

@@ -1,36 +1,36 @@
 % use SrvMngr qw( getNavigation );
-%	my %nav = %{SrvMngr->getNavigation( $c->languages(), 'N' )};
+% my %nav = %{ SrvMngr->getNavigation( $c->languages(), 'N' ) };
 
-	<div id='navmenu'>
+<div id='navmenu'>
   <!-- <a href='#' id='tognav' class='menu-title'>NAVIGATION</a> -->
   <div id='menunav'>
 
-%    my $cc = 200;
+    % my $cc = 200;
-%    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) 
+    % foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'})
-%		<=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
+      % <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
-%
+      %
       <!-- div class='section section-title'><%= $h %></div -->
     <div><a href='#' class='section section-title'><%= $h %></a></div>
     <div class='togms'>
-%	my ($classNew, $target, $href) = '';
+      % my ( $classNew, $target, $href ) = '';
-%	foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
+      % foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav{$h}{'DESCRIPTIONS'}}) {
 
-%	    next if ($_->{'MENUCAT'} ne 'N' );	# menu Navigation 
+        % next if ( $_->{'MENUCAT'} ne 'N' ); # menu Navigation
 
-%	    if ( $_->{'FILENAME'} =~ m/^2\// ) {
+        % if ( $_->{'FILENAME'} =~ m/^2\// ) {
-%		$target = '_self';
+          % $target = '_self';
-%	    	(my $file2 = $_->{'FILENAME'}) =~ s|^2/||;
+          % ( my $file2 = $_->{'FILENAME'} ) =~ s|^2/||;
-%	    	$href = '/smanager/' . $file2;
+          % $href = '/smanager/' . $file2;
-%	    } else {
+        % } else {
-%		$target = 'main';
+        % $target = 'main';
-%	    	$href = '/server-manager' . $_->{'FILENAME'};
+        % $href = '/server-manager' . $_->{'FILENAME'};
-%	    }
+      % }
     <div class='menu-cell'><a class='item<%= $classNew %>' target='<%= $target %>'
       id='sme<%= $cc %>' href='<%= $href %>'><%= $_->{'DESCRIPTION'} %></a></div>
-%           $cc++;
+  % $cc++;
-%	}
+  % }
-	</div>
+</div>
 
 % }
-    </div>
+</div>
-    </div>
+</div>

root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep

@@ -1,38 +1,38 @@
 % use SrvMngr qw( getNavigation );
-%	my %nav = %{SrvMngr->getNavigation( $c->languages(), 'A' )};
+% my %nav = %{ SrvMngr->getNavigation( $c->languages(), 'A' ) };
 
-	<div id='navigat2'>
+<div id='navigat2'>
   <!-- ><div><a href='#' id='togadm' class='menu-title'>ADMINISTRATION</a></div> -->
   <div id='menuadm'>
 
-%    my $cc = 100;
+    % my $cc = 100;
-%    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) 
+    % foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'})
-%		<=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
+      % <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
       <div><a href='#' class='section section-title'><%= $h %></a></div>
       <div class='togms'>
-%	my ($classNew, $target, $href) = '';
+        % my ( $classNew, $target, $href ) = '';
-%	foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
+        % foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav{$h}{'DESCRIPTIONS'}}) {
 
-%	    next if ($_->{'MENUCAT'} ne 'A' );	# menu Admin 
+          % next if ( $_->{'MENUCAT'} ne 'A' ); # menu Admin
 
-%	    if ( $_->{'FILENAME'} =~ m/^2\// ) {
+          % if ( $_->{'FILENAME'} =~ m/^2\// ) {
-%		$target = '_self';
+            % $target = '_self';
-%	    	(my $file2 = $_->{'FILENAME'}) =~ s|^2/||;
+            % ( my $file2 = $_->{'FILENAME'} ) =~ s|^2/||;
-%	    	$href = '/smanager/' . $file2;
+            % $href = '/smanager/' . $file2;
-%	    } else {
+          % } else {
-%		$target = 'main';
+          % $target = 'main';
-%#	    	$href = '/server-manager' . $_->{'FILENAME'};
+          %# $href = '/server-manager' . $_->{'FILENAME'};
-%#	    	$href = $c->getlegacyurl($c,'/server-manager' . $_->{'FILENAME'});
+          %# $href = $c->getlegacyurl($c,'/server-manager' . $_->{'FILENAME'});
-% 			my $host = $c->req->url->to_abs->host;
+          % my $host = $c->req->url->to_abs->host;
-%	    	$href = "/smanager/legacypanel?url=https://$host/server-manager" . $_->{'FILENAME'};
+          % $href = "/smanager/legacypanel?url=https://$host/server-manager" . $_->{'FILENAME'};
-% 
+          %
-%	    }
+        % }
       <div class='menu-cell'><a class='item<%= $classNew %>' target='<%= $target %>'
         id='sme<%= $cc %>' href='<%= $href %>'><%= $_->{'DESCRIPTION'} %></a></div>
-%           $cc++;
+    % $cc++;
-%	}
+    % }
   </div>
-%    }
+  % }
 
-    </div>
+</div>
-    </div>
+</div>

root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep

@@ -1,9 +1,9 @@
 <div id='pf_add'>
 
-	% my $retref= $c->stash("ret");
+  % my $retref = $c->stash("ret");
-	% my %ret = $retref ? %$retref : (ret => "");
+  % my %ret = $retref ? %$retref : ( ret => "" );
-	% my @vars = split(/,/, $ret{vars} // '');
+  % my @vars = split( /,/, $ret{vars} // '' );
-	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
+  % my ( $var1, $var2, $var3, $var4, $var5, $var6, $var7 ) = @vars;
 
   % if ($c->app->config->{debug}) {
     <pre>
@@ -16,12 +16,12 @@
   % } elsif (index($ret{ret},"SUCCESS") != -1) {
   <br>
   <div class='success'>
-		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+    %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) )
   </div>
   % } else {
   <br>
   <div class='sme-error'>
-		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+    %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) )
   </div>
   % }
   <br />
@@ -32,54 +32,54 @@
   %= dumper $c->current_route
   %= dumper $c->stash("ret")
   </pre>
-    % }
+% }
 
-    %= form_for '/portforwardingb' => (method => 'POST') => begin
+%= form_for '/portforwardingb' => ( method => 'POST' ) => begin
   <h2>
-		%=l "pf_CREATE_RULE"
+    %= l "pf_CREATE_RULE"
   </h2>
   <p>
-				%=l "pf_SUMMARY_ADD_DESC"
+    %= l "pf_SUMMARY_ADD_DESC"
   </p><br>
   <span class=label>
-				%=l "pf_LABEL_PROTOCOL"
+    %= l "pf_LABEL_PROTOCOL"
   </span><span class=data>
-				%=select_field  'proto'=>["TCP","UDP"]
+    %= select_field 'proto' => [ "TCP", "UDP" ]
   </span><br><br>
   <span class=label>
-				%=l "pf_LABEL_SOURCE_PORT"
+    %= l "pf_LABEL_SOURCE_PORT"
   </span><span class=data>
-				%=text_field 'sport'
+    %= text_field 'sport'
   </span><br><br>
   <span class=label>
-				%=l "pf_LABEL_DESTINATION_PORT"
+    %= l "pf_LABEL_DESTINATION_PORT"
   </span>
   <span class=data>
-				%=text_field 'dport'
+    %= text_field 'dport'
   </span><br><br>
   <span class=label>
-				%=l "pf_LABEL_DESTINATION_HOST"
+    %= l "pf_LABEL_DESTINATION_HOST"
   </span>
   <span class=data>
-				%=text_field 'dhost'
+    %= text_field 'dhost'
   </span><br><br>
   <span class=label>
-				%=l "pf_ALLOW_HOSTS"
+    %= l "pf_ALLOW_HOSTS"
   </span>
   <span class=data>
-				%=text_field 'allow'
+    %= text_field 'allow'
   </span><br><br>
   <span class=label>
-				%=l "pf_RULE_COMMENT"
+    %= l "pf_RULE_COMMENT"
   </span>
   <span class=data>
-				%=text_field 'cmmnt'
+    %= text_field 'cmmnt'
   </span><br><br>
   <p>
     <br>
     %= submit_button "$btn", class => 'action'
   </p>
 
-	%end
+% end
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep

@@ -16,51 +16,51 @@
     </pre>
   % }
 
-    %= form_for '/portforwardinge' => (method => 'POST') => begin
+  %= form_for '/portforwardinge' => ( method => 'POST' ) => begin
     <br>
     %= l "pf_SUMMARY_REMOVE_DESC"
   </p><br>
   <span class=label>
-				%=l "pf_LABEL_PROTOCOL"
+    %= l "pf_LABEL_PROTOCOL"
   </span><span class=data>
-				%=$proto
+    %= $proto
   </span><br><br>
   <span class=label>
-				%=l "pf_LABEL_SOURCE_PORT"
+    %= l "pf_LABEL_SOURCE_PORT"
   </span><span class=data>
-				%=$sport
+    %= $sport
   </span><br><br>
   <span class=label>
-				%=l "pf_LABEL_DESTINATION_HOST"
+    %= l "pf_LABEL_DESTINATION_HOST"
   </span>
   <span class=data>
-				%=$dport
+    %= $dport
   </span><br><br>
   <span class=label>
-				%=l "pf_LABEL_DESTINATION_PORT"
+    %= l "pf_LABEL_DESTINATION_PORT"
   </span>
   <span class=data>
-				%=$dhost
+    %= $dhost
   </span><br><br>
   <span class=label>
-				%=l "pf_RULE_COMMENT"
+    %= l "pf_RULE_COMMENT"
   </span>
   <span class=data>
-				%=$cmmnt
+    %= $cmmnt
   </span><br><br>
   <span class=label>
-				%=l "pf_ALLOW_HOSTS"
+    %= l "pf_ALLOW_HOSTS"
   </span>
   <span class=data>
-				%=$allow
+    %= $allow
   </span><br><br>
-		%#}
+  %# }
-			%= hidden_field sport=>$sport
+%= hidden_field sport => $sport
-			%= hidden_field proto=>$proto
+%= hidden_field proto => $proto
-			<br>
+<br>
-			%= submit_button "$btn", class => 'action'
+%= submit_button "$btn", class => 'action'
-			</p>
+</p>
 
-	%end
+% end
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep

@@ -1,14 +1,14 @@
 <div id='pf_list'>
   % my $btn = l('pf_CREATE_RULE');
-    %= form_for '/portforwardinga' => (method => 'POST') => begin
+  %= form_for '/portforwardinga' => ( method => 'POST' ) => begin
 
     % my $numtcpforwards = @$tcpforwards;
     % my $numudpforwards = @$udpforwards;
 
-	% my $retref= $c->stash("ret");
+    % my $retref = $c->stash("ret");
-	% my %ret = $retref ? %$retref : (ret => "");
+    % my %ret = $retref ? %$retref : ( ret => "" );
-	% my @vars = split(/,/, $ret{vars} // '');
+    % my @vars = split( /,/, $ret{vars} // '' );
-	% my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars;
+    % my ( $var1, $var2, $var3, $var4, $var5, $var6, $var7 ) = @vars;
 
     % if ($c->app->config->{debug}) {
       <pre>
@@ -17,16 +17,16 @@
     % }
 
   % if ($ret{ret} eq "") {
-		%=l "pf_FIRST_PAGE_DESCRIPTION"
+    %= l "pf_FIRST_PAGE_DESCRIPTION"
   % } elsif (index($ret{ret},"SUCCESS") != -1) {
   <br>
   <div class='success'>
-		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+    %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) )
   </div>
   % } else {
   <br>
   <div class='sme-error'>
-		%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6]))
+    %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) )
   </div>
   % }
   <br />
@@ -42,33 +42,33 @@
 
   % if ($empty){
     <br>
-		%=l 'pf_NO_FORWARDS'
+    %= l 'pf_NO_FORWARDS'
   % } else {
   <br>
-		%=l 'pf_SHOW_FORWARDS'
+  %= l 'pf_SHOW_FORWARDS'
   <br><br />
   <table class="sme-border TableSort"><thead>
       <tr>
         <th class='sme-border'>
-				%=l 'pf_LABEL_PROTOCOL'
+          %= l 'pf_LABEL_PROTOCOL'
         </th>
         <th class='sme-border'>
-				%=l 'pf_LABEL_SOURCE_PORT'
+          %= l 'pf_LABEL_SOURCE_PORT'
         </th>
         <th class='sme-border'>
-				%=l 'pf_LABEL_DESTINATION_HOST'
+          %= l 'pf_LABEL_DESTINATION_HOST'
         </th>
         <th class='sme-border'>
-				%=l 'pf_LABEL_DESTINATION_PORT'
+          %= l 'pf_LABEL_DESTINATION_PORT'
         </th>
         <th class='sme-border'>
-				%=l 'pf_ALLOW_HOSTS'
+          %= l 'pf_ALLOW_HOSTS'
         </th>
         <th class='sme-border'>
-				%=l 'pf_RULE_COMMENT'
+          %= l 'pf_RULE_COMMENT'
         </th>
         <th class='sme-border'>
-				%=l 'ACTION'
+          %= l 'ACTION'
         </th>
       </tr>
     </thead><tbody>
@@ -86,31 +86,33 @@
               % my $dport = $entry->prop('DestPort') || '';
               % my $cmmnt = $entry->prop('Comment') || '';
               % my $allow = $entry->prop('AllowHosts') || '';
-		%= 			t td => (class => 'sme-border') => $proto
+              %= t td => ( class => 'sme-border' ) => $proto
-		%= 			t td => (class => 'sme-border') => $sport
+              %= t td => ( class => 'sme-border' ) => $sport
-		%= 			t td => (class => 'sme-border') => $dhost
+              %= t td => ( class => 'sme-border' ) => $dhost
-		%= 			t td => (class => 'sme-border') => $dport
+              %= t td => ( class => 'sme-border' ) => $dport
-		%= 			t td => (class => 'sme-border') => $allow
+              %= t td => ( class => 'sme-border' ) => $allow
-		%= 			t td => (class => 'sme-border') => $cmmnt
+              %= t td => ( class => 'sme-border' ) => $cmmnt
               <td class='sme-border'>
-						%my $remove_text = l('REMOVE');  # Localized text
+                % my $remove_text = l('REMOVE'); # Localized text
-						%my $csrf_token = "TOKEN";  # CSRF token for security
+                % my $csrf_token = "TOKEN"; # CSRF token for security
-						%my $actionRemove = qq{
+                % my $actionRemove = qq{
-                                                %       <a href="portforwardingd?CsrfDef=$csrf_token&trt=DEL&sport=$sport&proto=$proto">
+                  % <a href="portforwardingd?CsrfDef=$csrf_token&trt=DEL&sport=$sport&proto=$proto"
-						%	<button type='button' class='sme-remove-button' title='$remove_text' >
+                  % class="sme-remove-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-						%		$remove_text
+                  % title="$remove_text" aria-label="$remove_text"
-						%	</button>
+                  % style="background:white;">
+                  % <span class="ui-icon ui-icon-delete"></span>
+                  % <span class="ui-button-text">$remove_text</span>
                   % </a>
-						%};
+              % };
-					<%= $c->render_to_string(inline => $actionRemove) %>
+            <%= $c->render_to_string( inline => $actionRemove ) %>
           </td>
         </tr>
       % }
     % }
-        %}
+    % }
-	%}
+    % }
   </tbody>
-	</table>
+</table>
-	%= hidden_field 'trt' => $pf_datas->{trt}
+%= hidden_field 'trt' => $pf_datas->{trt}
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_prt_add.html.ep

@@ -2,17 +2,17 @@
 
   % my $btn = l('ADD');
 
-    %= form_for '/printers2' => (method => 'POST') => begin
+  %= form_for '/printers2' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'prt_CREATE_NEW_PRINTER'
+        %= l 'prt_CREATE_NEW_PRINTER'
       </h2><br>
-	%=l 'prt_CREATE_NEW_DESC'
+      %= l 'prt_CREATE_NEW_DESC'
     </p><br>
 
     <p>
       <span class=label>
-	%=l 'prt_PRINTER_NAME', class => 'label'
+        %= l 'prt_PRINTER_NAME', class => 'label'
       </span><span class=data>
         %= text_field 'Name', class => 'input'
       </span>
@@ -20,7 +20,7 @@
 
     <p>
       <span class=label>
-	%=l 'DESCRIPTION_BRIEF', class => 'label'
+        %= l 'DESCRIPTION_BRIEF', class => 'label'
       </span><span class=data>
         %= text_field 'Description', class => 'input'
       </span>
@@ -28,7 +28,7 @@
 
     <p>
       <span class=label>
-	%=l 'LOCATION', class => 'label'
+        %= l 'LOCATION', class => 'label'
       </span><span class=data>
         %= select_field 'Location' => $c->printerLocation_list(), class => 'input'
       </span>

root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep

@@ -3,7 +3,7 @@
 
   % my $btn = l('prt_INITIAL_BTN');
 
-    %= form_for '/printers' => (method => 'POST') => begin
+  %= form_for '/printers' => ( method => 'POST' ) => begin
 
     %= hidden_field 'trt' => 'ADD'
 
@@ -15,67 +15,69 @@
 
   <p>
     <h2>
-	%=l 'prt_CURRENT_LIST'
+      %= l 'prt_CURRENT_LIST'
     </h2>
     <br><br>
     % my $numPrinters = @$printerDrivers;
     % if ($numPrinters == 0){
-        %=l 'prt_NO_PRINTERS'
+      %= l 'prt_NO_PRINTERS'
     % } else {
     <table class="sme-border TableSort"><thead>
         <tr>
           <th class='sme-border'>
-    	    %=l 'NAME'
+            %= l 'NAME'
           </th>
           <th class='sme-border'>
-    	    %=l 'DESCRIPTION'
+            %= l 'DESCRIPTION'
           </th>
           <th class='sme-border'>
-    	    %=l 'LOCATION'
+            %= l 'LOCATION'
           </th>
           <th class='sme-border'>
-    	    %=l 'prt_REMOTE_ADDRESS'
+            %= l 'prt_REMOTE_ADDRESS'
           </th>
           <th class='sme-border'>
-    	    %=l 'prt_REMOTE_NAME'
+            %= l 'prt_REMOTE_NAME'
           </th>
           <th class='sme-border'>
-    	    %=l 'ACTION'
+            %= l 'ACTION'
           </th>
         </tr>
       </thead><tbody>
         % foreach my $printer (@$printerDrivers)
         % {
-    %        my $address = ($printer->prop('Location') eq 'remote')
+          % my $address = ( $printer->prop('Location') eq 'remote' )
           % ? $printer->prop('Address') : 'N/A';
-    %        my $remoteName = ($printer->prop('Location') eq 'remote')
+          % my $remoteName = ( $printer->prop('Location') eq 'remote' )
           % ? $printer->prop('RemoteName') : 'N/A';
           % $remoteName = 'raw' unless ($remoteName);
           <tr>
-            %= t td => (class => 'sme-border') => $printer->key
+            %= t td => ( class => 'sme-border' ) => $printer->key
-            %= t td => (class => 'sme-border') => $printer->prop('Description')
+            %= t td => ( class => 'sme-border' ) => $printer->prop('Description')
-            %= t td => (class => 'sme-border') => $printer->prop('Location')
+            %= t td => ( class => 'sme-border' ) => $printer->prop('Location')
-            %= t td => (class => 'sme-border') => $address
+            %= t td => ( class => 'sme-border' ) => $address
-            %= t td => (class => 'sme-border') => $remoteName
+            %= t td => ( class => 'sme-border' ) => $remoteName
             <td class='sme-border'>
-				%my $remove_text = l('REMOVE');  # Localized text
+              % my $remove_text = l('REMOVE'); # Localized text
-				%my $csrf_token = "TOKEN";  # CSRF token for security
+              % my $csrf_token = "TOKEN"; # CSRF token for security
-				%my $printer_name = $printer->key;
+              % my $printer_name = $printer->key;
-				%my $actionRemove = qq{
+              % my $actionRemove = qq{
-                                %       <a href="printers2?CsrfDef=$csrf_token&trt=DEL&&printer=$printer_name">
+                % <a href="printers2?CsrfDef=$csrf_token&trt=DEL&&printer=$printer_name"
-				%	<button type='button' class='sme-remove-button' title='$remove_text' >
+                % class="sme-remove-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-				%		$remove_text
+                % title="$remove_text" aria-label="$remove_text"
-				%	</button>
+                % style="background:white;">
+                % <span class="ui-icon ui-icon-delete"></span>
+                % <span class="ui-button-text">$remove_text</span>
                 % </a>
-				%};
+            % };
-			<%= $c->render_to_string(inline => $actionRemove) %>
+          <%= $c->render_to_string( inline => $actionRemove ) %>
         </td>
       </tr>
       % }
     </tbody>
   </table>
-	<%} %>
+  <% } %>
-	</p>
+</p>
 
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_prt_net.html.ep

@@ -2,19 +2,19 @@
 
   % my $btn = l('ADD');
 
-    %= form_for '/printers2' => (method => 'POST') => begin
+  %= form_for '/printers2' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'prt_CREATE_NETWORK_PRINTER'
+        %= l 'prt_CREATE_NETWORK_PRINTER'
       </h2>
 
       <br><br>
-	%=l 'prt_CREATE_NETWORK_DESC'
+      %= l 'prt_CREATE_NETWORK_DESC'
     </p>
 
     <p>
       <span class=label>
-	%=l 'prt_HOSTNAME_OR_IP', class => 'label'
+        %= l 'prt_HOSTNAME_OR_IP', class => 'label'
       </span><span class=data>
         %= text_field 'Address', class => 'input'
       </span>
@@ -22,7 +22,7 @@
 
     <p>
       <span class=label>
-	%=l 'prt_REMOTE_NAME_DESC', class => 'label'
+        %= l 'prt_REMOTE_NAME_DESC', class => 'label'
       </span><span class=data>
         %= text_field 'RemoteName' => 'raw', class => 'input'
       </span>

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

@@ -2,18 +2,18 @@
 
   % my $btn = l('ADD');
 
-    %= form_for '/pseudonyms2' => (method => 'POST') => begin
+  %= form_for '/pseudonyms2' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'pse_TITLE_CREATE'
+        %= l 'pse_TITLE_CREATE'
       </h2>
       <br>
-	%= $c->render_to_string(inline => l('pse_VALID_PSEUDONYM_NAMES'));
+      %= $c->render_to_string( inline => l('pse_VALID_PSEUDONYM_NAMES') );
     </p>
 
     <p>
       <span class=label>
-	%=l 'pse_PSEUDONYM_NAME', class => 'label'
+        %= l 'pse_PSEUDONYM_NAME', class => 'label'
       </span><span class=data>
         %= text_field 'Pseudonym', class => 'input'
       </span>
@@ -21,7 +21,7 @@
 
     <p>
       <span class=label>
-	%=l 'pse_SELECT_ACCOUNT', class => 'label'
+        %= l 'pse_SELECT_ACCOUNT', class => 'label'
       </span><span class=data>
         %= select_field 'Account' => $c->existing_accounts_list(), class => 'input'
       </span>

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

@@ -1,14 +1,14 @@
 <div id='pse_del'>
 
   % my $btn = l('REMOVE');
-    %= form_for '/pseudonyms2' => (method => 'POST') => begin
+  %= form_for '/pseudonyms2' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'pse_REMOVE_PSEUDONYM'
+        %= l 'pse_REMOVE_PSEUDONYM'
       </h2>
 
       <p>
-	%= $c->render_to_string(inline => l('pse_ABOUT_TO_REMOVE', $pse_datas->{pseudonym}));
+        %= $c->render_to_string( inline => l( 'pse_ABOUT_TO_REMOVE', $pse_datas->{pseudonym} ) );
 
       </p>
 
@@ -22,4 +22,4 @@
 
     % end
 
-</div>
+  </div>

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

@@ -2,9 +2,9 @@
 
   % my $btn = l('pse_CLICK_TO_CREATE');
 
-    %= $c->render_to_string(inline => l('pse_DESCRIPTION'));
+  %= $c->render_to_string( inline => l('pse_DESCRIPTION') );
 
-    %= form_for '/pseudonyms' => (method => 'POST') => begin
+  %= form_for '/pseudonyms' => ( method => 'POST' ) => begin
 
     %= hidden_field 'trt' => 'ADD'
 
@@ -16,80 +16,84 @@
 
 
   <p><h2>
-	%=l 'pse_CURRENT_PSEUDONYMS'
+      %= l 'pse_CURRENT_PSEUDONYMS'
     </h2><br>
     % my $numPseudonyms = @$pseudonyms;
     % if ($numPseudonyms == 0){
-        %=l 'pse_ACCOUNT_PSEUDONYM_NONE'
+      %= l 'pse_ACCOUNT_PSEUDONYM_NONE'
     % } else {
     <table class="sme-border TableSort"><thead>
         <tr>
           <th class='sme-border'>
-    	    %=l 'pse_PSEUDONYM'
+            %= l 'pse_PSEUDONYM'
           </th>
           <th class='sme-border'>
-    	    %=l 'pse_USER_OR_GROUP'
+            %= l 'pse_USER_OR_GROUP'
           </th>
           <th class='sme-border'>
-    	    %=l 'ACTION'
+            %= l 'ACTION'
           </th>
           <!-- <th class='sme-border' style="display: normal;"></th> -->
       </tr></thead>
       <tbody>
 
-    %    foreach my $pseudonym ( @$pseudonyms )
+        % foreach my $pseudonym (@$pseudonyms)
         % {
           % my $modifiable = $pseudonym->prop('Changeable') || 'yes';
           % my $removable = $pseudonym->prop('Removable') || 'yes';
 
           % my $account = $pseudonym->prop('Account');
-    %       $account = "Administrator" if ($account eq "admin");
+          % $account = "Administrator" if ( $account eq "admin" );
-    %	    $account = $c->l("pse_EVERYONE") if ($account eq "shared");
+          % $account = $c->l("pse_EVERYONE") if ( $account eq "shared" );
 
           % my $visible = $pseudonym->prop('Visible');
           % $account .= $c->l("pse_LOCAL_ONLY")
-    %    	if (defined $visible && $visible eq "internal");
+          % if ( defined $visible && $visible eq "internal" );
 
           <tr>
-            %= t td => (class => 'sme-border') => $pseudonym->key
+            %= t td => ( class => 'sme-border' ) => $pseudonym->key
-            %= t td => (class => 'sme-border') => $account
+            %= t td => ( class => 'sme-border' ) => $account
 
             <td class='sme-border'>
-				%my ($actionModify, $actionRemove) = '&nbsp;'; 
+              % my ( $actionModify, $actionRemove ) = '&nbsp;';
-				%if ($modifiable eq 'yes') { 
+              % if ($modifiable eq 'yes') {
-					%my $modify_text = l('MODIFY');  # Localized text
+                % my $modify_text = l('MODIFY'); # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
+                % my $csrf_token = "TOKEN"; # CSRF token for security
-					%my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
+                % my $pseudonyms_entry_name = $pseudonym->key; # pseudonyms_entry name extracted from the data structure
-					%$actionModify = qq{
+                % $actionModify = qq{
-                                        %       <a href="pseudonyms2?CsrfDef=$csrf_token&trt=UPD&pseudonym=$pseudonyms_entry_name">
+                  % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=UPD&pseudonym=$pseudonyms_entry_name"
-					%	<button type='button' class='sme-modify-button' title='$modify_text' >
+                  % class="sme-modify-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-					%		$modify_text
+                  % title="$modify_text" aria-label="$modify_text"
-					%	</button>
+                  % style="background:white;">
+                  % <span class="ui-icon ui-icon-pencil"></span>
+                  % <span class="ui-button-text">$modify_text</span>
                   % </a>
-					%};
+              % };
-				%}
+          % }
 
-				%if ($removable eq 'yes')  { 
+          % if ($removable eq 'yes') {
-					%my $remove_text = l('REMOVE');  # Localized text
+            % my $remove_text = l('REMOVE'); # Localized text
-					%my $csrf_token = "TOKEN";  # CSRF token for security
+            % my $csrf_token = "TOKEN"; # CSRF token for security
-					%my $pseudonyms_entry_name = $pseudonym->key;  # pseudonyms_entry name extracted from the data structure
+            % my $pseudonyms_entry_name = $pseudonym->key; # pseudonyms_entry name extracted from the data structure
-					%$actionRemove = qq{
+            % $actionRemove = qq{
-                                        %       <a href="pseudonyms2?CsrfDef=$csrf_token&trt=DEL&pseudonym=$pseudonyms_entry_name">
+              % <a href="pseudonyms2?CsrfDef=$csrf_token&trt=DEL&pseudonym=$pseudonyms_entry_name"
-					%	<button type='button' class='sme-remove-button' title='$remove_text' >
+              % class="sme-remove-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-					%		$remove_text
+              % title="$remove_text" aria-label="$remove_text"
-					%	</button>
+              % style="background:white;">
+              % <span class="ui-icon ui-icon-delete"></span>
+              % <span class="ui-button-text">$remove_text</span>
               % </a>
-					%};
+          % };
-				%}
+        % }
-				<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
+        <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %>
 
       </td>
     </tr>
     % }
   </tbody>
-    	</table>
+</table>
-	<%} %>
+<% } %>
-	</p>
+</p>
 
 
 

root/usr/share/smanager/themes/default/templates/partials/_pse_upd.html.ep

@@ -2,18 +2,18 @@
 
   % my $btn = l('SAVE');
 
-    %= form_for '/pseudonyms2' => (method => 'POST') => begin
+  %= form_for '/pseudonyms2' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'pse_MODIFY_PSEUDONYM'
+        %= l 'pse_MODIFY_PSEUDONYM'
       </h2>
       <br>
-	%=l 'pse_DESC_PSEUDONYM_NAME'
+      %= l 'pse_DESC_PSEUDONYM_NAME'
     </p>
 
     <p>
       <span class=label>
-	%=l 'pse_PSEUDONYM_NAME', class => 'label'
+        %= l 'pse_PSEUDONYM_NAME', class => 'label'
       </span><span class=data>
         %= $pse_datas->{pseudonym}, class => 'data'
       </span>
@@ -21,25 +21,25 @@
 
     <p>
       <span class=label>
-	%=l 'pse_SELECT_ACCOUNT', class => 'label'
+        %= l 'pse_SELECT_ACCOUNT', class => 'label'
       </span><span class=data>
         % param 'Account' => $pse_datas->{account} unless param 'Account';
         %= select_field 'Account' => $c->existing_accounts_list(), class => 'input'
       </span>
     </p>
 
-    %if ( $c->is_pseudonym_not_removable( $pse_datas->{pseudonym} ) ) {
+    % if ( $c->is_pseudonym_not_removable( $pse_datas->{pseudonym} ) ) {
 
       <p>
         <span class=label>
-	%=l 'pse_SELECT_INTERNAL', class => 'label'
+          %= 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>
 
-    %}
+    % }
 
   <p>
     %= submit_button "$btn", class => 'action'
@@ -48,6 +48,6 @@
   %= hidden_field 'trt' => $pse_datas->{trt}
   %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym}
 
-    %end
+  % end
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep

@@ -1,17 +1,17 @@
 <div id='quo_list'>
 
   <p>
-    %    my $modul = $c->render_to_string(inline => $c->l('quo_QUOTA_DESC'));
+    % my $modul = $c->render_to_string( inline => $c->l('quo_QUOTA_DESC') );
     %= $modul
 
     <h3>
-	%=l 'quo_CURRENT_USAGE_AND_SETTINGS'
+      %= l 'quo_CURRENT_USAGE_AND_SETTINGS'
     </h3>
 
     <br>
     % my $numUsers = @$userAccounts;
     % if ($numUsers == 0){
-        %=l 'ACCOUNT_USER_NONE'
+      %= l 'ACCOUNT_USER_NONE'
     % } else {
 
     % my $limit = l('quo_LIMIT_WITH_GRACE_MB'); $limit =~ s#(graceX)#<br>$1#;
@@ -21,10 +21,10 @@
     <table class="sme-border TableSort"><thead>
         <tr>
           <th class='sme-border'>
-    	    %=l 'ACCOUNT'
+            %= l 'ACCOUNT'
           </th>
           <th class='sme-border'>
-    	    %=l 'USER_NAME'
+            %= l 'USER_NAME'
           </th>
           <th class='sme-border'>
             %= $limit
@@ -36,47 +36,49 @@
             %= $current
           </th>
           <th class='sme-border'>
-    	    %=l 'ACTION'
+            %= l 'ACTION'
           </th>
         </tr>
       </thead><tbody>
 
         % foreach my $user (@$userAccounts)
         % {
-    %	    my $uid = getpwnam($user->key);
+          % my $uid = getpwnam( $user->key );
           % unless ($uid) {
-    %		warn($self->localise('COULD_NOT_GET_UID'),$user->key);
+            % warn( $self->localise('COULD_NOT_GET_UID'), $user->key );
             % next;
           % }
-    %	    my $name = $user->prop("FirstName")." ".$user->prop("LastName");
+        % my $name = $user->prop("FirstName") . " " . $user->prop("LastName");
         % my $dev = Quota::getqcarg('/home/e-smith/files');
-    %	    my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
+        % my ( $bc, $bs, $bh, $bt, $ic, $is, $ih, $it ) = Quota::query( $dev, $uid );
         <tr>
-            %= t td => (class => 'sme-border') => $user->key
+          %= t td => ( class => 'sme-border' ) => $user->key
-            %= t td => (class => 'sme-border') => $name
+          %= t td => ( class => 'sme-border' ) => $name
-            %= t td => (class => 'sme-border') => sprintf("%.2f", $bs / 1024 )
+          %= t td => ( class => 'sme-border' ) => sprintf( "%.2f", $bs / 1024 )
-            %= t td => (class => 'sme-border') => sprintf("%.2f", $bh / 1024 )
+          %= t td => ( class => 'sme-border' ) => sprintf( "%.2f", $bh / 1024 )
-            %= t td => (class => 'sme-border') => sprintf("%.2f", $bc / 1024 )
+          %= t td => ( class => 'sme-border' ) => sprintf( "%.2f", $bc / 1024 )
           <td class='sme-border'>
-				%my $modify_text = l('MODIFY');  # Localized text
+            % my $modify_text = l('MODIFY'); # Localized text
-				%my $csrf_token = "TOKEN";  # CSRF token for security
+            % my $csrf_token = "TOKEN"; # CSRF token for security
-				%my $quota_user_name = $user->key;  # quotas_entry name extracted from the data structure
+            % my $quota_user_name = $user->key; # quotas_entry name extracted from the data structure
-				%my $actionModify = qq{
+            % my $actionModify = qq{
-                                %       <a href="quotad?CsrfDef=$csrf_token&trt=UPD&user=$quota_user_name">
+              % <a href="quotad?CsrfDef=$csrf_token&trt=UPD&user=$quota_user_name"
-				%	<button type='button' class='sme-modify-button' title='$modify_text' >
+              % class="sme-modify-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-				%		$modify_text
+              % title="$modify_text" aria-label="$modify_text"
-				%	</button>
+              % style="background:white;">
+              % <span class="ui-icon ui-icon-pencil"></span>
+              % <span class="ui-button-text">$modify_text</span>
               % </a>
-				%};
+          % };
-				<%= $c->render_to_string(inline => $actionModify) %>
+          <%= $c->render_to_string( inline => $actionModify ) %>
         </td>
       </tr>
       % }
     </tbody>
   </table>
-	<%} %>
+  <% } %>
-	</p>
+</p>
 
-        %= hidden_field 'trt' => $quo_datas->{trt}
+%= hidden_field 'trt' => $quo_datas->{trt}
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_quo_upd.html.ep

@@ -2,16 +2,16 @@
 
   % my $btn = l('SAVE');
 
-    %= form_for '/quota2' => (method => 'POST') => begin
+  %= form_for '/quota2' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'quo_MODIFY_USER_TITLE'
+        %= l 'quo_MODIFY_USER_TITLE'
       </h2>
     </p>
 
     % my $userid = $quo_datas->{user};
     % my $user = $quo_datas->{userRec};
-<!--
+    <!--
     for my $user @$userAccounts
     {
     unless ( $user->key eq $userid) {
@@ -19,35 +19,35 @@
     next;
     }
     }
--->
+    -->
-    %	my $uid = getpwnam($user->key);
+    % my $uid = getpwnam( $user->key );
     % unless ($uid) {
-    %		warn(l('COULD_NOT_GET_UID'),$user->key);
+      % warn( l('COULD_NOT_GET_UID'), $user->key );
       % next;
     % }
 
   % my $name = $user->prop("FirstName") . " " . $user->prop("LastName");
   % my $dev = Quota::getqcarg('/home/e-smith/files');
-    %	  my ($bc, $bs, $bh, $bt, $ic, $is, $ih, $it) = Quota::query($dev, $uid);
+  % my ( $bc, $bs, $bh, $bt, $ic, $is, $ih, $it ) = Quota::query( $dev, $uid );
 
   <p>
-	%=l 'quo_USER' 
+    %= l 'quo_USER'
     %= "$name (\"$userid\")"
-	%=l 'quo_CURRENTLY_HAS' 
+    %= l 'quo_CURRENTLY_HAS'
     %= $ic
-        %=l 'quo_FILES' 
+    %= l 'quo_FILES'
-	%=l 'quo_OCCUPYING' 
+    %= l 'quo_OCCUPYING'
     %= $c->toMB($bc)
-	%=l 'quo_MEGABYTES'
+    %= l 'quo_MEGABYTES'
   </p>
 
   <p>
-	%=l 'quo_INSTRUCTIONS'
+    %= l 'quo_INSTRUCTIONS'
   </p>
 
   <p>
     <span class=label>
-	%=l 'quo_USER', class => 'label'
+      %= l 'quo_USER', class => 'label'
     </span><span class=data>
       %= $name, class => 'input'
     </span>
@@ -55,7 +55,7 @@
 
   <p>
     <span class=label>
-	%=l 'quo_LIMIT_WITH_GRACE', class => 'label'
+      %= l 'quo_LIMIT_WITH_GRACE', class => 'label'
     </span><span class=data>
       % param 'Soft' => $quo_datas->{softlim} unless param 'Soft';
       %= text_field 'Soft', class => 'input'
@@ -64,7 +64,7 @@
 
   <p>
     <span class=label>
-	%=l 'quo_ABS_LIMIT', class => 'label'
+      %= l 'quo_ABS_LIMIT', class => 'label'
     </span><span class=data>
       % param 'Hard' => $quo_datas->{hardlim} unless param 'Hard';
       %= text_field 'Hard', class => 'input'

root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep

@@ -1,14 +1,14 @@
-	<p><h2>
+<p><h2>
-	%=l 'rma_TITLE_PPTP'
+    %= l 'rma_TITLE_PPTP'
   </h2><br>
-	%=l 'rma_DESC_PPTP'
+  %= l 'rma_DESC_PPTP'
   <br>
   <span class=label>
-	%=l 'rma_LABEL_PPTP'
+    %= l 'rma_LABEL_PPTP'
   </span><span class=data>
     % param 'PptpSessions' => $c->get_pptp_sessions unless param 'PptpSessions';
     %= text_field 'PptpSessions' => $c->get_pptp_sessions(), class => 'input'
   </span>
-	</p>
+</p>
 
-	<!--<hr class='sectionbar' />-->
+<!--<hr class='sectionbar' />-->

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

@@ -1,7 +1,7 @@
 <div id='swt_theme'>
   <font class="sme-copyright">
     % my $btn = l('swt_THEME');
-    %= form_for $c->url_for('swttheme') => (method => 'POST') => begin
+    %= form_for $c->url_for('swttheme') => ( method => 'POST' ) => begin
       % my $value = $c->session->{'CurrentTheme'};
       % $value = session 'CurrentTheme';
 

root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep

@@ -1,26 +1,26 @@
 % use SrvMngr qw( getNavigation simpleNavMerge );
-%	my %nav1 = %{SrvMngr->getNavigation( $c->languages(), 'U' )};
+% my %nav1 = %{ SrvMngr->getNavigation( $c->languages(), 'U' ) };
-% 	my %nav2 = %{SrvMngr->getNavigation( $c->languages(), 'A', session('username') )};
+% my %nav2 = %{ SrvMngr->getNavigation( $c->languages(), 'A', session('username') ) };
-%	my %nav = $c->session->{is_admin} ? %nav1 : %{SrvMngr->simpleNavMerge(\%nav1, \%nav2)};
+% my %nav = $c->session->{is_admin} ? %nav1 : %{ SrvMngr->simpleNavMerge( \%nav1, \%nav2 ) };
 
-	<div id='usermenu'>
+<div id='usermenu'>
   <a href='#' id='toguser' class='section section-title'>Current User (<%= session 'username' %>)</a>
   <div id='menuuser'>
-%    my $cc = 300;
+    % my $cc = 300;
-%    foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) 
+    % foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'})
-%		<=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
+      % <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
       <!-- div class='section'><%= $h %></div -->
-%		my ($classNew, $target, $href) = '';
+    % my ( $classNew, $target, $href ) = '';
-%		foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} }  @{$nav{$h}{'DESCRIPTIONS'}}) {
+    % foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav{$h}{'DESCRIPTIONS'}}) {
-%			next if ($_->{'MENUCAT'} ne 'A' && $_->{'MENUCAT'} ne 'U' );	# menu User 
+      % next if ( $_->{'MENUCAT'} ne 'A' && $_->{'MENUCAT'} ne 'U' ); # menu User
-%		    if ( $_->{'FILENAME'} =~ m/^2\// ) {
+      % if ( $_->{'FILENAME'} =~ m/^2\// ) {
-%				$target = '_self';
+        % $target = '_self';
-%				(my $file2 = $_->{'FILENAME'}) =~ s|^2/||;
+        % ( my $file2 = $_->{'FILENAME'} ) =~ s|^2/||;
-%				$href = '/smanager/' . $file2;
+        % $href = '/smanager/' . $file2;
-%		    } else {
+      % } else {
-%				$target = 'main';
+      % $target = 'main';
-%				$href = '/server-manager' . $_->{'FILENAME'};
+      % $href = '/server-manager' . $_->{'FILENAME'};
-%		    }
+    % }
   <div class='menu-cell'><a class='item<%= $classNew %>' target='<%= $target %>'
     id='sme<%= $cc %>' href='<%= $href %>'><%= $_->{'DESCRIPTION'} %></a></div>
 % $cc++;
@@ -28,5 +28,5 @@
 
 % }
 
-    </div>
+</div>
-    </div>
+</div>

root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep

@@ -2,16 +2,16 @@
 
   % my $btn = l('REMOVE');
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
+  %= form_for '/useraccountsd' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'usr_REMOVE_ACCOUNT_TITLE'
+        %= l 'usr_REMOVE_ACCOUNT_TITLE'
       </h2>
 
       <br>
-	%= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
+      %= $c->l( 'usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} );
       <br>
-	%= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2'))
+      %= $c->render_to_string( inline => $c->l('usr_REMOVE_DESC2') )
     </p>
 
     <p>

root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep

@@ -3,7 +3,7 @@
 
   % my $btn = l('usr_ADD_USER');
 
-    %= form_for '/useraccounts' => (method => 'POST') => begin
+  %= form_for '/useraccounts' => ( method => 'POST' ) => begin
 
     <p>
       <br>
@@ -13,30 +13,30 @@
   % end
 
   <p>
-	%= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC'))
+    %= $c->render_to_string( inline => $c->l('usr_FIRSTPAGE_DESC') )
     <br>
   </p>
 
   % my $numUsers = @$users;
   % if ($numUsers == 0){
-        %=l 'usr_NO_USER_ACCOUNTS'
+    %= l 'usr_NO_USER_ACCOUNTS'
   % } else {
   <table class="sme-border TableSort"><thead>
       <tr>
         <th class='sme-border'>
-    	    %=l 'ACCOUNT'
+          %= l 'ACCOUNT'
         </th>
         <th class='sme-border'>
-    	    %=l 'USER_NAME'
+          %= l 'USER_NAME'
         </th>
         <th class='sme-border'>
-    	    %=l 'usr_VPN_CLIENT_ACCESS'
+          %= l 'usr_VPN_CLIENT_ACCESS'
         </th>
         <th class='sme-border'>
-    	    %=l 'usr_FORWARDING_ADDRESS'
+          %= l 'usr_FORWARDING_ADDRESS'
         </th>
         <th class='sme-border'>
-    	    %=l 'ACTION'
+          %= l 'ACTION'
         </th>
       </tr>
     </thead><tbody>
@@ -55,104 +55,113 @@
         % my $password_set = $user->prop('PasswordSet');
 
         <tr>
-            %= t td => (class => 'sme-border') => $username
+          %= t td => ( class => 'sme-border' ) => $username
-            %= t td => (class => 'sme-border') => "$first  $last"
+          %= t td => ( class => 'sme-border' ) => "$first $last"
-            %= t td => (class => 'sme-border') => $vpnaccess
+          %= t td => ( class => 'sme-border' ) => $vpnaccess
-            %= t td => (class => 'sme-border') => $fwd
+          %= t td => ( class => 'sme-border' ) => $fwd
-			% my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = '&nbsp;';
+          % my ( $actionModify, $actionLock, $actionResetPw, $actionRemove, $actionroundcube ) = '&nbsp;';
           % my $modify_text = l('MODIFY'); # Localized text
           % 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{
+            % $actionModify = qq{
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
+              % <a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name"
-					%	<button type='button' class='sme-modify-button' title='$modify_text'>
+              % class="sme-modify-button ui-button ui-corner-all ui-widget ui-button-icon-only"
-					%		$modify_text
+              % title="$modify_text" aria-label="$modify_text">
-					%	</button>
+              % <span class="ui-icon ui-icon-pencil"></span>
-					%</a>
+              % <span class="ui-button-text">$modify_text</span>
-				%};                             
+              % </a>
-				%$actionResetPw = qq{
+          % };
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name">
+        % $actionResetPw = qq{
-					%	<button type='button' class='sme-password-button' title='$password_text' >
+          % <a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name"
-					%		$password_text
+          % class="sme-password-button ui-button ui-corner-all ui-widget ui-button-icon-only"
-					%	</button>
+          % title="$password_text" aria-label="$password_text">
-					%</a>
+          % <span class="ui-icon ui-icon-refresh"></span>
-				%};
+          % <span class="ui-button-text">$password_text</span>
-			%} else {
+          % </a>
-				%$actionModify = qq{
+      % };
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
+    % } else {
-					%	<button type='button' class='sme-modify-button' title='$modify_text' >
+    % $actionModify = qq{
-					%		$modify_text
+      % <a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name"
-					%	</button>
+      % class="sme-modify-button ui-button ui-corner-all ui-widget ui-button-icon-only"
-					%</a>
+      % title="$modify_text" aria-label="$modify_text">
-				%};
+      % <span class="ui-icon ui-icon-pencil"></span>
-			%}
+      % <span class="ui-button-text">$modify_text</span>
-			%if ($password_set ne 'yes') {
+      % </a>
-				%$actionLock = l('ACCOUNT_LOCKED');
+  % };
-				%$actionResetPw = qq{
+  % }
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
+  % if ($password_set ne 'yes') {
-						%	<button type='button' class='sme-password-button unset' title="$password_text - currently unset" style = background:pink; >
+    % $actionLock = l('ACCOUNT_LOCKED');
-						%		$password_text
+    % $actionResetPw = qq{
-						%	</button>
+      % <a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name"
-					%</a>
+      % class="sme-password-button unset ui-button ui-corner-all ui-widget ui-button-icon-only"
-				%};
+      % title="$password_text" aria-label="$password_text"
-			%} elsif ($useraccounts_user_name ne 'admin') {
+      % style="background:pink;">
-				% my $lock_text = l('ACCOUNT LOCKED');  # Localized text
+      % <span class="ui-icon ui-icon-refresh"></span>
-				% my $csrf_token = "TOKEN";  # CSRF token for security
+      % <span class="ui-button-text">$password_text</span>
-				% my $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+      % </a>
-				%$actionLock = qq{
+  % };
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
+% } elsif ($useraccounts_user_name ne 'admin') {
-						%	<button type='button' class='sme-lock-button' title='$lock_text' >
+% my $lock_text = l('LOCK_ACCOUNT'); # Localized text
-						%		$lock_text
+% my $csrf_token = "TOKEN"; # CSRF token for security
-						%	</button>
+% my $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure
-					%</a>
+% $actionLock = qq{
-					%};
+  % <a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name"
-				%$actionResetPw = qq{
+  % class="sme-lock-button ui-button ui-corner-all ui-widget ui-button-icon-only"
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
+  % title="$lock_text" aria-label="$lock_text">
-					%	<button type='button' class='sme-password-button' title='$password_text' >
+  % <span class="ui-icon ui-icon-locked"></span>
-					%		$password_text
+  % <span class="ui-button-text">$lock_text</span>
-					%	</button>
+  % </a>
-					%</a>
+% };
-					%};
+% $actionResetPw = qq{
-			%}
+  % <a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name"
-			%if ( $removable eq 'yes' )  { 
+  % class="sme-password-button ui-button ui-corner-all ui-widget ui-button-icon-only"
+  % title="$password_text" aria-label="$password_text">
+  % <span class="ui-icon ui-icon-refresh"></span>
+  % <span class="ui-button-text">$password_text</span>
+  % </a>
+% };
+% }
+% if ( $removable eq 'yes' ) {
   % my $remove_text = l('REMOVE'); # Localized text
   % my $csrf_token = "TOKEN"; # CSRF token for security
-				%$actionRemove = qq{
+  % $actionRemove = qq{
-					%<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
+    % <a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name"
-					%	<button type='button' class='sme-remove-button' title='$remove_text' >
+    % class="sme-remove-button ui-button ui-corner-all ui-widget ui-button-icon-only"
-					%		$remove_text
+    % title="$remove_text" aria-label="$remove_text">
-					%	</button>
+    % <span class="ui-icon ui-icon-trash"></span>
-					%</a>
+    % <span class="ui-button-text">$remove_text</span>
-				%};
+    % </a>
-			%}
+  % };
+% }
 
-		    % my $thisdomain = $c->req->url->to_abs->host;
+% my $thisdomain = $c->req->url->to_abs->host;
-			% my $roundcube_text = l('Webmail');  # Localized text
+% my $roundcube_text = l('Webmail'); # Localized text
-			% $csrf_token = "TOKEN";  # CSRF token for security
+% $csrf_token = "TOKEN"; # CSRF token for security
-			% $useraccounts_user_name = $user->key;  # useraccountss_entry name extracted from the data structure
+% $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure
-			% $actionroundcube = qq{
+% $actionroundcube = qq{
-				%<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px">
+  % <a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name&height=600px"
-				%	<button type='button' class='sme-email-button' title='$roundcube_text' >
+  % class="sme-email-button ui-button ui-corner-all ui-widget ui-button-icon-only"
-				%		$roundcube_text
+  % title="$roundcube_text" aria-label="$roundcube_text">
-				%	</button>
+  % <span class="ui-icon ui-icon-mail-closed"></span>
-				%</a>
+  % <span class="ui-button-text">$roundcube_text</span>
-			%};
+  % </a>
-			<td class='sme-border' style="min-width:35em">
+% };
-					<%= $c->render_to_string(inline => $actionModify) %>
+<td class='sme-border' style="min-width:35em">
-					<%= $c->render_to_string(inline => $actionResetPw) %>
+  <%= $c->render_to_string( inline => $actionModify ) %>
-					<%= $c->render_to_string(inline => $actionLock) %>
+  <%= $c->render_to_string( inline => $actionResetPw ) %>
-					<%= $c->render_to_string(inline => $actionRemove) %>
+  <%= $c->render_to_string( inline => $actionLock ) %>
-					<%= $c->render_to_string(inline => $actionroundcube) %>
+  <%= $c->render_to_string( inline => $actionRemove ) %>
-			</td>
+  <%= $c->render_to_string( inline => $actionroundcube ) %>
-    	</tr>
+</td>
-    %    }
+</tr>
-    	</tbody>
+% }
-    	</table>
+</tbody>
+</table>
 
-	<%} %>
+<% } %>
 
-        %= hidden_field 'trt' => $usr_datas->{trt}
+%= hidden_field 'trt' => $usr_datas->{trt}
 
 </div>

root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep

@@ -2,16 +2,16 @@
 
   % my $btn = l('usr_LOCK');
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
+  %= form_for '/useraccountsd' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'usr_LOCK_ACCOUNT_TITLE'
+        %= l 'usr_LOCK_ACCOUNT_TITLE'
       </h2>
 
       <br>
-	%= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} );
+      %= $c->l( 'usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} );
       <br>
-	%= $c->render_to_string(inline => $c->l('usr_LOCK_DESC2'))
+      %= $c->render_to_string( inline => $c->l('usr_LOCK_DESC2') )
     </p>
 
     <p>

root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep

@@ -2,39 +2,39 @@
 
   % my $btn = l('SAVE');
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
+  %= form_for '/useraccountsd' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'RESET_PASSWORD_TITLE'
+        %= l 'RESET_PASSWORD_TITLE'
       </h2>
 
       <br>
-	%= $c->l('usr_RESET_DESC', $usr_datas->{user}, $usr_datas->{name} );
+      %= $c->l( 'usr_RESET_DESC', $usr_datas->{user}, $usr_datas->{name} );
       <br>
       %= l 'usr_RESET_DESC2'
     </p>
 
     <p>
-    % my $strength = uc($usr_datas->{passwdstrength});
+      % 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')) %>
+      <%= $c->render_to_string( inline => l('usr_PASSWORD_WIKI') ) %>
     </p>
 
 
     <p>
       <span class=label>
-	%=l 'PASSWORD_NEW', class => 'label'
+        %= l 'PASSWORD_NEW', class => 'label'
       </span><span class=data>
-	%= password_field 'newPass', class => 'input', class=>'sme-password'
+        %= password_field 'newPass', class => 'input', class => 'sme-password'
       </span>
     </p>
 
     <p>
       <span class=label>
-	%=l 'PASSWORD_VERIFY_NEW', class => 'label'
+        %= l 'PASSWORD_VERIFY_NEW', class => 'label'
       </span><span class=data>
-	%= password_field 'newPassVerify', class => 'input', class=>'sme-password'
+        %= password_field 'newPassVerify', class => 'input', class => 'sme-password'
       </span>
     </p>
 

root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep

@@ -2,40 +2,40 @@
 
   % my $btn = l('SAVE');
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
+  %= form_for '/useraccountsd' => ( method => 'POST' ) => begin
     <p>
       %= l 'usr_SYSTEM_PASSWORD_DESCRIPTION'
     </p>
 
     <p>
-    % my $strength = uc($usr_datas->{passwdstrength});
+      % 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')) %>
+      <%= $c->render_to_string( inline => l('usr_PASSWORD_WIKI') ) %>
     </p>
 
 
     <p>
       <span class=label>
-	%=l 'usr_CURRENT_SYSTEM_PASSWORD', class => 'label'
+        %= l 'usr_CURRENT_SYSTEM_PASSWORD', class => 'label'
       </span><span class=data>
-	%= password_field 'CurPass', class => 'input', class=>'sme-password'
+        %= password_field 'CurPass', class => 'input', class => 'sme-password'
       </span>
     </p>
 
     <p>
       <span class=label>
-	%=l 'usr_NEW_SYSTEM_PASSWORD', class => 'label'
+        %= l 'usr_NEW_SYSTEM_PASSWORD', class => 'label'
       </span><span class=data>
-	%= password_field 'Pass', class => 'input', class=>'sme-password'
+        %= password_field 'Pass', class => 'input', class => 'sme-password'
       </span>
     </p>
 
     <p>
       <span class=label>
-	%=l 'usr_NEW_SYSTEM_PASSWORD_VERIFY', class => 'label'
+        %= l 'usr_NEW_SYSTEM_PASSWORD_VERIFY', class => 'label'
       </span><span class=data>
-	%= password_field 'PassVerify', class => 'input', class=>'sme-password'
+        %= password_field 'PassVerify', class => 'input', class => 'sme-password'
       </span>
     </p>
 

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

@@ -3,18 +3,18 @@
 
   % my $btn = l('ADD');
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
+  %= form_for '/useraccountsd' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'usr_P2_TITLE'
+        %= l 'usr_P2_TITLE'
       </h2>
       <br>
-	%= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC'))
+      %= $c->render_to_string( inline => l('usr_CREATE_MODIFY_DESC') )
     </p>
 
     <p>
       <span class=label>
-	%=l 'usr_ACCOUNT_NAME'
+        %= l 'usr_ACCOUNT_NAME'
       </span><span class=data>
         % if ( $usr_datas->{trt} eq 'ADD' ) {
           % param 'user' => $usr_datas->{user} unless param 'user';
@@ -28,7 +28,7 @@
 
   <p>
     <span class=label>
-	%=l 'usr_FIRSTNAME'
+      %= l 'usr_FIRSTNAME'
     </span><span class=data>
       % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
       %= text_field 'FirstName', class => 'input'
@@ -36,7 +36,7 @@
   </p>
   <p>
     <span class=label>
-	%=l 'usr_LASTNAME'
+      %= l 'usr_LASTNAME'
     </span><span class=data>
       % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
       %= text_field 'LastName', class => 'input'
@@ -45,7 +45,7 @@
 
   <p>
     <span class=label>
-	%=l 'usr_DEPARTMENT'
+      %= l 'usr_DEPARTMENT'
     </span><span class=data>
       % param 'Dept' => $usr_datas->{dept} unless param 'Dept';
       %= text_field 'Dept', class => 'input'
@@ -53,7 +53,7 @@
   </p>
   <p>
     <span class=label>
-	%=l 'usr_COMPANY'
+      %= l 'usr_COMPANY'
     </span><span class=data>
       % param 'Company' => $usr_datas->{company} unless param 'Company';
       %= text_field 'Company', class => 'input'
@@ -61,7 +61,7 @@
   </p>
   <p>
     <span class=label>
-	%=l 'usr_STREET_ADDRESS'
+      %= l 'usr_STREET_ADDRESS'
     </span><span class=data>
       % param 'Street' => $usr_datas->{street} unless param 'Street';
       %= text_field 'Street', class => 'input'
@@ -69,7 +69,7 @@
   </p>
   <p>
     <span class=label>
-	%=l 'usr_CITY'
+      %= l 'usr_CITY'
     </span><span class=data>
       % param 'City' => $usr_datas->{city} unless param 'City';
       %= text_field 'City', class => 'input'
@@ -77,7 +77,7 @@
   </p>
   <p>
     <span class=label>
-	%=l 'usr_PHONE_NUMBER'
+      %= l 'usr_PHONE_NUMBER'
     </span><span class=data>
       % param 'Phone' => $usr_datas->{phone} unless param 'Phone';
       %= text_field 'Phone', class => 'input'
@@ -85,7 +85,7 @@
   </p>
   <p>
     <span class=label>
-	%=l 'usr_EMAIL_DELIVERY'
+      %= l 'usr_EMAIL_DELIVERY'
     </span><span class=data>
       % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
       %= select_field 'EmailForward' => $c->emailForward_list(), class => 'input'
@@ -93,7 +93,7 @@
   </p>
   <p>
     <span class=label>
-	%=l 'usr_FORWARDING_ADDRESS'
+      %= l 'usr_FORWARDING_ADDRESS'
     </span><span class=data>
       % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
       %= text_field 'ForwardAddress', class => 'input'
@@ -102,42 +102,42 @@
 
   <p>
     <span class=label>
-	%=l 'usr_VPN_CLIENT_ACCESS'
+      %= 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>
 
   % if ( $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) {
     % my $btn2 = $c->l('DOWNLOAD');
-	%= form_for '/useraccountso' => (method => 'POST') => begin
+    %= form_for '/useraccountso' => ( method => 'POST' ) => begin
       <p>
         <span class=label>
-	%=l 'usr_LABEL_IPSECRW_DOWNLOAD'
+          %= l 'usr_LABEL_IPSECRW_DOWNLOAD'
         </span><span class=data>
           %= submit_button $btn2, class => 'action'
         </span>
       </p>
       %= hidden_field 'trt' => 'CRT'
       %= hidden_field 'user' => $usr_datas->{user}
-	%end
+    % end
   % }
 
-    %	my @groups = @{$c->get_groups()};
+  % my @groups = @{ $c->get_groups() };
   % if ( @groups ) {
     <p>
       <span class=label>
-	%=l 'usr_GROUP_MEMBERSHIPS'
+        %= l 'usr_GROUP_MEMBERSHIPS'
       </span>
       <span class=data>
         <table class="sme-border "><thead>
             <tr><th class='sme-border'>
-    	    %=l 'usr_MEMBER'
+                %= l 'usr_MEMBER'
               </th><th class='sme-border'>
-    	    %=l 'GROUP'
+                %= l 'GROUP'
               </th><th class='sme-border'>
-    	    %=l 'DESCRIPTION'
+                %= l 'DESCRIPTION'
             </th></tr>
           </thead><tbody>
 
@@ -155,13 +155,13 @@
                 % if ( $checked eq 'checked' ) {
                   <!-- % = check_box 'groupMemberships', value => $groupname, checked => $checked -->
                   <input type='checkbox' name='groupMemberships' checked value='<%= $groupname %>'>
-	    %} else {
+                % } else {
                 %= check_box 'groupMemberships' => $groupname
-	    %}
+              % }
             </td>
             <!-- t td => (class => 'sme-border') => (check_box ' groupMemberships' => $groupname  $checked) -->
-            %= t td => (class => 'sme-border') => $groupname
+            %= t td => ( class => 'sme-border' ) => $groupname
-            %= t td => (class => 'sme-border') => "$description"
+            %= t td => ( class => 'sme-border' ) => "$description"
           </tr>
           % }
         </tbody>

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

@@ -2,16 +2,16 @@
 
   % my $btn = l('SAVE');
 
-    %= form_for '/useraccountsd' => (method => 'POST') => begin
+  %= form_for '/useraccountsd' => ( method => 'POST' ) => begin
     <p>
       <h2>
-	%=l 'usr_MODIFY_ADMIN_TITLE'
+        %= l 'usr_MODIFY_ADMIN_TITLE'
       </h2><br>
     </p>
 
     <p>
       <span class=label>
-	%=l 'usr_ACCOUNT_NAME'
+        %= l 'usr_ACCOUNT_NAME'
       </span><span class=data>
         % $btn = l('SAVE');
         %= $usr_datas->{user}, class => 'data'
@@ -20,7 +20,7 @@
 
     <p>
       <span class=label>
-	%=l 'usr_FIRSTNAME'
+        %= l 'usr_FIRSTNAME'
       </span><span class=data>
         % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName';
         %= text_field 'FirstName', class => 'input'
@@ -28,7 +28,7 @@
     </p>
     <p>
       <span class=label>
-	%=l 'usr_LASTNAME'
+        %= l 'usr_LASTNAME'
       </span><span class=data>
         % param 'LastName' => $usr_datas->{lastname} unless param 'LastName';
         %= text_field 'LastName', class => 'input'
@@ -37,7 +37,7 @@
 
     <p>
       <span class=label>
-	%=l 'usr_EMAIL_DELIVERY'
+        %= l 'usr_EMAIL_DELIVERY'
       </span><span class=data>
         % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward';
         %= select_field 'EmailForward' => $c->emailForward_list(), class => 'input'
@@ -45,7 +45,7 @@
     </p>
     <p>
       <span class=label>
-	%=l 'usr_FORWARDING_ADDRESS'
+        %= l 'usr_FORWARDING_ADDRESS'
       </span><span class=data>
         % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress';
         %= text_field 'ForwardAddress', class => 'input'
@@ -54,26 +54,26 @@
 
     <p>
       <span class=label>
-	%=l 'usr_VPN_CLIENT_ACCESS'
+        %= 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>
 
     % if ( $c->ipsec_for_acct eq 'OK' ) {
       % my $btn2 = $c->l('DOWNLOAD');
-	%= form_for '/useraccountso' => (method => 'POST') => begin
+      %= form_for '/useraccountso' => ( method => 'POST' ) => begin
         <p>
           <span class=label>
-	%=l 'usr_LABEL_IPSECRW_DOWNLOAD'
+            %= l 'usr_LABEL_IPSECRW_DOWNLOAD'
           </span><span class=data>
             %= submit_button $btn2, class => 'action'
           </span>
         </p>
         %= hidden_field 'trt' => 'CRT'
         %= hidden_field 'user' => $usr_datas->{user}
-	%end
+      % end
     % }
 
   <p>

root/usr/share/smanager/themes/default/templates/portforwarding.html.ep

@@ -1,32 +1,32 @@
 % layout 'default', title => "Sme server 2 - Port Forwards";
 
 % content_for 'module' => begin
-<div id='module' class='module portforwarding-panel'>
+  <div id='module' class='module portforwarding-panel'>
 
     % if (config->{debug} == 1) {
       <p>
-		%= dumper "<pf>".$c->current_route
+        %= dumper "<pf>" . $c->current_route
           %= dumper $c->stash("ret")
           %= dumper $c->stash("portforwarding")
           % my $ref = $pf_datas->{portforwarding};
-		%= dumper $ref->{TCP}->[0]."</pf>"
+          %= dumper $ref->{TCP}->[0] . "</pf>"
       </p>
     % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
   %= $modul
 
   % if ($pf_datas->{trt} eq 'ADD') {
     %= include 'partials/_pf_add'
-    %} elsif ($pf_datas->{trt} eq 'ADD1') {
+  % } elsif ($pf_datas->{trt} eq 'ADD1') {
   %= include 'partials/_pf_add'
-    %} elsif ($pf_datas->{trt} eq 'DEL') {
+  % } elsif ($pf_datas->{trt} eq 'DEL') {
   %= include 'partials/_pf_del'
-	%} elsif ($pf_datas->{trt} eq 'DEL1'){
+  % } elsif ($pf_datas->{trt} eq 'DEL1'){
   %= include 'partials/_pf_list'
-	%} else {
+  % } else {
   %= include 'partials/_pf_list'
-	%}
+  % }
 
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/printers.html.ep

@@ -1,32 +1,32 @@
 % layout 'default', title => "Sme server 2 - printers";
 
 % content_for 'module' => begin
-<div id='module' class='module printers-panel'>
+  <div id='module' class='module printers-panel'>
 
-    %if (config->{debug} == 1) {
+    % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
         %= dumper $prt_datas
       </p>
-    %}
+    % }
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-			%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   % if ($prt_datas->{trt} eq 'ADD') {
     %= include 'partials/_prt_add'
-    %} elsif ($prt_datas->{trt} eq 'DEL') {
+  % } elsif ($prt_datas->{trt} eq 'DEL') {
   %= include 'partials/_prt_del'
-	%} elsif ($prt_datas->{trt} eq 'NET') {
+  % } elsif ($prt_datas->{trt} eq 'NET') {
   %= include 'partials/_prt_net'
-	    %} else {
+  % } else {
   %= include 'partials/_prt_list'
-	    %}
+  % }
 
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/proxy.html.ep

@@ -1,43 +1,43 @@
 % layout 'default', title => "Sme server 2 - proxy";
 
 % content_for 'module' => begin
-<div id='module' class='module proxy-panel'>
+  <div id='module' class='module proxy-panel'>
-    %if (config->{debug} == 1) {
+    % if (config->{debug} == 1) {
       <p>(DBG)route: <%= $c->current_route %><br>
-	(DBG)ht stat: <%= $prx_datas->{http_proxy_status}%> <br>
+        (DBG)ht stat: <%= $prx_datas->{http_proxy_status} %> <br>
-	(DBG)sm stat: <%=$prx_datas->{smtp_proxy_status} %>
+        (DBG)sm stat: <%= $prx_datas->{smtp_proxy_status} %>
       </p>
-    %}
+    % }
   <h1><%= $title %></h1>
   <br>
   <%= $modul %>
   <% my $btn = l('SAVE'); %>
 
-    %= form_for 'proxy' => (method => 'POST') => begin
+  %= form_for 'proxy' => ( method => 'POST' ) => begin
     <p>
-	%=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION'
+      %= l 'prx_HTTP_PROXY_STATUS_DESCRIPTION'
       <br><br>
       <span class=label>
-	%=l 'prx_HTTP_PROXY_STATUS_LABEL'
+        %= 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} ) {
+    % if ( $prx_datas->{smtp_proxy_status} ) {
       <p>
-	    %=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION'
+        %= l 'prx_SMTP_PROXY_STATUS_DESCRIPTION'
         <br><br>
         <span class=label>
-	    %=l 'prx_SMTP_PROXY_STATUS_LABEL'
+          %= 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>
-	%}
+    % }
   %= submit_button "$btn", class => 'action'
   % end
 </div>
-%end
+% end

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

@@ -1,7 +1,7 @@
 % layout 'default', title => "Sme server 2 - pseudonyms";
 
 % content_for 'module' => begin
-<div id='module' class='module pseudonyms-panel'>
+  <div id='module' class='module pseudonyms-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -12,21 +12,21 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   % if ($pse_datas->{trt} eq 'ADD') {
     %= include 'partials/_pse_add'
-    %} elsif ($pse_datas->{trt} eq 'DEL') {
+  % } elsif ($pse_datas->{trt} eq 'DEL') {
   %= include 'partials/_pse_del'
-	%} elsif ($pse_datas->{trt} eq 'UPD') {
+  % } elsif ($pse_datas->{trt} eq 'UPD') {
   %= include 'partials/_pse_upd'
-	    %} else {
+  % } else {
   %= include 'partials/_pse_list'
-	    %}
+  % }
 
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/qmailanalog.html.ep

@@ -1,19 +1,19 @@
 % layout 'default', title => "Sme server 2 - qmailanalog";
 % content_for 'module' => begin
-<div id='module' class='module qmailanalog-panel'>
+  <div id='module' class='module qmailanalog-panel'>
-    %if (config->{debug} == 1) {
+    % if (config->{debug} == 1) {
       <p>
         (DBG)route: <%= $c->current_route %><br>
       </p>
-    %}
+    % }
   <h1><%= $title %></h1>
   <br>
   <%= $modul %>
   <% my $btn = l('qma_GENERATE_REPORT'); %>
-    %= form_for 'qmailanalog' => (method => 'POST') => begin
+  %= form_for 'qmailanalog' => ( method => 'POST' ) => begin
     <p>
       <span class=label>
-		%=l 'qma_REPORT_TYPE'
+        %= l 'qma_REPORT_TYPE'
       </span><span class=data>
         <!-- (to be sorted) -->
         %= select_field 'report_type' => $c->reportType_list(), id => 'analysis_type'
@@ -33,11 +33,11 @@
       <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>
 
     %= submit_button "$btn", class => 'action'
   % end
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/quota.html.ep

@@ -1,7 +1,7 @@
 % layout 'default', title => "Sme server 2 - quota";
 
 % content_for 'module' => begin
-<div id='module' class='module quota-panel'>
+  <div id='module' class='module quota-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -12,18 +12,18 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   % if ($quo_datas->{trt} eq 'UPD') {
     %= include 'partials/_quo_upd'
-    %} else {
+  % } else {
   %= include 'partials/_quo_list'
-    %}
+  % }
 
 </div>
-%end
+% end
 

root/usr/share/smanager/themes/default/templates/reboot.html.ep

@@ -2,13 +2,13 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module reboot-panel'>
+  <div id='module' class='module reboot-panel'>
 
-    %if (config->{debug} == 1) {
+    % if (config->{debug} == 1) {
       <p>
         (DBG)route: <%= $c->current_route %><br>
       </p>
-    %}
+    % }
 
   <h1><%= $title %></h1>
   <br>
@@ -16,14 +16,14 @@
   %= $modul
 
   <% my $btn = l('PERFORM'); %>
-    %= form_for 'reboot' => (method => 'POST') => begin
+  %= form_for 'reboot' => ( method => 'POST' ) => begin
 
     <p>
-    %= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION'))
+      %= $c->render_to_string( inline => $c->l('rbo_DESCRIPTION') )
       <br><br>
 
       <span class=label>
-	%=l 'rbo_LABEL_REBOOT'
+        %= l 'rbo_LABEL_REBOOT'
       </span>
       <span class=data>
         %= select_field 'function' => $c->rebootFunction_list()
@@ -34,7 +34,7 @@
 
   % end
 
-    %= hidden_field 'debug' => '0'
+  %= hidden_field 'debug' => '1'
 
 </div>
-%end
+% end

root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep

@@ -1,7 +1,7 @@
 % layout 'default', title => "Sme server 2 - remoteaccess";
 
 % content_for 'module' => begin
-<div id='module' class='module remoteaccess-panel'>
+  <div id='module' class='module remoteaccess-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -9,205 +9,205 @@
         %= dumper $rma_datas
       </p>
     % }
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
   % if ( $notif ) {
     <br>
     <span class=sme-error>
-	<%= $c->render_to_string(inline => $notif) %>
+      <%= $c->render_to_string( inline => $notif ) %>
     </span>
-    %}
+  % }
 
   <!--<hr class='sectionbar' />-->
 
   <% my $btn = l('SAVE'); %>
 
-    %= form_for 'remoteaccess' => (method => 'POST') => begin
+  %= form_for 'remoteaccess' => ( method => 'POST' ) => begin
 
     % my $ipsec = $c->get_ipsecrw_status();
     % if ( $ipsec ) {
       <p>
         <h2>
-	%=l 'rma_TITLE_IPSECRW'
+          %= l 'rma_TITLE_IPSECRW'
         </h2><br>
 
-	%=l 'rma_DESC_IPSECRW'
+        %= l 'rma_DESC_IPSECRW'
         <br>
 
         <span class=label>
-	%=l 'rma_LABEL_IPSECRW_SESS'
+          %= l 'rma_LABEL_IPSECRW_SESS'
         </span><span class=data>
           % param 'IpsecrwSess' => $c->get_ipsecrw_sessions unless param 'IpsecrwSess';
           %= text_field 'IpsecrwSess', class => 'input'
         </span>
         <br>
 
-	%= $c->render_to_string(inline => $c->l('rma_DESC_IPSECRW_RESET'));
+        %= $c->render_to_string( inline => $c->l('rma_DESC_IPSECRW_RESET') );
         <br>
         <span class=label>
-	%=l 'rma_LABEL_IPSECRW_RESET'
+          %= l 'rma_LABEL_IPSECRW_RESET'
         </span><span class=data>
-	%= check_box 'IpsecrwReset',class => 'input'
+          %= check_box 'IpsecrwReset', class => 'input'
         </span>
         <br><br>
 
         <!--<hr class='sectionbar' />-->
 
-    %}
+      % }
 
     <!-- percequ include 'partials/_rma_pptp' -->
 
     <h2>
-	%= $c->l('rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT'));
+      %= $c->l( 'rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT') );
     </h2><br>
-	%=l 'rma_VALIDFROM_DESC'
+    %= l 'rma_VALIDFROM_DESC'
     <br><br>
 
     % my @vals = $self->_get_valid_from();
     % if (@vals) {
       <table class="sme-border TableSort"><thead>
           <tr><th class='sme-border'>
-    	    %=l 'NETWORK'
+              %= l 'NETWORK'
             </th><th class='sme-border'>
-    	    %=l 'SUBNET_MASK'
+              %= l 'SUBNET_MASK'
             </th><th class='sme-border'>
-    	    %=l 'NUM_OF_HOSTS'
+              %= l 'NUM_OF_HOSTS'
             </th><th class='sme-border'>
-    	    %=l 'REMOVE'
+              %= l 'REMOVE'
           </th></tr>
       </thead></tbody>
 
-    %    foreach my $val ( @vals )
+      % foreach my $val (@vals)
       % {
-    %        my ($net, $mask) = split '/', $val;
+        % my ( $net, $mask ) = split '/', $val;
         % $mask = '255.255.255.255' unless ($mask);
-    %        my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask);
+        % my ( $numhosts, $a, $b ) = esmith::util::computeHostRange( $net, $mask );
         <tr>
-            %= t td => (class => 'sme-border') => $net
+          %= t td => ( class => 'sme-border' ) => $net
-            %= t td => (class => 'sme-border') => $mask
+          %= t td => ( class => 'sme-border' ) => $mask
-            %= t td => (class => 'sme-border') => $numhosts
+          %= t td => ( class => 'sme-border' ) => $numhosts
-            <td class='sme-border'><input type='checkbox' name='Remove_nets' value='<%= $net.'/'.$mask %>'> </td>
+          <td class='sme-border'><input type='checkbox' name='Remove_nets' value='<%= $net . '/' . $mask %>'> </td>
         </tr>
       % }
 
   </tbody>
-    	</table>    
+</table>
 
-	<!-- my @cbGroup = $q->checkbox_group(-name => 'validFromRemove',
+<!-- my @cbGroup = $q->checkbox_group(-name => 'validFromRemove',
-		-values => [@vals], -labels => { map {$_ => ''} @vals });
+-values => [@vals], -labels => { map {$_ => ''} @vals });
-    	    foreach my $val (@vals)
+foreach my $val (@vals)
-    		{ esmith::cgi::genSmallCell($q, shift(@cbGroup), } -->
+{ esmith::cgi::genSmallCell($q, shift(@cbGroup), } -->
-    % } else {
+% } else {
-	<br><b>
+<br><b>
   %= l('rma_NO_ENTRIES_YET');
-	</b>
+</b>
-    %}
+% }
-	%=l 'rma_DESC_VALID_FROM_ENTRIES'
+%= l 'rma_DESC_VALID_FROM_ENTRIES'
-	<br><br>
+<br><br>
-	<span class=label>
+<span class=label>
-	%=l 'NETWORK'
+  %= l 'NETWORK'
-	</span><span class=data>
+</span><span class=data>
   %= text_field 'ValidFromNetwork', class => 'input'
-	</span>
+</span>
-	<br>
+<br>
-	<span class=label>
+<span class=label>
-	%=l 'rma_SUBNET_MASK'
+  %= l 'rma_SUBNET_MASK'
-	</span><span class=data>
+</span><span class=data>
   %= text_field 'ValidFromMask', class => 'input'
-	</span>
+</span>
 
-	<!--<hr class='sectionbar' />-->
+<!--<hr class='sectionbar' />-->
 
-	<h2>
+<h2>
-	%=l 'rma_TITLE_SSH'
+  %= l 'rma_TITLE_SSH'
-	</h2><br>
+</h2><br>
-	%=l 'rma_DESC_SSH'
+%= l 'rma_DESC_SSH'
-	<br><br>
+<br><br>
-	<span class=label>
+<span class=label>
-	%=l 'rma_LABEL_SSH'
+  %= l 'rma_LABEL_SSH'
-	</span><span class=data>
+</span><span class=data>
   % param 'SshAccess' => $c->get_ssh_access() unless param 'SshAccess';
   %= select_field 'SshAccess' => $c->networkAccess_list(), class => 'input'
-	</span>
+</span>
-	<br>
+<br>
 
-	<span class=label>
+<span class=label>
-	%=l 'rma_LABEL_SSH_ADMIN'
+  %= l 'rma_LABEL_SSH_ADMIN'
-	</span><span class=data>
+</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>
+</span>
-	<br>
+<br>
 
-	<span class=label>
+<span class=label>
-	%=l 'rma_LABEL_SSH_PASSWORD_ACCESS'
+  %= l 'rma_LABEL_SSH_PASSWORD_ACCESS'
-	</span><span class=data>
+</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>
+</span>
-	<br>
+<br>
 
-	<span class=label>
+<span class=label>
-	%=l 'rma_LABEL_SSH_PORT'
+  %= l 'rma_LABEL_SSH_PORT'
-	</span><span class=data>
+</span><span class=data>
   % param 'SshTCPPort' => $c->get_ssh_port() unless param 'SshTCPPort';
   %= text_field 'SshTCPPort', class => 'input'
-	</span>
+</span>
-	<br>
+<br>
 
-	<!--<hr class='sectionbar' />-->
+<!--<hr class='sectionbar' />-->
 
-	<h2>
+<h2>
-	%=l 'rma_TITLE_FTP_ACCESS'
+  %= l 'rma_TITLE_FTP_ACCESS'
-	</h2><br>
+</h2><br>
-	%= $c->render_to_string(inline => $c->l('rma_DESC_FTP_ACCESS'));
+%= $c->render_to_string( inline => $c->l('rma_DESC_FTP_ACCESS') );
 
-	<br>
+<br>
-	<span class=label>
+<span class=label>
-	%=l 'rma_LABEL_FTP_ACCESS'
+  %= l 'rma_LABEL_FTP_ACCESS'
-	</span><span class=data>
+</span><span class=data>
   % param 'FtpAccess' => $c->get_ftp_access() unless param 'FtpAccess';
   %= select_field 'FtpAccess' => $c->networkAccess_list(), class => 'input'
-	</span>
+</span>
-	<br>
+<br>
 
-	<br>
+<br>
-	%= $c->render_to_string(inline => $c->l('rma_DESC_FTP_LOGIN'));
+%= $c->render_to_string( inline => $c->l('rma_DESC_FTP_LOGIN') );
-	<br>
+<br>
-	<span class=label>
+<span class=label>
-	%=l 'rma_LABEL_FTP_LOGIN'
+  %= l 'rma_LABEL_FTP_LOGIN'
-	</span><span class=data>
+</span><span class=data>
   % param 'FtpPasswordAccess' => $c->get_ftp_password_login_access() unless param 'FtpPasswordAccess';
   %= select_field 'FtpPasswordAccess' => $c->passwordLogin_list(), class => 'input'
-	</span>
+</span>
-	<br>
+<br>
 
-    % my $mode = $c->get_telnet_mode();
+% my $mode = $c->get_telnet_mode();
-    % if ( $mode ne 'off') {
+% if ( $mode ne 'off') {
   <!--<hr class='sectionbar' />-->
 
   <h2>
-	%=l 'rma_TITLE_TELNET_ACCESS'
+    %= l 'rma_TITLE_TELNET_ACCESS'
   </h2><br>
 
   <span class=sme-error>
-	%=l 'rma_DESC_TELNET_ACCESS'
+    %= l 'rma_DESC_TELNET_ACCESS'
   </span>
   <br><br>
 
   <span class=label>
-	%=l 'rma_LABEL_TELNET_ACCESS'
+    %= l 'rma_LABEL_TELNET_ACCESS'
   </span><span class=data>
     % param 'TelnetAccess' => $mode unless param 'TelnetAccess';
     %= select_field 'TelnetAccess' => $c->networkAccess_list(), class => 'input'
   </span>
   <br>
 
-    %}
+% }
 
-	<br>
+<br>
-	%= submit_button "$btn", class => 'action'
+%= submit_button "$btn", class => 'action'
 
-    % end
+% end
 
 </div>
 

root/usr/share/smanager/themes/default/templates/review.html.ep

@@ -1,44 +1,44 @@
 % layout 'default', title => 'Sme server 2 - Review';
 
 % content_for 'module' => begin
-<div id='central' class='central review-panel module'>
+  <div id='central' class='central review-panel module'>
     <h1> <%= $title %> </h1>
     <%= $modul %><br><br>
 
     %= form_for 'review' => begin
       <b>
-	%=l 'rvw_NETWORKING_PARAMS'
+        %= l 'rvw_NETWORKING_PARAMS'
       </b><br>
 
       <p><span class=label>
-	%=l 'rvw_SERVER_MODE'
+          %= l 'rvw_SERVER_MODE'
         </span>
         %= $rvw_datas->{servermode}
       </p>
 
       <p><span class=label>
-	%=l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK'
+          %= l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK'
         </span>
         %= $rvw_datas->{localip}
       </p>
 
       % if ( $rvw_datas->{publicip} ) {
         <p><span class=label>
-	    %=l 'rvw_INTERNET_VISIBLE_ADDRESS'
+            %= l 'rvw_INTERNET_VISIBLE_ADDRESS'
           </span>
           %= $rvw_datas->{publicip}
         </p>
       % }
 
     <p><span class=label>
-	%=l 'rvw_GATEWAY'
+        %= l 'rvw_GATEWAY'
       </span>
       %= $rvw_datas->{gateway}
       %= $rvw_datas->{serveronly}
     </p>
 
     <p><table width='100%'><tr><td class=label><!--span class=label-->
-	%=l 'rvw_ADDITIONAL_LOCAL_NETWORKS'
+            %= l 'rvw_ADDITIONAL_LOCAL_NETWORKS'
             <!--/span--></td><td>
             %= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );
       </td></tr></table>
@@ -46,7 +46,7 @@
 
     <p><table width='100%'><tr><td class=label>
             <!--<p><span class=label>-->
-	%=l 'rvw_DHCP_SERVER'
+                %= l 'rvw_DHCP_SERVER'
                 <!--</span>-->
             </td><td>
               %= $rvw_datas->{dhcpserver}
@@ -54,52 +54,52 @@
     </td></tr></table></p>
 
     <br><br><b>
-	%=l 'rvw_SERVER_NAMES'
+      %= l 'rvw_SERVER_NAMES'
     </b><br>
 
     <p><span class=label>
-	%=l 'rvw_DNS_SERVER'
+        %= l 'rvw_DNS_SERVER'
       </span>
       %= $rvw_datas->{dnsserver}
     </p>
 
     <p><span class=label>
-	%=l 'rvw_WEB_SERVER'
+        %= l 'rvw_WEB_SERVER'
       </span>
       %= $rvw_datas->{webserver}
     </p>
 
     <p><span class=label>
-	%=l 'rvw_PROXY_SERVER'
+        %= l 'rvw_PROXY_SERVER'
       </span>
       %= $rvw_datas->{proxyserver}
     </p>
 
     <p><span class=label>
-	%=l 'rvw_FTP_SERVER'
+        %= l 'rvw_FTP_SERVER'
       </span>
       %= $rvw_datas->{ftpserver}
     </p>
 
     <p><span class=label>
-	%=l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS'
+        %= l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS'
       </span>
       %= $rvw_datas->{smtpserver}
     </p>
 
     <br><br><b>
-	%=l 'rvw_DOMAIN_INFORMATION'
+      %= l 'rvw_DOMAIN_INFORMATION'
     </b><br>
 
     <p><span class=label>
-	%=l 'rvw_PRIMARY_DOMAIN'
+        %= l 'rvw_PRIMARY_DOMAIN'
       </span>
       %= $rvw_datas->{domainname}
     </p>
 
     <!---<p><span class=label>-->
         <p><table width='100%'><tr><td class=label>
-	%=l 'rvw_VIRTUAL_DOMAINS'
+                %= l 'rvw_VIRTUAL_DOMAINS'
               </td><td>
                 <!--</span>-->
               %= $rvw_datas->{virtualdomains}
@@ -107,25 +107,25 @@
       <!--</p>-->
 
     <p><span class=label>
-	%=l 'rvw_PRIMARY_WEB_SITE'
+        %= l 'rvw_PRIMARY_WEB_SITE'
       </span>
       %= $rvw_datas->{primarywebsite}
     </p>
 
     <p><span class=label>
-	%=l 'rvw_SERVER_MANAGER'
+        %= l 'rvw_SERVER_MANAGER'
       </span>
       %= $rvw_datas->{servermanager}
     </p>
 
     <p><span class=label>
-	%=l 'rvw_USER_PASSWORD_PANEL'
+        %= l 'rvw_USER_PASSWORD_PANEL'
       </span>
       %= $rvw_datas->{usermanager}
     </p>
 
     <p><table width='100%'><tr><td class=label>
-	%=l 'rvw_EMAIL_ADDRESSES'
+            %= l 'rvw_EMAIL_ADDRESSES'
           </td><td>
             %= $rvw_datas->{emailaddresses}
     </td></tr></table></p>

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

@@ -3,7 +3,7 @@
 % content_for 'module' => begin
 
 
-<div id='roundcube' class='roundcube roundcube-panel module'>
+  <div id='roundcube' class='roundcube roundcube-panel module'>
     % if (config->{debug} == 1) {
       <p>
         %= dumper $c->current_route
@@ -11,30 +11,30 @@
     % }
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-			%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
-    <h1><%=$title %></h1><br>
+  <h1><%= $title %></h1><br>
   <p>If the Webmail panel does not appear after logging in, then please check your password.</p><br />
 
   % my $thisdomain = $c->req->url->to_abs->host;
   % my $url = $c->stash('modul');
   % if (!$url) {
-	%	$url = $thisdomain."/roundcube";
+    % $url = $thisdomain . "/roundcube";
-	%}
+  % }
   % my $username = 'admin';
   % if ($url =~ /[?&]_user=([^&]+)/) {
     % $username = $1;
-	%}
+  % }
   % if (!($url =~ /https:/)) {
     % $url = 'https://' . $url;
-	%}
+  % }
 
   <div class='roundcube'>
-		<a href="<%= "https://".$thisdomain."/" %>roundcube?_user=<%= $username %>"><button class="sme-fullwindow1-button" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %></button></a>
+    <a href="<%= "https://" . $thisdomain . "/" %>roundcube?_user=<%= $username %>"><button class="sme-fullwindow1-button" width=20em title="<%= l('Full Window') %>"><%= l('Full Window') %></button></a>
-		<object id="roundcube" data="<%=$url %>" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
+    <object id="roundcube" data="<%= $url %>" title="<%= $c->stash('title') %>"  type="text/html" ><%= $c->stash('title') %> not found</object>
   </div>
 </div>
 
 
-%end
+% end

root/usr/share/smanager/themes/default/templates/support.html.ep

@@ -1,10 +1,10 @@
 % layout 'default', title => 'Sme server 2 - Support';
 
 % content_for 'module' => begin
-<div id='module' class='module support-panel'>
+  <div id='module' class='module support-panel'>
     <p> < %= $title % ></p>
     <br>
     <%= $modul %>
     <br>
-</div>
+  </div>
-%end
+% end

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

@@ -1,7 +1,7 @@
 % layout 'default', title => "Sme server 2 - useraccounts";
 
 % content_for 'module' => begin
-<div id='module' class='module useraccounts-panel'>
+  <div id='module' class='module useraccounts-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -10,31 +10,31 @@
       </p>
     % }
 
-    <h1><%= $title%></h1>
+  <h1><%= $title %></h1>
 
   % if ( $notif ) {
     <br>
     <span class=sme-error>
-	<%= $c->render_to_string(inline => $notif) %>
+      <%= $c->render_to_string( inline => $notif ) %>
     </span>
-    %}
+  % }
 
   % if ($usr_datas->{trt} eq 'ADD' or $usr_datas->{trt} eq 'UPD') {
     %= include 'partials/_usr_upd'
-    %} elsif ($usr_datas->{trt} eq 'DEL') {
+  % } elsif ($usr_datas->{trt} eq 'DEL') {
   %= include 'partials/_usr_del'
-    %} elsif ($usr_datas->{trt} eq 'LCK') {
+  % } elsif ($usr_datas->{trt} eq 'LCK') {
   %= include 'partials/_usr_lock'
-    %} elsif ($usr_datas->{trt} eq 'PWD') {
+  % } elsif ($usr_datas->{trt} eq 'PWD') {
   %= include 'partials/_usr_pwd'
-    %} elsif ($usr_datas->{trt} eq 'PWS') {
+  % } elsif ($usr_datas->{trt} eq 'PWS') {
   %= include 'partials/_usr_pwds'
-    %} elsif ($usr_datas->{trt} eq 'UPS') {
+  % } elsif ($usr_datas->{trt} eq 'UPS') {
   %= include 'partials/_usr_upds'
-    %} else {
+  % } else {
   %= include 'partials/_usr_list'
-    %}
+  % }
 
 </div>
-%end
+% end
 

root/usr/share/smanager/themes/default/templates/userpassword.html.ep

@@ -2,7 +2,7 @@
 
 % content_for 'module' => begin
 
-<div id='module' class='module userpassword-panel'>
+  <div id='module' class='module userpassword-panel'>
 
     % if (config->{debug} == 1) {
       <p>
@@ -17,30 +17,30 @@
 
   % if ( stash 'error' ) {
     <br><div class=sme-error>
-    	%= $c->render_to_string(inline => stash 'error') 
+      %= $c->render_to_string( inline => stash 'error' )
     </div>
-    %}
+  % }
 
   <p>
     % my $btn = l('pwd_PASSWORD_CHANGE');
     % my $url = '/userpassword';
-	%= $c->render_to_string( inline => l('pwd_DESCRIPTION'));
+    %= $c->render_to_string( inline => l('pwd_DESCRIPTION') );
 
     <p>
-    % my $strength = uc($pwd_datas->{passwdstrength});
+      % 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')) %>
+      <%= $c->render_to_string( inline => l('pwd_PASSWORD_WIKI') ) %>
     </p>
 
     % if ( $pwd_datas->{trt} eq 'RESET' ) {
       % $btn = l('pwd_PASSWORD_RESET');
       % $url = '/userpasswordr';
-	%= $c->render_to_string( inline => l('pwd_DESCRIPTION_RESET'));
+      %= $c->render_to_string( inline => l('pwd_DESCRIPTION_RESET') );
     % }
   </p>
 
-    %= form_for $url => (method => 'POST') => begin
+  %= form_for $url => ( method => 'POST' ) => begin
     <p><span class=label>
         %= l 'pwd_YOUR_ACCOUNT'
       </span><span class=data>
@@ -55,22 +55,22 @@
       <p><span class=label>
           %= l 'pwd_PASSWORD_OLD'
         </span><span class=data>
-	%= password_field 'Oldpass', class => 'input', class=>'sme-password'
+          %= password_field 'Oldpass', class => 'input', class => 'sme-password'
         </span>
         <br><br></p>
     % }
 
   <p><span class=label>
-	%=l 'pwd_PASSWORD_NEW'
+      %= l 'pwd_PASSWORD_NEW'
     </span><span class=data>
-	%= password_field 'Pass', class => 'input', class=>'sme-password'
+      %= password_field 'Pass', class => 'input', class => 'sme-password'
     </span>
     <br><br></p>
 
   <p><span class=label>
-	%=l 'pwd_PASSWORD_VERIFY_NEW'
+      %= l 'pwd_PASSWORD_VERIFY_NEW'
     </span><span class=data>
-	%= password_field 'Passverify', class => 'input', class=>'sme-password'
+      %= password_field 'Passverify', class => 'input', class => 'sme-password'
     </span>
     <br><br></p>
 

root/usr/share/smanager/themes/default/templates/viewlogfiles.html.ep

@@ -1,23 +1,23 @@
 % layout 'default', title => "Sme server 2 - viewlogfiles";
 
 % content_for 'module' => begin
-<div id='module' class='module viewlogfiles-panel'>
+  <div id='module' class='module viewlogfiles-panel'>
-    %if (config->{debug} == 1) {
+    % if (config->{debug} == 1) {
       <p>
         (DBG)route: <%= $c->current_route %><br>
       </p>
-    %}
+    % }
   <h1><%= $title %></h1>
   <br>
   <%= $notif %>
   <% my $btn = l('NEXT'); %>
 
-    %= form_for 'viewlogfiles' => (method => 'POST') => begin
+  %= form_for 'viewlogfiles' => ( method => 'POST' ) => begin
     <p>
-	%=l 'log_FIRSTPAGE_DESC'
+      %= l 'log_FIRSTPAGE_DESC'
       <br>
       <span class=label>
-	%=l 'log_LOG_FILE_SELECT_DESC'
+        %= l 'log_LOG_FILE_SELECT_DESC'
       </span><span class=data>
         % param 'Filename' => 'messages';
         <!-- select_field 'Filename' => [['toto'], ['tata']], class => 'input' -->
@@ -26,43 +26,43 @@
     </p>
 
     <p>
-	%=l 'log_FILTER_PATTERN_DESC'
+      %= l 'log_FILTER_PATTERN_DESC'
       <br>
       <span class=label>
-	%=l 'log_FILTER_PATTERN_LABEL'
+        %= l 'log_FILTER_PATTERN_LABEL'
       </span><span class=data>
         %= text_field 'Matchpattern', class => 'input'
       </span>
     </p>
 
     <p>
-	%=l 'log_MATCH_PATTERN_DESC'
+      %= l 'log_MATCH_PATTERN_DESC'
       <br>
       <span class=label>
-	%=l 'log_MATCH_PATTERN_LABEL'
+        %= l 'log_MATCH_PATTERN_LABEL'
       </span><span class=data>
         %= text_field 'Highlightpattern', class => 'input'
       </span>
     </p>
 
     <p>
-	%=l 'log_OP_DESC'
+      %= l 'log_OP_DESC'
       <br>
       <span class=label>
-	%=l 'log_OP_LABEL'
+        %= l 'log_OP_LABEL'
       </span><span class=data>
-	%if ($log_datas->{'default_op'} eq 'download') {
+        % 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>
 
   <p>
-	%=l 'log_END_DESC'
+    %= l 'log_END_DESC'
   </p>
 
   %= submit_button "$btn", class => 'action'
   % end
 </div>
-%end
+% end