Skip to content

WIP: Made UI links relative. #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joerg84 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: Made UI links relative. #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions exec/java-exec/src/main/resources/rest/error.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
language governing permissions and limitations under the License. -->

<html>
<a href="/queries">back</a><br />
<a href="./queries">back</a><br />

<pre>
${model.printStackTrace()}
</pre>



<html>
<html>
32 changes: 16 additions & 16 deletions exec/java-exec/src/main/resources/rest/generic.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion exec/java-exec/src/main/resources/rest/index.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions exec/java-exec/src/main/resources/rest/login.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -34,4 +34,4 @@
</form>
</div>
</#macro>
<@page_html/>
<@page_html/>
6 changes: 3 additions & 3 deletions exec/java-exec/src/main/resources/rest/logs/list.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand All @@ -52,4 +52,4 @@
</#if>
</#macro>

<@page_html/>
<@page_html/>
6 changes: 3 additions & 3 deletions exec/java-exec/src/main/resources/rest/logs/log.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -34,4 +34,4 @@ ${line?html}
</#if>
</#macro>

<@page_html/>
<@page_html/>
4 changes: 2 additions & 2 deletions exec/java-exec/src/main/resources/rest/metrics/metrics.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -161,4 +161,4 @@
</script>
</#macro>

<@page_html/>
<@page_html/>
2 changes: 1 addition & 1 deletion exec/java-exec/src/main/resources/rest/options.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 8 additions & 8 deletions exec/java-exec/src/main/resources/rest/profile/list.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) >
Expand Down Expand Up @@ -45,20 +45,20 @@
<td>${query.getTime()}</td>
<!--
<td>
<a href="/profiles/${query.getQueryId()}">
<a href="./profiles/${query.getQueryId()}">
<div style="height:100%;width:100%">
${query.getQueryId()}
</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.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>
Expand Down Expand Up @@ -103,21 +103,21 @@
<td>${query.getTime()}</td>
<!--
<td>
<a href="/profiles/${query.getQueryId()}">
<a href="./profiles/${query.getQueryId()}">
<div style="height:100%;width:100%">
${query.getQueryId()}
</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.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>
Expand All @@ -139,4 +139,4 @@
</div>
</#macro>

<@page_html/>
<@page_html/>
2 changes: 1 addition & 1 deletion exec/java-exec/src/main/resources/rest/profile/profile.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions exec/java-exec/src/main/resources/rest/query/errorMessage.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/>
<@page_html/>
4 changes: 2 additions & 2 deletions exec/java-exec/src/main/resources/rest/query/list.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/>
<@page_html/>
2 changes: 1 addition & 1 deletion exec/java-exec/src/main/resources/rest/query/query.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;">
Expand Down
2 changes: 1 addition & 1 deletion exec/java-exec/src/main/resources/rest/query/result.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()>
Expand Down
2 changes: 1 addition & 1 deletion exec/java-exec/src/main/resources/rest/status.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions exec/java-exec/src/main/resources/rest/storage/list.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -85,4 +85,4 @@
</script>
</#macro>

<@page_html/>
<@page_html/>
Loading