deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix Information tab in build view

Browse source
This commit is contained in:
Dmitry Khomutov 2016-07-10 14:33:18 +06:00
parent 72d84c94f6
commit f86834b02f
2 changed files with 6 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
public/assets/js/build.js
View file

@ -33,7 +33,7 @@ var Build = Class.extend({
$('.build-started').data('date', self.buildData.started ? self.buildData.started : '');
$('.build-finished').data('date', self.buildData.finished ? self.buildData.finished : '');
$('#log pre').html(self.buildData.log);
$('.errors-table tbody').html(self.buildData.error_html);
$('.errors-table tbody').append(self.buildData.error_html);
if (self.buildData.errors == 0) {
$('.errors-label').hide();
@ -79,7 +79,7 @@ var Build = Class.extend({
var fullUri = window.PHPCI_URL + uri;
if (name == 'build-updated') {
fullUri = window.PHPCI_URL + 'build/data/' + self.buildId;
fullUri = window.PHPCI_URL + 'build/data/' + self.buildId + '?since=' + self.buildData.since;
}
$.ajax({
@ -161,20 +161,20 @@ var Build = Class.extend({
var output = plugin.render();
if (!plugin.box) {
output = $('<div class="box-body"></div>').html(output);
output = $('<div class="box-body"></div>').append(output);
}
var container = $('<div></div>').addClass('ui-plugin ' + plugin.css).attr('id', plugin.id);
var content = $('<div></div>').html(output);
var content = $('<div></div>').append(output);
content.addClass('box box-default');
if (plugin.title) {
content.prepend('<div class="box-header"><h3 class="box-title">'+plugin.title+'</h3></div>');
}
container.html(content);
container.append(content);
$('#plugins').html(container);
$('#plugins').append(container);
},
UiPlugin: Class.extend({

30
src/PHPCI/View/layout.phtml
View file

@ -202,36 +202,6 @@
<i class="fa fa-<?php print $project->getIcon(); ?>"></i>
<span><?php print $project->getTitle(); ?></span>
</a>
<?php /* <ul class="treeview-menu">
<li>
<a href="<?php print PHPCI_URL; ?>project/view/<?php print $project->getId(); ?>">
<i class="fa fa-angle-double-right"></i> <?php Lang::out('view'); ?>
</a>
</li>
<li>
<a href="<?php print PHPCI_URL; ?>project/build/<?php print $project->getId(); ?>">
<i class="fa fa-angle-double-right"></i> <?php Lang::out('build_now'); ?>
</a>
</li>
<?php if ($this->User()->getIsAdmin()): ?>
<li>
<a href="<?php print PHPCI_URL; ?>project/edit/<?php print $project->getId(); ?>">
<i class="fa fa-angle-double-right"></i> <?php Lang::out('edit_project'); ?>
</a>
</li>
<li>
<a href="<?php print PHPCI_URL; ?>project/delete/<?php print $project->getId(); ?>">
<i class="fa fa-angle-double-right"></i> <?php Lang::out('delete_project'); ?>
</a>
</li>
<?php endif; ?>
</ul>
*/ ?>
</li>
<?php endforeach; ?>
</ul>