Skip to content

Commit

Permalink
Prettier tables.
Browse files Browse the repository at this point in the history
- Striping.
- Correctly align approva icons.
- Show temporary repository in build request table if sync back option
  was not provided.
  • Loading branch information
ktf committed Jul 7, 2013
1 parent bbc3def commit ae827d4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
7 changes: 4 additions & 3 deletions buildrequests.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</div>
<div class="row-fluid">
<div class="container-fluid">
<table id="buildrequests" class="table">
<table id="buildrequests" class="table table-striped table-bordered">
<thead>
<tr><th>Id</th><th>Release</th><th>Package</th><th>Repository</th><th>Architecture</th><th>PKGTOOLS</th><th>CMSDIST</th><th>Machine</th></tr>
</thead>
Expand All @@ -63,7 +63,8 @@
var table = "";
var tableRow = "<tr><td>{{id}}</td><td>{{release}}</td>" +
"<td><a href='https://github.com/{{CMSDIST_USER_REPO}}/cmsdist/blob/{{CMSDIST_BRANCH}}/{{payload.package}}.spec'>{{payload.package}}</a></td>" +
"<td><a href='http://cmsrep.cern.ch/cmssw/{{payload.repository}}/'>{{payload.repository}}</a></td>" +
"<td><a href='http://cmsrep.cern.ch/cmssw/{{payload.repository}}{{^payload.syncBack}}.{{payload.tmpRepository}}{{/payload.syncBack}}/'>{{payload.repository}}" +
"{{^payload.syncBack}}.{{payload.tmpRepository}}{{/payload.syncBack}}</a></td>" +
"<td><a href='http://cmsrep.cern.ch/cmssw/{{payload.repository}}/RPMS/{{architecture}}/'>{{architecture}}</a></td>" +
"<td><a href='https://github.com/{{PKGTOOLS_USER_REPO}}/pkgtools/tree/{{PKGTOOLS_BRANCH}}'>{{payload.PKGTOOLS}}</a></td>" +
"<td><a href='https://github.com/{{CMSDIST_USER_REPO}}/cmsdist/tree/{{CMSDIST_BRANCH}}'>{{payload.CMSDIST}}</a></td>" +
Expand Down Expand Up @@ -116,7 +117,7 @@
$(document).ready(function() {

$(window).bind('hashchange', mainLoop);
var userInfoPromise = $.post("api/auth").done(function(d,a,b) {
var userInfoPromise = $.get("api/auth").done(function(d,a,b) {
$("#formbox").attr("action", "https://github.com/" + d["repository"] + "/search");
$("#userInfo").html("Welcome " + d["firstname"] + "<b class='caret'></b>");
$("#userCern").html("<a href='#'>CERN: " + d["user"] + "</a>");
Expand Down
2 changes: 1 addition & 1 deletion default.css
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ font-size: 18px;
#myTable {
width: 80%;
}
table {
table thead{
background-color: rgb(250, 250, 251);
border: 1px solid #ddd;
border-collapse: collapse;
Expand Down
10 changes: 5 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
var emptyTableTemplate = "<h2 class='releaseLink'>" +
"Open topics for <a class='relLink' href='https://github.com/{{repository}}/tree/{{current_branch}}'>{{current_branch}}</a>" +
" branch.</h2>" +
"<table class='table table-condensed'><thead></thead><tbody></tbody></table>" +
"<table class='table table-striped table-condensed table-bordered'><thead></thead><tbody></tbody></table>" +
"{{#has_fork}}<a class='actionLink' target='_blank' href='https://github.com/{{github_user}}" +
"/{{github_repo}}/pull/new/{{github_owner}}:{{current_branch}}...{{github_user}}:{{current_branch}}'>" +
"Create a new pull request for {{current_branch}}</a>{{/has_fork}}" +
Expand Down Expand Up @@ -149,13 +149,13 @@
{
var signatures = [];
var signatureValues = {
"signed": "<td align='middle' class='approved'>&#9679;</td>",
"pending": "<td align='middle' class='pending'>&#9650;</td>",
"rejected": "<td align='middle' class='rejected'>&#9632;</td>",
"signed": "<td style='text-align: center;' align='middle' class='approved'>&#9679;</td>",
"pending": "<td style='text-align: center;' align='middle' class='pending'>&#9650;</td>",
"rejected": "<td style='text-align: center;' align='middle' class='rejected'>&#9632;</td>",
}
// Reset all signatures.
for (var si = 0; si < Object.keys(categories).length; ++si)
signatures[si] = "<td align='middle'>-</td>";
signatures[si] = "<td style='text-align: center;' align='middle'>-</td>";
var canSign = false;
// Change to active those for which we have a signature
for (var signature in newSignatures)
Expand Down

0 comments on commit ae827d4

Please sign in to comment.