From 5d4d25f5496df12e941c58981f208b85b40120c6 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Fri, 28 Jun 2013 11:46:12 +0200
Subject: [PATCH] added admin setting to configure query timeout

---
 src/main/webapp/templates/admin.settings.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/templates/admin.settings.html b/src/main/webapp/templates/admin.settings.html
index cc226bcb..c333b4ae 100644
--- a/src/main/webapp/templates/admin.settings.html
+++ b/src/main/webapp/templates/admin.settings.html
@@ -146,10 +146,18 @@
 					<div class="control-group">
 						<label class="control-label" for="logLevel">Logging level</label>
 						<div class="controls">
-							<select name="logLevel" ng-model="settings.logLevel" ng-options="level for level in ['DEBUG', 'INFO', 'WARN', 'ERROR']">
+							<select name="logLevel" ng-model="settings.logLevel" class="input-block-level"
+								ng-options="level for level in ['DEBUG', 'INFO', 'WARN', 'ERROR']">
 							</select>
 						</div>
 					</div>
+					<div class="control-group">
+						<label class="control-label" for="logLevel">Database query timeout (ms)</label>
+						<div class="controls">
+							<input type="number" name="queryTimeout" class="input-block-level"
+								ng-model="settings.queryTimeout" />
+						</div>
+					</div>
 				</div>
 			</div>
 			<div class="control-group">