Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2025-06-13 12:54:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge 13bc22b1f3 into 3b0efcac9d

Browse Source
This commit is contained in:
Vaclav Valicek 2017-12-30 13:19:06 +00:00 committed by GitHub
commit 0a6197beef
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/laminar.cpp
View File

@ -193,6 +193,7 @@ void Laminar::sendStatus(LaminarClient* client) {
}); });
} }
j.set("latestNum", int(buildNums[client->scope.job])); j.set("latestNum", int(buildNums[client->scope.job]));
j.set("skin", getenv("LAMINAR_SKIN") ?: "");
j.startArray("artifacts"); j.startArray("artifacts");
populateArtifacts(j, client->scope.job, client->scope.num); populateArtifacts(j, client->scope.job, client->scope.num);
j.EndArray(); j.EndArray();

14
src/resources/index.html
View File

@ -48,6 +48,10 @@
right: 10px; right: 10px;
padding: 20px; padding: 20px;
} }
pre.black {
background-color: black;
color: white;
}
</style> </style>
</head> </head>
<body> <body>
@ -106,9 +110,9 @@
</div> </div>
</div> </div>
</div></div> </div></div>
</div></div> </div></div>
</div></template> </div></template>
<template id="jobs"><div> <template id="jobs"><div>
<ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li class="active">Jobs</li></ol> <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li class="active">Jobs</li></ol>
<div class="container-fluid"><div class="row"> <div class="container-fluid"><div class="row">
@ -131,7 +135,7 @@
</div> </div>
</div></div> </div></div>
</div></template> </div></template>
<template id="job"><div> <template id="job"><div>
<ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li><router-link to="/jobs">Jobs</router-link></li><li class="active">{{$route.params.name}}</li></ol></ol> <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li><router-link to="/jobs">Jobs</router-link></li><li class="active">{{$route.params.name}}</li></ol></ol>
<div class="container-fluid"> <div class="container-fluid">
@ -176,7 +180,7 @@
</div></div> </div></div>
</div> </div>
</div></template> </div></template>
<template id="run"><div> <template id="run"><div>
<ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li><router-link to="/jobs">Jobs</router-link></li><li><router-link :to="'/jobs/'+$route.params.name">{{$route.params.name}}</router-link></li><li class="active">#{{$route.params.number}}</li></ol></ol> <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li><router-link to="/jobs">Jobs</router-link></li><li><router-link :to="'/jobs/'+$route.params.name">{{$route.params.name}}</router-link></li><li class="active">#{{$route.params.number}}</li></ol></ol>
<div class="container-fluid"> <div class="container-fluid">
@ -215,7 +219,7 @@
<div class="row"><div class="col-xs-12"> <div class="row"><div class="col-xs-12">
<button type="button" class="btn btn-default btn-xs pull-right" :class="{'active':autoscroll}" v-on:click="autoscroll = !autoscroll" style="margin-top:10px">Autoscroll</button> <button type="button" class="btn btn-default btn-xs pull-right" :class="{'active':autoscroll}" v-on:click="autoscroll = !autoscroll" style="margin-top:10px">Autoscroll</button>
<h4>Console output</h4> <h4>Console output</h4>
<pre v-html="log"></pre> <pre :class="job.skin" v-html="log"></pre>
</div></div> </div></div>
</div> </div>
</div></template> </div></template>