diff --git a/.gitignore b/.gitignore index cbb3a13..1eebb69 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.log *spec-20* *.tar.gz +*.workspace diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep index b976dfb..49e09d5 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/backup.html.ep @@ -5,21 +5,21 @@
% 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')
%} @@ -32,59 +32,47 @@ <%= $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'})).'.' %> -

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

+ <%= select_field 'Function' => $c->get_function_options() %> +

- %= submit_button $c->l('PERFORM'), class => "" - + + <% my $btn = $c->l('PERFORM'); %> +
+
+ +
+
% end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep index 47bbd45..ce4ab13 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/clamav.html.ep @@ -4,47 +4,61 @@
- %if (config->{debug} == 1) { -

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

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

-

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

-

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

- %= submit_button "$btn", class => "" - % 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']] %> +
+
+ +
+
+ <%= l 'clm_LABEL_QUARANTINE' %> +
+
+ % param 'Quarantine' => $clm_datas->{Quarantine} unless param 'Quarantine'; + <%= select_field 'Quarantine' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']] %> +
+
+
+ +
+
+ <%= l 'clm_LABEL_CLAM_VERSIONS' %> +
+
+ <%= $clm_datas->{clam_versions} %> +
+
+
+ +
+
+ +
+
+ + %#end +
%end diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep index 82cecd4..e9bdeb6 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/directory.html.ep @@ -2,90 +2,67 @@ % content_for 'module' => begin -
+
%if (config->{debug} == 1) { -

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

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

<%= $title %>


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

-

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

-

- %=l 'dir_DESC_DIRECTORY_ACCESS', class => "" -
- - %=l 'dir_DIRECTORY_ACCESS', class => "" - - - % param 'access' => $dir_datas->{access} unless param 'access'; - %= select_field 'access' => [[ (l 'NETWORKS_ALLOW_LOCAL') => 'private'], [ (l 'NETWORKS_ALLOW_PUBLIC') => 'public']], class => "", id => "" - -

-

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

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

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

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

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

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

-

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

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

-

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

- % end - +
+
+ <%= l('dir_LABEL_ROOT') %> + <%= $dir_datas->{root} %> +
+
+ <%= l 'dir_DESC_DIRECTORY_ACCESS' %> +
+ <%= l 'dir_DIRECTORY_ACCESS' %> + % param 'access' => $dir_datas->{access} unless param 'access'; + <%= select_field 'access' => [[ (l 'NETWORKS_ALLOW_LOCAL') => 'private'], [ (l 'NETWORKS_ALLOW_PUBLIC') => 'public']] %> +
+
+ <%= l 'dir_DESC_DEPARTMENT' %> +

+ <%= l 'dir_DEPARTMENT' %> + %= text_field 'department' => $dir_datas->{department} +
+
+ <%= l 'dir_COMPANY' %> + <%= text_field 'company', $dir_datas->{company} %> +
+
+ <%= l 'dir_STREET' + <%= text_field 'street' => $dir_datas->{street} %> +
+
+ <%= l 'dir_CITY' %> + <%= text_field 'city', $dir_datas->{city} %> +
+
+ <%= l 'dir_PHONENUMBER' %> + <%= text_field 'phonenumber', $dir_datas->{phonenumber} %> +
+
+ <%= l 'dir_DESC_EXISTING' %> +

+ <%= l 'dir_EXISTING' %> + <%= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]] %> + +
+
+
+ +
+
%end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep index 0a3035c..978b579 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/domains.html.ep @@ -5,10 +5,10 @@
% if (config->{debug} == 1) { -

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

+
+ %= dumper $c->current_route + %= dumper $dom_datas +
% } % if ( stash 'error' ) { @@ -20,14 +20,14 @@

<%= $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_upd' + % } elsif ($dom_datas->{trt} eq 'DEL') { %= include 'partials/_dom_del' - %} elsif ($dom_datas->{trt} eq 'UP2') { + % } elsif ($dom_datas->{trt} eq 'UP2') { %= include 'partials/_dom_up2' - %} else { + % } else { %= include 'partials/_dom_list' - %} + % }
%end diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep index b1ba402..41edd04 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailaccess.html.ep @@ -5,63 +5,72 @@
% if (config->{debug} == 1) { -

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

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

<%= $title%>

- %= form_for '/emailsettingd' => (method => 'POST') => begin + + %#= form_for '/emailsettingd' => (method => 'POST') => begin - %=l 'mai_DESC_POP_ACCESS_CONTROL' - -

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

- - %=l 'mai_DESC_IMAP_ACCESS_CONTROL' - -

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

- - %=l 'mai_DESC_WEBMAIL' - -

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

- - % my $btn = l('SAVE'); - %= submit_button "$btn", class => "" - - %= hidden_field 'trt' => 'ACC' - % end + <%= 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() %> +
+ +
+ <%=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() %> +
+ +
+ <%= 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() %> +
+ + % my $btn = l('SAVE'); + +
+
+ +
+
+ %= hidden_field 'trt' => 'ACC' + %# end + +
%end diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep index 70daf51..0afad9a 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/hostentries.html.ep @@ -5,10 +5,10 @@
% if (config->{debug} == 1) { -

+

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

+
% }

<%= $title%>

@@ -21,15 +21,15 @@ %} % if ($hos_datas->{trt} eq 'ADD' or $hos_datas->{trt} eq 'UPD') { - %= include 'partials/_hos_upd' + %= include 'partials/_hos_upd' %} elsif ($hos_datas->{trt} eq 'DEL') { - %= include 'partials/_hos_del' + %= include 'partials/_hos_del' %} elsif ( $hos_datas->{trt} eq 'ALC' or $hos_datas->{trt} eq 'ULC') { - %= include 'partials/_hos_ulc' + %= include 'partials/_hos_ulc' %} elsif ( $hos_datas->{trt} eq 'ARM' or $hos_datas->{trt} eq 'URM') { - %= include 'partials/_hos_urm' + %= include 'partials/_hos_urm' %} else { - %= include 'partials/_hos_list' + %= include 'partials/_hos_list' %}
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep index 3959b66..a981ff2 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep @@ -5,22 +5,23 @@
% if (config->{debug} == 1) { -

+

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

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

<%= $title%>

% if ( stash 'modul' ) { - %= $c->render_to_string(inline => stash 'modul' ); + %= $c->render_to_string(inline => stash 'modul' ); % } % if ($iba_datas->{trt} eq 'ADD') { diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep index 7cf7428..0a82faa 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/login.html.ep @@ -2,20 +2,20 @@ % content_for 'module' => begin - %if ( config 'debug' ) { -

+ % if ( config 'debug' ) { +

- %if ( stash 'trt' ) { - %= dumper stash 'trt' - %} -

- %} + % if ( stash 'trt' ) { + %= dumper stash 'trt' + % } +
+ % } % if ( stash 'error' ) {
%= $c->render_to_string(inline => stash 'error')
-%} +% } % my $btn = l('use_SIGNIN'); % if ( $trt eq 'RESET' ) { @@ -23,7 +23,7 @@ %= $c->render_to_string(inline => l 'use_DESC_RESET')
% $btn = l('use_RESET'); -%} +% }