--- rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Update-to-use-jquery-dataTables-in-tables.patch 2024/01/27 20:02:57 1.1
+++ rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Update-to-use-jquery-dataTables-in-tables.patch 2024/01/29 14:46:56 1.4
@@ -12,25 +12,35 @@ diff -urN smeserver-manager-0.1.4.old/ro
$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-27 18:17:00.000000000 +0000
-@@ -17,6 +17,16 @@
++++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2024-01-29 14:41:00.000000000 +0000
+@@ -17,6 +17,26 @@
%= include 'common_js'
% }
%= content_for 'refresh'
+
+
++
++
++
+
+ %= stylesheet begin
+ .dataTables_wrapper {
+ width: min-content;
+ margin-right: auto;
+ }
++
++ .ui-button {
++ position: relative;
++ font-size: 0;
++ width: 23px;
++ height: 23px;
++ }
+ %end
+
-@@ -73,6 +83,23 @@
+@@ -73,6 +93,28 @@
%= content 'js_swapClass'
%= content 'js_togglePassword'
% }
@@ -47,6 +57,11 @@ diff -urN smeserver-manager-0.1.4.old/ro
+ "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
+
@@ -56,7 +71,7 @@ diff -urN smeserver-manager-0.1.4.old/ro
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-27 18:48:00.000000000 +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'
@@ -79,8 +94,19 @@ diff -urN smeserver-manager-0.1.4.old/ro
% foreach my $domain ( @$domains ) {
-@@ -51,8 +52,9 @@
- % $actionRemove = "" . l('REMOVE') . "";
+@@ -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 = "" . "" . "";
% }
- <%= $c->render_to_string(inline => $actionModify) %> |
@@ -91,9 +117,20 @@ diff -urN smeserver-manager-0.1.4.old/ro
% }
+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-27 18:52:00.000000000 +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'
@@ -123,15 +160,15 @@ diff -urN smeserver-manager-0.1.4.old/ro
%= t td => (class => 'sme-border') => $group->prop('Description')
- <%=l 'MODIFY'%> |
- <%=l 'REMOVE'%> |
-+ <%=l 'MODIFY'%>
-+ <%=l 'REMOVE'%>
++ |
++
+ |
% }
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-27 18:54:00.000000000 +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);
@@ -150,9 +187,14 @@ diff -urN smeserver-manager-0.1.4.old/ro
%=l 'ACTION'
-@@ -50,9 +50,11 @@
- % $actionModify = "" . l('MODIFY') . "";
- % $actionRemove = "" . 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 = "" . "" . "";
% }
- <%= $c->render_to_string(inline => $actionModify) %> |
- <%= $c->render_to_string(inline => $actionRemove) %> |
@@ -167,7 +209,7 @@ diff -urN smeserver-manager-0.1.4.old/ro
% }
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-27 18:58:00.000000000 +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'
@@ -192,9 +234,21 @@ diff -urN smeserver-manager-0.1.4.old/ro
% foreach my $ibay (@$ibays)
% {
% my $modifiable = $ibay->prop('Modifiable') || 'yes';
-@@ -60,10 +60,11 @@
+@@ -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 = "" . l('REMOVE') . "";
++ % $actionRemove = "" . "" . "";
% }
- <%= $c->render_to_string(inline => $actionModify) %> |
- <%= $c->render_to_string(inline => $actionResetPw) %> |
@@ -210,7 +264,7 @@ diff -urN smeserver-manager-0.1.4.old/ro
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-27 19:35:00.000000000 +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 {
@@ -251,9 +305,18 @@ diff -urN smeserver-manager-0.1.4.old/ro
% 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") {
+
+- <%=l 'REMOVE'%> |
++
+ % } 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-27 19:51:00.000000000 +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'
@@ -316,7 +379,7 @@ diff -urN smeserver-manager-0.1.4.old/ro
-
- <%=l 'REMOVE'%> |
+
-+ <%=l 'REMOVE'%>
++
+ |
% }
@@ -332,7 +395,7 @@ diff -urN smeserver-manager-0.1.4.old/ro
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-27 19:52:00.000000000 +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'
@@ -350,9 +413,18 @@ diff -urN smeserver-manager-0.1.4.old/ro
% 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
+- <%=l 'REMOVE'%> |
++ |
+
+ % }
+
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-27 16:45:00.000000000 +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'
@@ -378,8 +450,16 @@ diff -urN smeserver-manager-0.1.4.old/ro
% foreach my $pseudonym ( @$pseudonyms )
% {
-@@ -58,8 +59,9 @@
- % $actionRemove = "" . l('REMOVE') . "";
+@@ -52,14 +53,15 @@
+
+ % my ($actionModify, $actionRemove) = ' ';
+ % if ($modifiable eq 'yes') {
+- % $actionModify = "" . l('MODIFY') . "";
++ % $actionModify = "" . "" . "";
+ % }
+ % if ($removable eq 'yes') {
+- % $actionRemove = "" . l('REMOVE') . "";
++ % $actionRemove = "" . "" . "";
% }
- <%= $c->render_to_string(inline => $actionModify) %> |
@@ -392,7 +472,7 @@ diff -urN smeserver-manager-0.1.4.old/ro
% }
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-27 19:53:00.000000000 +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#;
@@ -410,9 +490,18 @@ diff -urN smeserver-manager-0.1.4.old/ro
% 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 )
+- <%=l 'MODIFY'%> |
++ |
+
+ % }
+
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-27 10:00:00.000000000 +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'
@@ -422,18 +511,77 @@ diff -urN smeserver-manager-0.1.4.old/ro
%=l 'ACCOUNT'
+@@ -35,7 +35,7 @@
+ |
+ %=l 'usr_FORWARDING_ADDRESS'
+ |
+-
++ |
+ %=l 'ACTION'
+ |
+
+@@ -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 = "" . "";
+ % }
+ % }
+- <%= $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) %>
++ |
+
+ % }
+
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-27 10:00:00.000000000 +0000
++++ 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 'usr_MEMBER'
|
+@@ -139,6 +139,7 @@
+ |
+ %=l 'DESCRIPTION'
+ |
++
+
+ % 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