diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-01-27 09:43:09.770713114 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-01-27 19:56:00.000000000 +0000 @@ -240,7 +240,7 @@ return $c->l('prt_ERR_UNEXPECTED_DESC') . ': ' . $description; } - if ($location =~ /^(lp[0-9]+|remote|usb\/lp[0-9]+)$/) + if ($location =~ /^(lp[0-9]+|remote|usb\/lp[0-9]+)$/){ $location = $1; } else { $location = "lp0"; 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-27 09:43:09.764712928 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2024-01-28 18:58:00.000000000 +0000 @@ -17,6 +17,19 @@ %= include 'common_js' % } %= content_for 'refresh' + + + + + + + %= stylesheet begin + .dataTables_wrapper { + width: min-content; + margin-right: auto; + } + %end + @@ -73,6 +86,28 @@ %= content 'js_swapClass' %= content 'js_togglePassword' % } +%= javascript begin + $(window).on('pageshow', function(){ + //alert('page show'); + $('.TableSort').DataTable({ + "stateSave": true, + "retrieve": true, + "responsive":true, + "language": { + "emptyTable": "No record found.", + "processing":'" style="color: rgba(42, 43, 43, 1)">Loading... ', + "error": function (xhr, error, thrown) {alert("Error occurred while loading data. Please try again.");} + } + }); + $(".sme-modify-button").button({"icon": "ui-icon-pencil"}); + $(".sme-remove-button").button({"icon": "ui-icon-trash"}); + $(".sme-password-button").button({"icon": "ui-icon-refresh"}); + $(".sme-lock-button").button({"icon": "ui-icon-key"}); + + }); +%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-27 09:43:09.731711904 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep 2024-01-29 12:16:00.000000000 +0000 @@ -16,7 +16,7 @@

%=l 'dom_CURRENT_DOMAINS'

- +
- + % foreach my $domain ( @$domains ) { @@ -42,17 +43,18 @@ %= t td => (class => 'sme-border') => $domain->{'Content'} %= t td => (class => 'sme-border') => l('dom_' . $domain->{'Nameservers'}) - % my $actionModify = "" . l('MODIFY') . ""; + % my $actionModify = "" . "" . ""; % my $removable = ($domain->{Removable} || 'yes'); % my $actionRemove = ' '; % if ($removable eq 'yes') { - % $actionRemove = "" . l('REMOVE') . ""; + % $actionRemove = "" . "" . ""; % } - - + % } diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep 2021-06-21 10:25:10.000000000 +0100 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep 2024-01-27 09:38:00.000000000 +0000 @@ -4,5 +4,6 @@ SME Server <%= session 'releaseVersion' %> - Manager <%= $c->app->VERSION %>
Copyright 1999-2006 Mitel Corporation
%= session 'copyRight' -
Copyright (c) 2013-2021 Koozali Foundation Inc.
+
Copyright (c) 2013-2024 Koozali Foundation Inc.
+ 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-27 09:43:09.731711904 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2024-01-29 12:29:00.000000000 +0000 @@ -17,7 +17,7 @@ % if ($numGroups == 0){ %=l 'ACCOUNT_GROUP_NONE' % } else { -
%=l 'DOMAIN_NAME' @@ -30,10 +30,11 @@ %=l 'dom_LABEL_NAMESERVERS' + %=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) %> +
+
- + % foreach my $group ( @$groups ) % { %= t td => (class => 'sme-border') => $group->key %= t td => (class => 'sme-border') => $group->prop('Description') - - + % } 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-27 09:43:09.753712587 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep 2024-01-29 12:16:00.000000000 +0000 @@ -15,7 +15,7 @@ %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);

-
%=l 'GROUP' @@ -25,19 +25,20 @@ %=l 'DESCRIPTION' - - %=l 'ACTION' + + %=l 'ACTION'
<%=l 'MODIFY'%><%=l 'REMOVE'%> +
+
- @@ -47,12 +47,14 @@ %= t td => (class => 'sme-border') => $_->{'Comment'}; % my ($actionModify, $actionRemove) = ' '; % if ($_->{'static'} ne 'yes') { - % $actionModify = "" . l('MODIFY') . ""; - % $actionRemove = "" . l('REMOVE') . ""; + % $actionModify = "" . "" . ""; + % $actionRemove = "" . "" . ""; % } - - - + + % } 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-27 09:43:09.732711935 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2024-01-29 12:19:00.000000000 +0000 @@ -21,7 +21,7 @@ % if ($numIbays == 0){ %=l 'iba_NO_IBAYS' % } else { -
%=l 'hos_HOSTNAME' @@ -32,7 +32,7 @@ %=l 'COMMENT' + %=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) %> +
+
- + % foreach my $ibay (@$ibays) % { % my $modifiable = $ibay->prop('Modifiable') || 'yes'; @@ -47,7 +47,7 @@ %= t td => (class => 'sme-border') => $ibay->prop('Name') % my ($actionModify, $actionResetPw, $actionRemove) = ' '; % if ($modifiable eq 'yes') { - % $actionModify = "" . l('MODIFY') . ""; + % $actionModify = "" . "" . ""; % } % if ($passwordable eq 'yes') { % if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) { @@ -58,12 +58,13 @@ % $actionResetPw .= ' '; % } % if ($removable eq 'yes') { - % $actionRemove = "" . l('REMOVE') . ""; + % $actionRemove = "" . "" . ""; % } - - - - + % } 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-27 09:43:09.732711935 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep 2024-01-29 12:24:00.000000000 +0000 @@ -47,28 +47,28 @@ %=l 'ln_LOCAL_NETWORK_NONE' % } else {
-
%=l 'NAME' @@ -29,11 +29,11 @@ %=l 'DESCRIPTION' - - %=l 'ACTION' + + %=l 'ACTION'
<%= $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) %> +
+
- - + + + - + - + - + % foreach my $localnetwork (@$localnetworks ) % { % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') ); @@ -82,7 +82,7 @@ %= t td => (class => 'sme-border') => $localnetwork->prop('Router') % if ($removable eq "yes") { + % } else { %} 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-27 09:43:09.732711935 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep 2024-01-29 12:26:00.000000000 +0000 @@ -46,37 +46,31 @@
%=l 'pf_SHOW_FORWARDS'
-
+ %=l 'NETWORK' - + %=l 'ln_SUBNET_MASK' - %=l 'ln_NUMBER_OF_HOSTS' - + %=l 'ROUTER' - + %=l 'ACTION' -
- <%=l 'REMOVE'%>
+
- - + - - + - - + - - + - - - + - - + - - + + + % my %forwards = (); % $forwards{TCP} = $tcpforwards; % $forwards{UDP} = $udpforwards; @@ -97,16 +91,17 @@ %= t td => (class => 'sme-border') => $dport %= t td => (class => 'sme-border') => $allow %= t td => (class => 'sme-border') => $cmmnt - + % } % } %} - %= hidden_field 'trt' => $pf_datas->{trt} %}
+ %=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' -
- <%=l 'REMOVE'%> + +
+ %= 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-27 09:43:09.733711966 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2024-01-29 12:27:00.000000000 +0000 @@ -21,7 +21,7 @@ % if ($numPrinters == 0){ %=l 'prt_NO_PRINTERS' % } else { - +
+ % foreach my $printer (@$printerDrivers) % { % my $address = ($printer->prop('Location') eq 'remote') @@ -55,7 +56,7 @@ %= t td => (class => 'sme-border') => $printer->prop('Location') %= t td => (class => 'sme-border') => $address %= t td => (class => 'sme-border') => $remoteName - + % } 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-27 09:43:09.733711966 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep 2024-01-29 12:19:00.000000000 +0000 @@ -19,7 +19,7 @@ % if ($numPseudonyms == 0){ %=l 'pse_ACCOUNT_PSEUDONYM_NONE' % } else { -
%=l 'NAME' @@ -42,6 +42,7 @@ %=l 'ACTION'
<%=l 'REMOVE'%>
+
- - + + + % foreach my $pseudonym ( @$pseudonyms ) % { @@ -52,14 +53,15 @@ % my ($actionModify, $actionRemove) = ' '; % if ($modifiable eq 'yes') { - % $actionModify = "" . l('MODIFY') . ""; + % $actionModify = "" . "" . ""; % } % if ($removable eq 'yes') { - % $actionRemove = "" . l('REMOVE') . ""; + % $actionRemove = "" . "" . ""; % } - - + % } 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-27 09:43:09.733711966 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep 2024-01-29 13:55:00.000000000 +0000 @@ -18,7 +18,7 @@ % my $absolute = l('quo_ABS_LIMIT_MB'); $absolute =~ s#(limitX)#
$1#; % my $current = l('quo_CURRENT_USAGE'); $current =~ s#(usageX)#
$1#; -
%=l 'pse_PSEUDONYM' @@ -27,11 +27,12 @@ %=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) %> +
+
+ % foreach my $user (@$userAccounts) % { @@ -56,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-27 09:43:09.753712587 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep 2024-01-29 12:01:00.000000000 +0000 @@ -21,7 +21,7 @@ % if ($numUsers == 0){ %=l 'usr_NO_USER_ACCOUNTS' % } else { -
%=l 'ACCOUNT' @@ -39,6 +39,7 @@ %=l 'ACTION'
<%=l 'MODIFY'%>
+
- @@ -61,26 +61,29 @@ %= t td => (class => 'sme-border') => $fwd % my ($actionModify, $actionLock, $actionResetPw, $actionRemove) = ' '; % if ($username eq 'admin') { - % $actionModify = "" . l('MODIFY') . ""; - % $actionResetPw = "" . l('PASSWORD_RESET') . ""; + % $actionModify = "" . ""; + % $actionResetPw = "" . ""; % } else { - % $actionModify = "" . l('MODIFY') . ""; + % $actionModify = "" . ""; % if ($password_set ne 'yes') { % $actionLock = l('ACCOUNT_LOCKED'); - % $actionResetPw = "" . l('PASSWORD_RESET') . ""; + % $actionResetPw = "" . ""; + %# $actionResetPw = "" . l('PASSWORD_RESET') . ""; % } else { - % $actionLock = "" . l('usr_LOCK_ACCOUNT') . ""; - % $actionResetPw = "" . l('PASSWORD_RESET') . ""; + % $actionLock = "" . ""; + % $actionResetPw = "" . ""; + %# $actionResetPw = "" . l('PASSWORD_RESET') . ""; % } % if ( $removable eq 'yes' ) { - % $actionRemove = "" . l('REMOVE') . ""; + % $actionRemove = "" . ""; % } % } - - - - - + % } diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2021-06-21 10:25:10.000000000 +0100 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2024-01-28 08:54:00.000000000 +0000 @@ -131,7 +131,7 @@ %=l 'usr_GROUP_MEMBERSHIPS' -
%=l 'ACCOUNT' @@ -35,7 +35,7 @@ %=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 => $actionModify) %> + <%= $c->render_to_string(inline => $actionResetPw) %> + <%= $c->render_to_string(inline => $actionLock) %> + <%= $c->render_to_string(inline => $actionRemove) %> +
+
+ % foreach my $g ( @groups) { % my $user = $usr_datas->{user}; diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2024-01-27 09:43:09.743712276 +0000 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2024-01-27 18:32:00.000000000 +0000 @@ -65,7 +65,7 @@ % my @vals = $self->_get_valid_from(); % if (@vals) { -
%=l 'usr_MEMBER' @@ -139,6 +139,7 @@ %=l 'DESCRIPTION'
+
+ % foreach my $val ( @vals ) % {
%=l 'NETWORK' @@ -75,6 +75,7 @@ %=l 'REMOVE'