/[smeserver]/rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Re-organise-menus.patch
ViewVC logotype

Contents of /rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Re-organise-menus.patch

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

Revision 1.4 - (show annotations) (download)
Wed Feb 21 08:54:10 2024 UTC (3 months, 1 week ago) by brianr
Branch: MAIN
CVS Tags: smeserver-manager-0_1_4-31_el7_sme, smeserver-manager-0_1_4-29_el7_sme, smeserver-manager-0_1_4-33_el7_sme, smeserver-manager-0_1_4-28_el7_sme, smeserver-manager-0_1_4-32_el7_sme, HEAD
Changes since 1.3: +85 -2 lines 
* Sun Feb 18 2024 Brian Read <brianr@koozali.org> 0.1.4-27.sme
- Re-arrange Menu [SME: 12476]
- Fix problem with ibays not all showing [SME: 12478]
1 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm
2 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2024-02-18 11:04:27.013707139 +0000
3 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2024-02-20 20:20:00.000000000 +0000
4 @@ -1,9 +1,9 @@
5 package SrvMngr::Controller::Backup;
6
7 #----------------------------------------------------------------------
8 -# heading : Administration
9 +# heading : System
10 # description : Backup or restore
11 -# navigation : 4000 4200
12 +# navigation : 4000 200
13 # Copyright (C) 2002 Mitel Networks Corporation
14 #----------------------------------------------------------------------
15 # routes : end
16 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm
17 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2021-06-21 10:25:10.000000000 +0100
18 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2024-02-20 20:21:00.000000000 +0000
19 @@ -1,9 +1,9 @@
20 package SrvMngr::Controller::Bugreport;
21
22 #----------------------------------------------------------------------
23 -# heading : Miscellaneous
24 +# heading : Investigation
25 # description : Report a bug
26 -# navigation : 7000 7300
27 +# navigation : 7000 500
28
29 # routes : end
30 #------------------------------
31 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm
32 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm 2020-11-19 07:53:26.000000000 +0000
33 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm 2024-02-20 20:20:00.000000000 +0000
34 @@ -1,9 +1,9 @@
35 package SrvMngr::Controller::Clamav;
36
37 #----------------------------------------------------------------------
38 -# heading : Configuration
39 +# heading : System
40 # description : Antivirus (ClamAV)
41 -# navigation : 6000 6720
42 +# navigation : 4000 600
43 #
44 # routes : end
45 #------------------------------
46 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm
47 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm 2024-02-18 11:04:27.057708453 +0000
48 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm 2024-02-20 20:20:00.000000000 +0000
49 @@ -1,9 +1,9 @@
50 package SrvMngr::Controller::Datetime;
51
52 #----------------------------------------------------------------------
53 -# heading : Configuration
54 +# heading : System
55 # description : Date and time
56 -# navigation : 6000 6100
57 +# navigation : 4000 400
58
59 # routes : end
60 #------------------------------
61 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm
62 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm 2020-11-19 07:53:26.000000000 +0000
63 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm 2024-02-20 08:47:00.000000000 +0000
64 @@ -1,9 +1,9 @@
65 package SrvMngr::Controller::Directory;
66
67 #----------------------------------------------------------------------
68 -# heading : Configuration
69 +# heading : User management
70 # description : Directory
71 -# navigation : 6000 6300
72 +# navigation : 2000 300
73 #
74 # routes : end
75 #----------------------------------------------------------------------
76 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm
77 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm 2020-11-19 07:53:26.000000000 +0000
78 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm 2024-02-20 10:07:00.000000000 +0000
79 @@ -1,9 +1,9 @@
80 package SrvMngr::Controller::Domains;
81
82 #----------------------------------------------------------------------
83 -# heading : Configuration
84 -# description : DOMAINS
85 -# navigation : 6000 6600
86 +# heading : Network
87 +# description : Domains
88 +# navigation : 6000 300
89 #
90 # routes : end
91 #----------------------------------------------------------------------
92 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm
93 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm 2021-06-21 10:25:10.000000000 +0100
94 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm 2024-02-20 20:20:00.000000000 +0000
95 @@ -1,9 +1,9 @@
96 package SrvMngr::Controller::Emailsettings;
97
98 #----------------------------------------------------------------------
99 -# heading : Configuration
100 +# heading : System
101 # description : E-mail
102 -# navigation : 6000 6700
103 +# navigation : 4000 500
104 #
105 #
106 # routes : end
107 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm
108 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm 2020-11-19 07:53:26.000000000 +0000
109 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm 2024-02-20 08:47:00.000000000 +0000
110 @@ -1,9 +1,9 @@
111 package SrvMngr::Controller::Groups;
112
113 #----------------------------------------------------------------------
114 -# heading : Collaboration
115 +# heading : User management
116 # description : GROUPS
117 -# navigation : 2000 2200
118 +# navigation : 2000 200
119 #----------------------------------------------------------------------
120 #
121 # routes : end
122 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm
123 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm 2020-11-19 07:53:26.000000000 +0000
124 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm 2024-02-20 10:07:00.000000000 +0000
125 @@ -1,9 +1,9 @@
126 package SrvMngr::Controller::Hostentries;
127
128 #----------------------------------------------------------------------
129 -# heading : Configuration
130 +# heading : Network
131 # description : Hostnames and addresses
132 -# navigation : 6000 6500
133 +# navigation : 6000 200
134 #----------------------------------------------------------------------
135 #
136 # routes : end
137 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm
138 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2020-11-19 07:53:26.000000000 +0000
139 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2024-02-20 16:49:00.000000000 +0000
140 @@ -1,9 +1,9 @@
141 package SrvMngr::Controller::Ibays;
142
143 #----------------------------------------------------------------------
144 -# heading : Collaboration
145 -# description : Information bays
146 -# navigation : 2000 2500
147 +# heading : Network
148 +# description : Shared areas (was ibays)
149 +# navigation : 6000 100
150 #
151 #
152 # routes : end
153 @@ -52,7 +52,7 @@
154 my $c = shift;
155
156 my $rt = $c->current_route;
157 - my $trt = ($c->param('trt') || 'ADD');
158 + my $trt = ($c->param('trt') || 'LIST');
159 my $ibay = $c->param('ibay') || '';
160
161 #$trt = 'DEL' if ( $ibay );
162 @@ -78,42 +78,42 @@
163
164 if ( $trt eq 'UPD' ) {
165
166 - my $rec = $adb->get($ibay);
167 - if ($rec and $rec->prop('type') eq 'ibay') {
168 - $iba_datas{ibay} = $ibay;
169 - $iba_datas{description} = $rec->prop('Name') || '';
170 - $iba_datas{group} = $rec->prop('Group') || '';
171 - $iba_datas{userAccess} = $rec->prop('UserAccess') || '';
172 - $iba_datas{publicAccess} = $rec->prop('PublicAccess') || '';
173 - $iba_datas{CgiBin} = $rec->prop('CgiBin') || 'disabled';
174 - $iba_datas{SSL} = $rec->prop('SSL') || 'disabled';
175 -
176 - }
177 + my $rec = $adb->get($ibay);
178 + if ($rec and $rec->prop('type') eq 'ibay') {
179 + $iba_datas{ibay} = $ibay;
180 + $iba_datas{description} = $rec->prop('Name') || '';
181 + $iba_datas{group} = $rec->prop('Group') || '';
182 + $iba_datas{userAccess} = $rec->prop('UserAccess') || '';
183 + $iba_datas{publicAccess} = $rec->prop('PublicAccess') || '';
184 + $iba_datas{CgiBin} = $rec->prop('CgiBin') || 'disabled';
185 + $iba_datas{SSL} = $rec->prop('SSL') || 'disabled';
186 + }
187 }
188
189 if ( $trt eq 'DEL' ) {
190
191 - my $rec = $adb->get($ibay);
192 - if ($rec and $rec->prop('type') eq 'ibay') {
193 - $iba_datas{ibay} = $ibay;
194 - $iba_datas{description} = $rec->prop('Name') || '';
195 - $modul .= print_vhost_message( $c, $ibay );
196 - }
197 + my $rec = $adb->get($ibay);
198 + if ($rec and $rec->prop('type') eq 'ibay') {
199 + $iba_datas{ibay} = $ibay;
200 + $iba_datas{description} = $rec->prop('Name') || '';
201 + $modul .= print_vhost_message( $c, $ibay );
202 + }
203
204 }
205
206 if ( $trt eq 'PWD' ) {
207
208 - my $rec = $adb->get($ibay);
209 - if ($rec and $rec->prop('type') eq 'ibay') {
210 - $iba_datas{ibay} = $ibay;
211 - $iba_datas{description} = $rec->prop('Name') || '';
212 - }
213 + my $rec = $adb->get($ibay);
214 + if ($rec and $rec->prop('type') eq 'ibay') {
215 + $iba_datas{ibay} = $ibay;
216 + $iba_datas{description} = $rec->prop('Name') || '';
217 + }
218
219 }
220
221 if ( $trt eq 'LIST' ) {
222 my @ibays;
223 + $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
224 if ($adb)
225 {
226 @ibays = $adb->ibays();
227 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm
228 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm 2020-11-19 07:53:26.000000000 +0000
229 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm 2024-02-20 12:05:00.000000000 +0000
230 @@ -1,11 +1,10 @@
231 package SrvMngr::Controller::Initial;
232
233 #----------------------------------------------------------------------
234 -# heading : None
235 +# heading : Support
236 # description : Home
237 -# navigation : 1000 1000
238 -# menu : N
239 -#
240 +# navigation : 0000 000
241 +# menu : N
242 # routes : end
243 #----------------------------------------------------------------------
244 use strict;
245 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm
246 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm 2020-11-19 07:53:26.000000000 +0000
247 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm 2024-02-20 10:07:00.000000000 +0000
248 @@ -1,9 +1,9 @@
249 package SrvMngr::Controller::Localnetworks;
250
251 #----------------------------------------------------------------------
252 -# heading : Security
253 +# heading : Network
254 # description : Local networks
255 -# navigation : 5000 5300
256 +# navigation : 6000 500
257 #
258 # routes : end
259 #----------------------------------------------------------------------
260 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Login.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Login.pm
261 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Login.pm 2024-02-18 11:04:27.048708184 +0000
262 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Login.pm 2024-02-20 12:17:00.000000000 +0000
263 @@ -1,6 +1,11 @@
264 package SrvMngr::Controller::Login;
265
266 #----------------------------------------------------------------------
267 +# heading : Support
268 +# description : Login
269 +# navigation : 0000 001
270 +# menu : N
271 +#
272 # routes : end
273 #----------------------------------------------------------------------
274
275 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm
276 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm 2020-11-19 07:53:26.000000000 +0000
277 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm 2024-02-20 08:47:00.000000000 +0000
278 @@ -1,10 +1,9 @@
279 package SrvMngr::Controller::Logout;
280
281 #----------------------------------------------------------------------
282 -# heading : None
283 +# heading : Current User
284 # description : Logout
285 -# navigation : 1000 1900
286 -# menu : U
287 +# navigation : 1000 900
288 #
289 # routes : end
290 #----------------------------------------------------------------------
291 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm
292 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm 2021-06-21 10:25:10.000000000 +0100
293 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm 2024-02-20 12:07:00.000000000 +0000
294 @@ -1,10 +1,10 @@
295 package SrvMngr::Controller::Manual;
296
297 #----------------------------------------------------------------------
298 -# heading : None
299 +# heading : Support
300 # description : Online manual
301 -# navigation : 1000 1100
302 -# menu : N
303 +# navigation : 0000 100
304 +# menu : N
305 #
306 # routes : end
307 #----------------------------------------------------------------------
308 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm
309 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm 2020-11-19 07:53:26.000000000 +0000
310 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm 2024-02-20 10:07:00.000000000 +0000
311 @@ -1,9 +1,9 @@
312 package SrvMngr::Controller::Portforwarding;
313
314 #----------------------------------------------------------------------
315 -# heading : Security
316 +# heading : Network
317 # description : Port forwarding
318 -# navigation : 5000 5400
319 +# navigation : 6000 600
320 #
321 # routes : end
322 #----------------------------------------------------------------------
323 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
324 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-02-18 11:04:27.081709170 +0000
325 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-02-20 20:20:00.000000000 +0000
326 @@ -1,9 +1,9 @@
327 package SrvMngr::Controller::Printers;
328
329 #----------------------------------------------------------------------
330 -# heading : Configuration
331 +# heading : System
332 # description : Printers
333 -# navigation : 6000 6400
334 +# navigation : 4000 800
335 #
336 #
337 # routes : end
338 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm
339 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm 2020-11-19 07:53:26.000000000 +0000
340 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm 2024-02-20 20:20:00.000000000 +0000
341 @@ -1,9 +1,9 @@
342 package SrvMngr::Controller::Proxy;
343
344 #----------------------------------------------------------------------
345 -# heading : Security
346 +# heading : System
347 # description : Proxy settings
348 -# navigation : 5000 5500
349 +# navigation : 4000 700
350 #----------------------------------------------------------------------
351 #
352 # routes : end
353 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm
354 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm 2020-11-19 07:53:26.000000000 +0000
355 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm 2024-02-20 08:47:00.000000000 +0000
356 @@ -1,9 +1,9 @@
357 package SrvMngr::Controller::Pseudonyms;
358
359 #----------------------------------------------------------------------
360 -# heading : Collaboration
361 +# heading : User management
362 # description : Pseudonyms
363 -# navigation : 2000 2400
364 +# navigation : 2000 210
365 #----------------------------------------------------------------------
366 #
367 # routes : end
368 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm
369 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm 2020-11-19 07:53:26.000000000 +0000
370 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm 2024-02-20 20:21:00.000000000 +0000
371 @@ -1,9 +1,9 @@
372 package SrvMngr::Controller::Qmailanalog;
373
374 #----------------------------------------------------------------------
375 -# heading : Administration
376 +# heading : Investigation
377 # description : Mail log file analysis
378 -# navigation : 4000 4500
379 +# navigation : 7000 200
380 #
381 # routes : end
382 #----------------------------------------------------------------------
383 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm
384 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm 2020-11-19 07:53:26.000000000 +0000
385 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm 2024-02-20 08:47:00.000000000 +0000
386 @@ -1,9 +1,9 @@
387 package SrvMngr::Controller::Quota;
388
389 #----------------------------------------------------------------------
390 -# heading : Collaboration
391 +# heading : User management
392 # description : Quotas
393 -# navigation : 2000 2300
394 +# navigation : 2000 300
395 #----------------------------------------------------------------------
396 #
397 # routes : end
398 @@ -190,4 +190,4 @@
399 }
400
401
402 -1
403 \ No newline at end of file
404 +1
405 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm
406 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2021-06-21 10:25:10.000000000 +0100
407 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2024-02-20 20:29:43.962492004 +0000
408 @@ -1,9 +1,9 @@
409 package SrvMngr::Controller::Reboot;
410
411 #----------------------------------------------------------------------
412 -# heading : Administration
413 +# heading : System
414 # description : Reboot or shutdown
415 -# navigation : 4000 4700
416 +# navigation : 4000 700
417 #
418 # routes : end
419 #----------------------------------------------------------------------
420 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm
421 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm 2021-06-21 10:25:10.000000000 +0100
422 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm 2024-02-20 10:07:00.000000000 +0000
423 @@ -1,9 +1,9 @@
424 package SrvMngr::Controller::Remoteaccess;
425
426 #----------------------------------------------------------------------
427 -# heading : Security
428 +# heading : Network
429 # description : Remote access
430 -# navigation : 5000 5200
431 +# navigation : 6000 400
432 #----------------------------------------------------------------------
433 #
434 # routes : end
435 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm
436 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2024-02-18 11:04:27.007706960 +0000
437 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2024-02-20 20:21:00.000000000 +0000
438 @@ -1,11 +1,10 @@
439 package SrvMngr::Controller::Review;
440
441 #----------------------------------------------------------------------
442 -# heading : None
443 +# heading : Investigation
444 # description : Review configuration
445 -# navigation : 1000 1200
446 +# navigation : 7000 400
447 #
448 -# menu : U
449 #
450 # routes : end
451 #----------------------------------------------------------------------
452 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm
453 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm 2020-11-19 07:53:26.000000000 +0000
454 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm 2024-02-20 12:07:00.000000000 +0000
455 @@ -1,10 +1,10 @@
456 package SrvMngr::Controller::Support;
457
458 #----------------------------------------------------------------------
459 -# heading : None
460 +# heading : Support
461 # description : Support and licensing
462 -# navigation : 1000 1200
463 -# menu : N
464 +# navigation : 0000 200
465 +# menu : N
466 #
467 # routes : end
468 #----------------------------------------------------------------------
469 @@ -41,4 +41,4 @@
470 };
471
472
473 -1;
474 \ No newline at end of file
475 +1;
476 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm
477 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2020-11-19 07:53:26.000000000 +0000
478 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2024-02-20 08:47:00.000000000 +0000
479 @@ -1,9 +1,9 @@
480 package SrvMngr::Controller::Useraccounts;
481
482 #----------------------------------------------------------------------
483 -# heading : Collaboration
484 +# heading : User management
485 # description : Users
486 -# navigation : 2000 2100
487 +# navigation : 2000 100
488 #----------------------------------------------------------------------
489 #
490 # routes : end
491 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm
492 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm 2024-02-18 11:04:27.048708184 +0000
493 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm 2024-02-20 08:47:00.000000000 +0000
494 @@ -1,11 +1,10 @@
495 package SrvMngr::Controller::Userpassword;
496
497 #----------------------------------------------------------------------
498 -# heading : None
499 -# description : User password
500 -# navigation : 1000 1250
501 -# menu : U
502 -
503 +# heading : Current User
504 +# description : Change password
505 +# navigation : 1000 250
506 +#
507 # routes : end
508 #----------------------------------------------------------------------
509
510 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm
511 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm 2021-06-21 10:25:10.000000000 +0100
512 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm 2024-02-20 20:21:00.000000000 +0000
513 @@ -1,9 +1,9 @@
514 package SrvMngr::Controller::Viewlogfiles;
515
516 #----------------------------------------------------------------------
517 -# heading : Administration
518 +# heading : Investigation
519 # description : View log files
520 -# navigation : 4000 4400
521 +# navigation : 7000 100
522 #
523 #
524 # routes : end
525 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm
526 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm 2020-11-19 07:53:26.000000000 +0000
527 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm 2024-02-20 10:07:00.000000000 +0000
528 @@ -1,9 +1,9 @@
529 package SrvMngr::Controller::Workgroup;
530
531 #----------------------------------------------------------------------
532 -# heading : Configuration
533 -# description : Workgroup
534 -# navigation : 6000 6200
535 +# heading : Network
536 +# description : Samba workgroup
537 +# navigation : 6000 700
538 #
539 # routes : end
540 #----------------------------------------------------------------------
541 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm
542 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2024-02-18 11:04:27.067708751 +0000
543 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2024-02-21 08:28:18.980905785 +0000
544 @@ -1,9 +1,9 @@
545 package SrvMngr::Controller::Yum;
546
547 #----------------------------------------------------------------------
548 -# heading : Configuration
549 +# heading : System
550 # description : Software installer
551 -# navigation : 4000 4200
552 +# navigation : 4000 300
553 #
554 # routes : end
555 #----------------------------------------------------------------------
556 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
557 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2024-02-18 11:04:27.117710244 +0000
558 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2024-02-21 08:43:00.000000000 +0000
559 @@ -31,6 +31,22 @@
560 %= stylesheet '/js/buttons.print.min.js'
561
562 %= stylesheet '/css/sme-jquery-overrides.css'
563 +
564 +
565 + <!--><script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
566 + <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
567 + <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
568 + <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
569 + <script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
570 + <script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.print.min.js"></script>
571 + -->
572 +
573 +
574 + <!-- ><link href="https://cdn.datatables.net/v/dt/dt-1.13.8/datatables.min.css" rel="stylesheet">
575 + <script src="https://cdn.datatables.net/v/dt/dt-1.13.8/datatables.min.js"></script>
576 + <link rel="stylesheet" href="//code.jquery.com/ui/1.13.2/themes/base/jquery-ui.css">
577 + <script src="https://code.jquery.com/ui/1.13.2/jquery-ui.js"></script>-->
578 +
579
580 </head>
581
582 @@ -60,7 +76,6 @@
583 %= include 'partials/_navig2'
584 % }
585 </div>
586 -
587 <div id="main" class="col-md-9">
588
589 %= include 'partials/_info'
590 @@ -91,48 +106,6 @@
591 % }
592
593 %= javascript '/js/sme-dataTable-setup.js'
594 -
595 -%= javascript begin
596 -//Set menu to initial condition based on localStorage
597 -$(document).ready(function() {
598 - let menunavflag = window.localStorage.getItem('menunav');
599 - if (menunavflag != "false"){
600 - $('#menunav').toggle(true);
601 - } else {
602 - $('#menunav').toggle(false);
603 - }
604 -
605 - let menuadmflag = window.localStorage.getItem('menuadm');
606 - if (menuadmflag != "false"){
607 - $('#menuadm').toggle(true);
608 - } else {
609 - $('#menuadm').toggle(false);
610 - }
611 -
612 - let menuuserflag = window.localStorage.getItem('menuuser');
613 - if (menuuserflag != "false"){
614 - $('#menuuser').toggle(true);
615 - } else {
616 - $('#menuuser').toggle(false);
617 - }
618 -
619 - var sections = document.getElementsByClassName("section-title");
620 - for (var i = 0, len = sections.length; i < len; i++) {
621 - var jqObj = $(sections[i]);
622 - var $section = jqObj.parent().next('div');
623 - if(!$section.length){
624 - return false;
625 - }
626 - let localStorageTag = "admSection-"+sections[i].innerHTML;
627 - if (window.localStorage.getItem(localStorageTag) != "false"){
628 - $section.toggle(true);
629 - } else {
630 - $section.toggle(false);
631 - }
632 - }
633 -})
634 -%end
635 -
636
637 </body>
638 </html>
639 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep
640 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep 2024-02-18 11:04:27.023707438 +0000
641 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep 2024-02-20 12:01:00.000000000 +0000
642 @@ -2,7 +2,7 @@
643 % my %nav = %{SrvMngr->getNavigation( $c->languages(), 'A' )};
644
645 <div id='navigat2'>
646 - <div><a href='#' id='togadm' class='menu-title'>ADMINISTRATION</a></div>
647 + <!-- ><div><a href='#' id='togadm' class='menu-title'>ADMINISTRATION</a></div> -->
648 <div id='menuadm'>
649
650 % my $cc = 1;
651 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep
652 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep 2020-11-19 07:53:26.000000000 +0000
653 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_nav_menu.html.ep 2024-02-20 12:16:00.000000000 +0000
654 @@ -2,13 +2,16 @@
655 % my %nav = %{SrvMngr->getNavigation( $c->languages(), 'N' )};
656
657 <div id='navmenu'>
658 - <a href='#' id='tognav' class='menu-title'>NAVIGATION</a>
659 + <!-- <a href='#' id='tognav' class='menu-title'>NAVIGATION</a> -->
660 <div id='menunav'>
661 +
662 % my $cc = 1;
663 % foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'})
664 % <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
665 %
666 <!-- div class='section section-title'><%= $h %></div -->
667 + <div><a href='#' class='section section-title'><%= $h %></a></div>
668 + <div class='togms'>
669 % my ($classNew, $target, $href) = '';
670 % foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav{$h}{'DESCRIPTIONS'}}) {
671
672 @@ -26,6 +29,7 @@
673 id='sme<%= $cc %>' href='<%= $href %>'><%= $_->{'DESCRIPTION'} %></a></div>
674 % $cc++;
675 % }
676 + </div>
677
678 % }
679 </div>
680 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep
681 --- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep 2020-11-19 07:53:26.000000000 +0000
682 +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_user_menu.html.ep 2024-02-20 11:53:00.000000000 +0000
683 @@ -3,7 +3,7 @@
684
685 <div id='usermenu'>
686 <a href='#' id='toguser' class='menu-title'>
687 - Hello <%= session 'username' %></a>
688 + <!-- Hello <%= session 'username' %></a> -->
689 <div id='menuuser'>
690 % my $cc = 1;
691 % foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'})
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed