You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/10/04 15:44:43 UTC
[ignite-teamcity-bot] branch master updated: Make forms grouping
more clear: Styling pages
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new f7ef786 Make forms grouping more clear: Styling pages
f7ef786 is described below
commit f7ef7863755a2a7a860cb17ab70dd4f698c4e88e
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Thu Oct 4 18:44:35 2018 +0300
Make forms grouping more clear: Styling pages
---
ignite-tc-helper-web/src/main/webapp/compare.html | 13 +++++--
.../src/main/webapp/css/style-1.5.css | 39 +++++++++++++++++--
ignite-tc-helper-web/src/main/webapp/index.html | 45 +++++++++++++---------
ignite-tc-helper-web/src/main/webapp/services.html | 23 +++++++----
4 files changed, 87 insertions(+), 33 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/webapp/compare.html b/ignite-tc-helper-web/src/main/webapp/compare.html
index dfdb318..7ae22c0 100644
--- a/ignite-tc-helper-web/src/main/webapp/compare.html
+++ b/ignite-tc-helper-web/src/main/webapp/compare.html
@@ -72,10 +72,15 @@
</head>
<body>
-Enlist tests:
-<div id="testsSet"></div>
-Compare tests sets:
-<div id="compareTestsSet"></div>
+<div class="formgroup">
+ Enlist tests:
+ <div id="testsSet"></div>
+</div>
+
+<div class="formgroup">
+ Compare tests sets:
+ <div id="compareTestsSet"></div>
+</div>
<br>
<div id="loadStatus"></div>
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 caa863d..dec409c 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
@@ -1,5 +1,5 @@
body {
- font-family: Arial;
+ font-family: Arial, sans-serif;
font-size: 14px;
font-style: normal;
font-variant: normal;
@@ -7,15 +7,17 @@ body {
}
input, div {
- font-family: Arial;
+ font-family: Arial, sans-serif;
font-size: 14px;
font-style: normal;
font-variant: normal;
font-weight: 500;
+ margin-left: 3px;
+ margin-right: 3px;
}
table, tr, td {
- font-family: Arial;
+ font-family: Arial, sans-serif;
font-size: 14px;
font-style: normal;
font-variant: normal;
@@ -95,6 +97,37 @@ table.stat tr:nth-child(odd) { background-color: #fafaff; }
float: right;
}
+input[type=button], input[type=submit], button {
+ background: #12AD5E;
+ border: none;
+ height: 24px;
+ color: #FFF;
+ font-weight: bold;
+ font-family: sans-serif;
+ margin: 5px;
+ border-radius: 3px;
+ box-shadow: 3px 2px 6px -2px rgba(0,0,0,0.64);
+ cursor:pointer;
+}
+
+form, .formgroup {
+ // width: 720px;
+ margin: 0px auto;
+ padding: 5px;
+ background: #FFF;
+ margin-top: 20px;
+ border-radius: 3px;
+ box-shadow: 3px 2px 6px -2px rgba(0,0,0,0.64);
+}
+
+html {
+ min-height: 100%;
+ //background: radial-gradient(ellipse at center, #FFFFFF 0%, #f2fff0 100%);
+ font-family: Arial, sans-serif;
+ font-size: 14px;
+ color: #000;
+}
+
form ul
{
font-size:100%;
diff --git a/ignite-tc-helper-web/src/main/webapp/index.html b/ignite-tc-helper-web/src/main/webapp/index.html
index ba81507..3e2cfff 100644
--- a/ignite-tc-helper-web/src/main/webapp/index.html
+++ b/ignite-tc-helper-web/src/main/webapp/index.html
@@ -63,17 +63,17 @@ function showCurrentBranchesData(result) {
var res = "";
for (var i = 0; i < result.length; i++) {
var id = result[i];
- res += "<a href='current.html?branch=" + id + "'>Latest (" + id + ")</a>";
- res += " <a href='current.html?branch=" + id + "&checkAllLogs=true' title='With logs processing'>(" + id + " + logs)</a>";
+ // res += "<div class='formgroup'>";
+ res += id + ":";
+ res += "<a href='current.html?branch=" + id + "'><button>Latest (" + id + ")</button></a>";
+ res += " <a href='current.html?branch=" + id + "&checkAllLogs=true' title='With logs processing'><button>Latest (" + id + " + logs)</button></a>";
+ res += " <a href='all.html?branch=" + id + "'><button title='Failures from last 10 runs merged'>History (" + id + ")</button></a>";
+ // res += "</div>";
res += "<br>";
}
- res += "<br>";
- for (var j = 0; j < result.length; j++) {
- var id2 = result[j];
- res += " <a href='all.html?branch=" + id2 + "'>History (" + id2 + ")</a>";
- res += "<br>";
- }
+ res += "</table>";
+
$("#branchesStatus").html(res);
}
@@ -118,11 +118,25 @@ function showBuildsOnServers(result) {
</script>
</head>
<body>
-Current Failed Tests: <br>
-<div id="branchesStatus"></div>
+<div class="formgroup">
+ Monitoring. Current Failed Tests: <br>
+ <div id="branchesStatus"></div>
+</div>
<br>
-Statistics: <br>
+<div class="formgroup">
+ Contribution. Check branch/PR:
+ <div id="suitesForPrCheck"></div>
+</div>
+<br>
+
+<div class="formgroup">
+ Check build: <br>
+ <div id="buildsCheck"></div>
+</div>
+<br>
+
+Statistics: <br>
<!--<a href="chart.html">Build metrics daily history</a><br>
<a href="restpretty.html?url=top/failing">Top failing tests</a> (JSON) <br>
<a href="restpretty.html?url=top/longRunning">Top long running tests</a> (JSON) <br>
@@ -130,15 +144,8 @@ Statistics: <br>
<a href="./status">Current Build Status (obsolete)</a><br>
<br>-->
<a href="comparison.html">Comparison master's branch in the date interval</a><br>
-<br>
-Check branch/PR: <br>
-<div id="suitesForPrCheck"></div>
-<br>
-
-Check build: <br>
-<div id="buildsCheck"></div>
-<br>
+Other: <br>
<a href="ignval.html">Ignite Log Values pretty-print</a>
<a href="monitoring.html">Bot moniroting page</a> <br>
<div id="loadStatus"></div>
diff --git a/ignite-tc-helper-web/src/main/webapp/services.html b/ignite-tc-helper-web/src/main/webapp/services.html
index 228d1af..f913fa4 100644
--- a/ignite-tc-helper-web/src/main/webapp/services.html
+++ b/ignite-tc-helper-web/src/main/webapp/services.html
@@ -15,6 +15,9 @@
<script src="js/common-1.6.js"></script>
<script src="js/testfails-2.1.js"></script>
+ <style>
+
+ </style>
<script>
$(document).ready(function() {
$.getScript("js/common-1.6.js", function(data, textStatus, jqxhr){ });
@@ -167,7 +170,7 @@ function showFormAndSuitesForPrCheck(result) {
res += "Server: <input type='text' name='serverId' value=" + chainAtServer.serverId + " readonly>";
res += "Chain: <input type='text' name='suiteId' value=" + chainAtServer.suiteId + ">";
res += "Base branch: <input class='branchForTc" + chainAtServer.serverId +
- "' type='text' name='baseBranchForTc' title='Etalon branch, e.g refs/heads/master'> ";
+ "' type='text' name='baseBranchForTc' title='Etalon branch to take base data from, e.g refs/heads/master'> ";
res += "<b>Branch:</b> <input class='branchForTc" + chainAtServer.serverId +
"' type='text' name='branchForTc' title='Tested branch, e.g. pull/4790/head or ignite-9349' required> ";
res += "<input type='submit' name='action' value='Latest' title='Show latest runs'>";
@@ -183,16 +186,22 @@ function showFormAndSuitesForPrCheck(result) {
<body>
<div id="loadStatus"></div>
-Trigger new TeamCity Run All for a PR/Branch: <br>
-<div id="suitesForRunAll"></div>
-<br><br>
+<div class="formgroup">
+ Trigger new TeamCity Run All for a PR/Branch: <br>
+ <div id="suitesForRunAll"></div>
+</div>
+<br>
-Notify JIRA (save TC Bot visa to a ticket comment): <br>
-<div id="notifyJira"></div><br>
+<div class="formgroup">
+ Notify JIRA (save TC Bot visa to a ticket comment): <br>
+ <div id="notifyJira"></div>
+</div>
+<br>
-See results of branch/PR TeamCity Run All: <br>
+<br>Check results of branch/PR TeamCity Run All:
<div id="suitesForPrCheck"></div>
+
<!--Notify GitHub: <br>
<div id="notifyGitHub">
<form>