This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-9800 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit 7c22b83735c7741638eac8ce22b800cb6647a2a6 Author: Dmitriy Pavlov <[email protected]> AuthorDate: Fri Oct 5 13:27:52 2018 +0300 IGNITE-9800: skeleton of page --- .../src/main/webapp/css/style-1.5.css | 6 +++ ignite-tc-helper-web/src/main/webapp/index2.html | 56 ++++++++++++++++++++++ ignite-tc-helper-web/src/main/webapp/pr.html | 12 ++--- 3 files changed, 68 insertions(+), 6 deletions(-) diff --git a/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css b/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css index 77c8508..d670800 100644 --- a/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css +++ b/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css @@ -127,6 +127,12 @@ form, .formgroup { box-shadow: 3px 2px 6px -2px rgba(0,0,0,0.64); } +.idxpgbutton { + width: 100px; + min-height: 100px; + height: 100px; +} + html { min-height: 100%; //background: radial-gradient(ellipse at center, #FFFFFF 0%, #f2fff0 100%); diff --git a/ignite-tc-helper-web/src/main/webapp/index2.html b/ignite-tc-helper-web/src/main/webapp/index2.html new file mode 100644 index 0000000..dfbc168 --- /dev/null +++ b/ignite-tc-helper-web/src/main/webapp/index2.html @@ -0,0 +1,56 @@ +<html> +<head> + <title>Ignite Teamcity Helper</title> + <link rel="icon" href="img/leaf-icon-png-7066.png"> + + <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css";> + + <link rel="stylesheet" href="css/style-1.5.css"> + + <script src="https://code.jquery.com/jquery-1.12.4.js";></script> + <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js";></script> + + <script src="js/common-1.6.js"></script> + <script> +$(document).ready(function() { + $.getScript("js/common-1.6.js", function(data, textStatus, jqxhr){ }); + + $( document ).tooltip(); + loadData(); +}); + +function loadData() { + $("#loadStatus").html("<img src='https://www.wallies.com/filebin/images/loading_apple.gif' width=20px height=20px> Please wait"); + + $("#version").html(" " + "<a href=\"monitoring.html\">TC Bot Moniroting Page</a> <br>"); + $.ajax({ + url: "rest/branches/version", + success: showVersionInfo, + error: showErrInLoadStatus + }); + + + $.ajax({ + url: "rest/branches/getServerIds", + success: function(result) { + $("#loadStatus").html(""); + }, + error: showErrInLoadStatus + }); +} + + +</script> +</head> +<body> +<div class="formgroup" style="text-align: center"> + <div style="text-align: center">I Want to</div> + <a href="prs.html"><button class="idxpgbutton">🔍<br>Inspect Contribution</button></a> + <a href="guard.html"><button class="idxpgbutton">🛡<br>Monitor TC state</button></a> +</div> + +<div id="loadStatus"></div> +<div id="version"></div> + +</body> +</html> \ No newline at end of file diff --git a/ignite-tc-helper-web/src/main/webapp/pr.html b/ignite-tc-helper-web/src/main/webapp/pr.html index 70d71ce..3988da3 100644 --- a/ignite-tc-helper-web/src/main/webapp/pr.html +++ b/ignite-tc-helper-web/src/main/webapp/pr.html @@ -63,12 +63,12 @@ function checkForUpdate() { $.ajax({ url: curFailuresUrl, - success: function(result) { - if (g_shownDataHashCodeHex!="" && isDefinedAndFilled(result.hashCodeHex)) { - if(g_shownDataHashCodeHex==result.hashCodeHex) { - var updRunning = isDefinedAndFilled(result.runningUpdates) && result.runningUpdates>0 + success: function (result) { + if (g_shownDataHashCodeHex !== "" && isDefinedAndFilled(result.hashCodeHex)) { + if (g_shownDataHashCodeHex === result.hashCodeHex) { + var updRunning = isDefinedAndFilled(result.runningUpdates) && result.runningUpdates > 0; var fastCheckNeeded = result.updateRequired || updRunning; - var ms = fastCheckNeeded ? 3000 : 30000 ; + var ms = fastCheckNeeded ? 3000 : 30000; setTimeout(checkForUpdate, ms); @@ -93,7 +93,7 @@ function loadData() { url: curFailuresUrl, success: function(result) { if(result.updateRequired || (isDefinedAndFilled(result.runningUpdates) && result.runningUpdates>0)) { - setTimeout(checkForUpdate, 3000) + setTimeout(checkForUpdate, 3000); $("#loadStatus").html("<img src='https://www.wallies.com/filebin/images/loading_apple.gif' width=20px height=20px> Updating"); } else { $("#loadStatus").html("");
