logs: improve layout, they never looked shinier :)

src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml

@@ -57,7 +57,6 @@
                 <SummaryView url="/diag_logs_filter_summary.php"/>
             </Firewall>
             <DHCP url="/diag_logs_dhcp.php"/>
-            <PortalAuth url="/diag_logs_auth.php"/>
             <PPP url="/diag_logs_ppp.php"/>
             <VPN url="/diag_logs_vpn.php*"/>
             <OpenVPN url="/diag_logs_openvpn.php"/>
@@ -192,7 +191,10 @@
         </Diagnostics>
     </Firewall>
     <Services order="4" cssClass="glyphicon glyphicon-cog">
-        <CaptivePortal VisibleName="Captive Portal" url="/ui/captiveportal/" cssClass="fa fa-paper-plane-o"/>
+        <CaptivePortal VisibleName="Captive Portal" cssClass="fa fa-paper-plane-o">
+            <Administration url="/ui/captiveportal/"/>
+            <Log VisibleName="Log File" url="/diag_logs_auth.php"/>
+        </CaptivePortal>
         <DHCPRelay VisibleName="DHCP Relay" url="/services_dhcp_relay.php"/>
         <DHCPServer VisibleName="DHCP Server" url="/services_dhcp.php">
             <DHCPServerTab url="/services_dhcp.php?if=*"/>
@@ -237,7 +239,7 @@
             <GPS url="/services_ntpd_gps.php"/>
             <PPS url="/services_ntpd_pps.php"/>
             <Status url="/status_ntpd.php"/>
-            <Log url="/diag_logs_ntpd.php"/>
+            <Log VisibleName="Log File" url="/diag_logs_ntpd.php"/>
         </NTP>
         <PPPoEServer VisibleName="PPPoE Server" url="/vpn_pppoe.php">
             <PPPoeServerEdit url="/vpn_pppoe_edit.php"/>
@@ -274,7 +276,7 @@
             <Leases VisibleName="Lease Status" url="/diag_ipsec_leases.php"/>
             <SAD VisibleName="Security Association Database" url="/diag_ipsec_sad.php"/>
             <SPD VisibleName="Security Policy Database" url="/diag_ipsec_spd.php"/>
-            <Log VisibleName="System Log" url="/diag_logs_ipsec.php"/>
+            <Log VisibleName="Log File" url="/diag_logs_ipsec.php"/>
         </IPsec>
         <L2TP cssClass="fa fa-road">
             <Settings url="/vpn_l2tp.php"/>

src/www/diag_logs_auth.php

@@ -44,7 +44,7 @@ if ($_POST['clear']) {
 	clear_clog($portal_logfile);
 }
 
-$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Portal Auth"));
+$pgtitle = array(gettext('Services'), gettext('Captive Portal'), gettext('Log File'));
 include("head.inc");
 
 ?>
@@ -61,25 +61,17 @@ include("head.inc");
 
 			    <section class="col-xs-12">
 
-
-					<? include('diag_logs_tabs.inc'); ?>
-
-
 						<div class="tab-content content-box col-xs-12">
-						<div class="container-fluid">
-							<?php printf(gettext('Last %s Portal Auth log entries'), $nentries); ?>
-						</div>
 						<div class="table-responsive">
 							<table class="table table-striped table-sort">
+								<tr><td colspan="2"><strong><?= sprintf(gettext('Last %s Portal Auth log entries'), $nentries); ?></strong></td></tr>
 								<?php dump_clog($portal_logfile, $nentries, true); ?>
-							</table>
-						</div>
-
-					    <div class="container-fluid">
+								<tr><td>
 									<form action="diag_logs_auth.php" method="post">
 										<input name="clear" type="submit" class="btn" value="<?= gettext("Clear log");?>" />
 									</form>
-
+								</td></tr>
+							</table>
 						</div>
 				    </div>
 			    </section>

src/www/diag_logs_ipsec.php

@@ -63,20 +63,17 @@ include("head.inc");
 
 			    <section class="col-xs-12">
 						<div class="tab-content content-box col-xs-12">
-					    <div class="container-fluid">
-
-							<p>  <?php printf(gettext("Last %s  IPsec log entries"),$nentries);?></p>
 
 								 <div class="table-responsive">
 									<table class="table table-striped table-sort">
+										<tr><td colspan="2"><strong><?= sprintf(gettext("Last %s IPsec log entries"),$nentries);?></strong></td></tr>
 										<?php dump_clog($ipsec_logfile, $nentries); ?>
-									</table>
-								 </div>
-
+										<tr><td>
 											<form action="diag_logs_ipsec.php" method="post">
 												<input name="clear" type="submit" class="btn" value="<?= gettext("Clear log");?>" />
 											</form>
-
+										</td></tr>
+									</table>
 								 </div>
 						</div>
 			    </section>

src/www/diag_logs_ntpd.php

@@ -33,7 +33,6 @@ require_once("services.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 
-
 $ntpd_logfile = '/var/log/ntpd.log';
 
 if (empty($config['syslog']['nentries'])) {
@@ -64,26 +63,21 @@ include("head.inc");
 
 			    <section class="col-xs-12">
 
-
-					<? include('diag_logs_tabs.inc'); ?>
-
-
 						<div class="tab-content content-box col-xs-12">
-					    <div class="container-fluid">
-
-							<p><?php printf(gettext("Last %s NTP log entries"), $nentries);?></p>
 
 								 <div class="table-responsive">
 									<table class="table table-striped table-sort">
+										<tr><td colspan="2"><strong><?= sprintf(gettext("Last %s NTP log entries"), $nentries);?></strong></td></tr>
 										<?php dump_clog($ntpd_logfile, $nentries); ?>
-									</table>
-								 </div>
-
+										<tr><td>
 											<form action="diag_logs_ntpd.php" method="post">
 												<input name="clear" type="submit" class="btn" value="<?= gettext("Clear log");?>" />
 											</form>
-
+										<tr></td>
+									</table>
 								 </div>
+
+
 						</div>
 			    </section>
 			</div>

src/www/diag_logs_relayd.php

@@ -68,7 +68,7 @@ include("head.inc");
 						<div class="tab-content content-box col-xs-12">
 								 <div class="table-responsive">
 									<table class="table table-striped table-sort">
-										<tr><td><strong><?= sprintf(gettext('Last %s Load Balancer log entries'), $nentries);?></strong></td></tr>
+										<tr><td colspan="2"><strong><?= sprintf(gettext('Last %s Load Balancer log entries'), $nentries);?></strong></td></tr>
 										 <?php dump_clog($relayd_logfile, $nentries); ?>
 										<tr><td>
 											<form action="diag_logs_relayd.php" method="post">