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

Annotation 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.2 - (hide annotations) (download)
Sun Jan 28 19:06:07 2024 UTC (9 months, 4 weeks ago) by brianr
Branch: MAIN
Changes since 1.1: +84 -6 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 brianr 1.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 brianr 1.2 +++ 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 brianr 1.1 %= 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 brianr 1.2 + <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 brianr 1.1 + <!-- 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 brianr 1.2 @@ -73,6 +86,28 @@
37 brianr 1.1 %= 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 brianr 1.2 + $(".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 brianr 1.1 + });
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-27 18:48: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     @@ -51,8 +52,9 @@
91     % $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . l('REMOVE') . "</a>";
92     % }
93    
94     - <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
95     - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
96     + <td class='sme-border' style="min-width:15em">
97     + <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
98     + </td>
99     </tr>
100     % }
101    
102 brianr 1.2 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep
103     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep 2021-06-21 10:25:10.000000000 +0100
104     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep 2024-01-27 09:38:00.000000000 +0000
105     @@ -4,5 +4,6 @@
106     SME Server <%= session 'releaseVersion' %> - Manager <%= $c->app->VERSION %>
107     <br>Copyright 1999-2006 Mitel Corporation<br>
108     %= session 'copyRight'
109     -<br>Copyright (c) 2013-2021 Koozali Foundation Inc.<br>
110     +<br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
111     </font>
112     +
113 brianr 1.1 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep
114     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2024-01-27 09:43:09.731711904 +0000
115     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2024-01-27 18:52:00.000000000 +0000
116     @@ -17,7 +17,7 @@
117     % if ($numGroups == 0){
118     %=l 'ACCOUNT_GROUP_NONE'
119     % } else {
120     - <table class="sme-border"><tbody>
121     + <table class="sme-border TableSort"><thead>
122     <tr>
123     <th class='sme-border'>
124     %=l 'GROUP'
125     @@ -25,19 +25,20 @@
126     <th class='sme-border'>
127     %=l 'DESCRIPTION'
128     </th>
129     - <th class='sme-border' colspan='2'>
130     -
131     - %=l 'ACTION'
132     + <th class='sme-border'>
133     + %=l 'ACTION'
134     </th>
135     </tr>
136     + </thead><tbody>
137    
138     % foreach my $group ( @$groups )
139     % {
140     <tr>
141     %= t td => (class => 'sme-border') => $group->key
142     %= t td => (class => 'sme-border') => $group->prop('Description')
143     - <td class='sme-border'><a href="groups2?CsrfDef=TOKEN&trt=UPD&group=<%= $group->key%>"><%=l 'MODIFY'%></a></td>
144     - <td class='sme-border'><a href="groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>"><%=l 'REMOVE'%></a></td>
145     + <td class='sme-border' style="min-width:15em"><a href="groups2?CsrfDef=TOKEN&trt=UPD&group=<%= $group->key%>"><%=l 'MODIFY'%></a>
146     + <a href="groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>"><%=l 'REMOVE'%></a>
147     + </td>
148     </tr>
149     % }
150     </tbody>
151     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
152     --- 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
153     +++ 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
154     @@ -15,7 +15,7 @@
155     %= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain);
156     </b><br></p>
157    
158     - <table class="sme-border"><thead>
159     + <table class="sme-border TableSort"><thead>
160     <tr>
161     <th class='sme-border'>
162     %=l 'hos_HOSTNAME'
163     @@ -32,7 +32,7 @@
164     <th class='sme-border'>
165     %=l 'COMMENT'
166     </th>
167     - <th class='sme-border' colspan='2'>
168     + <th class='sme-border'>
169     %=l 'ACTION'
170     </th>
171     </tr>
172     @@ -50,9 +50,11 @@
173     % $actionModify = "<a href='hostentriesd?CsrfDef=TOKEN&trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . l('MODIFY') . "</a>";
174     % $actionRemove = "<a href='hostentriesd?CsrfDef=TOKEN&trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . l('REMOVE') . "</a>";
175     % }
176     - <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
177     - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
178     -
179     + <td class='sme-border' style="min-width:15em">
180     + <%= $c->render_to_string(inline => $actionModify) %>
181     + <%= $c->render_to_string(inline => $actionRemove) %>
182     + </td>
183     +
184     </tr>
185    
186     % }
187     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
188     --- 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
189     +++ 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
190     @@ -21,7 +21,7 @@
191     % if ($numIbays == 0){
192     %=l 'iba_NO_IBAYS'
193     % } else {
194     - <table class="sme-border"><tbody>
195     + <table class="sme-border TableSort"><thead>
196     <tr>
197     <th class='sme-border'>
198     %=l 'NAME'
199     @@ -29,11 +29,11 @@
200     <th class='sme-border'>
201     %=l 'DESCRIPTION'
202     </th>
203     - <th class='sme-border' colspan='3'>
204     -
205     - %=l 'ACTION'
206     + <th class='sme-border'>
207     + %=l 'ACTION'
208     </th>
209     </tr>
210     + </thead><tbody>
211     % foreach my $ibay (@$ibays)
212     % {
213     % my $modifiable = $ibay->prop('Modifiable') || 'yes';
214     @@ -60,10 +60,11 @@
215     % if ($removable eq 'yes') {
216     % $actionRemove = "<a href='ibaysd?CsrfDef=TOKEN&trt=DEL&ibay=" . $ibay->key . "'>" . l('REMOVE') . "</a>";
217     % }
218     - <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
219     - <td class='sme-border'><%= $c->render_to_string(inline => $actionResetPw) %></td>
220     - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
221     -
222     + <td class='sme-border' style="min-width:20em">
223     + <%= $c->render_to_string(inline => $actionModify) %>
224     + <%= $c->render_to_string(inline => $actionResetPw)%>
225     + <%= $c->render_to_string(inline => $actionRemove) %>
226     + </td>
227     </tr>
228     % }
229     </tbody>
230     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
231     --- 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
232     +++ 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
233     @@ -47,28 +47,28 @@
234     %=l 'ln_LOCAL_NETWORK_NONE'
235     % } else {
236     <br>
237     - <table class="sme-border"><tbody>
238     + <table class="sme-border TableSort"><thead>
239     <tr>
240     - <th class='sme-border'>
241     + <th class='sme-border'>
242     %=l 'NETWORK'
243     - </th>
244     - <th class='sme-border'>
245     + </th>
246     + <th class='sme-border'>
247     %=l 'ln_SUBNET_MASK'
248     - </th>
249     + </th>
250    
251     <th class='sme-border'>
252     %=l 'ln_NUMBER_OF_HOSTS'
253     - </th>
254     + </th>
255    
256     - <th class='sme-border'>
257     + <th class='sme-border'>
258     %=l 'ROUTER'
259     - </th>
260     + </th>
261    
262     - <th class='sme-border' '>
263     + <th class='sme-border' '>
264     %=l 'ACTION'
265     - </th>
266     + </th>
267     </tr>
268     -
269     + </thead><tbody>
270     % foreach my $localnetwork (@$localnetworks )
271     % {
272     % my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') );
273     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
274     --- 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
275     +++ 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
276     @@ -46,37 +46,31 @@
277     <br>
278     %=l 'pf_SHOW_FORWARDS'
279     <br>
280     - <table class="sme-border"><tbody>
281     + <table class="sme-border TableSort"><thead>
282     <tr>
283     - <th class='sme-border'>
284     + <th class='sme-border'>
285     %=l 'pf_LABEL_PROTOCOL'
286     - </th>
287     - <th class='sme-border'>
288     + </th>
289     + <th class='sme-border'>
290     %=l 'pf_LABEL_SOURCE_PORT'
291     - </th>
292     -
293     - <th class='sme-border'>
294     + </th>
295     + <th class='sme-border'>
296     %=l 'pf_LABEL_DESTINATION_HOST'
297     - </th>
298     -
299     - <th class='sme-border'>
300     + </th>
301     + <th class='sme-border'>
302     %=l 'pf_LABEL_DESTINATION_PORT'
303     - </th>
304     -
305     - <th class='sme-border'>
306     + </th>
307     + <th class='sme-border'>
308     %=l 'pf_ALLOW_HOSTS'
309     - </th>
310     -
311     -
312     - <th class='sme-border'>
313     + </th>
314     + <th class='sme-border'>
315     %=l 'pf_RULE_COMMENT'
316     - </th>
317     -
318     - <th class='sme-border' '>
319     + </th>
320     + <th class='sme-border' '>
321     %=l 'ACTION'
322     - </th>
323     - </tr>
324     -
325     + </th>
326     + </tr>
327     + </thead><tbody>
328     % my %forwards = ();
329     % $forwards{TCP} = $tcpforwards;
330     % $forwards{UDP} = $udpforwards;
331     @@ -97,16 +91,17 @@
332     %= t td => (class => 'sme-border') => $dport
333     %= t td => (class => 'sme-border') => $allow
334     %= t td => (class => 'sme-border') => $cmmnt
335     - <td class='sme-border'>
336     - <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><%=l 'REMOVE'%></a></td>
337     + <td class='sme-border'>
338     + <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><%=l 'REMOVE'%></a>
339     + </td>
340     </tr>
341     % }
342     % }
343     %}
344     - %= hidden_field 'trt' => $pf_datas->{trt}
345     %}
346     </tbody>
347     </table>
348     + %= hidden_field 'trt' => $pf_datas->{trt}
349     % end
350     </div>
351    
352     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
353     --- 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
354     +++ 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
355     @@ -21,7 +21,7 @@
356     % if ($numPrinters == 0){
357     %=l 'prt_NO_PRINTERS'
358     % } else {
359     - <table class="sme-border"><tbody>
360     + <table class="sme-border TableSort"><thead>
361     <tr>
362     <th class='sme-border'>
363     %=l 'NAME'
364     @@ -42,6 +42,7 @@
365     %=l 'ACTION'
366     </th>
367     </tr>
368     + </thead><tbody>
369     % foreach my $printer (@$printerDrivers)
370     % {
371     % my $address = ($printer->prop('Location') eq 'remote')
372     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
373     --- 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
374     +++ 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
375     @@ -19,7 +19,7 @@
376     % if ($numPseudonyms == 0){
377     %=l 'pse_ACCOUNT_PSEUDONYM_NONE'
378     % } else {
379     - <table class="sme-border"><tbody>
380     + <table class="sme-border TableSort"><thead>
381     <tr>
382     <th class='sme-border'>
383     %=l 'pse_PSEUDONYM'
384     @@ -27,11 +27,12 @@
385     <th class='sme-border'>
386     %=l 'pse_USER_OR_GROUP'
387     </th>
388     - <th class='sme-border' colspan='2'>
389     -
390     + <th class='sme-border'>
391     %=l 'ACTION'
392     </th>
393     - </tr>
394     + <!-- <th class='sme-border' style="display: normal;"></th> -->
395     + </tr></thead>
396     + <tbody>
397    
398     % foreach my $pseudonym ( @$pseudonyms )
399     % {
400     @@ -58,8 +59,9 @@
401     % $actionRemove = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=DEL&pseudonym=" . $pseudonym->key . "'>" . l('REMOVE') . "</a>";
402     % }
403    
404     - <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
405     - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
406     + <td class='sme-border' style="min-width:15em">
407     + <%= $c->render_to_string(inline => $actionModify) %>&nbsp;<%= $c->render_to_string(inline => $actionRemove) %>
408     + </td>
409     </tr>
410    
411     % }
412     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
413     --- 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
414     +++ 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
415     @@ -18,7 +18,7 @@
416     % my $absolute = l('quo_ABS_LIMIT_MB'); $absolute =~ s#(limitX)#<br>$1#;
417     % my $current = l('quo_CURRENT_USAGE'); $current =~ s#(usageX)#<br>$1#;
418    
419     - <table class="sme-border"><tbody>
420     + <table class="sme-border TableSort"><thead>
421     <tr>
422     <th class='sme-border'>
423     %=l 'ACCOUNT'
424     @@ -39,6 +39,7 @@
425     %=l 'ACTION'
426     </th>
427     </tr>
428     + </thead><tbody>
429    
430     % foreach my $user (@$userAccounts)
431     % {
432     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep
433     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep 2024-01-27 09:43:09.753712587 +0000
434 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep 2024-01-28 19:01:00.000000000 +0000
435 brianr 1.1 @@ -21,7 +21,7 @@
436     % if ($numUsers == 0){
437     %=l 'usr_NO_USER_ACCOUNTS'
438     % } else {
439     - <table class="sme-border"><thead>
440     + <table class="sme-border TableSort"><thead>
441     <tr>
442     <th class='sme-border'>
443     %=l 'ACCOUNT'
444 brianr 1.2 @@ -35,7 +35,7 @@
445     <th class='sme-border'>
446     %=l 'usr_FORWARDING_ADDRESS'
447     </th>
448     - <th class='sme-border' colspan='4'>
449     + <th class='sme-border'>
450     %=l 'ACTION'
451     </th>
452     </tr>
453     @@ -61,26 +61,29 @@
454     %= t td => (class => 'sme-border') => $fwd
455     % my ($actionModify, $actionLock, $actionResetPw, $actionRemove) = '&nbsp;';
456     % if ($username eq 'admin') {
457     - % $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPS&user=" . $username . "'>" . l('MODIFY') . "</a>";
458     - % $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWS&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
459     + % $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPS&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY")."></button></a>";
460     + % $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWS&user=" . $username . "'>" . "<button class='sme-password-button' title=".l("Reset-Password")."></button></a>";
461     % } else {
462     - % $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPD&user=" . $username . "'>" . l('MODIFY') . "</a>";
463     + % $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPD&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY")."></button></a>";
464     % if ($password_set ne 'yes') {
465     % $actionLock = l('ACCOUNT_LOCKED');
466     - % $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "' class='error'>" . l('PASSWORD_RESET') . "</a>";
467     + % $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . "<button class='sme-password-button' style ='border-color:red;' title=".l("Reset-Password")."></button></a>";
468     + %# $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "' class='error'>" . l('PASSWORD_RESET') . "</a>";
469     % } else {
470     - % $actionLock = "<a href='useraccountsd?CsrfDef=TOKEN&trt=LCK&user=" . $username . "'>" . l('usr_LOCK_ACCOUNT') . "</a>";
471     - % $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
472     + % $actionLock = "<a href='useraccountsd?CsrfDef=TOKEN&trt=LCK&user=" . $username . "'>" . "<button class='ui-button ui-widget ui-corner-all ui-button-icon-only' style ='height:2em' title=".l('usr_LOCK_ACCOUNT')."><span class='ui-icon ui-icon-key'></span></button></a>";
473     + % $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . "<button class='ui-button ui-widget ui-corner-all ui-button-icon-only' style ='height:2em' title=".l("Reset-Password")."><span class='ui-icon ui-icon-refresh'></span></button></a>";
474     + %# $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
475     % }
476     % if ( $removable eq 'yes' ) {
477     - % $actionRemove = "<a href='useraccountsd?CsrfDef=TOKEN&trt=DEL&user=" . $username . "'>" . l('REMOVE') . "</a>";
478     + % $actionRemove = "<a href='useraccountsd?CsrfDef=TOKEN&trt=DEL&user=" . $username . "'>" . "<button class='ui-button ui-widget ui-corner-all ui-button-icon-only' style ='height:2em' title=".l("REMOVE")."><span class='ui-icon ui-icon-trash'></span></button></a>";
479     % }
480     % }
481     - <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td>
482     - <td class='sme-border'><%= $c->render_to_string(inline => $actionResetPw) %></td>
483     - <td class='sme-border'><%= $c->render_to_string(inline => $actionLock) %></td>
484     - <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td>
485     -
486     + <td class='sme-border' style="min-width:35em">
487     + <%= $c->render_to_string(inline => $actionModify) %>
488     + <%= $c->render_to_string(inline => $actionResetPw) %>
489     + <%= $c->render_to_string(inline => $actionLock) %>
490     + <%= $c->render_to_string(inline => $actionRemove) %>
491     + </td>
492     </tr>
493     % }
494     </tbody>
495 brianr 1.1 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep
496     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2021-06-21 10:25:10.000000000 +0100
497 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2024-01-28 08:54:00.000000000 +0000
498 brianr 1.1 @@ -131,7 +131,7 @@
499     %=l 'usr_GROUP_MEMBERSHIPS'
500     </span>
501     <span class=data>
502     - <table class="sme-border"><tbody>
503 brianr 1.2 + <table class="sme-border "><thead>
504 brianr 1.1 <tr><th class='sme-border'>
505     %=l 'usr_MEMBER'
506     </th><th class='sme-border'>
507 brianr 1.2 @@ -139,6 +139,7 @@
508     </th><th class='sme-border'>
509     %=l 'DESCRIPTION'
510     </th></tr>
511     + </thead><tbody>
512    
513     % foreach my $g ( @groups) {
514     % my $user = $usr_datas->{user};
515 brianr 1.1 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep
516     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2024-01-27 09:43:09.743712276 +0000
517     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2024-01-27 18:32:00.000000000 +0000
518     @@ -65,7 +65,7 @@
519    
520     % my @vals = $self->_get_valid_from();
521     % if (@vals) {
522     - <table class="sme-border"><tbody>
523     + <table class="sme-border TableSort"><thead>
524     <tr><th class='sme-border'>
525     %=l 'NETWORK'
526     </th><th class='sme-border'>
527     @@ -75,6 +75,7 @@
528     </th><th class='sme-border'>
529     %=l 'REMOVE'
530     </th></tr>
531     + </thead></tbody>
532    
533     % foreach my $val ( @vals )
534     % {
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed