From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo-Andres Hofmann To: development@lists.ipfire.org Subject: [PATCH 2/2] pakfire.cgi: Improve HTML output and layout Date: Mon, 27 Dec 2021 14:21:37 +0100 Message-ID: <20211227132137.1355-2-hofmann@leo-andres.de> In-Reply-To: <20211227132137.1355-1-hofmann@leo-andres.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8874614087886203892==" List-Id: --===============8874614087886203892== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Add missing closing tags, indentation and CSS styling. Add link to reboot notice, left-align info list and resize packages lists for better readability. Signed-off-by: Leo-Andres Hofmann --- Hi all, this patch series implements everything that came up in the discussion so far= and fixes a few HTML issues I found along the way. Because more changes are probably needed, I have not yet created a new patchs= et. Instead, this patch builds on the first proposal.=20 To test it, the following patches must therefore also be applied: https://patchwork.ipfire.org/patch/4842 https://patchwork.ipfire.org/project/ipfire/list/?series=3D2452 I hope this doesn't cause confusion again, if it does, I can of course build = a new patchset :) Happy holidays! Leo html/cgi-bin/pakfire.cgi | 137 ++++++++++++++++++++++++--------------- 1 file changed, 84 insertions(+), 53 deletions(-) diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 8516b07b1..51f586aa2 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -100,6 +100,32 @@ if($cgiparams{'ACTION'} eq 'json-getstatus') { ###--- HTML HEAD ---### my $extraHead =3D < + /* Main screen */ + table#pfmain { + width: 100%; + border-style: hidden; + table-layout: fixed; + } + + #pfmain td { + padding: 5px 20px 0; + text-align: center; + } + #pfmain tr:not(:last-child) > td { + padding-bottom: 1.5em; + } + #pfmain tr > td.heading { + padding: 0; + font-weight: bold; + background-color: $color{'color20'}; + } + + .pflist { + width: 100%; + text-align: left; + margin-bottom: 0.8em; + } + /* Pakfire log viewer */ section#pflog-header { width: 100%; @@ -173,20 +199,23 @@ END print "$_\n"; } print < - $Lang::tr{'pakfire accept all'} -   + + $Lang::tr{'pakfire accept all'} +  
+
+ + END &Header::closebox(); @@ -210,20 +239,23 @@ END print "$_\n"; } print < - $Lang::tr{'pakfire uninstall all'} -   + + $Lang::tr{'pakfire uninstall all'} +  
+
+ + END &Header::closebox(); @@ -311,70 +343,69 @@ my $packages_update_age =3D &General::age("/opt/pakfire= /db/lists/packages_list.db" &Header::openbox("100%", "center", "Pakfire"); =20 print < + END if ( -e "/var/run/need_reboot") { - print ""; - print "" + print "\t\t\n"; } print < - - + + + + + + + =20 - + +
$Lang::tr= {'needreboot'}!
 
$Lang::t= r{'needreboot'}!
$L= ang::tr{'pakfire system state'}: - - $Lang= ::tr{'available updates'}:
$Lang::tr{'pakfire core update level'}: $core_rel= ease
- $Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ag= o'}
- $Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::t= r{'pakfire ago'}
- $Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::= tr{'pakfire ago'}
+
$Lang::tr{'pakfire system state'}:$Lang::tr{'available updates'}:
$Lang::tr{'pakfire core update level'}: $core_release +
+
+ $Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ag= o'}
+ $Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::t= r{'pakfire ago'}
+ $Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::= tr{'pakfire ago'}
$Lang::tr{'pakfire last package update'} $packages_update_age $Lang::tr= {'pakfire ago'} -
-
-
-
-
-
+
- + +
+ 		+
+
+
$Lang::tr{'pakfire available addons'}$Lang::tr{'pakfire installed addons'}
  -
$Lang::tr{'pakfi= re available addons'} - $Lang::tr{'pakfire= installed addons'} -
-

$Lang::tr{'pakfire install description'}

-
-

$Lang::tr{'pakfire install description'}

+ + - - - - 		-

$Lang::tr{'pakfire uninstall description'}

-
- + +
+

$Lang::tr{'pakfire uninstall description'}

+
+ - -
+ &Pakfire::dblist("installed", "forweb"); + print < + + + +
END =20 --=20 2.27.0.windows.1 --===============8874614087886203892==--