From cc4e08b14a66deba122be7adea89f903b594b368 Mon Sep 17 00:00:00 2001 From: John Crisp Date: Tue, 15 Apr 2025 20:43:24 +0200 Subject: [PATCH] Finish template tidy --- .../templates/back_tape_configure.html.ep | 17 ++- .../templates/back_tape_restore.html.ep | 2 +- .../templates/back_workstn_configure.html.ep | 17 ++- .../templates/back_workstn_configure1.html.ep | 112 ++++++++------- .../templates/back_workstn_restore.html.ep | 5 +- .../templates/back_workstn_restore1.html.ep | 2 +- .../back_workstn_sel_restore.html.ep | 21 +-- .../back_workstn_sel_restore1.html.ep | 21 +-- .../back_workstn_sel_restore2.html.ep | 5 +- .../templates/back_workstn_verify.html.ep | 42 +++--- .../templates/back_workstn_verify1.html.ep | 7 +- .../AdminLTE/templates/backdown.html.ep | 4 +- .../themes/AdminLTE/templates/backup.html.ep | 60 ++++---- .../AdminLTE/templates/bugreport.html.ep | 87 +++++++----- .../AdminLTE/templates/bugreport2.html.ep | 2 +- .../themes/AdminLTE/templates/clamav.html.ep | 43 +++--- .../AdminLTE/templates/csrf_400.html.ep | 4 +- .../AdminLTE/templates/datetime.html.ep | 32 +++-- .../themes/AdminLTE/templates/default.html.ep | 2 +- .../AdminLTE/templates/emailaccess.html.ep | 29 ++-- .../AdminLTE/templates/emaildeliver.html.ep | 61 +++++--- .../AdminLTE/templates/emailfilter.html.ep | 89 ++++++++---- .../AdminLTE/templates/emailreceive.html.ep | 122 ++++++++++------ .../AdminLTE/templates/emailsettings.html.ep | 131 ++++++++++++------ .../AdminLTE/templates/embedded.html.ep | 8 +- .../AdminLTE/templates/userpassword.html.ep | 43 ++++-- .../AdminLTE/templates/viewlogfiles.html.ep | 14 +- .../AdminLTE/templates/viewlogfiles2.html.ep | 4 +- .../themes/AdminLTE/templates/welcome.html.ep | 47 ++++--- .../AdminLTE/templates/whatever.html.ep | 2 +- .../AdminLTE/templates/workgroup.html.ep | 14 +- .../themes/AdminLTE/templates/yum.html.ep | 65 ++++++--- .../AdminLTE/templates/yumconfig.html.ep | 61 +++++--- .../AdminLTE/templates/yuminstall.html.ep | 27 ++-- .../AdminLTE/templates/yumlogfile.html.ep | 8 +- smeserver-manager-AdminLTE.spec | 5 +- 36 files changed, 759 insertions(+), 456 deletions(-) diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep index b5daaf1..c68b2c1 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_configure.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -29,7 +29,8 @@

%=l 'bac_ENABLE_TAPE_BACKUP' - + + % if ( $bac_datas->{status} eq 'checked' ) { %} else { @@ -42,7 +43,8 @@

%=l 'bac_TAPE_BACKUP_TIME' - + + % param 'BackupHour' => $bac_datas->{backupHour} unless param 'BackupHour'; %= text_field 'BackupHour', size => '2' % param 'BackupMin' => $bac_datas->{backupMin} unless param 'BackupMin'; @@ -50,7 +52,8 @@ + + % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM'; %= select_field 'BackupAMPM' => ['AM', 'PM'], class => "" @@ -59,7 +62,8 @@

%=l 'bac_LOAD_TAPE_REMINDER_TIME' - + + % param 'ReminderHour' => $bac_datas->{reminderHour} unless param 'ReminderHour'; %= text_field 'ReminderHour', size => '2' % param 'ReminderMin' => $bac_datas->{reminderMin} unless param 'ReminderMin'; @@ -67,7 +71,8 @@ + + % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM'; %= select_field 'ReminderAMPM' => ['AM', 'PM'], class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep index 06770e6..28969a5 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_tape_restore.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -

+
% if (config->{debug} == 1) {

%= dumper $c->current_route diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep index 0c4e887..f77b903 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -

+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -29,19 +29,24 @@ %=l 'bac_WORKSTN_BACKUP_ENABLED' %= $bac_datas->{status} -
+ +
%= $c->render_to_string(inline => $c->workstnBackupConfig()) -

+

+

%= l 'bac_WORKSTATION_BACKUP_SETCONF' -


+ +
%=l 'bac_SELECT_VFS_TYPE' - + + % param 'VFSType' => $bac_datas->{vfstype} unless param 'VFSType'; %= select_field 'VFSType' => $c->get_VFSType_options(), class => "" -

+ +

%= hidden_field 'Function' => $bac_datas->{'function'} . '1' %= submit_button $c->l('NEXT'), class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure1.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure1.html.ep index e62bd11..2a59186 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure1.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_configure1.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -11,7 +11,7 @@ % } % if ( stash 'error' ) { -

+
%= $c->render_to_string(inline => stash 'error')
%} @@ -29,7 +29,8 @@

%=l 'bac_ENABLE_WORKSTN_BACKUP' - + + % if ( $bac_datas->{status} eq 'checked' ) { %} else { @@ -38,60 +39,73 @@

-

+

+

%= l 'bac_WORKSTATION_BACKUP_DEST' -


+ +
% if ( $bac_datas->{vfstype} =~ m/cifs|nfs/s ) { - - %=l 'bac_WORKSTN_NAME' - - % param 'BackupwkStation' => $bac_datas->{station} unless param 'BackupwkStation'; - %= text_field 'BackupwkStation', size => 20, class => "" -
+ + %=l 'bac_WORKSTN_NAME' + + + % param 'BackupwkStation' => $bac_datas->{station} unless param 'BackupwkStation'; + %= text_field 'BackupwkStation', size => 20, class => "" + +
%} % if ( $bac_datas->{vfstype} eq 'usb' ) { - - %=l 'bac_local removable disk' - - % param 'BackupwkFolder' => $bac_datas->{mount} unless param 'BackupwkFolder'; - %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => "" -
+ + %=l 'bac_local removable disk' + + + % param 'BackupwkFolder' => $bac_datas->{mount} unless param 'BackupwkFolder'; + %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => "" + +
% } elsif ( $bac_datas->{vfstype} eq 'mnt') { - %=l 'bac_Mounted disk' - - % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder'; - %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => "" -
+ %=l 'bac_Mounted disk' + + + % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder'; + %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype}), class => "" + +
% } else { - - %=l 'bac_SHARED_FOLDER_NAME' - - % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder'; - %= text_field 'BackupwkFolder', size => 20, class => "" -
+ + %=l 'bac_SHARED_FOLDER_NAME' + + % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder'; + %= text_field 'BackupwkFolder', size => 20, class => "" + +
%} % if ( $bac_datas->{vfstype} eq 'cifs' ) { - - %=l 'bac_WORKSTN_LOGIN' - - % param 'BackupwkLogin' => $bac_datas->{login} unless param 'BackupwkLogin'; - %= text_field 'BackupwkLogin', size => 12, class => "" -
- %=l 'bac_PASSWORD' - - % param 'BackupwkPassword' => $bac_datas->{password} unless param 'BackupwkPassword'; - %= password_field 'BackupwkPassword', size => 12, class => "" - + + %=l 'bac_WORKSTN_LOGIN' + + % param 'BackupwkLogin' => $bac_datas->{login} unless param 'BackupwkLogin'; + %= text_field 'BackupwkLogin', size => 12, class => "" + +
+ + %=l 'bac_PASSWORD' + + % param 'BackupwkPassword' => $bac_datas->{password} unless param 'BackupwkPassword'; + %= password_field 'BackupwkPassword', size => 12, class => "" + %}


%= l 'bac_WORKSTN_BACKUP_SETTINGS'


-

+

+ %=l 'bac_NUMBER_OF_SETS' - + + % param 'SetsNumber' => $bac_datas->{setsNumber} unless param 'SetsNumber'; %= text_field 'SetsNumber', size => '3' @@ -104,7 +118,8 @@

%=l 'bac_WORKSTN_BACKUP_TIME' - + + % param 'BackupwkHour' => $bac_datas->{hour} unless param 'BackupwkHour'; %= text_field 'BackupwkHour', size => '2' % param 'BackupwkMin' => $bac_datas->{min} unless param 'BackupwkMin'; @@ -119,23 +134,25 @@

%=l 'bac_WORKSTN_TIMEOUT' - + + % param 'BackupwkTimeout' => $bac_datas->{timeout} unless param 'BackupwkTimeout'; %= text_field 'BackupwkTimeout', size => '2' %=l 'bac_INC_ONLY_TIMEOUT' % if ( $bac_datas->{incOnlyTimeout} eq 'checked' ) { - + %} else { - %= check_box 'IncOnlyTimeout' + %= check_box 'IncOnlyTimeout' %}

%=l 'bac_COMPRESSION_LEVEL' - + + % param 'Compression' => $bac_datas->{compression} unless param 'Compression'; %= text_field 'Compression', size => '1' @@ -143,7 +160,8 @@ % param 'Dof' => $bac_datas->{dof} unless param 'Dof'; %= select_field 'Dof' => $c->get_dow_list(), class => "" -


+

+
%= hidden_field 'Function' => $bac_datas->{function} diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore.html.ep index e72e977..f079e30 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -33,7 +33,8 @@

%=l 'bac_SELECT_BACKUP_FILE' - + + %= select_field 'Backupset' => $c->get_Backupset_options(), class => ""

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore1.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore1.html.ep index 073191a..70451a0 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore1.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_restore1.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -

+
% if (config->{debug} == 1) {

%= dumper $c->current_route diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore.html.ep index 43835f4..1ef3814 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -

+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -26,17 +26,22 @@

<%=l 'bac_BACKUP_CHOICE' %>

-
+
+ %=l 'bac_SELECT_BACKUP_FILE' - + + %= select_field 'Backupset' => $c->get_Restoreset_options(), class => "" -
- -
+ +
+
+ %=l 'bac_FILTER_EXPRESSION' - + + %= text_field 'Filterexp', size => 32, class => "" -
+ +

%= hidden_field 'Function' => $bac_datas->{'function'} %= submit_button $c->l('PERFORM'), class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore1.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore1.html.ep index e25e520..b2c6569 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore1.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore1.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -19,7 +19,8 @@

<%= $title%>

-

<%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %>


+

<%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %>

+
%= $c->render_to_string(inline => (l 'bac_READ_COMPLETE')) @@ -27,15 +28,19 @@
%=l 'bac_SELECT_FILES_TO_RESTORE' - + + %= select_field 'Restorefiles' => $c->get_Restorefiles_options($bac_datas->{'filterexp'},$bac_datas->{'backupset'}), class => "", multiple => 1, size => 15 -
- -
+ +
+
+ %=l 'bac_SELECT_DATE_BEFORE' - + + %= text_field 'Seldatebefore', size => 32, class => "" -
+ +

%= hidden_field 'Function' => $bac_datas->{'function'} %= hidden_field 'Backupset' => $bac_datas->{'backupset'} diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore2.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore2.html.ep index db78741..3a16d39 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore2.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_sel_restore2.html.ep @@ -11,9 +11,10 @@ % } % if ( stash 'error' ) { -
+
+
%= $c->render_to_string(inline => stash 'error') -
+
%}

<%= $title%>

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify.html.ep index 94f8427..874456b 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify.html.ep @@ -1,18 +1,19 @@ % layout 'AdminLTE', title => "Sme server 2 - backup - verify"; % content_for 'module' => begin -
+
% if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $bac_datas -

+

+ %= dumper $c->current_route + %= dumper $bac_datas +

% } % if ( stash 'error' ) { -
+
+
%= $c->render_to_string(inline => stash 'error') -
+
%}

<%= $title%>

@@ -24,25 +25,34 @@ %= 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()) %} -

+
+
+ %=l 'bac_SELECT_BACKUP_FILE' - + + %= select_field 'Backupset' => $c->get_Backupset_options(), class => "" -
+ +
-

+

+ %=l 'bac_CHECK_TO_VERIFY_FULL_RESTORE' - + + %= check_box 'Verifyall' -


+ +

+
%=l 'bac_CHECK_INTEGRITY_WARNING' -

+
+
%= hidden_field 'Function' => $bac_datas->{'function'} . '1' %= submit_button $c->l('bac_VERIFY'), class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify1.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify1.html.ep index ea9f07e..b354e05 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify1.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/back_workstn_verify1.html.ep @@ -1,7 +1,7 @@ % layout 'AdminLTE', title => "Sme server 2 - backup - verify"; % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -11,9 +11,10 @@ % } % if ( stash 'error' ) { -

+
+
%= $c->render_to_string(inline => stash 'error') -
+
%}

<%= $title%>

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/backdown.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/backdown.html.ep index 7f1a076..41eba29 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/backdown.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/backdown.html.ep @@ -3,8 +3,8 @@ my $backups = esmith::BackupHistoryDB->open; my $now = time(); my $backup_rec = $backups->new_record($now, { - type => 'backup_record', BackupType => 'desktop', - StartEpochTime => $now, + type => 'backup_record', BackupType => 'desktop', + StartEpochTime => $now, }); # Dump the current mysql tables so that they are part of the image. diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep index 99a728d..119a424 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -11,14 +11,16 @@ % } % if ( stash 'warning' ) { -

+
+
%= $c->render_to_string(inline => stash 'warning') -
+
%} % if ( stash 'error' ) { -
+
+
%= $c->render_to_string(inline => stash 'error') -
+
%}

<%= $title%>

@@ -35,39 +37,49 @@ %=l 'bac_BACKUP_CONFIG_STATUS' -

+

+ %=l 'bac_TAPE_BACKUPS', - + + %= $c->l(uc($bac_datas->{'backupStatus'})).'.' % if ( $bac_datas->{'backupStatus'} eq 'enabled' ) { - %= $c->l('bac_BACKUPS_RUN_AT') - - %= $bac_datas->{'backupTime'} - - %= $c->l('bac_REMINDER_MESSAGE_AT') - - %= $bac_datas->{'reminderTime'} - + %= $c->l('bac_BACKUPS_RUN_AT') + + %= $bac_datas->{'backupTime'} + + %= $c->l('bac_REMINDER_MESSAGE_AT') + + %= $bac_datas->{'reminderTime'} + %} -

+

+ +

+ %=l 'bac_WORKSTN_BACKUPS', - + + %= $c->l(uc($bac_datas->{'backupwkStatus'})).'.' % if ( $bac_datas->{'backupwkStatus'} eq 'enabled' ) { - %= $c->l('bac_WKBACKUPS_RUN_AT') - - %= $bac_datas->{'backupwkTime'} - + %= $c->l('bac_WKBACKUPS_RUN_AT') + + %= $bac_datas->{'backupwkTime'} + %} +

-

+

+ %=l 'bac_SELECT_AN_ACTION' - + + % param 'Function' => $bac_datas->{function} unless param 'Function'; %= select_field 'Function' => $c->get_function_options(), class => "" -

+ +


%= submit_button $c->l('PERFORM'), class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep index eed997f..fdeafdc 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

@@ -15,39 +15,53 @@ - %=l ('bugr_DO_NOT_PANIC') + %=l ('bugr_DO_NOT_PANIC')

- %=l ('bugr_SME_EXPERIENCE') -

+ %=l ('bugr_SME_EXPERIENCE') +

+

%=l ('bugr_USE_TEMPLATE') : https://wiki.koozali.org/Bugzilla_Help#Reporting_Bugs. -

+

+

%=l ('bugr_PLEASE_REPORT_HERE') : https://bugs.koozali.org. -

- %=l ('bugr_FOLLOWING_REPORT_MIGHT_HELP') -

- %=l ('bugr_REPORT_CONTENT') -

  • - %=l ('bugr_SME_VERSION') -
  • - %=l ('bugr_SERVER_MODE') -
  • - %=l ('bugr_PREVIOUS_SERVER_MODE') -
  • - %=l ('bugr_KERNEL_AND_ARCH') -
  • - %=l ('bugr_INSTALLED_RPMS') -
  • - %=l ('bugr_ALTERED_TEMPLATES') -
  • - %=l ('bugr_ALTERED_EVENTS') -
  • - %=l ('bugr_YUM_REPOS') -

- %=l ('bugr_PRIVACY') +

+

+ %=l ('bugr_FOLLOWING_REPORT_MIGHT_HELP') +

+

+ %=l ('bugr_REPORT_CONTENT') +
+

    +
  • + %=l ('bugr_SME_VERSION') +
    • +
  • + %=l ('bugr_SERVER_MODE') +
    • +
  • + %=l ('bugr_PREVIOUS_SERVER_MODE') +
    • +
  • + %=l ('bugr_KERNEL_AND_ARCH') +
    • +
  • + %=l ('bugr_INSTALLED_RPMS') +
    • +
  • + %=l ('bugr_ALTERED_TEMPLATES') +
    • +
  • + %=l ('bugr_ALTERED_EVENTS') +
  • + %=l ('bugr_YUM_REPOS') +
    • +
    +
+ %=l ('bugr_PRIVACY')

<% my $btn = l('bugr_CREATE_REPORT'); %> @@ -57,14 +71,17 @@ % end

- %=l ('bugr_DONATING') -

- %=l ('bugr_AWARE_SME') -

- %=l ('bugr_YOUR_HELP') -

- %=l ('bugr_CONSIDER_DONATING') -

+ %=l ('bugr_DONATING') + +

+ %=l ('bugr_AWARE_SME') +

+ + %=l ('bugr_YOUR_HELP') + +

+ %=l ('bugr_CONSIDER_DONATING') +

%= link_to 'https://wiki.koozali.org/Donate' => begin diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep index 88f5577..01595e1 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/bugreport2.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep index 23e9688..9f05ad5 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep @@ -1,7 +1,7 @@ % layout 'AdminLTE', title => "Sme server 2 - clamav"; % content_for 'module' => begin -

+
%if (config->{debug} == 1) {

(DBG)route: <%= $c->current_route %>
(DBG)FsS stat: <%= $clm_datas->{FilesystemScan}%>
@@ -15,29 +15,32 @@ %= form_for 'clamav' => (method => 'POST') => begin

- - %=l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD' - - % param 'FilesystemScan' => $clm_datas->{FilesystemScan} unless param 'FilesystemScan'; - %= select_field 'FilesystemScan' => [[ (l 'clm_DAILY') => 'daily'], [ (l 'clm_NEVER') => 'disabled'], [ (l 'clm_WEEKLY') => 'weekly']], class => "" - + + %=l 'clm_LABEL_FILESYSTEM_SCAN_PERIOD' + + + % param 'FilesystemScan' => $clm_datas->{FilesystemScan} unless param 'FilesystemScan'; + %= select_field 'FilesystemScan' => [[ (l 'clm_DAILY') => 'daily'], [ (l 'clm_NEVER') => 'disabled'], [ (l 'clm_WEEKLY') => 'weekly']], class => "" +

- - %=l 'clm_LABEL_QUARANTINE' - - % param 'Quarantine' => $clm_datas->{Quarantine} unless param 'Quarantine'; - %= select_field 'Quarantine' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "" -
- + + %=l 'clm_LABEL_QUARANTINE' + + + % param 'Quarantine' => $clm_datas->{Quarantine} unless param 'Quarantine'; + %= select_field 'Quarantine' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']], class => "" +
+

- - %=l 'clm_LABEL_CLAM_VERSIONS' - - %= $clm_datas->{clam_versions} -
- + + %=l 'clm_LABEL_CLAM_VERSIONS' + + + %= $clm_datas->{clam_versions} +
+

%= submit_button "$btn", class => "" % end diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/csrf_400.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/csrf_400.html.ep index 4b57377..039dc87 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/csrf_400.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/csrf_400.html.ep @@ -1,8 +1,8 @@ % layout 'AdminLTE', title => "Sme server 2 - err 400"; % content_for 'module' => begin -
-
+
+
%= l 'CSRF_VALIDATION_FAILURE'
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep index ddcfc40..fa54deb 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep @@ -1,7 +1,7 @@ % layout 'AdminLTE', title => "Sme server 2 - datetime"; % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

@@ -11,7 +11,8 @@ % } % if ( stash 'error' ) { -

+
+
%= $c->render_to_string(inline => stash 'error')
%} @@ -49,7 +50,8 @@
%=l 'dat_NTP_SERVER' - + + %= text_field 'Ntpserver' => $dat_datas->{ntpserver}, class => ""

@@ -78,36 +80,44 @@
%=l 'dat_NEW_M/D/Y' - + + % param 'Month' => $dat_datas->{month} unless param 'Month'; %= select_field 'Month' => $c->getMonth_list(), class => "" - + + % param 'Day' => $dat_datas->{day} unless param 'Day'; %= text_field 'Day', size => '2', class => "" - + + % param 'Year' => $dat_datas->{year} unless param 'Year'; %= text_field 'Year', size => '4', class => ""
%=l 'dat_NEW_H/M/S' - + + % param 'Hour' => $dat_datas->{hour} unless param 'Hour'; %= text_field 'Hour', size => '2', class => "" - + + % param 'Minute' => $dat_datas->{minute} unless param 'Minute'; %= text_field 'Minute', size => '2', class => "" - + + % param 'Second' => $dat_datas->{second} unless param 'Second'; %= text_field 'Second', size => '2', class => ""
%=l 'dat_AM/PM_AND_TZ' - + + % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm'; %= select_field 'Ampm' => ['AM', 'PM'], class => "" - + + % param 'Timezone' => $c->getTimezone() unless param 'Timezone'; %= select_field 'Timezone' => $c->getZone_list(), class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/default.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/default.html.ep index 07d4e65..6ecf3e5 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/default.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/default.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+

<%= $title %>

<%= $modul %>

diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep index a3150e7..f9d79ff 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep @@ -1,7 +1,7 @@ % layout 'AdminLTE', title => "Sme server 2 - emailaccess"; % content_for 'module' => begin -

+
% if (config->{debug} == 1) {

@@ -22,30 +22,39 @@ %=l 'mai_DESC_POP_ACCESS_CONTROL' -

+

+ %=l 'mai_LABEL_POP_ACCESS_CONTROL' - + + % param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess'; %= select_field 'POPAccess' => $c->get_pop_opt(), class => "" -

+ +

%=l 'mai_DESC_IMAP_ACCESS_CONTROL' -

+

+ %=l 'mai_LABEL_IMAP_ACCESS_CONTROL' - + + % param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess'; %= select_field 'IMAPAccess' => $c->get_imap_opt(), class => "" -

+ +

%=l 'mai_DESC_WEBMAIL' -

+

+ %=l 'mai_LABEL_WEBMAIL' - + + % param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail'; %= select_field 'WebMail' => $c->get_webmail_opt(), class => "" -

+ +

% my $btn = l('SAVE'); %= submit_button "$btn", class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep index 1b769b2..d845454 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/emaildeliver.html.ep @@ -1,7 +1,7 @@ % layout 'AdminLTE', title => "Sme server 2 - emaildeliver"; % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

@@ -11,9 +11,10 @@ % } % if ( stash 'error' ) { -

+
+
%= $c->render_to_string(inline => stash 'error') -
+
%}

<%= $title%>

@@ -26,12 +27,15 @@ %=l 'mai_DESC_UNKNOWN' -

+

+ %=l 'mai_LABEL_UNKNOWN' - + + % param 'EmailUnknownUser' => $mai_datas->{emailunknownuser} unless param 'EmailUnknownUser'; %= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => "" -

+ +

@@ -40,12 +44,15 @@ %=l 'mai_DESC_DELEGATE' -

+

+ %=l 'mai_LABEL_DELEGATE' - + + % param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer'; %= text_field 'DelegateMailServer', class => "" -

+ +

@@ -54,33 +61,45 @@ %=l 'mai_DESC_SMARTHOST' -

+

+ %=l 'mai_LABEL_SMARTHOST' - + + % param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost'; %= text_field 'SMTPSmartHost', class => "" -

+ +

-

+

+ %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS' - + + % param 'SMTPAUTHPROXY_status' => $mai_datas->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status'; %= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => "" -

+ +

-

+

+ %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID' - + + % param 'SMTPAUTHPROXY_Userid' => $mai_datas->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid'; %= text_field 'SMTPAUTHPROXY_Userid', class => "" -

+ +

-

+

+ %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD' - + + % param 'SMTPAUTHPROXY_Passwd' => $mai_datas->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd'; %= password_field 'SMTPAUTHPROXY_Passwd', class => "" -

+ +

% my $btn = l('SAVE'); %= submit_button "$btn", class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep index d61308a..c0d5cd8 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailfilter.html.ep @@ -1,7 +1,7 @@ % layout 'AdminLTE', title => "Sme server 2 - emailfilter"; % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

@@ -11,9 +11,10 @@ % } % if ( stash 'error' ) { -

+
+
%= $c->render_to_string(inline => stash 'error') -
+
%}

<%= $title%>

@@ -22,74 +23,102 @@ %=l 'mai_DESC_VIRUS_SCAN' -

+

+ %=l 'mai_LABEL_VIRUS_SCAN' - + + % param 'VirusStatus' => $mai_datas->{virusstatus} unless param 'VirusStatus'; %= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "" -

+ +
+

%=l 'mai_DESC_SPAM_SCAN' -

+

+ %=l 'mai_LABEL_SPAM_SCAN' - + + % param 'Spamstatus' => $mai_datas->{spamstatus} unless param 'Spamstatus'; %= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "" -

+ +

-

+

+ %=l 'mai_LABEL_SPAM_SENSITIVITY' - + + % param 'SpamSensitivity' => $mai_datas->{spamsensitivity} unless param 'SpamSensitivity'; %= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => "" -

+ +

-

+

+ %=l 'mai_LABEL_SPAM_TAGLEVEL' - + + % param 'SpamTagLevel' => $mai_datas->{spamtaglevel} unless param 'SpamTagLevel'; %= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => "" -

+ +

-

+

+ %=l 'mai_LABEL_SPAM_REJECTLEVEL' - + + % param 'SpamRejectLevel' => $mai_datas->{spamrejectlevel} unless param 'SpamRejectLevel'; %= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => "" -

+ +

-

+

+ %=l 'mai_LABEL_SORTSPAM' - + + % param 'SpamSortSpam' => $mai_datas->{spamsortspam} unless param 'SpamSortSpam'; %= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "" -

+ +

%=l 'mai_DESC_SPAM_SUBJECT' -

+

+ %=l 'mai_LABEL_SPAM_SUBJECTTAG' - + + % param 'SpamSubjectTag' => $mai_datas->{spamsubjecttag} unless param 'SpamSubjectTag'; %= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => "" -

+ +

-

+

+ %=l 'mai_LABEL_SPAM_SUBJECT' - + + % param 'SpamSubject' => $mai_datas->{spamsubject} unless param 'SpamSubject'; %= text_field 'SpamSubject' => class => "" -

+ +

%=l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT' -

+

+ %=l 'mai_LABEL_CONTENT_TO_BLOCK' - + + % param 'BlockExecutableContent' => $c->get_patterns_current_opt() unless param 'BlockExecutableContent'; %= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => "", multiple => "1" -

+ +

% my $btn = l('SAVE'); %= submit_button "$btn", class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep index 6cb71a1..28f8a5c 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailreceive.html.ep @@ -5,7 +5,7 @@ % use constant FALSE => 0; % use constant TRUE => 1; -
+
% if (config->{debug} == 1) {

@@ -16,9 +16,10 @@ % } % if ( stash 'error' ) { -

+
+
%= $c->render_to_string(inline => stash 'error') -
+
%}

<%= $title%>

@@ -27,9 +28,11 @@ %=l 'mai_DESC_MODE' -

+

+ %=l 'mai_LABEL_MODE' - + + % param 'FetchmailMethod' => $mai_datas->{fetchmailmethod} unless param 'FetchmailMethod'; %= select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class => "" -

+ +

%#=l 'mai_DESC_SMTP_AUTH_CONTROL'
@@ -51,9 +55,11 @@
% my $smtp_mesg=l('SMTP port %u allow client to authenticate:'); -

+

+ %= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); - + + % param 'SMTPAuth' => $c->get_current_smtp_auth( FALSE ) unless param 'SMTPAuth'; %= select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => "" -

+ +

% my $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:'); -

+

+ %= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); - - % 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 => "" -

+ +

%my $smtp_mesg=l('Submission port %u status:'); -

+

+ %= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); - + + % param 'uSMTPAuth' => $c->get_current_smtp_ssl_auth(FALSE,'u', TRUE) unless param 'uSMTPAuth'; - + --> %= select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => "" -

+ +

@@ -99,63 +111,87 @@ %=l 'mai_DESC_SECONDARY' -

+

+ %=l 'mai_LABEL_SECONDARY' - + + % param 'SecondaryMailServer' => $mai_datas->{secondarymailserver} unless param 'SecondaryMailServer'; %= text_field 'SecondaryMailServer', class => "" -

+ +

%=l 'mai_DESC_FETCH_PERIOD' -

+

+ %=l 'mai_LABEL_FETCH_PERIOD' - + + % param 'FreqOffice' => $mai_datas->{freqoffice} unless param 'FreqOffice'; %= select_field 'FreqOffice' => $c->fetchmail_freq(), class => "" -

+ +

-

+

+ %=l 'mai_LABEL_FETCH_PERIOD_NIGHTS' - + + % param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside'; %= select_field 'FreqOutside' => $c->fetchmail_freq(), class => "" -

+ +

-

+

+ %=l 'mai_LABEL_FETCH_PERIOD_WEEKENDS' - + + % param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend'; %= select_field 'FreqWeekend' => $c->fetchmail_freq(), class => "" -

+ +

-

+

+ %=l 'mai_LABEL_POP_ACCOUNT' - + + % param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount'; %= text_field 'SecondaryMailAccount', class => "" -

+ +

-

+

+ %=l 'mai_LABEL_POP_PASS' - + + % param 'SecondaryMailPassword' => $mai_datas->{secondarymailpassword} unless param 'SecondaryMailPassword'; %= password_field 'SecondaryMailPassword', class => "" -

+ +

-

+

+ %=l 'mai_LABEL_SORT_METHOD' - + + % param 'SpecifyHeader' => $mai_datas->{specifyheader} unless param 'SpecifyHeader'; %= select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => "" -

+ +

-

+

+ %=l 'mai_LABEL_SORT_HEADER' - + + % param 'SecondaryMailEnvelope' => $mai_datas->{secondarymailenvelope} unless param 'SecondaryMailEnvelope'; %= text_field 'SecondaryMailEnvelope', class => "" -

+ +

% my $btn = l('SAVE'); %= submit_button "$btn", class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep index 3ab57dd..10abd1b 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep @@ -5,7 +5,7 @@ % use constant FALSE => 0; % use constant TRUE => 1; -
+
% if (config->{debug} == TRUE) {

@@ -17,31 +17,40 @@ % if ( stash 'error' ) {

%= $c->render_to_string(inline => stash 'error') -
+
%}

<%= $title%>

%= form_for 'emailsettings' => (method => 'POST') => begin -

+

+ %=l 'mai_LABEL_POP_ACCESS_CONTROL' - + + %= $c->get_current_pop3_access( TRUE ) -

+ +

-

+

+ %=l 'mai_LABEL_IMAP_ACCESS_CONTROL' - + + %= $c->get_current_imap_access( TRUE ) -

+ +

-

+

+ %=l 'mai_LABEL_WEBMAIL' - + + %= $c->get_current_webmail_status( TRUE ) -

+ +

- % my $btn = l('mai_DESC_STATE_ACCESS_BUTTON'); + % my $btn = l('mai_DESC_STATE_ACCESS_BUTTON');
%= submit_button "$btn", class => ""
@@ -53,23 +62,32 @@ %= form_for 'emailsettings' => (method => 'POST') => begin -

+

+ %=l 'mai_LABEL_VIRUS_SCAN' - + + %= $c->get_virus_status(TRUE) -

+ +

-

+

+ %=l 'mai_LABEL_SPAM_SCAN' - + + %= $c->get_spam_status(TRUE) -

+ +

-

+

+ %=l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT' - + + %= $c->get_patterns_status(TRUE) -

+ +

% my $btn = l('mai_DESC_STATE_FILTERING_BUTTON');
@@ -83,34 +101,46 @@ %= form_for 'emailsettings' => (method => 'POST') => begin -

+

+ %=l 'mai_LABEL_MODE' - + + %= $mai_datas->{fetchmailmethod} -

+ +

% my $smtp_mesg; % $smtp_mesg=l('SMTP port %u allow client to authenticate:'); -

+

+ %= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); - - %= $c->get_current_smtp_auth( TRUE ) -

+ + + %= $c->get_current_smtp_auth( TRUE ) + +

% $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:'); -

+

+ %= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); - - %= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE ) -

+ + + %= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE ) + +

% $smtp_mesg=l 'Submission port %u status:'; -

+

+ %= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); - + + %= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE ) -

+ +


% my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON'); @@ -125,27 +155,36 @@ %= form_for 'emailsettings' => (method => 'POST') => begin -

+

+ %=l 'mai_LABEL_UNKNOWN' - + + %= $c->get_emailunknownuser_status( TRUE ) -

+ +

-

+

+ %=l 'mai_LABEL_DELEGATE' - + + %= $c->get_value('DelegateMailServer') -

+ +

-

+

+ %=l 'mai_LABEL_SMARTHOST' - + + %= $c->get_value('SMTPSmartHost') -

+ +

- % my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON'); + % my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON');
- %= submit_button "$btn", class => "" + %= submit_button "$btn", class => ""
%= hidden_field 'trt' => 'DEL' diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep index e15dd10..c3c49bb 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/embedded.html.ep @@ -2,18 +2,20 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route

% } % if ( stash 'error' ) { -
+
+
%= $c->render_to_string(inline => stash 'error')
%} -

Embedded - <%=$title %>


+

Embedded - <%=$title %>

+

If the legacy panel does not appear, then you may not be logged into the original Server manager.
You can log in by clicking here. Or by clicking on the "Legacy SM" button at the top of the window.

% my $height = $c->stash('height') | '600px'; % if ($height !~ /px$/) { $height = $height.'px';} diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep index 5a7944a..7e6acfb 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/userpassword.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

@@ -16,9 +16,10 @@

% if ( stash 'error' ) { -
+
+
%= $c->render_to_string(inline => stash 'error') -
+
%}

@@ -33,38 +34,50 @@

%= form_for $url => (method => 'POST') => begin -

+

+ %= l 'pwd_YOUR_ACCOUNT' - + + %= $pwd_datas->{Account} %= hidden_field 'User' => $pwd_datas->{Account} %= hidden_field 'Trt' => $pwd_datas->{trt} %= hidden_field 'jwt' => $pwd_datas->{jwt} -

+

+

% if ( $pwd_datas->{trt} ne 'RESET' ) { -

+

+ %= l 'pwd_PASSWORD_OLD' - + + %= password_field 'Oldpass', class => "", class="">'sme-password' -

+

+

% } -

+

+ %=l 'pwd_PASSWORD_NEW' - + + %= password_field 'Pass', class => "", class="">'sme-password' -

+

+

-

+

+ %=l 'pwd_PASSWORD_VERIFY_NEW' - + + %= password_field 'Passverify', class => "", class="">'sme-password' -

+

+


diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep index 4bf9159..bc498c2 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles.html.ep @@ -1,7 +1,7 @@ % layout 'AdminLTE', title => "Sme server 2 - viewlogfiles"; % content_for 'module' => begin -

+
%if (config->{debug} == 1) {

(DBG)route: <%= $c->current_route %>
@@ -18,7 +18,8 @@
%=l 'log_LOG_FILE_SELECT_DESC' - + + % param 'Filename' => 'messages'; %= select_field 'Filename' => $c->findlogFiles(), class => "" @@ -30,7 +31,8 @@
%=l 'log_FILTER_PATTERN_LABEL' - + + %= text_field 'Matchpattern', class => ""

@@ -40,7 +42,8 @@
%=l 'log_MATCH_PATTERN_LABEL' - + + %= text_field 'Highlightpattern', class => ""

@@ -50,7 +53,8 @@
%=l 'log_OP_LABEL' - + + %if ($log_datas->{'default_op'} eq 'download') { % param 'Operation' => 'download'; %} diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep index a064bf5..7eac823 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/viewlogfiles2.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

@@ -26,7 +26,7 @@ %= hidden_field 'Highlightpattern' => $log_datas->{highlightpattern} %= hidden_field 'Operation' => $log_datas->{operation} % end - +

%end diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep index 084acb0..3ed2a9e 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/welcome.html.ep @@ -1,8 +1,9 @@ % layout 'AdminLTE', title => 'Sme server 2 - IndexT'; % content_for 'module' => begin -
-

Index on line - Welcome page
+

+

Index on line - Welcome page +

Cogo diam enim ibidem paulatim pertineo velit. Comis patria pertineo secundum. Aliquip laoreet quibus zelus. Gravis incassum interdico iustum lucidus neo os paratus. Autem causa haero pneum similis sudo vindico. Iusto molior neque oppeto. Ideo minim nibh refoveo veniam vereor virtus. Appellatio pala scisco. @@ -31,31 +32,33 @@ Abdo abigo aptent commoveo inhibeo molior nibh plaga pneum zelus. Conventio geni % my %nav = %{SrvMngr::navigation2->getNavigation( $c->languages() )}; -

+
% foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'}) % <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) { -
- %= $h
-% foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav{$h}{'DESCRIPTIONS'}}) { -% my ($target, $classNew) = ( $_->{'FILENAME'} =~ m/^2\// ) ? -% ('_self',' accent') : -% ('main','') ; +
+ %= $h -% my $href = '/server-manager' . $_->{'FILENAME'}; - - -% $c++; -% } + % foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav{$h}{'DESCRIPTIONS'}}) { + % my ($target, $classNew) = ( $_->{'FILENAME'} =~ m/^2\// ) ? + % ('_self',' accent') : + % ('main','') ; + + % my $href = '/server-manager' . $_->{'FILENAME'}; + + + % $c++; + % } % } diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/whatever.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/whatever.html.ep index e1e603e..4accb7d 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/whatever.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/whatever.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+


dev
What else !!! The page you were requesting "<%= $self->req->url->path || '/' %>" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep index 882df96..fb947cc 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/workgroup.html.ep @@ -1,7 +1,7 @@ % layout 'AdminLTE', title => "Sme server 2 - workgroup"; % content_for 'module' => begin -

+
%if (config->{debug} == 1) {

@@ -23,7 +23,8 @@

%=l 'wkg_LABEL_WORKGROUP', class => "" - + + %= text_field 'Workgroup' => $wkg_datas->{Workgroup}, class => "" , pattern=>".{1,15}", title=>"Limited to 15 characters by the NETBIOS"

@@ -32,7 +33,8 @@

%=l 'wkg_LABEL_SERVERNAME', class => "" - + + %= text_field 'ServerName' => $wkg_datas->{ServerName}, class => ""

@@ -41,7 +43,8 @@
%=l 'wkg_LABEL_PDC', class => "" - + + % param 'ServerRole' => $wkg_datas->{ServerRole} unless param 'ServerRole'; %= select_field 'ServerRole' => [[ (l 'YES') => 'PDC'], [ (l 'NO') => 'WS']], class => "" @@ -51,7 +54,8 @@
%=l 'wkg_LABEL_ROAM', class => "" - + + % param 'RoamingProfiles' => $wkg_datas->{RoamingProfiles} unless param 'RoamingProfiles'; %= select_field 'RoamingProfiles' => [[ (l 'YES') => 'yes'], [ (l 'NO') => 'no']], class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep index 0e375e2..ad9d75a 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/yum.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -13,25 +13,31 @@

<%= $title%>

% if ( $notif ) { -
+
+ %= $notif %} % if ( $c->is_empty('updates') ) { -

+
+

%=l 'yum_TITLE_UPTODATE'

%=l 'yum_DESC_UPTODATE' -

+

+
%} % if ( $c->non_empty('updates') ) { -

+
+
+

%=l 'yum_TITLE_UPDATES_AVAILABLE'

%=l 'yum_DESC_UPDATES_AVAILABLE' -

+

+
%= form_for 'yum' => (method => 'POST') => begin %= hidden_field 'trt' => 'UPDT' @@ -59,37 +65,52 @@ %= form_for 'yum' => (method => 'POST') => begin -

+

+ %=l 'yum_LABEL_YUM_STATUS' - + + %= $c->get_status('status', 'localise') -

+ +

-

+

+ %=l 'yum_LABEL_YUM_PACKAGEFUNCTIONS' - + + %= $c->get_status('PackageFunctions', 'localise') -

+ +

-

+

+ %=l 'yum_LABEL_YUM_DELTARPMPROCESS' - + + %= $c->get_status('DeltaRpmProcess', 'localise') -

+ +

-

+

+ %=l 'yum_LABEL_YUM_DOWNLOADONLY' - + + %= $c->get_status('DownloadOnly', 'localise') -

+ +

-

+

+ %=l 'yum_LABEL_YUM_AUTOINSTALLUPDATES' - + + %= $c->get_status('AutoInstallUpdates', 'localise') -

+ +

- %= hidden_field 'trt' => 'CONF' + %= hidden_field 'trt' => 'CONF'
%= submit_button $c->l('yum_BUTTON_CONFIGURATION'), class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep index 8fe3b84..09b96da 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumconfig.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -13,71 +13,90 @@

<%= $title%>

% if ( $notif ) { -
+
+
%= $notif
%} %= form_for 'yumd' => (method => 'POST') => begin -

+

+ %=l 'yum_LABEL_YUM_STATUS' - + + % param 'yum_check4updates' => $c->get_status('check4updates') unless param 'yum_check4updates'; %= select_field 'yum_check4updates' => $c->get_check_freq_opt() -

+ +


%=l 'yum_DESC_YUM_PACKAGEFUNCTIONS' -

+

+ %=l 'yum_LABEL_YUM_PACKAGEFUNCTIONS' - + + % param 'yum_PackageFunctions' => $c->get_status('PackageFunctions') unless param 'yum_PackageFunctions'; %= select_field 'yum_PackageFunctions' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']] -

+ +


%=l 'yum_DESC_ENABLED_REPOSITORIES' -

+

+ %=l 'yum_LABEL_ENABLED_REPOSITORIES' - + + % param 'SelectedRepositories' => $c->get_repository_current_options() unless param 'SelectedRepositories'; %= select_field 'SelectedRepositories' => $c->get_repository_options2(), class => "", multiple => '1' -

+ +


%=l 'yum_DESC_YUM_DELTARPMPROCESS' -

+

+ %=l 'yum_LABEL_YUM_DELTARPMPROCESS' - + + % param 'yum_DeltaRpmProcess' => $c->get_status('DeltaRpmProcess') unless param 'yum_DeltaRpmProcess'; %= select_field 'yum_DeltaRpmProcess' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']] -

+ +


%=l 'yum_DESC_YUM_DOWNLOADONLY' -

+

+ %=l 'yum_LABEL_YUM_DOWNLOADONLY' - + + % param 'yum_DownloadOnly' => $c->get_status('DownloadOnly') unless param 'yum_DownloadOnly'; %= select_field 'yum_DownloadOnly' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']] -

+ +


%=l 'yum_DESC_YUM_AUTOINSTALLUPDATES' -

+

+ %=l 'yum_LABEL_YUM_AUTOINSTALLUPDATES' - + + % param 'yum_AutoInstallUpdates' => $c->get_status('AutoInstallUpdates') unless param 'yum_AutoInstallUpdates'; %= select_field 'yum_AutoInstallUpdates' => [[ $c->l('DISABLED') => 'disabled'], [ $c->l('ENABLED') => 'enabled']] -

+ +

- %= hidden_field 'trt' => 'CONF' + %= hidden_field 'trt' => 'CONF'
%= submit_button $c->l('SAVE'), class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep index 37f3819..c7c7386 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/yuminstall.html.ep @@ -2,7 +2,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -13,7 +13,8 @@

<%= $title%>

% if ( $notif ) { -
+
+
%= $notif
%} @@ -25,27 +26,33 @@

% if ($c->non_empty('available','group')) { %=l 'yum_DESC_AVAILABLE_GROUPS' -

+

+ %=l 'yum_LABEL_AVAILABLE_GROUPS' - + + % param 'SelectedGroups' => $c->get_names2('updates','group') unless param 'SelectedGroups'; %= select_field 'SelectedGroups' => $c->get_options2('available', 'group'), class => "", multiple => "1" -

+ +

%}
% if ($c->non_empty('available','packages')) { %=l 'yum_DESC_AVAILABLE_PACKAGES' -

+

+ %=l 'yum_LABEL_AVAILABLE_PACKAGES' - + + % param 'SelectedPackages' => $c->get_names2('updates','package') unless param 'SelectedPackages'; %= select_field 'SelectedPackages' => $c->get_options2('available', 'package'), class => "", multiple => "1" -

+ +

%} - + - %= hidden_field 'trt' => 'INST' + %= hidden_field 'trt' => 'INST'

%= submit_button $c->l('yum_INSTALL_SOFTWARE'), class => "" diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep index 2e8f6e4..359c3b6 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/yumlogfile.html.ep @@ -6,7 +6,7 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) {

%= dumper $c->current_route @@ -17,7 +17,8 @@

<%= $title%>

% if ( $notif ) { -
+
+
%= $notif
%} @@ -28,8 +29,9 @@ <%= $c->render_to_string(inline => $c->format_yum_log()) %> - %= hidden_field 'trt' => 'LOGF' + %= hidden_field 'trt' => 'LOGF'
+ diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index 19f0539..8dbbf4d 100644 --- a/smeserver-manager-AdminLTE.spec +++ b/smeserver-manager-AdminLTE.spec @@ -1,6 +1,6 @@ %define name smeserver-manager-AdminLTE %define version 11.0.0 -%define release 2 +%define release 3 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} Version: %{version} @@ -26,6 +26,9 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Tue Apr 15 2025 John Crisp 11.0.0-3.sme +- Finish template tidy + * Tue Apr 15 2025 John Crisp 11.0.0-2.sme - Start to build templates with AdminLTE - Split the basic template into sections to make it easier to manage