/[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.4 - (show annotations) (download)
Mon Jan 29 14:46:56 2024 UTC (3 months, 2 weeks ago) by brianr
Branch: MAIN
CVS Tags: smeserver-manager-0_1_4-31_el7_sme, smeserver-manager-0_1_4-27_el7_sme, smeserver-manager-0_1_4-24_el7_sme, smeserver-manager-0_1_4-29_el7_sme, smeserver-manager-0_1_4-23_el7_sme, smeserver-manager-0_1_4-33_el7_sme, smeserver-manager-0_1_4-25_el7_sme, smeserver-manager-0_1_4-26_el7_sme, smeserver-manager-0_1_4-28_el7_sme, smeserver-manager-0_1_4-32_el7_sme, smeserver-manager-0_1_4-22_el7_sme, HEAD
Changes since 1.3: +10 -3 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
- Change action links to icons
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-29 14:41:00.000000000 +0000
16 @@ -17,6 +17,26 @@
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 +
32 + .ui-button {
33 + position: relative;
34 + font-size: 0;
35 + width: 23px;
36 + height: 23px;
37 + }
38 + %end
39 +
40 </head>
41
42 <body>
43 @@ -73,6 +93,28 @@
44 %= content 'js_swapClass'
45 %= content 'js_togglePassword'
46 % }
47 +%= javascript begin
48 + $(window).on('pageshow', function(){
49 + //alert('page show');
50 + $('.TableSort').DataTable({
51 + "stateSave": true,
52 + "retrieve": true,
53 + "responsive":true,
54 + "language": {
55 + "emptyTable": "No record found.",
56 + "processing":'" style="color: rgba(42, 43, 43, 1)">Loading... ',
57 + "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
67 +
68 +
69
70 </body>
71 </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
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
74 +++ 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 @@
76 <h2>
77 %=l 'dom_CURRENT_DOMAINS'
78 </h2>
79 - <table class="sme-border"><tbody>
80 + <table class="sme-border TableSort"><thead>
81 <tr>
82 <th class='sme-border'>
83 %=l 'DOMAIN_NAME'
84 @@ -30,10 +30,11 @@
85 <th class='sme-border'>
86 %=l 'dom_LABEL_NAMESERVERS'
87 </th>
88 - <th class='sme-border' colspan='2'>
89 + <th class='sme-border'>
90 %=l 'ACTION'
91 </th>
92 </tr>
93 + </thead><tbody>
94
95 % foreach my $domain ( @$domains ) {
96 <tr>
97 @@ -42,17 +43,18 @@
98 %= 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>
113 - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
114 + <td class='sme-border' style="min-width:15em">
115 + <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
116 + </td>
117 </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
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
133 +++ 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 @@
135 % if ($numGroups == 0){
136 %=l 'ACCOUNT_GROUP_NONE'
137 % } else {
138 - <table class="sme-border"><tbody>
139 + <table class="sme-border TableSort"><thead>
140 <tr>
141 <th class='sme-border'>
142 %=l 'GROUP'
143 @@ -25,19 +25,20 @@
144 <th class='sme-border'>
145 %=l 'DESCRIPTION'
146 </th>
147 - <th class='sme-border' colspan='2'>
148 -
149 - %=l 'ACTION'
150 + <th class='sme-border'>
151 + %=l 'ACTION'
152 </th>
153 </tr>
154 + </thead><tbody>
155
156 % foreach my $group ( @$groups )
157 % {
158 <tr>
159 %= t td => (class => 'sme-border') => $group->key
160 %= 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>
162 - <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%>"><button class='sme-modify-button' title="<%=l('MODIFY')%>"></button></a>
164 + <a href="groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"</button></a>
165 + </td>
166 </tr>
167 % }
168 </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
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
171 +++ 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 @@
173 %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
174 </b><br></p>
175
176 - <table class="sme-border"><thead>
177 + <table class="sme-border TableSort"><thead>
178 <tr>
179 <th class='sme-border'>
180 %=l 'hos_HOSTNAME'
181 @@ -32,7 +32,7 @@
182 <th class='sme-border'>
183 %=l 'COMMENT'
184 </th>
185 - <th class='sme-border' colspan='2'>
186 + <th class='sme-border'>
187 %=l 'ACTION'
188 </th>
189 </tr>
190 @@ -47,12 +47,14 @@
191 %= t td => (class => 'sme-border') => $_->{'Comment'};
192 % 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>
200 - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
201 -
202 + <td class='sme-border' style="min-width:15em">
203 + <%= $c->render_to_string(inline => $actionModify) %>
204 + <%= $c->render_to_string(inline => $actionRemove) %>
205 + </td>
206 +
207 </tr>
208
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
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
212 +++ 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 @@
214 % if ($numIbays == 0){
215 %=l 'iba_NO_IBAYS'
216 % } else {
217 - <table class="sme-border"><tbody>
218 + <table class="sme-border TableSort"><thead>
219 <tr>
220 <th class='sme-border'>
221 %=l 'NAME'
222 @@ -29,11 +29,11 @@
223 <th class='sme-border'>
224 %=l 'DESCRIPTION'
225 </th>
226 - <th class='sme-border' colspan='3'>
227 -
228 - %=l 'ACTION'
229 + <th class='sme-border'>
230 + %=l 'ACTION'
231 </th>
232 </tr>
233 + </thead><tbody>
234 % foreach my $ibay (@$ibays)
235 % {
236 % my $modifiable = $ibay->prop('Modifiable') || 'yes';
237 @@ -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') {
250 - % $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>
254 - <td class='sme-border'><%= $c->render_to_string(inline => $actionResetPw) %></td>
255 - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
256 -
257 + <td class='sme-border' style="min-width:20em">
258 + <%= $c->render_to_string(inline => $actionModify) %>
259 + <%= $c->render_to_string(inline => $actionResetPw)%>
260 + <%= $c->render_to_string(inline => $actionRemove) %>
261 + </td>
262 </tr>
263 % }
264 </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
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
267 +++ 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 @@
269 %=l 'ln_LOCAL_NETWORK_NONE'
270 % } else {
271 <br>
272 - <table class="sme-border"><tbody>
273 + <table class="sme-border TableSort"><thead>
274 <tr>
275 - <th class='sme-border'>
276 + <th class='sme-border'>
277 %=l 'NETWORK'
278 - </th>
279 - <th class='sme-border'>
280 + </th>
281 + <th class='sme-border'>
282 %=l 'ln_SUBNET_MASK'
283 - </th>
284 + </th>
285
286 <th class='sme-border'>
287 %=l 'ln_NUMBER_OF_HOSTS'
288 - </th>
289 + </th>
290
291 - <th class='sme-border'>
292 + <th class='sme-border'>
293 %=l 'ROUTER'
294 - </th>
295 + </th>
296
297 - <th class='sme-border' '>
298 + <th class='sme-border' '>
299 %=l 'ACTION'
300 - </th>
301 + </th>
302 </tr>
303 -
304 + </thead><tbody>
305 % foreach my $localnetwork (@$localnetworks )
306 % {
307 % 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
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
319 +++ 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 @@
321 <br>
322 %=l 'pf_SHOW_FORWARDS'
323 <br>
324 - <table class="sme-border"><tbody>
325 + <table class="sme-border TableSort"><thead>
326 <tr>
327 - <th class='sme-border'>
328 + <th class='sme-border'>
329 %=l 'pf_LABEL_PROTOCOL'
330 - </th>
331 - <th class='sme-border'>
332 + </th>
333 + <th class='sme-border'>
334 %=l 'pf_LABEL_SOURCE_PORT'
335 - </th>
336 -
337 - <th class='sme-border'>
338 + </th>
339 + <th class='sme-border'>
340 %=l 'pf_LABEL_DESTINATION_HOST'
341 - </th>
342 -
343 - <th class='sme-border'>
344 + </th>
345 + <th class='sme-border'>
346 %=l 'pf_LABEL_DESTINATION_PORT'
347 - </th>
348 -
349 - <th class='sme-border'>
350 + </th>
351 + <th class='sme-border'>
352 %=l 'pf_ALLOW_HOSTS'
353 - </th>
354 -
355 -
356 - <th class='sme-border'>
357 + </th>
358 + <th class='sme-border'>
359 %=l 'pf_RULE_COMMENT'
360 - </th>
361 -
362 - <th class='sme-border' '>
363 + </th>
364 + <th class='sme-border' '>
365 %=l 'ACTION'
366 - </th>
367 - </tr>
368 -
369 + </th>
370 + </tr>
371 + </thead><tbody>
372 % my %forwards = ();
373 % $forwards{TCP} = $tcpforwards;
374 % $forwards{UDP} = $udpforwards;
375 @@ -97,16 +91,17 @@
376 %= t td => (class => 'sme-border') => $dport
377 %= t td => (class => 'sme-border') => $allow
378 %= t td => (class => 'sme-border') => $cmmnt
379 - <td class='sme-border'>
380 - <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><%=l 'REMOVE'%></a></td>
381 + <td class='sme-border'>
382 + <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"></button></a>
383 + </td>
384 </tr>
385 % }
386 % }
387 %}
388 - %= hidden_field 'trt' => $pf_datas->{trt}
389 %}
390 </tbody>
391 </table>
392 + %= hidden_field 'trt' => $pf_datas->{trt}
393 % end
394 </div>
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
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
398 +++ 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 @@
400 % if ($numPrinters == 0){
401 %=l 'prt_NO_PRINTERS'
402 % } else {
403 - <table class="sme-border"><tbody>
404 + <table class="sme-border TableSort"><thead>
405 <tr>
406 <th class='sme-border'>
407 %=l 'NAME'
408 @@ -42,6 +42,7 @@
409 %=l 'ACTION'
410 </th>
411 </tr>
412 + </thead><tbody>
413 % foreach my $printer (@$printerDrivers)
414 % {
415 % 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
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
427 +++ 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 @@
429 % if ($numPseudonyms == 0){
430 %=l 'pse_ACCOUNT_PSEUDONYM_NONE'
431 % } else {
432 - <table class="sme-border"><tbody>
433 + <table class="sme-border TableSort"><thead>
434 <tr>
435 <th class='sme-border'>
436 %=l 'pse_PSEUDONYM'
437 @@ -27,11 +27,12 @@
438 <th class='sme-border'>
439 %=l 'pse_USER_OR_GROUP'
440 </th>
441 - <th class='sme-border' colspan='2'>
442 -
443 + <th class='sme-border'>
444 %=l 'ACTION'
445 </th>
446 - </tr>
447 + <!-- <th class='sme-border' style="display: normal;"></th> -->
448 + </tr></thead>
449 + <tbody>
450
451 % foreach my $pseudonym ( @$pseudonyms )
452 % {
453 @@ -52,14 +53,15 @@
454
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>
466 - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
467 + <td class='sme-border' style="min-width:15em">
468 + <%= $c->render_to_string(inline => $actionModify) %>&nbsp;<%= $c->render_to_string(inline => $actionRemove) %>
469 + </td>
470 </tr>
471
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
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
475 +++ 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 @@
477 % my $absolute = l('quo_ABS_LIMIT_MB'); $absolute =~ s#(limitX)#<br>$1#;
478 % my $current = l('quo_CURRENT_USAGE'); $current =~ s#(usageX)#<br>$1#;
479
480 - <table class="sme-border"><tbody>
481 + <table class="sme-border TableSort"><thead>
482 <tr>
483 <th class='sme-border'>
484 %=l 'ACCOUNT'
485 @@ -39,6 +39,7 @@
486 %=l 'ACTION'
487 </th>
488 </tr>
489 + </thead><tbody>
490
491 % 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
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
504 +++ 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 @@
506 % if ($numUsers == 0){
507 %=l 'usr_NO_USER_ACCOUNTS'
508 % } else {
509 - <table class="sme-border"><thead>
510 + <table class="sme-border TableSort"><thead>
511 <tr>
512 <th class='sme-border'>
513 %=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
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
567 +++ 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 @@
569 %=l 'usr_GROUP_MEMBERSHIPS'
570 </span>
571 <span class=data>
572 - <table class="sme-border"><tbody>
573 + <table class="sme-border "><thead>
574 <tr><th class='sme-border'>
575 %=l 'usr_MEMBER'
576 </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
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
587 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2024-01-27 18:32:00.000000000 +0000
588 @@ -65,7 +65,7 @@
589
590 % my @vals = $self->_get_valid_from();
591 % if (@vals) {
592 - <table class="sme-border"><tbody>
593 + <table class="sme-border TableSort"><thead>
594 <tr><th class='sme-border'>
595 %=l 'NETWORK'
596 </th><th class='sme-border'>
597 @@ -75,6 +75,7 @@
598 </th><th class='sme-border'>
599 %=l 'REMOVE'
600 </th></tr>
601 + </thead></tbody>
602
603 % foreach my $val ( @vals )
604 % {
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed