From 20c692547066f1fc1ba2695cddb5570c78f814a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 30 Jan 2015 14:21:32 +0100
Subject: [PATCH] Fixed sub url setting bug

---
 '                      | 46 ++++++++++++++++++++++++++++++++++++++++++
 grafana                |  2 +-
 pkg/setting/setting.go |  2 +-
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 '

diff --git a/' b/'
new file mode 100644
index 00000000000..33a5fbfaf00
--- /dev/null
+++ b/'
@@ -0,0 +1,46 @@
+  <div class="editor-row">
+		<div class="section">
+			<div>
+			<div class="tight-form">
+				<ul class="tight-form-list">
+					<li class="tight-form-item" style="width: 148px">
+						<strong>Relative time options</strong></small>
+					</li>
+					<li>
+						<input type="text" class="input-xlarge tight-form-input"
+							ng-model="panel.time_options" array-join>
+				  </li>
+					<li class="tight-form-item">
+						Until
+					</li>
+					<li class="tight-form-item">
+					 now-
+					</li>
+					<li>
+						<input type="text" class="input-mini tight-form-input last"
+						  ng-model="panel.nowDelay" placeholder="0m" bs-tooltip="'Enter 1m to ignore the last minute (because it can contain incomplete metrics)'" data-placement="right">
+				  </li>
+				</ul>
+				<div class="clearfix"></div>
+			</div>
+			<div class="tight-form">
+				<ul class="tight-form-list">
+					<li class="tight-form-item" style="width: 148px">
+						<strong>Auto-refresh options</strong>
+					</li>
+					<li>
+						<input type="text" class="input-xlarge tight-form-input"
+							ng-model="panel.refresh_intervals" array-join>
+				  </li>
+				</ul>
+				<div class="clearfix"></div>
+			</div>
+			</div>
+
+			<p>
+			<br>
+			<i class="fa fa-info-circle"></i>
+			For these changes to fully take effect save and reload the dashboard.
+		</i>
+	</div>
+</div>
diff --git a/grafana b/grafana
index 740709da049..465c72d98ef 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit 740709da0493536269adfe1cafd0b93d975b02a2
+Subproject commit 465c72d98ef80127ce75a32254ead85b0efd68a7
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 41e1d89b4a5..3b65790295e 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -139,7 +139,7 @@ func parseAppUrlAndSubUrl(section *ini.Section) (string, string) {
 	}
 
 	// Check if has app suburl.
-	url, err := url.Parse(AppUrl)
+	url, err := url.Parse(appUrl)
 	if err != nil {
 		log.Fatal(4, "Invalid root_url(%s): %s", appUrl, err)
 	}