--- 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/28 19:06:07 1.2
@@ -12,13 +12,16 @@ 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-28 18:58:00.000000000 +0000
+@@ -17,6 +17,19 @@
%= include 'common_js'
% }
%= content_for 'refresh'
+
+
++
++
++
+
+ %= stylesheet begin
+ .dataTables_wrapper {
@@ -30,7 +33,7 @@ diff -urN smeserver-manager-0.1.4.old/ro
-@@ -73,6 +83,23 @@
+@@ -73,6 +86,28 @@
%= content 'js_swapClass'
%= content 'js_togglePassword'
% }
@@ -47,6 +50,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
+
@@ -91,6 +99,17 @@ 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
@@ -412,7 +431,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/_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-28 19:01:00.000000000 +0000
@@ -21,7 +21,7 @@
% if ($numUsers == 0){
%=l 'usr_NO_USER_ACCOUNTS'
@@ -422,18 +441,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