diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/localnetworks.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/localnetworks.html.ep index 3a364fd..d55bad6 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/localnetworks.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/localnetworks.html.ep @@ -5,16 +5,17 @@
% 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') { @@ -30,4 +31,5 @@ %}
+ %end diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep index 47a3788..d6cca68 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_up2.html.ep @@ -4,42 +4,42 @@
-
- <%=l 'dom_DESC_CORPORATE_DNS' %> -
- -
- -
-
- +
+ <%=l 'dom_DESC_CORPORATE_DNS' %>
-
- % param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder'; - -
-
-
+
-
-
- -
-
- % param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2'; - -
-
+
+
+ +
+
+ % param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder'; + +
+
-
+
-
-
- +
+
+ +
+
+ % param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2'; + +
-
- <%= hidden_field 'trt' => $dom_datas->{trt} %> + +
+ +
+
+ +
+
+ <%= hidden_field 'trt' => $dom_datas->{trt} %> diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep index 478f2ee..aa4c68f 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_dom_upd.html.ep @@ -4,84 +4,84 @@
-
+
-
-

- % if ( $dom_datas->{trt} eq "ADD" ) { - <%=l 'dom_CREATE_TITLE' %> - % } else { - <%=l 'dom_MODIFY_TITLE' %> - % $btn = l('MODIFY'); - % } -

-
- -
- -
-
- <%=l 'DOMAIN_NAME' %> +
+

+ % if ( $dom_datas->{trt} eq "ADD" ) { + <%=l 'dom_CREATE_TITLE' %> + % } else { + <%=l 'dom_MODIFY_TITLE' %> + % $btn = l('MODIFY'); + % } +

-
- % if ( $dom_datas->{trt} eq "ADD" ) { - % param 'Domain' => $dom_datas->{domain} unless param 'Domain'; - <%= text_field 'Domain' %> - % } else { - <%= hidden_field 'Domain' => $dom_datas->{domain} %> - <%= $dom_datas->{domain} %> - % } -
-
-
+
-
-
- +
+
+ +
+
+ % if ( $dom_datas->{trt} eq "ADD" ) { + % param 'Domain' => $dom_datas->{domain} unless param 'Domain'; + + % } else { + <%= hidden_field 'Domain' => $dom_datas->{domain} %> + <%= $dom_datas->{domain} %> + % } +
-
- % param 'Description' => $dom_datas->{description} unless param 'Description'; - -
-
-
- <%=l 'dom_CONTENT_FIELD_DESCRIPTION' %> -

+
-
-
- +
+
+ +
+
+ % param 'Description' => $dom_datas->{description} unless param 'Description'; + +
-
- % param 'Content' => $dom_datas->{content} unless param 'Content'; - <%= select_field 'Content', $c->content_options_list(), class => "form-select", id => "inputDomainContent" %> -
-
-
- <%=l 'dom_DESC_NAMESERVERS' %> -

+
+ <%=l 'dom_CONTENT_FIELD_DESCRIPTION' %> +

-
-
- +
+
+ +
+
+ % param 'Content' => $dom_datas->{content} unless param 'Content'; + <%= select_field 'Content', $c->content_options_list(), class => "form-select", id => "inputDomainContent" %> +
-
- % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers'; - <%= select_field 'Nameservers', $c->nameserver_options_list(), class => "form-select", id => "inputDomainNameServers" %> -
-
-
+
+ <%=l 'dom_DESC_NAMESERVERS' %> +

-
-
- +
+
+ +
+
+ % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers'; + <%= select_field 'Nameservers', $c->nameserver_options_list(), class => "form-select", id => "inputDomainNameServers" %> +
-
- <%= hidden_field 'trt' => $dom_datas->{trt} %> + +
+ +
+
+ +
+
+ <%= hidden_field 'trt' => $dom_datas->{trt} %> diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep index a91b164..50dd810 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_ln_add.html.ep @@ -4,7 +4,7 @@ % my %ret; % unless (length($retref)) {%ret = (ret=>"");} % else {%ret = %$retref;} - + % my @vars = split(",",$ret{vars}); % my $var1 = @vars[0]; % my $var2 = @vars[1]; @@ -14,63 +14,80 @@ % my $var6 = @vars[5]; %if ($ret{'ret'} eq "") { - + %} elsif (index($ret{ret},"SUCCESS") != -1) {

Operation Status Report

- %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); + <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
- %} else { + %} else {

Operation Status Report - Error

- %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); + <%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %>
%}
% my $btn = l('ADD'); % my $network_db = esmith::NetworksDB->open(); - + % if (config->{debug} == 1) { -

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

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

- %end + + +
+
+

<%=l "ln_ADD_TITLE" %>

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

+ +
+
+ +
+
+
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 7eac1b8..006da19 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 @@ -4,62 +4,85 @@ % 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 -

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

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

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

- %end +
+ +
+

<%=l "ln_REMOVE_TITLE" %>

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

+ +
+
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+ + % if ($deletehosts) { +
+ + tell me if you find this! + + <%=$c->l("ln_REMOVE_HOSTS_DESC") %> +
+ + <%= $c->l("ln_REMOVE_HOSTS_LABEL") %> + + + <%=check_box deletehost=>1, checked=>1 %> + +

+ % } + +
+
+ +
+
+ + <%= hidden_field localnetwork=>$localnetwork %> + +
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 9231607..2d8256b 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 @@ -1,108 +1,100 @@
% my $btn = l('ln_LOCALNETWORK_ADD'); - %= form_for '/localnetworksa' => (method => 'POST') => begin - % my $retref= $c->stash("ret"); - % my %ret; - % unless (length($retref)) {%ret = (ret=>"");} - % else {%ret = %$retref;} +
- % if (config->{debug} == 1) { -

- %= dumper "Ret:".$ret{ret}; -

- %} +
- % 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]; + % my $retref= $c->stash("ret"); + % my %ret; + % unless (length($retref)) {%ret = (ret=>"");} + % else {%ret = %$retref;} + % if (config->{debug} == 1) { +
+ %= dumper "Ret:".$ret{ret}; +
+ % } - %if ($ret{ret} eq "") { - %=l "ln_FIRSTPAGE_DESC" - %} elsif (index($ret{ret},"SUCCESS") != -1) { -
-

Operation Status Report

- %= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); + % 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 "") { + <%= l "ln_FIRSTPAGE_DESC" %> + % } elsif (index($ret{ret},"SUCCESS") != -1) { +
+
+

Operation Status Report

+ <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %> +
+ % } else { +
+

Operation Status Report - Error

+ <%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); %> +
+ % } + +

+ +
+
+ +
- %} else { -
-

Operation Status Report - Error

- %= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7)); -
- %} -

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

- - % end +
% my $numlocalnetworks = @$localnetworks; - % if ($numlocalnetworks == 0){ - %=l 'ln_LOCAL_NETWORK_NONE' - % } else { + % if ($numlocalnetworks == 0) { + <%= l 'ln_LOCAL_NETWORK_NONE' %> + % } else {
- - - - - - - - - - - - - - % 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 => "") => $localnetwork->key - %= t td => (class => "") => $localnetwork->prop('Mask') - %= t td => (class => "") => $num_hosts - %= t td => (class => "") => $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{ - % - % - % - %}; + + + + + + + + + + + % 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"; } + + + % } - - - % } - +
- %=l 'NETWORK' - - %=l 'ln_SUBNET_MASK' - - %=l 'ln_NUMBER_OF_HOSTS' - - %=l 'ROUTER' - - %=l 'ACTION' -
<%= l 'NETWORK' %><%= l 'ln_SUBNET_MASK' %><%= l 'ln_NUMBER_OF_HOSTS' %><%= l 'ROUTER' %><%= l 'ACTION' %>
<%= $localnetwork->key %> + <%= $localnetwork->prop('Mask') %> + <%= $num_hosts %> + <%= $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) %>
<%= $c->render_to_string(inline => $actionRemove) %>
- %= hidden_field 'trt' => $ln_datas->{trt} - %} + <%= hidden_field 'trt' => $ln_datas->{trt} %> + % }
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 1583946..3c6ba24 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 @@ -2,8 +2,6 @@ % my $btn = l('pse_CLICK_TO_CREATE'); - -
<%= $c->render_to_string(inline => l('pse_DESCRIPTION')); %>
diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index 8a49e0b..a48fc08 100644 --- a/smeserver-manager-AdminLTE.spec +++ b/smeserver-manager-AdminLTE.spec @@ -1,6 +1,6 @@ %define name smeserver-manager-AdminLTE %define version 11.0.0 -%define release 23 +%define release 24 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} Version: %{version} @@ -26,6 +26,9 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Mon May 19 2025 John Crisp 11.0.0-24.sme +- Local Networks and a few odd tidies + * Sun May 18 2025 John Crisp 11.0.0-23.sme - Domains done plus more tweaks