From 8ad32f60ae4ac81c826dff4372f65d4451df23a2 Mon Sep 17 00:00:00 2001
From: Joerg Schad <joerg@mesosphere.io>
Date: Sun, 6 Aug 2017 18:23:35 -0700
Subject: [PATCH] WIP: Made UI links relative.

---
 .../src/main/resources/rest/error.ftl         |  4 +--
 .../src/main/resources/rest/generic.ftl       | 32 +++++++++----------
 .../src/main/resources/rest/index.ftl         |  2 +-
 .../src/main/resources/rest/login.ftl         |  4 +--
 .../src/main/resources/rest/logs/list.ftl     |  6 ++--
 .../src/main/resources/rest/logs/log.ftl      |  6 ++--
 .../main/resources/rest/metrics/metrics.ftl   |  4 +--
 .../src/main/resources/rest/options.ftl       |  2 +-
 .../src/main/resources/rest/profile/list.ftl  | 16 +++++-----
 .../main/resources/rest/profile/profile.ftl   |  2 +-
 .../resources/rest/query/errorMessage.ftl     |  4 +--
 .../src/main/resources/rest/query/list.ftl    |  4 +--
 .../src/main/resources/rest/query/query.ftl   |  2 +-
 .../src/main/resources/rest/query/result.ftl  |  2 +-
 .../src/main/resources/rest/status.ftl        |  2 +-
 .../src/main/resources/rest/storage/list.ftl  |  8 ++---
 .../main/resources/rest/storage/update.ftl    | 16 +++++-----
 .../main/resources/rest/threads/threads.ftl   |  4 +--
 18 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/exec/java-exec/src/main/resources/rest/error.ftl b/exec/java-exec/src/main/resources/rest/error.ftl
index a07794a1d2e..6a080f5789b 100644
--- a/exec/java-exec/src/main/resources/rest/error.ftl
+++ b/exec/java-exec/src/main/resources/rest/error.ftl
@@ -10,7 +10,7 @@
   language governing permissions and limitations under the License. -->
 
 <html>
-<a href="/queries">back</a><br />
+<a href="./queries">back</a><br />
 
 <pre>
 ${model.printStackTrace()}
@@ -18,4 +18,4 @@ ${model.printStackTrace()}
 
 
 
-<html>
\ No newline at end of file
+<html>
diff --git a/exec/java-exec/src/main/resources/rest/generic.ftl b/exec/java-exec/src/main/resources/rest/generic.ftl
index 60869e7e15a..c4a4576b0cc 100644
--- a/exec/java-exec/src/main/resources/rest/generic.ftl
+++ b/exec/java-exec/src/main/resources/rest/generic.ftl
@@ -23,17 +23,17 @@
       <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
       <title>Apache Drill</title>
-      <link rel="shortcut icon" href="/static/img/drill.ico">
+      <link rel="shortcut icon" href="./static/img/drill.ico">
 
-      <link href="/static/css/bootstrap.min.css" rel="stylesheet">
+      <link href="./static/css/bootstrap.min.css" rel="stylesheet">
 
-      <script src="/static/js/jquery.min.js"></script>
-      <script src="/static/js/bootstrap.min.js"></script>
+      <script src="./static/js/jquery.min.js"></script>
+      <script src="./static/js/bootstrap.min.js"></script>
 
       <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
       <!--[if lt IE 9]>
-        <script src="/static/js/html5shiv.js"></script>
-        <script src="/static/js/1.4.2/respond.min.js"></script>
+        <script src="./static/js/html5shiv.js"></script>
+        <script src="./static/js/1.4.2/respond.min.js"></script>
       <![endif]-->
 
       <@page_head/>
@@ -50,35 +50,35 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="/">Apache Drill</a>
+            <a class="navbar-brand" href=".">Apache Drill</a>
           </div>
           <div class="navbar-collapse collapse">
             <#if showControls == true>
             <ul class="nav navbar-nav">
-              <li><a href="/query">Query</a></li>
-              <li><a href="/profiles">Profiles</a></li>
+              <li><a href="./query">Query</a></li>
+              <li><a href="./profiles">Profiles</a></li>
               <#if showStorage == true>
-              <li><a href="/storage">Storage</a></li>
+              <li><a href="./storage">Storage</a></li>
               </#if>
-              <li><a href="/metrics">Metrics</a></li>
+              <li><a href="./metrics">Metrics</a></li>
               <#if showThreads == true>
-              <li><a href="/threads">Threads</a></li>
+              <li><a href="./threads">Threads</a></li>
               </#if>
               <#if showLogs == true>
-                  <li><a href="/logs">Logs</a></li>
+                  <li><a href="./logs">Logs</a></li>
               </#if>
             </ul>
             </#if>
             <ul class="nav navbar-nav navbar-right">
               <#if showOptions == true>
-              <li><a href="/options">Options</a></li>
+              <li><a href="./options">Options</a></li>
               </#if>
               <li><a href="http://drill.apache.org/docs/">Documentation</a>
               <#if showLogin == true >
-              <li><a href="/login">Log In</a>
+              <li><a href="./login">Log In</a>
               </#if>
               <#if showLogout == true >
-              <li><a href="/logout">Log Out (${loggedInUserName})</a>
+              <li><a href="./logout">Log Out (${loggedInUserName})</a>
               </#if>
             </ul>
           </div>
diff --git a/exec/java-exec/src/main/resources/rest/index.ftl b/exec/java-exec/src/main/resources/rest/index.ftl
index d1aa844b84d..b135d9b6631 100644
--- a/exec/java-exec/src/main/resources/rest/index.ftl
+++ b/exec/java-exec/src/main/resources/rest/index.ftl
@@ -14,7 +14,7 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
 
diff --git a/exec/java-exec/src/main/resources/rest/login.ftl b/exec/java-exec/src/main/resources/rest/login.ftl
index 15888361e41..92e1db45bf0 100644
--- a/exec/java-exec/src/main/resources/rest/login.ftl
+++ b/exec/java-exec/src/main/resources/rest/login.ftl
@@ -14,7 +14,7 @@
 </#macro>
 
 <#macro page_body>
-    <a href="/queries">back</a><br/>
+    <a href="./queries">back</a><br/>
     <div class="page-header"></div>
     <div align="center" class="table-responsive">
         <form role="form" name="input" action="/j_security_check" method="POST">
@@ -34,4 +34,4 @@
         </form>
     </div>
 </#macro>
-<@page_html/>
\ No newline at end of file
+<@page_html/>
diff --git a/exec/java-exec/src/main/resources/rest/logs/list.ftl b/exec/java-exec/src/main/resources/rest/logs/list.ftl
index 3d836dff342..cf7c5e22ca3 100644
--- a/exec/java-exec/src/main/resources/rest/logs/list.ftl
+++ b/exec/java-exec/src/main/resources/rest/logs/list.ftl
@@ -14,7 +14,7 @@
 </#macro>
 
 <#macro page_body>
-<a href="/queries">back</a><br/>
+<a href="./queries">back</a><br/>
 <div class="page-header">
 </div>
 
@@ -30,7 +30,7 @@
             <#list model as log>
             <tr>
                 <td>
-                    <a href="/log/${log.getName()}/content">
+                    <a href="./log/${log.getName()}/content">
                         <div style="height:100%;width:100%;white-space:pre-line">${log.getName()}</div>
                     </a>
                 </td>
@@ -52,4 +52,4 @@
 </#if>
 </#macro>
 
-<@page_html/>
\ No newline at end of file
+<@page_html/>
diff --git a/exec/java-exec/src/main/resources/rest/logs/log.ftl b/exec/java-exec/src/main/resources/rest/logs/log.ftl
index f5386bd2450..a76d3ac068e 100644
--- a/exec/java-exec/src/main/resources/rest/logs/log.ftl
+++ b/exec/java-exec/src/main/resources/rest/logs/log.ftl
@@ -14,12 +14,12 @@
 </#macro>
 
 <#macro page_body>
