From 120899b3fbf434bba33d1748a0bb654f68dac550 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 16 Oct 2015 21:25:52 +0200
Subject: [PATCH] logs: move settings to system settings

---
 src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml | 2 +-
 src/www/diag_logs_settings.php                          | 7 +------
 src/www/diag_logs_tabs.inc                              | 1 -
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index afa8af808..e50cbb44e 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -62,7 +62,6 @@
             <Proxy url="/diag_logs_proxy.php">
                 <ProxyActions url="/diag_logs_proxy.php?*"/>
             </Proxy>
-            <Settings url="/diag_logs_settings.php"/>
         </LogFiles>
         <Settings cssClass="fa fa-cogs">
             <General url="/system_general.php"/>
@@ -73,6 +72,7 @@
             <Tunables VisibleName="Tunables" url="/system_advanced_sysctl.php"/>
             <Notifications url="/system_advanced_notifications.php"/>
             <RRDGraphs VisibleName="RRD Graphs" url="/status_rrd_graph_settings.php"/>
+            <LogFiles VisibleName="Log Files" url="/diag_logs_settings.php"/>
         </Settings>
         <Wizard url="/wizard.php" cssClass="fa fa-magic">
             <Step url="/wizard.php*"/>
diff --git a/src/www/diag_logs_settings.php b/src/www/diag_logs_settings.php
index 1d3e8cf76..df0627e2d 100644
--- a/src/www/diag_logs_settings.php
+++ b/src/www/diag_logs_settings.php
@@ -214,7 +214,7 @@ if ($_POST['resetlogs'] == gettext("Reset Log Files")) {
 	}
 }
 
-$pgtitle = array(gettext("Status"), gettext("System logs"), gettext("Settings"));
+$pgtitle = array(gettext('System'), gettext('Settings'), gettext('Log Files'));
 $closehead = false;
 include("head.inc");
 
@@ -296,11 +296,7 @@ function check_everything() {
 				<?php if (isset($savemsg)) print_info_box($savemsg); ?>
 
 			    <section class="col-xs-12">
-
-				<? $active_tab = "/diag_logs_settings.php"; include('diag_logs_tabs.inc'); ?>
-
 					<div class="tab-content content-box col-xs-12">
-				    <div class="container-fluid">
 
 
 
@@ -498,7 +494,6 @@ function check_everything() {
 									</table>
 								</div>
 							</form>
-						</div>
 					</div>
 				</section>
 			</div>
diff --git a/src/www/diag_logs_tabs.inc b/src/www/diag_logs_tabs.inc
index 517589937..33de5e4f5 100644
--- a/src/www/diag_logs_tabs.inc
+++ b/src/www/diag_logs_tabs.inc
@@ -34,5 +34,4 @@ $tab_array[] = array(gettext("DHCP"), $active_tab == "/diag_logs_dhcp.php", "dia
 $tab_array[] = array(gettext("PPP"), $active_tab == "/diag_logs_ppp.php", "diag_logs_ppp.php");
 $tab_array[] = array(gettext("VPN"), $active_tab == "/diag_logs_vpn.php", "diag_logs_vpn.php");
 $tab_array[] = array(gettext("Proxy"), $active_tab == "/diag_logs_proxy.php", "diag_logs_proxy.php?type=cache");
-$tab_array[] = array(gettext("Settings"), $active_tab == "/diag_logs_settings.php", "diag_logs_settings.php");
 display_top_tabs($tab_array);