updatexlrator.cgi: Fix Bug 10477 - Update Accelerator disk usage statistics are very cramped in 2.15 beta1

  - This bug has been open for a long time and is still valid. The Cache statistics on
   the Update accelerator configuration page are jammed closely together making it
   not so easy to see what the numbers are.
- Implemented similar approach as used on the Memory table section of the Memory
   information page.
- Installed on vm testbed machine and confirmed to provide the desired layout.

Tested-by Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 html/cgi-bin/updatexlrator.cgi | 58 +++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 26 deletions(-)
  

Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch@ipfire.org>

Am 09.08.2021 um 22:32 schrieb Adolf Belka:
> - This bug has been open for a long time and is still valid. The Cache statistics on
>     the Update accelerator configuration page are jammed closely together making it
>     not so easy to see what the numbers are.
> - Implemented similar approach as used on the Memory table section of the Memory
>     information page.
> - Installed on vm testbed machine and confirmed to provide the desired layout.
> 
> Tested-by Adolf Belka <adolf.belka@ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>   html/cgi-bin/updatexlrator.cgi | 58 +++++++++++++++++++---------------
>   1 file changed, 32 insertions(+), 26 deletions(-)
> 
> diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
> index 9cfe08f4e..deead7d79 100644
> --- a/html/cgi-bin/updatexlrator.cgi
> +++ b/html/cgi-bin/updatexlrator.cgi
> @@ -722,15 +722,18 @@ unless ($numfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>\n<hr s
>   
>   print <<END
>   <table>
> -<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr>
> +<tr>
> +<td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td>
> +</tr>
>   </table>
> -<table cellpadding='3'>
> +<table width='75%' cellspacing='5'>
>   <tr>
> -<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'size'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'used'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'free'}</i></td>
> -<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'updxlrtr cache dir'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
> +<td></td>
> +<td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
>   </tr>
>   END
>   ;
> @@ -745,17 +748,17 @@ my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr);
>   
>   print <<END
>   <tr>
> -<td>[$repository]</td>
> -<td align='right'>$size</td>
> -<td align='right'>$used</td>
> -<td align='right'>$free</td>
> -<td>
> +<td align='center'>[$repository]</td>
> +<td align='center'>$size</td>
> +<td align='center'>$used</td>
> +<td align='center'>$free</td>
> +<td align='right' colspan='2'>
>   END
>   ;
>   &percentbar($percent);
>   print <<END
>   </td>
> -<td align='right'>$percent</td>
> +<td align='center'>$percent</td>
>   </tr>
>   </table>
>   END
> @@ -1015,15 +1018,18 @@ unless (@repositoryfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>
>   
>   print <<END
>   <table>
> -<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr>
> +<tr>
> +<td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td>
> +</tr>
>   </table>
> -<table cellpadding='3'>
> +<table width='75%' cellspacing='5'>
>   <tr>
> -<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'size'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'used'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'free'}</i></td>
> -<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'updxlrtr cache dir'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
> +<td></td>
> +<td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
>   </tr>
>   END
>   ;
> @@ -1038,17 +1044,17 @@ my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr);
>   
>   print <<END
>   <tr>
> -<td>[$repository]</td>
> -<td align='right'>$size</td>
> -<td align='right'>$used</td>
> -<td align='right'>$free</td>
> -<td>
> +<td align='center'>[$repository]</td>
> +<td align='center'>$size</td>
> +<td align='center'>$used</td>
> +<td align='center'>$free</td>
> +<td align='right' colspan='2'>
>   END
>   ;
>   &percentbar($percent);
>   print <<END
>   </td>
> -<td align='right'>$percent</td>
> +<td align='center'>$percent</td>
>   </tr>
>   </table>
>   END
>
  

Could I have a screenshot of this, please?

-Michael

> On 9 Aug 2021, at 22:32, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> - This bug has been open for a long time and is still valid. The Cache statistics on
>   the Update accelerator configuration page are jammed closely together making it
>   not so easy to see what the numbers are.
> - Implemented similar approach as used on the Memory table section of the Memory
>   information page.
> - Installed on vm testbed machine and confirmed to provide the desired layout.
> 
> Tested-by Adolf Belka <adolf.belka@ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
> html/cgi-bin/updatexlrator.cgi | 58 +++++++++++++++++++---------------
> 1 file changed, 32 insertions(+), 26 deletions(-)
> 
> diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
> index 9cfe08f4e..deead7d79 100644
> --- a/html/cgi-bin/updatexlrator.cgi
> +++ b/html/cgi-bin/updatexlrator.cgi
> @@ -722,15 +722,18 @@ unless ($numfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>\n<hr s
> 
> print <<END
> <table>
> -<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr>
> +<tr>
> +<td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td>
> +</tr>
> </table>
> -<table cellpadding='3'>
> +<table width='75%' cellspacing='5'>
> <tr>
> -<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'size'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'used'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'free'}</i></td>
> -<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'updxlrtr cache dir'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
> +<td></td>
> +<td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
> </tr>
> END
> ;
> @@ -745,17 +748,17 @@ my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr);
> 
> print <<END
> <tr>
> -<td>[$repository]</td>
> -<td align='right'>$size</td>
> -<td align='right'>$used</td>
> -<td align='right'>$free</td>
> -<td>
> +<td align='center'>[$repository]</td>
> +<td align='center'>$size</td>
> +<td align='center'>$used</td>
> +<td align='center'>$free</td>
> +<td align='right' colspan='2'>
> END
> ;
> &percentbar($percent);
> print <<END
> </td>
> -<td align='right'>$percent</td>
> +<td align='center'>$percent</td>
> </tr>
> </table>
> END
> @@ -1015,15 +1018,18 @@ unless (@repositoryfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>
> 
> print <<END
> <table>
> -<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr>
> +<tr>
> +<td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td>
> +</tr>
> </table>
> -<table cellpadding='3'>
> +<table width='75%' cellspacing='5'>
> <tr>
> -<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'size'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'used'}</i></td>
> -<td align='center' class='base'><i>$Lang::tr{'free'}</i></td>
> -<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'updxlrtr cache dir'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
> +<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
> +<td></td>
> +<td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
> </tr>
> END
> ;
> @@ -1038,17 +1044,17 @@ my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr);
> 
> print <<END
> <tr>
> -<td>[$repository]</td>
> -<td align='right'>$size</td>
> -<td align='right'>$used</td>
> -<td align='right'>$free</td>
> -<td>
> +<td align='center'>[$repository]</td>
> +<td align='center'>$size</td>
> +<td align='center'>$used</td>
> +<td align='center'>$free</td>
> +<td align='right' colspan='2'>
> END
> ;
> &percentbar($percent);
> print <<END
> </td>
> -<td align='right'>$percent</td>
> +<td align='center'>$percent</td>
> </tr>
> </table>
> END
> -- 
> 2.32.0
>
  

Hi Michael,

On 11/08/2021 12:49, Michael Tremer wrote:
> Could I have a screenshot of this, please?
I attached a screenshot into the bug but also find the original version and the fixed version screenshots attached to this email.