-<a href="/logs">back</a><br/>
+<a href="./logs">back</a><br/>
 <div class="page-header">
 </div>
 <h3>${model.getName()} <span class="badge alert-info">(last ${model.getMaxLines()} lines)</span></h3>
 <p>
-    <a href="/log/${model.getName()}/download">Download Full Log</a>
+    <a href="./log/${model.getName()}/download">Download Full Log</a>
 </p>
     <#if (model.getLines()?size > 0)>
     <pre>
@@ -34,4 +34,4 @@ ${line?html}
     </#if>
 </#macro>
 
-<@page_html/>
\ No newline at end of file
+<@page_html/>
diff --git a/exec/java-exec/src/main/resources/rest/metrics/metrics.ftl b/exec/java-exec/src/main/resources/rest/metrics/metrics.ftl
index 1600a2d8e94..4f586cdaf09 100644
--- a/exec/java-exec/src/main/resources/rest/metrics/metrics.ftl
+++ b/exec/java-exec/src/main/resources/rest/metrics/metrics.ftl
@@ -14,7 +14,7 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
   <div class="row">
@@ -161,4 +161,4 @@
   </script>
 </#macro>
 
-<@page_html/>
\ No newline at end of file
+<@page_html/>
diff --git a/exec/java-exec/src/main/resources/rest/options.ftl b/exec/java-exec/src/main/resources/rest/options.ftl
index 7ba12507b51..c8ab74c8fb6 100644
--- a/exec/java-exec/src/main/resources/rest/options.ftl
+++ b/exec/java-exec/src/main/resources/rest/options.ftl
@@ -14,7 +14,7 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
   <h4>System options</h4>
diff --git a/exec/java-exec/src/main/resources/rest/profile/list.ftl b/exec/java-exec/src/main/resources/rest/profile/list.ftl
index 1fcffb60f18..4abc58b3d75 100644
--- a/exec/java-exec/src/main/resources/rest/profile/list.ftl
+++ b/exec/java-exec/src/main/resources/rest/profile/list.ftl
@@ -14,7 +14,7 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
   <#if (model.getErrors()?size > 0) >
@@ -45,7 +45,7 @@
             <td>${query.getTime()}</td>
             <!--
             <td>
-              <a href="/profiles/${query.getQueryId()}">
+              <a href="./profiles/${query.getQueryId()}">
                 <div style="height:100%;width:100%">
                   ${query.getQueryId()}
                 </div>
@@ -53,12 +53,12 @@
             </td>
             -->
             <td>
-              <a href="/profiles/${query.getQueryId()}">
+              <a href="./profiles/${query.getQueryId()}">
               <div style="height:100%;width:100%;white-space:pre-line">${query.getUser()}</div>
               </a>
             </td> 
             <td>
-              <a href="/profiles/${query.getQueryId()}">
+              <a href="./profiles/${query.getQueryId()}">
               <div style="height:100%;width:100%;white-space:pre-line">${query.getQuery()}</div>
               </a>
             </td> 
@@ -103,7 +103,7 @@
           <td>${query.getTime()}</td>
           <!--
           <td>
-            <a href="/profiles/${query.getQueryId()}">
+            <a href="./profiles/${query.getQueryId()}">
               <div style="height:100%;width:100%">
                 ${query.getQueryId()}
               </div>
@@ -111,13 +111,13 @@
           </td>
           -->
           <td>
-            <a href="/profiles/${query.getQueryId()}">
+            <a href="./profiles/${query.getQueryId()}">
             <div style="height:100%;width:100%;white-space:pre-line">${query.getUser()}</div>
             </a>
           </td> 
           
           <td>
-            <a href="/profiles/${query.getQueryId()}">
+            <a href="./profiles/${query.getQueryId()}">
               <div style="height:100%;width:100%;white-space:pre-line">${query.getQuery()}</div>
             </a>
           </td>      
