[PATCH 1/2] dhcp.cgi: Adjust spacing between an icon and explanatory text

[PATCH 1/2] dhcp.cgi: Adjust spacing between an icon and explanatory text

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1598 bytes --]

- When dealing with a problem on the forum I noticed that in the Fixed Leases table
   Legend section there was a very large space between the empty checkbox icon and the
   explanatory text. It looks like the &nbsp that I have removed worked on the text
   section 'click to enable' as that was moved but not on the off.gif icon as that stayed
   in its original place leaving a very large space between the icon and the explanatory
   text. Removing the two   commands fixes that.
- Reading up about &nbsp the problem might be related to these tags no longer being
   recommended to use with the newer HTML versions and that indenting or spacing should be
   done via CSS code. Will have a look in future on how to accomplish this via CSS.

Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 html/cgi-bin/dhcp.cgi | 1 -
 1 file changed, 1 deletion(-)
 mode change 100755 => 100644 html/cgi-bin/dhcp.cgi

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
old mode 100755
new mode 100644
index 84e2322af..ec5d62657
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -1153,7 +1153,6 @@ print <<END
 	<td class='boldbase'>&nbsp;<b>$Lang::tr{'legend'}:&nbsp;</b></td>
 	<td><img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td>
 	<td class='base'>$Lang::tr{'click to disable'}</td>
-	<td>&nbsp;&nbsp;</td>
 	<td><img src='/images/off.gif' alt='$Lang::tr{'click to enable'}' /></td>
 	<td class='base'>$Lang::tr{'click to enable'}</td>
 	<td>&nbsp;&nbsp;</td>
-- 
2.43.0

[PATCH 2/2] dhcp.cgi: Adjust legend entries to make clear they are legends and not messages

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1328 bytes --]

- A new IPFire user on the forum saw the orange and red coloured blocks in the legend
   section and believed that they were messages about problems that had been created with
   the fixed leases.
- This change puts a small block with seperate explanatory text for both the orange and
   red coloured blocks.
- This change will also be applied to the wiki in a much clearer way

Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 html/cgi-bin/dhcp.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index ec5d62657..c079fe1ae 100644
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -1164,10 +1164,10 @@ print <<END
 </tr>
 <tr>
 	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-	<td class='base orange'>$Lang::tr{'ip address outside subnets'}</td>
-        <td>&nbsp;&nbsp</td>
-        <td class='base red'>$Lang::tr{'dhcp fixed ip address in dynamic range'}</td>
+	<td class='base orange'>&nbsp;</td>
+	<td class='base'>&nbsp;$Lang::tr{'ip address outside subnets'}&emsp;</td>
+       <td class='base red'>&nbsp;</td>
+       <td class='base'>&nbsp;$Lang::tr{'dhcp fixed ip address in dynamic range'}</td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
 	$dup
-- 
2.43.0

Re: [PATCH 1/2] dhcp.cgi: Adjust spacing between an icon and explanatory text

[Bernhard Bitsch]

[-- Attachment #1: Type: text/plain, Size: 1761 bytes --]

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 01.01.2024 um 15:35 schrieb Adolf Belka:
> - When dealing with a problem on the forum I noticed that in the Fixed Leases table
>     Legend section there was a very large space between the empty checkbox icon and the
>     explanatory text. It looks like the &nbsp that I have removed worked on the text
>     section 'click to enable' as that was moved but not on the off.gif icon as that stayed
>     in its original place leaving a very large space between the icon and the explanatory
>     text. Removing the two &nbsp; commands fixes that.
> - Reading up about &nbsp the problem might be related to these tags no longer being
>     recommended to use with the newer HTML versions and that indenting or spacing should be
>     done via CSS code. Will have a look in future on how to accomplish this via CSS.
> 
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>   html/cgi-bin/dhcp.cgi | 1 -
>   1 file changed, 1 deletion(-)
>   mode change 100755 => 100644 html/cgi-bin/dhcp.cgi
> 
> diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
> old mode 100755
> new mode 100644
> index 84e2322af..ec5d62657
> --- a/html/cgi-bin/dhcp.cgi
> +++ b/html/cgi-bin/dhcp.cgi
> @@ -1153,7 +1153,6 @@ print <<END
>   	<td class='boldbase'>&nbsp;<b>$Lang::tr{'legend'}:&nbsp;</b></td>
>   	<td><img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td>
>   	<td class='base'>$Lang::tr{'click to disable'}</td>
> -	<td>&nbsp;&nbsp;</td>
>   	<td><img src='/images/off.gif' alt='$Lang::tr{'click to enable'}' /></td>
>   	<td class='base'>$Lang::tr{'click to enable'}</td>
>   	<td>&nbsp;&nbsp;</td>

Re: [PATCH 2/2] dhcp.cgi: Adjust legend entries to make clear they are legends and not messages

[jon]

[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]

Appreciated-by: Jon Murphy <jon.murphy(a)ipfire.org>

New tag in appreciation of the effort! 

Happy New Year!

> On Jan 1, 2024, at 8:35 AM, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> - A new IPFire user on the forum saw the orange and red coloured blocks in the legend
>   section and believed that they were messages about problems that had been created with
>   the fixed leases.
> - This change puts a small block with seperate explanatory text for both the orange and
>   red coloured blocks.
> - This change will also be applied to the wiki in a much clearer way
> 
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> html/cgi-bin/dhcp.cgi | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
> index ec5d62657..c079fe1ae 100644
> --- a/html/cgi-bin/dhcp.cgi
> +++ b/html/cgi-bin/dhcp.cgi
> @@ -1164,10 +1164,10 @@ print <<END
> </tr>
> <tr>
> 	<td>&nbsp;</td>
> -	<td>&nbsp;</td>
> -	<td class='base orange'>$Lang::tr{'ip address outside subnets'}</td>
> -        <td>&nbsp;&nbsp</td>
> -        <td class='base red'>$Lang::tr{'dhcp fixed ip address in dynamic range'}</td>
> +	<td class='base orange'>&nbsp;</td>
> +	<td class='base'>&nbsp;$Lang::tr{'ip address outside subnets'}&emsp;</td>
> +       <td class='base red'>&nbsp;</td>
> +       <td class='base'>&nbsp;$Lang::tr{'dhcp fixed ip address in dynamic range'}</td>
> 	<td>&nbsp;</td>
> 	<td>&nbsp;</td>
> 	$dup
> -- 
> 2.43.0
> 

Re: [PATCH 2/2] dhcp.cgi: Adjust legend entries to make clear they are legends and not messages

[Bernhard Bitsch]

[-- Attachment #1: Type: text/plain, Size: 1488 bytes --]

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 01.01.2024 um 15:35 schrieb Adolf Belka:
> - A new IPFire user on the forum saw the orange and red coloured blocks in the legend
>     section and believed that they were messages about problems that had been created with
>     the fixed leases.
> - This change puts a small block with seperate explanatory text for both the orange and
>     red coloured blocks.
> - This change will also be applied to the wiki in a much clearer way
> 
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>   html/cgi-bin/dhcp.cgi | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
> index ec5d62657..c079fe1ae 100644
> --- a/html/cgi-bin/dhcp.cgi
> +++ b/html/cgi-bin/dhcp.cgi
> @@ -1164,10 +1164,10 @@ print <<END
>   </tr>
>   <tr>
>   	<td>&nbsp;</td>
> -	<td>&nbsp;</td>
> -	<td class='base orange'>$Lang::tr{'ip address outside subnets'}</td>
> -        <td>&nbsp;&nbsp</td>
> -        <td class='base red'>$Lang::tr{'dhcp fixed ip address in dynamic range'}</td>
> +	<td class='base orange'>&nbsp;</td>
> +	<td class='base'>&nbsp;$Lang::tr{'ip address outside subnets'}&emsp;</td>
> +       <td class='base red'>&nbsp;</td>
> +       <td class='base'>&nbsp;$Lang::tr{'dhcp fixed ip address in dynamic range'}</td>
>   	<td>&nbsp;</td>
>   	<td>&nbsp;</td>
>   	$dup