From 46bcd54a1ac40426635d2b5a09650f14c073928d Mon Sep 17 00:00:00 2001
From: Wouter R <gennerate@zonnet.nl>
Date: Wed, 6 Jan 2016 16:38:59 +0100
Subject: [PATCH] Only show warning about verbose logging when level is set to
 verbose or bulk. Small improvements to when log level warnings are shown.

---
 js/settings/SettingsWindow.js | 25 +++++++++++++++++++------
 www/settings.html             |  4 ++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/js/settings/SettingsWindow.js b/js/settings/SettingsWindow.js
index 2488b7a..274ffed 100644
--- a/js/settings/SettingsWindow.js
+++ b/js/settings/SettingsWindow.js
@@ -35,7 +35,7 @@ function SettingsWindow() {
 	var _networkAPI = new NetworkAPI();
 	
 	var _restoreStateField;
-	var _initialLogLevel;
+	var _initialLogLevel = undefined;
 	
 	var self = this;
 
@@ -124,7 +124,12 @@ function SettingsWindow() {
 		_form.loadAllSettings(function(loadedSettings){
 			console.log("Settings:loaded settings: ",loadedSettings);
 			settings = loadedSettings;
-			_initialLogLevel = loadedSettings['system.log.level'];
+			
+			//only set the initial level once, to make behaviour of restart warning as correctly as possible
+			if (_initialLogLevel == undefined)
+				_initialLogLevel = loadedSettings['system.log.level'];
+			updateLogLevelWarningsVisibility();
+			
 			_form.fillForm(settings);
 			$(document).trigger(SettingsWindow.SETTINGS_LOADED);
 			if(complete) complete();
@@ -183,16 +188,24 @@ function SettingsWindow() {
 		location.href = "filemanager/"+location.search;
 	}
 
-	this.logLevelChanged = function(elem) {
+	this.logLevelChanged = function() {
+		updateLogLevelWarningsVisibility();
+	}
+
+
+	/***** LOCAL FUNCTIONS *****/
+
+	function updateLogLevelWarningsVisibility() {
 		var showHideAnimDuration = 100;
-		if (_initialLogLevel != elem.value) {
+		newLevel = $('#logLevel').val();
+		if (_initialLogLevel != newLevel) {
 			$('#logging-restart-warning').show(showHideAnimDuration);
 		} else {
 			$('#logging-restart-warning').hide(showHideAnimDuration);
 		}
 
-		switch (elem.value) {
-		case "info": case "verbose": case "bulk":
+		switch (newLevel) {
+		case "verbose": case "bulk":
 			$('#logging-verbose-warning').show(showHideAnimDuration);
 			break;
 		default:
diff --git a/www/settings.html b/www/settings.html
index 15d64f3..d6d74a7 100644
--- a/www/settings.html
+++ b/www/settings.html
@@ -183,7 +183,7 @@
   <fieldset id="debugPanel">
  		<legend>Debug</legend>
  		<label for="logLevel">Log level:</label>
-		<select id="logLevel" name="system.log.level" onchange="settingsWindow.logLevelChanged(this)">
+		<select id="logLevel" name="system.log.level" onchange="settingsWindow.logLevelChanged()">
 			<option value="" disabled="disabled" selected="selected">Please choose a log level</option>
 			<option value="quiet">Quiet</option>
 			<option value="error">Error</option>
@@ -193,7 +193,7 @@
 			<option value="bulk">Bulk</option>
  		</select><br/>
  		<div id="logging-restart-warning" class="warn-box">
-  			Restart the wifibox for a new log level to take effect.
+  			Restart the wifibox for the new log level to take effect.
   		</div>
   		<div id="logging-verbose-warning" class="warn-box">
   			<em>Be careful</em>: when setting a log level higher than info, the Wifibox may quickly run out of memory, causing crashes and other unwanted behaviour.