smeserver-dhcpmanager/contribs10/smeserver-dhcpmanager-2.0.4-Yet-more-changes-for-SM2-panels.patch

diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm
--- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm     2023-12-19 09:44:56.678590486 +0000
+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm 2024-01-16 08:38:00.000000000 +0000
@@ -144,7 +144,7 @@
     $dhcp_data{trt} = $trt;
     $dhcp_data{"first"} = '';
        # ..... get scan results into dhcp_data
-       dhcp_data{"scanresults"} = get_scan_results($c);
+       $dhcp_data{"scanresults"} = get_scan_results($c);
     $c->stash( title => $title, modul => $modul, dhcp_data => \%dhcp_data );
     $c->render( template => 'dhcpd' );
 }
@@ -332,10 +332,10 @@
        my $c = shift;
     my $ret = delete_all_leases($c);
        if ($ret == 'ok') { 
-               dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
+               $dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
                do_leases($c);
        }       
-       else {dhcp_data{"error"}=$ret;}
+       else {$dhcp_data{"error"}=$ret;}
     return ;
 }
 
@@ -352,10 +352,10 @@
     # else return "ok"
     my $ret = delete_lease($c);
        if ($ret == 'ok') { 
-               dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
+               $dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
                do_leases($c);
        }       
-       else {dhcp_data{"error"}=$ret;}
+       else {$dhcp_data{"error"}=$ret;}
     return ;
 }
 
@@ -536,4 +536,4 @@
 
 1;
 
-       
\ No newline at end of file
+       
diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep
--- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep      2023-12-19 09:44:56.680590493 +0000
+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep  2023-12-19 11:12:00.000000000 +0000
@@ -63,9 +63,12 @@
                </button>
                </td><td>
                %= button_to $c->l('dhcpd_SCAN_YOUR_NETWORK') => '/dhcpd3'
-               </td><td>
-               %= button_to $c->l('dhcpd_GLOBAL_WINPOPUP') => '/dhcpd2'
+               </td>
+               <!--
                <td>
+               %= button_to $c->l('dhcpd_GLOBAL_WINPOPUP') => '/dhcpd2'
+               </td>
+               -->
                </tr>
                </table>   
                <hr /> 
diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep
--- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep     2023-12-19 09:44:56.681590497 +0000
+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep 2024-01-16 12:32:00.000000000 +0000
@@ -26,7 +26,7 @@
                %= submit_button "$btn", class => 'action'
     % end
     <br>
-       <table class="sme-border table-sort"><tbody>
+       <table class="sme-border table-sort"><thead>
                <tr>
                        <th class='sme-border'>
                                %=l 'dhcpd_IP'
@@ -50,6 +50,8 @@
                                %=l 'dhcpd_ACTION'
                        </th>
                </tr>
+               </thead>
+               <tbody>
         % foreach my $ip (@$leases) {
         <tr>
                        %= t td => (class => 'sme-border') => $ip->{ip}
@@ -66,9 +68,12 @@
                        %= t td => (class => 'sme-border') => $ip->{mac}
                        <td class = 'sme-border'>               
                                <a href="/smanager/dhcpd6?trt=DEL&ip=<%= $ip->{ip}%>" onclick="Remove_lease_confirm(event,'<%=$c->l('dhcpd_REMOVE_A_DHCP_LEASE_ACTION')%>',this);"><center><%=l 'dhcpd_REMOVE'%></center></a>
-                       </td><td class = 'sme-border'>
+                       </td>
+                       <!--
+                       <td class = 'sme-border'>
                                <a href="/smanager/dhcpd8?trt=WIN&ip=<%= $ip->{ip}%>" onclick="Winpop_confirm(event,'<%=$c->l('dhcpd_SENDING_A_WINPOPUP')%>',this);"><center><%=l 'dhcpd_WINPOPUP_ACTION'%></center></a>
                        </td>
+                       -->
                </tr>
                %} 
                </tbody>
@@ -110,4 +115,4 @@
        %end
 
 
