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

Annotation 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.2 - (hide annotations) (download)
Tue Feb 20 13:47:07 2024 UTC (8 months, 1 week ago) by brianr
Branch: MAIN
CVS Tags: smeserver-manager-0_1_4-27_el7_sme
Changes since 1.1: +239 -90 lines 
* Sun Feb 18 2024 Brian Read <brianr@koozali.org> 0.1.4-27.sme
- Re-arrange Menu [SME: 12476]
1 brianr 1.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 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2024-02-20 08:47:00.000000000 +0000
4     @@ -1,9 +1,9 @@
5 brianr 1.1 package SrvMngr::Controller::Backup;
6    
7     #----------------------------------------------------------------------
8     -# heading : Administration
9     +# heading : System
10     # description : Backup or restore
11 brianr 1.2 -# navigation : 4000 4200
12     +# navigation : 5000 200
13 brianr 1.1 # Copyright (C) 2002 Mitel Networks Corporation
14 brianr 1.2 #----------------------------------------------------------------------
15     # routes : end
16 brianr 1.1 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 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2024-02-20 10:02:00.000000000 +0000
19     @@ -1,9 +1,9 @@
20 brianr 1.1 package SrvMngr::Controller::Bugreport;
21    
22     #----------------------------------------------------------------------
23     -# heading : Miscellaneous
24     +# heading : Investigation
25     # description : Report a bug
26 brianr 1.2 -# navigation : 7000 7300
27     +# navigation : 6000 500
28 brianr 1.1
29 brianr 1.2 # routes : end
30     #------------------------------
31 brianr 1.1 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 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm 2024-02-20 08:47:00.000000000 +0000
34     @@ -1,9 +1,9 @@
35 brianr 1.1 package SrvMngr::Controller::Clamav;
36    
37     #----------------------------------------------------------------------
38     -# heading : Configuration
39     +# heading : System
40     # description : Antivirus (ClamAV)
41 brianr 1.2 -# navigation : 6000 6720
42     +# navigation : 5000 600
43 brianr 1.1 #
44 brianr 1.2 # routes : end
45     #------------------------------
46 brianr 1.1 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 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm 2024-02-20 08:47:00.000000000 +0000
49     @@ -1,9 +1,9 @@
50 brianr 1.1 package SrvMngr::Controller::Datetime;
51    
52     #----------------------------------------------------------------------
53     -# heading : Configuration
54     +# heading : System
55     # description : Date and time
56 brianr 1.2 -# navigation : 6000 6100
57     +# navigation : 5000 400
58 brianr 1.1
59 brianr 1.2 # routes : end
60     #------------------------------
61 brianr 1.1 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 brianr 1.2 +++ 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 brianr 1.1 package SrvMngr::Controller::Directory;
66    
67     #----------------------------------------------------------------------
68     -# heading : Configuration
69     +# heading : User management
70     # description : Directory
71 brianr 1.2 -# navigation : 6000 6300
72     +# navigation : 2000 300
73 brianr 1.1 #
74 brianr 1.2 # routes : end
75     #----------------------------------------------------------------------
76 brianr 1.1 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 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm 2024-02-20 10:07:00.000000000 +0000
79 brianr 1.1 @@ -1,9 +1,9 @@
80     package SrvMngr::Controller::Domains;
81    
82     #----------------------------------------------------------------------
83     -# heading : Configuration
84 brianr 1.2 -# description : DOMAINS
85     -# navigation : 6000 6600
86 brianr 1.1 +# heading : Network
87 brianr 1.2 +# description : Domains
88     +# navigation : 6000 300
89 brianr 1.1 #
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 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm 2024-02-20 08:47:00.000000000 +0000
95     @@ -1,9 +1,9 @@
96 brianr 1.1 package SrvMngr::Controller::Emailsettings;
97    
98     #----------------------------------------------------------------------
99     -# heading : Configuration
100     +# heading : System
101     # description : E-mail
102 brianr 1.2 -# navigation : 6000 6700
103     +# navigation : 5000 500
104 brianr 1.1 #
105 brianr 1.2 #
106     # routes : end
107 brianr 1.1 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 brianr 1.2 +++ 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 brianr 1.1 package SrvMngr::Controller::Groups;
112    
113     #----------------------------------------------------------------------
114     -# heading : Collaboration
115     +# heading : User management
116     # description : GROUPS
117 brianr 1.2 -# navigation : 2000 2200
118     +# navigation : 2000 200
119 brianr 1.1 #----------------------------------------------------------------------
120 brianr 1.2 #
121     # routes : end
122 brianr 1.1 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 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm 2024-02-20 10:07:00.000000000 +0000
125 brianr 1.1 @@ -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 brianr 1.2 +# navigation : 6000 200
134 brianr 1.1 #----------------------------------------------------------------------
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 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2024-02-20 10:07:00.000000000 +0000
140     @@ -1,9 +1,9 @@
141 brianr 1.1 package SrvMngr::Controller::Ibays;
142    
143     #----------------------------------------------------------------------
144     -# heading : Collaboration
145     -# description : Information bays
146 brianr 1.2 -# navigation : 2000 2500
147 brianr 1.1 +# heading : Network
148     +# description : Shared areas (was ibays)
149 brianr 1.2 +# navigation : 6000 100
150 brianr 1.1 #
151     #
152 brianr 1.2 # routes : end
153 brianr 1.1 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
154     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm 2020-11-19 07:53:26.000000000 +0000
155 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm 2024-02-20 12:05:00.000000000 +0000
156     @@ -1,11 +1,10 @@
157 brianr 1.1 package SrvMngr::Controller::Initial;
158    
159     #----------------------------------------------------------------------
160     -# heading : None
161 brianr 1.2 +# heading : Support
162 brianr 1.1 # description : Home
163 brianr 1.2 -# navigation : 1000 1000
164     -# menu : N
165     -#
166     +# navigation : 0000 000
167     +# menu : N
168     # routes : end
169     #----------------------------------------------------------------------
170     use strict;
171 brianr 1.1 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
172     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm 2020-11-19 07:53:26.000000000 +0000
173 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm 2024-02-20 10:07:00.000000000 +0000
174 brianr 1.1 @@ -1,9 +1,9 @@
175     package SrvMngr::Controller::Localnetworks;
176    
177     #----------------------------------------------------------------------
178     -# heading : Security
179     +# heading : Network
180     # description : Local networks
181     -# navigation : 5000 5300
182 brianr 1.2 +# navigation : 6000 500
183 brianr 1.1 #
184     # routes : end
185     #----------------------------------------------------------------------
186 brianr 1.2 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
187     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Login.pm 2024-02-18 11:04:27.048708184 +0000
188     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Login.pm 2024-02-20 12:17:00.000000000 +0000
189     @@ -1,6 +1,11 @@
190     package SrvMngr::Controller::Login;
191    
192     #----------------------------------------------------------------------
193     +# heading : Support
194     +# description : Login
195     +# navigation : 0000 001
196     +# menu : N
197     +#
198     # routes : end
199     #----------------------------------------------------------------------
200    
201 brianr 1.1 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
202     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm 2020-11-19 07:53:26.000000000 +0000
203 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm 2024-02-20 08:47:00.000000000 +0000
204     @@ -1,10 +1,9 @@
205 brianr 1.1 package SrvMngr::Controller::Logout;
206    
207     #----------------------------------------------------------------------
208     -# heading : None
209     +# heading : Current User
210     # description : Logout
211 brianr 1.2 -# navigation : 1000 1900
212     -# menu : U
213     +# navigation : 1000 900
214     #
215     # routes : end
216     #----------------------------------------------------------------------
217 brianr 1.1 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
218     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm 2021-06-21 10:25:10.000000000 +0100
219 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm 2024-02-20 12:07:00.000000000 +0000
220     @@ -1,10 +1,10 @@
221 brianr 1.1 package SrvMngr::Controller::Manual;
222    
223     #----------------------------------------------------------------------
224     -# heading : None
225     +# heading : Support
226     # description : Online manual
227 brianr 1.2 -# navigation : 1000 1100
228     -# menu : N
229     +# navigation : 0000 100
230     +# menu : N
231     #
232     # routes : end
233     #----------------------------------------------------------------------
234 brianr 1.1 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
235     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm 2020-11-19 07:53:26.000000000 +0000
236 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm 2024-02-20 10:07:00.000000000 +0000
237 brianr 1.1 @@ -1,9 +1,9 @@
238     package SrvMngr::Controller::Portforwarding;
239    
240     #----------------------------------------------------------------------
241     -# heading : Security
242     +# heading : Network
243     # description : Port forwarding
244     -# navigation : 5000 5400
245 brianr 1.2 +# navigation : 6000 600
246 brianr 1.1 #
247     # routes : end
248     #----------------------------------------------------------------------
249     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
250     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-02-18 11:04:27.081709170 +0000
251 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-02-20 08:47:00.000000000 +0000
252     @@ -1,9 +1,9 @@
253 brianr 1.1 package SrvMngr::Controller::Printers;
254    
255     #----------------------------------------------------------------------
256     -# heading : Configuration
257     +# heading : System
258     # description : Printers
259 brianr 1.2 -# navigation : 6000 6400
260     +# navigation : 5000 800
261 brianr 1.1 #
262 brianr 1.2 #
263     # routes : end
264 brianr 1.1 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
265     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm 2020-11-19 07:53:26.000000000 +0000
266 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm 2024-02-20 08:47:00.000000000 +0000
267     @@ -1,9 +1,9 @@
268 brianr 1.1 package SrvMngr::Controller::Proxy;
269    
270     #----------------------------------------------------------------------
271     -# heading : Security
272     +# heading : System
273     # description : Proxy settings
274 brianr 1.2 -# navigation : 5000 5500
275     +# navigation : 5000 700
276 brianr 1.1 #----------------------------------------------------------------------
277 brianr 1.2 #
278     # routes : end
279 brianr 1.1 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
280     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm 2020-11-19 07:53:26.000000000 +0000
281 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm 2024-02-20 08:47:00.000000000 +0000
282     @@ -1,9 +1,9 @@
283 brianr 1.1 package SrvMngr::Controller::Pseudonyms;
284    
285     #----------------------------------------------------------------------
286     -# heading : Collaboration
287     +# heading : User management
288     # description : Pseudonyms
289 brianr 1.2 -# navigation : 2000 2400
290     +# navigation : 2000 210
291 brianr 1.1 #----------------------------------------------------------------------
292 brianr 1.2 #
293     # routes : end
294 brianr 1.1 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
295     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm 2020-11-19 07:53:26.000000000 +0000
296 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm 2024-02-20 10:02:00.000000000 +0000
297     @@ -1,9 +1,9 @@
298 brianr 1.1 package SrvMngr::Controller::Qmailanalog;
299    
300     #----------------------------------------------------------------------
301     -# heading : Administration
302     +# heading : Investigation
303     # description : Mail log file analysis
304 brianr 1.2 -# navigation : 4000 4500
305     +# navigation : 6000 200
306 brianr 1.1 #
307 brianr 1.2 # routes : end
308     #----------------------------------------------------------------------
309 brianr 1.1 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
310     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm 2020-11-19 07:53:26.000000000 +0000
311 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm 2024-02-20 08:47:00.000000000 +0000
312     @@ -1,9 +1,9 @@
313 brianr 1.1 package SrvMngr::Controller::Quota;
314    
315     #----------------------------------------------------------------------
316     -# heading : Collaboration
317     +# heading : User management
318     # description : Quotas
319 brianr 1.2 -# navigation : 2000 2300
320     +# navigation : 2000 300
321 brianr 1.1 #----------------------------------------------------------------------
322 brianr 1.2 #
323     # routes : end
324 brianr 1.1 @@ -190,4 +190,4 @@
325     }
326    
327    
328     -1
329     \ No newline at end of file
330     +1
331     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
332     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2021-06-21 10:25:10.000000000 +0100
333 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2024-02-20 10:07:00.000000000 +0000
334     @@ -1,9 +1,9 @@
335 brianr 1.1 package SrvMngr::Controller::Reboot;
336    
337     #----------------------------------------------------------------------
338     -# heading : Administration
339     +# heading : System
340     # description : Reboot or shutdown
341 brianr 1.2 -# navigation : 4000 4700
342     +# navigation : 6000 700
343 brianr 1.1 #
344 brianr 1.2 # routes : end
345     #----------------------------------------------------------------------
346 brianr 1.1 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
347     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm 2021-06-21 10:25:10.000000000 +0100
348 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm 2024-02-20 10:07:00.000000000 +0000
349 brianr 1.1 @@ -1,9 +1,9 @@
350     package SrvMngr::Controller::Remoteaccess;
351    
352     #----------------------------------------------------------------------
353     -# heading : Security
354     +# heading : Network
355     # description : Remote access
356     -# navigation : 5000 5200
357 brianr 1.2 +# navigation : 6000 400
358 brianr 1.1 #----------------------------------------------------------------------
359     #
360     # routes : end
361     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
362     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2024-02-18 11:04:27.007706960 +0000
363 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2024-02-20 10:02:00.000000000 +0000
364     @@ -1,11 +1,10 @@
365 brianr 1.1 package SrvMngr::Controller::Review;
366    
367     #----------------------------------------------------------------------
368     -# heading : None
369     +# heading : Investigation
370     # description : Review configuration
371 brianr 1.2 -# navigation : 1000 1200
372     +# navigation : 6000 400
373 brianr 1.1 #
374 brianr 1.2 -# menu : U
375     #
376     # routes : end
377     #----------------------------------------------------------------------
378 brianr 1.1 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
379     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm 2020-11-19 07:53:26.000000000 +0000
380 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm 2024-02-20 12:07:00.000000000 +0000
381     @@ -1,10 +1,10 @@
382 brianr 1.1 package SrvMngr::Controller::Support;
383    
384     #----------------------------------------------------------------------
385     -# heading : None
386     +# heading : Support
387     # description : Support and licensing
388 brianr 1.2 -# navigation : 1000 1200
389     -# menu : N
390     +# navigation : 0000 200
391     +# menu : N
392     #
393     # routes : end
394     #----------------------------------------------------------------------
395 brianr 1.1 @@ -41,4 +41,4 @@
396     };
397    
398    
399     -1;
400     \ No newline at end of file
401     +1;
402     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
403     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2020-11-19 07:53:26.000000000 +0000
404     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2024-02-18 10:39:00.000000000 +0000
405     @@ -1,7 +1,7 @@
406     package SrvMngr::Controller::Useraccounts;
407    
408     #----------------------------------------------------------------------
409     -# heading : Collaboration
410     +# heading : User management
411     # description : Users
412     # navigation : 2000 2100
413     #----------------------------------------------------------------------
414     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
415     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm 2024-02-18 11:04:27.048708184 +0000
416 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm 2024-02-19 16:14:00.000000000 +0000
417     @@ -1,11 +1,10 @@
418 brianr 1.1 package SrvMngr::Controller::Userpassword;
419    
420     #----------------------------------------------------------------------
421     -# heading : None
422 brianr 1.2 -# description : User password
423     +# heading : Current User
424     +# description : Change password
425 brianr 1.1 # navigation : 1000 1250
426 brianr 1.2 -# menu : U
427     -
428     +#
429     # routes : end
430     #----------------------------------------------------------------------
431    
432 brianr 1.1 diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm
433     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm 1970-01-01 01:00:00.000000000 +0100
434 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm 2024-02-20 10:02:00.000000000 +0000
435 brianr 1.1 @@ -0,0 +1,384 @@
436     +package SrvMngr::Controller::Uservacations;
437     +#----------------------------------------------------------------------
438     +# heading : User management
439     +# description : User vacations
440 brianr 1.2 +# navigation : 6000 150
441 brianr 1.1 +#
442     +# name : Uservacationsget, method : get, url : /uservacations, ctlact : Uservacations#main
443     +# name : Uservacationspost,method : post, url : /Uservacations, ctlact : Uservacations#do_display
444     +# name : Uservacations1, method : get, url : /Uservacations1, ctlact : Uservacations#do_display
445     +# name : Uservacations2, method : post, url : /Uservacations2, ctlact : Uservacations#do_display
446     +# routes : end
447     +#----------------------------------------------------------------------
448     +
449     +use strict;
450     +use warnings;
451     +use Mojo::Base 'Mojolicious::Controller';
452     +
453     +#use DateTime; #Not part of SME10 mix
454     +use POSIX;
455     +
456     +use Locale::gettext;
457     +use SrvMngr::I18N;
458     +use SrvMngr qw(theme_list init_session);
459     +
460     +use Data::Dumper;
461     +use esmith::util;
462     +use esmith::HostsDB;
463     +use esmith::AccountsDB;
464     +
465     +our $db = esmith::ConfigDB->open();
466     +our $adb = esmith::AccountsDB->open();
467     +
468     +our $PanelUser = $ENV{'REMOTE_USER'} ||'';
469     +$PanelUser = $1 if ($PanelUser =~ /^([a-z][\.\-a-z0-9]*)$/);
470     +
471     +our %delegatedVacations;
472     +
473     +use constant FALSE => 0;
474     +use constant TRUE => 1;
475     +
476     +sub main {
477     +
478     + my $c = shift;
479     + $c->app->log->info( $c->log_req );
480     +
481     + my %vac_datas = ();
482     + my $title = $c->l('vac_FORM_TITLE');
483     + my $modul = '';
484     +
485     + $vac_datas{trt} = 'LIST';
486     +
487     + my @vacations = get_vacation_table($c);
488     + my $empty = (scalar @vacations == 0);
489     +
490     + $vac_datas{"first"} = 'vac_MODIFY_DESCRIPTION';
491     +
492     + $c->stash(
493     + title => $title,
494     + modul => $modul,
495     + vac_datas => \%vac_datas,
496     + vacations =>\@vacations,
497     + empty => $empty
498     + );
499     + $c->render( template => 'uservacations' );
500     +}
501     +
502     +sub do_display {
503     +
504     + my $c = shift;
505     + $c->app->log->info( $c->log_req );
506     +
507     + my $rt = $c->current_route;
508     + my $trt = ( $c->param('trt') || 'LIST' );
509     +
510     + $trt = 'ADD' if ( $rt eq 'Uservacations1' );
511     + $trt = 'ADD1' if ( $rt eq 'Uservacations2' );
512     +
513     + my %vac_datas = ();
514     + my $title = $c->l('vac_FORM_TITLE');
515     + my $modul = '';
516     +
517     +
518     + if ( $trt eq 'ADD' ) {
519     + # Add or change a vacation message - called from the list panel
520     + # Get the data and pass it across.
521     + my $account = $c->param("account");
522     + my $user = $adb->get($account);
523     + my $username = $user->prop("FirstName")." ".$user->prop("LastName");
524     + my $EmailVacation = $user->prop('EmailVacation') || '';
525     + my $EmailVacationFrom = $user->prop('EmailVacationFrom') || '';
526     + my $EmailVacationTo = $user->prop('EmailVacationTo') || '';
527     + my $VacText = get_vacation_text($c);
528     + $c->stash(account=>$account,
529     + username=>$username,
530     + EmailVacation=>$EmailVacation,
531     + EmailVacationFrom=>$EmailVacationFrom,
532     + EmailVacationTo=>$EmailVacationTo,
533     + VacText=>$VacText
534     + );
535     + }
536     +
537     + if ( $trt eq 'ADD1' ) {
538     + #Add or edit vacation message.
539     + my $ret = add_vac_message($c);
540     + #Return to list page if success
541     + if ($ret eq "OK") {
542     + $trt = "LIST";
543     + $vac_datas{success} = "vac_SUCCESS";
544     +
545     + } else {
546     + my $account = $c->param("account");
547     + my $user = $adb->get($account);
548     + my $username = $user->prop("FirstName")." ".$user->prop("LastName");
549     + my $EmailVacationFrom = $c->param('EmailVacationFrom') || '';
550     + my $EmailVacationTo = $c->param('EmailVacationTo') || '';
551     + my $EmailVacation = $c->param('EmailVacation') || '';
552     + my $VacText = $c->param("VacText");
553     + $c->stash(account=>$account,
554     + username=>$username,
555     + EmailVacation=>$EmailVacation,
556     + EmailVacationFrom=>$EmailVacationFrom,
557     + EmailVacationTo=>$EmailVacationTo,
558     + VacText=>$VacText
559     + );
560     + #Error - return to Add page
561     + $trt = "ADD";
562     + $vac_datas{error} = $ret;
563     + }
564     + }
565     +
566     + if ( $trt eq 'LIST' ) {
567     +
568     + #List all the users and vacation message details.
569     + my @vacations = get_vacation_table($c);
570     + my $empty = (scalar @vacations == 0);
571     + $c->stash(
572     + empty => $empty,
573     + vacations =>\@vacations
574     + );
575     + }
576     +
577     +
578     + $vac_datas{'trt'} = $trt;
579     + $c->stash( title => $title, modul => $modul, vac_datas => \%vac_datas );
580     + $c->render( template => 'uservacations' );
581     +}
582     +
583     +sub user_accounts_exist
584     +{
585     + my $q = shift;
586     + #return scalar $adb->users;
587     + if (scalar $adb->users)
588     + { return $q->l('vac_DESCRIPTION'); }
589     +}
590     +
591     +sub get_vacation_table
592     +{
593     + my $self = shift;
594     +
595     +#We want to retrieve granted group from DB, and retrieve users of groups
596     + my $record = $adb->get($PanelUser);
597     + my $dg;
598     + if ($record) {$dg=$record->prop('delegatedVacations')||'';}
599     + else {$dg = '';}
600     + $dg =~ s/ //g;
601     + my @g = split(/,/, $dg);
602     + my @visiblemembers = ();
603     +
604     + foreach my $g (@g) {
605     + my $members = $adb->get_prop("$g",'Members');
606     + next unless defined $members;
607     + $members =~ s/ //g;
608     + my @members = split(/,/, $members);
609     + push @visiblemembers , @members ;
610     + }
611     +
612     + foreach my $k ( @visiblemembers )
613     + {
614     + $delegatedVacations{$k}=1;
615     + }
616     +
617     +
618     + my @users = $adb->users;
619     + return () if (@users == 0); ##$self->l("ACCOUNT_USER_NONE")
620     + return () if (@visiblemembers == 0 && $dg ne '');#; #$self->l("NO_USERS_IN_GRANTED_GROUPS")
621     +
622     + my @data = ();
623     +
624     + for my $user (@users)
625     + {
626     + next if %delegatedVacations and not $delegatedVacations{$user->key};
627     + # make it clearer which uses have vacation
628     + my $EmailVacation = $user->prop('EmailVacation') || '';
629     + my $EmailVacationFrom = $user->prop('EmailVacationFrom') || '';
630     + my $EmailVacationTo = $user->prop('EmailVacationTo') || '';
631     + my $status = $user->prop('EmailVacation') || '';
632     + if ($status eq 'yes') { $status = 'YES'; } else { $status = ''; }
633     +
634     + push @data,
635     + { User => $user->key,
636     + FullName => $user->prop('FirstName') . " " .$user->prop('LastName'),
637     + status => $self->l($status),
638     + EmailVacation => $EmailVacation,
639     + EmailVacationFrom => showDate($EmailVacationFrom),
640     + EmailVacationTo => showDate($EmailVacationTo),
641     + Modify => $self->l('vac_MODIFY'),
642     + }
643     + }
644     + return @data;
645     +}
646     +
647     +sub showDate
648     +{
649     + my $strDate = shift;
650     + my ($Year,$Month,$Day) = ($strDate =~ /(\d{4})(\d{2})(\d{2})/);
651     + #my $Unix = mktime(0,0,0,$Day,$Month,$Year);
652     + return "$Year-$Month-$Day";
653     +}
654     +
655     +
656     +sub modify_link
657     +{
658     + my ($data_item, $row, $field) = @_;
659     +
660     + return "uservacations?" .
661     + join("&",
662     + "page=0",
663     + "page_stack=",
664     + "Next=Next",
665     + "User=" . $row->{User},
666     + "FullName=" . $row->{FullName},
667     + "EmailVacation=" . $row->{EmailVacation},
668     + "EmailVacationFrom=" . $row->{EmailVacationFrom},
669     + "EmailVacationTo=" . $row->{EmailVacationTo},
670     + "wherenext=VACATION_PAGE_MODIFY");
671     +}
672     +
673     +# this formats the text to display on screen
674     +sub get_vacation_text
675     +{
676     + my $q = shift;
677     + my $domain = $db->get_value('DomainName');
678     + my $user = $q->param('account');
679     +
680     + my $fullname = $adb->get_prop($user, "FirstName") . " " .
681     + $adb->get_prop($user, "LastName");
682     +
683     + my $vfile = "/home/e-smith/files/users/$user/.vacation.msg";
684     +
685     + my $from = $q->l('vac_FROM');
686     + my $Subject = $q->l('vac_SUBJECT');
687     + my $away = $q->l('vac_AWAY_FROM_MAIL');
688     + my $return = $q->l('vac_ANSWER_TO_OBJECT_SENDER');
689     +
690     + #my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$Subject $return\n".
691     + # "\n$away\n"."\n--\n$fullname";
692     +
693     + my $ExistingMessage = "$from $fullname \<$user\@$domain\>\n"."$Subject $return\n".
694     + "\n$away\n"."\n--\n$fullname";
695     +
696     +
697     + # if exists and is not empty
698     + if (( -e $vfile ) && (! -z $vfile ))
699     + {
700     + open (VACATION, "<$vfile")
701     + or die "Error: Could not open file: $vfile\n";
702     + my @vacationTemp;
703     +
704     + #reformat so email address isn't hidden inside < >
705     + while (<VACATION>)
706     + {
707     + $_ =~ s/</&lt\;/;
708     + $_ =~ s/>/&gt\;/;
709     + push (@vacationTemp, $_);
710     + }
711     +
712     + $ExistingMessage = join ("", @vacationTemp);
713     +
714     + close VACATION;
715     + }
716     + return $ExistingMessage;
717     +}
718     +
719     +# saves the text to .vacation.msg
720     +sub add_vac_message
721     +{
722     + my $q = shift;
723     +
724     + my $domain = $db->get_value('DomainName');
725     + my $user = $q->param('account');
726     +
727     + my $EmailVacation = $q->param('EmailVacation')||"no";
728     + #die($EmailVacation);
729     + #if ($EmailVacation eq "yes") {$EmailVacation = "yes";} else {$EmailVacation = "no";}
730     +
731     + #Decode To and FROM to standard format - comes over in html5 iso format yyyy-mm-dd
732     + my $EmailVacationFrom = trim($q->param('EmailVacationFrom'));
733     + my ($fromYear,$fromMonth,$fromDay) = ($EmailVacationFrom =~ /(\d{4})-(\d{2})-(\d{2})/);
734     + $EmailVacationFrom = $fromYear.$fromMonth.$fromDay;
735     + if ($EmailVacationFrom !~ m/^2[0-9]{3}[0|1][0-9][0-3][0-9]$/ and $EmailVacationFrom ne "") {return "vac_FROM_DATE_INCORRECT";}
736     + my $EmailVacationTo = trim($q->param('EmailVacationTo'));
737     + my ($toYear,$toMonth,$toDay) = ($EmailVacationTo =~ /(\d{4})-(\d{2})-(\d{2})/);
738     + $EmailVacationTo = $toYear.$toMonth.$toDay;
739     +# $EmailVacationTo =~ s/-//g; #Just take out "-".
740     + if ($EmailVacationTo !~ m/^2[0-9]{3}[0|1][0-9][0-3][0-9]$/ and $EmailVacationFrom ne "") {return "vac_TO_DATE_INCORRECT";}
741     + #Check not the same or From follows To.
742     + if ($EmailVacationTo ne "" and $EmailVacationTo eq $EmailVacationFrom) {return "vac_DATES_THE_SAME";}
743     + my $UnixFrom = mktime(0,0,0,$fromDay,$fromMonth,$fromYear);
744     + my $UnixTo = mktime(0,0,0,$toDay,$toMonth,$toYear);
745     + if ($UnixTo < $UnixFrom) {return "vac_TO_DATE_MUST_BE_LATER";}
746     +
747     +
748     + my $new_message = $q->param('VacText');
749     + my $vfile = "/home/e-smith/files/users/$user/.vacation.msg";
750     +
751     + my $fullname = $adb->get_prop($user, "FirstName") . " " .
752     + $adb->get_prop($user, "LastName");
753     +
754     + my $from = 'From:';
755     + my $away = $q->l('vac_AWAY_FROM_MAIL');
756     + my $return = $q->l('vac_ANSWER_TO_OBJECT_SENDER');
757     +
758     + my $vacation_text = "$from $fullname \<$user\@$domain\>\n"."Subject: $return\n".
759     + "\n$away \n"."\n--\n$fullname";
760     +
761     + my $reset = $vacation_text;
762     +
763     + # if exists and is not empty
764     + if (( -e $vfile ) && (! -z $vfile ))
765     + {
766     + open (VACATION, "<$vfile")
767     + or die "Error: Could not open file: $vfile\n";
768     + my @vacationTemp = <VACATION>;
769     + $vacation_text = join ("", @vacationTemp);
770     +
771     + close VACATION;
772     + }
773     +
774     + chomp $new_message;
775     +
776     + # reset msg to default,
777     + if ($new_message =~ /reset/)
778     + { $vacation_text = $reset; }
779     + else
780     + {
781     + #or save new_message
782     + unless ($new_message eq "")
783     + { $vacation_text = $new_message; }
784     + }
785     +
786     + # Strip out DOS Carriage Returns (CR)
787     + $vacation_text =~ s/\r//g;
788     +
789     + unlink $vfile;
790     + open (VACATION, ">$vfile")
791     + or die ("Error opening vacation message.\n");
792     +
793     + print VACATION "$vacation_text";
794     + close VACATION;
795     +
796     + esmith::util::chownFile($user, $user,
797     + "/home/e-smith/files/users/$user/.vacation.msg");
798     +
799     + $adb->set_prop($user, 'EmailVacation', $EmailVacation);
800     + $adb->set_prop($user, 'EmailVacationFrom', $EmailVacationFrom);
801     + $adb->set_prop($user, 'EmailVacationTo', $EmailVacationTo);
802     +
803     + #the first is more correct but is slower
804     + #system ("/sbin/e-smith/signal-event", "email-update", $user) == 0
805     + system ("/etc/e-smith/events/actions/qmail-update-user event $user") == 0
806     + or die ("Error occurred updating .qmail\n");
807     +
808     + if (($EmailVacation eq 'no') && ( -e "/home/e-smith/files/users/$user/.vacation"))
809     + {
810     + system ("/bin/rm /home/e-smith/files/users/$user/.vacation") == 0
811     + or die ("Error resetting vacation db.\n");
812     + }
813     +
814     + return "OK";
815     +}
816     +
817     +sub trim { my $s = shift; $s =~ s/^\s+|\s+$//g; return $s };
818     +
819     +1;
820     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
821     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm 2021-06-21 10:25:10.000000000 +0100
822 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm 2024-02-20 10:02:00.000000000 +0000
823     @@ -1,9 +1,9 @@
824 brianr 1.1 package SrvMngr::Controller::Viewlogfiles;
825    
826     #----------------------------------------------------------------------
827     -# heading : Administration
828     +# heading : Investigation
829     # description : View log files
830 brianr 1.2 -# navigation : 4000 4400
831     +# navigation : 6000 100
832 brianr 1.1 #
833 brianr 1.2 #
834     # routes : end
835 brianr 1.1 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
836     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm 2020-11-19 07:53:26.000000000 +0000
837 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm 2024-02-20 10:07:00.000000000 +0000
838     @@ -1,9 +1,9 @@
839 brianr 1.1 package SrvMngr::Controller::Workgroup;
840    
841     #----------------------------------------------------------------------
842     -# heading : Configuration
843     -# description : Workgroup
844 brianr 1.2 -# navigation : 6000 6200
845 brianr 1.1 +# heading : Network
846     +# description : Samba workgroup
847 brianr 1.2 +# navigation : 6000 700
848 brianr 1.1 #
849     # routes : end
850 brianr 1.2 #----------------------------------------------------------------------
851 brianr 1.1 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
852     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2024-02-18 11:04:27.067708751 +0000
853 brianr 1.2 +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2024-02-19 16:34:00.000000000 +0000
854     @@ -1,9 +1,9 @@
855 brianr 1.1 package SrvMngr::Controller::Yum;
856    
857     #----------------------------------------------------------------------
858     -# heading : Configuration
859     +# heading : System
860     # description : Software installer
861 brianr 1.2 -# navigation : 4000 4200
862     +# navigation : 5000 5300
863 brianr 1.1 #
864 brianr 1.2 # routes : end
865     #----------------------------------------------------------------------
866     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
867     --- 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
868     +++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_navig2.html.ep 2024-02-20 12:01:00.000000000 +0000
869     @@ -2,7 +2,7 @@
870     % my %nav = %{SrvMngr->getNavigation( $c->languages(), 'A' )};
871    
872     <div id='navigat2'>
873     - <div><a href='#' id='togadm' class='menu-title'>ADMINISTRATION</a></div>
874     + <!-- ><div><a href='#' id='togadm' class='menu-title'>ADMINISTRATION</a></div> -->
875     <div id='menuadm'>
876    
877     % my $cc = 1;
878     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
879     --- 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
880     +++ 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
881     @@ -2,13 +2,16 @@
882     % my %nav = %{SrvMngr->getNavigation( $c->languages(), 'N' )};
883    
884     <div id='navmenu'>
885     - <a href='#' id='tognav' class='menu-title'>NAVIGATION</a>
886     + <!-- <a href='#' id='tognav' class='menu-title'>NAVIGATION</a> -->
887     <div id='menunav'>
888     +
889     % my $cc = 1;
890     % foreach my $h (sort { ($nav{$a}{'WEIGHT'}/$nav{$a}{'COUNT'})
891     % <=> ($nav{$b}{'WEIGHT'}/$nav{$b}{'COUNT'}) } keys %nav) {
892     %
893     <!-- div class='section section-title'><%= $h %></div -->
894     + <div><a href='#' class='section section-title'><%= $h %></a></div>
895     + <div class='togms'>
896     % my ($classNew, $target, $href) = '';
897     % foreach (sort { $a->{'WEIGHT'} <=> $b->{'WEIGHT'} } @{$nav{$h}{'DESCRIPTIONS'}}) {
898    
899     @@ -26,6 +29,7 @@
900     id='sme<%= $cc %>' href='<%= $href %>'><%= $_->{'DESCRIPTION'} %></a></div>
901     % $cc++;
902     % }
903     + </div>
904    
905     % }
906     </div>
907     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
908     --- 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
909     +++ 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
910     @@ -3,7 +3,7 @@
911    
912     <div id='usermenu'>
913     <a href='#' id='toguser' class='menu-title'>
914     - Hello <%= session 'username' %></a>
915     + <!-- Hello <%= session 'username' %></a> -->
916     <div id='menuuser'>
917     % my $cc = 1;
918     % 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