From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 40/54] samba: Refactor status area
Date: Tue, 13 Oct 2020 16:07:58 +0000
Message-ID: <20201013160812.27754-40-michael.tremer@ipfire.org>
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7689049161073154062=="
List-Id: <development.lists.ipfire.org>

--===============7689049161073154062==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

There is no need to double-wrap the status output in tables.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/samba.cgi | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index a64fc9177..66043f15b 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -37,9 +37,6 @@ my %mainsettings =3D ();
 my $message =3D "";
 my $errormessage =3D "";
=20
-my $Status =3D qx(/usr/local/bin/sambactrl smbstatus);
-$Status =3D &Header::cleanhtml($Status);
-
 my $userentry =3D "";
 my @user =3D ();
 my @userline =3D ();
@@ -746,16 +743,17 @@ if ($sambasettings{'ACTION'} eq 'smbsharechange')
 ############################################################################=
################################################
 ############################################### Anzeige des Sambastatus ####=
################################################
=20
-&Header::openbox('100%', 'center', 'Status');
+&Header::openbox('100%', 'left', $Lang::tr{'status'});
=20
-print <<END
-<br />
-<table class=3D"tbl" width=3D'95%' cellspacing=3D'0'>
-<tr><td bgcolor=3D'$color{'color20'}' colspan=3D'3' align=3D'left'><b>$Lang:=
:tr{'samba status'}</b></td></tr>
-<tr><td  align=3D'left'><small><pre>$Status</pre></small></td></tr>
-</table>
+my $status =3D qx(/usr/local/bin/sambactrl smbstatus);
+$status =3D &Header::cleanhtml($status);
+
+print <<END;
+	<small>
+		<pre>$status</pre>
+	</small>
 END
-;
+
 &Header::closebox();
=20
 &Header::closebigbox();
--=20
2.20.1


--===============7689049161073154062==--