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

Contents 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

Revision 1.3 - (show annotations) (download)
Mon Jan 29 14:01:07 2024 UTC (4 months, 2 weeks ago) by brianr
Branch: MAIN
Changes since 1.2: +88 -25 lines 
* Sat Jan 27 2024 Brian Read <brianr@koozali.org> 0.1.4-22.sme
- Update to use jquery plugin dataTables [SME: 12458]
- Update Copyright footer to 2024
- Edit tables to have TableSort in class
- Fix up tables tbody and thead correctly
- Sort out action column to make compatible with dataTable
1 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm
2 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-01-27 09:43:09.770713114 +0000
3 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-01-27 19:56:00.000000000 +0000
4 @@ -240,7 +240,7 @@
5 return $c->l('prt_ERR_UNEXPECTED_DESC') . ': ' . $description;
6 }
7
8 - if ($location =~ /^(lp[0-9]+|remote|usb\/lp[0-9]+)$/)
9 + if ($location =~ /^(lp[0-9]+|remote|usb\/lp[0-9]+)$/){
10 $location = $1;
11 } else {
12 $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
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
15 +++ 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,19 @@
17 %= include 'common_js'
18 % }
19 %= content_for 'refresh'
20 + <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>
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 -->
26 + %= stylesheet begin
27 + .dataTables_wrapper {
28 + width: min-content;
29 + margin-right: auto;
30 + }
31 + %end
32 +
33 </head>
34
35 <body>
36 @@ -73,6 +86,28 @@
37 %= content 'js_swapClass'
38 %= content 'js_togglePassword'
39 % }
40 +%= javascript begin
41 + $(window).on('pageshow', function(){
42 + //alert('page show');
43 + $('.TableSort').DataTable({
44 + "stateSave": true,
45 + "retrieve": true,
46 + "responsive":true,
47 + "language": {
48 + "emptyTable": "No record found.",
49 + "processing":'" style="color: rgba(42, 43, 43, 1)">Loading... ',
50 + "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
60 +
61 +
62
63 </body>
64 </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
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
67 +++ 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 @@
69 <h2>
70 %=l 'dom_CURRENT_DOMAINS'
71 </h2>
72 - <table class="sme-border"><tbody>
73 + <table class="sme-border TableSort"><thead>
74 <tr>
75 <th class='sme-border'>
76 %=l 'DOMAIN_NAME'
77 @@ -30,10 +30,11 @@
78 <th class='sme-border'>
79 %=l 'dom_LABEL_NAMESERVERS'
80 </th>
81 - <th class='sme-border' colspan='2'>
82 + <th class='sme-border'>
83 %=l 'ACTION'
84 </th>
85 </tr>
86 + </thead><tbody>
87
88 % foreach my $domain ( @$domains ) {
89 <tr>
90 @@ -42,17 +43,18 @@
91 %= 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>
106 - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
107 + <td class='sme-border' style="min-width:15em">
108 + <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
109 + </td>
110 </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
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
126 +++ 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 @@
128 % if ($numGroups == 0){
129 %=l 'ACCOUNT_GROUP_NONE'
130 % } else {
131 - <table class="sme-border"><tbody>
132 + <table class="sme-border TableSort"><thead>
133 <tr>
134 <th class='sme-border'>
135 %=l 'GROUP'
136 @@ -25,19 +25,20 @@
137 <th class='sme-border'>
138 %=l 'DESCRIPTION'
139 </th>
140 - <th class='sme-border' colspan='2'>
141 -
142 - %=l 'ACTION'
143 + <th class='sme-border'>
144 + %=l 'ACTION'
145 </th>
146 </tr>
147 + </thead><tbody>
148
149 % foreach my $group ( @$groups )
150 % {
151 <tr>
152 %= t td => (class => 'sme-border') => $group->key
153 %= 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>
155 - <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%>"><button class='sme-modify-button' title="<%=l('MODIFY')%>"></button></a>
157 + <a href="groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"</button></a>
158 + </td>
159 </tr>
160 % }
161 </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
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
164 +++ 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 @@
166 %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
167 </b><br></p>
168
169 - <table class="sme-border"><thead>
170 + <table class="sme-border TableSort"><thead>
171 <tr>
172 <th class='sme-border'>
173 %=l 'hos_HOSTNAME'
174 @@ -32,7 +32,7 @@
175 <th class='sme-border'>
176 %=l 'COMMENT'
177 </th>
178 - <th class='sme-border' colspan='2'>
179 + <th class='sme-border'>
180 %=l 'ACTION'
181 </th>
182 </tr>
183 @@ -47,12 +47,14 @@
184 %= t td => (class => 'sme-border') => $_->{'Comment'};
185 % 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>
193 - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
194 -
195 + <td class='sme-border' style="min-width:15em">
196 + <%= $c->render_to_string(inline => $actionModify) %>
197 + <%= $c->render_to_string(inline => $actionRemove) %>
198 + </td>
199 +
200 </tr>
201
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
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
205 +++ 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 @@
207 % if ($numIbays == 0){
208 %=l 'iba_NO_IBAYS'
209 % } else {
210 - <table class="sme-border"><tbody>
211 + <table class="sme-border TableSort"><thead>
212 <tr>
213 <th class='sme-border'>
214 %=l 'NAME'
215 @@ -29,11 +29,11 @@
216 <th class='sme-border'>
217 %=l 'DESCRIPTION'
218 </th>
219 - <th class='sme-border' colspan='3'>
220 -
221 - %=l 'ACTION'
222 + <th class='sme-border'>
223 + %=l 'ACTION'
224 </th>
225 </tr>
226 + </thead><tbody>
227 % foreach my $ibay (@$ibays)
228 % {
229 % my $modifiable = $ibay->prop('Modifiable') || 'yes';
230 @@ -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') {
243 - % $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>
247 - <td class='sme-border'><%= $c->render_to_string(inline => $actionResetPw) %></td>
248 - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
249 -
250 + <td class='sme-border' style="min-width:20em">
251 + <%= $c->render_to_string(inline => $actionModify) %>
252 + <%= $c->render_to_string(inline => $actionResetPw)%>
253 + <%= $c->render_to_string(inline => $actionRemove) %>
254 + </td>
255 </tr>
256 % }
257 </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
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
260 +++ 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 @@
262 %=l 'ln_LOCAL_NETWORK_NONE'
263 % } else {
264 <br>
265 - <table class="sme-border"><tbody>
266 + <table class="sme-border TableSort"><thead>
267 <tr>
268 - <th class='sme-border'>
269 + <th class='sme-border'>
270 %=l 'NETWORK'
271 - </th>
272 - <th class='sme-border'>
273 + </th>
274 + <th class='sme-border'>
275 %=l 'ln_SUBNET_MASK'
276 - </th>
277 + </th>
278
279 <th class='sme-border'>
280 %=l 'ln_NUMBER_OF_HOSTS'
281 - </th>
282 + </th>
283
284 - <th class='sme-border'>
285 + <th class='sme-border'>
286 %=l 'ROUTER'
287 - </th>
288 + </th>
289
290 - <th class='sme-border' '>
291 + <th class='sme-border' '>
292 %=l 'ACTION'
293 - </th>
294 + </th>
295 </tr>
296 -
297 + </thead><tbody>
298 % foreach my $localnetwork (@$localnetworks )
299 % {
300 % 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
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
312 +++ 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 @@
314 <br>
315 %=l 'pf_SHOW_FORWARDS'
316 <br>
317 - <table class="sme-border"><tbody>
318 + <table class="sme-border TableSort"><thead>
319 <tr>
320 - <th class='sme-border'>
321 + <th class='sme-border'>
322 %=l 'pf_LABEL_PROTOCOL'
323 - </th>
324 - <th class='sme-border'>
325 + </th>
326 + <th class='sme-border'>
327 %=l 'pf_LABEL_SOURCE_PORT'
328 - </th>
329 -
330 - <th class='sme-border'>
331 + </th>
332 + <th class='sme-border'>
333 %=l 'pf_LABEL_DESTINATION_HOST'
334 - </th>
335 -
336 - <th class='sme-border'>
337 + </th>
338 + <th class='sme-border'>
339 %=l 'pf_LABEL_DESTINATION_PORT'
340 - </th>
341 -
342 - <th class='sme-border'>
343 + </th>
344 + <th class='sme-border'>
345 %=l 'pf_ALLOW_HOSTS'
346 - </th>
347 -
348 -
349 - <th class='sme-border'>
350 + </th>
351 + <th class='sme-border'>
352 %=l 'pf_RULE_COMMENT'
353 - </th>
354 -
355 - <th class='sme-border' '>
356 + </th>
357 + <th class='sme-border' '>
358 %=l 'ACTION'
359 - </th>
360 - </tr>
361 -
362 + </th>
363 + </tr>
364 + </thead><tbody>
365 % my %forwards = ();
366 % $forwards{TCP} = $tcpforwards;
367 % $forwards{UDP} = $udpforwards;
368 @@ -97,16 +91,17 @@
369 %= t td => (class => 'sme-border') => $dport
370 %= t td => (class => 'sme-border') => $allow
371 %= t td => (class => 'sme-border') => $cmmnt
372 - <td class='sme-border'>
373 - <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><%=l 'REMOVE'%></a></td>
374 + <td class='sme-border'>
375 + <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"></button></a>
376 + </td>
377 </tr>
378 % }
379 % }
380 %}
381 - %= hidden_field 'trt' => $pf_datas->{trt}
382 %}
383 </tbody>
384 </table>
385 + %= hidden_field 'trt' => $pf_datas->{trt}
386 % end
387 </div>
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
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
391 +++ 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 @@
393 % if ($numPrinters == 0){
394 %=l 'prt_NO_PRINTERS'
395 % } else {
396 - <table class="sme-border"><tbody>
397 + <table class="sme-border TableSort"><thead>
398 <tr>
399 <th class='sme-border'>
400 %=l 'NAME'
401 @@ -42,6 +42,7 @@
402 %=l 'ACTION'
403 </th>
404 </tr>
405 + </thead><tbody>
406 % foreach my $printer (@$printerDrivers)
407 % {
408 % 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
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
420 +++ 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 @@
422 % if ($numPseudonyms == 0){
423 %=l 'pse_ACCOUNT_PSEUDONYM_NONE'
424 % } else {
425 - <table class="sme-border"><tbody>
426 + <table class="sme-border TableSort"><thead>
427 <tr>
428 <th class='sme-border'>
429 %=l 'pse_PSEUDONYM'
430 @@ -27,11 +27,12 @@
431 <th class='sme-border'>
432 %=l 'pse_USER_OR_GROUP'
433 </th>
434 - <th class='sme-border' colspan='2'>
435 -
436 + <th class='sme-border'>
437 %=l 'ACTION'
438 </th>
439 - </tr>
440 + <!-- <th class='sme-border' style="display: normal;"></th> -->
441 + </tr></thead>
442 + <tbody>
443
444 % foreach my $pseudonym ( @$pseudonyms )
445 % {
446 @@ -52,14 +53,15 @@
447
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>
459 - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
460 + <td class='sme-border' style="min-width:15em">
461 + <%= $c->render_to_string(inline => $actionModify) %>&nbsp;<%= $c->render_to_string(inline => $actionRemove) %>
462 + </td>
463 </tr>
464
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
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
468 +++ 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 @@
470 % my $absolute = l('quo_ABS_LIMIT_MB'); $absolute =~ s#(limitX)#<br>$1#;
471 % my $current = l('quo_CURRENT_USAGE'); $current =~ s#(usageX)#<br>$1#;
472
473 - <table class="sme-border"><tbody>
474 + <table class="sme-border TableSort"><thead>
475 <tr>
476 <th class='sme-border'>
477 %=l 'ACCOUNT'
478 @@ -39,6 +39,7 @@
479 %=l 'ACTION'
480 </th>
481 </tr>
482 + </thead><tbody>
483
484 % 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
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
497 +++ 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 @@
499 % if ($numUsers == 0){
500 %=l 'usr_NO_USER_ACCOUNTS'
501 % } else {
502 - <table class="sme-border"><thead>
503 + <table class="sme-border TableSort"><thead>
504 <tr>
505 <th class='sme-border'>
506 %=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
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
560 +++ 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 @@
562 %=l 'usr_GROUP_MEMBERSHIPS'
563 </span>
564 <span class=data>
565 - <table class="sme-border"><tbody>
566 + <table class="sme-border "><thead>
567 <tr><th class='sme-border'>
568 %=l 'usr_MEMBER'
569 </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
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
580 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2024-01-27 18:32:00.000000000 +0000
581 @@ -65,7 +65,7 @@
582
583 % my @vals = $self->_get_valid_from();
584 % if (@vals) {
585 - <table class="sme-border"><tbody>
586 + <table class="sme-border TableSort"><thead>
587 <tr><th class='sme-border'>
588 %=l 'NETWORK'
589 </th><th class='sme-border'>
590 @@ -75,6 +75,7 @@
591 </th><th class='sme-border'>
592 %=l 'REMOVE'
593 </th></tr>
594 + </thead></tbody>
595
596 % foreach my $val ( @vals )
597 % {
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed