/[smeserver]/rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Update-to-use-jquery-dataTables-in-tables.patch
ViewVC logotype

Diff of /rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Update-to-use-jquery-dataTables-in-tables.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by brianr, Sat Jan 27 20:02:57 2024 UTC Revision 1.2 by brianr, Sun Jan 28 19:06:07 2024 UTC
# Line 12  diff -urN smeserver-manager-0.1.4.old/ro Line 12  diff -urN smeserver-manager-0.1.4.old/ro
12           $location = "lp0";           $location = "lp0";
13  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  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
14  --- 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.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep        2024-01-27 09:43:09.764712928 +0000
15  +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep    2024-01-27 18:17:00.000000000 +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
16  @@ -17,6 +17,16 @@  @@ -17,6 +17,19 @@
17          %= include 'common_js'          %= include 'common_js'
18       % }       % }
19       %= content_for 'refresh'       %= content_for 'refresh'
20  +    <link href="https://cdn.datatables.net/v/dt/dt-1.13.8/datatables.min.css" rel="stylesheet">  +    <link href="https://cdn.datatables.net/v/dt/dt-1.13.8/datatables.min.css" rel="stylesheet">
21  +       <script src="https://cdn.datatables.net/v/dt/dt-1.13.8/datatables.min.js"></script>  +       <script src="https://cdn.datatables.net/v/dt/dt-1.13.8/datatables.min.js"></script>
22    +       <link rel="stylesheet" href="//code.jquery.com/ui/1.13.2/themes/base/jquery-ui.css">
23    +       <script src="https://code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
24    +
25  +       <!-- Jquery datatables override -->  +       <!-- Jquery datatables override -->
26  +       %= stylesheet begin  +       %= stylesheet begin
27  +       .dataTables_wrapper {  +       .dataTables_wrapper {
# Line 30  diff -urN smeserver-manager-0.1.4.old/ro Line 33  diff -urN smeserver-manager-0.1.4.old/ro
33   </head>   </head>
34    
35   <body>   <body>
36  @@ -73,6 +83,23 @@  @@ -73,6 +86,28 @@
37          %= content 'js_swapClass'          %= content 'js_swapClass'
38          %= content 'js_togglePassword'          %= content 'js_togglePassword'
39       % }       % }
# Line 47  diff -urN smeserver-manager-0.1.4.old/ro Line 50  diff -urN smeserver-manager-0.1.4.old/ro
50  +                               "error": function (xhr, error, thrown) {alert("Error occurred while loading data. Please try again.");}  +                               "error": function (xhr, error, thrown) {alert("Error occurred while loading data. Please try again.");}
51  +                       }  +                       }
52  +               });  +               });
53    +               $(".sme-modify-button").button({"icon": "ui-icon-pencil"});
54    +               $(".sme-remove-button").button({"icon": "ui-icon-trash"});
55    +               $(".sme-password-button").button({"icon": "ui-icon-refresh"});
56    +               $(".sme-lock-button").button({"icon": "ui-icon-key"});
57    +              
58  +   });  +   });
59  +%end  +%end
60  +      +    
# Line 91  diff -urN smeserver-manager-0.1.4.old/ro Line 99  diff -urN smeserver-manager-0.1.4.old/ro
99          </tr>          </tr>
100       %  }       %  }
101    
102    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
103    --- 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
104    +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep   2024-01-27 09:38:00.000000000 +0000
105    @@ -4,5 +4,6 @@
106     SME Server <%= session 'releaseVersion' %> - Manager <%= $c->app->VERSION %>
107     <br>Copyright 1999-2006 Mitel Corporation<br>
108     %= session 'copyRight'
109    -<br>Copyright (c) 2013-2021 Koozali Foundation Inc.<br>
110    +<br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
111     </font>
112    +
113  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  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
114  --- 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.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep     2024-01-27 09:43:09.731711904 +0000
115  +++ 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-27 18:52:00.000000000 +0000
# Line 412  diff -urN smeserver-manager-0.1.4.old/ro Line 431  diff -urN smeserver-manager-0.1.4.old/ro
431       %    {       %    {
432  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  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
433  --- 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.old/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep     2024-01-27 09:43:09.753712587 +0000
434  +++ 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
435  @@ -21,7 +21,7 @@  @@ -21,7 +21,7 @@
436       %  if ($numUsers == 0){       %  if ($numUsers == 0){
437           %=l 'usr_NO_USER_ACCOUNTS'           %=l 'usr_NO_USER_ACCOUNTS'
# Line 422  diff -urN smeserver-manager-0.1.4.old/ro Line 441  diff -urN smeserver-manager-0.1.4.old/ro
441          <tr>          <tr>
442              <th class='sme-border'>              <th class='sme-border'>
443              %=l 'ACCOUNT'              %=l 'ACCOUNT'
444    @@ -35,7 +35,7 @@
445                <th class='sme-border'>
446                %=l 'usr_FORWARDING_ADDRESS'
447                </th>
448    -           <th class='sme-border' colspan='4'>
449    +           <th class='sme-border'>
450                %=l 'ACTION'
451                </th>
452            </tr>
453    @@ -61,26 +61,29 @@
454                 %= t td => (class => 'sme-border') => $fwd
455         %      my ($actionModify, $actionLock, $actionResetPw, $actionRemove) = '&nbsp;';
456         %      if ($username eq 'admin')  {
457    -    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPS&user=" . $username . "'>" . l('MODIFY') . "</a>";
458    -    %          $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWS&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
459    +    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPS&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY")."></button></a>";
460    +    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWS&user=" . $username . "'>" . "<button class='sme-password-button' title=".l("Reset-Password")."></button></a>";
461         %      } else {
462    -    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPD&user=" . $username . "'>" . l('MODIFY') . "</a>";
463    +    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPD&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY")."></button></a>";
464         %          if ($password_set ne 'yes') {
465         %                  $actionLock = l('ACCOUNT_LOCKED');
466    -    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "' class='error'>" . l('PASSWORD_RESET') . "</a>";
467    +    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . "<button class='sme-password-button' style ='border-color:red;' title=".l("Reset-Password")."></button></a>";
468    +    %#                 $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "' class='error'>" . l('PASSWORD_RESET') . "</a>";
469         %          } else {
470    -    %                  $actionLock = "<a href='useraccountsd?CsrfDef=TOKEN&trt=LCK&user=" . $username . "'>" . l('usr_LOCK_ACCOUNT') . "</a>";
471    -    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
472    +    %                  $actionLock = "<a href='useraccountsd?CsrfDef=TOKEN&trt=LCK&user=" . $username . "'>" . "<button class='ui-button ui-widget ui-corner-all ui-button-icon-only' style ='height:2em' title=".l('usr_LOCK_ACCOUNT')."><span class='ui-icon ui-icon-key'></span></button></a>";
473    +    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . "<button class='ui-button ui-widget ui-corner-all ui-button-icon-only' style ='height:2em' title=".l("Reset-Password")."><span class='ui-icon ui-icon-refresh'></span></button></a>";
474    +    %#                 $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
475         %          }
476         %          if ( $removable eq 'yes' )  {
477    -    %                  $actionRemove = "<a href='useraccountsd?CsrfDef=TOKEN&trt=DEL&user=" . $username . "'>" . l('REMOVE') . "</a>";
478    +    %                  $actionRemove = "<a href='useraccountsd?CsrfDef=TOKEN&trt=DEL&user=" . $username . "'>" . "<button class='ui-button ui-widget ui-corner-all ui-button-icon-only' style ='height:2em' title=".l("REMOVE")."><span class='ui-icon ui-icon-trash'></span></button></a>";
479         %          }
480         %      }
481    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
482    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionResetPw) %></td>
483    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionLock) %></td>
484    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
485    -
486    +           <td class='sme-border' style="min-width:35em">
487    +                               <%= $c->render_to_string(inline => $actionModify) %>
488    +                               <%= $c->render_to_string(inline => $actionResetPw) %>
489    +                               <%= $c->render_to_string(inline => $actionLock) %>
490    +                               <%= $c->render_to_string(inline => $actionRemove) %>
491    +           </td>
492            </tr>
493         %    }
494            </tbody>
495  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  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
496  --- 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.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep      2021-06-21 10:25:10.000000000 +0100
497  +++ 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
498  @@ -131,7 +131,7 @@  @@ -131,7 +131,7 @@
499          %=l 'usr_GROUP_MEMBERSHIPS'          %=l 'usr_GROUP_MEMBERSHIPS'
500          </span>          </span>
501          <span class=data>          <span class=data>
502  -       <table class="sme-border"><tbody>  -       <table class="sme-border"><tbody>
503  +       <table class="sme-border TableSort"><tbody>  +       <table class="sme-border "><thead>
504          <tr><th class='sme-border'>          <tr><th class='sme-border'>
505              %=l 'usr_MEMBER'              %=l 'usr_MEMBER'
506              </th><th class='sme-border'>              </th><th class='sme-border'>
507    @@ -139,6 +139,7 @@
508                </th><th class='sme-border'>
509                %=l 'DESCRIPTION'
510            </th></tr>
511    +       </thead><tbody>
512            
513         %    foreach my $g ( @groups) {
514         %       my $user = $usr_datas->{user};
515  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  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
516  --- 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.old/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep   2024-01-27 09:43:09.743712276 +0000
517  +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep       2024-01-27 18:32:00.000000000 +0000  +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep       2024-01-27 18:32:00.000000000 +0000

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed