/[smeserver]/rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Get-jquery-etc-from-smeserver-manager-jsquery-rpm.patch
ViewVC logotype

Annotation of /rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Get-jquery-etc-from-smeserver-manager-jsquery-rpm.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.2 - (hide annotations) (download)
Fri Feb 2 16:39:19 2024 UTC (4 months 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, HEAD
Changes since 1.1: +454 -10 lines 
* Tue Jan 30 2024 Brian Read <brianr@koozali.org> 0.1.4-23.sme
- Arrange that jquery etc is local and from rpm smeserver-manager-jsquery [SME: 12459]
- Correct position of % end in partial .html.ep files with tables in.
- Make smeserver-mananger-jsquery a requirement
- Move jquery overrides to jsquery rpm
1 brianr 1.1 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
2     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2024-01-30 13:05:20.561995482 +0000
3 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2024-02-02 11:00:00.000000000 +0000
4     @@ -17,25 +17,19 @@
5 brianr 1.1 %= include 'common_js'
6     % }
7     %= content_for 'refresh'
8     - <link href="https://cdn.datatables.net/v/dt/dt-1.13.8/datatables.min.css" rel="stylesheet">
9     +
10     + %= stylesheet '/js/datatables.min.css'
11     + %= javascript '/js/datatables.min.js'
12     + %= stylesheet '/js/jquery-ui.min.css'
13     + %= javascript '/js/jquery-ui.min.js'
14 brianr 1.2 +
15     + %= stylesheet '/css/sme-jquery-overrides.css'
16 brianr 1.1 +
17     + <!-- ><link href="https://cdn.datatables.net/v/dt/dt-1.13.8/datatables.min.css" rel="stylesheet">
18     <script src="https://cdn.datatables.net/v/dt/dt-1.13.8/datatables.min.js"></script>
19     <link rel="stylesheet" href="//code.jquery.com/ui/1.13.2/themes/base/jquery-ui.css">
20     - <script src="https://code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
21     + <script src="https://code.jquery.com/ui/1.13.2/jquery-ui.js"></script>-->
22    
23 brianr 1.2 - <!-- Jquery datatables override -->
24     - %= stylesheet begin
25     - .dataTables_wrapper {
26     - width: min-content;
27     - margin-right: auto;
28     - }
29     -
30     - .ui-button {
31     - position: relative;
32     - font-size: 0;
33     - width: 23px;
34     - height: 23px;
35     - }
36     - %end
37    
38     </head>
39    
40     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
41     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep 2024-01-30 13:05:20.562995510 +0000
42     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep 2024-02-01 12:57:00.000000000 +0000
43     @@ -5,101 +5,101 @@
44    
45     %= form_for '/domains' => (method => 'POST') => begin
46    
47     - %= l('dom_FORM_DESCRIPTION');
48     + %= l('dom_FORM_DESCRIPTION');
49     +
50     + <p>
51     + <br>
52     + %= submit_button "$btn", class => 'action'
53     + </p>
54     +
55     + %= hidden_field 'trt' => 'UP2'
56    
57     - <p>
58     - <br>
59     - %= submit_button "$btn", class => 'action'
60     - </p>
61     + % end
62    
63     - <p>
64     <h2>
65     - %=l 'dom_CURRENT_DOMAINS'
66     + %=l 'dom_CURRENT_DOMAINS'
67     </h2>
68     <table class="sme-border TableSort"><thead>
69     <tr>
70     - <th class='sme-border'>
71     - %=l 'DOMAIN_NAME'
72     - </th>
73     - <th class='sme-border'>
74     - %=l 'DESCRIPTION_BRIEF'
75     - </th>
76     - <th class='sme-border'>
77     - %=l 'dom_CONTENT'
78     - </th>
79     - <th class='sme-border'>
80     - %=l 'dom_LABEL_NAMESERVERS'
81     - </th>
82     - <th class='sme-border'>
83     - %=l 'ACTION'
84     - </th>
85     - </tr>
86     - </thead><tbody>
87     + <th class='sme-border'>
88     + %=l 'DOMAIN_NAME'
89     + </th>
90     + <th class='sme-border'>
91     + %=l 'DESCRIPTION_BRIEF'
92     + </th>
93     + <th class='sme-border'>
94     + %=l 'dom_CONTENT'
95     + </th>
96     + <th class='sme-border'>
97     + %=l 'dom_LABEL_NAMESERVERS'
98     + </th>
99     + <th class='sme-border'>
100     + %=l 'ACTION'
101     + </th>
102     + </tr>
103     + </thead><tbody>
104    
105     - % foreach my $domain ( @$domains ) {
106     + % foreach my $domain ( @$domains ) {
107     <tr>
108     %= t td => (class => 'sme-border') => $domain->{Domain}
109     %= t td => (class => 'sme-border') => $domain->{'Description'}
110     %= t td => (class => 'sme-border') => $domain->{'Content'}
111     %= t td => (class => 'sme-border') => l('dom_' . $domain->{'Nameservers'})
112    
113     - % my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
114     + % my $actionModify = "<a href='domains2?CsrfDef=TOKEN&trt=UPD&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-modify-button' title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>";
115    
116     - % my $removable = ($domain->{Removable} || 'yes');
117     - % my $actionRemove = '&nbsp;';
118     + % my $removable = ($domain->{Removable} || 'yes');
119     + % my $actionRemove = '&nbsp;';
120    
121     - % if ($removable eq 'yes') {
122     - % $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
123     - % }
124     -
125     - <td class='sme-border' style="min-width:15em">
126     - <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
127     - </td>
128     - </tr>
129     - % }
130     -
131     - </tbody>
132     - </table>
133     - </p>
134     + % if ($removable eq 'yes') {
135     + % $actionRemove = "<a href='domains2?CsrfDef=TOKEN&trt=DEL&Domain=" . $domain->{Domain} . "'>" . "<button class='sme-remove-button' title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
136     + % }
137    
138     - %= hidden_field 'trt' => 'ADD'
139     + <td class='sme-border' style="min-width:15em">
140     + <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionRemove) %>
141     + </td>
142     + </tr>
143     + % }
144    
145     - % end
146     + </tbody>
147     + </table>
148     +
149     + %= hidden_field 'trt' => 'ADD'
150    
151     %= form_for '/domains' => (method => 'POST') => begin
152    
153     - <HR class="sectionbar">
154     + <HR class="sectionbar">
155    
156     - % my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS');
157     + % my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS');
158    
159     - <h3>
160     - %= l 'dom_DESC_CORPORATE_DNS_CURRENT'
161     - </h3>
162     -
163     - <p>
164     - <span class=label>
165     - %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
166     - </span><span class=data>
167     - %= $dom_datas->{forwarder}
168     - </span>
169     - </p>
170     -
171     - % if ($dom_datas->{forwarder2}) {
172     - <p>
173     - <span class=label>
174     - %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY'
175     - </span><span class=data>
176     - %= $dom_datas->{forwarder2}
177     - </span>
178     - </p>
179     - % }
180     -
181     - <p>
182     - %= submit_button "$btn2", class => 'action'
183     - </p>
184     + <h3>
185     + %= l 'dom_DESC_CORPORATE_DNS_CURRENT'
186     + </h3>
187     +
188     + <p>
189     + <span class=label>
190     + %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY'
191     + </span><span class=data>
192     + %= $dom_datas->{forwarder}
193     + </span>
194     + </p>
195     +
196     + % if ($dom_datas->{forwarder2}) {
197     + <p>
198     + <span class=label>
199     + %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY'
200     + </span><span class=data>
201     + %= $dom_datas->{forwarder2}
202     + </span>
203     + </p>
204     + % }
205     +
206     + <p>
207     + %= submit_button "$btn2", class => 'action'
208     + </p>
209     + %= hidden_field 'trt' => 'UP2'
210     + % end
211    
212     - %= hidden_field 'trt' => 'UP2'
213    
214     - % end
215    
216     </div>
217     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
218     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2024-01-30 13:05:20.563995537 +0000
219     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2024-02-01 11:14:00.000000000 +0000
220     @@ -9,6 +9,8 @@
221     <p> <br>
222     %= submit_button "$btn", class => 'action'
223     </p>
224     + % end
225 brianr 1.1 +
226 brianr 1.2
227     <p> <h2>
228     %=l 'grp_CURRENT_LIST'
229     @@ -36,9 +38,10 @@
230     <tr>
231     %= t td => (class => 'sme-border') => $group->key
232     %= t td => (class => 'sme-border') => $group->prop('Description')
233     - <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>
234     - <a href="groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"</button></a>
235     - </td>
236     + <td class='sme-border' style="min-width:15em">
237     + <a href='groups2?CsrfDef=TOKEN&trt=UPD&group=<%= $group->key%>'><button class='sme-modify-button' title=<%=l('MODIFY')%>><%=l('MODIFY') %></button></a>
238     + <a href='groups2?CsrfDef=TOKEN&trt=DEL&group=<%= $group->key%>'><button class='sme-remove-button' title=<%=l('REMOVE')%>><%=l('REMOVE') %></button></a>
239     + </td>
240     </tr>
241     % }
242     </tbody>
243     @@ -47,6 +50,4 @@
244     </p>
245    
246    
247     - % end
248     -
249     </div>
250     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
251     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep 2024-01-30 13:05:20.563995537 +0000
252     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep 2024-02-01 11:20:00.000000000 +0000
253     @@ -8,6 +8,10 @@
254     %= submit_button "$btn", class => 'action'
255     <br></p>
256    
257     + %= hidden_field 'trt' => $hos_datas->{trt}
258     +
259     + % end
260     +
261     % my %dom_hos = %{$dom_hosts};
262     % foreach my $domain ( sort ( keys %dom_hos ) ) {
263    
264     @@ -47,8 +51,8 @@
265     %= t td => (class => 'sme-border') => $_->{'Comment'};
266     % my ($actionModify, $actionRemove) = '&nbsp;';
267     % if ($_->{'static'} ne 'yes') {
268     - % $actionModify = "<a href='hostentriesd?CsrfDef=TOKEN&trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
269     - % $actionRemove = "<a href='hostentriesd?CsrfDef=TOKEN&trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
270     + % $actionModify = "<a href='hostentriesd?CsrfDef=TOKEN&trt=UPD&Hostname=" . $_->{'HostName'} . "'>" . "<button class='sme-modify-button' title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>";
271     + % $actionRemove = "<a href='hostentriesd?CsrfDef=TOKEN&trt=DEL&Hostname=" . $_->{'HostName'} . "'>" . "<button class='sme-remove-button' title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
272     % }
273     <td class='sme-border' style="min-width:15em">
274     <%= $c->render_to_string(inline => $actionModify) %>
275     @@ -65,8 +69,5 @@
276    
277     % }
278    
279     - %= hidden_field 'trt' => $hos_datas->{trt}
280     -
281     - % end
282    
283     </div>
284     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
285     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2024-01-30 13:05:20.564995564 +0000
286     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2024-02-01 08:43:00.000000000 +0000
287     @@ -47,18 +47,20 @@
288     %= t td => (class => 'sme-border') => $ibay->prop('Name')
289     % my ($actionModify, $actionResetPw, $actionRemove) = '&nbsp;';
290     % if ($modifiable eq 'yes') {
291     - % $actionModify = "<a href='ibaysd?CsrfDef=TOKEN&trt=UPD&ibay=" . $ibay->key . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
292     + % $actionModify = "<a href='ibaysd?CsrfDef=TOKEN&trt=UPD&ibay=" . $ibay->key . "'>" . "<button class='sme-modify-button' title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>";
293     % }
294     % if ($passwordable eq 'yes') {
295     % if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
296     - % $actionResetPw .= "<a href='ibaysd?CsrfDef=TOKEN&trt=PWD&ibay=" . $ibay->key . "' class='error'>" . l('PASSWORD_RESET') . "</a>";
297     - % } else {
298     - % $actionResetPw .= "<a href='ibaysd?CsrfDef=TOKEN&trt=PWD&ibay=" . $ibay->key . "'>" . l('PASSWORD_RESET') . "</a>";
299     + %# $actionResetPw .= "<a href='ibaysd?CsrfDef=TOKEN&trt=PWD&ibay=" . $ibay->key . "' class='error'>" . l('PASSWORD_RESET') . "</a>";
300     + % $actionResetPw .= "<a href='ibaysd?CsrfDef=TOKEN&trt=PWD&ibay=" . $ibay->key. "'>" . "<button class='sme-password-button' style ='border-color:red;' title=".l("Reset-Password").">".l("Reset-Password")."</button></a>";
301     +% } else {
302     + % $actionResetPw .= "<a href='ibaysd?CsrfDef=TOKEN&trt=PWD&ibay=" . $ibay->key . "'>" . "<button class='sme-password-button' title=".l("Reset-Password").">".l("Reset-Password")."</button></a>";
303     + %# $actionResetPw .= "<a href='ibaysd?CsrfDef=TOKEN&trt=PWD&ibay=" . $ibay->key . "'>" . l('PASSWORD_RESET') . "</a>";
304     % }
305     % $actionResetPw .= '&nbsp';
306     % }
307     % if ($removable eq 'yes') {
308     - % $actionRemove = "<a href='ibaysd?CsrfDef=TOKEN&trt=DEL&ibay=" . $ibay->key . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
309     + % $actionRemove = "<a href='ibaysd?CsrfDef=TOKEN&trt=DEL&ibay=" . $ibay->key . "'>" . "<button class='sme-remove-button' title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
310     % }
311     <td class='sme-border' style="min-width:20em">
312     <%= $c->render_to_string(inline => $actionModify) %>
313     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
314     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep 2024-01-30 13:05:20.564995564 +0000
315     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep 2024-02-01 11:23:00.000000000 +0000
316     @@ -41,6 +41,8 @@
317     <div class='center'>
318     %= submit_button "$btn", class => 'action'
319     </div>
320     + % end
321     +
322     <br>
323     % my $numlocalnetworks = @$localnetworks;
324     % if ($numlocalnetworks == 0){
325     @@ -82,7 +84,7 @@
326     %= t td => (class => 'sme-border') => $localnetwork->prop('Router')
327     % if ($removable eq "yes") {
328     <td class='sme-border'>
329     - <a href="localnetworksd?CsrfDef=TOKEN&trt=DEL&localnetwork=<%= $localnetwork->key%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"></button></a></td>
330     + <a href="localnetworksd?CsrfDef=TOKEN&trt=DEL&localnetwork=<%= $localnetwork->key%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"><%=l('REMOVE') %></button></a></td>
331     % } else {
332     <td class='sme-border'> </td>
333     %}
334     @@ -94,5 +96,4 @@
335    
336     %= hidden_field 'trt' => $ln_datas->{trt}
337     %}
338     - % end
339     </div>
340     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
341     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep 2024-01-30 13:05:20.564995564 +0000
342     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep 2024-02-01 11:24:00.000000000 +0000
343     @@ -37,7 +37,9 @@
344     <div class='center'>
345     %= submit_button "$btn", class => 'action'
346     </div>
347     - <br>
348     + % end
349     +
350     + <br>
351    
352     % if ($empty){
353     <br>
354     @@ -92,7 +94,7 @@
355     %= t td => (class => 'sme-border') => $allow
356     %= t td => (class => 'sme-border') => $cmmnt
357     <td class='sme-border'>
358     - <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"></button></a>
359     + <a href="portforwardingd?CsrfDef=TOKEN&trt=DEL&sport=<%= $sport%>&proto=<%= $proto%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"><%=l('REMOVE') %></button></a>
360     </td>
361     </tr>
362     % }
363     @@ -102,6 +104,6 @@
364     </tbody>
365     </table>
366     %= hidden_field 'trt' => $pf_datas->{trt}
367     - % end
368     +
369     </div>
370    
371     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
372     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2024-01-30 13:05:20.565995591 +0000
373     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2024-02-01 11:27:00.000000000 +0000
374     @@ -11,6 +11,7 @@
375     <br>
376     %= submit_button "$btn", class => 'action'
377     </p>
378     + % end
379    
380     <p>
381     <h2>
382     @@ -56,7 +57,7 @@
383     %= t td => (class => 'sme-border') => $printer->prop('Location')
384     %= t td => (class => 'sme-border') => $address
385     %= t td => (class => 'sme-border') => $remoteName
386     - <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>
387     + <td class='sme-border'><a href="printers2?CsrfDef=TOKEN&trt=DEL&printer=<%= $printer->key%>"><button class='sme-remove-button' title="<%=l('REMOVE')%>"><%=l('REMOVE') %></button></a></td>
388     </tr>
389     % }
390     </tbody>
391     @@ -64,6 +65,5 @@
392     <%} %>
393     </p>
394    
395     - % end
396    
397     </div>
398     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
399     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep 2024-01-30 13:05:20.565995591 +0000
400     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep 2024-02-01 11:27:00.000000000 +0000
401     @@ -11,6 +11,9 @@
402     <p><br>
403     %= submit_button "$btn", class => 'action'
404     </p>
405 brianr 1.1 +
406 brianr 1.2 + % end
407     +
408    
409     <p><h2>
410     %=l 'pse_CURRENT_PSEUDONYMS'
411     @@ -53,10 +56,10 @@
412 brianr 1.1
413 brianr 1.2 % my ($actionModify, $actionRemove) = '&nbsp;';
414     % if ($modifiable eq 'yes') {
415     - % $actionModify = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=UPD&pseudonym=" . $pseudonym->key . "'>" . "<button class='sme-modify-button' title=".l('MODIFY')."></button>" . "</a>";
416     + % $actionModify = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=UPD&pseudonym=" . $pseudonym->key . "'>" . "<button class='sme-modify-button' title=".l('MODIFY').">".l('MODIFY')."</button>" . "</a>";
417     % }
418     % if ($removable eq 'yes') {
419     - % $actionRemove = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=DEL&pseudonym=" . $pseudonym->key . "'>" . "<button class='sme-remove-button' title=".l('REMOVE')."></button>" . "</a>";
420     + % $actionRemove = "<a href='pseudonyms2?CsrfDef=TOKEN&trt=DEL&pseudonym=" . $pseudonym->key . "'>" . "<button class='sme-remove-button' title=".l('REMOVE').">".l('REMOVE')."</button>" . "</a>";
421     % }
422    
423     <td class='sme-border' style="min-width:15em">
424     @@ -71,7 +74,6 @@
425     </p>
426    
427    
428     - % end
429    
430     </div>
431    
432     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
433     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep 2024-01-30 13:05:20.566995618 +0000
434     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep 2024-02-01 08:34:00.000000000 +0000
435     @@ -57,7 +57,7 @@
436     %= t td => (class => 'sme-border') => sprintf("%.2f", $bs / 1024 )
437     %= t td => (class => 'sme-border') => sprintf("%.2f", $bh / 1024 )
438     %= t td => (class => 'sme-border') => sprintf("%.2f", $bc / 1024 )
439     - <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>
440     + <td class='sme-border'><a href="quotad?CsrfDef=TOKEN&trt=UPD&user=<%= $user->key%>"><button class='sme-modify-button' title="<%=l('MODIFY')%>"><%=l('MODIFY') %></button></a></td>
441     </tr>
442     % }
443     </tbody>
444     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
445     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep 2024-01-30 13:05:20.566995618 +0000
446     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep 2024-01-31 19:30:00.000000000 +0000
447     @@ -61,21 +61,19 @@
448     %= t td => (class => 'sme-border') => $fwd
449     % my ($actionModify, $actionLock, $actionResetPw, $actionRemove) = '&nbsp;';
450     % if ($username eq 'admin') {
451     - % $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPS&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY")."></button></a>";
452     - % $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWS&user=" . $username . "'>" . "<button class='sme-password-button' title=".l("Reset-Password")."></button></a>";
453     + % $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPS&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY").">".l("MODIFY")."</button></a>";
454     + % $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWS&user=" . $username . "'>" . "<button class='sme-password-button' title=".l("Reset-Password").">".l("Reset-Password")."</button></a>";
455     % } else {
456     - % $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPD&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY")."></button></a>";
457     + % $actionModify = "<a href='useraccountsd?CsrfDef=TOKEN&trt=UPD&user=" . $username . "'>" . "<button class='sme-modify-button' title=".l("MODIFY").">".l("MODIFY")."</button></a>";
458     % if ($password_set ne 'yes') {
459     % $actionLock = l('ACCOUNT_LOCKED');
460     - % $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>";
461     - %# $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "' class='error'>" . l('PASSWORD_RESET') . "</a>";
462     + % $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . "<button class='sme-password-button' style ='border-color:red;' title=".l("Reset-Password").">".l("Reset-Password")."</button></a>";
463     % } else {
464     - % $actionLock = "<a href='useraccountsd?CsrfDef=TOKEN&trt=LCK&user=" . $username . "'>" . "<button class='sme-lock-button' title=".l('usr_LOCK_ACCOUNT')."></button></a>";
465     - % $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . "<button class='sme-password-button' title=".l("Reset-Password")."></button></a>";
466     - %# $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . l('PASSWORD_RESET') . "</a>";
467     + % $actionLock = "<a href='useraccountsd?CsrfDef=TOKEN&trt=LCK&user=" . $username . "'>" . "<button class='sme-lock-button' title=".l('usr_LOCK_ACCOUNT').">".l("usr_LOCK_ACCOUNT")."</button></a>";
468     + % $actionResetPw = "<a href='useraccountsd?CsrfDef=TOKEN&trt=PWD&user=" . $username . "'>" . "<button class='sme-password-button' title=".l("Reset-Password").">".l("Reset-Password")."</button></a>";
469     % }
470     % if ( $removable eq 'yes' ) {
471     - % $actionRemove = "<a href='useraccountsd?CsrfDef=TOKEN&trt=DEL&user=" . $username . "'>" . "<button class='sme-remove-button' title=".l("REMOVE")."></button></a>";
472     + % $actionRemove = "<a href='useraccountsd?CsrfDef=TOKEN&trt=DEL&user=" . $username . "'>" . "<button class='sme-remove-button' title=".l("REMOVE").">".l("REMOVE")."</button></a>";
473     % }
474     % }
475     <td class='sme-border' style="min-width:35em">
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed