From bcc85862fec53fddb517ea1a4788f06331a6ce86 Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Wed, 18 Oct 2017 10:00:14 +0200
Subject: [PATCH] dshttpsettings: Move whitelisted cookies to end of config
 page

---
 .../plugins/partials/ds_http_settings.html    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/public/app/features/plugins/partials/ds_http_settings.html b/public/app/features/plugins/partials/ds_http_settings.html
index f27a9d00da2..582ec7d9618 100644
--- a/public/app/features/plugins/partials/ds_http_settings.html
+++ b/public/app/features/plugins/partials/ds_http_settings.html
@@ -36,18 +36,6 @@
         </div>
       </div>
     </div>
-
-    <div class="gf-form-inline" ng-if="current.access=='proxy'">
-      <div class="gf-form max-width-30">
-        <span class="gf-form-label width-7">Cookies</span>
-        <bootstrap-tagsinput ng-model="current.jsonData.keepCookies" tagclass="label label-tag" placeholder="Add Name">
-        </bootstrap-tagsinput>
-        <info-popover mode="right-absolute">
-          Grafana Proxy deletes forwarded cookies by default. Specify cookies by name that should be forwarded to the data source.
-        </info-popover>
-      </div>
-    </div>
-
   </div>
 
   <h3 class="page-heading">HTTP Auth</h3>
@@ -135,3 +123,17 @@
   </div>
 </div>
 
+<h3 class="page-heading" ng-if="current.access=='proxy'">Advanced HTTP Settings</h3>
+<div class="gf-form-group" ng-if="current.access=='proxy'">
+  <div class="gf-form-inline">
+    <div class="gf-form">
+      <span class="gf-form-label width-10">Whitelisted Cookies</span>
+      <bootstrap-tagsinput ng-model="current.jsonData.keepCookies" tagclass="label label-tag" placeholder="Add Name">
+      </bootstrap-tagsinput>
+      <info-popover mode="right-absolute">
+        Grafana Proxy deletes forwarded cookies by default. Specify cookies by name that should be forwarded to the data source.
+      </info-popover>
+    </div>
+  </div>
+</div>
+