diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2024-01-30 13:05:20.561995482 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2024-02-02 11:00:00.000000000 +0000 @@ -17,25 +17,19 @@ %= include 'common_js' % } %= content_for 'refresh' - + + %= stylesheet '/js/datatables.min.css' + %= javascript '/js/datatables.min.js' + %= stylesheet '/js/jquery-ui.min.css' + %= javascript '/js/jquery-ui.min.js' + + %= stylesheet '/css/sme-jquery-overrides.css' + + - - %= stylesheet begin - .dataTables_wrapper { - width: min-content; - margin-right: auto; - } - - .ui-button { - position: relative; - font-size: 0; - width: 23px; - height: 23px; - } - %end diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep 2024-01-30 13:05:20.562995510 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep 2024-02-01 12:57:00.000000000 +0000 @@ -5,101 +5,101 @@ %= form_for '/domains' => (method => 'POST') => begin - %= l('dom_FORM_DESCRIPTION'); + %= l('dom_FORM_DESCRIPTION'); + +

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

+ + %= hidden_field 'trt' => 'UP2' -

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

+ % end -

- %=l 'dom_CURRENT_DOMAINS' + %=l 'dom_CURRENT_DOMAINS'

- - - - - - - + + + + + + + - % foreach my $domain ( @$domains ) { + % foreach my $domain ( @$domains ) { %= t td => (class => 'sme-border') => $domain->{Domain} %= t td => (class => 'sme-border') => $domain->{'Description'} %= t td => (class => 'sme-border') => $domain->{'Content'} %= t td => (class => 'sme-border') => l('dom_' . $domain->{'Nameservers'}) - % my $actionModify = "" . "" . ""; + % my $actionModify = "" . "" . ""; - % my $removable = ($domain->{Removable} || 'yes'); - % my $actionRemove = ' '; + % my $removable = ($domain->{Removable} || 'yes'); + % my $actionRemove = ' '; - % if ($removable eq 'yes') { - % $actionRemove = "" . "" . ""; - % } - - - - % } - - -
- %=l 'DOMAIN_NAME' - - %=l 'DESCRIPTION_BRIEF' - - %=l 'dom_CONTENT' - - %=l 'dom_LABEL_NAMESERVERS' - - %=l 'ACTION' -
+ %=l 'DOMAIN_NAME' + + %=l 'DESCRIPTION_BRIEF' + + %=l 'dom_CONTENT' + + %=l 'dom_LABEL_NAMESERVERS' + + %=l 'ACTION' +
- <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %> -
-

+ % if ($removable eq 'yes') { + % $actionRemove = "" . "" . ""; + % } - %= hidden_field 'trt' => 'ADD' + + <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %> + + + % } - % end + + + + %= hidden_field 'trt' => 'ADD' %= form_for '/domains' => (method => 'POST') => begin -
+
- % my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS'); + % my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS'); -

- %= l 'dom_DESC_CORPORATE_DNS_CURRENT' -

- -

- - %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' - - %= $dom_datas->{forwarder} - -

- - % if ($dom_datas->{forwarder2}) { -

- - %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' - - %= $dom_datas->{forwarder2} - -

- % } - -

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

+

+ %= l 'dom_DESC_CORPORATE_DNS_CURRENT' +

+ +

+ + %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' + + %= $dom_datas->{forwarder} + +

+ + % if ($dom_datas->{forwarder2}) { +

+ + %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' + + %= $dom_datas->{forwarder2} + +

+ % } + +

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

+ %= hidden_field 'trt' => 'UP2' + % end - %= hidden_field 'trt' => 'UP2' - % end diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2024-01-30 13:05:20.563995537 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2024-02-01 11:14:00.000000000 +0000 @@ -9,6 +9,8 @@


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

+ % end +

%=l 'grp_CURRENT_LIST' @@ -36,9 +38,10 @@ %= t td => (class => 'sme-border') => $group->key %= t td => (class => 'sme-border') => $group->prop('Description') - - + + % } @@ -47,6 +50,4 @@

- % end - diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep 2024-01-30 13:05:20.563995537 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep 2024-02-01 11:20:00.000000000 +0000 @@ -8,6 +8,10 @@ %= submit_button "$btn", class => 'action'

