/[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.3 by brianr, Mon Jan 29 14:01: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 56  diff -urN smeserver-manager-0.1.4.old/ro Line 64  diff -urN smeserver-manager-0.1.4.old/ro
64   </html>   </html>
65  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
66  --- 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
67  +++ 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
68  @@ -16,7 +16,7 @@  @@ -16,7 +16,7 @@
69          <h2>          <h2>
70          %=l 'dom_CURRENT_DOMAINS'          %=l 'dom_CURRENT_DOMAINS'
# Line 79  diff -urN smeserver-manager-0.1.4.old/ro Line 87  diff -urN smeserver-manager-0.1.4.old/ro
87    
88       %    foreach my $domain ( @$domains ) {       %    foreach my $domain ( @$domains ) {
89           <tr>           <tr>
90  @@ -51,8 +52,9 @@  @@ -42,17 +43,18 @@
91       %          $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . l('REMOVE') . "</a>";               %= t td => (class => 'sme-border') => $domain->{'Content'}
92                 %= t td => (class => 'sme-border') => l('dom_' . $domain->{'Nameservers'})
93    
94    -    %      my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . l('MODIFY') . "</a>";
95    +    %      my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
96    
97         %      my $removable = ($domain->{Removable} || 'yes');
98         %      my $actionRemove = '&nbsp;';
99    
100         %      if ($removable eq 'yes')  {
101    -    %          $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . l('REMOVE') . "</a>";
102    +    %          $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
103       %      }       %      }
104    
105  -           <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 110  diff -urN smeserver-manager-0.1.4.old/ro
110          </tr>          </tr>
111       %  }       %  }
112    
113    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
114    --- 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
115    +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep   2024-01-27 09:38:00.000000000 +0000
116    @@ -4,5 +4,6 @@
117     SME Server <%= session 'releaseVersion' %> - Manager <%= $c->app->VERSION %>
118     <br>Copyright 1999-2006 Mitel Corporation<br>
119     %= session 'copyRight'
120    -<br>Copyright (c) 2013-2021 Koozali Foundation Inc.<br>
121    +<br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
122     </font>
123    +
124  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
125  --- 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
126  +++ 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
127  @@ -17,7 +17,7 @@  @@ -17,7 +17,7 @@
128       %  if ($numGroups == 0){       %  if ($numGroups == 0){
129           %=l 'ACCOUNT_GROUP_NONE'           %=l 'ACCOUNT_GROUP_NONE'
# Line 123  diff -urN smeserver-manager-0.1.4.old/ro Line 153  diff -urN smeserver-manager-0.1.4.old/ro
153               %= t td => (class => 'sme-border') => $group->prop('Description')               %= t td => (class => 'sme-border') => $group->prop('Description')
154  -           <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>
155  -           <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>
156  +           <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>
157  +                               <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>
158  +           </td>  +           </td>
159          </tr>          </tr>
160       %    }       %    }
161          </tbody>          </tbody>
162  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
163  --- 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
164  +++ 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
165  @@ -15,7 +15,7 @@  @@ -15,7 +15,7 @@
166          %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);          %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
167          </b><br></p>          </b><br></p>
# Line 150  diff -urN smeserver-manager-0.1.4.old/ro Line 180  diff -urN smeserver-manager-0.1.4.old/ro
180              %=l 'ACTION'              %=l 'ACTION'
181              </th>              </th>
182          </tr>          </tr>
183  @@ -50,9 +50,11 @@  @@ -47,12 +47,14 @@
184       %          $actionModify = "<a href='hostentriesd?CsrfDef=TOKEN&trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . l('MODIFY') . "</a>";               %= t td => (class => 'sme-border') => $_->{'Comment'};
185       %          $actionRemove = "<a href='hostentriesd?CsrfDef=TOKEN&trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . l('REMOVE') . "</a>";       %      my ($actionModify, $actionRemove) = '&nbsp;';
186         %      if ($_->{'static'} ne 'yes') {
187    -    %          $actionModify = "<a href='hostentriesd?CsrfDef=TOKEN&trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . l('MODIFY') . "</a>";
188    -    %          $actionRemove = "<a href='hostentriesd?CsrfDef=TOKEN&trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . l('REMOVE') . "</a>";
189    +    %          $actionModify = "<a href='hostentriesd?CsrfDef=TOKEN&trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
190    +    %          $actionRemove = "<a href='hostentriesd?CsrfDef=TOKEN&trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
191       %      }       %      }
192  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
193  -           <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 202  diff -urN smeserver-manager-0.1.4.old/ro
202       %  }       %  }
203  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
204  --- 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
205  +++ 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
206  @@ -21,7 +21,7 @@  @@ -21,7 +21,7 @@
207       %  if ($numIbays == 0){       %  if ($numIbays == 0){
208           %=l 'iba_NO_IBAYS'           %=l 'iba_NO_IBAYS'
# Line 192  diff -urN smeserver-manager-0.1.4.old/ro Line 227  diff -urN smeserver-manager-0.1.4.old/ro
227       %    foreach my $ibay (@$ibays)       %    foreach my $ibay (@$ibays)
228       %    {       %    {
229       %      my $modifiable = $ibay->prop('Modifiable') || 'yes';       %      my $modifiable = $ibay->prop('Modifiable') || 'yes';
230  @@ -60,10 +60,11 @@  @@ -47,7 +47,7 @@
231                 %= t td => (class => 'sme-border') => $ibay->prop('Name')
232         %      my ($actionModify, $actionResetPw, $actionRemove) = '&nbsp;';
233         %      if ($modifiable eq 'yes') {
234    -    %          $actionModify = "<a href='ibaysd?CsrfDef=TOKEN&trt=UPD&ibay=" . $ibay->key . "'>" . l('MODIFY') . "</a>";
235    +    %          $actionModify = "<a href='ibaysd?CsrfDef=TOKEN&trt=UPD&ibay=" . $ibay->key . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
236         %      }
237         %      if ($passwordable eq 'yes')  {
238         %          if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
239    @@ -58,12 +58,13 @@
240         %          $actionResetPw .= '&nbsp';
241         %      }
242       %      if ($removable eq 'yes')  {       %      if ($removable eq 'yes')  {
243       %          $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>";
244    +    %          $actionRemove = "<a href='ibaysd?CsrfDef=TOKEN&trt=DEL&ibay=" . $ibay->key . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
245       %      }       %      }
246  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>  -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
247  -           <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 257  diff -urN smeserver-manager-0.1.4.old/ro
257          </tbody>          </tbody>
258  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
259  --- 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
260  +++ 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
261  @@ -47,28 +47,28 @@  @@ -47,28 +47,28 @@
262           %=l 'ln_LOCAL_NETWORK_NONE'           %=l 'ln_LOCAL_NETWORK_NONE'
263       %  } else {       %  } else {
# Line 251  diff -urN smeserver-manager-0.1.4.old/ro Line 298  diff -urN smeserver-manager-0.1.4.old/ro
298                  %    foreach my $localnetwork (@$localnetworks )                  %    foreach my $localnetwork (@$localnetworks )
299                  %    {                  %    {
300                  %       my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );                  %       my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
301    @@ -82,7 +82,7 @@
302                                            %= t td => (class => 'sme-border') => $localnetwork->prop('Router')
303                                            %  if ($removable eq "yes") {
304                                                    <td class='sme-border'>
305    -                                               <a href="localnetworksd?CsrfDef=TOKEN&trt=DEL&localnetwork=<%= $localnetwork->key%>"><%=l 'REMOVE'%></a></td>
306    +                                               <a href="localnetworksd?CsrfDef=TOKEN&trt=DEL&localnetwork=<%= $localnetwork->key%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"></button></a></td>
307                                            % } else {
308                                                    <td class='sme-border'> </td>
309                                            %}
310  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
311  --- 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
312  +++ 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
313  @@ -46,37 +46,31 @@  @@ -46,37 +46,31 @@
314           <br>           <br>
315                  %=l 'pf_SHOW_FORWARDS'                  %=l 'pf_SHOW_FORWARDS'
# Line 316  diff -urN smeserver-manager-0.1.4.old/ro Line 372  diff -urN smeserver-manager-0.1.4.old/ro
372  -                                               <td class='sme-border'>  -                                               <td class='sme-border'>
373  -                                               <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>
374  +                                       <td class='sme-border'>  +                                       <td class='sme-border'>
375  +                                               <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>
376  +                                       </td>  +                                       </td>
377                          </tr>                          </tr>
378            %       }            %       }
# Line 332  diff -urN smeserver-manager-0.1.4.old/ro Line 388  diff -urN smeserver-manager-0.1.4.old/ro
388    
389  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
390  --- 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
391  +++ 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
392  @@ -21,7 +21,7 @@  @@ -21,7 +21,7 @@
393       %  if ($numPrinters == 0){       %  if ($numPrinters == 0){
394           %=l 'prt_NO_PRINTERS'           %=l 'prt_NO_PRINTERS'
# Line 350  diff -urN smeserver-manager-0.1.4.old/ro Line 406  diff -urN smeserver-manager-0.1.4.old/ro
406       %    foreach my $printer (@$printerDrivers)       %    foreach my $printer (@$printerDrivers)
407       %    {       %    {
408       %        my $address = ($printer->prop('Location') eq 'remote')       %        my $address = ($printer->prop('Location') eq 'remote')
409    @@ -55,7 +56,7 @@
410                 %= t td => (class => 'sme-border') => $printer->prop('Location')
411                 %= t td => (class => 'sme-border') => $address
412                 %= t td => (class => 'sme-border') => $remoteName
413    -           <td class='sme-border'><a href="printers2?CsrfDef=TOKEN&trt=DEL&printer=<%= $printer->key%>"><%=l 'REMOVE'%></a></td>
414    +           <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>
415            </tr>
416         %    }
417            </tbody>
418  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
419  --- 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
420  +++ 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
421  @@ -19,7 +19,7 @@  @@ -19,7 +19,7 @@
422       %  if ($numPseudonyms == 0){       %  if ($numPseudonyms == 0){
423           %=l 'pse_ACCOUNT_PSEUDONYM_NONE'           %=l 'pse_ACCOUNT_PSEUDONYM_NONE'
# Line 378  diff -urN smeserver-manager-0.1.4.old/ro Line 443  diff -urN smeserver-manager-0.1.4.old/ro
443    
444       %    foreach my $pseudonym ( @$pseudonyms )       %    foreach my $pseudonym ( @$pseudonyms )
445       %    {       %    {
446  @@ -58,8 +59,9 @@  @@ -52,14 +53,15 @@
447       %          $actionRemove = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=DEL&pseudonym=" . $pseudonym->key . "'>" . l('REMOVE') . "</a>";  
448         %      my ($actionModify, $actionRemove) = '&nbsp;';
449         %      if ($modifiable eq 'yes') {
450    -    %          $actionModify = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=UPD&pseudonym=" . $pseudonym->key . "'>" . l('MODIFY') . "</a>";
451    +    %          $actionModify = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=UPD&pseudonym=" . $pseudonym->key . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
452         %      }
453         %      if ($removable eq 'yes')  {
454    -    %          $actionRemove = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=DEL&pseudonym=" . $pseudonym->key . "'>" . l('REMOVE') . "</a>";
455    +    %          $actionRemove = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=DEL&pseudonym=" . $pseudonym->key . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
456       %      }       %      }
457    
458  -           <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 465  diff -urN smeserver-manager-0.1.4.old/ro
465       %    }       %    }
466  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
467  --- 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
468  +++ 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
469  @@ -18,7 +18,7 @@  @@ -18,7 +18,7 @@
470       %   my $absolute = l('quo_ABS_LIMIT_MB');     $absolute =~ s#(limitX)#<br>$1#;       %   my $absolute = l('quo_ABS_LIMIT_MB');     $absolute =~ s#(limitX)#<br>$1#;
471       %    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 483  diff -urN smeserver-manager-0.1.4.old/ro
483    
484       %    foreach my $user (@$userAccounts)       %    foreach my $user (@$userAccounts)
485       %    {       %    {
486    @@ -56,7 +57,7 @@
487                 %= t td => (class => 'sme-border') => sprintf("%.2f", $bs / 1024 )
488                 %= t td => (class => 'sme-border') => sprintf("%.2f", $bh / 1024 )
489                 %= t td => (class => 'sme-border') => sprintf("%.2f", $bc / 1024 )
490    -           <td class='sme-border'><a href="quotad?CsrfDef=TOKEN&trt=UPD&user=<%= $user->key%>"><%=l 'MODIFY'%></a></td>
491    +           <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>
492            </tr>
493         %    }
494            </tbody>
495  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
496  --- 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
497  +++ 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
498  @@ -21,7 +21,7 @@  @@ -21,7 +21,7 @@
499       %  if ($numUsers == 0){       %  if ($numUsers == 0){
500           %=l 'usr_NO_USER_ACCOUNTS'           %=l 'usr_NO_USER_ACCOUNTS'
# Line 422  diff -urN smeserver-manager-0.1.4.old/ro Line 504  diff -urN smeserver-manager-0.1.4.old/ro
504          <tr>          <tr>
505              <th class='sme-border'>              <th class='sme-border'>
506              %=l 'ACCOUNT'              %=l 'ACCOUNT'
507    @@ -35,7 +35,7 @@
508                <th class='sme-border'>
509                %=l 'usr_FORWARDING_ADDRESS'
510                </th>
511    -           <th class='sme-border' colspan='4'>
512    +           <th class='sme-border'>
513                %=l 'ACTION'
514                </th>
515            </tr>
516    @@ -61,26 +61,29 @@
517                 %= t td => (class => 'sme-border') => $fwd
518         %      my ($actionModify, $actionLock, $actionResetPw, $actionRemove) = '&nbsp;';
519         %      if ($username eq 'admin')  {
520    -    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPS&user=" . $username . "'>" . l('MODIFY') . "</a>";
521    -    %          $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWS&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
522    +    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPS&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY")."></button></a>";
523    +    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWS&user=" . $username . "'>" . "<button class='sme-password-button' title=".l("Reset-Password")."></button></a>";
524         %      } else {
525    -    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPD&user=" . $username . "'>" . l('MODIFY') . "</a>";
526    +    %          $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPD&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY")."></button></a>";
527         %          if ($password_set ne 'yes') {
528         %                  $actionLock = l('ACCOUNT_LOCKED');
529    -    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "' class='error'>" . l('PASSWORD_RESET') . "</a>";
530    +    %                  $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>";
531    +    %#                 $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "' class='error'>" . l('PASSWORD_RESET') . "</a>";
532         %          } else {
533    -    %                  $actionLock = "<a href='useraccountsd?CsrfDef=TOKEN&trt=LCK&user=" . $username . "'>" . l('usr_LOCK_ACCOUNT') . "</a>";
534    -    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
535    +    %                  $actionLock = "<a href='useraccountsd?CsrfDef=TOKEN&trt=LCK&user=" . $username . "'>" . "<button class='sme-lock-button' title=".l('usr_LOCK_ACCOUNT')."></button></a>";
536    +    %                  $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . "<button class='sme-password-button' title=".l("Reset-Password")."></button></a>";
537    +    %#                 $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
538         %          }
539         %          if ( $removable eq 'yes' )  {
540    -    %                  $actionRemove = "<a href='useraccountsd?CsrfDef=TOKEN&trt=DEL&user=" . $username . "'>" . l('REMOVE') . "</a>";
541    +    %                  $actionRemove = "<a href='useraccountsd?CsrfDef=TOKEN&trt=DEL&user=" . $username . "'>" . "<button class='sme-remove-button' title=".l("REMOVE")."></button></a>";
542         %          }
543         %      }
544    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
545    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionResetPw) %></td>
546    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionLock) %></td>
547    -           <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
548    -
549    +           <td class='sme-border' style="min-width:35em">
550    +                               <%= $c->render_to_string(inline => $actionModify) %>
551    +                               <%= $c->render_to_string(inline => $actionResetPw) %>
552    +                               <%= $c->render_to_string(inline => $actionLock) %>
553    +                               <%= $c->render_to_string(inline => $actionRemove) %>
554    +           </td>
555            </tr>
556         %    }
557            </tbody>
558  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
559  --- 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
560  +++ 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
561  @@ -131,7 +131,7 @@  @@ -131,7 +131,7 @@
562          %=l 'usr_GROUP_MEMBERSHIPS'          %=l 'usr_GROUP_MEMBERSHIPS'
563          </span>          </span>
564          <span class=data>          <span class=data>
565  -       <table class="sme-border"><tbody>  -       <table class="sme-border"><tbody>
566  +       <table class="sme-border TableSort"><tbody>  +       <table class="sme-border "><thead>
567          <tr><th class='sme-border'>          <tr><th class='sme-border'>
568              %=l 'usr_MEMBER'              %=l 'usr_MEMBER'
569              </th><th class='sme-border'>              </th><th class='sme-border'>
570    @@ -139,6 +139,7 @@
571                </th><th class='sme-border'>
572                %=l 'DESCRIPTION'
573            </th></tr>
574    +       </thead><tbody>
575            
576         %    foreach my $g ( @groups) {
577         %       my $user = $usr_datas->{user};
578  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
579  --- 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
580  +++ 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