Regards,
Adolf.
> 
> -Michael
> 
>> On 9 Aug 2021, at 22:32, Adolf Belka <adolf.belka@ipfire.org> wrote:
>>
>> - This bug has been open for a long time and is still valid. The Cache statistics on
>>    the Update accelerator configuration page are jammed closely together making it
>>    not so easy to see what the numbers are.
>> - Implemented similar approach as used on the Memory table section of the Memory
>>    information page.
>> - Installed on vm testbed machine and confirmed to provide the desired layout.
>>
>> Tested-by Adolf Belka <adolf.belka@ipfire.org>
>> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
>> ---
>> html/cgi-bin/updatexlrator.cgi | 58 +++++++++++++++++++---------------
>> 1 file changed, 32 insertions(+), 26 deletions(-)
>>
>> diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
>> index 9cfe08f4e..deead7d79 100644
>> --- a/html/cgi-bin/updatexlrator.cgi
>> +++ b/html/cgi-bin/updatexlrator.cgi
>> @@ -722,15 +722,18 @@ unless ($numfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>\n<hr s
>>
>> print <<END
>> <table>
>> -<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr>
>> +<tr>
>> +<td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td>
>> +</tr>
>> </table>
>> -<table cellpadding='3'>
>> +<table width='75%' cellspacing='5'>
>> <tr>
>> -<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td>
>> -<td align='center' class='base'><i>$Lang::tr{'size'}</i></td>
>> -<td align='center' class='base'><i>$Lang::tr{'used'}</i></td>
>> -<td align='center' class='base'><i>$Lang::tr{'free'}</i></td>
>> -<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td>
>> +<td align='center' class='boldbase'><b>$Lang::tr{'updxlrtr cache dir'}</b></td>
>> +<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
>> +<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
>> +<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
>> +<td></td>
>> +<td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
>> </tr>
>> END
>> ;
>> @@ -745,17 +748,17 @@ my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr);
>>
>> print <<END
>> <tr>
>> -<td>[$repository]</td>
>> -<td align='right'>$size</td>
>> -<td align='right'>$used</td>
>> -<td align='right'>$free</td>
>> -<td>
>> +<td align='center'>[$repository]</td>
>> +<td align='center'>$size</td>
>> +<td align='center'>$used</td>
>> +<td align='center'>$free</td>
>> +<td align='right' colspan='2'>
>> END
>> ;
>> &percentbar($percent);
>> print <<END
>> </td>
>> -<td align='right'>$percent</td>
>> +<td align='center'>$percent</td>
>> </tr>
>> </table>
>> END
>> @@ -1015,15 +1018,18 @@ unless (@repositoryfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>
>>
>> print <<END
>> <table>
>> -<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr>
>> +<tr>
>> +<td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td>
>> +</tr>
>> </table>
>> -<table cellpadding='3'>
>> +<table width='75%' cellspacing='5'>
>> <tr>
>> -<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td>
>> -<td align='center' class='base'><i>$Lang::tr{'size'}</i></td>
>> -<td align='center' class='base'><i>$Lang::tr{'used'}</i></td>
>> -<td align='center' class='base'><i>$Lang::tr{'free'}</i></td>
>> -<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td>
>> +<td align='center' class='boldbase'><b>$Lang::tr{'updxlrtr cache dir'}</b></td>
>> +<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
>> +<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
>> +<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
>> +<td></td>
>> +<td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
>> </tr>
>> END
>> ;
>> @@ -1038,17 +1044,17 @@ my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr);
>>
>> print <<END
>> <tr>
>> -<td>[$repository]</td>
>> -<td align='right'>$size</td>
>> -<td align='right'>$used</td>
>> -<td align='right'>$free</td>
>> -<td>
>> +<td align='center'>[$repository]</td>
>> +<td align='center'>$size</td>
>> +<td align='center'>$used</td>
>> +<td align='center'>$free</td>
>> +<td align='right' colspan='2'>
>> END
>> ;
>> &percentbar($percent);
>> print <<END
>> </td>
>> -<td align='right'>$percent</td>
>> +<td align='center'>$percent</td>
>> </tr>
>> </table>
>> END
>> -- 
>> 2.32.0
>>
>
  

Hello,

Oh yeah, massive improvement :)