+ %= hidden_field 'trt' => $hos_datas->{trt} + + % end + % my %dom_hos = %{$dom_hosts}; % foreach my $domain ( sort ( keys %dom_hos ) ) { @@ -47,8 +51,8 @@ %= t td => (class => 'sme-border') => $_->{'Comment'}; % my ($actionModify, $actionRemove) = ' '; % if ($_->{'static'} ne 'yes') { - % $actionModify = "" . "" . ""; - % $actionRemove = "" . "" . ""; + % $actionModify = "" . "" . ""; + % $actionRemove = "" . "" . ""; % } <%= $c->render_to_string(inline => $actionModify) %> @@ -65,8 +69,5 @@ % } - %= hidden_field 'trt' => $hos_datas->{trt} - - % end diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2024-01-30 13:05:20.564995564 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2024-02-01 08:43:00.000000000 +0000 @@ -47,18 +47,20 @@ %= t td => (class => 'sme-border') => $ibay->prop('Name') % my ($actionModify, $actionResetPw, $actionRemove) = ' '; % if ($modifiable eq 'yes') { - % $actionModify = "" . "" . ""; + % $actionModify = "" . "" . ""; % } % if ($passwordable eq 'yes') { % if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) { - % $actionResetPw .= "" . l('PASSWORD_RESET') . ""; - % } else { - % $actionResetPw .= "" . l('PASSWORD_RESET') . ""; + %# $actionResetPw .= "" . l('PASSWORD_RESET') . ""; + % $actionResetPw .= "" . ""; +% } else { + % $actionResetPw .= "" . ""; + %# $actionResetPw .= "" . l('PASSWORD_RESET') . ""; % } % $actionResetPw .= ' '; % } % if ($removable eq 'yes') { - % $actionRemove = "" . "" . ""; + % $actionRemove = "" . "" . ""; % } <%= $c->render_to_string(inline => $actionModify) %> diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep 2024-01-30 13:05:20.564995564 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep 2024-02-01 11:23:00.000000000 +0000 @@ -41,6 +41,8 @@
%= submit_button "$btn", class => 'action'
+ % end +
% my $numlocalnetworks = @$localnetworks; % if ($numlocalnetworks == 0){ @@ -82,7 +84,7 @@ %= t td => (class => 'sme-border') => $localnetwork->prop('Router') % if ($removable eq "yes") { - + % } else { %} @@ -94,5 +96,4 @@ %= hidden_field 'trt' => $ln_datas->{trt} %} - % end diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep 2024-01-30 13:05:20.564995564 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep 2024-02-01 11:24:00.000000000 +0000 @@ -37,7 +37,9 @@
%= submit_button "$btn", class => 'action'
-
+ % end + +
% if ($empty){
@@ -92,7 +94,7 @@ %= t td => (class => 'sme-border') => $allow %= t td => (class => 'sme-border') => $cmmnt - + % } @@ -102,6 +104,6 @@ %= hidden_field 'trt' => $pf_datas->{trt} - % end + diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2024-01-30 13:05:20.565995591 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2024-02-01 11:27:00.000000000 +0000 @@ -11,6 +11,7 @@
%= submit_button "$btn", class => 'action'

+ % end

@@ -56,7 +57,7 @@ %= t td => (class => 'sme-border') => $printer->prop('Location') %= t td => (class => 'sme-border') => $address %= t td => (class => 'sme-border') => $remoteName - + % } @@ -64,6 +65,5 @@ <%} %>

- % end diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep 2024-01-30 13:05:20.565995591 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep 2024-02-01 11:27:00.000000000 +0000 @@ -11,6 +11,9 @@


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

+ + % end +

%=l 'pse_CURRENT_PSEUDONYMS' @@ -53,10 +56,10 @@ % my ($actionModify, $actionRemove) = ' '; % if ($modifiable eq 'yes') { - % $actionModify = "" . "" . ""; + % $actionModify = "" . "" . ""; % } % if ($removable eq 'yes') { - % $actionRemove = "" . "" . ""; + % $actionRemove = "" . "" . ""; % } @@ -71,7 +74,6 @@

- % end diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep 2024-01-30 13:05:20.566995618 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep 2024-02-01 08:34:00.000000000 +0000 @@ -57,7 +57,7 @@ %= 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 ) - + % } diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep 2024-01-30 13:05:20.566995618 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep 2024-01-31 19:30:00.000000000 +0000 @@ -61,21 +61,19 @@ %= t td => (class => 'sme-border') => $fwd % my ($actionModify, $actionLock, $actionResetPw, $actionRemove) = ' '; % if ($username eq 'admin') { - % $actionModify = "" . ""; - % $actionResetPw = "" . ""; + % $actionModify = "" . ""; + % $actionResetPw = "" . ""; % } else { - % $actionModify = "" . ""; + % $actionModify = "" . ""; % if ($password_set ne 'yes') { % $actionLock = l('ACCOUNT_LOCKED'); - % $actionResetPw = "" . ""; - %# $actionResetPw = "" . l('PASSWORD_RESET') . ""; + % $actionResetPw = "" . ""; % } else { - % $actionLock = "" . ""; - % $actionResetPw = "" . ""; - %# $actionResetPw = "" . l('PASSWORD_RESET') . ""; + % $actionLock = "" . ""; + % $actionResetPw = "" . ""; % } % if ( $removable eq 'yes' ) { - % $actionRemove = "" . ""; + % $actionRemove = "" . ""; % } % }