/[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.4 by brianr, Mon Jan 29 14:46:56 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-29 14:41:00.000000000 +0000
16  @@ -17,6 +17,16 @@  @@ -17,6 +17,26 @@
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 {
28  +               width: min-content;  +               width: min-content;
29  +               margin-right: auto;  +               margin-right: auto;
30  +       }  +       }
31    +      
32    +       .ui-button {
33    +               position: relative;
34    +               font-size: 0;
35    +               width: 23px;
36    +               height: 23px;
37    +       }
38  +       %end  +       %end
39  +  +
40   </head>   </head>
41    
42   <body>   <body>
43  @@ -73,6 +83,23 @@  @@ -73,6 +93,28 @@
44          %= content 'js_swapClass'          %= content 'js_swapClass'
45          %= content 'js_togglePassword'          %= content 'js_togglePassword'
46       % }       % }
# Line 47  diff -urN smeserver-manager-0.1.4.old/ro Line 57  diff -urN smeserver-manager-0.1.4.old/ro
57  +                               "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.");}
58  +                       }  +                       }
59  +               });  +               });
60    +               $(".sme-modify-button").button({"icon": "ui-icon-pencil"});
61    +               $(".sme-remove-button").button({"icon": "ui-icon-trash"});
62    +               $(".sme-password-button").button({"icon": "ui-icon-refresh"});
63    +               $(".sme-lock-button").button({"icon": "ui-icon-key"});
64    +              
65  +   });  +   });
66  +%end  +%end
67  +      +    
# Line 56  diff -urN smeserver-manager-0.1.4.old/ro Line 71  diff -urN smeserver-manager-0.1.4.old/ro
71   </html>   </html>
72  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  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
73  --- 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.old/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep     2024-01-27 09:43:09.731711904 +0000
74  +++ 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
75  @@ -16,7 +16,7 @@  @@ -16,7 +16,7 @@
76          <h2>          <h2>
77          %=l 'dom_CURRENT_DOMAINS'          %=l 'dom_CURRENT_DOMAINS'
# Line 79  diff -urN smeserver-manager-0.1.4.old/ro Line 94  diff -urN smeserver-manager-0.1.4.old/ro
94    
95       %    foreach my $domain ( @$domains ) {       %    foreach my $domain ( @$domains ) {
96           <tr>           <tr>
97  @@ -51,8 +52,9 @@  @@ -42,17 +43,18 @@
98       %          $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . l('REMOVE') . "</a>";               %= t td => (class => 'sme-border') => $domain->{'Content'}
99                 %= t td => (class => 'sme-border') => l('dom_' . $domain->{'Nameservers'})
100    
101    -    %      my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . l('MODIFY') . "</a>";
102    +    %      my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
103    
104         %      my $removable = ($domain->{Removable} || 'yes');
105         %      my $actionRemove = '&nbsp;';
106    
107         %      if ($removable eq 'yes')  {
108    -    %          $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . l('REMOVE') . "</a>";
109    +    %          $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
110       %      }       %      }
111    
112  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
# Line 91  diff -urN smeserver-manager-0.1.4.old/ro Line 117  diff -urN smeserver-manager-0.1.4.old/ro
117          </tr>          </tr>
118       %  }       %  }
119    
120    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
121    --- 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
122    +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep   2024-01-27 09:38:00.000000000 +0000
123    @@ -4,5 +4,6 @@
124     SME Server <%= session 'releaseVersion' %> - Manager <%= $c->app->VERSION %>
125     <br>Copyright 1999-2006 Mitel Corporation<br>
126     %= session 'copyRight'
127    -<br>Copyright (c) 2013-2021 Koozali Foundation Inc.<br>
128    +<br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
129     </font>
130    +
131  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
132  --- 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
133  +++ 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
134  @@ -17,7 +17,7 @@  @@ -17,7 +17,7 @@
135       %  if ($numGroups == 0){       %  if ($numGroups == 0){
136           %=l 'ACCOUNT_GROUP_NONE'           %=l 'ACCOUNT_GROUP_NONE'
# Line 123  diff -urN smeserver-manager-0.1.4.old/ro Line 160  diff -urN smeserver-manager-0.1.4.old/ro
160               %= t td => (class => 'sme-border') => $group->prop('Description')               %= t td => (class => 'sme-border') => $group->prop('Description')
161  -           <td class='sme-border'><a href="groups2?CsrfDef=TOKEN&trt=UPD&group=<%= $group->key%>"><%=l 'MODIFY'%></a></td>  -           <td class='sme-border'><a href="groups2?CsrfDef=TOKEN&trt=UPD&group=<%= $group->key%>"><%=l 'MODIFY'%></a></td>
162  -           <td class='sme-border'><a href="groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>"><%=l 'REMOVE'%></a></td>  -           <td class='sme-border'><a href="groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>"><%=l 'REMOVE'%></a></td>
163  +           <td class='sme-border' style="min-width:15em"><a href="groups2?CsrfDef=TOKEN&trt=UPD&group=<%= $group->key%>"><%=l 'MODIFY'%></a>  +           <td class='sme-border' style="min-width:15em"><a href="groups2?CsrfDef=TOKEN&trt=UPD&group=<%= $group->key%>"><button class='sme-modify-button' title="<%=l('MODIFY')%>"></button></a>
164  +                               <a href="groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>"><%=l 'REMOVE'%></a>  +                               <a href="groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"</button></a>
165  +           </td>  +           </td>
166          </tr>          </tr>
167       %    }       %    }
168          </tbody>          </tbody>
169  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  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
170  --- 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.old/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep     2024-01-27 09:43:09.753712587 +0000
171  +++ 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
172  @@ -15,7 +15,7 @@  @@ -15,7 +15,7 @@
173          %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);          %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
174          </b><br></p>          </b><br></p>
# Line 150  diff -urN smeserver-manager-0.1.4.old/ro Line 187  diff -urN smeserver-manager-0.1.4.old/ro
187              %=l 'ACTION'              %=l 'ACTION'
188              </th>              </th>
189          </tr>          </tr>
190  @@ -50,9 +50,11 @@  @@ -47,12 +47,14 @@
191       %          $actionModify = "<a href='hostentriesd?CsrfDef=TOKEN&trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . l('MODIFY') . "</a>";               %= t td => (class => 'sme-border') => $_->{'Comment'};
192       %          $actionRemove = "<a href='hostentriesd?CsrfDef=TOKEN&trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . l('REMOVE') . "</a>";       %      my ($actionModify, $actionRemove) = '&nbsp;';
193         %      if ($_->{'static'} ne 'yes') {
194    -    %          $actionModify = "<a href='hostentriesd?CsrfDef=TOKEN&trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . l('MODIFY') . "</a>";
195    -    %          $actionRemove = "<a href='hostentriesd?CsrfDef=TOKEN&trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . l('REMOVE') . "</a>";
196    +    %          $actionModify = "<a href='hostentriesd?CsrfDef=TOKEN&trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
197    +    %          $actionRemove = "<a href='hostentriesd?CsrfDef=TOKEN&trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
198       %      }       %      }
199  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
200  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
# Line 167  diff -urN smeserver-manager-0.1.4.old/ro Line 209  diff -urN smeserver-manager-0.1.4.old/ro
209       %  }       %  }
210  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  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
211  --- 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.old/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep     2024-01-27 09:43:09.732711935 +0000
212  +++ 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
213  @@ -21,7 +21,7 @@  @@ -21,7 +21,7 @@
214       %  if ($numIbays == 0){       %  if ($numIbays == 0){
215           %=l 'iba_NO_IBAYS'           %=l 'iba_NO_IBAYS'
# Line 192  diff -urN smeserver-manager-0.1.4.old/ro Line 234  diff -urN smeserver-manager-0.1.4.old/ro
234       %    foreach my $ibay (@$ibays)       %    foreach my $ibay (@$ibays)
235       %    {       %    {
236       %      my $modifiable = $ibay->prop('Modifiable') || 'yes';       %      my $modifiable = $ibay->prop('Modifiable') || 'yes';
237  @@ -60,10 +60,11 @@  @@ -47,7 +47,7 @@
238                 %= t td => (class => 'sme-border') => $ibay->prop('Name')
239         %      my ($actionModify, $actionResetPw, $actionRemove) = '&nbsp;';
240         %      if ($modifiable eq 'yes') {
241    -    %          $actionModify = "<a href='ibaysd?CsrfDef=TOKEN&trt=UPD&ibay=" . $ibay->key . "'>" . l('MODIFY') . "</a>";
242    +    %          $actionModify = "<a href='ibaysd?CsrfDef=TOKEN&trt=UPD&ibay=" . $ibay->key . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
243         %      }
244         %      if ($passwordable eq 'yes')  {
245         %          if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
246    @@ -58,12 +58,13 @@
247         %          $actionResetPw .= '&nbsp';
248         %      }
249       %      if ($removable eq 'yes')  {       %      if ($removable eq 'yes')  {
250       %          $actionRemove = "<a href='ibaysd?CsrfDef=TOKEN&trt=DEL&ibay=" . $ibay->key . "'>" . l('REMOVE') . "</a>";  -    %          $actionRemove = "<a href='ibaysd?CsrfDef=TOKEN&trt=DEL&ibay=" . $ibay->key . "'>" . l('REMOVE') . "</a>";
251    +    %          $actionRemove = "<a href='ibaysd?CsrfDef=TOKEN&trt=DEL&ibay=" . $ibay->key . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
252       %      }       %      }
253  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
254  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionResetPw) %></td>  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionResetPw) %></td>
# Line 210  diff -urN smeserver-manager-0.1.4.old/ro Line 264  diff -urN smeserver-manager-0.1.4.old/ro
264          </tbody>          </tbody>
265  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  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
266  --- 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.old/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep      2024-01-27 09:43:09.732711935 +0000
267  +++ 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
268  @@ -47,28 +47,28 @@  @@ -47,28 +47,28 @@
269           %=l 'ln_LOCAL_NETWORK_NONE'           %=l 'ln_LOCAL_NETWORK_NONE'
270       %  } else {       %  } else {
# Line 251  diff -urN smeserver-manager-0.1.4.old/ro Line 305  diff -urN smeserver-manager-0.1.4.old/ro
305                  %    foreach my $localnetwork (@$localnetworks )                  %    foreach my $localnetwork (@$localnetworks )
306                  %    {                  %    {
307                  %       my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );                  %       my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
308    @@ -82,7 +82,7 @@
309                                            %= t td => (class => 'sme-border') => $localnetwork->prop('Router')
310                                            %  if ($removable eq "yes") {
311                                                    <td class='sme-border'>
312    -                                               <a href="localnetworksd?CsrfDef=TOKEN&trt=DEL&localnetwork=<%= $localnetwork->key%>"><%=l 'REMOVE'%></a></td>
313    +                                               <a href="localnetworksd?CsrfDef=TOKEN&trt=DEL&localnetwork=<%= $localnetwork->key%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"></button></a></td>
314                                            % } else {
315                                                    <td class='sme-border'> </td>
316                                            %}
317  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  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
318  --- 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.old/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep      2024-01-27 09:43:09.732711935 +0000
319  +++ 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
320  @@ -46,37 +46,31 @@  @@ -46,37 +46,31 @@
321           <br>           <br>
322                  %=l 'pf_SHOW_FORWARDS'                  %=l 'pf_SHOW_FORWARDS'
# Line 316  diff -urN smeserver-manager-0.1.4.old/ro Line 379  diff -urN smeserver-manager-0.1.4.old/ro
379  -                                               <td class='sme-border'>  -                                               <td class='sme-border'>
380  -                                               <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><%=l 'REMOVE'%></a></td>  -                                               <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><%=l 'REMOVE'%></a></td>
381  +                                       <td class='sme-border'>  +                                       <td class='sme-border'>
382  +                                               <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><%=l 'REMOVE'%></a>  +                                               <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"></button></a>
383  +                                       </td>  +                                       </td>
384                          </tr>                          </tr>
385            %       }            %       }
# Line 332  diff -urN smeserver-manager-0.1.4.old/ro Line 395  diff -urN smeserver-manager-0.1.4.old/ro
395    
396  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  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
397  --- 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.old/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep     2024-01-27 09:43:09.733711966 +0000
398  +++ 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
399  @@ -21,7 +21,7 @@  @@ -21,7 +21,7 @@
400       %  if ($numPrinters == 0){       %  if ($numPrinters == 0){
401           %=l 'prt_NO_PRINTERS'           %=l 'prt_NO_PRINTERS'
# Line 350  diff -urN smeserver-manager-0.1.4.old/ro Line 413  diff -urN smeserver-manager-0.1.4.old/ro
413       %    foreach my $printer (@$printerDrivers)       %    foreach my $printer (@$printerDrivers)
414       %    {       %    {
415       %        my $address = ($printer->prop('Location') eq 'remote')       %        my $address = ($printer->prop('Location') eq 'remote')
416    @@ -55,7 +56,7 @@
417                 %= t td => (class => 'sme-border') => $printer->prop('Location')
418                 %= t td => (class => 'sme-border') => $address
419                 %= t td => (class => 'sme-border') => $remoteName
420    -           <td class='sme-border'><a href="printers2?CsrfDef=TOKEN&trt=DEL&printer=<%= $printer->key%>"><%=l 'REMOVE'%></a></td>
421    +           <td class='sme-border'><a href="printers2?CsrfDef=TOKEN&trt=DEL&printer=<%= $printer->key%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"></button></a></td>
422            </tr>
423         %    }
424            </tbody>
425  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  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
426  --- 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.old/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep     2024-01-27 09:43:09.733711966 +0000
427  +++ 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
428  @@ -19,7 +19,7 @@  @@ -19,7 +19,7 @@
429       %  if ($numPseudonyms == 0){       %  if ($numPseudonyms == 0){
430           %=l 'pse_ACCOUNT_PSEUDONYM_NONE'           %=l 'pse_ACCOUNT_PSEUDONYM_NONE'
# Line 378  diff -urN smeserver-manager-0.1.4.old/ro Line 450  diff -urN smeserver-manager-0.1.4.old/ro
450    
451       %    foreach my $pseudonym ( @$pseudonyms )       %    foreach my $pseudonym ( @$pseudonyms )
452       %    {       %    {
453  @@ -58,8 +59,9 @@  @@ -52,14 +53,15 @@
454       %          $actionRemove = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=DEL&pseudonym=" . $pseudonym->key . "'>" . l('REMOVE') . "</a>";  
455         %      my ($actionModify, $actionRemove) = '&nbsp;';
456         %      if ($modifiable eq 'yes') {
457    -    %          $actionModify = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=UPD&pseudonym=" . $pseudonym->key . "'>" . l('MODIFY') . "</a>";
458    +    %          $actionModify = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=UPD&pseudonym=" . $pseudonym->key . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
459         %      }
460         %      if ($removable eq 'yes')  {
461    -    %          $actionRemove = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=DEL&pseudonym=" . $pseudonym->key . "'>" . l('REMOVE') . "</a>";
462    +    %          $actionRemove = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=DEL&pseudonym=" . $pseudonym->key . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
463       %      }       %      }
464    
465  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
# Line 392  diff -urN smeserver-manager-0.1.4.old/ro Line 472  diff -urN smeserver-manager-0.1.4.old/ro
472       %    }       %    }
473  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  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
474  --- 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.old/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep     2024-01-27 09:43:09.733711966 +0000
475  +++ 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
476  @@ -18,7 +18,7 @@  @@ -18,7 +18,7 @@
477       %   my $absolute = l('quo_ABS_LIMIT_MB');     $absolute =~ s#(limitX)#<br>$1#;       %   my $absolute = l('quo_ABS_LIMIT_MB');     $absolute =~ s#(limitX)#<br>$1#;
478       %    my $current = l('quo_CURRENT_USAGE');     $current =~ s#(usageX)#<br>$1#;       %    my $current = l('quo_CURRENT_USAGE');     $current =~ s#(usageX)#<br>$1#;
# Line 410  diff -urN smeserver-manager-0.1.4.old/ro Line 490  diff -urN smeserver-manager-0.1.4.old/ro
490    
491       %    foreach my $user (@$userAccounts)       %    foreach my $user (@$userAccounts)
492       %    {       %    {
493    @@ -56,7 +57,7 @@
494                 %= t td => (class => 'sme-border') => sprintf("%.2f", $bs / 1024 )
495                 %= t td => (class => 'sme-border') => sprintf("%.2f", $bh / 1024 )
496                 %= t td => (class => 'sme-border') => sprintf("%.2f", $bc / 1024 )
497    -           <td class='sme-border'><a href="quotad?CsrfDef=TOKEN&trt=UPD&user=<%= $user->key%>"><%=l 'MODIFY'%></a></td>
498    +           <td class='sme-border'><a href="quotad?CsrfDef=TOKEN&trt=UPD&user=<%= $user->key%>"><button class='sme-modify-button' title="<%=l('MODIFY')%>"></button></a></td>
499            </tr>
500         %    }
501            </tbody>
502  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
503  --- 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
504  +++ 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
505  @@ -21,7 +21,7 @@  @@ -21,7 +21,7 @@
506       %  if ($numUsers == 0){       %  if ($numUsers == 0){
507           %=l 'usr_NO_USER_ACCOUNTS'           %=l 'usr_NO_USER_ACCOUNTS'
# Line 422  diff -urN smeserver-manager-0.1.4.old/ro Line 511  diff -urN smeserver-manager-0.1.4.old/ro
511          <tr>          <tr>
512              <th class='sme-border'>              <th class='sme-border'>
513              %=l 'ACCOUNT'              %=l 'ACCOUNT'
514    @@ -35,7 +35,7 @@
515                <th class='sme-border'>
516                %=l 'usr_FORWARDING_ADDRESS'
517                </th>
518    -           <th class='sme-border' colspan='4'>
519    +           <th class='sme-border'>
520                %=l 'ACTION'
521                </th>
522            </tr>
523    @@ -61,26 +61,29 @@
524                 %= t td => (class => 'sme-border') => $fwd
525         %      my ($actionModify, $actionLock, $actionResetPw, $actionRemove) = '&nbsp;';
526         %      if ($username eq 'admin')  {
527    -    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPS&user=" . $username . "'>" . l('MODIFY') . "</a>";
528    -    %          $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWS&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
529    +    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPS&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY")."></button></a>";
530    +    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWS&user=" . $username . "'>" . "<button class='sme-password-button' title=".l("Reset-Password")."></button></a>";
531         %      } else {
532    -    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPD&user=" . $username . "'>" . l('MODIFY') . "</a>";
533    +    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPD&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY")."></button></a>";
534         %          if ($password_set ne 'yes') {
535         %                  $actionLock = l('ACCOUNT_LOCKED');
536    -    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "' class='error'>" . l('PASSWORD_RESET') . "</a>";
537    +    %                  $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>";
538    +    %#                 $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "' class='error'>" . l('PASSWORD_RESET') . "</a>";
539         %          } else {
540    -    %                  $actionLock = "<a href='useraccountsd?CsrfDef=TOKEN&trt=LCK&user=" . $username . "'>" . l('usr_LOCK_ACCOUNT') . "</a>";
541    -    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
542    +    %                  $actionLock = "<a href='useraccountsd?CsrfDef=TOKEN&trt=LCK&user=" . $username . "'>" . "<button class='sme-lock-button' title=".l('usr_LOCK_ACCOUNT')."></button></a>";
543    +    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . "<button class='sme-password-button' title=".l("Reset-Password")."></button></a>";
544    +    %#                 $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
545         %          }
546         %          if ( $removable eq 'yes' )  {
547    -    %                  $actionRemove = "<a href='useraccountsd?CsrfDef=TOKEN&trt=DEL&user=" . $username . "'>" . l('REMOVE') . "</a>";
548    +    %                  $actionRemove = "<a href='useraccountsd?CsrfDef=TOKEN&trt=DEL&user=" . $username . "'>" . "<button class='sme-remove-button' title=".l("REMOVE")."></button></a>";
549         %          }
550         %      }
551    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
552    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionResetPw) %></td>
553    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionLock) %></td>
554    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
555    -
556    +           <td class='sme-border' style="min-width:35em">
557    +                               <%= $c->render_to_string(inline => $actionModify) %>
558    +                               <%= $c->render_to_string(inline => $actionResetPw) %>
559    +                               <%= $c->render_to_string(inline => $actionLock) %>
560    +                               <%= $c->render_to_string(inline => $actionRemove) %>
561    +           </td>
562            </tr>
563         %    }
564            </tbody>
565  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
566  --- 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
567  +++ 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
568  @@ -131,7 +131,7 @@  @@ -131,7 +131,7 @@
569          %=l 'usr_GROUP_MEMBERSHIPS'          %=l 'usr_GROUP_MEMBERSHIPS'
570          </span>          </span>
571          <span class=data>          <span class=data>
572  -       <table class="sme-border"><tbody>  -       <table class="sme-border"><tbody>
573  +       <table class="sme-border TableSort"><tbody>  +       <table class="sme-border "><thead>
574          <tr><th class='sme-border'>          <tr><th class='sme-border'>
575              %=l 'usr_MEMBER'              %=l 'usr_MEMBER'
576              </th><th class='sme-border'>              </th><th class='sme-border'>
577    @@ -139,6 +139,7 @@
578                </th><th class='sme-border'>
579                %=l 'DESCRIPTION'
580            </th></tr>
581    +       </thead><tbody>
582            
583         %    foreach my $g ( @groups) {
584         %       my $user = $usr_datas->{user};
585  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
586  --- 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
587  +++ 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