@@ -139,4 +139,4 @@
   </div>
 </#macro>
 
-<@page_html/>
\ No newline at end of file
+<@page_html/>
diff --git a/exec/java-exec/src/main/resources/rest/profile/profile.ftl b/exec/java-exec/src/main/resources/rest/profile/profile.ftl
index 95d7d56b67e..4a59677628c 100644
--- a/exec/java-exec/src/main/resources/rest/profile/profile.ftl
+++ b/exec/java-exec/src/main/resources/rest/profile/profile.ftl
@@ -23,7 +23,7 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
   <h3>Query and Planning</h3>
diff --git a/exec/java-exec/src/main/resources/rest/query/errorMessage.ftl b/exec/java-exec/src/main/resources/rest/query/errorMessage.ftl
index dbdcc9eabfc..036c880a8d3 100644
--- a/exec/java-exec/src/main/resources/rest/query/errorMessage.ftl
+++ b/exec/java-exec/src/main/resources/rest/query/errorMessage.ftl
@@ -14,11 +14,11 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
   <h2> Query Failed: An Error Occurred </h2>
   ${model}
 </#macro>
 
-<@page_html/>
\ No newline at end of file
+<@page_html/>
diff --git a/exec/java-exec/src/main/resources/rest/query/list.ftl b/exec/java-exec/src/main/resources/rest/query/list.ftl
index 9b64d18874e..d8985c06147 100644
--- a/exec/java-exec/src/main/resources/rest/query/list.ftl
+++ b/exec/java-exec/src/main/resources/rest/query/list.ftl
@@ -14,10 +14,10 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
   <h3>Under Construction.</h3>
 </#macro>
 
-<@page_html/>
\ No newline at end of file
+<@page_html/>
diff --git a/exec/java-exec/src/main/resources/rest/query/query.ftl b/exec/java-exec/src/main/resources/rest/query/query.ftl
index 5033aca4916..23dcfffd607 100644
--- a/exec/java-exec/src/main/resources/rest/query/query.ftl
+++ b/exec/java-exec/src/main/resources/rest/query/query.ftl
@@ -14,7 +14,7 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
   <div id="message" class="alert alert-info alert-dismissable" style="font-family: Courier;">
diff --git a/exec/java-exec/src/main/resources/rest/query/result.ftl b/exec/java-exec/src/main/resources/rest/query/result.ftl
index 7fe52a4f0ee..e2858a06b48 100644
--- a/exec/java-exec/src/main/resources/rest/query/result.ftl
+++ b/exec/java-exec/src/main/resources/rest/query/result.ftl
@@ -22,7 +22,7 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
   <#if model.isEmpty()>
diff --git a/exec/java-exec/src/main/resources/rest/status.ftl b/exec/java-exec/src/main/resources/rest/status.ftl
index c5992fb865c..7e9ae7b462e 100644
--- a/exec/java-exec/src/main/resources/rest/status.ftl
+++ b/exec/java-exec/src/main/resources/rest/status.ftl
@@ -14,7 +14,7 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
     <div class="alert alert-success">
       <strong>${model.getValue()}</strong>
diff --git a/exec/java-exec/src/main/resources/rest/storage/list.ftl b/exec/java-exec/src/main/resources/rest/storage/list.ftl
index ef9756178e5..e4423bcb596 100644
--- a/exec/java-exec/src/main/resources/rest/storage/list.ftl
+++ b/exec/java-exec/src/main/resources/rest/storage/list.ftl
@@ -14,7 +14,7 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
   <h4>Enabled Storage Plugins</h4>
@@ -28,7 +28,7 @@
                 ${plugin.getName()}
               </td>
               <td style="border:none;">
-                <a class="btn btn-primary" href="/storage/${plugin.getName()}">Update</a>
+                <a class="btn btn-primary" href="./storage/${plugin.getName()}">Update</a>
                 <a class="btn btn-default" onclick="doEnable('${plugin.getName()}', false)">Disable</a>
               </td>
             </tr>
@@ -50,7 +50,7 @@
                 ${plugin.getName()}
               </td>
               <td style="border:none;">
-                <a class="btn btn-primary" href="/storage/${plugin.getName()}">Update</a>
+                <a class="btn btn-primary" href="./storage/${plugin.getName()}">Update</a>
                 <a class="btn btn-primary" onclick="doEnable('${plugin.getName()}', true)">Enable</a>
               </td>
             </tr>
@@ -85,4 +85,4 @@
   </script>
 </#macro>
 
-<@page_html/>
\ No newline at end of file
+<@page_html/>
diff --git a/exec/java-exec/src/main/resources/rest/storage/update.ftl b/exec/java-exec/src/main/resources/rest/storage/update.ftl
index 5e7de5e90f2..d57a52e06f5 100644
--- a/exec/java-exec/src/main/resources/rest/storage/update.ftl
+++ b/exec/java-exec/src/main/resources/rest/storage/update.ftl
@@ -11,21 +11,21 @@
 
 <#include "*/generic.ftl">
 <#macro page_head>
-  <script src="/static/js/jquery.form.js"></script>
+  <script src="./static/js/jquery.form.js"></script>
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
   <h3>Configuration</h3>
-  <form id="updateForm" role="form" action="/storage/${model.getName()}" method="POST">
+  <form id="updateForm" role="form" action="./storage/${model.getName()}" method="POST">
     <input type="hidden" name="name" value="${model.getName()}" />
     <div class="form-group">
       <textarea class="form-control" id="config" rows="20" cols="50" name="config" style="font-family: Courier;">
       </textarea>
     </div>
-    <a class="btn btn-default" href="/storage">Back</a>
+    <a class="btn btn-default" href="./storage">Back</a>
     <button class="btn btn-default" type="submit" onclick="doUpdate();">
       <#if model.exists()>Update<#else>Create</#if>
     </button>
@@ -42,11 +42,11 @@
   <div id="message" class="hidden alert alert-info">
   </div>
   <script>
-    $.get("/storage/${model.getName()}.json", function(data) {
+    $.get("./storage/${model.getName()}.json", function(data) {
       $("#config").val(JSON.stringify(data.config, null, 2));
     });
     $("#enabled").click(function() {
-      $.get("/storage/${model.getName()}/enable/<#if model.enabled()>false<#else>true</#if>", function(data) {
+      $.get("./storage/${model.getName()}/enable/<#if model.enabled()>false<#else>true</#if>", function(data) {
         $("#message").removeClass("hidden").text(data.result).alert();
         setTimeout(function() { location.reload(); }, 800);
       });
@@ -77,7 +77,7 @@
     function deleteFunction() {
       var temp = confirm("Are you sure?");
       if (temp == true) {
-        $.get("/storage/${model.getName()}/delete", function(data) {
+        $.get("./storage/${model.getName()}/delete", function(data) {
           window.location.href = "/storage";
         });
       }
@@ -85,4 +85,4 @@
   </script>
 </#macro>
 
-<@page_html/>
\ No newline at end of file
+<@page_html/>
diff --git a/exec/java-exec/src/main/resources/rest/threads/threads.ftl b/exec/java-exec/src/main/resources/rest/threads/threads.ftl
index e393164d64e..c7b1d82e3c9 100644
--- a/exec/java-exec/src/main/resources/rest/threads/threads.ftl
+++ b/exec/java-exec/src/main/resources/rest/threads/threads.ftl
@@ -14,7 +14,7 @@
 </#macro>
 
 <#macro page_body>
-  <a href="/queries">back</a><br/>
+  <a href="./queries">back</a><br/>
   <div class="page-header">
   </div>
   <div id="mainDiv" role="main">
@@ -32,4 +32,4 @@
   </script>
 </#macro>
 
-<@page_html/>
\ No newline at end of file
+<@page_html/>
