From 74c9beb5872bc5fef8c884abfedfbd3ab287c307 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Tue, 12 Aug 2025 06:20:31 +0100 Subject: [PATCH] * Mon Aug 11 2025 Brian Read 11.0.0-113.sme - Re-factor all template files to make them nicely formatted [SME: 13103] --- .../templates/back_tape_configure.html.ep | 126 +++---- .../templates/back_tape_restore.html.ep | 42 +-- .../templates/back_workstn_configure.html.ep | 68 ++-- .../templates/back_workstn_configure1.html.ep | 260 ++++++------- .../templates/back_workstn_restore.html.ep | 56 +-- .../templates/back_workstn_restore1.html.ep | 75 ++-- .../back_workstn_sel_restore.html.ep | 60 +-- .../back_workstn_sel_restore1.html.ep | 62 ++-- .../back_workstn_sel_restore2.html.ep | 40 +- .../templates/back_workstn_verify.html.ep | 68 ++-- .../templates/back_workstn_verify1.html.ep | 38 +- .../themes/default/templates/backdown.html.ep | 120 +++--- .../themes/default/templates/backup.html.ep | 127 ++++--- .../default/templates/bugreport.html.ep | 108 +++--- .../default/templates/bugreport2.html.ep | 40 +- .../themes/default/templates/clamav.html.ep | 80 ++-- .../themes/default/templates/csrf_400.html.ep | 6 +- .../themes/default/templates/datetime.html.ep | 268 +++++++------- .../themes/default/templates/default.html.ep | 8 +- .../default/templates/directory.html.ep | 161 ++++---- .../themes/default/templates/domains.html.ep | 44 +-- .../default/templates/emailsettings.html.ep | 102 +++--- .../themes/default/templates/embedded.html.ep | 32 +- .../templates/exception_development.html.ep | 18 +- .../themes/default/templates/groups.html.ep | 44 +-- .../default/templates/hostentries.html.ep | 50 +-- .../themes/default/templates/ibays.html.ep | 52 +-- .../themes/default/templates/initial.html.ep | 32 +- .../default/templates/localnetworks.html.ep | 46 +-- .../themes/default/templates/login.html.ep | 116 +++--- .../themes/default/templates/manual.html.ep | 4 +- .../themes/default/templates/module.html.ep | 38 +- .../templates/not_found.development.html.ep | 18 +- .../default/templates/not_found.html.ep | 14 +- .../templates/partials/_dom_del.html.ep | 40 +- .../templates/partials/_dom_list.html.ep | 210 +++++------ .../templates/partials/_dom_up2.html.ep | 54 +-- .../templates/partials/_dom_upd.html.ep | 118 +++--- .../templates/partials/_footer.html.ep | 26 +- .../templates/partials/_grp_add.html.ep | 96 ++--- .../templates/partials/_grp_del.html.ep | 110 +++--- .../templates/partials/_grp_list.html.ep | 122 +++--- .../templates/partials/_grp_upd.html.ep | 112 +++--- .../templates/partials/_header.html.ep | 20 +- .../templates/partials/_hos_del.html.ep | 42 +-- .../templates/partials/_hos_list.html.ep | 146 ++++---- .../templates/partials/_hos_ulc.html.ep | 96 ++--- .../templates/partials/_hos_upd.html.ep | 128 +++---- .../templates/partials/_hos_urm.html.ep | 54 +-- .../templates/partials/_iba_del.html.ep | 32 +- .../templates/partials/_iba_list.html.ep | 194 +++++----- .../templates/partials/_iba_pwd.html.ep | 70 ++-- .../templates/partials/_iba_upd.html.ep | 172 ++++----- .../default/templates/partials/_info.html.ep | 38 +- .../templates/partials/_js_imports.html.ep | 118 +++--- .../templates/partials/_ln_add.html.ep | 120 +++--- .../templates/partials/_ln_del.html.ep | 100 ++--- .../templates/partials/_ln_list.html.ep | 170 ++++----- .../templates/partials/_mai_ACC.html.ep | 86 ++--- .../templates/partials/_mai_DEL.html.ep | 144 ++++---- .../templates/partials/_mai_FIL.html.ep | 160 ++++---- .../templates/partials/_mai_FRONT.html.ep | 254 ++++++------- .../templates/partials/_mai_REC.html.ep | 250 ++++++------- .../templates/partials/_module.html.ep | 36 +- .../templates/partials/_nav_menu.html.ep | 62 ++-- .../templates/partials/_navig2.html.ep | 66 ++-- .../templates/partials/_pf_add.html.ep | 154 ++++---- .../templates/partials/_pf_del.html.ep | 118 +++--- .../templates/partials/_pf_list.html.ep | 206 +++++------ .../templates/partials/_prt_add.html.ep | 72 ++-- .../templates/partials/_prt_list.html.ep | 140 +++---- .../templates/partials/_prt_net.html.ep | 70 ++-- .../templates/partials/_pse_add.html.ep | 60 +-- .../templates/partials/_pse_del.html.ep | 34 +- .../templates/partials/_pse_list.html.ep | 160 ++++---- .../templates/partials/_pse_upd.html.ep | 84 ++--- .../templates/partials/_quo_list.html.ep | 144 ++++---- .../templates/partials/_quo_upd.html.ep | 144 ++++---- .../templates/partials/_rma_pptp.html.ep | 26 +- .../templates/partials/_swt_theme.html.ep | 20 +- .../templates/partials/_user_menu.html.ep | 58 +-- .../templates/partials/_usr_del.html.ep | 42 +-- .../templates/partials/_usr_list.html.ep | 288 +++++++-------- .../templates/partials/_usr_lock.html.ep | 42 +-- .../templates/partials/_usr_pwd.html.ep | 84 ++--- .../templates/partials/_usr_pwds.html.ep | 84 ++--- .../templates/partials/_usr_upd.html.ep | 346 +++++++++--------- .../templates/partials/_usr_upds.html.ep | 152 ++++---- .../default/templates/portforwarding.html.ep | 46 +-- .../themes/default/templates/printers.html.ep | 46 +-- .../themes/default/templates/proxy.html.ep | 76 ++-- .../default/templates/pseudonyms.html.ep | 44 +-- .../default/templates/qmailanalog.html.ep | 74 ++-- .../themes/default/templates/quota.html.ep | 34 +- .../themes/default/templates/reboot.html.ep | 50 +-- .../default/templates/remoteaccess.html.ep | 340 ++++++++--------- .../themes/default/templates/review.html.ep | 246 ++++++------- .../default/templates/roundcube.html.ep | 56 +-- .../themes/default/templates/support.html.ep | 8 +- .../default/templates/useraccounts.html.ep | 58 +-- .../default/templates/userpassword.html.ep | 118 +++--- .../default/templates/viewlogfiles.html.ep | 116 +++--- .../default/templates/viewlogfiles2.html.ep | 34 +- .../themes/default/templates/welcome.html.ep | 90 ++--- .../themes/default/templates/whatever.html.ep | 18 +- .../default/templates/workgroup.html.ep | 117 +++--- .../themes/default/templates/yum.html.ep | 170 ++++----- .../default/templates/yumconfig.html.ep | 128 +++---- .../default/templates/yuminstall.html.ep | 80 ++-- .../default/templates/yumlogfile.html.ep | 44 +-- .../default/templates/yumpostupg.html.ep | 46 +-- .../default/templates/yumremove.html.ep | 82 ++--- .../default/templates/yumupdate.html.ep | 52 +-- smeserver-manager.spec | 5 +- 114 files changed, 5301 insertions(+), 5274 deletions(-) diff --git a/root/usr/share/smanager/themes/default/templates/back_tape_configure.html.ep b/root/usr/share/smanager/themes/default/templates/back_tape_configure.html.ep index 850e4ad..7085045 100644 --- a/root/usr/share/smanager/themes/default/templates/back_tape_configure.html.ep +++ b/root/usr/share/smanager/themes/default/templates/back_tape_configure.html.ep @@ -2,80 +2,80 @@ % 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') -
- %} + % if ( stash 'error' ) { +
+ %= $c->render_to_string( inline => stash 'error' ) +
+ % } -

<%= $title%>

+

<%= $title %>

-

- %=l 'bac_ENABLE_DISABLE_TAPE' -


+

+ %= l 'bac_ENABLE_DISABLE_TAPE' +


- %= $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 -

- - %=l 'bac_ENABLE_TAPE_BACKUP' - - % if ( $bac_datas->{status} eq 'checked' ) { - - %} else { - %= check_box 'Tapebackup' - %} - -

+

+ + %= l 'bac_ENABLE_TAPE_BACKUP' + + % if ( $bac_datas->{status} eq 'checked' ) { + + % } else { + %= check_box 'Tapebackup' + % } + +

-

- - %=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'; - %= text_field 'BackupMin', size => '2' - - - %=l 'AM/PM:' - - % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM'; - %= select_field 'BackupAMPM' => ['AM', 'PM'], class => 'input' - -

+

+ + %= 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'; + %= text_field 'BackupMin', size => '2' + + + %= l 'AM/PM:' + + % param 'BackupAMPM' => $bac_datas->{backupAMPM} unless param 'BackupAMPM'; + %= select_field 'BackupAMPM' => [ 'AM', 'PM' ], class => 'input' + +

-

- - %=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'; - %= text_field 'ReminderMin', size => '2' - - - %=l 'AM/PM:' - - % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM'; - %= select_field 'ReminderAMPM' => ['AM', 'PM'], class => 'input' - -


+

+ + %= 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'; + %= text_field 'ReminderMin', size => '2' + + + %= l 'AM/PM:' + + % param 'ReminderAMPM' => $bac_datas->{reminderAMPM} unless param 'ReminderAMPM'; + %= select_field 'ReminderAMPM' => [ 'AM', 'PM' ], class => 'input' + +


- %= hidden_field 'Function' => $bac_datas->{'function'} - %= submit_button $c->l('bac_UPDATE_CONF'), class => 'action' + %= hidden_field 'Function' => $bac_datas->{'function'} + %= submit_button $c->l('bac_UPDATE_CONF'), class => 'action' - % end + % end
-% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/back_tape_restore.html.ep b/root/usr/share/smanager/themes/default/templates/back_tape_restore.html.ep index 6029a53..bce02a5 100644 --- a/root/usr/share/smanager/themes/default/templates/back_tape_restore.html.ep +++ b/root/usr/share/smanager/themes/default/templates/back_tape_restore.html.ep @@ -2,36 +2,36 @@ % 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') -
- %} + % if ( stash 'error' ) { +
+ %= $c->render_to_string( inline => stash 'error' ) +
+ % } -

<%= $title%>

+

<%= $title %>

- %= form_for '/backupd' => (method => 'POST') => begin + %= form_for '/backupd' => ( method => 'POST' ) => begin -

- %=l 'bac_RESTORE_CONF_FROM_TAPE' -

+

+ %= l 'bac_RESTORE_CONF_FROM_TAPE' +

- %= $c->render_to_string(inline => (l 'bac_RESTORE_CONF_FROM_TAPE_DESC')) + %= $c->render_to_string( inline => ( l 'bac_RESTORE_CONF_FROM_TAPE_DESC' ) ) -
+
- %= hidden_field 'Function' => $bac_datas->{'function'} + %= hidden_field 'Function' => $bac_datas->{'function'} - %= submit_button $c->l('bac_RESTORE_FROM_TAPE'), class => 'action' + %= submit_button $c->l('bac_RESTORE_FROM_TAPE'), class => 'action' - % end + % end
-% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/back_workstn_configure.html.ep b/root/usr/share/smanager/themes/default/templates/back_workstn_configure.html.ep index 1fd7ee0..6b6acee 100644 --- a/root/usr/share/smanager/themes/default/templates/back_workstn_configure.html.ep +++ b/root/usr/share/smanager/themes/default/templates/back_workstn_configure.html.ep @@ -2,52 +2,52 @@ % 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') -
- %} + % if ( stash 'error' ) { +
+ %= $c->render_to_string( inline => stash 'error' ) +
+ % } -

<%= $title%>

+

<%= $title %>

- %= form_for '/backup' => (method => 'POST') => begin + %= form_for '/backup' => ( method => 'POST' ) => begin -

- %=l 'bac_CONFIGURE_WORKSTN_BACKUP' -

+

+ %= l 'bac_CONFIGURE_WORKSTN_BACKUP' +

- %= $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' - - %= $bac_datas->{status} -
+ %= l 'bac_WORKSTN_BACKUP_ENABLED' + + %= $bac_datas->{status} +
- %= $c->render_to_string(inline => $c->workstnBackupConfig()) + %= $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 => 'input' -

+

+ %= 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 => 'input' +

- %= hidden_field 'Function' => $bac_datas->{'function'} . '1' - %= submit_button $c->l('NEXT'), class => 'action' + %= hidden_field 'Function' => $bac_datas->{'function'} . '1' + %= submit_button $c->l('NEXT'), class => 'action' - % end + % end
-% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/back_workstn_configure1.html.ep b/root/usr/share/smanager/themes/default/templates/back_workstn_configure1.html.ep index 463bcb9..45d7ffb 100644 --- a/root/usr/share/smanager/themes/default/templates/back_workstn_configure1.html.ep +++ b/root/usr/share/smanager/themes/default/templates/back_workstn_configure1.html.ep @@ -2,153 +2,153 @@ % 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') -
- %} + % if ( stash 'error' ) { +
+ %= $c->render_to_string( inline => stash 'error' ) +
+ % } -

<%= $title%>

+

<%= $title %>

-

- %=l 'bac_CONFIGURE_WORKSTN_BACKUP' -

+

+ %= l 'bac_CONFIGURE_WORKSTN_BACKUP' +

- %= $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 -

- - %=l 'bac_ENABLE_WORKSTN_BACKUP' - - % if ( $bac_datas->{status} eq 'checked' ) { - - %} else { - %= check_box 'Workstnbackup' - %} - +

+ + %= l 'bac_ENABLE_WORKSTN_BACKUP' + + % if ( $bac_datas->{status} eq 'checked' ) { + + % } else { + %= check_box 'Workstnbackup' + % } + -

-

- %= l 'bac_WORKSTATION_BACKUP_DEST' -


+

+

+ %= 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 => 'input' -
- %} - % 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 => 'input' -
+ + %= l 'bac_WORKSTN_NAME' + + % param 'BackupwkStation' => $bac_datas->{station} unless param 'BackupwkStation'; + %= text_field 'BackupwkStation', size => 20, class => 'input' +
+ % } + % 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 => 'input'; +
% } 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 => 'input' -
+ + %= l 'bac_Mounted disk' + + % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder'; + %= select_field 'BackupwkFolder' => $c->get_BackupwkDest_options( $bac_datas->{vfstype} ), class => 'input'; +
% } else { - - %=l 'bac_SHARED_FOLDER_NAME' - - % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder'; - %= text_field 'BackupwkFolder', size => 20, class => 'input' -
- %} - % if ( $bac_datas->{vfstype} eq 'cifs' ) { - - %=l 'bac_WORKSTN_LOGIN' - - % param 'BackupwkLogin' => $bac_datas->{login} unless param 'BackupwkLogin'; - %= text_field 'BackupwkLogin', size => 12, class => 'input' -
- %=l 'bac_PASSWORD' - - % param 'BackupwkPassword' => $bac_datas->{password} unless param 'BackupwkPassword'; - %= password_field 'BackupwkPassword', size => 12, class => 'input' - - %} -


- %= l 'bac_WORKSTN_BACKUP_SETTINGS' -


+ + %= l 'bac_SHARED_FOLDER_NAME' + + % param 'BackupwkFolder' => $bac_datas->{folder} unless param 'BackupwkFolder'; + %= text_field 'BackupwkFolder', size => 20, class => 'input' +
+ % } + % if ( $bac_datas->{vfstype} eq 'cifs' ) { + + %= l 'bac_WORKSTN_LOGIN' + + % param 'BackupwkLogin' => $bac_datas->{login} unless param 'BackupwkLogin'; + %= text_field 'BackupwkLogin', size => 12, class => 'input' +
+ %= l 'bac_PASSWORD' + + % param 'BackupwkPassword' => $bac_datas->{password} unless param 'BackupwkPassword'; + %= password_field 'BackupwkPassword', size => 12, class => 'input' + + % } +


+ %= l 'bac_WORKSTN_BACKUP_SETTINGS' +


-

- %=l 'bac_NUMBER_OF_SETS' - - % param 'SetsNumber' => $bac_datas->{setsNumber} unless param 'SetsNumber'; - %= text_field 'SetsNumber', size => '3' - - %=l 'bac_NUMBER_OF_FILES_IN_SET' - - % param 'Filesinset' => $bac_datas->{filesinset} unless param 'Filesinset'; - %= text_field 'Filesinset', size => '3' -

+

+ %= l 'bac_NUMBER_OF_SETS' + + % param 'SetsNumber' => $bac_datas->{setsNumber} unless param 'SetsNumber'; + %= text_field 'SetsNumber', size => '3' + + %= l 'bac_NUMBER_OF_FILES_IN_SET' + + % param 'Filesinset' => $bac_datas->{filesinset} unless param 'Filesinset'; + %= text_field 'Filesinset', size => '3' +

-

- - %=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'; - %= text_field 'BackupwkMin', size => '2' - - %=l 'AM/PM:' - - % param 'BackupwkAMPM' => $bac_datas->{ampm} unless param 'BackupwkAMPM'; - %= select_field 'BackupwkAMPM' => ['AM', 'PM'], class => 'input' - -

+

+ + %= 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'; + %= text_field 'BackupwkMin', size => '2' + + %= l 'AM/PM:' + + % param 'BackupwkAMPM' => $bac_datas->{ampm} unless param 'BackupwkAMPM'; + %= select_field 'BackupwkAMPM' => [ 'AM', 'PM' ], class => 'input' + +

-

- %=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' - %} -

+

+ %= 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' + % } +

-

- - %=l 'bac_COMPRESSION_LEVEL' - - % param 'Compression' => $bac_datas->{compression} unless param 'Compression'; - %= text_field 'Compression', size => '1' - - %=l 'bac_FULL_ONLY_ON' - - % param 'Dof' => $bac_datas->{dof} unless param 'Dof'; - %= select_field 'Dof' => $c->get_dow_list(), class => 'input' -


+

+ + %= l 'bac_COMPRESSION_LEVEL' + + % param 'Compression' => $bac_datas->{compression} unless param 'Compression'; + %= text_field 'Compression', size => '1' + + %= l 'bac_FULL_ONLY_ON' + + % param 'Dof' => $bac_datas->{dof} unless param 'Dof'; + %= select_field 'Dof' => $c->get_dow_list(), class => 'input' +


- %= hidden_field 'Function' => $bac_datas->{function} - %= hidden_field 'VFSType' => $bac_datas->{vfstype} - %= submit_button $c->l('bac_UPDATE_CONF'), class => 'action' + %= hidden_field 'Function' => $bac_datas->{function} + %= hidden_field 'VFSType' => $bac_datas->{vfstype} + %= submit_button $c->l('bac_UPDATE_CONF'), class => 'action' % end -
-% end \ No newline at end of file +
+ % end diff --git a/root/usr/share/smanager/themes/default/templates/back_workstn_restore.html.ep b/root/usr/share/smanager/themes/default/templates/back_workstn_restore.html.ep index 9fd3bf7..ceabfaa 100644 --- a/root/usr/share/smanager/themes/default/templates/back_workstn_restore.html.ep +++ b/root/usr/share/smanager/themes/default/templates/back_workstn_restore.html.ep @@ -2,43 +2,43 @@ % 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') -
- %} + % if ( stash 'error' ) { +
+ %= $c->render_to_string( inline => stash 'error' ) +
+ % } -

<%= $title%>

+

<%= $title %>

- %= form_for '/backupd' => (method => 'POST') => begin + %= form_for '/backupd' => ( method => 'POST' ) => begin -

- %=l 'bac_WORKSTN_RESTORE' -

+

+ %= l 'bac_WORKSTN_RESTORE' +

-

+

% 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() ); + % } -

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

+

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

- %= hidden_field 'Function' => $bac_datas->{'function'} - %= submit_button $c->l('bac_RESTORE_FROM_WORKSTN'), class => 'action' - % end + %= hidden_field 'Function' => $bac_datas->{'function'} + %= submit_button $c->l('bac_RESTORE_FROM_WORKSTN'), class => 'action' + % end
-% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/back_workstn_restore1.html.ep b/root/usr/share/smanager/themes/default/templates/back_workstn_restore1.html.ep index 803a173..c182b17 100644 --- a/root/usr/share/smanager/themes/default/templates/back_workstn_restore1.html.ep +++ b/root/usr/share/smanager/themes/default/templates/back_workstn_restore1.html.ep @@ -1,36 +1,59 @@ % layout 'default', title => "Sme server 2 - restore"; - +%= stylesheet '/css/backup.css' % content_for 'module' => begin - -
+
+ %= javascript '/js/backup_workstation_restore.js' % 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') -
- %} + % if ( stash 'error' ) { +
+ %= $c->render_to_string( inline => stash 'error' ) +
+ % } -

<%= $title%>

+

<%= $title %>

- %= form_for '/backupd' => (method => 'POST') => begin + %= form_for '/backupd' => ( method => 'POST' ) => begin -

- %=l 'bac_WORKSTN_RESTORE' -

-

- %= $c->render_to_string(inline => $bac_datas->{restore_log}) -

- %=l 'bac_YOU_MUST_REBOOT' -

- %= hidden_field 'Function' => $bac_datas->{'function'} - %= submit_button $c->l('bac_REBOOT'), class => 'action' - % end +

+ %= l 'bac_WORKSTN_RESTORE' +

+ +
+
+
Stage: -
+
+
0%
+
+ +
+

Console Output:

+
+
+ +
+
+
+ + + +

+ %= l 'bac_YOU_MUST_REBOOT' +

+ %= hidden_field 'Function' => $bac_datas->{'function'} + %= submit_button $c->l('bac_REBOOT'), class => 'action' + % end
-% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore.html.ep b/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore.html.ep index d042dfa..b803f4e 100644 --- a/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore.html.ep +++ b/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore.html.ep @@ -2,47 +2,47 @@ % 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') -
- %} + % if ( stash 'error' ) { +
+ %= $c->render_to_string( inline => stash 'error' ) +
+ % } -

<%= $title%>

+

<%= $title %>

- %= form_for '/backupd' => (method => 'POST') => begin + %= form_for '/backupd' => ( method => 'POST' ) => begin -

<%=l 'bac_WORKSTN_SEL_RESTORE' %>

+

<%= l 'bac_WORKSTN_SEL_RESTORE' %>

- %= $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() ); -

<%=l 'bac_BACKUP_CHOICE' %>

+

<%= l 'bac_BACKUP_CHOICE' %>

-
- %=l 'bac_SELECT_BACKUP_FILE' - - %= select_field 'Backupset' => $c->get_Restoreset_options(), class => 'input' -
+
+ %= l 'bac_SELECT_BACKUP_FILE' + + %= select_field 'Backupset' => $c->get_Restoreset_options(), class => 'input' +
-
- %=l 'bac_FILTER_EXPRESSION' - - %= text_field 'Filterexp', size => 32, class => 'input' -
-
- %= hidden_field 'Function' => $bac_datas->{'function'} - %= submit_button $c->l('PERFORM'), class => 'action' +
+ %= l 'bac_FILTER_EXPRESSION' + + %= text_field 'Filterexp', size => 32, class => 'input' +
+
+ %= hidden_field 'Function' => $bac_datas->{'function'} + %= submit_button $c->l('PERFORM'), class => 'action' - % end + % end
-% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore1.html.ep b/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore1.html.ep index 9b0bfd0..60d0a5f 100644 --- a/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore1.html.ep +++ b/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore1.html.ep @@ -2,48 +2,48 @@ % 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') -
- %} + % if ( stash 'error' ) { +
+ %= $c->render_to_string( inline => stash 'error' ) +
+ % } -

<%= $title%>

+

<%= $title %>

-

<%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %>


+

<%= l 'bac_WORKSTN_SELECTIVE_RESTORE' %>


- %= $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 -
- %=l 'bac_SELECT_FILES_TO_RESTORE' - - %= select_field 'Restorefiles' => $c->get_Restorefiles_options($bac_datas->{'filterexp'},$bac_datas->{'backupset'}), class => 'input', multiple => 1, size => 15 -
+
+ %= l 'bac_SELECT_FILES_TO_RESTORE' + + %= select_field 'Restorefiles' => $c->get_Restorefiles_options( $bac_datas->{'filterexp'}, $bac_datas->{'backupset'} ), class => 'input', multiple => 1, size => 15; +
-
- %=l 'bac_SELECT_DATE_BEFORE' - - %= text_field 'Seldatebefore', size => 32, class => 'input' -
-
- %= hidden_field 'Function' => $bac_datas->{'function'} - %= hidden_field 'Backupset' => $bac_datas->{'backupset'} - %= hidden_field 'Filterexp' => $bac_datas->{'filterexp'} +
+ %= l 'bac_SELECT_DATE_BEFORE' + + %= text_field 'Seldatebefore', size => 32, class => 'input' +
+
+ %= hidden_field 'Function' => $bac_datas->{'function'} + %= hidden_field 'Backupset' => $bac_datas->{'backupset'} + %= hidden_field 'Filterexp' => $bac_datas->{'filterexp'} - %= submit_button $c->l('PERFORM'), class => 'action' + %= submit_button $c->l('PERFORM'), class => 'action' - % end + % end
-% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore2.html.ep b/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore2.html.ep index 3c0b3d2..4940871 100644 --- a/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore2.html.ep +++ b/root/usr/share/smanager/themes/default/templates/back_workstn_sel_restore2.html.ep @@ -2,31 +2,31 @@ % 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') -
- %} + % if ( stash 'error' ) { +
+ %= $c->render_to_string( inline => stash 'error' ) +
+ % } -

<%= $title%>

-

<%=l 'bac_WORKSTN_SELECTIVE_RESTORE' %>

-
- %= $c->render_to_string(inline => $bac_datas->{restore_log}) -
+

<%= $title %>

+

<%= l 'bac_WORKSTN_SELECTIVE_RESTORE' %>

+
+ %= $c->render_to_string( inline => $bac_datas->{restore_log} ) +
- %= form_for '/backupd' => (method => 'POST') => begin - %= hidden_field 'Function' => $bac_datas->{'function'} - %= submit_button $c->l('NEXT'), class => 'action' + %= form_for '/backupd' => ( method => 'POST' ) => begin + %= hidden_field 'Function' => $bac_datas->{'function'} + %= submit_button $c->l('NEXT'), class => 'action' - % end + % end
-% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/back_workstn_verify.html.ep b/root/usr/share/smanager/themes/default/templates/back_workstn_verify.html.ep index bc06917..527530c 100644 --- a/root/usr/share/smanager/themes/default/templates/back_workstn_verify.html.ep +++ b/root/usr/share/smanager/themes/default/templates/back_workstn_verify.html.ep @@ -1,51 +1,51 @@ % layout 'default', 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') -
- %} + % if ( stash 'error' ) { +
+ %= $c->render_to_string( inline => stash 'error' ) +
+ % } -

<%= $title%>

+

<%= $title %>

-

- %=l 'bac_VERIFY_WORKSTN_BACKUP_FILE' -

+

+ %= l 'bac_VERIFY_WORKSTN_BACKUP_FILE' +

- %= 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()) - %} -

- %=l 'bac_SELECT_BACKUP_FILE' - - %= select_field 'Backupset' => $c->get_Backupset_options(), class => 'input' -
+ %= $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 => 'input' +
-

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


+

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


- %=l 'bac_CHECK_INTEGRITY_WARNING' + %= l 'bac_CHECK_INTEGRITY_WARNING' -

- %= hidden_field 'Function' => $bac_datas->{'function'} . '1' - %= submit_button $c->l('bac_VERIFY'), class => 'action' +

+ %= hidden_field 'Function' => $bac_datas->{'function'} . '1' + %= submit_button $c->l('bac_VERIFY'), class => 'action' - % end + % end
-% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/back_workstn_verify1.html.ep b/root/usr/share/smanager/themes/default/templates/back_workstn_verify1.html.ep index 2b8ad56..8e0ff88 100644 --- a/root/usr/share/smanager/themes/default/templates/back_workstn_verify1.html.ep +++ b/root/usr/share/smanager/themes/default/templates/back_workstn_verify1.html.ep @@ -1,35 +1,35 @@ % layout 'default', title => "Sme server 2 - backup - verify"; % content_for 'module' => begin -
+
% if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $bac_datas->{function} - -

+

+ %= dumper $c->current_route + %= dumper $bac_datas->{function} + +

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

<%= $title%>

+

<%= $title %>

-

<%= l 'bac_VERIFY_WORKSTN_BACKUP_FILE' %>

+

<%= l 'bac_VERIFY_WORKSTN_BACKUP_FILE' %>