Thank you!

Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 11 Aug 2021, at 12:22, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> Hi Michael,
> 
> On 11/08/2021 12:49, Michael Tremer wrote:
>> Could I have a screenshot of this, please?
> I attached a screenshot into the bug but also find the original version and the fixed version screenshots attached to this email.
> 
> Regards,
> Adolf.
>> -Michael
>>> On 9 Aug 2021, at 22:32, Adolf Belka <adolf.belka@ipfire.org> wrote:
>>> 
>>> - This bug has been open for a long time and is still valid. The Cache statistics on
>>>   the Update accelerator configuration page are jammed closely together making it
>>>   not so easy to see what the numbers are.
>>> - Implemented similar approach as used on the Memory table section of the Memory
>>>   information page.
>>> - Installed on vm testbed machine and confirmed to provide the desired layout.
>>> 
>>> Tested-by Adolf Belka <adolf.belka@ipfire.org>
>>> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
>>> ---
>>> html/cgi-bin/updatexlrator.cgi | 58 +++++++++++++++++++---------------
>>> 1 file changed, 32 insertions(+), 26 deletions(-)
>>> 
>>> diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
>>> index 9cfe08f4e..deead7d79 100644
>>> --- a/html/cgi-bin/updatexlrator.cgi
>>> +++ b/html/cgi-bin/updatexlrator.cgi
>>> @@ -722,15 +722,18 @@ unless ($numfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>\n<hr s
>>> 
>>> print <<END
>>> <table>
>>> -<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr>
>>> +<tr>
>>> +<td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td>
>>> +</tr>
>>> </table>
>>> -<table cellpadding='3'>
>>> +<table width='75%' cellspacing='5'>
>>> <tr>
>>> -<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td>
>>> -<td align='center' class='base'><i>$Lang::tr{'size'}</i></td>
>>> -<td align='center' class='base'><i>$Lang::tr{'used'}</i></td>
>>> -<td align='center' class='base'><i>$Lang::tr{'free'}</i></td>
>>> -<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td>
>>> +<td align='center' class='boldbase'><b>$Lang::tr{'updxlrtr cache dir'}</b></td>
>>> +<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
>>> +<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
>>> +<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
>>> +<td></td>
>>> +<td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
>>> </tr>
>>> END
>>> ;
>>> @@ -745,17 +748,17 @@ my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr);
>>> 
>>> print <<END
>>> <tr>
>>> -<td>[$repository]</td>
>>> -<td align='right'>$size</td>
>>> -<td align='right'>$used</td>
>>> -<td align='right'>$free</td>
>>> -<td>
>>> +<td align='center'>[$repository]</td>
>>> +<td align='center'>$size</td>
>>> +<td align='center'>$used</td>
>>> +<td align='center'>$free</td>
>>> +<td align='right' colspan='2'>
>>> END
>>> ;
>>> &percentbar($percent);
>>> print <<END
>>> </td>
>>> -<td align='right'>$percent</td>
>>> +<td align='center'>$percent</td>
>>> </tr>
>>> </table>
>>> END
>>> @@ -1015,15 +1018,18 @@ unless (@repositoryfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>
>>> 
>>> print <<END
>>> <table>
>>> -<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr>
>>> +<tr>
>>> +<td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td>
>>> +</tr>
>>> </table>
>>> -<table cellpadding='3'>
>>> +<table width='75%' cellspacing='5'>
>>> <tr>
>>> -<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td>
>>> -<td align='center' class='base'><i>$Lang::tr{'size'}</i></td>
>>> -<td align='center' class='base'><i>$Lang::tr{'used'}</i></td>
>>> -<td align='center' class='base'><i>$Lang::tr{'free'}</i></td>
>>> -<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td>
>>> +<td align='center' class='boldbase'><b>$Lang::tr{'updxlrtr cache dir'}</b></td>
>>> +<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
>>> +<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
>>> +<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
>>> +<td></td>
>>> +<td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
>>> </tr>
>>> END
>>> ;
>>> @@ -1038,17 +1044,17 @@ my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr);
>>> 
>>> print <<END
>>> <tr>
>>> -<td>[$repository]</td>
>>> -<td align='right'>$size</td>
>>> -<td align='right'>$used</td>
>>> -<td align='right'>$free</td>
>>> -<td>
>>> +<td align='center'>[$repository]</td>
>>> +<td align='center'>$size</td>
>>> +<td align='center'>$used</td>
>>> +<td align='center'>$free</td>
>>> +<td align='right' colspan='2'>
>>> END
>>> ;
>>> &percentbar($percent);
>>> print <<END
>>> </td>
>>> -<td align='right'>$percent</td>
>>> +<td align='center'>$percent</td>
>>> </tr>
>>> </table>
>>> END
>>> -- 
>>> 2.32.0
>>> 
> <Unpatched cache statistics.png><patched cache statistics.png>