Skip to content

Commit

Permalink
[HWKMETRICS-128] Update the display to have the git SHA1 on a separat…
Browse files Browse the repository at this point in the history
…e row and smaller font.
  • Loading branch information
Stefan Negrea committed Aug 27, 2015
1 parent 664f742 commit 2ec3abd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
6 changes: 2 additions & 4 deletions api/metrics-api-jaxrs-1.1/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ <h1>Hawkular Metrics</h1>

<h3>A time series metrics engine based on Cassandra</h3>

<p>
<span id="implementation-version"></span>
<span id="built-from-git-sha1"></span>
</p>
<p id="implementation-version"></p>
<p id="built-from-git-sha1" style="font-size:12px;"></p>

<p id="status">Status: <i>Checking...</i></p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion api/metrics-api-jaxrs-1.1/src/main/webapp/status.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function updateStatus() {
statusJson = JSON.parse(httpRequest.responseText);
document.getElementById("status").innerHTML = "Metrics Service :" + statusJson.MetricsService;
document.getElementById("implementation-version").innerHTML = statusJson["Implementation-Version"];
document.getElementById("built-from-git-sha1").innerHTML = "(" + statusJson["Built-From-Git-SHA1"] + ")";
document.getElementById("built-from-git-sha1").innerHTML = "(Git SHA1 - " + statusJson["Built-From-Git-SHA1"] + ")";
} else if (httpRequest.status === 404 || httpRequest.status === 503) {
document.getElementById("status").innerHTML = "The server is not available";
} else {
Expand Down
6 changes: 2 additions & 4 deletions api/metrics-api-jaxrs/src/main/webapp/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@
<h1>Hawkular Metrics</h1>
<h3>A time series metrics engine based on Cassandra</h3>

<p>
<span id="implementation-version"></span>
<span id="built-from-git-sha1"></span>
</p>
<p id="implementation-version"></p>
<p id="built-from-git-sha1" style="font-size:12px;"></p>

<p id="status">Status: <i>Checking...</i></p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion api/metrics-api-jaxrs/src/main/webapp/static/status.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function updateStatus() {
statusJson = JSON.parse(httpRequest.responseText);
document.getElementById("status").innerHTML = "Metrics Service :" + statusJson.MetricsService;
document.getElementById("implementation-version").innerHTML = statusJson["Implementation-Version"];
document.getElementById("built-from-git-sha1").innerHTML = "(" + statusJson["Built-From-Git-SHA1"] + ")";
document.getElementById("built-from-git-sha1").innerHTML = "(Git SHA1 - " + statusJson["Built-From-Git-SHA1"] + ")";
} else if (httpRequest.status === 404 || httpRequest.status === 503) {
document.getElementById("status").innerHTML = "The server is not available";
} else {
Expand Down

0 comments on commit 2ec3abd

Please sign in to comment.