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 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2024-01-27 18:17:00.000000000 +0000 |
16 |
|
|
@@ -17,6 +17,16 @@ |
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 |
|
|
+ <!-- Jquery datatables override --> |
23 |
|
|
+ %= stylesheet begin |
24 |
|
|
+ .dataTables_wrapper { |
25 |
|
|
+ width: min-content; |
26 |
|
|
+ margin-right: auto; |
27 |
|
|
+ } |
28 |
|
|
+ %end |
29 |
|
|
+ |
30 |
|
|
</head> |
31 |
|
|
|
32 |
|
|
<body> |
33 |
|
|
@@ -73,6 +83,23 @@ |
34 |
|
|
%= content 'js_swapClass' |
35 |
|
|
%= content 'js_togglePassword' |
36 |
|
|
% } |
37 |
|
|
+%= javascript begin |
38 |
|
|
+ $(window).on('pageshow', function(){ |
39 |
|
|
+ //alert('page show'); |
40 |
|
|
+ $('.TableSort').DataTable({ |
41 |
|
|
+ "stateSave": true, |
42 |
|
|
+ "retrieve": true, |
43 |
|
|
+ "responsive":true, |
44 |
|
|
+ "language": { |
45 |
|
|
+ "emptyTable": "No record found.", |
46 |
|
|
+ "processing":'" style="color: rgba(42, 43, 43, 1)">Loading... ', |
47 |
|
|
+ "error": function (xhr, error, thrown) {alert("Error occurred while loading data. Please try again.");} |
48 |
|
|
+ } |
49 |
|
|
+ }); |
50 |
|
|
+ }); |
51 |
|
|
+%end |
52 |
|
|
+ |
53 |
|
|
+ |
54 |
|
|
|
55 |
|
|
</body> |
56 |
|
|
</html> |
57 |
|
|
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 |
58 |
|
|
--- 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 |
59 |
|
|
+++ 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 |
60 |
|
|
@@ -16,7 +16,7 @@ |
61 |
|
|
<h2> |
62 |
|
|
%=l 'dom_CURRENT_DOMAINS' |
63 |
|
|
</h2> |
64 |
|
|
- <table class="sme-border"><tbody> |
65 |
|
|
+ <table class="sme-border TableSort"><thead> |
66 |
|
|
<tr> |
67 |
|
|
<th class='sme-border'> |
68 |
|
|
%=l 'DOMAIN_NAME' |
69 |
|
|
@@ -30,10 +30,11 @@ |
70 |
|
|
<th class='sme-border'> |
71 |
|
|
%=l 'dom_LABEL_NAMESERVERS' |
72 |
|
|
</th> |
73 |
|
|
- <th class='sme-border' colspan='2'> |
74 |
|
|
+ <th class='sme-border'> |
75 |
|
|
%=l 'ACTION' |
76 |
|
|
</th> |
77 |
|
|
</tr> |
78 |
|
|
+ </thead><tbody> |
79 |
|
|
|
80 |
|
|
% foreach my $domain ( @$domains ) { |
81 |
|
|
<tr> |
82 |
|
|
@@ -51,8 +52,9 @@ |
83 |
|
|
% $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . l('REMOVE') . "</a>"; |
84 |
|
|
% } |
85 |
|
|
|
86 |
|
|
- <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td> |
87 |
|
|
- <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td> |
88 |
|
|
+ <td class='sme-border' style="min-width:15em"> |
89 |
|
|
+ <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %> |
90 |
|
|
+ </td> |
91 |
|
|
</tr> |
92 |
|
|
% } |
93 |
|
|
|
94 |
|
|
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 |
95 |
|
|
--- 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 |
96 |
|
|
+++ 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 |
97 |
|
|
@@ -17,7 +17,7 @@ |
98 |
|
|
% if ($numGroups == 0){ |
99 |
|
|
%=l 'ACCOUNT_GROUP_NONE' |
100 |
|
|
% } else { |
101 |
|
|
- <table class="sme-border"><tbody> |
102 |
|
|
+ <table class="sme-border TableSort"><thead> |
103 |
|
|
<tr> |
104 |
|
|
<th class='sme-border'> |
105 |
|
|
%=l 'GROUP' |
106 |
|
|
@@ -25,19 +25,20 @@ |
107 |
|
|
<th class='sme-border'> |
108 |
|
|
%=l 'DESCRIPTION' |
109 |
|
|
</th> |
110 |
|
|
- <th class='sme-border' colspan='2'> |
111 |
|
|
- |
112 |
|
|
- %=l 'ACTION' |
113 |
|
|
+ <th class='sme-border'> |
114 |
|
|
+ %=l 'ACTION' |
115 |
|
|
</th> |
116 |
|
|
</tr> |
117 |
|
|
+ </thead><tbody> |
118 |
|
|
|
119 |
|
|
% foreach my $group ( @$groups ) |
120 |
|
|
% { |
121 |
|
|
<tr> |
122 |
|
|
%= t td => (class => 'sme-border') => $group->key |
123 |
|
|
%= t td => (class => 'sme-border') => $group->prop('Description') |
124 |
|
|
- <td class='sme-border'><a href="groups2?CsrfDef=TOKEN&trt=UPD&group=<%= $group->key%>"><%=l 'MODIFY'%></a></td> |
125 |
|
|
- <td class='sme-border'><a href="groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>"><%=l 'REMOVE'%></a></td> |
126 |
|
|
+ <td class='sme-border' style="min-width:15em"><a href="groups2?CsrfDef=TOKEN&trt=UPD&group=<%= $group->key%>"><%=l 'MODIFY'%></a> |
127 |
|
|
+ <a href="groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>"><%=l 'REMOVE'%></a> |
128 |
|
|
+ </td> |
129 |
|
|
</tr> |
130 |
|
|
% } |
131 |
|
|
</tbody> |
132 |
|
|
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 |
133 |
|
|
--- 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 |
134 |
|
|
+++ 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 |
135 |
|
|
@@ -15,7 +15,7 @@ |
136 |
|
|
%= $c->l('hos_CURRENT_HOSTNAMES_FOR_LOCAL_DOMAIN', $domain); |
137 |
|
|
</b><br></p> |
138 |
|
|
|
139 |
|
|
- <table class="sme-border"><thead> |
140 |
|
|
+ <table class="sme-border TableSort"><thead> |
141 |
|
|
<tr> |
142 |
|
|
<th class='sme-border'> |
143 |
|
|
%=l 'hos_HOSTNAME' |
144 |
|
|
@@ -32,7 +32,7 @@ |
145 |
|
|
<th class='sme-border'> |
146 |
|
|
%=l 'COMMENT' |
147 |
|
|
</th> |
148 |
|
|
- <th class='sme-border' colspan='2'> |
149 |
|
|
+ <th class='sme-border'> |
150 |
|
|
%=l 'ACTION' |
151 |
|
|
</th> |
152 |
|
|
</tr> |
153 |
|
|
@@ -50,9 +50,11 @@ |
154 |
|
|
% $actionModify = "<a href='hostentriesd?CsrfDef=TOKEN&trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . l('MODIFY') . "</a>"; |
155 |
|
|
% $actionRemove = "<a href='hostentriesd?CsrfDef=TOKEN&trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . l('REMOVE') . "</a>"; |
156 |
|
|
% } |
157 |
|
|
- <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td> |
158 |
|
|
- <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td> |
159 |
|
|
- |
160 |
|
|
+ <td class='sme-border' style="min-width:15em"> |
161 |
|
|
+ <%= $c->render_to_string(inline => $actionModify) %> |
162 |
|
|
+ <%= $c->render_to_string(inline => $actionRemove) %> |
163 |
|
|
+ </td> |
164 |
|
|
+ |
165 |
|
|
</tr> |
166 |
|
|
|
167 |
|
|
% } |
168 |
|
|
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 |
169 |
|
|
--- 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 |
170 |
|
|
+++ 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 |
171 |
|
|
@@ -21,7 +21,7 @@ |
172 |
|
|
% if ($numIbays == 0){ |
173 |
|
|
%=l 'iba_NO_IBAYS' |
174 |
|
|
% } else { |
175 |
|
|
- <table class="sme-border"><tbody> |
176 |
|
|
+ <table class="sme-border TableSort"><thead> |
177 |
|
|
<tr> |
178 |
|
|
<th class='sme-border'> |
179 |
|
|
%=l 'NAME' |
180 |
|
|
@@ -29,11 +29,11 @@ |
181 |
|
|
<th class='sme-border'> |
182 |
|
|
%=l 'DESCRIPTION' |
183 |
|
|
</th> |
184 |
|
|
- <th class='sme-border' colspan='3'> |
185 |
|
|
- |
186 |
|
|
- %=l 'ACTION' |
187 |
|
|
+ <th class='sme-border'> |
188 |
|
|
+ %=l 'ACTION' |
189 |
|
|
</th> |
190 |
|
|
</tr> |
191 |
|
|
+ </thead><tbody> |
192 |
|
|
% foreach my $ibay (@$ibays) |
193 |
|
|
% { |
194 |
|
|
% my $modifiable = $ibay->prop('Modifiable') || 'yes'; |
195 |
|
|
@@ -60,10 +60,11 @@ |
196 |
|
|
% if ($removable eq 'yes') { |
197 |
|
|
% $actionRemove = "<a href='ibaysd?CsrfDef=TOKEN&trt=DEL&ibay=" . $ibay->key . "'>" . l('REMOVE') . "</a>"; |
198 |
|
|
% } |
199 |
|
|
- <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td> |
200 |
|
|
- <td class='sme-border'><%= $c->render_to_string(inline => $actionResetPw) %></td> |
201 |
|
|
- <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td> |
202 |
|
|
- |
203 |
|
|
+ <td class='sme-border' style="min-width:20em"> |
204 |
|
|
+ <%= $c->render_to_string(inline => $actionModify) %> |
205 |
|
|
+ <%= $c->render_to_string(inline => $actionResetPw)%> |
206 |
|
|
+ <%= $c->render_to_string(inline => $actionRemove) %> |
207 |
|
|
+ </td> |
208 |
|
|
</tr> |
209 |
|
|
% } |
210 |
|
|
</tbody> |
211 |
|
|
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 |
212 |
|
|
--- 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 |
213 |
|
|
+++ 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 |
214 |
|
|
@@ -47,28 +47,28 @@ |
215 |
|
|
%=l 'ln_LOCAL_NETWORK_NONE' |
216 |
|
|
% } else { |
217 |
|
|
<br> |
218 |
|
|
- <table class="sme-border"><tbody> |
219 |
|
|
+ <table class="sme-border TableSort"><thead> |
220 |
|
|
<tr> |
221 |
|
|
- <th class='sme-border'> |
222 |
|
|
+ <th class='sme-border'> |
223 |
|
|
%=l 'NETWORK' |
224 |
|
|
- </th> |
225 |
|
|
- <th class='sme-border'> |
226 |
|
|
+ </th> |
227 |
|
|
+ <th class='sme-border'> |
228 |
|
|
%=l 'ln_SUBNET_MASK' |
229 |
|
|
- </th> |
230 |
|
|
+ </th> |
231 |
|
|
|
232 |
|
|
<th class='sme-border'> |
233 |
|
|
%=l 'ln_NUMBER_OF_HOSTS' |
234 |
|
|
- </th> |
235 |
|
|
+ </th> |
236 |
|
|
|
237 |
|
|
- <th class='sme-border'> |
238 |
|
|
+ <th class='sme-border'> |
239 |
|
|
%=l 'ROUTER' |
240 |
|
|
- </th> |
241 |
|
|
+ </th> |
242 |
|
|
|
243 |
|
|
- <th class='sme-border' '> |
244 |
|
|
+ <th class='sme-border' '> |
245 |
|
|
%=l 'ACTION' |
246 |
|
|
- </th> |
247 |
|
|
+ </th> |
248 |
|
|
</tr> |
249 |
|
|
- |
250 |
|
|
+ </thead><tbody> |
251 |
|
|
% foreach my $localnetwork (@$localnetworks ) |
252 |
|
|
% { |
253 |
|
|
% my ($num_hosts) = esmith::util::computeHostRange( $localnetwork->key, $localnetwork->prop('Mask') ); |
254 |
|
|
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 |
255 |
|
|
--- 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 |
256 |
|
|
+++ 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 |
257 |
|
|
@@ -46,37 +46,31 @@ |
258 |
|
|
<br> |
259 |
|
|
%=l 'pf_SHOW_FORWARDS' |
260 |
|
|
<br> |
261 |
|
|
- <table class="sme-border"><tbody> |
262 |
|
|
+ <table class="sme-border TableSort"><thead> |
263 |
|
|
<tr> |
264 |
|
|
- <th class='sme-border'> |
265 |
|
|
+ <th class='sme-border'> |
266 |
|
|
%=l 'pf_LABEL_PROTOCOL' |
267 |
|
|
- </th> |
268 |
|
|
- <th class='sme-border'> |
269 |
|
|
+ </th> |
270 |
|
|
+ <th class='sme-border'> |
271 |
|
|
%=l 'pf_LABEL_SOURCE_PORT' |
272 |
|
|
- </th> |
273 |
|
|
- |
274 |
|
|
- <th class='sme-border'> |
275 |
|
|
+ </th> |
276 |
|
|
+ <th class='sme-border'> |
277 |
|
|
%=l 'pf_LABEL_DESTINATION_HOST' |
278 |
|
|
- </th> |
279 |
|
|
- |
280 |
|
|
- <th class='sme-border'> |
281 |
|
|
+ </th> |
282 |
|
|
+ <th class='sme-border'> |
283 |
|
|
%=l 'pf_LABEL_DESTINATION_PORT' |
284 |
|
|
- </th> |
285 |
|
|
- |
286 |
|
|
- <th class='sme-border'> |
287 |
|
|
+ </th> |
288 |
|
|
+ <th class='sme-border'> |
289 |
|
|
%=l 'pf_ALLOW_HOSTS' |
290 |
|
|
- </th> |
291 |
|
|
- |
292 |
|
|
- |
293 |
|
|
- <th class='sme-border'> |
294 |
|
|
+ </th> |
295 |
|
|
+ <th class='sme-border'> |
296 |
|
|
%=l 'pf_RULE_COMMENT' |
297 |
|
|
- </th> |
298 |
|
|
- |
299 |
|
|
- <th class='sme-border' '> |
300 |
|
|
+ </th> |
301 |
|
|
+ <th class='sme-border' '> |
302 |
|
|
%=l 'ACTION' |
303 |
|
|
- </th> |
304 |
|
|
- </tr> |
305 |
|
|
- |
306 |
|
|
+ </th> |
307 |
|
|
+ </tr> |
308 |
|
|
+ </thead><tbody> |
309 |
|
|
% my %forwards = (); |
310 |
|
|
% $forwards{TCP} = $tcpforwards; |
311 |
|
|
% $forwards{UDP} = $udpforwards; |
312 |
|
|
@@ -97,16 +91,17 @@ |
313 |
|
|
%= t td => (class => 'sme-border') => $dport |
314 |
|
|
%= t td => (class => 'sme-border') => $allow |
315 |
|
|
%= t td => (class => 'sme-border') => $cmmnt |
316 |
|
|
- <td class='sme-border'> |
317 |
|
|
- <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><%=l 'REMOVE'%></a></td> |
318 |
|
|
+ <td class='sme-border'> |
319 |
|
|
+ <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><%=l 'REMOVE'%></a> |
320 |
|
|
+ </td> |
321 |
|
|
</tr> |
322 |
|
|
% } |
323 |
|
|
% } |
324 |
|
|
%} |
325 |
|
|
- %= hidden_field 'trt' => $pf_datas->{trt} |
326 |
|
|
%} |
327 |
|
|
</tbody> |
328 |
|
|
</table> |
329 |
|
|
+ %= hidden_field 'trt' => $pf_datas->{trt} |
330 |
|
|
% end |
331 |
|
|
</div> |
332 |
|
|
|
333 |
|
|
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 |
334 |
|
|
--- 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 |
335 |
|
|
+++ 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 |
336 |
|
|
@@ -21,7 +21,7 @@ |
337 |
|
|
% if ($numPrinters == 0){ |
338 |
|
|
%=l 'prt_NO_PRINTERS' |
339 |
|
|
% } else { |
340 |
|
|
- <table class="sme-border"><tbody> |
341 |
|
|
+ <table class="sme-border TableSort"><thead> |
342 |
|
|
<tr> |
343 |
|
|
<th class='sme-border'> |
344 |
|
|
%=l 'NAME' |
345 |
|
|
@@ -42,6 +42,7 @@ |
346 |
|
|
%=l 'ACTION' |
347 |
|
|
</th> |
348 |
|
|
</tr> |
349 |
|
|
+ </thead><tbody> |
350 |
|
|
% foreach my $printer (@$printerDrivers) |
351 |
|
|
% { |
352 |
|
|
% my $address = ($printer->prop('Location') eq 'remote') |
353 |
|
|
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 |
354 |
|
|
--- 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 |
355 |
|
|
+++ 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 |
356 |
|
|
@@ -19,7 +19,7 @@ |
357 |
|
|
% if ($numPseudonyms == 0){ |
358 |
|
|
%=l 'pse_ACCOUNT_PSEUDONYM_NONE' |
359 |
|
|
% } else { |
360 |
|
|
- <table class="sme-border"><tbody> |
361 |
|
|
+ <table class="sme-border TableSort"><thead> |
362 |
|
|
<tr> |
363 |
|
|
<th class='sme-border'> |
364 |
|
|
%=l 'pse_PSEUDONYM' |
365 |
|
|
@@ -27,11 +27,12 @@ |
366 |
|
|
<th class='sme-border'> |
367 |
|
|
%=l 'pse_USER_OR_GROUP' |
368 |
|
|
</th> |
369 |
|
|
- <th class='sme-border' colspan='2'> |
370 |
|
|
- |
371 |
|
|
+ <th class='sme-border'> |
372 |
|
|
%=l 'ACTION' |
373 |
|
|
</th> |
374 |
|
|
- </tr> |
375 |
|
|
+ <!-- <th class='sme-border' style="display: normal;"></th> --> |
376 |
|
|
+ </tr></thead> |
377 |
|
|
+ <tbody> |
378 |
|
|
|
379 |
|
|
% foreach my $pseudonym ( @$pseudonyms ) |
380 |
|
|
% { |
381 |
|
|
@@ -58,8 +59,9 @@ |
382 |
|
|
% $actionRemove = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=DEL&pseudonym=" . $pseudonym->key . "'>" . l('REMOVE') . "</a>"; |
383 |
|
|
% } |
384 |
|
|
|
385 |
|
|
- <td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td> |
386 |
|
|
- <td class='sme-border'><%= $c->render_to_string(inline => $actionRemove) %></td> |
387 |
|
|
+ <td class='sme-border' style="min-width:15em"> |
388 |
|
|
+ <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %> |
389 |
|
|
+ </td> |
390 |
|
|
</tr> |
391 |
|
|
|
392 |
|
|
% } |
393 |
|
|
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 |
394 |
|
|
--- 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 |
395 |
|
|
+++ 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 |
396 |
|
|
@@ -18,7 +18,7 @@ |
397 |
|
|
% my $absolute = l('quo_ABS_LIMIT_MB'); $absolute =~ s#(limitX)#<br>$1#; |
398 |
|
|
% my $current = l('quo_CURRENT_USAGE'); $current =~ s#(usageX)#<br>$1#; |
399 |
|
|
|
400 |
|
|
- <table class="sme-border"><tbody> |
401 |
|
|
+ <table class="sme-border TableSort"><thead> |
402 |
|
|
<tr> |
403 |
|
|
<th class='sme-border'> |
404 |
|
|
%=l 'ACCOUNT' |
405 |
|
|
@@ -39,6 +39,7 @@ |
406 |
|
|
%=l 'ACTION' |
407 |
|
|
</th> |
408 |
|
|
</tr> |
409 |
|
|
+ </thead><tbody> |
410 |
|
|
|
411 |
|
|
% foreach my $user (@$userAccounts) |
412 |
|
|
% { |
413 |
|
|
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 |
414 |
|
|
--- 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 |
415 |
|
|
+++ 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 |
416 |
|
|
@@ -21,7 +21,7 @@ |
417 |
|
|
% if ($numUsers == 0){ |
418 |
|
|
%=l 'usr_NO_USER_ACCOUNTS' |
419 |
|
|
% } else { |
420 |
|
|
- <table class="sme-border"><thead> |
421 |
|
|
+ <table class="sme-border TableSort"><thead> |
422 |
|
|
<tr> |
423 |
|
|
<th class='sme-border'> |
424 |
|
|
%=l 'ACCOUNT' |
425 |
|
|
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 |
426 |
|
|
--- 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 |
427 |
|
|
+++ 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 |
428 |
|
|
@@ -131,7 +131,7 @@ |
429 |
|
|
%=l 'usr_GROUP_MEMBERSHIPS' |
430 |
|
|
</span> |
431 |
|
|
<span class=data> |
432 |
|
|
- <table class="sme-border"><tbody> |
433 |
|
|
+ <table class="sme-border TableSort"><tbody> |
434 |
|
|
<tr><th class='sme-border'> |
435 |
|
|
%=l 'usr_MEMBER' |
436 |
|
|
</th><th class='sme-border'> |
437 |
|
|
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 |
438 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2024-01-27 09:43:09.743712276 +0000 |
439 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2024-01-27 18:32:00.000000000 +0000 |
440 |
|
|
@@ -65,7 +65,7 @@ |
441 |
|
|
|
442 |
|
|
% my @vals = $self->_get_valid_from(); |
443 |
|
|
% if (@vals) { |
444 |
|
|
- <table class="sme-border"><tbody> |
445 |
|
|
+ <table class="sme-border TableSort"><thead> |
446 |
|
|
<tr><th class='sme-border'> |
447 |
|
|
%=l 'NETWORK' |
448 |
|
|
</th><th class='sme-border'> |
449 |
|
|
@@ -75,6 +75,7 @@ |
450 |
|
|
</th><th class='sme-border'> |
451 |
|
|
%=l 'REMOVE' |
452 |
|
|
</th></tr> |
453 |
|
|
+ </thead></tbody> |
454 |
|
|
|
455 |
|
|
% foreach my $val ( @vals ) |
456 |
|
|
% { |