-
- %= $c->render_to_string(inline => $c->workstnVerify()) -
+
+ %= $c->render_to_string( inline => $c->workstnVerify() ) +
- %= 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' - % end + % end
-% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/backdown.html.ep b/root/usr/share/smanager/themes/default/templates/backdown.html.ep index c0a5fcc..857b22a 100644 --- a/root/usr/share/smanager/themes/default/templates/backdown.html.ep +++ b/root/usr/share/smanager/themes/default/templates/backdown.html.ep @@ -1,67 +1,71 @@ <% - - my $backups = esmith::BackupHistoryDB->open; # no UTF8 - my $now = time(); - my $backup_rec = $backups->new_record($now, { - type => 'backup_record', BackupType => 'desktop', - StartEpochTime => $now, - }); - - # Dump the current mysql tables so that they are part of the image. - # The events handle cases where mysqld is not enabled, and/or is not running. - my $status = system("/sbin/e-smith/signal-event", "pre-backup", "desktop"); - if ($status) { - $c->desktopBackupRecordStatus($backup_rec, 'pre-backup', $status); - return ($c->l('bac_OPERATION_STATUS_REPORT').$c->l('bac_ERR_PRE_BACKUP')); + my $backups = esmith::BackupHistoryDB->open; # no UTF8 + my $now = time(); + my $backup_rec = $backups->new_record( + $now, + { + type => 'backup_record', + BackupType => 'desktop', + StartEpochTime => $now, } + ); - my $clvl = $c->stash('compressionlevel'); - my $cmd = "/bin/tar --create --file=- --directory / @{$c->stash('exclude')} " - . "@{$c->stash('directories')} | /usr/bin/gzip $clvl "; + # 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" ); + if ($status) { + $c->desktopBackupRecordStatus( $backup_rec, 'pre-backup', $status ); + return ( $c->l('bac_OPERATION_STATUS_REPORT') . $c->l('bac_ERR_PRE_BACKUP') ); + } - my $success = open my $fh, '-|', $cmd; - #unless ($success) { return "Error download command."; }; - if ($success) { - # Try with download plugin - seems to fail to complete download and also - # name of file deposited is not as required. - #my $output = do { local $/; <$fh> }; - #close $fh; - #$c->render_file( - #data => $output, - #filename => 'output.txt', - #content_type => 'text/plain' - #); - # So organise it ourselves. - $c->res->headers->content_type('application/x-tar'); - $c->res->headers->content_disposition(qq/attachment; filename="smeserver.tgz"/); - my $cb; - $cb = sub { - my $c = shift; - my $size = 500 * 1024; - my $length = sysread($fh, my $buffer, $size); - unless ($length) { - close $fh; - undef $cb; - $c->finish; - return; - } - $c->write_chunk($buffer, $cb); - }; - $c->$cb; - } else { - $c->render(text => "Failed to execute command: $!", status => 500); - } + my $clvl = $c->stash('compressionlevel'); + my $cmd = "/bin/tar --create --file=- --directory / @{$c->stash('exclude')} " + . "@{$c->stash('directories')} | /usr/bin/gzip $clvl "; - # Remove the dumped tables. - $status = system("/sbin/e-smith/signal-event", "post-backup", "desktop"); - if ($status) { - $c->desktopBackupRecordStatus($backup_rec, 'post-backup', $status); - die ($c->l('bac_ERR_POST_BACKUP'),"\n"); - } + my $success = open my $fh, '-|', $cmd; + #unless ($success) { return "Error download command."; }; + if ($success) { + # Try with download plugin - seems to fail to complete download and also + # name of file deposited is not as required. + #my $output = do { local $/; <$fh> }; + #close $fh; + #$c->render_file( + #data => $output, + #filename => 'output.txt', + #content_type => 'text/plain' + #); + # So organise it ourselves. + $c->res->headers->content_type('application/x-tar'); + $c->res->headers->content_disposition(qq/attachment; filename="smeserver.tgz"/); + my $cb; + $cb = sub { + my $c = shift; + my $size = 500 * 1024; + my $length = sysread( $fh, my $buffer, $size ); + unless ($length) { + close $fh; + undef $cb; + $c->finish; + return; + } + $c->write_chunk( $buffer, $cb ); + }; + $c->$cb; + } + else { + $c->render( text => "Failed to execute command: $!", status => 500 ); + } - $now = time(); - $backup_rec->set_prop('EndEpochTime', "$now"); - $backup_rec->set_prop('Result', "0"); + # Remove the dumped tables. + $status = system( "/sbin/e-smith/signal-event", "post-backup", "desktop" ); + if ($status) { + $c->desktopBackupRecordStatus( $backup_rec, 'post-backup', $status ); + die( $c->l('bac_ERR_POST_BACKUP'), "\n" ); + } + $now = time(); + $backup_rec->set_prop( 'EndEpochTime', "$now" ); + $backup_rec->set_prop( 'Result', "0" ); + %> 1; diff --git a/root/usr/share/smanager/themes/default/templates/backup.html.ep b/root/usr/share/smanager/themes/default/templates/backup.html.ep index d05c940..17fb750 100644 --- a/root/usr/share/smanager/themes/default/templates/backup.html.ep +++ b/root/usr/share/smanager/themes/default/templates/backup.html.ep @@ -1,79 +1,78 @@ % layout 'default', title => "Sme server 2 - backup"; % content_for 'module' => begin - -
+
% if (config->{debug} == 1) { -

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

+

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

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

<%= $title%>

- +

<%= $title %>

+ - <%= $c->render_to_string(inline => (l 'bac_BACKUP_DESC_DAR', $bac_datas->{module}, - $bac_datas->{dumpsize}, $bac_datas->{tarsize})) %> + <%= $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 -

- %=l 'bac_BACKUP_CONFIG_STATUS' -

+

+ %= 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'} - - %} -

- %=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'} - - %} +

+ %= 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'} + + % } +

+ %= 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'} + + % } -

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

+

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

-
- %= submit_button $c->l('PERFORM'), class => 'action' - - % end +
+ %= submit_button $c->l('PERFORM'), class => 'action' -
+ % end -% end \ No newline at end of file +
+ + % end diff --git a/root/usr/share/smanager/themes/default/templates/bugreport.html.ep b/root/usr/share/smanager/themes/default/templates/bugreport.html.ep index f410e6d..6f332e5 100644 --- a/root/usr/share/smanager/themes/default/templates/bugreport.html.ep +++ b/root/usr/share/smanager/themes/default/templates/bugreport.html.ep @@ -2,81 +2,81 @@ % content_for 'module' => begin -
+
% if (config->{debug} == 1) { -

- (DBG)route: <%= $c->current_route %>
- (DBG)trt: <%= $bugr_datas->{trt} %>
-

+

+ (DBG)route: <%= $c->current_route %>
+ (DBG)trt: <%= $bugr_datas->{trt} %>
+

% } - -

<%= $title %>

- + +

<%= $title %>

+ - %=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_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_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'); %> + <% my $btn = l('bugr_CREATE_REPORT'); %> - %= form_for 'bugreport' => (method => 'POST') => begin - %= submit_button "$btn", class => 'action' - % end + %= form_for 'bugreport' => ( method => 'POST' ) => begin + %= submit_button "$btn", class => 'action' + % end -

    - %=l ('bugr_DONATING') +

    + %= l('bugr_DONATING')

    - %=l ('bugr_AWARE_SME') + %= l('bugr_AWARE_SME')

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

    - %=l ('bugr_CONSIDER_DONATING') + %= l('bugr_CONSIDER_DONATING')

    -

    +

    - %= link_to 'https://wiki.koozali.org/Donate' => begin - %= image '/images/btn_donateCC_LG.gif' + %= link_to 'https://wiki.koozali.org/Donate' => begin + %= image '/images/btn_donateCC_LG.gif' %= hidden_field 'trt' => $bugr_datas->{trt} - % end + % end -
    - %=l ('bugr_THANK_YOU') +
    + %= l('bugr_THANK_YOU')
    -%end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/bugreport2.html.ep b/root/usr/share/smanager/themes/default/templates/bugreport2.html.ep index 00285e5..75385f5 100644 --- a/root/usr/share/smanager/themes/default/templates/bugreport2.html.ep +++ b/root/usr/share/smanager/themes/default/templates/bugreport2.html.ep @@ -2,33 +2,33 @@ % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

    - (DBG)route: <%= $c->current_route %>
    - (DBG)trt: <%= $bugr_datas->{trt} %>
    -

    +

    + (DBG)route: <%= $c->current_route %>
    + (DBG)trt: <%= $bugr_datas->{trt} %>
    +

    % } -

    <%= $title %>

    +

    <%= $title %>

    -
    <%= $modul %>
    +
    <%= $modul %>
    - <% my $btn = l('bugr_Download this report'); %> + <% my $btn = l('bugr_Download this report'); %> - %= form_for 'bugreportD' => (method => 'POST') => begin - %= submit_button "$btn", class => 'action' - %= hidden_field 'trt' => $bugr_datas->{trt} - % end - - % my $out = "==================
    "; - % $out .= "Boot anaysis image (right click and save image to download)
    "; - % $out .= "==================
    "; - % $out .= "boot timing image"; - -
    <%= $c->render_to_string(inline=>$out) %>
    + %= form_for 'bugreportD' => ( method => 'POST' ) => begin + %= submit_button "$btn", class => 'action' + %= hidden_field 'trt' => $bugr_datas->{trt} + % end + + % my $out = "==================
    "; + % $out .= "Boot anaysis image (right click and save image to download)
    "; + % $out .= "==================
    "; + % $out .= "boot timing image"; + +
    <%= $c->render_to_string( inline => $out ) %>
    -%end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/clamav.html.ep b/root/usr/share/smanager/themes/default/templates/clamav.html.ep index cecacdb..be7e0c6 100644 --- a/root/usr/share/smanager/themes/default/templates/clamav.html.ep +++ b/root/usr/share/smanager/themes/default/templates/clamav.html.ep @@ -1,45 +1,45 @@ % layout 'default', title => "Sme server 2 - clamav"; % content_for 'module' => begin -
    - %if (config->{debug} == 1) { -

    (DBG)route: <%= $c->current_route %>
    - (DBG)FsS stat: <%= $clm_datas->{FilesystemScan}%>
    - (DBG)Quar stat: <%=$clm_datas->{Quarantine} %> -

    - %} -

    <%= $title %>

    -
    - <%= $modul %> - <% my $btn = l('SAVE'); %> +
    + % if (config->{debug} == 1) { +

    (DBG)route: <%= $c->current_route %>
    + (DBG)FsS stat: <%= $clm_datas->{FilesystemScan} %>
    + (DBG)Quar stat: <%= $clm_datas->{Quarantine} %> +

    + % } +

    <%= $title %>

    +
    + <%= $modul %> + <% my $btn = l('SAVE'); %> - %= 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 => 'input' - -

    -

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

    -

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

    - %= submit_button "$btn", class => 'action' - % end + %= 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 => 'input'; + +

    +

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

    +

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

    + %= submit_button "$btn", class => 'action' + % end
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/csrf_400.html.ep b/root/usr/share/smanager/themes/default/templates/csrf_400.html.ep index 85850a8..0d990f2 100644 --- a/root/usr/share/smanager/themes/default/templates/csrf_400.html.ep +++ b/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 -
    +
    - %= l 'CSRF_VALIDATION_FAILURE' + %= l 'CSRF_VALIDATION_FAILURE'
    -
    +
    % end diff --git a/root/usr/share/smanager/themes/default/templates/datetime.html.ep b/root/usr/share/smanager/themes/default/templates/datetime.html.ep index d5befdb..8433f31 100644 --- a/root/usr/share/smanager/themes/default/templates/datetime.html.ep +++ b/root/usr/share/smanager/themes/default/templates/datetime.html.ep @@ -1,147 +1,147 @@ % layout 'default', title => 'Sme server 2 - datetime'; % content_for 'module' => begin -
    - % if (config->{debug} == 1) { -

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

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

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

    + % } - %if ($c->stash('first')) { -

    - %=$c->render_to_string(inline =>$c->l($c->stash('first'))) -

    - %} elsif ($c->stash('success')) { -
    - %= $c->l($c->stash('success')); -
    - %} elsif ($c->stash('error')) { -
    - %= $c->l($c->stash('error')); -
    - %} + % if ($c->stash('first')) { +

    + %= $c->render_to_string( inline => $c->l( $c->stash('first') ) ) +

    + % } elsif ($c->stash('success')) { +
    + %= $c->l( $c->stash('success') ); +
    + % } elsif ($c->stash('error')) { +
    + %= $c->l( $c->stash('error') ); +
    + % } -

    <%= $title %>


    - %= $modul - <% my $btn = l('SAVE'); %> -

    - - %= label_for 'real-time-clock' => $c->l('dat_The_time_is_currently'), class => 'datetime-clock-label' - - - %= text_field 'clock', id => 'real-time-clock', readonly => 'readonly', class => 'datetime-clock' , value => $dat_data->{currentdatetime} - - % if ($dat_data->{ntpstatus} eq 'disabled') { -
    - %=l 'dat_NTP_ENABLE_DESC' -
    -
    - % } else { - % my $current_year = $dat_data->{year}; - % my $year_options = [ map { [ $_, $_ ] } ($current_year..($current_year+30)) ]; - % my $month_options = [ map { [ sprintf('%02d', $_), sprintf('%02d', $_) ] } (1..12) ]; - % 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' ] - % ]; -

    <%= $c->l('Time Configuration') %>

    - %= form_for "datetimeu" => (method => 'post') => begin +

    <%= $title %>


    + %= $modul + <% my $btn = l('SAVE'); %> +

    + + %= label_for 'real-time-clock' => $c->l('dat_The_time_is_currently'), class => 'datetime-clock-label'; + + + %= text_field 'clock', id => 'real-time-clock', readonly => 'readonly', class => 'datetime-clock', value => $dat_data->{currentdatetime}; + + % if ($dat_data->{ntpstatus} eq 'disabled') { +
    + %= l 'dat_NTP_ENABLE_DESC' +
    +
    + % } else { + % my $current_year = $dat_data->{year}; + % my $year_options = [ map { [ $_, $_ ] } ( $current_year .. ( $current_year + 30 ) ) ]; + % my $month_options = [ map { [ sprintf( '%02d', $_ ), sprintf( '%02d', $_ ) ] } ( 1 .. 12 ) ]; + % 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' ] + % ]; +

    <%= $c->l('Time Configuration') %>

    + %= form_for "datetimeu" => ( method => 'post' ) => begin - %= hidden_field 'Old_ntpstatus' => $dat_data->{ntpstatus}; - %= hidden_field 'trt' => $dat_data->{trt}; + %= hidden_field 'Old_ntpstatus' => $dat_data->{ntpstatus}; + %= hidden_field 'trt' => $dat_data->{trt}; - - %= label_for time_mode => $c->l('Time Setting Mode:') - - % param 'time_mode' => $dat_data->{time_mode} unless param 'time_mode'; - %= select_field time_mode => ($mode_options, id => 'time_mode_select') - + + %= label_for time_mode => $c->l('Time Setting Mode:') + + % param 'time_mode' => $dat_data->{time_mode} unless param 'time_mode'; + %= select_field time_mode => ( $mode_options, id => 'time_mode_select' ) + -
    -

    - %= $c->l('dat_NTP_CONFIGURE_DESC') -

    -
    -
    - - %= label_for ntpserver => $c->l('dat_NTP_Server_URL') - -
    -
    - % 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' - - -
    -
    -
    +
    +

    + %= $c->l('dat_NTP_CONFIGURE_DESC') +

    +
    +
    + + %= label_for ntpserver => $c->l('dat_NTP_Server_URL') + +
    +
    + % 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'; + + +
    +
    +
    -
    -

    - %= $c->l('dat_NTP_DISABLE_DESC') -

    -
    -
    - - %= label_for 'datetime_manual' => $c->l('dat_set_manually') - -
    -
    -
    - <%= $c->l('Date') %> - %= label_for year => $c->l('Year:') - % param 'year' => ($dat_data->{year}) unless param 'year'; - %= select_field year => ($year_options, id => 'year'), required => 'required' -   +
    +

    + %= $c->l('dat_NTP_DISABLE_DESC') +

    +
    +
    + + %= label_for 'datetime_manual' => $c->l('dat_set_manually') + +
    +
    +
    + <%= $c->l('Date') %> + %= label_for year => $c->l('Year:') + % param 'year' => ( $dat_data->{year} ) unless param 'year'; + %= select_field year => ( $year_options, id => 'year' ), required => 'required' +   - %= label_for month => $c->l('Month:') - % param 'month' => ($dat_data->{month}) unless param 'month'; - %= select_field month => ($month_options, id => 'month'), required => 'required' -   + %= label_for month => $c->l('Month:') + % param 'month' => ( $dat_data->{month} ) unless param 'month'; + %= select_field month => ( $month_options, id => 'month' ), required => 'required' +   - %= label_for day => $c->l('Day:') - % param 'day' => ($dat_data->{day}) unless param 'day'; - %= text_field day => id => 'day', size => 2, maxlength => 2, placeholder => 'DD', pattern => '^(0[1-9]|[12][0-9]|3[01])$', title => 'Day (01-31)', required => 'required', inputmode => 'numeric', autocomplete => 'off' -
    - -
    - <%= $c->l('Time') %> - %= label_for hour => $c->l('Hour:') - % param 'hour' => ($dat_data->{hour}) unless param 'hour'; - %= select_field hour => ($hour_options, id => 'hour'), required => 'required' -   + %= label_for day => $c->l('Day:') + % param 'day' => ( $dat_data->{day} ) unless param 'day'; + %= text_field day => id => 'day', size => 2, maxlength => 2, placeholder => 'DD', pattern => '^(0[1-9]|[12][0-9]|3[01])$', title => 'Day (01-31)', required => 'required', inputmode => 'numeric', autocomplete => 'off'; +
    - %= label_for minute => $c->l('Minute:') - % param 'minute' => ($dat_data->{minute}) unless param 'minute'; - %= text_field minute => id => 'minute', size => 2, maxlength => 2, placeholder => 'MM', pattern => '^[0-5][0-9]$', title => 'Minute (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off' -   +
    + <%= $c->l('Time') %> + %= label_for hour => $c->l('Hour:') + % param 'hour' => ( $dat_data->{hour} ) unless param 'hour'; + %= select_field hour => ( $hour_options, id => 'hour' ), required => 'required' +   - %= label_for second => $c->l('Second:') - % param 'second' => ($dat_data->{second}) unless param 'second'; - %= text_field second => id => 'second', size => 2, maxlength => 2, placeholder => 'SS', pattern => '^[0-5][0-9]$', title => 'Second (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off' -
    -
    -
    -
    -
    - - %=l 'dat_TZ' - -
    -
    - % param 'Timezone' => $c->getTimezone() unless param 'Timezone'; - %= select_field 'Timezone' => $c->getZone_list(), class => 'input' -
    -
    -
    - %= submit_button $btn, class => 'action' - % end - % } -
    + %= label_for minute => $c->l('Minute:') + % param 'minute' => ( $dat_data->{minute} ) unless param 'minute'; + %= text_field minute => id => 'minute', size => 2, maxlength => 2, placeholder => 'MM', pattern => '^[0-5][0-9]$', title => 'Minute (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off'; +   + + %= label_for second => $c->l('Second:') + % param 'second' => ( $dat_data->{second} ) unless param 'second'; + %= text_field second => id => 'second', size => 2, maxlength => 2, placeholder => 'SS', pattern => '^[0-5][0-9]$', title => 'Second (00-59)', required => 'required', inputmode => 'numeric', autocomplete => 'off'; + +
    +
    +
    +
    + + %= l 'dat_TZ' + +
    +
    + % param 'Timezone' => $c->getTimezone() unless param 'Timezone'; + %= select_field 'Timezone' => $c->getZone_list(), class => 'input' +
    +
    +
    + %= submit_button $btn, class => 'action' + % end + % } +
    % end -1; \ No newline at end of file +1; diff --git a/root/usr/share/smanager/themes/default/templates/default.html.ep b/root/usr/share/smanager/themes/default/templates/default.html.ep index 578e01b..1d885f0 100644 --- a/root/usr/share/smanager/themes/default/templates/default.html.ep +++ b/root/usr/share/smanager/themes/default/templates/default.html.ep @@ -2,12 +2,12 @@ % content_for 'module' => begin -
    +

    <%= $title %>

    <%= $modul %>

    - %= link_to Initial => '/' + %= link_to Initial => '/'

    -
    +
    -%end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/directory.html.ep b/root/usr/share/smanager/themes/default/templates/directory.html.ep index 773247e..8255612 100644 --- a/root/usr/share/smanager/themes/default/templates/directory.html.ep +++ b/root/usr/share/smanager/themes/default/templates/directory.html.ep @@ -1,88 +1,87 @@ % layout 'default', title => "Sme server 2 - directory"; % content_for 'module' => begin -
    +
    - %if (config->{debug} == 1) { -

    - (DBG)route: <%= $c->current_route %>
    - (DBG)dir. access: <%= $dir_datas->{access}%>
    -

    - %} - -

    <%= $title %>

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

    + (DBG)route: <%= $c->current_route %>
    + (DBG)dir. access: <%= $dir_datas->{access} %>
    +

    + % } + +

    <%= $title %>

    +
    + <%= $modul %> + <% my $btn = l('SAVE'); %> + + + %= form_for 'directory' => ( method => 'POST' ) => begin
    - <%= $modul %> - <% my $btn = l('SAVE'); - %> - - - %= form_for 'directory' => (method => 'POST') => begin -
    -

    - - %= l('dir_LABEL_ROOT'), class => 'label' - - %= $dir_datas->{root}, class => 'data' - -

    -

    - %=l 'dir_DESC_DIRECTORY_ACCESS', class => 'desc' -
    - - %=l 'dir_DIRECTORY_ACCESS', class => 'label' - - % 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' - -

    -

    - %=l 'dir_DESC_DEPARTMENT', class => 'desc' -

    - - %=l 'dir_DEPARTMENT', class => 'label' - - %= text_field 'department' => $dir_datas->{department}, class => 'input' - -

    - - %=l 'dir_COMPANY', class => 'label' - - %= text_field 'company', $dir_datas->{company}, class => 'input' - -

    - - %=l 'dir_STREET', class => 'label' - - %= text_field 'street' => $dir_datas->{street}, class => 'input' - -

    - - %=l 'dir_CITY', class => 'label' - - %= text_field 'city', $dir_datas->{city}, class => 'input' - -

    - - %=l 'dir_PHONENUMBER', class => 'label' - - %= text_field 'phonenumber', $dir_datas->{phonenumber}, class => 'input' - -

    -

    - %=l 'dir_DESC_EXISTING', class => 'desc' -

    - - %=l 'dir_EXISTING', class => 'label' - - %= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]], class => 'input' - -

    -

    -
    - %= submit_button "$btn", class => 'action' -

    - % end +

    + + %= l('dir_LABEL_ROOT'), class => 'label' + + %= $dir_datas->{root}, class => 'data' + +

    +

    + %= l 'dir_DESC_DIRECTORY_ACCESS', class => 'desc' +
    + + %= l 'dir_DIRECTORY_ACCESS', class => 'label' + + % 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'; + +

    +

    + %= l 'dir_DESC_DEPARTMENT', class => 'desc' +

    + + %= l 'dir_DEPARTMENT', class => 'label' + + %= text_field 'department' => $dir_datas->{department}, class => 'input' + +

    + + %= l 'dir_COMPANY', class => 'label' + + %= text_field 'company', $dir_datas->{company}, class => 'input' + +

    + + %= l 'dir_STREET', class => 'label' + + %= text_field 'street' => $dir_datas->{street}, class => 'input' + +

    + + %= l 'dir_CITY', class => 'label' + + %= text_field 'city', $dir_datas->{city}, class => 'input' + +

    + + %= l 'dir_PHONENUMBER', class => 'label' + + %= text_field 'phonenumber', $dir_datas->{phonenumber}, class => 'input' + +

    +

    + %= l 'dir_DESC_EXISTING', class => 'desc' +

    + + %= l 'dir_EXISTING', class => 'label' + + %= select_field 'existing' => [ [ ( l 'dir_LEAVE' ) => 'leave' ], [ ( l 'dir_UPDATE' ) => 'update' ] ], class => 'input'; + +

    +

    +
    + %= submit_button "$btn", class => 'action' +

    + % end
    -%end \ No newline at end of file +% end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/domains.html.ep b/root/usr/share/smanager/themes/default/templates/domains.html.ep index 8357cfa..18feaea 100644 --- a/root/usr/share/smanager/themes/default/templates/domains.html.ep +++ b/root/usr/share/smanager/themes/default/templates/domains.html.ep @@ -1,32 +1,32 @@ % layout 'default', title => "Sme server 2 - domains"; % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

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

    <%= $title%>

    + % if ( stash 'error' ) { +
    + %= $c->render_to_string( inline => stash 'error' ) +
    + % } - % if ($dom_datas->{trt} eq 'ADD' or $dom_datas->{trt} eq 'UPD') { - %= include 'partials/_dom_upd' - %} elsif ($dom_datas->{trt} eq 'DEL') { - %= include 'partials/_dom_del' - %} elsif ($dom_datas->{trt} eq 'UP2') { - %= include 'partials/_dom_up2' - %} else { - %= include 'partials/_dom_list' - %} +

    <%= $title %>

    + + % if ($dom_datas->{trt} eq 'ADD' or $dom_datas->{trt} eq 'UPD') { + %= include 'partials/_dom_upd' + % } elsif ($dom_datas->{trt} eq 'DEL') { + %= include 'partials/_dom_del' + % } elsif ($dom_datas->{trt} eq 'UP2') { + %= include 'partials/_dom_up2' + % } else { + %= include 'partials/_dom_list' + % }
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/emailsettings.html.ep b/root/usr/share/smanager/themes/default/templates/emailsettings.html.ep index 031437f..c5059f2 100644 --- a/root/usr/share/smanager/themes/default/templates/emailsettings.html.ep +++ b/root/usr/share/smanager/themes/default/templates/emailsettings.html.ep @@ -1,70 +1,70 @@ %# -%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 +%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 %# % layout 'default', title => "Sme server 2 - E-Mail", share_dir => './'; %# css specific to this panel: % content_for 'module' => begin -% use constant FALSE => 0; -% use constant TRUE => 1; + % use constant FALSE => 0; + % use constant TRUE => 1; -
    +
    % if (config->{debug} == 1) { - 
    +      
     		%= dumper $c->current_route
 		%= dumper $mai_data->{trt}
-	
    
-    % }
-    
-    
    <%=$title%>
    
