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/05 19:31:10 UTC
[ignite-teamcity-bot] branch ignite-9800 updated: IGNITE-9800: More
UI improvements
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
The following commit(s) were added to refs/heads/ignite-9800 by this push:
new 5f86e7c IGNITE-9800: More UI improvements
5f86e7c is described below
commit 5f86e7c975517e49a1fe96713341a835a08396dd
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Oct 5 22:31:07 2018 +0300
IGNITE-9800: More UI improvements
---
ignite-tc-helper-web/src/main/webapp/index.html | 9 ++---
ignite-tc-helper-web/src/main/webapp/prs.html | 46 +++++++++++++++++++------
2 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/webapp/index.html b/ignite-tc-helper-web/src/main/webapp/index.html
index d49a69a..731b77b 100644
--- a/ignite-tc-helper-web/src/main/webapp/index.html
+++ b/ignite-tc-helper-web/src/main/webapp/index.html
@@ -44,10 +44,11 @@ function loadData() {
</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>
- <a href="index0.html"><button class="idxpgbutton">🛡<br>See obsolete index page</button></a>
+ <div style="text-align: center">You need to</div>
+ <a href="prs.html"><button class="idxpgbutton"><font size="30px">🔍</font><br>Inspect Contribution</button></a>
+ <a href="guard.html"><button class="idxpgbutton"><font size="30px">🛡️</font><br>Monitor TC state</button></a>
+ <a href="comparison.html"><button class="idxpgbutton"><font size="30px">📉</font><br>See test progres</button></a>
+ <a href="index0.html"><button class="idxpgbutton"><font size="30px">λ</font><br>I like old home page</button></a>
</div>
<div id="loadStatus"></div>
diff --git a/ignite-tc-helper-web/src/main/webapp/prs.html b/ignite-tc-helper-web/src/main/webapp/prs.html
index 477e673..95bc579 100644
--- a/ignite-tc-helper-web/src/main/webapp/prs.html
+++ b/ignite-tc-helper-web/src/main/webapp/prs.html
@@ -29,6 +29,11 @@
$( "#accordion" ).accordion({
heightStyle: "fill"
});
+ $(window).resize(function(){
+ // update accordion height
+ $( ".accordion" ).accordion( "resize" )
+ });
+
loadData();
});
@@ -69,24 +74,27 @@
if (srvId != "apache")
return;
- let tableForSrv = $('#serverContributions-' + srvId);
+
$.ajax({
url: "rest/visa/contributions?serverId="+srvId,
success:
function (result) {
- showTable(tableForSrv, result)
+ showTable(result, srvId)
}
});
}
- function showTable(tableForSrv, result) {
+ function showTable( result, srvId) {
- tableForSrv.dataTable().fnDestroy();
+ let tableForSrv = $('#serverContributions-' + srvId);
+
+ tableForSrv.dataTable().fnDestroy();
tableForSrv.DataTable({
data: result,
- bSort: false,
- order: [[0, 'asc']],
+ //"iDisplayLength": 100,
+ //"dom": '<lf<t>ip>',
+ //"dom": '<"wrapper"flipt>',
columns: [
{
"data": "prNumber",
@@ -94,11 +102,26 @@
}
, {
"data": "prTitle",
- title: "prTitle"
+ title: "Title"
},
{
"data": "prAuthor",
- title: "prAuthor"
+ title: "Author"
+ },
+ {
+ "data": "prNumber",
+ title: "Existing RunAll",
+ "render": function(data, type, row, meta){
+ if(type === 'display'){
+ data = '<a href="/pr.html?serverId='+srvId+'&' +
+ //todo customizable suite
+ 'suiteId=IgniteTests24Java8_RunAll' +
+ //'&baseBranchForTc=' +
+ '&branchForTc=pull%2F' +data+ '%2Fhead&action=Latest"><button>Check build for pull/' + data + '/head</button></a>';
+ }
+
+ return data;
+ }
}
]
});
@@ -244,9 +267,10 @@
<table id="serverContributions-apache" class="ui-widget ui-widget-content">
<thead>
<tr class="ui-widget-header ">
- <th>PR Number</th>
- <th>PR Title</th>
- <th>PR Author</th>
+ <th>...</th>
+ <th>Loading</th>
+ <th>...</th>
+ <th>.</th>
<!--
<th>Login</th>
<th>Password</th>-->