smeserver-manager/sme10/smeserver-manager-0.1.4-format-for-dhcp-ips-in-review-config.patch

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
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm        2021-12-27 16:34:16.424183556 +0000
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm    2021-12-27 11:56:00.000000000 +0000
@@ -187,10 +187,10 @@
        {
            $ip .= "/".get_value($c,'ExternalNetmask');
        }
-       my $out = $c->l('rvw_EXTERNAL_IP_ADDRESS_SUBNET_MASK').$ip;
+       my $out = $c->l('rvw_EXTERNAL_IP_ADDRESS_SUBNET_MASK').':'.$ip;
        if ($static)
        {
-           $out .= $c->l('rvw_GATEWAY').get_value($c,'GatewayIP');
+           $out .= $c->l('rvw_GATEWAY').':'.get_value($c,'GatewayIP');
        }
        return $out
     }
@@ -224,9 +224,9 @@
     my $out = (get_prop($c,'dhcpd','status') || 'disabled' );
 
     if (get_prop($c,'dhcpd', 'status') eq 'enabled') {
-        $out .= '<br>'.$c->l('rvw_BEGINNING_OF_DHCP_ADDRESS_RANGE');
+        $out .= '<br>'.$c->l('rvw_BEGINNING_OF_DHCP_ADDRESS_RANGE').':';
        $out .= (get_prop($c,'dhcpd','start') || '' ).'<br>';
-        $out .= $c->l('rvw_END_OF_DHCP_ADDRESS_RANGE');
+        $out .= $c->l('rvw_END_OF_DHCP_ADDRESS_RANGE').':';
        $out .= (get_prop($c,'dhcpd','end') || '' );
     }
     return $out;
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/review.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/review.html.ep
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/review.html.ep 2021-12-27 16:34:16.418183497 +0000
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/review.html.ep     2021-12-27 12:00:00.000000000 +0000
@@ -44,11 +44,14 @@
        </td></tr></table>
        </p>
        
-       <p><span class=label>
+       <p><table width='100%'><tr><td class=label>
+       <!--<p><span class=label>-->
        %=l 'rvw_DHCP_SERVER'
-       </span>
+       <!--</span>-->
+       </td><td>
        %= $rvw_datas->{dhcpserver}
-       </p>
+       <!--</p>-->
+       </td></tr></table></p>
 
        <br><br><b>
        %=l 'rvw_SERVER_NAMES'
1	brianr	1.1	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
2			--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2021-12-27 16:34:16.424183556 +0000
3			+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2021-12-27 11:56:00.000000000 +0000
4			@@ -187,10 +187,10 @@
5			{
6			$ip .= "/".get_value($c,'ExternalNetmask');
7			}
8			- my $out = $c->l('rvw_EXTERNAL_IP_ADDRESS_SUBNET_MASK').$ip;
9			+ my $out = $c->l('rvw_EXTERNAL_IP_ADDRESS_SUBNET_MASK').':'.$ip;
10			if ($static)
11			{
12			- $out .= $c->l('rvw_GATEWAY').get_value($c,'GatewayIP');
13			+ $out .= $c->l('rvw_GATEWAY').':'.get_value($c,'GatewayIP');
14			}
15			return $out
16			}
17			@@ -224,9 +224,9 @@
18			my $out = (get_prop($c,'dhcpd','status') \|\| 'disabled' );
19
20			if (get_prop($c,'dhcpd', 'status') eq 'enabled') {
21			- $out .= '<br>'.$c->l('rvw_BEGINNING_OF_DHCP_ADDRESS_RANGE');
22			+ $out .= '<br>'.$c->l('rvw_BEGINNING_OF_DHCP_ADDRESS_RANGE').':';
23			$out .= (get_prop($c,'dhcpd','start') \|\| '' ).'<br>';
24			- $out .= $c->l('rvw_END_OF_DHCP_ADDRESS_RANGE');
25			+ $out .= $c->l('rvw_END_OF_DHCP_ADDRESS_RANGE').':';
26			$out .= (get_prop($c,'dhcpd','end') \|\| '' );
27			}
28			return $out;
29			diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/review.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/review.html.ep
30			--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/review.html.ep 2021-12-27 16:34:16.418183497 +0000
31			+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/review.html.ep 2021-12-27 12:00:00.000000000 +0000
32			@@ -44,11 +44,14 @@
33			</td></tr></table>
34			</p>
35
36			- <p><span class=label>
37			+ <p><table width='100%'><tr><td class=label>
38			+ <!--<p><span class=label>-->
39			%=l 'rvw_DHCP_SERVER'
40			- </span>
41			+ <!--</span>-->
42			+ </td><td>
43			%= $rvw_datas->{dhcpserver}
44			- </p>
45			+ <!--</p>-->
46			+ </td></tr></table></p>
47
48			<br><br><b>
49			%=l 'rvw_SERVER_NAMES'