-
-    % if ( stash('modul')) {
-	%= $c->render_to_string(inline => stash('modul') );
+
    % } - %if ($c->stash('first')) { -

    - %=$c->render_to_string(inline =>$c->l($c->stash('first'))) -

    +

    <%= $title %>

    - %} elsif ($c->stash('success')) { -
    - %= $c->l($c->stash('success')); -
    -
    + % if ( stash('modul')) { + %= $c->render_to_string( inline => stash('modul') ); + % } - %} elsif ($c->stash('error')) { -
    - %= $c->l($c->stash('error')); -
    -
    - %} + % if ($c->stash('first')) { +

    + %= $c->render_to_string( inline => $c->l( $c->stash('first') ) ) +

    + + % } elsif ($c->stash('success')) { +
    + %= $c->l( $c->stash('success') ); +
    +
    + + % } elsif ($c->stash('error')) { +
    + %= $c->l( $c->stash('error') ); +
    +
    + % } + + %# 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' + + % 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' + % } - %#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' - - % 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' - %} -
    -%end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/embedded.html.ep b/root/usr/share/smanager/themes/default/templates/embedded.html.ep index 6560eb5..4933f44 100644 --- a/root/usr/share/smanager/themes/default/templates/embedded.html.ep +++ b/root/usr/share/smanager/themes/default/templates/embedded.html.ep @@ -1,23 +1,23 @@ -% layout 'default', title => "Sme server 2 - embedded"; +% layout 'default', title => "Sme server 2 - embedded"; % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

    - %= dumper $c->current_route -

    +

    + %= dumper $c->current_route +

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

    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';} - <%= $c->stash('title') %> not found + % if ( stash 'error' ) { +
    + %= $c->render_to_string( inline => stash 'error' ) +
    + % } +

    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'; } + <%= $c->stash('title') %> not found
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/exception_development.html.ep b/root/usr/share/smanager/themes/default/templates/exception_development.html.ep index 8b8a189..7a0a4a2 100644 --- a/root/usr/share/smanager/themes/default/templates/exception_development.html.ep +++ b/root/usr/share/smanager/themes/default/templates/exception_development.html.ep @@ -2,16 +2,16 @@ % content_for 'module' => begin -
    -


    dev
    Oups !!! - The page you were requesting - "<%= $self->req->url->path || '/' %>" - caused en exception !! -
    dev
    +

    +


    dev
    Oups !!! + The page you were requesting + "<%= $self->req->url->path || '/' %>" + caused en exception !! +
    dev

    - %= link_to Back => '/' + %= link_to Back => '/'

    -
    +
    -% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/groups.html.ep b/root/usr/share/smanager/themes/default/templates/groups.html.ep index d9e91d7..073a570 100644 --- a/root/usr/share/smanager/themes/default/templates/groups.html.ep +++ b/root/usr/share/smanager/themes/default/templates/groups.html.ep @@ -1,33 +1,33 @@ % layout 'default', title => "Sme server 2 - groups"; % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

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

    <%= $title%>

    + % if ( stash 'error' ) { +
    + %= $c->render_to_string( inline => stash 'error' ) +
    + % } - % if ($grp_datas->{trt} eq 'ADD') { - %= include 'partials/_grp_add' - %} elsif ($grp_datas->{trt} eq 'DEL') { - %= include 'partials/_grp_del' - %} elsif ($grp_datas->{trt} eq 'UPD') { - %= include 'partials/_grp_upd' - %} else { - %= include 'partials/_grp_list' - %} +

    <%= $title %>

    + + % if ($grp_datas->{trt} eq 'ADD') { + %= include 'partials/_grp_add' + % } elsif ($grp_datas->{trt} eq 'DEL') { + %= include 'partials/_grp_del' + % } elsif ($grp_datas->{trt} eq 'UPD') { + %= include 'partials/_grp_upd' + % } else { + %= include 'partials/_grp_list' + % }
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/hostentries.html.ep b/root/usr/share/smanager/themes/default/templates/hostentries.html.ep index 386d1c9..a4d4f09 100644 --- a/root/usr/share/smanager/themes/default/templates/hostentries.html.ep +++ b/root/usr/share/smanager/themes/default/templates/hostentries.html.ep @@ -1,35 +1,35 @@ % layout 'default', title => "Sme server 2 - hostentries"; % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

    % } - -

    <%= $title%>

    - % if ( $notif ) { -
    - - <%= $c->render_to_string(inline => $notif) %> - - %} +

    <%= $title %>

    - % if ($hos_datas->{trt} eq 'ADD' or $hos_datas->{trt} eq 'UPD') { - %= include 'partials/_hos_upd' - %} elsif ($hos_datas->{trt} eq 'DEL') { - %= include 'partials/_hos_del' - %} 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') { - %= include 'partials/_hos_urm' - %} else { - %= include 'partials/_hos_list' - %} + % if ( $notif ) { +
    + + <%= $c->render_to_string( inline => $notif ) %> + + % } + + % if ($hos_datas->{trt} eq 'ADD' or $hos_datas->{trt} eq 'UPD') { + %= include 'partials/_hos_upd' + % } elsif ($hos_datas->{trt} eq 'DEL') { + %= include 'partials/_hos_del' + % } 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') { + %= include 'partials/_hos_urm' + % } else { + %= include 'partials/_hos_list' + % }
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/ibays.html.ep b/root/usr/share/smanager/themes/default/templates/ibays.html.ep index 73948d9..b04e1a6 100644 --- a/root/usr/share/smanager/themes/default/templates/ibays.html.ep +++ b/root/usr/share/smanager/themes/default/templates/ibays.html.ep @@ -1,39 +1,39 @@ % layout 'default', title => "Sme server 2 - ibays"; % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

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

    <%= $title%>

    +

    <%= $title %>

    - % if ( stash 'modul' ) { - %= $c->render_to_string(inline => stash 'modul' ); - % } + % if ( 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') { - %= include 'partials/_iba_del' - %} elsif ($iba_datas->{trt} eq 'UPD') { - %= include 'partials/_iba_upd' - %} elsif ($iba_datas->{trt} eq 'PWD') { - %= include 'partials/_iba_pwd' - %} else { - %= include 'partials/_iba_list' - %} + % if ($iba_datas->{trt} eq 'ADD') { + %= include 'partials/_iba_upd' + % } elsif ($iba_datas->{trt} eq 'DEL') { + %= include 'partials/_iba_del' + % } elsif ($iba_datas->{trt} eq 'UPD') { + %= include 'partials/_iba_upd' + % } elsif ($iba_datas->{trt} eq 'PWD') { + %= include 'partials/_iba_pwd' + % } else { + %= include 'partials/_iba_list' + % }
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/initial.html.ep b/root/usr/share/smanager/themes/default/templates/initial.html.ep index 9ec3eb6..6b75784 100644 --- a/root/usr/share/smanager/themes/default/templates/initial.html.ep +++ b/root/usr/share/smanager/themes/default/templates/initial.html.ep @@ -2,27 +2,27 @@ % content_for 'module' => begin - % if (config->{debug} == 1) { -

    - %= dumper $c->current_route -

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

    + %= dumper $c->current_route +

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

    +

    %= $title -

    -
    -

    + +
    +

    %= $modul -

    +

    -% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/localnetworks.html.ep b/root/usr/share/smanager/themes/default/templates/localnetworks.html.ep index 72b5f4e..4884d01 100644 --- a/root/usr/share/smanager/themes/default/templates/localnetworks.html.ep +++ b/root/usr/share/smanager/themes/default/templates/localnetworks.html.ep @@ -1,32 +1,32 @@ % layout 'default', title => "Sme server 2 - localnetworks"; % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

    - %= dumper $c->current_route - %= dumper $c->stash("ret") - %= dumper $c->param("localnetwork"); - %= dumper $c->stash("ln_datas"); - %= dumper $c->param("deletehost"); -

    +

    + %= dumper $c->current_route + %= dumper $c->stash("ret") + %= dumper $c->param("localnetwork"); + %= dumper $c->stash("ln_datas"); + %= dumper $c->param("deletehost"); +

    % } - -

    <%= $title%>

    - %= $modul - % if ($ln_datas->{trt} eq 'ADD') { - %= include 'partials/_ln_add' - %} elsif ($ln_datas->{trt} eq 'ADD1') { - %= include 'partials/_ln_add' - %} elsif ($ln_datas->{trt} eq 'DEL') { - %= include 'partials/_ln_del' - %} elsif ($ln_datas->{trt} eq 'DEL1'){ - %= include 'partials/_ln_list' - %} else { - %= include 'partials/_ln_list' - %} +

    <%= $title %>

    + %= $modul + + % if ($ln_datas->{trt} eq 'ADD') { + %= include 'partials/_ln_add' + % } elsif ($ln_datas->{trt} eq 'ADD1') { + %= include 'partials/_ln_add' + % } elsif ($ln_datas->{trt} eq 'DEL') { + %= include 'partials/_ln_del' + % } elsif ($ln_datas->{trt} eq 'DEL1'){ + %= include 'partials/_ln_list' + % } else { + %= include 'partials/_ln_list' + % }
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/login.html.ep b/root/usr/share/smanager/themes/default/templates/login.html.ep index d460b38..23e8924 100644 --- a/root/usr/share/smanager/themes/default/templates/login.html.ep +++ b/root/usr/share/smanager/themes/default/templates/login.html.ep @@ -2,68 +2,68 @@ % content_for 'module' => begin - diff --git a/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep index baec60b..957ec5e 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep @@ -1,29 +1,29 @@
    - % my $btn = l('REMOVE'); - %= form_for '/hostentriesd' => (method => 'POST') => begin -

    -

    - %=l 'hos_REMOVE_TITLE' -

    -

    + % my $btn = l('REMOVE'); + %= form_for '/hostentriesd' => ( method => 'POST' ) => begin +

    +

    + %= l 'hos_REMOVE_TITLE' +

    +

    -

    - %= $c->l('hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname}); -

    - -

    - %=l 'hos_ABOUT_TO_REMOVE' -

    +

    + %= $c->l( 'hos_REMOVE_PAGE_DESCRIPTION', $hos_datas->{hostname} ); +

    -

    -
    - %= submit_button "$btn", class => 'action' -

    +

    + %= l 'hos_ABOUT_TO_REMOVE' +

    - %= hidden_field 'trt' => $hos_datas->{trt} - %= hidden_field 'Hostname' => $hos_datas->{hostname} +

    +
    + %= submit_button "$btn", class => 'action' +

    - % end + %= hidden_field 'trt' => $hos_datas->{trt} + %= hidden_field 'Hostname' => $hos_datas->{hostname} + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep index a9877cb..da9d03c 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep @@ -1,84 +1,84 @@
    - % my $btn = l('hos_ADD_HOSTNAME'); + % my $btn = l('hos_ADD_HOSTNAME'); - %= form_for '/hostentries' => (method => 'POST') => begin + %= form_for '/hostentries' => ( method => 'POST' ) => begin -

    - %= submit_button "$btn", class => 'action' -

    +

    + %= submit_button "$btn", class => 'action' +

    - %= hidden_field 'trt' => $hos_datas->{trt} + %= hidden_field 'trt' => $hos_datas->{trt} - % end + % end - % my %dom_hos = %{$dom_hosts}; - % foreach my $domain ( sort ( keys %dom_hos ) ) { + % my %dom_hos = %{$dom_hosts}; + % foreach my $domain ( sort ( keys %dom_hos ) ) { -


    - %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain); -

    - - - - - - - - - - - +


    + %= $c->l( 'hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain ); +

    - % foreach (@{$dom_hos{$domain}{'HOSTS'}}) { +
    - %=l 'hos_HOSTNAME' - - %=l 'hos_HOSTTYPE' - - %=l 'IP_ADDRESS_OR_FQDN' - - %=l 'hos_ETHERNET_ADDRESS' - - %=l 'COMMENT' - - %=l 'ACTION' -
    - %= t td => (class => 'sme-border') => $_->{'HostName'}; - %= t td => (class => 'sme-border') => $_->{'HostType'}; - %= t td => (class => 'sme-border') => $_->{'IP'}; - %= t td => (class => 'sme-border') => $_->{'MACAddress'}; - %= t td => (class => 'sme-border') => $_->{'Comment'}; - - - % } - -
    - %my ($actionModify, $actionRemove) = ' '; - %my $static = $_->{'static'} || "no"; - %if ($static ne 'yes') { - %my $modify_text = l('MODIFY'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure - %$actionModify = qq{ - % - % - % - %}; - %my $remove_text = l('REMOVE'); # Localized text - %$csrf_token = "TOKEN"; # CSRF token for security - %#my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure - %$actionRemove = qq{ - % - % - % - %}; - %} - <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %> -
    - % } + + %= l 'hos_HOSTNAME' + + + %= l 'hos_HOSTTYPE' + + + %= l 'IP_ADDRESS_OR_FQDN' + + + %= l 'hos_ETHERNET_ADDRESS' + + + %= l 'COMMENT' + + + %= l 'ACTION' + + + + + % foreach (@{$dom_hos{$domain}{'HOSTS'}}) { + + %= t td => ( class => 'sme-border' ) => $_->{'HostName'}; + %= t td => ( class => 'sme-border' ) => $_->{'HostType'}; + %= t td => ( class => 'sme-border' ) => $_->{'IP'}; + %= t td => ( class => 'sme-border' ) => $_->{'MACAddress'}; + %= t td => ( class => 'sme-border' ) => $_->{'Comment'}; + + % my ( $actionModify, $actionRemove ) = ' '; + % my $static = $_->{'static'} || "no"; + % if ($static ne 'yes') { + % my $modify_text = l('MODIFY'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure + % $actionModify = qq{ + % + % + % + % }; + % my $remove_text = l('REMOVE'); # Localized text + % $csrf_token = "TOKEN"; # CSRF token for security + %# my $hostentries_name = $_->{'HostName'}; # hostentries name extracted from the data structure + % $actionRemove = qq{ + % + % + % + % }; + % } + <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %> + + + % } + + + % }
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep index a710b55..f18c435 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep @@ -1,60 +1,60 @@
    - + - % my $btn = l('NEXT'); + % my $btn = l('NEXT'); - %= form_for '/hostentriesd' => (method => 'POST') => begin -

    - % if ( $hos_datas->{trt} eq "ALC" ) { - %=l 'hos_CREATE_TYPE' - % } else { - %=l 'hos_MODIFY_TYPE' - % $btn = l('MODIFY'); - % } -

    + %= form_for '/hostentriesd' => ( method => 'POST' ) => begin +

    + % if ( $hos_datas->{trt} eq "ALC" ) { + %= l 'hos_CREATE_TYPE' + % } else { + %= l 'hos_MODIFY_TYPE' + % $btn = l('MODIFY'); + % } +

    -

    - %=l 'hos_LOCAL_PAGE_DESCRIPTION' -

    +

    + %= l 'hos_LOCAL_PAGE_DESCRIPTION' +

    -

    - %=l 'hos_LOCAL_IP_DESCRIPTION' -

    +

    + %= l 'hos_LOCAL_IP_DESCRIPTION' +

    -

    - - %=l 'hos_LOCAL_IP', class => 'label' - - % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip'; - %= text_field 'Internalip', class => 'input' - -

    +

    + + %= l 'hos_LOCAL_IP', class => 'label' + + % param 'Internalip' => $hos_datas->{internalip} unless param 'Internalip'; + %= text_field 'Internalip', class => 'input' + +

    -

    - %=l 'hos_ETHERNET_ADDRESS_DESCRIPTION' -

    +

    + %= l 'hos_ETHERNET_ADDRESS_DESCRIPTION' +

    -

    - - %=l 'hos_ETHERNET_ADDRESS', class => 'label' - - % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress'; - %= text_field 'Macaddress', class => 'input' - -

    +

    + + %= l 'hos_ETHERNET_ADDRESS', class => 'label' + + % param 'Macaddress' => $hos_datas->{macaddress} unless param 'Macaddress'; + %= text_field 'Macaddress', class => 'input' + +

    -


    - %= submit_button "$btn", class => 'action' -

    +


    + %= submit_button "$btn", class => 'action' +

    - %= hidden_field 'trt' => $hos_datas->{trt} - %= 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 'Hosttype'=> $hos_datas->{hosttype} - %= hidden_field 'Externalip' => $hos_datas->{externalip} - - %end + %= hidden_field 'trt' => $hos_datas->{trt} + %= 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 'Hosttype' => $hos_datas->{hosttype} + %= hidden_field 'Externalip' => $hos_datas->{externalip} + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep index d97c560..e058e1a 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep @@ -1,77 +1,77 @@
    - % my $btn = l('NEXT'); + % my $btn = l('NEXT'); - %= form_for '/hostentriesd' => (method => 'POST') => begin -

    - % if ( $hos_datas->{trt} eq "ADD" ) { - %=l 'hos_CREATE_TITLE' - % } else { - %=l 'hos_MODIFY_TITLE' - % $btn = l('MODIFY'); - % } -

    + %= form_for '/hostentriesd' => ( method => 'POST' ) => begin +

    + % if ( $hos_datas->{trt} eq "ADD" ) { + %= l 'hos_CREATE_TITLE' + % } else { + %= l 'hos_MODIFY_TITLE' + % $btn = l('MODIFY'); + % } +

    -

    - %=l 'hos_HOSTNAME_DESCRIPTION' -

    +

    + %= l 'hos_HOSTNAME_DESCRIPTION' +

    -

    - - %=l 'hos_HOSTNAME', class => 'label' - - % if ( $hos_datas->{trt} eq "ADD" ) { - % param 'Name' => $hos_datas->{name} unless param 'Name'; - %= text_field 'Name', class => 'input' - % } else { - %= hidden_field 'Name' => $hos_datas->{name} - %= $hos_datas->{name}, class => 'data' - % } - -

    +

    + + %= l 'hos_HOSTNAME', class => 'label' + + % if ( $hos_datas->{trt} eq "ADD" ) { + % param 'Name' => $hos_datas->{name} unless param 'Name'; + %= text_field 'Name', class => 'input' + % } else { + %= hidden_field 'Name' => $hos_datas->{name} + %= $hos_datas->{name}, class => 'data' + % } + +

    -

    - - %=l 'DOMAIN', class => 'label' - - % if ( $hos_datas->{trt} eq "ADD" ) { - % param 'Domain' => $hos_datas->{domain} unless param 'Domain'; - %= select_field 'Domain', $c->domains_list(), class => 'input' - % } else { - %= hidden_field 'Domain' => $hos_datas->{domain} - %= $hos_datas->{domain}, class => 'data' - % } - -

    +

    + + %= l 'DOMAIN', class => 'label' + + % if ( $hos_datas->{trt} eq "ADD" ) { + % param 'Domain' => $hos_datas->{domain} unless param 'Domain'; + %= select_field 'Domain', $c->domains_list(), class => 'input' + % } else { + %= hidden_field 'Domain' => $hos_datas->{domain} + %= $hos_datas->{domain}, class => 'data' + % } + +

    -

    - - %= $c->l('COMMENT', ''); - - % param 'Comment' => $hos_datas->{comment} unless param 'Comment'; - %= text_field 'Comment', class => 'input' - -

    +

    + + %= $c->l( 'COMMENT', '' ); + + % param 'Comment' => $hos_datas->{comment} unless param 'Comment'; + %= text_field 'Comment', class => 'input' + +

    -

    - - %=l 'LOCATION', class => 'label' - - % param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype'; - %= select_field 'Hosttype', $c->hosttype_list(), class => 'input' - -

    +

    + + %= l 'LOCATION', class => 'label' + + % param 'Hosttype' => $hos_datas->{hosttype} unless param 'Hosttype'; + %= select_field 'Hosttype', $c->hosttype_list(), class => 'input' + +

    -


    - %= submit_button "$btn", class => 'action' -

    +


    + %= submit_button "$btn", class => 'action' +

    - %= hidden_field 'trt' => $hos_datas->{trt} - %= hidden_field 'Hostname' => $hos_datas->{hostname} - %= hidden_field 'Internalip' => $hos_datas->{internalip} - %= hidden_field 'Externalip' => $hos_datas->{externalip} - %= hidden_field 'Macaddress' => $hos_datas->{macaddress} + %= hidden_field 'trt' => $hos_datas->{trt} + %= hidden_field 'Hostname' => $hos_datas->{hostname} + %= hidden_field 'Internalip' => $hos_datas->{internalip} + %= hidden_field 'Externalip' => $hos_datas->{externalip} + %= hidden_field 'Macaddress' => $hos_datas->{macaddress} - %end + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep index f7d5c3b..b130749 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep @@ -1,37 +1,37 @@
    - + - % my $btn = l('MODIFY'); + % my $btn = l('MODIFY'); - %= form_for '/hostentriesd' => (method => 'POST') => begin + %= form_for '/hostentriesd' => ( method => 'POST' ) => begin -

    - %=l 'hos_REMOTE_PAGE_DESCRIPTION' -

    +

    + %= l 'hos_REMOTE_PAGE_DESCRIPTION' +

    -

    - - %=l 'IP_ADDRESS_OR_FQDN', class => 'label' - - % param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip'; - %= text_field 'Externalip', class => 'input' - -

    +

    + + %= l 'IP_ADDRESS_OR_FQDN', class => 'label' + + % param 'Externalip' => $hos_datas->{externalip} unless param 'Externalip'; + %= text_field 'Externalip', class => 'input' + +

    -


    - %= submit_button "$btn", class => 'action' -

    +


    + %= submit_button "$btn", class => 'action' +

    - %= hidden_field 'trt' => $hos_datas->{trt} - %= 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 'Hosttype'=> $hos_datas->{hosttype} - %= hidden_field 'Internalip' => $hos_datas->{internalip} - %= hidden_field 'Macaddress' => $hos_datas->{macaddress} - - %end + %= hidden_field 'trt' => $hos_datas->{trt} + %= 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 'Hosttype' => $hos_datas->{hosttype} + %= hidden_field 'Internalip' => $hos_datas->{internalip} + %= hidden_field 'Macaddress' => $hos_datas->{macaddress} + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_iba_del.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_iba_del.html.ep index 9c599cf..a7f2bce 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_iba_del.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_iba_del.html.ep @@ -1,22 +1,22 @@
    - % my $btn = l('REMOVE'); - %= form_for '/ibaysd' => (method => 'POST') => begin -

    -

    - %=l 'iba_REMOVE_TITLE' -

    -
    - %= $c->render_to_string(inline => l('iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description})); -
    -

    -

    - %= submit_button "$btn", class => 'action' -

    + % my $btn = l('REMOVE'); + %= form_for '/ibaysd' => ( method => 'POST' ) => begin +

    +

    + %= l 'iba_REMOVE_TITLE' +

    +
    + %= $c->render_to_string( inline => l( 'iba_REMOVE_DESC', $iba_datas->{ibay}, $iba_datas->{description} ) ); +
    +

    +

    + %= submit_button "$btn", class => 'action' +

    - %= hidden_field 'trt' => $iba_datas->{trt} - %= hidden_field 'ibay' => $iba_datas->{ibay} + %= hidden_field 'trt' => $iba_datas->{trt} + %= hidden_field 'ibay' => $iba_datas->{ibay} - % end + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep index 6eab56f..b41374b 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep @@ -1,111 +1,111 @@
    - % my $btn = l('iba_ADD_IBAY'); + % my $btn = l('iba_ADD_IBAY'); - %= form_for '/ibays' => (method => 'POST') => begin + %= form_for '/ibays' => ( method => 'POST' ) => begin -

    -
    - %= submit_button "$btn", class => 'action' -

    +

    +
    + %= submit_button "$btn", class => 'action' +

    %= hidden_field 'trt' => 'ADD'; - % end + % end -

    - %=l 'iba_FIRSTPAGE_DESC' -

    -

    - - % my $numIbays = @$ibays; - % if ($numIbays == 0){ - %=l 'iba_NO_IBAYS' - % } else { - - - - - - - - % foreach my $ibay (@$ibays) - % { - % my $modifiable = $ibay->prop('Modifiable') || 'yes'; - % my $passwordable = $ibay->prop('Passwordable') || 'yes'; - % my $removable = $ibay->prop('Removable') || 'yes'; - % my $needPassword = grep { $_ eq $ibay->prop('PublicAccess') } - % qw(local-pw global-pw global-pw-remote); +

    + %= l 'iba_FIRSTPAGE_DESC' +

    +

    + + % my $numIbays = @$ibays; + % if ($numIbays == 0){ + %= l 'iba_NO_IBAYS' + % } else { +
    - %=l 'NAME' - - %=l 'DESCRIPTION' - - %=l 'ACTION' -
    + + + + + + + % foreach my $ibay (@$ibays) + % { + % my $modifiable = $ibay->prop('Modifiable') || 'yes'; + % my $passwordable = $ibay->prop('Passwordable') || 'yes'; + % my $removable = $ibay->prop('Removable') || 'yes'; + % my $needPassword = grep { $_ eq $ibay->prop('PublicAccess') } + % qw(local-pw global-pw global-pw-remote); - %= t td => (class => 'sme-border') => $ibay->key - %= t td => (class => 'sme-border') => $ibay->prop('Name') - - - % } - -
    + %= l 'NAME' + + %= l 'DESCRIPTION' + + %= l 'ACTION' +
    - %my ($actionModify, $actionResetPw, $actionRemove) = ' '; - %if ($modifiable eq 'yes') { - %my $modify_text = l('MODIFY'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure - %$actionModify = qq{ - % - % - % - %}; - %} - - %if ($passwordable eq 'yes') { - %my $password_text = l('PASSWORD_RESET'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure - %if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) { - %$actionResetPw = qq{ - % - % - % - %}; - %} else { - %$actionResetPw = qq{ - % - % - % - %}; - %} - - %} + %= t td => ( class => 'sme-border' ) => $ibay->key + %= t td => ( class => 'sme-border' ) => $ibay->prop('Name') + + % my ( $actionModify, $actionResetPw, $actionRemove ) = ' '; + % if ($modifiable eq 'yes') { + % my $modify_text = l('MODIFY'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure + % $actionModify = qq{ + % + % + % + % }; + % } - %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{ - % - % - % - %}; - %} - <%= $c->render_to_string(inline => $actionModify) %> - <%= $c->render_to_string(inline => $actionResetPw)%> - <%= $c->render_to_string(inline => $actionRemove) %> -
    - <%} %> + % if ($passwordable eq 'yes') { + % my $password_text = l('PASSWORD_RESET'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $ibays_entry_name = $ibay->key; # ibays_entry name extracted from the data structure + % if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) { + % $actionResetPw = qq{ + % + % + % + % }; + % } else { + % $actionResetPw = qq{ + % + % + % + % }; + % } + + % } + + % 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{ + % + % + % + % }; + % } + <%= $c->render_to_string( inline => $actionModify ) %> + <%= $c->render_to_string( inline => $actionResetPw ) %> + <%= $c->render_to_string( inline => $actionRemove ) %> + + + % } + + + <% } %>
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_iba_pwd.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_iba_pwd.html.ep index 83f55e1..91e5daa 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_iba_pwd.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_iba_pwd.html.ep @@ -1,42 +1,42 @@
    - % my $btn = l('SAVE'); + % my $btn = l('SAVE'); - %= form_for '/ibaysd' => (method => 'POST') => begin -

    -

    - %=l 'PASSWORD_RESET' -

    - -

    - %=l 'iba_PASSWORD_DESC' - %= $iba_datas->{ibay} -

    - -

    - - %=l 'PASSWORD_NEW', class => 'label' - - %= password_field 'newPass', class => 'input' , class=>'sme-password' - -

    + %= form_for '/ibaysd' => ( method => 'POST' ) => begin +

    +

    + %= l 'PASSWORD_RESET' +

    -

    - - %=l 'PASSWORD_VERIFY_NEW', class => 'label' - - %= password_field 'newPassVerify', class => 'input', class=>'sme-password' - -

    +

    + %= l 'iba_PASSWORD_DESC' + %= $iba_datas->{ibay} +

    -

    -

    - %= submit_button "$btn", class => 'action' -

    +

    + + %= l 'PASSWORD_NEW', class => 'label' + + %= password_field 'newPass', class => 'input', class => 'sme-password' + +

    - %= hidden_field 'trt' => $iba_datas->{trt} - %= hidden_field 'ibay' => $iba_datas->{ibay} - - % end +

    + + %= l 'PASSWORD_VERIFY_NEW', class => 'label' + + %= password_field 'newPassVerify', class => 'input', class => 'sme-password' + +

    -
    \ No newline at end of file +

    +

    + %= submit_button "$btn", class => 'action' +

    + + %= hidden_field 'trt' => $iba_datas->{trt} + %= hidden_field 'ibay' => $iba_datas->{ibay} + + % end + +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep index ff2e201..67ebdea 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep @@ -1,101 +1,101 @@
    - % my $btn = l('ADD'); + % my $btn = l('ADD'); - %= form_for '/ibaysd' => (method => 'POST') => begin -

    -

    - %=l 'iba_ADD_TITLE' -

    -
    - %=l 'iba_NAME_FIELD_DESC' -

    + %= form_for '/ibaysd' => ( method => 'POST' ) => begin +

    +

    + %= l 'iba_ADD_TITLE' +

    +
    + %= l 'iba_NAME_FIELD_DESC' +

    -

    - - %=l 'iba_NAME_LABEL', class => 'label' - - % if ( $iba_datas->{trt} eq 'ADD' ) { - % param 'ibay' => $iba_datas->{ibay} unless param 'ibay'; - %= text_field 'ibay', class => 'input' - % } else { - % $btn = l('SAVE'); - %= $iba_datas->{ibay}, class => 'data' - % } - -

    +

    + + %= l 'iba_NAME_LABEL', class => 'label' + + % if ( $iba_datas->{trt} eq 'ADD' ) { + % param 'ibay' => $iba_datas->{ibay} unless param 'ibay'; + %= text_field 'ibay', class => 'input' + % } else { + % $btn = l('SAVE'); + %= $iba_datas->{ibay}, class => 'data' + % } + +

    -

    - - %=l 'DESCRIPTION', class => 'label' - - % param 'ibayDesc' => $iba_datas->{description} unless param 'ibayDesc'; - %= text_field 'ibayDesc', class => 'input' - -

    +

    + + %= l 'DESCRIPTION', class => 'label' + + % param 'ibayDesc' => $iba_datas->{description} unless param 'ibayDesc'; + %= text_field 'ibayDesc', class => 'input' + +

    -

    - - %=l 'GROUP' - - % param 'group' => $iba_datas->{group} unless param 'group'; - %= select_field 'group' => $c->group_list_m(), class => 'input' -
    -     -

    +

    + + %= l 'GROUP' + + % param 'group' => $iba_datas->{group} unless param 'group'; + %= select_field 'group' => $c->group_list_m(), class => 'input' +
    +     +

    -

    - - %=l 'iba_USER_ACCESS' - - % param 'userAccess' => $iba_datas->{userAccess} unless param 'userAccess'; - %= select_field 'userAccess' => $c->userAccess_list_m(), class => 'input' - -
    -     -

    +

    + + %= l 'iba_USER_ACCESS' + + % param 'userAccess' => $iba_datas->{userAccess} unless param 'userAccess'; + %= select_field 'userAccess' => $c->userAccess_list_m(), class => 'input' -

    - - %=l 'iba_PUBLIC_ACCESS' - - % param 'publicAccess' => $iba_datas->{publicAccess} unless param 'publicAccess'; - %= select_field 'publicAccess' => $c->publicAccess_list_m(), class => 'input' -
    -     -

    +
    + +

    -

    - - %=l 'iba_ALLOW_DYNAMIC_CONTENT' - - % param 'CgiBin' => $iba_datas->{CgiBin} unless param 'CgiBin'; - %= select_field 'CgiBin' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input' -
    -     -

    +

    + + %= l 'iba_PUBLIC_ACCESS' + + % param 'publicAccess' => $iba_datas->{publicAccess} unless param 'publicAccess'; + %= select_field 'publicAccess' => $c->publicAccess_list_m(), class => 'input' +
    +     +

    -

    - - %=l 'iba_HTTPS_Only' - - % param 'SSL' => $iba_datas->{SSL} unless param 'SSL'; - %= select_field 'SSL' => [[ (l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input' -
    -     -

    +

    + + %= l 'iba_ALLOW_DYNAMIC_CONTENT' + + % param 'CgiBin' => $iba_datas->{CgiBin} unless param 'CgiBin'; + %= select_field 'CgiBin' => [ [ ( l 'DISABLED' ) => 'disabled' ], [ ( l 'ENABLED' ) => 'enabled' ] ], class => 'input'; +
    +     +

    -

    -

    - %= submit_button $btn, class => 'action' -

    +

    + + %= l 'iba_HTTPS_Only' + + % param 'SSL' => $iba_datas->{SSL} unless param 'SSL'; + %= select_field 'SSL' => [ [ ( l 'DISABLED' ) => 'disabled' ], [ ( l 'ENABLED' ) => 'enabled' ] ], class => 'input'; +
    +     +

    - %= hidden_field 'trt' => $iba_datas->{trt} - % if ( $iba_datas->{trt} eq 'UPD' ) { - %= hidden_field 'ibay' => $iba_datas->{ibay} - % } - - % end +

    +

    + %= submit_button $btn, class => 'action' +

    + + %= hidden_field 'trt' => $iba_datas->{trt} + % if ( $iba_datas->{trt} eq 'UPD' ) { + %= hidden_field 'ibay' => $iba_datas->{ibay} + % } + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_info.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_info.html.ep index a31f128..8cd5a51 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_info.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_info.html.ep @@ -1,25 +1,25 @@ -<% use POSIX qw(strftime); %> +<% use POSIX qw(strftime); %>
    - <% if (! $c->session->{PwdSet} ) { %> -
    + <% if (! $c->session->{PwdSet} ) { %> +
    Warning: you have not yet changed the default system password.
    - <% } %> - <% if ( $c->is_unsafe ) { %> -
    + <% } %> + <% if ( $c->is_unsafe ) { %> +
    Warning: a reconfigure and reboot is required before proceeding! Failure to do so now may leave your system in an unknown state!
    - <% } %> - <% if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) { %> -
    + <% } %> + <% if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) { %> +
    Warning: Development or debug mode enabled AND public access is offered ! -
    - <% } %> - <% my $curdate = strftime '%Y%m%d', localtime; %> - <% if ( "$curdate" >= "20290531" ) { %> -
    - URGENT NOTICE: As per May 31st 2029, SME Server 11 is obsolete, and potentially INSECURE. NO support will be offered for any issue found with this installed version. - Please migrate IMMEDIATELY to Koozali SME Server 12 or higher version. Failure to upgrade may lead to the compromise of this server. +
    + <% } %> + <% my $curdate = strftime '%Y%m%d', localtime; %> + <% if ( "$curdate" >= "20290531" ) { %> +
    + URGENT NOTICE: As per May 31st 2029, SME Server 11 is obsolete, and potentially INSECURE. NO support will be offered for any issue found with this installed version. + Please migrate IMMEDIATELY to Koozali SME Server 12 or higher version. Failure to upgrade may lead to the compromise of this server.
    Please, consult https://wiki.koozali.org/SME_Server:Download to get the latest version -
    - <% } %> -
    \ No newline at end of file +
    +<% } %> +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_js_imports.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_js_imports.html.ep index d5c2054..41ce8c8 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_js_imports.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_js_imports.html.ep @@ -4,21 +4,21 @@ % content_for 'js_togglePassword' => begin %= javascript begin - $(document).ready(function() { + $(document).ready(function() { const togglePassword = document.querySelector('#togglePassword'); const password = document.querySelector('#id_password'); if (( togglePassword ) && ( password )) { - togglePassword.addEventListener('click', function (e) { - // toggle the type attribute - const type = password.getAttribute('type') === 'password' ? 'text' : 'password'; - password.setAttribute('type', type); - // toggle the eye slash icon - // this.classList.toggle('eye-slash'); - }) + togglePassword.addEventListener('click', function (e) { + // toggle the type attribute + const type = password.getAttribute('type') === 'password' ? 'text' : 'password'; + password.setAttribute('type', type); + // toggle the eye slash icon + // this.classList.toggle('eye-slash'); + }) } - }); + }); % end % end @@ -30,34 +30,34 @@ %= javascript begin $(document).ready(function() { - $('#tognav').click(function() { - //alert('click1:'+window.localStorage.getItem('menunav')); - window.localStorage.setItem('menunav',!$('#menunav').is(':visible')); - //alert('click2:'+window.localStorage.getItem('menunav')); - $('#menunav').toggle({ duration: 300 }); - }); + $('#tognav').click(function() { + //alert('click1:'+window.localStorage.getItem('menunav')); + window.localStorage.setItem('menunav',!$('#menunav').is(':visible')); + //alert('click2:'+window.localStorage.getItem('menunav')); + $('#menunav').toggle({ duration: 300 }); + }); - $('#toguser').click(function() { - window.localStorage.setItem('menuuser',!$('#menuuser').is(':visible')); - $('#menuuser').toggle({ duration: 300 }); - }); + $('#toguser').click(function() { + window.localStorage.setItem('menuuser',!$('#menuuser').is(':visible')); + $('#menuuser').toggle({ duration: 300 }); + }); - $('#togadm').click(function() { - window.localStorage.setItem('menuadm',!$('#menuadm').is(':visible')); - $('#menuadm').toggle({ duration: 300 }); - }); + $('#togadm').click(function() { + window.localStorage.setItem('menuadm',!$('#menuadm').is(':visible')); + $('#menuadm').toggle({ duration: 300 }); + }); - - $('.section-title').click(function() { - var $section = $(this).parent().next('div'); - if(!$section.length){ - return false; - } - let localStorageTag = "admSection-"+this.innerHTML; - var jqObj = $($section); - window.localStorage.setItem(localStorageTag,!jqObj.is(':visible')); - $section.toggle({ duration: 600 }); - }) + + $('.section-title').click(function() { + var $section = $(this).parent().next('div'); + if(!$section.length){ + return false; + } + let localStorageTag = "admSection-"+this.innerHTML; + var jqObj = $($section); + window.localStorage.setItem(localStorageTag,!jqObj.is(':visible')); + $section.toggle({ duration: 600 }); + }) }); % end @@ -67,35 +67,35 @@ % content_for 'js_swapClass' => begin %= javascript begin - (function($) { - $.fn.swapClass = function(class1, class2) { - this.each(function() { - var $elem = $(this); - if ($elem.hasClass(class1)) { - $elem.removeClass(class1).addClass(class2); - } - else if ($elem.hasClass(class2)) { - $elem.removeClass(class2).addClass(class1); - } - }); - }; - })(jQuery); + (function($) { + $.fn.swapClass = function(class1, class2) { + this.each(function() { + var $elem = $(this); + if ($elem.hasClass(class1)) { + $elem.removeClass(class1).addClass(class2); + } + else if ($elem.hasClass(class2)) { + $elem.removeClass(class2).addClass(class1); + } + }); + }; + })(jQuery); $(document).ready(function() { - $('a.item-current').swapClass('item-current','item'); + $('a.item-current').swapClass('item-current','item'); - var pathname = $(location).attr('pathname'); + var pathname = $(location).attr('pathname'); - //alert('jQuery loaded. Path searched: ' + pathname); + //alert('jQuery loaded. Path searched: ' + pathname); - var menus = $('a.item'); - $.each(menus, function() { - if ( $(this).attr('href') == pathname ) { - $(this).swapClass('item', 'item-current'); - // alert('menu found! ' + $(this).attr('href') + ' ' + $(this).attr('class')); - } - }) + var menus = $('a.item'); + $.each(menus, function() { + if ( $(this).attr('href') == pathname ) { + $(this).swapClass('item', 'item-current'); + // alert('menu found! ' + $(this).attr('href') + ' ' + $(this).attr('class')); + } + }) - }); + }); % end -% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep index e04a581..f2ab28e 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep @@ -1,67 +1,67 @@
    - % my $retref= $c->stash("ret"); - % my %ret = $retref ? %$retref : (ret => ""); - % my @vars = split(/,/, $ret{vars} // ''); - % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars; + % my $retref = $c->stash("ret"); + % my %ret = $retref ? %$retref : ( ret => "" ); + % my @vars = split( /,/, $ret{vars} // '' ); + % my ( $var1, $var2, $var3, $var4, $var5, $var6, $var7 ) = @vars; - % if ($c->app->config->{debug}) { -

    - %= dumper { ret_data => \%ret } -

    - % } + % if ($c->app->config->{debug}) { +

    + %= dumper { ret_data => \%ret } +

    + % } - % if ($ret{ret} eq "") { - %=l "ln_FIRSTPAGE_DESC" - % } elsif (index($ret{ret},"SUCCESS") != -1) { -
    -
    - %= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) -
    - % } else { -
    -
    - %= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) -
    - % } -
    - % my $btn = l('ADD'); - % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db"; + % if ($ret{ret} eq "") { + %= l "ln_FIRSTPAGE_DESC" + % } elsif (index($ret{ret},"SUCCESS") != -1) { +
    +
    + %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) ) +
    + % } else { +
    +
    + %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) ) +
    + % } +
    + % my $btn = l('ADD'); + % my $network_db = esmith::NetworksDB::UTF8->open() || die "Couldn't open NetworksDB db"; - % if (config->{debug} == 1) { -

    - %= dumper $c->current_route - %= dumper $c->stash("ret") -

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

    + %= dumper $c->current_route + %= dumper $c->stash("ret") +

    + % } - %= form_for '/localnetworksb' => (method => 'POST') => begin -

    - %=l "ln_ADD_TITLE" -

    -

    - %= $c->render_to_string(inline => l('ln_ADD_DESC')); -


    - - %=l "NETWORK" - - %=text_field 'networkAddress' -

    - - %=l "ln_SUBNET_MASK" - - %=text_field 'networkMask' -

    - - %=l "ROUTER" - - - %=text_field 'networkRouter' -

    -

    -
    - %= submit_button "$btn", class => 'action' -

    - %end + %= form_for '/localnetworksb' => ( method => 'POST' ) => begin +

    + %= l "ln_ADD_TITLE" +

    +

    + %= $c->render_to_string( inline => l('ln_ADD_DESC') ); +


    + + %= l "NETWORK" + + %= text_field 'networkAddress' +

    + + %= l "ln_SUBNET_MASK" + + %= text_field 'networkMask' +

    + + %= l "ROUTER" + + + %= text_field 'networkRouter' +

    +

    +
    + %= submit_button "$btn", class => 'action' +

    + % end -
    \ No newline at end of file +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_ln_del.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_ln_del.html.ep index 8c2e1ae..68ebe2e 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_ln_del.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_ln_del.html.ep @@ -1,59 +1,59 @@
    - % my $btn = l('REMOVE'); - % my $deletehosts = $ln_datas->{deletehosts}; - % my $subnet = $ln_datas->{subnet}; - % my $router = $ln_datas->{router}; - - % if (config->{debug} == 1) { - 
    +  % my $btn = l('REMOVE');
+  % my $deletehosts = $ln_datas->{deletehosts};
+  % my $subnet = $ln_datas->{subnet};
+  % my $router = $ln_datas->{router};
+
+  % if (config->{debug} == 1) {
+    
     		%= dumper $c->current_route
 		%= dumper $c->stash("ret")
 		%= dumper %$ln_datas
 		%= dumper $deletehosts
-	
    
+
    + % } + + %= form_for '/localnetworkse' => ( method => 'POST' ) => begin +

    + %= l "ln_REMOVE_TITLE" +

    +

    + %= l "ln_REMOVE_DESC" +


    + + %= l "NETWORK" + + %= $localnetwork +

    + + %= l "ln_SUBNET_MASK" + + %= $subnet +

    + + %= l "ROUTER" + + + %= $router +

    + % if($deletehosts) { +
    + %= $c->l("ln_REMOVE_HOSTS_DESC") +
    + + %= $c->l("ln_REMOVE_HOSTS_LABEL") + + + %= check_box deletehost => 1, checked => 1 +

    % } - - %= form_for '/localnetworkse' => (method => 'POST') => begin -

    - %=l "ln_REMOVE_TITLE" -

    -

    - %=l "ln_REMOVE_DESC" -


    - - %=l "NETWORK" - - %=$localnetwork -

    - - %=l "ln_SUBNET_MASK" - - %= $subnet -

    - - %=l "ROUTER" - - - %= $router -

    - % if($deletehosts) { -
    - %=$c->l("ln_REMOVE_HOSTS_DESC") -
    - - %= $c->l("ln_REMOVE_HOSTS_LABEL") - - - %=check_box deletehost=>1, checked=>1 -

    - %} - %= hidden_field localnetwork=>$localnetwork -

    -
    - %= submit_button "$btn", class => 'action' -

    + %= hidden_field localnetwork => $localnetwork +

    +
    + %= submit_button "$btn", class => 'action' +

    - %end + % end -
    \ No newline at end of file +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep index 5ee0697..e293066 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep @@ -1,97 +1,97 @@
    - % my $btn = l('ln_LOCALNETWORK_ADD'); - %= form_for '/localnetworksa' => (method => 'POST') => begin + % my $btn = l('ln_LOCALNETWORK_ADD'); + %= form_for '/localnetworksa' => ( method => 'POST' ) => begin - % my $retref= $c->stash("ret"); - % my %ret = $retref ? %$retref : (ret => ""); - % my @vars = split(/,/, $ret{vars} // ''); - % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars; + % my $retref = $c->stash("ret"); + % my %ret = $retref ? %$retref : ( ret => "" ); + % my @vars = split( /,/, $ret{vars} // '' ); + % my ( $var1, $var2, $var3, $var4, $var5, $var6, $var7 ) = @vars; - % if ($c->app->config->{debug}) { - 
    +    % if ($c->app->config->{debug}) {
+      
     		%= dumper { ret_data => \%ret }
-	
      
-	% }
+
    + % } - % if ($ret{ret} eq "") { - %=l "ln_FIRSTPAGE_DESC" - % } elsif (index($ret{ret},"SUCCESS") != -1) { -
    -
    - %= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) -
    - % } else { -
    -
    - %= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) -
    - % } + % if ($ret{ret} eq "") { + %= l "ln_FIRSTPAGE_DESC" + % } elsif (index($ret{ret},"SUCCESS") != -1) { +
    +
    + %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) ) +
    + % } else { +
    +
    + %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) ) +
    + % } -

    -
    - %= submit_button "$btn", class => 'action' -

    +

    +
    + %= submit_button "$btn", class => 'action' +

    - % end + % end -
    - % my $numlocalnetworks = @$localnetworks; - % if ($numlocalnetworks == 0){ - %=l 'ln_LOCAL_NETWORK_NONE' - % } else { -
    - - - - +
    + % my $numlocalnetworks = @$localnetworks; + % if ($numlocalnetworks == 0){ + %= l 'ln_LOCAL_NETWORK_NONE' + % } else { +
    +
    - %=l 'NETWORK' - - %=l 'ln_SUBNET_MASK' -
    + + + - + - + - - - - % 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"; } - - %= t td => (class => 'sme-border') => $localnetwork->key - %= t td => (class => 'sme-border') => $localnetwork->prop('Mask') - %= t td => (class => 'sme-border') => $num_hosts - %= t td => (class => 'sme-border') => $localnetwork->prop('Router') - %my $actionRemove = ' '; - %if ($removable eq "yes") { - %my $remove_text = l('REMOVE'); # Localized text - %my $local_network_entry = $localnetwork->key; - %my $csrf_token = "TOKEN"; # CSRF token for security - %$actionRemove = qq{ - % - % - % - %}; - % } - - - % } - -
    + %= l 'NETWORK' + + %= l 'ln_SUBNET_MASK' + - %=l 'ln_NUMBER_OF_HOSTS' - + %= l 'ln_NUMBER_OF_HOSTS' + - %=l 'ROUTER' - + %= l 'ROUTER' + - %=l 'ACTION' -
    <%= $c->render_to_string(inline => $actionRemove) %>
    - %= hidden_field 'trt' => $ln_datas->{trt} - %} -
    \ No newline at end of file + + %= l 'ACTION' + + + + % 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"; } + + %= t td => ( class => 'sme-border' ) => $localnetwork->key + %= t td => ( class => 'sme-border' ) => $localnetwork->prop('Mask') + %= t td => ( class => 'sme-border' ) => $num_hosts + %= t td => ( class => 'sme-border' ) => $localnetwork->prop('Router') + % my $actionRemove = ' '; + % if ($removable eq "yes") { + % my $remove_text = l('REMOVE'); # Localized text + % my $local_network_entry = $localnetwork->key; + % my $csrf_token = "TOKEN"; # CSRF token for security + % $actionRemove = qq{ + % + % + % + % }; + % } + <%= $c->render_to_string( inline => $actionRemove ) %> + + % } + + + %= hidden_field 'trt' => $ln_datas->{trt} + % } +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_mai_ACC.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_mai_ACC.html.ep index 5397ad9..f9b15a9 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_mai_ACC.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_mai_ACC.html.ep @@ -1,54 +1,54 @@ %# -%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 +%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 %#
    -%# - % if (config->{debug} == 1) { - 
    +  %# 
+  % if (config->{debug} == 1) {
+    
     			%= dumper $mai_data
-		
    
-	% }
-	% my $btn = l('SAVE');
-	% $c->param(Selected => undef); #This may need deleting for a params panel - only needed for a table
+
    + % } + % my $btn = l('SAVE'); + % $c->param( Selected => undef ); #This may need deleting for a params panel - only needed for a table -

    <%= $c->l('mai_DESC_STATE_ACCESS_BUTTON') %>


    - %= 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' +

    <%= $c->l('mai_DESC_STATE_ACCESS_BUTTON') %>


    + %= 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_LABEL_POP_ACCESS_CONTROL' - - % param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess'; - %= select_field 'POPAccess' => $c->get_pop_opt(), class => 'input' -

    +

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

    - %=l 'mai_DESC_IMAP_ACCESS_CONTROL' + %= 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 => 'input' -

    +

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

    - %=l 'mai_DESC_WEBMAIL' + %= 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 => 'input' -

    +

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

    - %# .... - %# Probably finally by a submit. - %= submit_button $btn, class => 'action' - %end -
    \ No newline at end of file + %# .... + %# Probably finally by a submit. + %= submit_button $btn, class => 'action' + % end +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_mai_DEL.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_mai_DEL.html.ep index 89655c0..d9e31ad 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_mai_DEL.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_mai_DEL.html.ep @@ -1,90 +1,90 @@ %# -%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 +%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 %#
    -%# - % if (config->{debug} == 1) { - 
    +  %# 
+  % if (config->{debug} == 1) {
+    
     			%= dumper $mai_data
-		
    
-	% }
-	% my $btn = l('SAVE');
-	% $c->param(Selected => undef); #This may need deleting for a params panel - only needed for a table
+
    + % } + % my $btn = l('SAVE'); + % $c->param( Selected => undef ); #This may need deleting for a params panel - only needed for a table -

    <%= $c->l('mai_DESC_STATE_DELIVERY_BUTTON') %>

    - %= 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_TITLE_UNKNOWN' -

    +

    <%= $c->l('mai_DESC_STATE_DELIVERY_BUTTON') %>

    + %= 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_TITLE_UNKNOWN' +

    - %=l 'mai_DESC_UNKNOWN' + %= l 'mai_DESC_UNKNOWN' -

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

    +

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

    - -

    - %=l 'mai_TITLE_DELEGATE' -

    + +

    + %= l 'mai_TITLE_DELEGATE' +

    - %=l 'mai_DESC_DELEGATE' + %= l 'mai_DESC_DELEGATE' -

    - %=l 'mai_LABEL_DELEGATE' - - % param 'DelegateMailServer' => $mai_data->{delegatemailserver} unless param 'DelegateMailServer'; - %= text_field 'DelegateMailServer', class => 'input' -

    +

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

    - -

    - %=l 'mai_TITLE_SMARTHOST' -

    + +

    + %= l 'mai_TITLE_SMARTHOST' +

    - %=l 'mai_DESC_SMARTHOST' + %= l 'mai_DESC_SMARTHOST' -

    - %=l 'mai_LABEL_SMARTHOST' - - % param 'SMTPSmartHost' => $mai_data->{smtpsmarthost} unless param 'SMTPSmartHost'; - %= text_field 'SMTPSmartHost', class => 'input' -

    +

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

    -

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

    +

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

    -

    - %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID' - - % param 'SMTPAUTHPROXY_Userid' => $mai_data->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid'; - %= text_field 'SMTPAUTHPROXY_Userid', class => 'input' -

    +

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

    -

    - %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD' - - % param 'SMTPAUTHPROXY_Passwd' => $mai_data->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd'; - %= password_field 'SMTPAUTHPROXY_Passwd', class => 'input' -

    +

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

    - %# .... - %# Probably finally by a submit. - %= submit_button $btn, class => 'action' - %end -
    \ No newline at end of file + %# .... + %# Probably finally by a submit. + %= submit_button $btn, class => 'action' + % end +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_mai_FIL.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_mai_FIL.html.ep index 0293882..3229fde 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_mai_FIL.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_mai_FIL.html.ep @@ -1,98 +1,98 @@ %# -%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 +%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 %#
    -%# - % if (config->{debug} == 1) { - 
    +  %# 
+  % if (config->{debug} == 1) {
+    
     			%= dumper $mai_data
-		
    
-	% }
-	% my $btn = l('SAVE');
-	% $c->param(Selected => undef); #This may need deleting for a params panel - only needed for a table
+
    + % } + % my $btn = l('SAVE'); + % $c->param( Selected => undef ); #This may need deleting for a params panel - only needed for a table -

    <%= $c->l('mai_DESC_STATE_FILTERING_BUTTON') %>


    - %= 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' +

    <%= $c->l('mai_DESC_STATE_FILTERING_BUTTON') %>


    + %= 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_LABEL_VIRUS_SCAN' - - % param 'VirusStatus' => $mai_data->{virusstatus} unless param 'VirusStatus'; - %= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input' -

    +

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

    - %=l 'mai_DESC_SPAM_SCAN' + %= l 'mai_DESC_SPAM_SCAN' -

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

    +

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

    -

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

    +

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

    -

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

    +

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

    -

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

    +

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

    -

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

    +

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

    - %=l 'mai_DESC_SPAM_SUBJECT' + %= l 'mai_DESC_SPAM_SUBJECT' -

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

    +

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

    -

    - %=l 'mai_LABEL_SPAM_SUBJECT' - - % param 'SpamSubject' => $mai_data->{spamsubject} unless param 'SpamSubject'; - %= text_field 'SpamSubject' => class => 'input' -

    +

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

    - %=l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT' + %= 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 => 'input', multiple => "1" -

    +

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

    - %# .... - %# Probably finally by a submit. - %= submit_button $btn, class => 'action' - %end -
    \ No newline at end of file + %# .... + %# Probably finally by a submit. + %= submit_button $btn, class => 'action' + % end +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_mai_FRONT.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_mai_FRONT.html.ep index 35ea23e..749b6f1 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_mai_FRONT.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_mai_FRONT.html.ep @@ -1,152 +1,152 @@ %# -%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 +%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 %#
    -%# - % if (config->{debug} == 1) { - 
    +  %# 
+  % if (config->{debug} == 1) {
+    
     			%= dumper $mai_data
 			
     
-		
    
-	% }
-	% $c->param(Selected => undef); #This may need deleting for a params panel - only needed for a table
-	% my $btn = l('Modify');
-	
    
-		<%= $c->l('mai_DESC_STATE_ACCESS_BUTTON') %>
-		%= form_for 'emailsettings' => (method => 'POST') => begin
-		
    
-		%=l 'mai_LABEL_POP_ACCESS_CONTROL'
-		
-		%= $c->get_current_pop3_access( TRUE )
-		
    
+
    + % } + % $c->param( Selected => undef ); #This may need deleting for a params panel - only needed for a table + % my $btn = l('Modify'); +
    + <%= $c->l('mai_DESC_STATE_ACCESS_BUTTON') %> + %= 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_IMAP_ACCESS_CONTROL' + + %= $c->get_current_imap_access(TRUE) +

    -

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

    +

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

    -
    -
    - %= submit_button "$btn", class => 'action' -
    +
    +
    + %= submit_button "$btn", class => 'action' +
    - %= hidden_field 'trt' => 'ACC' - % end -
    -
    + %= hidden_field 'trt' => 'ACC' + % end + +
    - -
    - <%= $c->l('mai_DESC_STATE_FILTERING_BUTTON') %> - %= 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) -

    +
    + <%= $c->l('mai_DESC_STATE_FILTERING_BUTTON') %> + %= form_for 'emailsettings' => ( method => 'POST' ) => begin +

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

    -

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

    +

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

    -
    -
    - %= submit_button "$btn", class => 'action' -
    +

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

    - %= hidden_field 'trt' => 'FIL' - % end -
    -
    +
    +
    + %= submit_button "$btn", class => 'action' +
    -
    - <%= $c->l('mai_DESC_STATE_RECEPTION_BUTTON') %> - %= form_for 'emailsettings' => (method => 'POST') => begin -

    - %=l 'mai_LABEL_MODE' - - %= $mai_data->{fetchmailmethod} -

    - - % my $smtp_mesg; + %= hidden_field 'trt' => 'FIL' + % end +
    +
    - % $smtp_mesg=l('mai_SMTP_port_authenticate'); -

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

    +
    + <%= $c->l('mai_DESC_STATE_RECEPTION_BUTTON') %> + %= form_for 'emailsettings' => ( method => 'POST' ) => begin +

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

    - % $smtp_mesg=l('mai_SMTPS_SSL/TLS'); -

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

    + % my $smtp_mesg; - % $smtp_mesg=l 'mai_Submission_port'; -

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

    -
    + % $smtp_mesg = l('mai_SMTP_port_authenticate'); +

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

    -
    - %= submit_button "$btn", class => 'action' -
    + % $smtp_mesg = l('mai_SMTPS_SSL/TLS'); +

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

    - %= hidden_field 'trt' => 'REC' - % end -
    -
    + % $smtp_mesg = l 'mai_Submission_port'; +

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

    +
    -
    - <%= $c->l('mai_DESC_STATE_DELIVERY_BUTTON') %> - %= form_for 'emailsettings' => (method => 'POST') => begin -

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

    +
    + %= submit_button "$btn", class => 'action' +
    -

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

    + %= hidden_field 'trt' => 'REC' + % end +
    +
    -

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

    +
    + <%= $c->l('mai_DESC_STATE_DELIVERY_BUTTON') %> + %= form_for 'emailsettings' => ( method => 'POST' ) => begin +

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

    -
    -
    - %= submit_button "$btn", class => 'action' -
    +

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

    - %= hidden_field 'trt' => 'DEL' - % end -
    -
    \ No newline at end of file +

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

    + +
    +
    + %= submit_button "$btn", class => 'action' +
    + + %= hidden_field 'trt' => 'DEL' + % end + +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_mai_REC.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_mai_REC.html.ep index dbc7db2..c5700cc 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_mai_REC.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_mai_REC.html.ep @@ -1,159 +1,159 @@ %# -%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 +%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-06-29 08:53:20 %#
    -%# - % if (config->{debug} == 1) { - 
    +  %# 
+  % if (config->{debug} == 1) {
+    
     			%= dumper $mai_data
-		
    
-	% }
-	% my $btn = l('SAVE');
-	% $c->param(Selected => undef); #This may need deleting for a params panel - only needed for a table
+
    + % } + % my $btn = l('SAVE'); + % $c->param( Selected => undef ); #This may need deleting for a params panel - only needed for a table -

    <%= $c->l('mai_DESC_STATE_RECEPTION_BUTTON') %>


    - %= 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' +

    <%= $c->l('mai_DESC_STATE_RECEPTION_BUTTON') %>


    + %= 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_LABEL_MODE' - - % param 'FetchmailMethod' => $mai_data->{fetchmailmethod} unless param 'FetchmailMethod'; - - %= select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class => 'input' -

    + + --> + %= select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class => 'input' +

    - %#=l 'mai_DESC_SMTP_AUTH_CONTROL' -
    - %= l "mai_SMTP_port_(25)" -
    - %= l "mai_SMTPS_port_(465)" -
    - %= l "mai_SMTP_Submission" -
    + %# =l 'mai_DESC_SMTP_AUTH_CONTROL' +
    + %= l "mai_SMTP_port_(25)" +
    + %= l "mai_SMTPS_port_(465)" +
    + %= l "mai_SMTP_Submission" +
    - % my $smtp_mesg=l('mai_SMTP_port_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 => 'input' -

    + + --> + %= select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => 'input' +

    - % 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'; - - %= select_field 'sSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => 'input' -

    + % 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'; - %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 => 'input' -

    + + --> + %= select_field 'uSMTPAuth' => $c->get_smtp_ssl_auth_opt(), class => 'input' +

    - -

    - %=l 'mai_TITLE_SECONDARY' -


    + +

    + %= l 'mai_TITLE_SECONDARY' +


    - %=l 'mai_DESC_SECONDARY' + %= l 'mai_DESC_SECONDARY' -

    - %=l 'mai_LABEL_SECONDARY' - - % param 'SecondaryMailServer' => $mai_data->{secondarymailserver} unless param 'SecondaryMailServer'; - %= text_field 'SecondaryMailServer', class => 'input' -

    +

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

    - %=l 'mai_DESC_FETCH_PERIOD' + %= l 'mai_DESC_FETCH_PERIOD' -

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

    +

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

    -

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

    +

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

    -

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

    +

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

    -

    - %=l 'mai_LABEL_POP_ACCOUNT' - - % param 'SecondaryMailAccount' => $mai_data->{secondarymailaccount} unless param 'SecondaryMailAccount'; - %= text_field 'SecondaryMailAccount', class => 'input' -

    +

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

    -

    - %=l 'mai_LABEL_POP_PASS' - - % param 'SecondaryMailPassword' => $mai_data->{secondarymailpassword} unless param 'SecondaryMailPassword'; - %= password_field 'SecondaryMailPassword', class => 'input' -

    +

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

    -

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

    +

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

    -

    - %=l 'mai_LABEL_SORT_HEADER' - - % param 'SecondaryMailEnvelope' => $mai_data->{secondarymailenvelope} unless param 'SecondaryMailEnvelope'; - %= text_field 'SecondaryMailEnvelope', class => 'input' -

    +

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

    - %# .... - %# Probably finally by a submit. - %= submit_button $btn, class => 'action' - %end -
    \ No newline at end of file + %# .... + %# Probably finally by a submit. + %= submit_button $btn, class => 'action' + % end +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_module.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_module.html.ep index f68c806..b52235b 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_module.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_module.html.ep @@ -1,42 +1,42 @@ % layout 'default', title => 'Sme server 2 - Support'; % content_for 'head' => begin - %= include 'partials/_head' + %= include 'partials/_head' % end % content_for 'header' => begin - %= include 'partials/_header' + %= include 'partials/_header' % end % content_for 'info' => begin - %= include 'partials/_info' + %= include 'partials/_info' % end % content_for 'navigation' => begin - < %= $navigation % > - %= include 'partials/_navig' + < %= $navigation % > + %= include 'partials/_navig' % end % content_for 'footer' => begin - %= include 'partials/_footer' + %= include 'partials/_footer' % end % content_for 'end' => begin -
    - content_end -
    +
    + content_end +
    % end
    -

    < %= $title % >


    - <%= $modul %>
    -Et eu humo modo paratus quadrum turpis validus. Abico appellatio augue qui refero valetudo vereor. Augue diam eu genitus ille letalis nobis typicus veniam. +

    < %= $title % >


    + <%= $modul %>
    + 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. -
    -

    - %= link_to Welcome => '/' -

    + 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. +
    +

    + %= link_to Welcome => '/' +

    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep index 52488a4..f1c4f17 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep +++ b/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' )}; +% use SrvMngr qw( getNavigation ); +% my %nav = %{ SrvMngr->getNavigation( $c->languages(), 'N' ) }; - diff --git a/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep index 5b6762c..68816cb 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep +++ b/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' )}; +% use SrvMngr qw( getNavigation ); +% my %nav = %{ SrvMngr->getNavigation( $c->languages(), 'A' ) }; - diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep index db90b37..5e6a42c 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep @@ -1,85 +1,85 @@
    - % my $retref= $c->stash("ret"); - % my %ret = $retref ? %$retref : (ret => ""); - % my @vars = split(/,/, $ret{vars} // ''); - % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars; + % my $retref = $c->stash("ret"); + % my %ret = $retref ? %$retref : ( ret => "" ); + % my @vars = split( /,/, $ret{vars} // '' ); + % my ( $var1, $var2, $var3, $var4, $var5, $var6, $var7 ) = @vars; - % if ($c->app->config->{debug}) { - 
    +  % if ($c->app->config->{debug}) {
+    
     		%= dumper { ret_data => \%ret }
-	
      
-	% }
+
    + % } - % if ($ret{ret} eq "") { + % if ($ret{ret} eq "") { - % } elsif (index($ret{ret},"SUCCESS") != -1) { -
    -
    - %= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) -
    - % } else { -
    -
    - %= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) -
    - % } -
    - % my $btn = l('ADD'); - - % if (config->{debug} == 1) { - - %= dumper $c->current_route - %= dumper $c->stash("ret") - - % } - - %= form_for '/portforwardingb' => (method => 'POST') => begin -

    - %=l "pf_CREATE_RULE" -

    -

    - %=l "pf_SUMMARY_ADD_DESC" -


    - - %=l "pf_LABEL_PROTOCOL" - - %=select_field 'proto'=>["TCP","UDP"] -

    - - %=l "pf_LABEL_SOURCE_PORT" - - %=text_field 'sport' -

    - - %=l "pf_LABEL_DESTINATION_PORT" - - - %=text_field 'dport' -

    - - %=l "pf_LABEL_DESTINATION_HOST" - - - %=text_field 'dhost' -

    - - %=l "pf_ALLOW_HOSTS" - - - %=text_field 'allow' -

    - - %=l "pf_RULE_COMMENT" - - - %=text_field 'cmmnt' -

    -

    -
    - %= submit_button "$btn", class => 'action' -

    + % } elsif (index($ret{ret},"SUCCESS") != -1) { +
    +
    + %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) ) +
    + % } else { +
    +
    + %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) ) +
    + % } +
    + % my $btn = l('ADD'); - %end + % if (config->{debug} == 1) { + + %= dumper $c->current_route + %= dumper $c->stash("ret") + +% } -
    \ No newline at end of file +%= form_for '/portforwardingb' => ( method => 'POST' ) => begin +

    + %= l "pf_CREATE_RULE" +

    +

    + %= l "pf_SUMMARY_ADD_DESC" +


    + + %= l "pf_LABEL_PROTOCOL" + + %= select_field 'proto' => [ "TCP", "UDP" ] +

    + + %= l "pf_LABEL_SOURCE_PORT" + + %= text_field 'sport' +

    + + %= l "pf_LABEL_DESTINATION_PORT" + + + %= text_field 'dport' +

    + + %= l "pf_LABEL_DESTINATION_HOST" + + + %= text_field 'dhost' +

    + + %= l "pf_ALLOW_HOSTS" + + + %= text_field 'allow' +

    + + %= l "pf_RULE_COMMENT" + + + %= text_field 'cmmnt' +

    +

    +
    + %= submit_button "$btn", class => 'action' +

    + +% end + +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep index 6df5b10..79e0ef8 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_del.html.ep @@ -1,66 +1,66 @@
    - % my $btn = l('REMOVE'); - % my $proto = $pf_datas->{proto}; - % my $sport = $pf_datas->{sport}; - % my $dport = $pf_datas->{dport}; - % my $dhost = $pf_datas->{dhost}; - % my $cmmnt = $pf_datas->{cmmnt}; - % my $allow = $pf_datas->{allow}; - - % if (config->{debug} == 1) { - 
    +  % my $btn = l('REMOVE');
+  % my $proto = $pf_datas->{proto};
+  % my $sport = $pf_datas->{sport};
+  % my $dport = $pf_datas->{dport};
+  % my $dhost = $pf_datas->{dhost};
+  % my $cmmnt = $pf_datas->{cmmnt};
+  % my $allow = $pf_datas->{allow};
+
+  % if (config->{debug} == 1) {
+    
     	%= dumper $c->current_route
 	%= dumper $c->stash("ret")
     %= dumper %$pf_datas
-	
    
-    % }
-     
-    %= form_for '/portforwardinge' => (method => 'POST') => begin
-        
    
-		%= l "pf_SUMMARY_REMOVE_DESC"
-			

    
-			
-				%=l "pf_LABEL_PROTOCOL"
-			
-				%=$proto
-			

    
-			
-				%=l "pf_LABEL_SOURCE_PORT"
-			
-				%=$sport
-			

    
-			
-				%=l "pf_LABEL_DESTINATION_HOST"
-			
-			
-				%=$dport
-			

    
-			
-				%=l "pf_LABEL_DESTINATION_PORT"
-			
-			
-				%=$dhost
-			

    
-			
-				%=l "pf_RULE_COMMENT"
-			
-			
-				%=$cmmnt
-			

    
-			
-				%=l "pf_ALLOW_HOSTS"
-			
-			
-				%=$allow
-			

    
-		%#}
-			%= hidden_field sport=>$sport
-			%= hidden_field proto=>$proto
-			
    
-			%= submit_button "$btn", class => 'action'
-			
    
+
    + % } - %end + %= form_for '/portforwardinge' => ( method => 'POST' ) => begin +
    + %= l "pf_SUMMARY_REMOVE_DESC" +


    + + %= l "pf_LABEL_PROTOCOL" + + %= $proto +

    + + %= l "pf_LABEL_SOURCE_PORT" + + %= $sport +

    + + %= l "pf_LABEL_DESTINATION_HOST" + + + %= $dport +

    + + %= l "pf_LABEL_DESTINATION_PORT" + + + %= $dhost +

    + + %= l "pf_RULE_COMMENT" + + + %= $cmmnt +

    + + %= l "pf_ALLOW_HOSTS" + + + %= $allow +

    + %# } +%= hidden_field sport => $sport +%= hidden_field proto => $proto +
    +%= submit_button "$btn", class => 'action' +

    -
    \ No newline at end of file +% end + +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep index cfe3b51..7091fcb 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep @@ -1,116 +1,116 @@
    - % my $btn = l('pf_CREATE_RULE'); - %= form_for '/portforwardinga' => (method => 'POST') => begin + % my $btn = l('pf_CREATE_RULE'); + %= form_for '/portforwardinga' => ( method => 'POST' ) => begin % my $numtcpforwards = @$tcpforwards; - % my $numudpforwards = @$udpforwards; + % my $numudpforwards = @$udpforwards; - % my $retref= $c->stash("ret"); - % my %ret = $retref ? %$retref : (ret => ""); - % my @vars = split(/,/, $ret{vars} // ''); - % my ($var1, $var2, $var3, $var4, $var5, $var6, $var7) = @vars; + % my $retref = $c->stash("ret"); + % my %ret = $retref ? %$retref : ( ret => "" ); + % my @vars = split( /,/, $ret{vars} // '' ); + % my ( $var1, $var2, $var3, $var4, $var5, $var6, $var7 ) = @vars; - % if ($c->app->config->{debug}) { - 
    +    % if ($c->app->config->{debug}) {
+      
     		%= dumper { ret_data => \%ret }
-	
      
-	% }
+
    + % } - % if ($ret{ret} eq "") { - %=l "pf_FIRST_PAGE_DESCRIPTION" - % } elsif (index($ret{ret},"SUCCESS") != -1) { -
    -
    - %= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) -
    - % } else { -
    -
    - %= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) -
    - % } -
    + % if ($ret{ret} eq "") { + %= l "pf_FIRST_PAGE_DESCRIPTION" + % } elsif (index($ret{ret},"SUCCESS") != -1) { +
    +
    + %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) ) +
    + % } else { +
    +
    + %= $c->render_to_string( inline => l( $ret{ret}, @vars[ 0 .. 6 ] ) ) +
    + % } +
    -

    -
    - %= submit_button "$btn", class => 'action' -

    +

    +
    + %= submit_button "$btn", class => 'action' +

    - % end - - % if ($empty){ -
    - %=l 'pf_NO_FORWARDS' - % } else { -
    - %=l 'pf_SHOW_FORWARDS' -

    - - - - - - - - - - - - % my %forwards = (); - % $forwards{TCP} = $tcpforwards; - % $forwards{UDP} = $udpforwards; + % end - % foreach my $proto (sort keys %forwards) { + % if ($empty){ +
    + %= l 'pf_NO_FORWARDS' + % } else { +
    + %= l 'pf_SHOW_FORWARDS' +

    +
    - %=l 'pf_LABEL_PROTOCOL' - - %=l 'pf_LABEL_SOURCE_PORT' - - %=l 'pf_LABEL_DESTINATION_HOST' - - %=l 'pf_LABEL_DESTINATION_PORT' - - %=l 'pf_ALLOW_HOSTS' - - %=l 'pf_RULE_COMMENT' - - %=l 'ACTION' -
    + + + + + + + + + + + % my %forwards = (); + % $forwards{TCP} = $tcpforwards; + % $forwards{UDP} = $udpforwards; - % if (@{ $forwards{$proto} }) { - % foreach my $entry (@{ $forwards{$proto} }) { - - % my $sport = $entry->key; - % my $dhost = $entry->prop('DestHost'); - % 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') => $sport - %= t td => (class => 'sme-border') => $dhost - %= t td => (class => 'sme-border') => $dport - %= t td => (class => 'sme-border') => $allow - %= t td => (class => 'sme-border') => $cmmnt - - - % } - % } - %} - %} - -
    + %= l 'pf_LABEL_PROTOCOL' + + %= l 'pf_LABEL_SOURCE_PORT' + + %= l 'pf_LABEL_DESTINATION_HOST' + + %= l 'pf_LABEL_DESTINATION_PORT' + + %= l 'pf_ALLOW_HOSTS' + + %= l 'pf_RULE_COMMENT' + + %= l 'ACTION' +
    - %my $remove_text = l('REMOVE'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $actionRemove = qq{ - % - % - % - %}; - <%= $c->render_to_string(inline => $actionRemove) %> -
    - %= hidden_field 'trt' => $pf_datas->{trt} - -
    \ No newline at end of file + % foreach my $proto (sort keys %forwards) { + + % if (@{ $forwards{$proto} }) { + % foreach my $entry (@{ $forwards{$proto} }) { + + % my $sport = $entry->key; + % my $dhost = $entry->prop('DestHost'); + % 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' ) => $sport + %= t td => ( class => 'sme-border' ) => $dhost + %= t td => ( class => 'sme-border' ) => $dport + %= t td => ( class => 'sme-border' ) => $allow + %= t td => ( class => 'sme-border' ) => $cmmnt + + % my $remove_text = l('REMOVE'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $actionRemove = qq{ + % + % + % + % }; + <%= $c->render_to_string( inline => $actionRemove ) %> + + + % } + % } + % } + % } + + + %= hidden_field 'trt' => $pf_datas->{trt} + +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_prt_add.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_prt_add.html.ep index ece8548..8aa953f 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_prt_add.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_prt_add.html.ep @@ -1,46 +1,46 @@
    - % my $btn = l('ADD'); + % my $btn = l('ADD'); - %= form_for '/printers2' => (method => 'POST') => begin -

    -

    - %=l 'prt_CREATE_NEW_PRINTER' -


    - %=l 'prt_CREATE_NEW_DESC' -


    + %= form_for '/printers2' => ( method => 'POST' ) => begin +

    +

    + %= l 'prt_CREATE_NEW_PRINTER' +


    + %= l 'prt_CREATE_NEW_DESC' +


    -

    - - %=l 'prt_PRINTER_NAME', class => 'label' - - %= text_field 'Name', class => 'input' - -

    +

    + + %= l 'prt_PRINTER_NAME', class => 'label' + + %= text_field 'Name', class => 'input' + +

    -

    - - %=l 'DESCRIPTION_BRIEF', class => 'label' - - %= text_field 'Description', class => 'input' - -

    +

    + + %= l 'DESCRIPTION_BRIEF', class => 'label' + + %= text_field 'Description', class => 'input' + +

    -

    - - %=l 'LOCATION', class => 'label' - - %= select_field 'Location' => $c->printerLocation_list(), class => 'input' - -

    +

    + + %= l 'LOCATION', class => 'label' + + %= select_field 'Location' => $c->printerLocation_list(), class => 'input' + +

    -

    -

    - %= submit_button "$btn", class => 'action' -

    +

    +

    + %= submit_button "$btn", class => 'action' +

    - %= hidden_field 'trt' => $prt_datas->{trt} - - % end + %= hidden_field 'trt' => $prt_datas->{trt} + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep index f4b7cac..d76eb85 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep @@ -1,81 +1,81 @@
    - % my $btn = l('prt_INITIAL_BTN'); + % my $btn = l('prt_INITIAL_BTN'); - %= form_for '/printers' => (method => 'POST') => begin + %= form_for '/printers' => ( method => 'POST' ) => begin - %= hidden_field 'trt' => 'ADD' + %= hidden_field 'trt' => 'ADD' -

    -
    - %= submit_button "$btn", class => 'action' -

    - % end +

    +
    + %= submit_button "$btn", class => 'action' +

    + % end -

    -

    - %=l 'prt_CURRENT_LIST' -

    -

    - % my $numPrinters = @$printerDrivers; - % if ($numPrinters == 0){ - %=l 'prt_NO_PRINTERS' - % } else { - - - - - - - - - - - % foreach my $printer (@$printerDrivers) - % { - % my $address = ($printer->prop('Location') eq 'remote') - % ? $printer->prop('Address') : 'N/A'; - % my $remoteName = ($printer->prop('Location') eq 'remote') - % ? $printer->prop('RemoteName') : 'N/A'; - % $remoteName = 'raw' unless ($remoteName); +

    +

    + %= l 'prt_CURRENT_LIST' +

    +

    + % my $numPrinters = @$printerDrivers; + % if ($numPrinters == 0){ + %= l 'prt_NO_PRINTERS' + % } else { +
    - %=l 'NAME' - - %=l 'DESCRIPTION' - - %=l 'LOCATION' - - %=l 'prt_REMOTE_ADDRESS' - - %=l 'prt_REMOTE_NAME' - - %=l 'ACTION' -
    - %= t td => (class => 'sme-border') => $printer->key - %= t td => (class => 'sme-border') => $printer->prop('Description') - %= t td => (class => 'sme-border') => $printer->prop('Location') - %= t td => (class => 'sme-border') => $address - %= t td => (class => 'sme-border') => $remoteName - - - % } - -
    - %my $remove_text = l('REMOVE'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $printer_name = $printer->key; - %my $actionRemove = qq{ - % - % - % - %}; - <%= $c->render_to_string(inline => $actionRemove) %> -
    - <%} %> -

    + + %= l 'NAME' + + + %= l 'DESCRIPTION' + + + %= l 'LOCATION' + + + %= l 'prt_REMOTE_ADDRESS' + + + %= l 'prt_REMOTE_NAME' + + + %= l 'ACTION' + + + + % foreach my $printer (@$printerDrivers) + % { + % my $address = ( $printer->prop('Location') eq 'remote' ) + % ? $printer->prop('Address') : 'N/A'; + % my $remoteName = ( $printer->prop('Location') eq 'remote' ) + % ? $printer->prop('RemoteName') : 'N/A'; + % $remoteName = 'raw' unless ($remoteName); + + %= t td => ( class => 'sme-border' ) => $printer->key + %= t td => ( class => 'sme-border' ) => $printer->prop('Description') + %= t td => ( class => 'sme-border' ) => $printer->prop('Location') + %= t td => ( class => 'sme-border' ) => $address + %= t td => ( class => 'sme-border' ) => $remoteName + + % my $remove_text = l('REMOVE'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $printer_name = $printer->key; + % my $actionRemove = qq{ + % + % + % + % }; + <%= $c->render_to_string( inline => $actionRemove ) %> + + + % } + + + <% } %> +

    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_prt_net.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_prt_net.html.ep index 839a466..076079e 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_prt_net.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_prt_net.html.ep @@ -1,43 +1,43 @@
    - % my $btn = l('ADD'); + % my $btn = l('ADD'); - %= form_for '/printers2' => (method => 'POST') => begin -

    -

    - %=l 'prt_CREATE_NETWORK_PRINTER' -

    - -

    - %=l 'prt_CREATE_NETWORK_DESC' -

    - -

    - - %=l 'prt_HOSTNAME_OR_IP', class => 'label' - - %= text_field 'Address', class => 'input' - -

    + %= form_for '/printers2' => ( method => 'POST' ) => begin +

    +

    + %= l 'prt_CREATE_NETWORK_PRINTER' +

    -

    - - %=l 'prt_REMOTE_NAME_DESC', class => 'label' - - %= text_field 'RemoteName' => 'raw', class => 'input' - -

    +

    + %= l 'prt_CREATE_NETWORK_DESC' +

    -

    -

    - %= submit_button "$btn", class => 'action' -

    +

    + + %= l 'prt_HOSTNAME_OR_IP', class => 'label' + + %= text_field 'Address', class => 'input' + +

    - %= hidden_field 'trt' => $prt_datas->{trt} - %= hidden_field 'Name' => $prt_datas->{name} - %= hidden_field 'Description' => $prt_datas->{description} - %= hidden_field 'Location' => $prt_datas->{location} - - % end +

    + + %= l 'prt_REMOTE_NAME_DESC', class => 'label' + + %= text_field 'RemoteName' => 'raw', class => 'input' + +

    + +

    +

    + %= submit_button "$btn", class => 'action' +

    + + %= hidden_field 'trt' => $prt_datas->{trt} + %= hidden_field 'Name' => $prt_datas->{name} + %= hidden_field 'Description' => $prt_datas->{description} + %= hidden_field 'Location' => $prt_datas->{location} + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pse_add.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pse_add.html.ep index e57375f..e8ba8f3 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pse_add.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pse_add.html.ep @@ -1,39 +1,39 @@
    - % my $btn = l('ADD'); + % my $btn = l('ADD'); - %= form_for '/pseudonyms2' => (method => 'POST') => begin -

    -

    - %=l 'pse_TITLE_CREATE' -

    -
    - %= $c->render_to_string(inline => l('pse_VALID_PSEUDONYM_NAMES')); -

    + %= form_for '/pseudonyms2' => ( method => 'POST' ) => begin +

    +

    + %= l 'pse_TITLE_CREATE' +

    +
    + %= $c->render_to_string( inline => l('pse_VALID_PSEUDONYM_NAMES') ); +

    -

    - - %=l 'pse_PSEUDONYM_NAME', class => 'label' - - %= text_field 'Pseudonym', class => 'input' - -

    +

    + + %= l 'pse_PSEUDONYM_NAME', class => 'label' + + %= text_field 'Pseudonym', class => 'input' + +

    -

    - - %=l 'pse_SELECT_ACCOUNT', class => 'label' - - %= select_field 'Account' => $c->existing_accounts_list(), class => 'input' - -

    +

    + + %= l 'pse_SELECT_ACCOUNT', class => 'label' + + %= select_field 'Account' => $c->existing_accounts_list(), class => 'input' + +

    -

    -

    - %= submit_button "$btn", class => 'action' -

    +

    +

    + %= submit_button "$btn", class => 'action' +

    - %= hidden_field 'trt' => $pse_datas->{trt} - - % end + %= hidden_field 'trt' => $pse_datas->{trt} + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pse_del.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pse_del.html.ep index 33ef674..7233403 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pse_del.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pse_del.html.ep @@ -1,25 +1,25 @@
    - % my $btn = l('REMOVE'); - %= form_for '/pseudonyms2' => (method => 'POST') => begin -

    -

    - %=l 'pse_REMOVE_PSEUDONYM' -

    + % my $btn = l('REMOVE'); + %= form_for '/pseudonyms2' => ( method => 'POST' ) => begin +

    +

    + %= l 'pse_REMOVE_PSEUDONYM' +

    -

    - %= $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} ) ); -

    +

    -

    -
    - %= submit_button "$btn", class => 'action' -

    +

    +
    + %= submit_button "$btn", class => 'action' +

    - %= hidden_field 'trt' => $pse_datas->{trt} - %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym} + %= hidden_field 'trt' => $pse_datas->{trt} + %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym} - % end + % end -
    +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep index 1428be0..ae5c322 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep @@ -1,95 +1,95 @@
    - % my $btn = l('pse_CLICK_TO_CREATE'); + % 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' + %= hidden_field 'trt' => 'ADD' -


    - %= submit_button "$btn", class => 'action' -

    - - % end +


    + %= submit_button "$btn", class => 'action' +

    + + % end -

    - %=l 'pse_CURRENT_PSEUDONYMS' -


    - % my $numPseudonyms = @$pseudonyms; - % if ($numPseudonyms == 0){ - %=l 'pse_ACCOUNT_PSEUDONYM_NONE' - % } else { - - - - - - - - - - % 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 = $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"); - +

    + %= l 'pse_CURRENT_PSEUDONYMS' +


    + % my $numPseudonyms = @$pseudonyms; + % if ($numPseudonyms == 0){ + %= l 'pse_ACCOUNT_PSEUDONYM_NONE' + % } else { +
    - %=l 'pse_PSEUDONYM' - - %=l 'pse_USER_OR_GROUP' - - %=l 'ACTION' -
    - %= t td => (class => 'sme-border') => $pseudonym->key - %= t td => (class => 'sme-border') => $account + + + + + + - - - % } - -
    + %= l 'pse_PSEUDONYM' + + %= l 'pse_USER_OR_GROUP' + + %= l 'ACTION' +
    - %my ($actionModify, $actionRemove) = ' '; - %if ($modifiable eq 'yes') { - %my $modify_text = l('MODIFY'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $pseudonyms_entry_name = $pseudonym->key; # pseudonyms_entry name extracted from the data structure - %$actionModify = qq{ - % - % - % - %}; - %} + % foreach my $pseudonym (@$pseudonyms) + % { + % my $modifiable = $pseudonym->prop('Changeable') || 'yes'; + % my $removable = $pseudonym->prop('Removable') || 'yes'; - %if ($removable eq 'yes') { - %my $remove_text = l('REMOVE'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $pseudonyms_entry_name = $pseudonym->key; # pseudonyms_entry name extracted from the data structure - %$actionRemove = qq{ - % - % - % - %}; - %} - <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %> + % my $account = $pseudonym->prop('Account'); + % $account = "Administrator" if ( $account eq "admin" ); + % $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" ); + + + %= t td => ( class => 'sme-border' ) => $pseudonym->key + %= t td => ( class => 'sme-border' ) => $account + + + % my ( $actionModify, $actionRemove ) = ' '; + % if ($modifiable eq 'yes') { + % my $modify_text = l('MODIFY'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $pseudonyms_entry_name = $pseudonym->key; # pseudonyms_entry name extracted from the data structure + % $actionModify = qq{ + % + % + % + % }; + % } + + % if ($removable eq 'yes') { + % my $remove_text = l('REMOVE'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $pseudonyms_entry_name = $pseudonym->key; # pseudonyms_entry name extracted from the data structure + % $actionRemove = qq{ + % + % + % + % }; + % } + <%= $c->render_to_string( inline => $actionModify ) %> <%= $c->render_to_string( inline => $actionRemove ) %> + + + + % } + + + <% } %> +

    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_pse_upd.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_pse_upd.html.ep index 18554fd..50b8fdc 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_pse_upd.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_pse_upd.html.ep @@ -1,53 +1,53 @@
    - % my $btn = l('SAVE'); + % my $btn = l('SAVE'); - %= form_for '/pseudonyms2' => (method => 'POST') => begin -

    -

    - %=l 'pse_MODIFY_PSEUDONYM' -

    -
    - %=l 'pse_DESC_PSEUDONYM_NAME' -

    + %= form_for '/pseudonyms2' => ( method => 'POST' ) => begin +

    +

    + %= l 'pse_MODIFY_PSEUDONYM' +

    +
    + %= l 'pse_DESC_PSEUDONYM_NAME' +

    -

    - - %=l 'pse_PSEUDONYM_NAME', class => 'label' - - %= $pse_datas->{pseudonym}, class => 'data' - -

    +

    + + %= l 'pse_PSEUDONYM_NAME', class => 'label' + + %= $pse_datas->{pseudonym}, class => 'data' + +

    -

    - - %=l 'pse_SELECT_ACCOUNT', class => 'label' - - % param 'Account' => $pse_datas->{account} unless param 'Account'; - %= select_field 'Account' => $c->existing_accounts_list(), class => 'input' - -

    +

    + + %= l 'pse_SELECT_ACCOUNT', class => 'label' + + % param 'Account' => $pse_datas->{account} unless param 'Account'; + %= select_field 'Account' => $c->existing_accounts_list(), class => 'input' + +

    - %if ( $c->is_pseudonym_not_removable( $pse_datas->{pseudonym} ) ) { + % if ( $c->is_pseudonym_not_removable( $pse_datas->{pseudonym} ) ) { -

    - - %=l 'pse_SELECT_INTERNAL', class => 'label' - - % param 'Internal' => $pse_datas->{internal} unless param 'Internal'; - %= select_field 'Internal' => [ [(l 'YES') => 'YES'], [(l 'NO') => 'NO'] ], class => 'input' - -

    +

    + + %= l 'pse_SELECT_INTERNAL', class => 'label' + + % param 'Internal' => $pse_datas->{internal} unless param 'Internal'; + %= select_field 'Internal' => [ [ ( l 'YES' ) => 'YES' ], [ ( l 'NO' ) => 'NO' ] ], class => 'input'; + +

    - %} - -

    - %= submit_button "$btn", class => 'action' -

    + % } - %= hidden_field 'trt' => $pse_datas->{trt} - %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym} - - %end +

    + %= submit_button "$btn", class => 'action' +

    + + %= hidden_field 'trt' => $pse_datas->{trt} + %= hidden_field 'Pseudonym' => $pse_datas->{pseudonym} + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep index bedc826..9af19d2 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep @@ -1,82 +1,82 @@
    -

    - % my $modul = $c->render_to_string(inline => $c->l('quo_QUOTA_DESC')); - %= $modul - -

    - %=l 'quo_CURRENT_USAGE_AND_SETTINGS' -

    +

    + % my $modul = $c->render_to_string( inline => $c->l('quo_QUOTA_DESC') ); + %= $modul -
    - % my $numUsers = @$userAccounts; - % if ($numUsers == 0){ - %=l 'ACCOUNT_USER_NONE' - % } else { +

    + %= l 'quo_CURRENT_USAGE_AND_SETTINGS' +

    - % my $limit = l('quo_LIMIT_WITH_GRACE_MB'); $limit =~ s#(graceX)#
    $1#; - % my $absolute = l('quo_ABS_LIMIT_MB'); $absolute =~ s#(limitX)#
    $1#; - % my $current = l('quo_CURRENT_USAGE'); $current =~ s#(usageX)#
    $1#; +
    + % my $numUsers = @$userAccounts; + % if ($numUsers == 0){ + %= l 'ACCOUNT_USER_NONE' + % } else { - - - - - - - - - - + % my $limit = l('quo_LIMIT_WITH_GRACE_MB'); $limit =~ s#(graceX)#
    $1#; + % my $absolute = l('quo_ABS_LIMIT_MB'); $absolute =~ s#(limitX)#
    $1#; + % my $current = l('quo_CURRENT_USAGE'); $current =~ s#(usageX)#
    $1#; - % foreach my $user (@$userAccounts) - % { - % my $uid = getpwnam($user->key); - % unless ($uid) { - % warn($self->localise('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); +
    - %=l 'ACCOUNT' - - %=l 'USER_NAME' - - %= $limit - - %= $absolute - - %= $current - - %=l 'ACTION' -
    - %= t td => (class => 'sme-border') => $user->key - %= t td => (class => 'sme-border') => $name - %= 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", $bc / 1024 ) - - - % } - -
    - %my $modify_text = l('MODIFY'); # Localized text - %my $csrf_token = "TOKEN"; # CSRF token for security - %my $quota_user_name = $user->key; # quotas_entry name extracted from the data structure - %my $actionModify = qq{ - % - % - % - %}; - <%= $c->render_to_string(inline => $actionModify) %> -
    - <%} %> -

    + + %= l 'ACCOUNT' + + + %= l 'USER_NAME' + + + %= $limit + + + %= $absolute + + + %= $current + + + %= l 'ACTION' + + + - %= hidden_field 'trt' => $quo_datas->{trt} + % foreach my $user (@$userAccounts) + % { + % my $uid = getpwnam( $user->key ); + % unless ($uid) { + % warn( $self->localise('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 ); + + %= t td => ( class => 'sme-border' ) => $user->key + %= t td => ( class => 'sme-border' ) => $name + %= 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", $bc / 1024 ) + + % my $modify_text = l('MODIFY'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $quota_user_name = $user->key; # quotas_entry name extracted from the data structure + % my $actionModify = qq{ + % + % + % + % }; + <%= $c->render_to_string( inline => $actionModify ) %> + + + % } + + + <% } %> +

    + + %= hidden_field 'trt' => $quo_datas->{trt}
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_quo_upd.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_quo_upd.html.ep index b4777e7..8c62cde 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_quo_upd.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_quo_upd.html.ep @@ -1,84 +1,84 @@
    - % my $btn = l('SAVE'); + % my $btn = l('SAVE'); - %= form_for '/quota2' => (method => 'POST') => begin -

    -

    - %=l 'quo_MODIFY_USER_TITLE' -

    -

    + %= form_for '/quota2' => ( method => 'POST' ) => begin +

    +

    + %= l 'quo_MODIFY_USER_TITLE' +

    +

    - % my $userid = $quo_datas->{user}; - % my $user = $quo_datas->{userRec}; - - % my $uid = getpwnam($user->key); - % unless ($uid) { - % warn(l('COULD_NOT_GET_UID'),$user->key); - % next; - % } + % my $userid = $quo_datas->{user}; + % my $user = $quo_datas->{userRec}; + + % my $uid = getpwnam( $user->key ); + % unless ($uid) { + % 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 $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 ); -

    - %=l 'quo_USER' - %= "$name (\"$userid\")" - %=l 'quo_CURRENTLY_HAS' - %= $ic - %=l 'quo_FILES' - %=l 'quo_OCCUPYING' - %= $c->toMB($bc) - %=l 'quo_MEGABYTES' -

    - -

    - %=l 'quo_INSTRUCTIONS' -

    +

    + %= l 'quo_USER' + %= "$name (\"$userid\")" + %= l 'quo_CURRENTLY_HAS' + %= $ic + %= l 'quo_FILES' + %= l 'quo_OCCUPYING' + %= $c->toMB($bc) + %= l 'quo_MEGABYTES' +

    -

    - - %=l 'quo_USER', class => 'label' - - %= $name, class => 'input' - -

    +

    + %= l 'quo_INSTRUCTIONS' +

    -

    - - %=l 'quo_LIMIT_WITH_GRACE', class => 'label' - - % param 'Soft' => $quo_datas->{softlim} unless param 'Soft'; - %= text_field 'Soft', class => 'input' - -

    +

    + + %= l 'quo_USER', class => 'label' + + %= $name, class => 'input' + +

    -

    - - %=l 'quo_ABS_LIMIT', class => 'label' - - % param 'Hard' => $quo_datas->{hardlim} unless param 'Hard'; - %= text_field 'Hard', class => 'input' - -

    +

    + + %= l 'quo_LIMIT_WITH_GRACE', class => 'label' + + % param 'Soft' => $quo_datas->{softlim} unless param 'Soft'; + %= text_field 'Soft', class => 'input' + +

    -

    -

    - %= submit_button "$btn", class => 'action' -

    +

    + + %= l 'quo_ABS_LIMIT', class => 'label' + + % param 'Hard' => $quo_datas->{hardlim} unless param 'Hard'; + %= text_field 'Hard', class => 'input' + +

    - %= hidden_field 'trt' => $quo_datas->{trt} - %= hidden_field 'user' => $quo_datas->{user} - - % end +

    +

    + %= submit_button "$btn", class => 'action' +

    -
    \ No newline at end of file + %= hidden_field 'trt' => $quo_datas->{trt} + %= hidden_field 'user' => $quo_datas->{user} + + % end + +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep index edfa6de..d6ebaf1 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep @@ -1,14 +1,14 @@ -

    - %=l 'rma_TITLE_PPTP' -


    - %=l 'rma_DESC_PPTP' -
    - - %=l 'rma_LABEL_PPTP' - - % param 'PptpSessions' => $c->get_pptp_sessions unless param 'PptpSessions'; - %= text_field 'PptpSessions' => $c->get_pptp_sessions(), class => 'input' - -

    +

    + %= l 'rma_TITLE_PPTP' +


    + %= l 'rma_DESC_PPTP' +
    + + %= l 'rma_LABEL_PPTP' + + % param 'PptpSessions' => $c->get_pptp_sessions unless param 'PptpSessions'; + %= text_field 'PptpSessions' => $c->get_pptp_sessions(), class => 'input' + +

    - \ No newline at end of file + diff --git a/root/usr/share/smanager/themes/default/templates/partials/_swt_theme.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_swt_theme.html.ep index 6033a19..b7c1dc0 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_swt_theme.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_swt_theme.html.ep @@ -1,14 +1,14 @@
    - + % my $btn = l('swt_THEME'); - %= form_for $c->url_for('swttheme') => (method => 'POST') => begin - % my $value = $c->session->{'CurrentTheme'}; - % $value = session 'CurrentTheme'; + %= form_for $c->url_for('swttheme') => ( method => 'POST' ) => begin + % my $value = $c->session->{'CurrentTheme'}; + % $value = session 'CurrentTheme'; - % param 'Theme' => $value unless param 'Theme'; - %= select_field 'Theme' => $c->theme_list(), class => 'input' - %= hidden_field 'From' => $c->tx->req->url - %= submit_button "$btn" - % end - + % param 'Theme' => $value unless param 'Theme'; + %= select_field 'Theme' => $c->theme_list(), class => 'input' + %= hidden_field 'From' => $c->tx->req->url + %= submit_button "$btn" + % end +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep index d13c0de..9366cf3 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep @@ -1,32 +1,32 @@ -% use SrvMngr qw( getNavigation simpleNavMerge ); -% my %nav1 = %{SrvMngr->getNavigation( $c->languages(), 'U' )}; -% my %nav2 = %{SrvMngr->getNavigation( $c->languages(), 'A', session('username') )}; -% my %nav = $c->session->{is_admin} ? %nav1 : %{SrvMngr->simpleNavMerge(\%nav1, \%nav2)}; +% use SrvMngr qw( getNavigation simpleNavMerge ); +% my %nav1 = %{ SrvMngr->getNavigation( $c->languages(), 'U' ) }; +% my %nav2 = %{ SrvMngr->getNavigation( $c->languages(), 'A', session('username') ) }; +% my %nav = $c->session->{is_admin} ? %nav1 : %{ SrvMngr->simpleNavMerge( \%nav1, \%nav2 ) }; -
    - Current User (<%= session 'username' %>) - +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep index a113cf8..caea9dc 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep @@ -1,28 +1,28 @@
    - % my $btn = l('REMOVE'); + % my $btn = l('REMOVE'); - %= form_for '/useraccountsd' => (method => 'POST') => begin -

    -

    - %=l 'usr_REMOVE_ACCOUNT_TITLE' -

    - -
    - %= $c->l('usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} ); -
    - %= $c->render_to_string(inline => $c->l('usr_REMOVE_DESC2')) -

    + %= form_for '/useraccountsd' => ( method => 'POST' ) => begin +

    +

    + %= l 'usr_REMOVE_ACCOUNT_TITLE' +

    -

    -
    - %= submit_button "$btn", class => 'action' -

    +
    + %= $c->l( 'usr_REMOVE_DESC', $usr_datas->{user}, $usr_datas->{name} ); +
    + %= $c->render_to_string( inline => $c->l('usr_REMOVE_DESC2') ) +

    - %= hidden_field 'trt' => $usr_datas->{trt} - %= hidden_field 'user' => $usr_datas->{user} - %= hidden_field 'name' => $usr_datas->{name} - - % end +

    +
    + %= submit_button "$btn", class => 'action' +

    + + %= hidden_field 'trt' => $usr_datas->{trt} + %= hidden_field 'user' => $usr_datas->{user} + %= hidden_field 'name' => $usr_datas->{name} + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep index 524c692..6c735c8 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep @@ -1,158 +1,158 @@
    - % my $btn = l('usr_ADD_USER'); + % my $btn = l('usr_ADD_USER'); - %= form_for '/useraccounts' => (method => 'POST') => begin + %= form_for '/useraccounts' => ( method => 'POST' ) => begin -

    -
    - %= submit_button "$btn", class => 'action' -

    +

    +
    + %= submit_button "$btn", class => 'action' +

    - % end + % end -

    - %= $c->render_to_string(inline => $c->l('usr_FIRSTPAGE_DESC')) -
    -

    - - % my $numUsers = @$users; - % if ($numUsers == 0){ - %=l 'usr_NO_USER_ACCOUNTS' - % } else { - - - - - - - - - - - % foreach my $user (@$users) { +

    + %= $c->render_to_string( inline => $c->l('usr_FIRSTPAGE_DESC') ) +
    +

    - % my $username = $user->key(); - % my $first = $user->prop('FirstName'); - % my $last = $user->prop('LastName'); - % my $lockable = $user->prop('Lockable') || 'yes'; - % my $removable = $user->prop('Removable') || 'yes'; - % my $fwd = (($user->prop('EmailForward') || 'local') =~ m/^forward|both$/) ? - % $user->prop('ForwardAddress') : ''; - % my $vpnaccess = $user->prop('VPNClientAccess') || 'no'; - % $vpnaccess = $vpnaccess eq 'yes' ? $c->l('YES') : $c->l('NO'); - % my $password_set = $user->prop('PasswordSet'); + % my $numUsers = @$users; + % if ($numUsers == 0){ + %= l 'usr_NO_USER_ACCOUNTS' + % } else { +
    - %=l 'ACCOUNT' - - %=l 'USER_NAME' - - %=l 'usr_VPN_CLIENT_ACCESS' - - %=l 'usr_FORWARDING_ADDRESS' - - %=l 'ACTION' -
    + + + + + + + + + + % foreach my $user (@$users) { + + % my $username = $user->key(); + % my $first = $user->prop('FirstName'); + % my $last = $user->prop('LastName'); + % my $lockable = $user->prop('Lockable') || 'yes'; + % my $removable = $user->prop('Removable') || 'yes'; + % my $fwd = (($user->prop('EmailForward') || 'local') =~ m/^forward|both$/) ? + % $user->prop('ForwardAddress') : ''; + % my $vpnaccess = $user->prop('VPNClientAccess') || 'no'; + % $vpnaccess = $vpnaccess eq 'yes' ? $c->l('YES') : $c->l('NO'); + % my $password_set = $user->prop('PasswordSet'); - %= t td => (class => 'sme-border') => $username - %= t td => (class => 'sme-border') => "$first $last" - %= t td => (class => 'sme-border') => $vpnaccess - %= t td => (class => 'sme-border') => $fwd - % my ($actionModify, $actionLock, $actionResetPw, $actionRemove,$actionroundcube) = ' '; - % 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') { - %$actionModify = qq{ - % - % - % - %}; - %$actionResetPw = qq{ - % - % - % - %}; - %} else { - %$actionModify = qq{ - % - % - % - %}; - %} - %if ($password_set ne 'yes') { - %$actionLock = l('ACCOUNT_LOCKED'); - %$actionResetPw = qq{ - % - % - % - %}; - %} elsif ($useraccounts_user_name ne 'admin') { - % my $lock_text = l('ACCOUNT LOCKED'); # Localized text - % my $csrf_token = "TOKEN"; # CSRF token for security - % my $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure - %$actionLock = qq{ - % - % - % - %}; - %$actionResetPw = qq{ - % - % - % - %}; - %} - %if ( $removable eq 'yes' ) { - % my $remove_text = l('REMOVE'); # Localized text - % my $csrf_token = "TOKEN"; # CSRF token for security - %$actionRemove = qq{ - % - % - % - %}; - %} - - % my $thisdomain = $c->req->url->to_abs->host; - % my $roundcube_text = l('Webmail'); # Localized text - % $csrf_token = "TOKEN"; # CSRF token for security - % $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure - % $actionroundcube = qq{ - % - % - % - %}; - - - % } - -
    + %= l 'ACCOUNT' + + %= l 'USER_NAME' + + %= l 'usr_VPN_CLIENT_ACCESS' + + %= l 'usr_FORWARDING_ADDRESS' + + %= l 'ACTION' +
    - <%= $c->render_to_string(inline => $actionModify) %> - <%= $c->render_to_string(inline => $actionResetPw) %> - <%= $c->render_to_string(inline => $actionLock) %> - <%= $c->render_to_string(inline => $actionRemove) %> - <%= $c->render_to_string(inline => $actionroundcube) %> -
    + %= t td => ( class => 'sme-border' ) => $username + %= t td => ( class => 'sme-border' ) => "$first $last" + %= t td => ( class => 'sme-border' ) => $vpnaccess + %= t td => ( class => 'sme-border' ) => $fwd + % my ( $actionModify, $actionLock, $actionResetPw, $actionRemove, $actionroundcube ) = ' '; + % 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') { + % $actionModify = qq{ + % + % + % + % }; + % $actionResetPw = qq{ + % + % + % + % }; + % } else { + % $actionModify = qq{ + % + % + % + % }; + % } + % if ($password_set ne 'yes') { + % $actionLock = l('ACCOUNT_LOCKED'); + % $actionResetPw = qq{ + % + % + % + % }; + % } elsif ($useraccounts_user_name ne 'admin') { + % my $lock_text = l('ACCOUNT LOCKED'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % my $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure + % $actionLock = qq{ + % + % + % + % }; + % $actionResetPw = qq{ + % + % + % + % }; + % } + % if ( $removable eq 'yes' ) { + % my $remove_text = l('REMOVE'); # Localized text + % my $csrf_token = "TOKEN"; # CSRF token for security + % $actionRemove = qq{ + % + % + % + % }; + % } - <%} %> + % my $thisdomain = $c->req->url->to_abs->host; + % my $roundcube_text = l('Webmail'); # Localized text + % $csrf_token = "TOKEN"; # CSRF token for security + % $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure + % $actionroundcube = qq{ + % + % + % + % }; + + <%= $c->render_to_string( inline => $actionModify ) %> + <%= $c->render_to_string( inline => $actionResetPw ) %> + <%= $c->render_to_string( inline => $actionLock ) %> + <%= $c->render_to_string( inline => $actionRemove ) %> + <%= $c->render_to_string( inline => $actionroundcube ) %> + + + % } + + - %= hidden_field 'trt' => $usr_datas->{trt} + <% } %> + + %= hidden_field 'trt' => $usr_datas->{trt}
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep index 07b6bba..5e191c0 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep @@ -1,28 +1,28 @@
    - % my $btn = l('usr_LOCK'); + % my $btn = l('usr_LOCK'); - %= form_for '/useraccountsd' => (method => 'POST') => begin -

    -

    - %=l 'usr_LOCK_ACCOUNT_TITLE' -

    - -
    - %= $c->l('usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} ); -
    - %= $c->render_to_string(inline => $c->l('usr_LOCK_DESC2')) -

    + %= form_for '/useraccountsd' => ( method => 'POST' ) => begin +

    +

    + %= l 'usr_LOCK_ACCOUNT_TITLE' +

    -

    -
    - %= submit_button "$btn", class => 'action' -

    +
    + %= $c->l( 'usr_LOCK_DESC', $usr_datas->{user}, $usr_datas->{name} ); +
    + %= $c->render_to_string( inline => $c->l('usr_LOCK_DESC2') ) +

    - %= hidden_field 'trt' => $usr_datas->{trt} - %= hidden_field 'user' => $usr_datas->{user} - %= hidden_field 'name' => $usr_datas->{name} - - % end +

    +
    + %= submit_button "$btn", class => 'action' +

    + + %= hidden_field 'trt' => $usr_datas->{trt} + %= hidden_field 'user' => $usr_datas->{user} + %= hidden_field 'name' => $usr_datas->{name} + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep index 4b8e125..63c3f68 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep @@ -1,52 +1,52 @@
    - % my $btn = l('SAVE'); + % my $btn = l('SAVE'); - %= form_for '/useraccountsd' => (method => 'POST') => begin -

    -

    - %=l 'RESET_PASSWORD_TITLE' -

    - -
    - %= $c->l('usr_RESET_DESC', $usr_datas->{user}, $usr_datas->{name} ); -
    - %= l 'usr_RESET_DESC2' -

    - -

    - % 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_PASSWORD_WIKI')) %> + %= form_for '/useraccountsd' => ( method => 'POST' ) => begin +

    +

    + %= l 'RESET_PASSWORD_TITLE' +

    + +
    + %= $c->l( 'usr_RESET_DESC', $usr_datas->{user}, $usr_datas->{name} ); +
    + %= l 'usr_RESET_DESC2' +

    + +

    + % 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_PASSWORD_WIKI') ) %>

    -

    - - %=l 'PASSWORD_NEW', class => 'label' - - %= password_field 'newPass', class => 'input', class=>'sme-password' - -

    +

    + + %= l 'PASSWORD_NEW', class => 'label' + + %= password_field 'newPass', class => 'input', class => 'sme-password' + +

    -

    - - %=l 'PASSWORD_VERIFY_NEW', class => 'label' - - %= password_field 'newPassVerify', class => 'input', class=>'sme-password' - -

    +

    + + %= l 'PASSWORD_VERIFY_NEW', class => 'label' + + %= password_field 'newPassVerify', class => 'input', class => 'sme-password' + +

    -

    -

    - %= submit_button "$btn", class => 'action' -

    +

    +

    + %= submit_button "$btn", class => 'action' +

    - %= hidden_field 'trt' => $usr_datas->{trt} - %= hidden_field 'user' => $usr_datas->{user} - %= hidden_field 'name' => $usr_datas->{name} - - % end + %= hidden_field 'trt' => $usr_datas->{trt} + %= hidden_field 'user' => $usr_datas->{user} + %= hidden_field 'name' => $usr_datas->{name} -
    \ No newline at end of file + % end + +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep index d12893a..3c326d9 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep @@ -1,53 +1,53 @@
    - % my $btn = l('SAVE'); + % my $btn = l('SAVE'); - %= form_for '/useraccountsd' => (method => 'POST') => begin -

    - %= l 'usr_SYSTEM_PASSWORD_DESCRIPTION' -

    - -

    - % 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_PASSWORD_WIKI')) %> + %= form_for '/useraccountsd' => ( method => 'POST' ) => begin +

    + %= l 'usr_SYSTEM_PASSWORD_DESCRIPTION' +

    + +

    + % 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_PASSWORD_WIKI') ) %>

    -

    - - %=l 'usr_CURRENT_SYSTEM_PASSWORD', class => 'label' - - %= password_field 'CurPass', class => 'input', class=>'sme-password' - -

    +

    + + %= l 'usr_CURRENT_SYSTEM_PASSWORD', class => 'label' + + %= password_field 'CurPass', class => 'input', class => 'sme-password' + +

    -

    - - %=l 'usr_NEW_SYSTEM_PASSWORD', class => 'label' - - %= password_field 'Pass', class => 'input', class=>'sme-password' - -

    +

    + + %= l 'usr_NEW_SYSTEM_PASSWORD', class => 'label' + + %= password_field 'Pass', class => 'input', class => 'sme-password' + +

    -

    - - %=l 'usr_NEW_SYSTEM_PASSWORD_VERIFY', class => 'label' - - %= password_field 'PassVerify', class => 'input', class=>'sme-password' - -

    +

    + + %= l 'usr_NEW_SYSTEM_PASSWORD_VERIFY', class => 'label' + + %= password_field 'PassVerify', class => 'input', class => 'sme-password' + +

    -

    -

    - %= submit_button "$btn", class => 'action' -

    +

    +

    + %= submit_button "$btn", class => 'action' +

    - %= hidden_field 'trt' => $usr_datas->{trt} - %= hidden_field 'user' => $usr_datas->{user} - %= hidden_field 'name' => $usr_datas->{name} - - % end + %= hidden_field 'trt' => $usr_datas->{trt} + %= hidden_field 'user' => $usr_datas->{user} + %= hidden_field 'name' => $usr_datas->{name} -
    \ No newline at end of file + % end + +
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep index 67d2de7..ca5eab4 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep @@ -1,185 +1,185 @@
    - % my $btn = l('ADD'); + % my $btn = l('ADD'); - %= form_for '/useraccountsd' => (method => 'POST') => begin -

    -

    - %=l 'usr_P2_TITLE' -

    -
    - %= $c->render_to_string(inline => l ('usr_CREATE_MODIFY_DESC')) -

    + %= form_for '/useraccountsd' => ( method => 'POST' ) => begin +

    +

    + %= l 'usr_P2_TITLE' +

    +
    + %= $c->render_to_string( inline => l('usr_CREATE_MODIFY_DESC') ) +

    -

    - - %=l 'usr_ACCOUNT_NAME' - - % if ( $usr_datas->{trt} eq 'ADD' ) { - % param 'user' => $usr_datas->{user} unless param 'user'; - %= text_field 'user', class => 'input' - % } else { - % $btn = l('SAVE'); - %= $usr_datas->{user}, class => 'data' - % } - -

    +

    + + %= l 'usr_ACCOUNT_NAME' + + % if ( $usr_datas->{trt} eq 'ADD' ) { + % param 'user' => $usr_datas->{user} unless param 'user'; + %= text_field 'user', class => 'input' + % } else { + % $btn = l('SAVE'); + %= $usr_datas->{user}, class => 'data' + % } + +

    -

    - - %=l 'usr_FIRSTNAME' - - % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName'; - %= text_field 'FirstName', class => 'input' - -

    -

    - - %=l 'usr_LASTNAME' - - % param 'LastName' => $usr_datas->{lastname} unless param 'LastName'; - %= text_field 'LastName', class => 'input' - -

    +

    + + %= l 'usr_FIRSTNAME' + + % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName'; + %= text_field 'FirstName', class => 'input' + +

    +

    + + %= l 'usr_LASTNAME' + + % param 'LastName' => $usr_datas->{lastname} unless param 'LastName'; + %= text_field 'LastName', class => 'input' + +

    -

    - - %=l 'usr_DEPARTMENT' - - % param 'Dept' => $usr_datas->{dept} unless param 'Dept'; - %= text_field 'Dept', class => 'input' - -

    -

    - - %=l 'usr_COMPANY' - - % param 'Company' => $usr_datas->{company} unless param 'Company'; - %= text_field 'Company', class => 'input' - -

    -

    - - %=l 'usr_STREET_ADDRESS' - - % param 'Street' => $usr_datas->{street} unless param 'Street'; - %= text_field 'Street', class => 'input' - -

    -

    - - %=l 'usr_CITY' - - % param 'City' => $usr_datas->{city} unless param 'City'; - %= text_field 'City', class => 'input' - -

    -

    - - %=l 'usr_PHONE_NUMBER' - - % param 'Phone' => $usr_datas->{phone} unless param 'Phone'; - %= text_field 'Phone', class => 'input' - -

    -

    - - %=l 'usr_EMAIL_DELIVERY' - - % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; - %= select_field 'EmailForward' => $c->emailForward_list(), class => 'input' - -

    -

    - - %=l 'usr_FORWARDING_ADDRESS' - - % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress'; - %= text_field 'ForwardAddress', class => 'input' - -

    +

    + + %= l 'usr_DEPARTMENT' + + % param 'Dept' => $usr_datas->{dept} unless param 'Dept'; + %= text_field 'Dept', class => 'input' + +

    +

    + + %= l 'usr_COMPANY' + + % param 'Company' => $usr_datas->{company} unless param 'Company'; + %= text_field 'Company', class => 'input' + +

    +

    + + %= l 'usr_STREET_ADDRESS' + + % param 'Street' => $usr_datas->{street} unless param 'Street'; + %= text_field 'Street', class => 'input' + +

    +

    + + %= l 'usr_CITY' + + % param 'City' => $usr_datas->{city} unless param 'City'; + %= text_field 'City', class => 'input' + +

    +

    + + %= l 'usr_PHONE_NUMBER' + + % param 'Phone' => $usr_datas->{phone} unless param 'Phone'; + %= text_field 'Phone', class => 'input' + +

    +

    + + %= l 'usr_EMAIL_DELIVERY' + + % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; + %= select_field 'EmailForward' => $c->emailForward_list(), class => 'input' + +

    +

    + + %= l 'usr_FORWARDING_ADDRESS' + + % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress'; + %= text_field 'ForwardAddress', class => 'input' + +

    -

    - - %=l 'usr_VPN_CLIENT_ACCESS' - - % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess'; - %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => 'input' - -

    +

    + + %= l 'usr_VPN_CLIENT_ACCESS' + + % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess'; + %= select_field 'VPNClientAccess' => [ [ ( l 'NO' ) => 'no' ], [ ( l 'YES' ) => 'yes' ] ], class => 'input'; + +

    - % if ( $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) { - % my $btn2 = $c->l('DOWNLOAD'); - %= form_for '/useraccountso' => (method => 'POST') => begin -

    - - %=l 'usr_LABEL_IPSECRW_DOWNLOAD' - - %= submit_button $btn2, class => 'action' - -

    - %= hidden_field 'trt' => 'CRT' - %= hidden_field 'user' => $usr_datas->{user} - %end - % } - - % my @groups = @{$c->get_groups()}; - % if ( @groups ) { -

    - - %=l 'usr_GROUP_MEMBERSHIPS' - - - - - - - % foreach my $g ( @groups) { - % my $user = $usr_datas->{user}; - % my $groupname = $g->key(); - % my $description = $g->prop('Description'); - % my $checked = ''; - % if ( $user and $c->is_user_in_group($user, $groupname) ) { - % $checked = 'checked'; - % } - - - - - %= t td => (class => 'sme-border') => $groupname - %= t td => (class => 'sme-border') => "$description" - - % } - -
    - %=l 'usr_MEMBER' - - %=l 'GROUP' - - %=l 'DESCRIPTION' -
    - % if ( $checked eq 'checked' ) { - - - %} else { - %= check_box 'groupMemberships' => $groupname - %} -
    -     -

    - % } - -

    -

    - %= submit_button $btn, class => 'action' -

    - - %= hidden_field 'trt' => $usr_datas->{trt} - % if ( $usr_datas->{trt} eq 'UPD' ) { - %= hidden_field 'user' => $usr_datas->{user} - % } - + % if ( $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) { + % my $btn2 = $c->l('DOWNLOAD'); + %= form_for '/useraccountso' => ( method => 'POST' ) => begin +

    + + %= l 'usr_LABEL_IPSECRW_DOWNLOAD' + + %= submit_button $btn2, class => 'action' + +

    + %= hidden_field 'trt' => 'CRT' + %= hidden_field 'user' => $usr_datas->{user} % end + % } + + % my @groups = @{ $c->get_groups() }; + % if ( @groups ) { +

    + + %= l 'usr_GROUP_MEMBERSHIPS' + + + + + + + % foreach my $g ( @groups) { + % my $user = $usr_datas->{user}; + % my $groupname = $g->key(); + % my $description = $g->prop('Description'); + % my $checked = ''; + % if ( $user and $c->is_user_in_group($user, $groupname) ) { + % $checked = 'checked'; + % } + + + + + %= t td => ( class => 'sme-border' ) => $groupname + %= t td => ( class => 'sme-border' ) => "$description" + + % } + +
    + %= l 'usr_MEMBER' + + %= l 'GROUP' + + %= l 'DESCRIPTION' +
    + % if ( $checked eq 'checked' ) { + + + % } else { + %= check_box 'groupMemberships' => $groupname + % } +
    +     +

    + % } + +

    +

    + %= submit_button $btn, class => 'action' +

    + + %= hidden_field 'trt' => $usr_datas->{trt} + % if ( $usr_datas->{trt} eq 'UPD' ) { + %= hidden_field 'user' => $usr_datas->{user} + % } + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep index 40f60ab..1b84407 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep @@ -1,89 +1,89 @@
    - % my $btn = l('SAVE'); + % my $btn = l('SAVE'); - %= form_for '/useraccountsd' => (method => 'POST') => begin -

    -

    - %=l 'usr_MODIFY_ADMIN_TITLE' -


    -

    + %= form_for '/useraccountsd' => ( method => 'POST' ) => begin +

    +

    + %= l 'usr_MODIFY_ADMIN_TITLE' +


    +

    -

    - - %=l 'usr_ACCOUNT_NAME' - - % $btn = l('SAVE'); - %= $usr_datas->{user}, class => 'data' - -

    +

    + + %= l 'usr_ACCOUNT_NAME' + + % $btn = l('SAVE'); + %= $usr_datas->{user}, class => 'data' + +

    -

    - - %=l 'usr_FIRSTNAME' - - % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName'; - %= text_field 'FirstName', class => 'input' - -

    -

    - - %=l 'usr_LASTNAME' - - % param 'LastName' => $usr_datas->{lastname} unless param 'LastName'; - %= text_field 'LastName', class => 'input' - -

    +

    + + %= l 'usr_FIRSTNAME' + + % param 'FirstName' => $usr_datas->{firstname} unless param 'FirstName'; + %= text_field 'FirstName', class => 'input' + +

    +

    + + %= l 'usr_LASTNAME' + + % param 'LastName' => $usr_datas->{lastname} unless param 'LastName'; + %= text_field 'LastName', class => 'input' + +

    -

    - - %=l 'usr_EMAIL_DELIVERY' - - % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; - %= select_field 'EmailForward' => $c->emailForward_list(), class => 'input' - -

    -

    - - %=l 'usr_FORWARDING_ADDRESS' - - % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress'; - %= text_field 'ForwardAddress', class => 'input' - -

    +

    + + %= l 'usr_EMAIL_DELIVERY' + + % param 'EmailForward' => $usr_datas->{emailforward} unless param 'EmailForward'; + %= select_field 'EmailForward' => $c->emailForward_list(), class => 'input' + +

    +

    + + %= l 'usr_FORWARDING_ADDRESS' + + % param 'ForwardAddress' => $usr_datas->{forwardaddress} unless param 'ForwardAddress'; + %= text_field 'ForwardAddress', class => 'input' + +

    -

    - - %=l 'usr_VPN_CLIENT_ACCESS' - - % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess'; - %= select_field 'VPNClientAccess' => [[ (l 'NO') => 'no'], [ (l 'YES') => 'yes']], class => 'input' - -

    +

    + + %= l 'usr_VPN_CLIENT_ACCESS' + + % param 'VPNClientAccess' => $usr_datas->{vpnclientaccess} unless param 'VPNClientAccess'; + %= select_field 'VPNClientAccess' => [ [ ( l 'NO' ) => 'no' ], [ ( l 'YES' ) => 'yes' ] ], class => 'input'; + +

    - % if ( $c->ipsec_for_acct eq 'OK' ) { - % my $btn2 = $c->l('DOWNLOAD'); - %= form_for '/useraccountso' => (method => 'POST') => begin -

    - - %=l 'usr_LABEL_IPSECRW_DOWNLOAD' - - %= submit_button $btn2, class => 'action' - -

    - %= hidden_field 'trt' => 'CRT' + % if ( $c->ipsec_for_acct eq 'OK' ) { + % my $btn2 = $c->l('DOWNLOAD'); + %= form_for '/useraccountso' => ( method => 'POST' ) => begin +

    + + %= l 'usr_LABEL_IPSECRW_DOWNLOAD' + + %= submit_button $btn2, class => 'action' + +

    + %= hidden_field 'trt' => 'CRT' %= hidden_field 'user' => $usr_datas->{user} - %end - % } + % end + % } -

    -
    - %= submit_button $btn, class => 'action' -

    +

    +
    + %= submit_button $btn, class => 'action' +

    - %= hidden_field 'trt' => $usr_datas->{trt} - %= hidden_field 'user' => $usr_datas->{user} - - % end + %= hidden_field 'trt' => $usr_datas->{trt} + %= hidden_field 'user' => $usr_datas->{user} + + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/portforwarding.html.ep b/root/usr/share/smanager/themes/default/templates/portforwarding.html.ep index 1f2116b..524bb49 100644 --- a/root/usr/share/smanager/themes/default/templates/portforwarding.html.ep +++ b/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 -
    +
    % if (config->{debug} == 1) { -

    - %= dumper "".$c->current_route - %= dumper $c->stash("ret") - %= dumper $c->stash("portforwarding") - % my $ref = $pf_datas->{portforwarding}; - %= dumper $ref->{TCP}->[0]."" -

    +

    + %= dumper "" . $c->current_route + %= dumper $c->stash("ret") + %= dumper $c->stash("portforwarding") + % my $ref = $pf_datas->{portforwarding}; + %= dumper $ref->{TCP}->[0] . "" +

    % } - -

    <%= $title%>

    - %= $modul - % if ($pf_datas->{trt} eq 'ADD') { - %= include 'partials/_pf_add' - %} elsif ($pf_datas->{trt} eq 'ADD1') { - %= include 'partials/_pf_add' - %} elsif ($pf_datas->{trt} eq 'DEL') { - %= include 'partials/_pf_del' - %} elsif ($pf_datas->{trt} eq 'DEL1'){ - %= include 'partials/_pf_list' - %} else { - %= include 'partials/_pf_list' - %} +

    <%= $title %>

    + %= $modul + + % if ($pf_datas->{trt} eq 'ADD') { + %= include 'partials/_pf_add' + % } elsif ($pf_datas->{trt} eq 'ADD1') { + %= include 'partials/_pf_add' + % } elsif ($pf_datas->{trt} eq 'DEL') { + %= include 'partials/_pf_del' + % } elsif ($pf_datas->{trt} eq 'DEL1'){ + %= include 'partials/_pf_list' + % } else { + %= include 'partials/_pf_list' + % }
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/printers.html.ep b/root/usr/share/smanager/themes/default/templates/printers.html.ep index a171cd0..35986e0 100644 --- a/root/usr/share/smanager/themes/default/templates/printers.html.ep +++ b/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 -
    +
    - %if (config->{debug} == 1) { -

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

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

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

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

    <%= $title%>

    +

    <%= $title %>

    - % if ($prt_datas->{trt} eq 'ADD') { - %= include 'partials/_prt_add' - %} elsif ($prt_datas->{trt} eq 'DEL') { - %= include 'partials/_prt_del' - %} elsif ($prt_datas->{trt} eq 'NET') { - %= include 'partials/_prt_net' - %} else { - %= include 'partials/_prt_list' - %} + % if ($prt_datas->{trt} eq 'ADD') { + %= include 'partials/_prt_add' + % } elsif ($prt_datas->{trt} eq 'DEL') { + %= include 'partials/_prt_del' + % } elsif ($prt_datas->{trt} eq 'NET') { + %= include 'partials/_prt_net' + % } else { + %= include 'partials/_prt_list' + % }
    -%end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/proxy.html.ep b/root/usr/share/smanager/themes/default/templates/proxy.html.ep index 321ca15..7d84fb1 100644 --- a/root/usr/share/smanager/themes/default/templates/proxy.html.ep +++ b/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 -
    - %if (config->{debug} == 1) { -

    (DBG)route: <%= $c->current_route %>
    - (DBG)ht stat: <%= $prx_datas->{http_proxy_status}%>
    - (DBG)sm stat: <%=$prx_datas->{smtp_proxy_status} %> -

    - %} -

    <%= $title %>

    -
    - <%= $modul %> - <% my $btn = l('SAVE'); %> +
    + % if (config->{debug} == 1) { +

    (DBG)route: <%= $c->current_route %>
    + (DBG)ht stat: <%= $prx_datas->{http_proxy_status} %>
    + (DBG)sm stat: <%= $prx_datas->{smtp_proxy_status} %> +

    + % } +

    <%= $title %>

    +
    + <%= $modul %> + <% my $btn = l('SAVE'); %> - %= form_for 'proxy' => (method => 'POST') => begin -

    - %=l 'prx_HTTP_PROXY_STATUS_DESCRIPTION' -

    - - %=l 'prx_HTTP_PROXY_STATUS_LABEL' - - % 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' - -

    - %if ( $prx_datas->{smtp_proxy_status} ) { -

    - %=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION' -

    - - %=l 'prx_SMTP_PROXY_STATUS_LABEL' - - % 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} -

    -     -

    - %} - %= submit_button "$btn", class => 'action' - % end + %= form_for 'proxy' => ( method => 'POST' ) => begin +

    + %= l 'prx_HTTP_PROXY_STATUS_DESCRIPTION' +

    + + %= l 'prx_HTTP_PROXY_STATUS_LABEL' + + % 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'; + +

    + % if ( $prx_datas->{smtp_proxy_status} ) { +

    + %= l 'prx_SMTP_PROXY_STATUS_DESCRIPTION' +

    + + %= l 'prx_SMTP_PROXY_STATUS_LABEL' + + % 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}; +

    +     +

    + % } + %= submit_button "$btn", class => 'action' + % end
    -%end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/pseudonyms.html.ep b/root/usr/share/smanager/themes/default/templates/pseudonyms.html.ep index fc9f8e4..ac76ec5 100644 --- a/root/usr/share/smanager/themes/default/templates/pseudonyms.html.ep +++ b/root/usr/share/smanager/themes/default/templates/pseudonyms.html.ep @@ -1,32 +1,32 @@ % layout 'default', title => "Sme server 2 - pseudonyms"; % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

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

    <%= $title%>

    + % if ( stash 'error' ) { +
    + %= $c->render_to_string( inline => stash 'error' ) +
    + % } - % if ($pse_datas->{trt} eq 'ADD') { - %= include 'partials/_pse_add' - %} elsif ($pse_datas->{trt} eq 'DEL') { - %= include 'partials/_pse_del' - %} elsif ($pse_datas->{trt} eq 'UPD') { - %= include 'partials/_pse_upd' - %} else { - %= include 'partials/_pse_list' - %} +

    <%= $title %>

    + + % if ($pse_datas->{trt} eq 'ADD') { + %= include 'partials/_pse_add' + % } elsif ($pse_datas->{trt} eq 'DEL') { + %= include 'partials/_pse_del' + % } elsif ($pse_datas->{trt} eq 'UPD') { + %= include 'partials/_pse_upd' + % } else { + %= include 'partials/_pse_list' + % }
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/qmailanalog.html.ep b/root/usr/share/smanager/themes/default/templates/qmailanalog.html.ep index 539d2c2..58a029d 100644 --- a/root/usr/share/smanager/themes/default/templates/qmailanalog.html.ep +++ b/root/usr/share/smanager/themes/default/templates/qmailanalog.html.ep @@ -1,43 +1,43 @@ % layout 'default', title => "Sme server 2 - qmailanalog"; % content_for 'module' => begin -
    - %if (config->{debug} == 1) { -

    - (DBG)route: <%= $c->current_route %>
    -

    - %} -

    <%= $title %>

    -
    - <%= $modul %> - <% my $btn = l('qma_GENERATE_REPORT'); %> - %= form_for 'qmailanalog' => (method => 'POST') => begin -

    - - %=l 'qma_REPORT_TYPE' - - - %= select_field 'report_type' => $c->reportType_list(), id => 'analysis_type' - -

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

    + (DBG)route: <%= $c->current_route %>
    +

    + % } +

    <%= $title %>

    +
    + <%= $modul %> + <% my $btn = l('qma_GENERATE_REPORT'); %> + %= form_for 'qmailanalog' => ( method => 'POST' ) => begin +

    + + %= l 'qma_REPORT_TYPE' + + + %= select_field 'report_type' => $c->reportType_list(), id => 'analysis_type' + +

    - -
    - - %= label_for message_id => 'Message ID:' - - %= text_field 'message_id', placeholder => 'Enter Postfix Message ID', id => 'message_id_group' - -
    + +
    + + %= label_for message_id => 'Message ID:' + + %= text_field 'message_id', placeholder => 'Enter Postfix Message ID', id => 'message_id_group' + +
    -
    - - %= label_for email_address => 'Email Address:' - - %= email_field 'email_address', placeholder => 'Enter email address', id => 'email_address_group' - -
    +
    + + %= label_for email_address => 'Email Address:' + + %= email_field 'email_address', placeholder => 'Enter email address', id => 'email_address_group'; + +
    - %= submit_button "$btn", class => 'action' - % end + %= submit_button "$btn", class => 'action' + % end
    -%end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/quota.html.ep b/root/usr/share/smanager/themes/default/templates/quota.html.ep index 5f3779a..d542a63 100644 --- a/root/usr/share/smanager/themes/default/templates/quota.html.ep +++ b/root/usr/share/smanager/themes/default/templates/quota.html.ep @@ -1,29 +1,29 @@ % layout 'default', title => "Sme server 2 - quota"; % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

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

    <%= $title%>

    +

    <%= $title %>

    - % if ($quo_datas->{trt} eq 'UPD') { - %= include 'partials/_quo_upd' - %} else { - %= include 'partials/_quo_list' - %} + % if ($quo_datas->{trt} eq 'UPD') { + %= include 'partials/_quo_upd' + % } else { + %= include 'partials/_quo_list' + % }
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/reboot.html.ep b/root/usr/share/smanager/themes/default/templates/reboot.html.ep index 595265c..bf10843 100644 --- a/root/usr/share/smanager/themes/default/templates/reboot.html.ep +++ b/root/usr/share/smanager/themes/default/templates/reboot.html.ep @@ -2,39 +2,39 @@ % content_for 'module' => begin -
    +
    - %if (config->{debug} == 1) { -

    - (DBG)route: <%= $c->current_route %>
    -

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

    + (DBG)route: <%= $c->current_route %>
    +

    + % } -

    <%= $title %>

    -
    +

    <%= $title %>

    +
    - %= $modul + %= $modul - <% my $btn = l('PERFORM'); %> - %= form_for 'reboot' => (method => 'POST') => begin + <% my $btn = l('PERFORM'); %> + %= form_for 'reboot' => ( method => 'POST' ) => begin -

    - %= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION')) -

    +

    + %= $c->render_to_string( inline => $c->l('rbo_DESCRIPTION') ) +

    - - %=l 'rbo_LABEL_REBOOT' - - - %= select_field 'function' => $c->rebootFunction_list() - -


    + + %= l 'rbo_LABEL_REBOOT' + + + %= select_field 'function' => $c->rebootFunction_list() + +


    - %= submit_button "$btn", class => 'action' + %= submit_button "$btn", class => 'action' - % end + % end - %= hidden_field 'debug' => '0' + %= hidden_field 'debug' => '1'
    -%end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep b/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep index 529debd..c954c8d 100644 --- a/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep +++ b/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep @@ -1,214 +1,214 @@ % layout 'default', title => "Sme server 2 - remoteaccess"; % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

    % } -

    <%= $title%>

    - % if ( $notif ) { -
    - - <%= $c->render_to_string(inline => $notif) %> - - %} +

    <%= $title %>

    + % if ( $notif ) { +
    + + <%= $c->render_to_string( inline => $notif ) %> + + % } - + - <% my $btn = l('SAVE'); %> + <% my $btn = l('SAVE'); %> - %= form_for 'remoteaccess' => (method => 'POST') => begin + %= form_for 'remoteaccess' => ( method => 'POST' ) => begin % my $ipsec = $c->get_ipsecrw_status(); % if ( $ipsec ) { -

    -

    - %=l 'rma_TITLE_IPSECRW' -


    +

    +

    + %= l 'rma_TITLE_IPSECRW' +


    - %=l 'rma_DESC_IPSECRW' -
    + %= l 'rma_DESC_IPSECRW' +
    - - %=l 'rma_LABEL_IPSECRW_SESS' - - % param 'IpsecrwSess' => $c->get_ipsecrw_sessions unless param 'IpsecrwSess'; - %= text_field 'IpsecrwSess', class => 'input' - -
    + + %= l 'rma_LABEL_IPSECRW_SESS' + + % param 'IpsecrwSess' => $c->get_ipsecrw_sessions unless param 'IpsecrwSess'; + %= text_field 'IpsecrwSess', class => 'input' + +
    - %= $c->render_to_string(inline => $c->l('rma_DESC_IPSECRW_RESET')); -
    - - %=l 'rma_LABEL_IPSECRW_RESET' - - %= check_box 'IpsecrwReset',class => 'input' - -

    + %= $c->render_to_string( inline => $c->l('rma_DESC_IPSECRW_RESET') ); +
    + + %= l 'rma_LABEL_IPSECRW_RESET' + + %= check_box 'IpsecrwReset', class => 'input' + +

    - + - %} + % } - + -

    - %= $c->l('rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT')); -


    - %=l 'rma_VALIDFROM_DESC' -

    +

    + %= $c->l( 'rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT') ); +


    + %= l 'rma_VALIDFROM_DESC' +

    % my @vals = $self->_get_valid_from(); % if (@vals) { - - - +
    - %=l 'NETWORK' - - %=l 'SUBNET_MASK' - - %=l 'NUM_OF_HOSTS' - - %=l 'REMOVE' -
    + + - % foreach my $val ( @vals ) - % { - % my ($net, $mask) = split '/', $val; - % $mask = '255.255.255.255' unless ($mask); - % my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask); + % foreach my $val (@vals) + % { + % my ( $net, $mask ) = split '/', $val; + % $mask = '255.255.255.255' unless ($mask); + % my ( $numhosts, $a, $b ) = esmith::util::computeHostRange( $net, $mask ); - %= t td => (class => 'sme-border') => $net - %= t td => (class => 'sme-border') => $mask - %= t td => (class => 'sme-border') => $numhosts - - - % } + %= t td => ( class => 'sme-border' ) => $net + %= t td => ( class => 'sme-border' ) => $mask + %= t td => ( class => 'sme-border' ) => $numhosts + + + % } - -
    + %= l 'NETWORK' + + %= l 'SUBNET_MASK' + + %= l 'NUM_OF_HOSTS' + + %= l 'REMOVE' +
    '>
    '>
    + + - - % } else { -
    - %= l('rma_NO_ENTRIES_YET'); - - %} - %=l 'rma_DESC_VALID_FROM_ENTRIES' -

    - - %=l 'NETWORK' - - %= text_field 'ValidFromNetwork', class => 'input' - -
    - - %=l 'rma_SUBNET_MASK' - - %= text_field 'ValidFromMask', class => 'input' - + +% } else { +
    + %= l('rma_NO_ENTRIES_YET'); + +% } +%= l 'rma_DESC_VALID_FROM_ENTRIES' +

    + + %= l 'NETWORK' + + %= text_field 'ValidFromNetwork', class => 'input' + +
    + + %= l 'rma_SUBNET_MASK' + + %= text_field 'ValidFromMask', class => 'input' + - + -

    - %=l 'rma_TITLE_SSH' -


    - %=l 'rma_DESC_SSH' -

    - - %=l 'rma_LABEL_SSH' - - % param 'SshAccess' => $c->get_ssh_access() unless param 'SshAccess'; - %= select_field 'SshAccess' => $c->networkAccess_list(), class => 'input' - -
    - - - %=l 'rma_LABEL_SSH_ADMIN' - - % param 'SshPermitRootLogin' => $rma_datas->{sshPermitRootLogin} unless param 'SshPermitRootLogin'; - %= select_field 'SshPermitRootLogin' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => 'input' - -
    +

    + %= l 'rma_TITLE_SSH' +


    +%= l 'rma_DESC_SSH' +

    + + %= l 'rma_LABEL_SSH' + + % param 'SshAccess' => $c->get_ssh_access() unless param 'SshAccess'; + %= select_field 'SshAccess' => $c->networkAccess_list(), class => 'input' + +
    - - %=l 'rma_LABEL_SSH_PASSWORD_ACCESS' - - % param 'SshPasswordAuthentication' => $c->get_ssh_password_auth() unless param 'SshPasswordAuthentication'; - %= select_field 'SshPasswordAuthentication' => [[(l 'NO'), 'no'], [(l 'YES'), 'yes']], class => 'input' - -
    + + %= l 'rma_LABEL_SSH_ADMIN' + + % param 'SshPermitRootLogin' => $rma_datas->{sshPermitRootLogin} unless param 'SshPermitRootLogin'; + %= select_field 'SshPermitRootLogin' => [ [ ( l 'NO' ), 'no' ], [ ( l 'YES' ), 'yes' ] ], class => 'input'; + +
    - - %=l 'rma_LABEL_SSH_PORT' - - % param 'SshTCPPort' => $c->get_ssh_port() unless param 'SshTCPPort'; - %= text_field 'SshTCPPort', class => 'input' - -
    + + %= l 'rma_LABEL_SSH_PASSWORD_ACCESS' + + % param 'SshPasswordAuthentication' => $c->get_ssh_password_auth() unless param 'SshPasswordAuthentication'; + %= select_field 'SshPasswordAuthentication' => [ [ ( l 'NO' ), 'no' ], [ ( l 'YES' ), 'yes' ] ], class => 'input'; + +
    - + + %= l 'rma_LABEL_SSH_PORT' + + % param 'SshTCPPort' => $c->get_ssh_port() unless param 'SshTCPPort'; + %= text_field 'SshTCPPort', class => 'input' + +
    -

    - %=l 'rma_TITLE_FTP_ACCESS' -


    - %= $c->render_to_string(inline => $c->l('rma_DESC_FTP_ACCESS')); + -
    - - %=l 'rma_LABEL_FTP_ACCESS' - - % param 'FtpAccess' => $c->get_ftp_access() unless param 'FtpAccess'; - %= select_field 'FtpAccess' => $c->networkAccess_list(), class => 'input' - -
    +

    + %= l 'rma_TITLE_FTP_ACCESS' +


    +%= $c->render_to_string( inline => $c->l('rma_DESC_FTP_ACCESS') ); -
    - %= $c->render_to_string(inline => $c->l('rma_DESC_FTP_LOGIN')); -
    - - %=l 'rma_LABEL_FTP_LOGIN' - - % param 'FtpPasswordAccess' => $c->get_ftp_password_login_access() unless param 'FtpPasswordAccess'; - %= select_field 'FtpPasswordAccess' => $c->passwordLogin_list(), class => 'input' - -
    +
    + + %= l 'rma_LABEL_FTP_ACCESS' + + % param 'FtpAccess' => $c->get_ftp_access() unless param 'FtpAccess'; + %= select_field 'FtpAccess' => $c->networkAccess_list(), class => 'input' + +
    - % my $mode = $c->get_telnet_mode(); - % if ( $mode ne 'off') { - +
    +%= $c->render_to_string( inline => $c->l('rma_DESC_FTP_LOGIN') ); +
    + + %= l 'rma_LABEL_FTP_LOGIN' + + % param 'FtpPasswordAccess' => $c->get_ftp_password_login_access() unless param 'FtpPasswordAccess'; + %= select_field 'FtpPasswordAccess' => $c->passwordLogin_list(), class => 'input' + +
    -

    - %=l 'rma_TITLE_TELNET_ACCESS' -


    +% my $mode = $c->get_telnet_mode(); +% if ( $mode ne 'off') { + - - %=l 'rma_DESC_TELNET_ACCESS' - -

    +

    + %= l 'rma_TITLE_TELNET_ACCESS' +


    - - %=l 'rma_LABEL_TELNET_ACCESS' - - % param 'TelnetAccess' => $mode unless param 'TelnetAccess'; - %= select_field 'TelnetAccess' => $c->networkAccess_list(), class => 'input' - -
    + + %= l 'rma_DESC_TELNET_ACCESS' + +

    - %} + + %= l 'rma_LABEL_TELNET_ACCESS' + + % param 'TelnetAccess' => $mode unless param 'TelnetAccess'; + %= select_field 'TelnetAccess' => $c->networkAccess_list(), class => 'input' + +
    -
    - %= submit_button "$btn", class => 'action' +% } - % end +
    +%= submit_button "$btn", class => 'action' + +% end
    -% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/review.html.ep b/root/usr/share/smanager/themes/default/templates/review.html.ep index efedf62..e30ffaa 100644 --- a/root/usr/share/smanager/themes/default/templates/review.html.ep +++ b/root/usr/share/smanager/themes/default/templates/review.html.ep @@ -1,137 +1,137 @@ % layout 'default', title => 'Sme server 2 - Review'; % content_for 'module' => begin -
    +

    <%= $title %>

    <%= $modul %>

    %= form_for 'review' => begin - - %=l 'rvw_NETWORKING_PARAMS' -
    - -

    - %=l 'rvw_SERVER_MODE' - - %= $rvw_datas->{servermode} -

    - -

    - %=l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK' - - %= $rvw_datas->{localip} -

    - - % if ( $rvw_datas->{publicip} ) { -

    - %=l 'rvw_INTERNET_VISIBLE_ADDRESS' - - %= $rvw_datas->{publicip} -

    - % } - -

    - %=l 'rvw_GATEWAY' - - %= $rvw_datas->{gateway} - %= $rvw_datas->{serveronly} -

    - -

    - %=l 'rvw_ADDITIONAL_LOCAL_NETWORKS' - - %= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} ); -
    -

    - -

    - - %=l 'rvw_DHCP_SERVER' - - - %= $rvw_datas->{dhcpserver} - -

    + + %= l 'rvw_NETWORKING_PARAMS' +
    -

    - %=l 'rvw_SERVER_NAMES' -
    - -

    - %=l 'rvw_DNS_SERVER' - - %= $rvw_datas->{dnsserver} -

    - -

    - %=l 'rvw_WEB_SERVER' - - %= $rvw_datas->{webserver} -

    - -

    - %=l 'rvw_PROXY_SERVER' - - %= $rvw_datas->{proxyserver} -

    - -

    - %=l 'rvw_FTP_SERVER' - - %= $rvw_datas->{ftpserver} -

    +

    + %= l 'rvw_SERVER_MODE' + + %= $rvw_datas->{servermode} +

    -

    - %=l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS' - - %= $rvw_datas->{smtpserver} -

    +

    + %= l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK' + + %= $rvw_datas->{localip} +

    -

    - %=l 'rvw_DOMAIN_INFORMATION' -
    - -

    - %=l 'rvw_PRIMARY_DOMAIN' - - %= $rvw_datas->{domainname} -

    - - -

    - %=l 'rvw_VIRTUAL_DOMAINS' - - - %= $rvw_datas->{virtualdomains} -

    - - -

    - %=l 'rvw_PRIMARY_WEB_SITE' - - %= $rvw_datas->{primarywebsite} -

    - -

    - %=l 'rvw_SERVER_MANAGER' - - %= $rvw_datas->{servermanager} -

    - -

    - %=l 'rvw_USER_PASSWORD_PANEL' - - %= $rvw_datas->{usermanager} -

    - -

    - %=l 'rvw_EMAIL_ADDRESSES' - - %= $rvw_datas->{emailaddresses} -

    + % if ( $rvw_datas->{publicip} ) { +

    + %= l 'rvw_INTERNET_VISIBLE_ADDRESS' + + %= $rvw_datas->{publicip} +

    + % } - % end +

    + %= l 'rvw_GATEWAY' + + %= $rvw_datas->{gateway} + %= $rvw_datas->{serveronly} +

    + +

    + %= l 'rvw_ADDITIONAL_LOCAL_NETWORKS' + + %= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} ); +
    +

    + +

    + + %= l 'rvw_DHCP_SERVER' + + + %= $rvw_datas->{dhcpserver} + +

    + +

    + %= l 'rvw_SERVER_NAMES' +
    + +

    + %= l 'rvw_DNS_SERVER' + + %= $rvw_datas->{dnsserver} +

    + +

    + %= l 'rvw_WEB_SERVER' + + %= $rvw_datas->{webserver} +

    + +

    + %= l 'rvw_PROXY_SERVER' + + %= $rvw_datas->{proxyserver} +

    + +

    + %= l 'rvw_FTP_SERVER' + + %= $rvw_datas->{ftpserver} +

    + +

    + %= l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS' + + %= $rvw_datas->{smtpserver} +

    + +

    + %= l 'rvw_DOMAIN_INFORMATION' +
    + +

    + %= l 'rvw_PRIMARY_DOMAIN' + + %= $rvw_datas->{domainname} +

    + + +

    + %= l 'rvw_VIRTUAL_DOMAINS' + + + %= $rvw_datas->{virtualdomains} +

    + + +

    + %= l 'rvw_PRIMARY_WEB_SITE' + + %= $rvw_datas->{primarywebsite} +

    + +

    + %= l 'rvw_SERVER_MANAGER' + + %= $rvw_datas->{servermanager} +

    + +

    + %= l 'rvw_USER_PASSWORD_PANEL' + + %= $rvw_datas->{usermanager} +

    + +

    + %= l 'rvw_EMAIL_ADDRESSES' + + %= $rvw_datas->{emailaddresses} +

    + + % end
    -% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/roundcube.html.ep b/root/usr/share/smanager/themes/default/templates/roundcube.html.ep index f6550bc..78ace4b 100644 --- a/root/usr/share/smanager/themes/default/templates/roundcube.html.ep +++ b/root/usr/share/smanager/themes/default/templates/roundcube.html.ep @@ -1,40 +1,40 @@ -% layout 'default', title => "Sme server 2 - roundcube"; +% layout 'default', title => "Sme server 2 - roundcube"; % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

    - %= dumper $c->current_route -

    +

    + %= dumper $c->current_route +

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

    <%=$title %>


    -

    If the Webmail panel does not appear after logging in, then please check your password.


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

    <%= $title %>


    +

    If the Webmail panel does not appear after logging in, then please check your password.


    - % my $thisdomain = $c->req->url->to_abs->host; - % my $url = $c->stash('modul'); - % if (!$url) { - % $url = $thisdomain."/roundcube"; - %} - % my $username = 'admin'; - % if ($url =~ /[?&]_user=([^&]+)/) { - % $username = $1; - %} - % if (!($url =~ /https:/)) { + % my $thisdomain = $c->req->url->to_abs->host; + % my $url = $c->stash('modul'); + % if (!$url) { + % $url = $thisdomain . "/roundcube"; + % } + % my $username = 'admin'; + % if ($url =~ /[?&]_user=([^&]+)/) { + % $username = $1; + % } + % if (!($url =~ /https:/)) { % $url = 'https://' . $url; - %} + % } -
    - roundcube?_user=<%= $username %>"> - <%= $c->stash('title') %> not found -
    +
    + roundcube?_user=<%= $username %>"> + <%= $c->stash('title') %> not found +
    -%end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/support.html.ep b/root/usr/share/smanager/themes/default/templates/support.html.ep index 737e467..544e3c4 100644 --- a/root/usr/share/smanager/themes/default/templates/support.html.ep +++ b/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 -
    +

    < %= $title % >


    - <%= $modul %> + <%= $modul %>
    -
    -%end \ No newline at end of file +
    +% end diff --git a/root/usr/share/smanager/themes/default/templates/useraccounts.html.ep b/root/usr/share/smanager/themes/default/templates/useraccounts.html.ep index 9b0d703..6a66fc4 100644 --- a/root/usr/share/smanager/themes/default/templates/useraccounts.html.ep +++ b/root/usr/share/smanager/themes/default/templates/useraccounts.html.ep @@ -1,40 +1,40 @@ % layout 'default', title => "Sme server 2 - useraccounts"; % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

    % } - -

    <%= $title%>

    - % if ( $notif ) { -
    - - <%= $c->render_to_string(inline => $notif) %> - - %} +

    <%= $title %>

    - % if ($usr_datas->{trt} eq 'ADD' or $usr_datas->{trt} eq 'UPD') { - %= include 'partials/_usr_upd' - %} elsif ($usr_datas->{trt} eq 'DEL') { - %= include 'partials/_usr_del' - %} elsif ($usr_datas->{trt} eq 'LCK') { - %= include 'partials/_usr_lock' - %} elsif ($usr_datas->{trt} eq 'PWD') { - %= include 'partials/_usr_pwd' - %} elsif ($usr_datas->{trt} eq 'PWS') { - %= include 'partials/_usr_pwds' - %} elsif ($usr_datas->{trt} eq 'UPS') { - %= include 'partials/_usr_upds' - %} else { - %= include 'partials/_usr_list' - %} + % if ( $notif ) { +
    + + <%= $c->render_to_string( inline => $notif ) %> + + % } + + % if ($usr_datas->{trt} eq 'ADD' or $usr_datas->{trt} eq 'UPD') { + %= include 'partials/_usr_upd' + % } elsif ($usr_datas->{trt} eq 'DEL') { + %= include 'partials/_usr_del' + % } elsif ($usr_datas->{trt} eq 'LCK') { + %= include 'partials/_usr_lock' + % } elsif ($usr_datas->{trt} eq 'PWD') { + %= include 'partials/_usr_pwd' + % } elsif ($usr_datas->{trt} eq 'PWS') { + %= include 'partials/_usr_pwds' + % } elsif ($usr_datas->{trt} eq 'UPS') { + %= include 'partials/_usr_upds' + % } else { + %= include 'partials/_usr_list' + % }
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/userpassword.html.ep b/root/usr/share/smanager/themes/default/templates/userpassword.html.ep index bb5a5ef..f7167ff 100644 --- a/root/usr/share/smanager/themes/default/templates/userpassword.html.ep +++ b/root/usr/share/smanager/themes/default/templates/userpassword.html.ep @@ -2,85 +2,85 @@ % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

    % } -

    +

    %= l 'pwd_ACCOUNT_PASSWORD_CHANGE' -

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

    + % my $btn = l('pwd_PASSWORD_CHANGE'); + % my $url = '/userpassword'; + %= $c->render_to_string( inline => l('pwd_DESCRIPTION') );

    - % my $btn = l('pwd_PASSWORD_CHANGE'); - % my $url = '/userpassword'; - %= $c->render_to_string( inline => l('pwd_DESCRIPTION')); - -

    - % 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_PASSWORD_WIKI')) %> + % 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_PASSWORD_WIKI') ) %>

    % if ( $pwd_datas->{trt} eq 'RESET' ) { - % $btn = l('pwd_PASSWORD_RESET'); - % $url = '/userpasswordr'; - %= $c->render_to_string( inline => l('pwd_DESCRIPTION_RESET')); + % $btn = l('pwd_PASSWORD_RESET'); + % $url = '/userpasswordr'; + %= $c->render_to_string( inline => l('pwd_DESCRIPTION_RESET') ); % } -

    +

    - %= 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} -

    + %= 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 => 'input', class=>'sme-password' - -

    +

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

    % } -

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

    +

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

    -

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

    +

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

    -

    -
    - %= submit_button "$btn", class => 'action' -

    +

    +
    + %= submit_button "$btn", class => 'action' +

    - % end + % end
    -% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/viewlogfiles.html.ep b/root/usr/share/smanager/themes/default/templates/viewlogfiles.html.ep index aa97f43..158be43 100644 --- a/root/usr/share/smanager/themes/default/templates/viewlogfiles.html.ep +++ b/root/usr/share/smanager/themes/default/templates/viewlogfiles.html.ep @@ -1,68 +1,68 @@ % layout 'default', title => "Sme server 2 - viewlogfiles"; % content_for 'module' => begin -
    - %if (config->{debug} == 1) { -

    - (DBG)route: <%= $c->current_route %>
    -

    - %} -

    <%= $title %>

    -
    - <%= $notif %> - <% my $btn = l('NEXT'); %> +
    + % if (config->{debug} == 1) { +

    + (DBG)route: <%= $c->current_route %>
    +

    + % } +

    <%= $title %>

    +
    + <%= $notif %> + <% my $btn = l('NEXT'); %> - %= form_for 'viewlogfiles' => (method => 'POST') => begin -

    - %=l 'log_FIRSTPAGE_DESC' -
    - - %=l 'log_LOG_FILE_SELECT_DESC' - - % param 'Filename' => 'messages'; - - %= select_field 'Filename' => $c->findlogFiles(), class => 'input' - -

    + %= form_for 'viewlogfiles' => ( method => 'POST' ) => begin +

    + %= l 'log_FIRSTPAGE_DESC' +
    + + %= l 'log_LOG_FILE_SELECT_DESC' + + % param 'Filename' => 'messages'; + + %= select_field 'Filename' => $c->findlogFiles(), class => 'input' + +

    -

    - %=l 'log_FILTER_PATTERN_DESC' -
    - - %=l 'log_FILTER_PATTERN_LABEL' - - %= text_field 'Matchpattern', class => 'input' - -

    +

    + %= l 'log_FILTER_PATTERN_DESC' +
    + + %= l 'log_FILTER_PATTERN_LABEL' + + %= text_field 'Matchpattern', class => 'input' + +

    -

    - %=l 'log_MATCH_PATTERN_DESC' -
    - - %=l 'log_MATCH_PATTERN_LABEL' - - %= text_field 'Highlightpattern', class => 'input' - -

    +

    + %= l 'log_MATCH_PATTERN_DESC' +
    + + %= l 'log_MATCH_PATTERN_LABEL' + + %= text_field 'Highlightpattern', class => 'input' + +

    -

    - %=l 'log_OP_DESC' -
    - - %=l 'log_OP_LABEL' - - %if ($log_datas->{'default_op'} eq 'download') { - % param 'Operation' => 'download'; - %} - %= select_field 'Operation' => [[(l 'log_VIEW') => 'view'],[(l 'DOWNLOAD') => 'download']], class => 'input' - -

    +

    + %= l 'log_OP_DESC' +
    + + %= l 'log_OP_LABEL' + + % if ($log_datas->{'default_op'} eq 'download') { + % param 'Operation' => 'download'; + % } + %= select_field 'Operation' => [ [ ( l 'log_VIEW' ) => 'view' ], [ ( l 'DOWNLOAD' ) => 'download' ] ], class => 'input'; + +

    -

    - %=l 'log_END_DESC' -

    +

    + %= l 'log_END_DESC' +

    - %= submit_button "$btn", class => 'action' - % end + %= submit_button "$btn", class => 'action' + % end
    -%end +% end diff --git a/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep b/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep index dde2cdf..fde4d64 100644 --- a/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep +++ b/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep @@ -2,31 +2,31 @@ % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

    - (DBG)route: <%= $c->current_route %>
    - (DBG)trt: <%= $log_datas->{trt} %>
    -

    +

    + (DBG)route: <%= $c->current_route %>
    + (DBG)trt: <%= $log_datas->{trt} %>
    +

    % } -

    <%= $title %>

    +

    <%= $title %>

    -
    <%= $modul %>
    +
    <%= $modul %>
    -

    +

    <% my $btn = l('log_REFRESH'); %> - %= form_for 'viewlogfilesr' => (method => 'POST') => begin - %= submit_button "$btn", class => 'action' - %= hidden_field 'trt' => $log_datas->{trt} - %= hidden_field 'Filename' => $log_datas->{filename} - %= hidden_field 'Matchpattern' => $log_datas->{matchpattern} - %= hidden_field 'Highlightpattern' => $log_datas->{highlightpattern} - %= hidden_field 'Operation' => $log_datas->{operation} + %= form_for 'viewlogfilesr' => ( method => 'POST' ) => begin + %= submit_button "$btn", class => 'action' + %= hidden_field 'trt' => $log_datas->{trt} + %= hidden_field 'Filename' => $log_datas->{filename} + %= hidden_field 'Matchpattern' => $log_datas->{matchpattern} + %= hidden_field 'Highlightpattern' => $log_datas->{highlightpattern} + %= hidden_field 'Operation' => $log_datas->{operation} % end -

    +
    -%end + % end diff --git a/root/usr/share/smanager/themes/default/templates/welcome.html.ep b/root/usr/share/smanager/themes/default/templates/welcome.html.ep index 9aa28c3..57584e2 100644 --- a/root/usr/share/smanager/themes/default/templates/welcome.html.ep +++ b/root/usr/share/smanager/themes/default/templates/welcome.html.ep @@ -1,71 +1,71 @@ % layout 'default', title => 'Sme server 2 - IndexT'; % content_for 'module' => begin -
    +

    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. + 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. -Caecus esse exputo ideo laoreet valde. Appellatio feugiat haero jus lucidus tum valetudo vulputate. Amet illum imputo volutpat. Acsi adipiscing brevitas facilisi illum laoreet lobortis lucidus sagaciter uxor. Defui dolor hos luptatum quadrum saluto verto vicis wisi. + Caecus esse exputo ideo laoreet valde. Appellatio feugiat haero jus lucidus tum valetudo vulputate. Amet illum imputo volutpat. Acsi adipiscing brevitas facilisi illum laoreet lobortis lucidus sagaciter uxor. Defui dolor hos luptatum quadrum saluto verto vicis wisi. -Acsi ideo pagus ymo. Ea jugis lobortis nimis utrum veniam vereor. Aliquip amet autem gilvus hos iaceo loquor natu pagus refoveo. Adipiscing laoreet probo tation tum vero. Enim minim ymo. Dolore imputo iusto iustum lobortis meus molior vulputate. Dolor immitto iustum jumentum olim pagus saluto uxor zelus. Capto commodo eu euismod. Duis ille nunc premo quidem tamen ulciscor wisi. + Acsi ideo pagus ymo. Ea jugis lobortis nimis utrum veniam vereor. Aliquip amet autem gilvus hos iaceo loquor natu pagus refoveo. Adipiscing laoreet probo tation tum vero. Enim minim ymo. Dolore imputo iusto iustum lobortis meus molior vulputate. Dolor immitto iustum jumentum olim pagus saluto uxor zelus. Capto commodo eu euismod. Duis ille nunc premo quidem tamen ulciscor wisi. -Abdo abico damnum dolor et facilisi incassum melior populus saepius. Commodo conventio ex exputo pagus quae valetudo. Eligo jumentum lobortis suscipit tamen torqueo validus venio voco. Letalis molior tego tincidunt tum. Bene iriure melior natu obruo os te voco. Ea oppeto refoveo tum. Consectetuer dolus ut. + Abdo abico damnum dolor et facilisi incassum melior populus saepius. Commodo conventio ex exputo pagus quae valetudo. Eligo jumentum lobortis suscipit tamen torqueo validus venio voco. Letalis molior tego tincidunt tum. Bene iriure melior natu obruo os te voco. Ea oppeto refoveo tum. Consectetuer dolus ut. -Abdo abigo aptent commoveo inhibeo molior nibh plaga pneum zelus. Conventio genitus neo nulla patria pneum saluto velit voco. Abigo defui dolore humo nulla nunc. Autem commodo erat gemino nisl olim pecus ratis tego. Fere luctus nunc sit. Bene humo imputo paulatim suscipit. Aliquam diam dolor feugiat gravis imputo lucidus modo nulla obruo. Ea macto melior neo qui ratis velit. + Abdo abigo aptent commoveo inhibeo molior nibh plaga pneum zelus. Conventio genitus neo nulla patria pneum saluto velit voco. Abigo defui dolore humo nulla nunc. Autem commodo erat gemino nisl olim pecus ratis tego. Fere luctus nunc sit. Bene humo imputo paulatim suscipit. Aliquam diam dolor feugiat gravis imputo lucidus modo nulla obruo. Ea macto melior neo qui ratis velit.

    - %= l ('MESS_TEST','toto') + %= l( 'MESS_TEST', 'toto' )

    - %= link_to Initial => '/' + %= link_to Initial => '/'

    - %= link_to Manual => '/manual' + %= link_to Manual => '/manual'

    - %= link_to Welcome => '/welcome' - Accueil. + %= link_to Welcome => '/welcome' + Accueil.

    - -% use SrvMngr::Navigation2; -% my %nav = %{SrvMngr::navigation2->getNavigation( $c->languages() )}; - - -% end \ No newline at end of file + +
    + +% end diff --git a/root/usr/share/smanager/themes/default/templates/whatever.html.ep b/root/usr/share/smanager/themes/default/templates/whatever.html.ep index 674d4f7..5a24476 100644 --- a/root/usr/share/smanager/themes/default/templates/whatever.html.ep +++ b/root/usr/share/smanager/themes/default/templates/whatever.html.ep @@ -2,16 +2,16 @@ % content_for 'module' => begin -
    -


    dev
    What else !!! - The page you were requesting - "<%= $self->req->url->path || '/' %>" - could not be found. -
    dev
    +

    +


    dev
    What else !!! + The page you were requesting + "<%= $self->req->url->path || '/' %>" + could not be found. +
    dev

    - %= link_to Welcome => '/' + %= link_to Welcome => '/'

    -
    +
    -% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/workgroup.html.ep b/root/usr/share/smanager/themes/default/templates/workgroup.html.ep index 7ef735e..fcfc5c2 100644 --- a/root/usr/share/smanager/themes/default/templates/workgroup.html.ep +++ b/root/usr/share/smanager/themes/default/templates/workgroup.html.ep @@ -1,66 +1,65 @@ % layout 'default', title => "Sme server 2 - workgroup"; % content_for 'module' => begin -
    +
    - %if (config->{debug} == 1) { -

    - (DBG)route: <%= $c->current_route %>
    - (DBG)pdc: <%= $wkg_datas->{ServerRole}%>
    - (DBG)roam: <%= $wkg_datas->{RoamingProfiles}%>
    -

    - %} - -

    <%= $title %>

    -
    - <%= $modul %> - <% my $btn = l('SAVE'); - %> + % if (config->{debug} == 1) { +

    + (DBG)route: <%= $c->current_route %>
    + (DBG)pdc: <%= $wkg_datas->{ServerRole} %>
    + (DBG)roam: <%= $wkg_datas->{RoamingProfiles} %>
    +

    + % } - %= form_for 'workgroup' => (method => 'POST') => begin -

    - %=l 'wkg_DESC_WORKGROUP', class => 'desc' -

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

    -

    - %=l 'wkg_DESC_SERVERNAME', class => 'desc' -

    - - %=l 'wkg_LABEL_SERVERNAME', class => 'label' - - %= text_field 'ServerName' => $wkg_datas->{ServerName}, class => 'input' - -

    -

    - %= $c->render_to_string(inline => l 'wkg_DESC_PDC') -
    - - %=l 'wkg_LABEL_PDC', class => 'label' - - % param 'ServerRole' => $wkg_datas->{ServerRole} unless param 'ServerRole'; - %= select_field 'ServerRole' => [[ (l 'YES') => 'PDC'], [ (l 'NO') => 'WS']], class => 'input' - -

    -

    - %= $c->render_to_string(inline => l 'wkg_DESC_ROAM') -
    - - %=l 'wkg_LABEL_ROAM', class => 'label' - - % param 'RoamingProfiles' => $wkg_datas->{RoamingProfiles} unless param 'RoamingProfiles'; - %= select_field 'RoamingProfiles' => [[ (l 'YES') => 'yes'], [ (l 'NO') => 'no']], class => 'input' - -

    -

    -
    - %= submit_button "$btn", class => 'action' -

    - % end +

    <%= $title %>

    +
    + <%= $modul %> + <% my $btn = l('SAVE'); %> + + %= form_for 'workgroup' => ( method => 'POST' ) => begin +

    + %= l 'wkg_DESC_WORKGROUP', class => 'desc' +

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

    +

    + %= l 'wkg_DESC_SERVERNAME', class => 'desc' +

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

    +

    + %= $c->render_to_string( inline => l 'wkg_DESC_PDC' ) +
    + + %= l 'wkg_LABEL_PDC', class => 'label' + + % param 'ServerRole' => $wkg_datas->{ServerRole} unless param 'ServerRole'; + %= select_field 'ServerRole' => [ [ ( l 'YES' ) => 'PDC' ], [ ( l 'NO' ) => 'WS' ] ], class => 'input'; + +

    +

    + %= $c->render_to_string( inline => l 'wkg_DESC_ROAM' ) +
    + + %= l 'wkg_LABEL_ROAM', class => 'label' + + % param 'RoamingProfiles' => $wkg_datas->{RoamingProfiles} unless param 'RoamingProfiles'; + %= select_field 'RoamingProfiles' => [ [ ( l 'YES' ) => 'yes' ], [ ( l 'NO' ) => 'no' ] ], class => 'input'; + +

    +

    +
    + %= submit_button "$btn", class => 'action' +

    + % end
    -%end \ No newline at end of file +% end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/yum.html.ep b/root/usr/share/smanager/themes/default/templates/yum.html.ep index 3745d0c..08cddca 100644 --- a/root/usr/share/smanager/themes/default/templates/yum.html.ep +++ b/root/usr/share/smanager/themes/default/templates/yum.html.ep @@ -2,99 +2,99 @@ % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

    % } - -

    <%= $title%>

    - % if ( $notif ) { -
    - %= $notif - - %} +

    <%= $title %>

    - % if ( $c->is_empty('updates') ) { -

    - %=l 'yum_TITLE_UPTODATE' -

    - %=l 'yum_DESC_UPTODATE' -

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

    - %=l 'yum_TITLE_UPDATES_AVAILABLE' -

    - %=l 'yum_DESC_UPDATES_AVAILABLE' -

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

    + %= l 'yum_TITLE_UPTODATE' +

    + %= l 'yum_DESC_UPTODATE' +

    + % } - %= form_for 'yum' => (method => 'POST') => begin - %= hidden_field 'trt' => 'UPDT' - %= submit_button $c->l('yum_BUTTON_INSTALL_UPDATES'), class => 'action' - % end - %} - - % if ( $c->non_empty('available') ) { - %= form_for 'yum' => (method => 'POST') => begin -
    - %= hidden_field 'trt' => 'INST' - %= submit_button $c->l('yum_BUTTON_INSTALL_AVAILABLE'), class => 'action' - % end - %} - - % if ( $c->non_empty('installed') ) { - %= form_for 'yum' => (method => 'POST') => begin -
    - %= hidden_field 'trt' => 'REMO' - %= submit_button $c->l('yum_BUTTON_REMOVE'), class => 'action' - % end - %} - - - - %= 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' -
    - %= submit_button $c->l('yum_BUTTON_CONFIGURATION'), class => 'action' + % 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' + %= submit_button $c->l('yum_BUTTON_INSTALL_UPDATES'), class => 'action' % end + % } + + % if ( $c->non_empty('available') ) { + %= form_for 'yum' => ( method => 'POST' ) => begin +
    + %= hidden_field 'trt' => 'INST' + %= submit_button $c->l('yum_BUTTON_INSTALL_AVAILABLE'), class => 'action' + % end + % } + + % if ( $c->non_empty('installed') ) { + %= form_for 'yum' => ( method => 'POST' ) => begin +
    + %= hidden_field 'trt' => 'REMO' + %= submit_button $c->l('yum_BUTTON_REMOVE'), class => 'action' + % end + % } + + + + %= 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' +
    + %= submit_button $c->l('yum_BUTTON_CONFIGURATION'), class => 'action' + + % end
    -% end \ No newline at end of file +% end diff --git a/root/usr/share/smanager/themes/default/templates/yumconfig.html.ep b/root/usr/share/smanager/themes/default/templates/yumconfig.html.ep index f8bf80a..2a953b4 100644 --- a/root/usr/share/smanager/themes/default/templates/yumconfig.html.ep +++ b/root/usr/share/smanager/themes/default/templates/yumconfig.html.ep @@ -2,88 +2,88 @@ % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

    % } - -

    <%= $title%>

    - % if ( $notif ) { -
    - %= $notif -
    - %} +

    <%= $title %>

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

    - %=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() -

    + %= form_for 'yumd' => ( method => 'POST' ) => begin -
    - %=l 'yum_DESC_YUM_PACKAGEFUNCTIONS' +

    + %= 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_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_YUM_PACKAGEFUNCTIONS' -
    - %=l 'yum_DESC_ENABLED_REPOSITORIES' +

    + %= 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_LABEL_ENABLED_REPOSITORIES' - - % param 'SelectedRepositories' => $c->get_repository_current_options() unless param 'SelectedRepositories'; - %= select_field 'SelectedRepositories' => $c->get_repository_options2(), class => 'input', multiple => '1' -

    +
    + %= l 'yum_DESC_ENABLED_REPOSITORIES' -
    - %=l 'yum_DESC_YUM_DELTARPMPROCESS' +

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

    -

    - %=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_DELTARPMPROCESS' -
    - %=l 'yum_DESC_YUM_DOWNLOADONLY' +

    + %= 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_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_DOWNLOADONLY' -
    - %=l 'yum_DESC_YUM_AUTOINSTALLUPDATES' +

    + %= 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_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']] -

    +
    + %= l 'yum_DESC_YUM_AUTOINSTALLUPDATES' - %= hidden_field 'trt' => 'CONF' -
    +

    + %= 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' +
    - %= submit_button $c->l('SAVE'), class => 'action' - + %= submit_button $c->l('SAVE'), class => 'action' + - % end + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/yuminstall.html.ep b/root/usr/share/smanager/themes/default/templates/yuminstall.html.ep index e64ce02..84ce4ff 100644 --- a/root/usr/share/smanager/themes/default/templates/yuminstall.html.ep +++ b/root/usr/share/smanager/themes/default/templates/yuminstall.html.ep @@ -2,56 +2,56 @@ % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

    % } - -

    <%= $title%>

    - % if ( $notif ) { -
    - %= $notif -
    - %} -
    +

    <%= $title %>

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

    + %= form_for 'yumd' => ( method => 'POST' ) => begin + + %= l 'yum_HEADER_AVAILABLE_SOFTWARE' +

    % 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 => 'input', 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 => 'input', multiple => "1" -

    - %} + %= 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 => 'input', 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 => 'input', multiple => "1"; +

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

    - - %= submit_button $c->l('yum_INSTALL_SOFTWARE'), class => 'action' + %= hidden_field 'trt' => 'INST' +

    + + %= submit_button $c->l('yum_INSTALL_SOFTWARE'), class => 'action' - % end + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/yumlogfile.html.ep b/root/usr/share/smanager/themes/default/templates/yumlogfile.html.ep index f615da2..2c9700a 100644 --- a/root/usr/share/smanager/themes/default/templates/yumlogfile.html.ep +++ b/root/usr/share/smanager/themes/default/templates/yumlogfile.html.ep @@ -1,40 +1,40 @@ % layout 'default', title => "Sme server 2 - yum_logfile"; % content_for 'refresh' => begin - -%end + +% end % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

    % } - -

    <%= $title%>

    - % if ( $notif ) { -
    - %= $notif -
    - %} +

    <%= $title %>

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

    Please Wait - Yum Running (<%= $c->get_yum_status_page() %>)

    + %= form_for 'yum' => ( method => 'POST' ) => begin - <%= $c->render_to_string(inline => $c->format_yum_log()) %> +

    Please Wait - Yum Running (<%= $c->get_yum_status_page() %>)

    - %= hidden_field 'trt' => 'LOGF' -
    + <%= $c->render_to_string( inline => $c->format_yum_log() ) %> + + %= hidden_field 'trt' => 'LOGF' +
    + prc= submit_button $c->l('NEXT'), class => 'action' +
    - % end +% end
    diff --git a/root/usr/share/smanager/themes/default/templates/yumpostupg.html.ep b/root/usr/share/smanager/themes/default/templates/yumpostupg.html.ep index 1db3f6a..4215a54 100644 --- a/root/usr/share/smanager/themes/default/templates/yumpostupg.html.ep +++ b/root/usr/share/smanager/themes/default/templates/yumpostupg.html.ep @@ -2,43 +2,43 @@ % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

    % } -

    <%= $title%>

    +

    <%= $title %>

    - % if ( $notif ) { -
    - %= $notif -
    - %} + % if ( $notif ) { +
    + %= $notif +
    + % } -
    +
    <% my $btn = l('NEXT'); %> %= $c->render_to_string( inline => l 'yum_UPDATE_SUCCESS' ) % if ( $yum_datas->{reconf} eq 'yes' ) { - %= $c->render_to_string( inline => l 'yum_HEADER_POSTUPGRADE_REQUIRED' ) - <% $btn = l('RECONFIGURE'); %> + %= $c->render_to_string( inline => l 'yum_HEADER_POSTUPGRADE_REQUIRED' ) + <% $btn = l('RECONFIGURE'); %> % } -

    +

    - %= form_for 'yumd' => (method => 'POST') => begin + %= form_for 'yumd' => ( method => 'POST' ) => begin - <%= $c->render_to_string(inline => $c->show_yum_log()) %> + <%= $c->render_to_string( inline => $c->show_yum_log() ) %> - %= hidden_field 'trt' => 'PSTU' - %= hidden_field 'reconf' => $yum_datas->{reconf} -
    + %= hidden_field 'trt' => 'PSTU' + %= hidden_field 'reconf' => $yum_datas->{reconf} +
    - %= submit_button "$btn", class => 'action' - + %= submit_button "$btn", class => 'action' + - % end + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/yumremove.html.ep b/root/usr/share/smanager/themes/default/templates/yumremove.html.ep index 538fc5c..31079f1 100644 --- a/root/usr/share/smanager/themes/default/templates/yumremove.html.ep +++ b/root/usr/share/smanager/themes/default/templates/yumremove.html.ep @@ -2,55 +2,55 @@ % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

    % } - -

    <%= $title%>

    + +

    <%= $title %>

    +
    + + % if ( $notif ) { +
    + %= $notif +
    + % } + + %= form_for 'yumd' => ( method => 'POST' ) => begin + + %= l 'yum_HEADER_INSTALLED_SOFTWARE' +
    - - % if ( $notif ) { -
    - %= $notif -
    - %} - - %= form_for 'yumd' => (method => 'POST') => begin - - %=l 'yum_HEADER_INSTALLED_SOFTWARE' - -
    % if ($c->non_empty('installed','group')) { - %=l 'yum_DESC_INSTALLED_GROUPS' -

    - %=l 'yum_LABEL_INSTALLED_GROUPS' - - %= select_field 'SelectedGroups' => $c->get_options2('installed', 'group'), class => 'input', multiple => "1" -

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

    - %=l 'yum_LABEL_INSTALLED_PACKAGES' - - %= select_field 'SelectedPackages' => $c->get_options2('installed', 'package'), class => 'input', multiple => "1" -

    - %} + %= l 'yum_DESC_INSTALLED_GROUPS' +

    + %= l 'yum_LABEL_INSTALLED_GROUPS' + + %= select_field 'SelectedGroups' => $c->get_options2( 'installed', 'group' ), class => 'input', multiple => "1"; +

    + % } +
    + % if ($c->non_empty('installed','packages')) { + %= l 'yum_DESC_INSTALLED_PACKAGES' +

    + %= l 'yum_LABEL_INSTALLED_PACKAGES' + + %= select_field 'SelectedPackages' => $c->get_options2( 'installed', 'package' ), class => 'input', multiple => "1"; +

    + % } - + - %= hidden_field 'trt' => 'REMO' -
    - - %= submit_button $c->l('REMOVE'), class => 'action' + %= hidden_field 'trt' => 'REMO' +
    + + %= submit_button $c->l('REMOVE'), class => 'action' - % end + % end
    diff --git a/root/usr/share/smanager/themes/default/templates/yumupdate.html.ep b/root/usr/share/smanager/themes/default/templates/yumupdate.html.ep index cf74d55..00d01b6 100644 --- a/root/usr/share/smanager/themes/default/templates/yumupdate.html.ep +++ b/root/usr/share/smanager/themes/default/templates/yumupdate.html.ep @@ -2,42 +2,42 @@ % content_for 'module' => begin -
    +
    % if (config->{debug} == 1) { -

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

    +

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

    % } - -

    <%= $title%>

    - % if ( $notif ) { -
    - %= $notif -
    - %} +

    <%= $title %>

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

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

    + %= l 'yum_DESC_AVAILABLE_UPDATES' - +

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

    - %= hidden_field 'trt' => 'UPDT' -
    + + + %= hidden_field 'trt' => 'UPDT' +
    - %= submit_button $c->l('yum_INSTALL_UPDATES'), class => 'action' - + %= submit_button $c->l('yum_INSTALL_UPDATES'), class => 'action' + - % end + % end
    diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 649d0ed..dc5bd4a 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme Server Configuration : Manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 112 +%define release 113 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -146,6 +146,9 @@ true %defattr(-,root,root) %changelog +* Mon Aug 11 2025 Brian Read 11.0.0-113.sme +- Re-factor all template files to make them nicely formatted [SME: 13103] + * Thu Aug 07 2025 Brian Read 11.0.0-112.sme - Fix sprintf fail in viewlogfiles when % in log line [SME: 13099] - Fix reboot/shutdown failure - reported by Massimo - fixed by JC [SME: 13097]