diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/backdown.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/backdown.html.ep index 41eba29..4f2d8c3 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/backdown.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/backdown.html.ep @@ -1,6 +1,6 @@ <% - my $backups = esmith::BackupHistoryDB->open; + my $backups = esmith::BackupHistoryDB->open; # no UTF8 my $now = time(); my $backup_rec = $backups->new_record($now, { type => 'backup_record', BackupType => 'desktop', @@ -22,7 +22,7 @@ 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 + # 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; diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep index c1945cd..43867c8 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_list.html.ep @@ -28,7 +28,7 @@ <%=l 'DESCRIPTION_BRIEF' %> <%=l 'dom_CONTENT' %> <%=l 'dom_LABEL_NAMESERVERS'%> - <%=l 'ACTION' %> + <%=l 'ACTION' %> @@ -65,10 +65,10 @@ % % %}; - %# $actionRemove = "" . "" . ""; + %# $actionRemove = "" . "" . ""; %}; - <%= $c->render_to_string(inline => $actionRemove) %> - <%= $c->render_to_string(inline => $actionModify) %> + <%= $c->render_to_string(inline => $actionRemove) %> + <%= $c->render_to_string(inline => $actionModify) %> % } diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep index 069fa84..5d1903e 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep @@ -24,7 +24,7 @@ <%= l 'GROUP' %> <%= l 'DESCRIPTION' %> - <%= l 'ACTION' %> + <%= l 'ACTION' %> @@ -54,8 +54,8 @@ % %}; - <%= $c->render_to_string(inline => $actionModify) %> - <%= $c->render_to_string(inline => $actionRemove) %> + <%= $c->render_to_string(inline => $actionModify) %> + <%= $c->render_to_string(inline => $actionRemove) %> % } diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep index 3aa2d86..3d3a467 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_iba_list.html.ep @@ -36,7 +36,7 @@ <%= l 'NAME' %> <%= l 'DESCRIPTION' %> - <%= l 'ACTION' %> + <%= l 'ACTION' %> @@ -103,9 +103,9 @@ % %}; % } - <%= $c->render_to_string(inline => $actionModify) %> - <%= $c->render_to_string(inline => $actionResetPw)%> - <%= $c->render_to_string(inline => $actionRemove) %> + <%= $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/AdminLTE/templates/partials/_ln_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep index e88bdbf..f44590a 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_del.html.ep @@ -17,11 +17,11 @@
-

<%=l "ln_REMOVE_TITLE" %>

+

<%= l "ln_REMOVE_TITLE" %>

- <%=l "ln_REMOVE_DESC" %> + <%= l "ln_REMOVE_DESC" %>


@@ -60,19 +60,20 @@
% if ($deletehosts) { -
+
- tell me if you find this! + tell me if you find this! + Please opoen a bug and tell me - <%= $c->l("ln_REMOVE_HOSTS_DESC") %> -
- - <%= $c->l("ln_REMOVE_HOSTS_LABEL") %> - - - <%= check_box deletehost=>1, checked=>1 %> - -

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

% }
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep index 66b051b..10ffba1 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_list.html.ep @@ -5,37 +5,31 @@
% my $retref = $c->stash("ret"); - % my %ret; - % unless (length($retref)) {%ret = (ret=>"");} - % else {%ret = %$retref;} + % 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 } %>
+            
+ % } - %# my $element_count = scalar(@ret); - - %# if (length $element_count == 0) { - % my @vars = split(",",$ret{vars}); - % my $var1 = $vars[0]; - % my $var2 = $vars[1]; - % my $var3 = $vars[2]; - % my $var4 = $vars[3]; - % my $var5 = $vars[4]; - % my $var6 = $vars[5]; - % my $var7 = $vars[6]; - %# } - - %if ($ret{ret} eq "") { + % if ($ret{ret} eq "") { <%= l "ln_FIRSTPAGE_DESC" %> % } elsif (index($ret{ret},"SUCCESS") != -1) { +

Operation Status Report


-

Operation Status Report

- <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %> + <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
% } else { -
+

Operation Status Report - Error

+
+

Operation Status Report - Error

- <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %> + <%= $c->render_to_string(inline => l($ret{ret}, @vars[0..6])) %>
% } @@ -63,7 +57,7 @@ <%= l 'ln_SUBNET_MASK' %> <%= l 'ln_NUMBER_OF_HOSTS' %> <%= l 'ROUTER' %> - <%= l 'ACTION' %> + <%= l 'ACTION' %> @@ -90,7 +84,7 @@ % %}; % } - <%= $c->render_to_string(inline => $actionRemove) %> + <%= $c->render_to_string(inline => $actionRemove) %> % } diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep index 37104f6..7dd9090 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_add.html.ep @@ -17,7 +17,7 @@
- +
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep index 3c6ba24..2b57c36 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_pse_list.html.ep @@ -22,9 +22,9 @@ - - - + + + @@ -57,7 +57,7 @@ % $modify_text % % - %}; + % }; % } % if ($removable eq 'yes') { @@ -70,11 +70,11 @@ % $remove_text % % - %}; + % }; % } - - + + % } diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep index 0e55dae..92ed13b 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_quo_list.html.ep @@ -36,7 +36,7 @@ - + @@ -77,7 +77,7 @@ % %}; - + % } diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep index e56989f..03c01d2 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep @@ -23,11 +23,11 @@
<%= l 'pse_PSEUDONYM' %><%= l 'pse_USER_OR_GROUP' %><%= l 'ACTION' %><%= l 'pse_PSEUDONYM' %><%= l 'pse_USER_OR_GROUP' %><%= l 'ACTION' %>
<%= $c->render_to_string(inline => $actionModify) %><%= $c->render_to_string(inline => $actionRemove) %><%= $c->render_to_string(inline => $actionModify) %><%= $c->render_to_string(inline => $actionRemove) %>
<%= $limit %> <%= $absolute %> <%= $current %><%= l 'ACTION' %><%= l 'ACTION' %>
<%= $c->render_to_string(inline => $actionModify) %><%= $c->render_to_string(inline => $actionModify) %>
- - - - - + + + + + @@ -136,17 +136,17 @@ % $actionroundcube = qq{ % - % % %}; - - - - - + + + + + % } diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep index 8b630b8..fdfbe68 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/remoteaccess.html.ep @@ -85,10 +85,10 @@ % 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); - + % my ($net, $mask) = split '/', $val; + % $mask = '255.255.255.255' unless ($mask); + % my ($numhosts,$a,$b) = esmith::util::computeHostRange($net,$mask); + @@ -96,7 +96,7 @@ '> - % } + % }
<%=l 'ACCOUNT' %><%=l 'USER_NAME' %><%=l 'usr_VPN_CLIENT_ACCESS' %><%=l 'usr_FORWARDING_ADDRESS' %><%= l 'ACTION' %><%= 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) %><%= $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) %>
<%= $net %> <%= $mask %> <%= $numhosts %>