-</div>
\ No newline at end of file
+</div>
1	brianr	1.1	diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm
2			--- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm 2023-12-19 09:44:56.678590486 +0000
3	brianr	1.3	+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm 2024-01-16 08:38:00.000000000 +0000
4			@@ -144,7 +144,7 @@
5	brianr	1.1	$dhcp_data{trt} = $trt;
6			$dhcp_data{"first"} = '';
7			# ..... get scan results into dhcp_data
8			- dhcp_data{"scanresults"} = get_scan_results($c);
9	brianr	1.3	+ $dhcp_data{"scanresults"} = get_scan_results($c);
10			$c->stash( title => $title, modul => $modul, dhcp_data => \%dhcp_data );
11	brianr	1.1	$c->render( template => 'dhcpd' );
12			}
13	brianr	1.3	@@ -332,10 +332,10 @@
14	brianr	1.2	my $c = shift;
15			my $ret = delete_all_leases($c);
16			if ($ret == 'ok') {
17			- dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
18	brianr	1.3	+ $dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
19	brianr	1.2	do_leases($c);
20			}
21			- else {dhcp_data{"error"}=$ret;}
22			+ else {$dhcp_data{"error"}=$ret;}
23			return ;
24			}
25
26	brianr	1.3	@@ -352,10 +352,10 @@
27	brianr	1.2	# else return "ok"
28			my $ret = delete_lease($c);
29			if ($ret == 'ok') {
30			- dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
31	brianr	1.3	+ $dhcp_data{"success"}="dhcpd_SUCCESSFULLY_SAVED_SETTINGS";
32	brianr	1.2	do_leases($c);
33			}
34			- else {dhcp_data{"error"}=$ret;}
35			+ else {$dhcp_data{"error"}=$ret;}
36			return ;
37			}
38	brianr	1.1
39	brianr	1.3	@@ -536,4 +536,4 @@
40	brianr	1.1
41			1;
42
43			-
44			\ No newline at end of file
45			+
46			diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep
47			--- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep 2023-12-19 09:44:56.680590493 +0000
48	brianr	1.3	+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep 2023-12-19 11:12:00.000000000 +0000
49			@@ -63,9 +63,12 @@
50	brianr	1.1	</button>
51			</td><td>
52	brianr	1.3	%= button_to $c->l('dhcpd_SCAN_YOUR_NETWORK') => '/dhcpd3'
53	brianr	1.1	- </td><td>
54			- %= button_to $c->l('dhcpd_GLOBAL_WINPOPUP') => '/dhcpd2'
55			+ </td>
56			+ <!--
57			<td>
58			+ %= button_to $c->l('dhcpd_GLOBAL_WINPOPUP') => '/dhcpd2'
59			+ </td>
60			+ -->
61			</tr>
62			</table>
63			<hr />
64			diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep
65			--- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep 2023-12-19 09:44:56.681590497 +0000
66	brianr	1.3	+++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_leases.html.ep 2024-01-16 12:32:00.000000000 +0000
67	brianr	1.1	@@ -26,7 +26,7 @@
68			%= submit_button "$btn", class => 'action'
69			% end
70			<br>
71			- <table class="sme-border table-sort"><tbody>
72			+ <table class="sme-border table-sort"><thead>
73			<tr>
74			<th class='sme-border'>
75			%=l 'dhcpd_IP'
76			@@ -50,6 +50,8 @@
77			%=l 'dhcpd_ACTION'
78			</th>
79			</tr>
80			+ </thead>
81			+ <tbody>
82			% foreach my $ip (@$leases) {
83			<tr>
84			%= t td => (class => 'sme-border') => $ip->{ip}
85			@@ -66,9 +68,12 @@
86			%= t td => (class => 'sme-border') => $ip->{mac}
87			<td class = 'sme-border'>
88			<a href="/smanager/dhcpd6?trt=DEL&ip=<%= $ip->{ip}%>" onclick="Remove_lease_confirm(event,'<%=$c->l('dhcpd_REMOVE_A_DHCP_LEASE_ACTION')%>',this);"><center><%=l 'dhcpd_REMOVE'%></center></a>
89			- </td><td class = 'sme-border'>
90			+ </td>
91	brianr	1.2	+ <!--
92	brianr	1.1	+ <td class = 'sme-border'>
93			<a href="/smanager/dhcpd8?trt=WIN&ip=<%= $ip->{ip}%>" onclick="Winpop_confirm(event,'<%=$c->l('dhcpd_SENDING_A_WINPOPUP')%>',this);"><center><%=l 'dhcpd_WINPOPUP_ACTION'%></center></a>
94			</td>
95			+ -->
96			</tr>
97			%}
98			</tbody>
99	brianr	1.3	@@ -110,4 +115,4 @@
100	brianr	1.1	%end
101
102
103			-</div>
104			\ No newline at end of file
105			+</div>