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

Build sources instead of 'Manual' word.

Browse source
This commit is contained in:
Dmitry Khomutov 2017-04-13 22:00:29 +07:00
commit 145670acde
25 changed files with 266 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/PHPCensor/View/Build/view.phtml
View file

@ -78,10 +78,16 @@
<div class="box-body no-padding">
<table class="table">
<tr>
<th><?php Lang::out('build_source'); ?></th>
<td style="text-align: right">
<?php Lang::out($build->getSourceHumanize()); ?>
</td>
</tr>
<tr>
<th><?php Lang::out('commit'); ?></th>
<td style="text-align: right">
<a target="_blank" href="<?php print $build->getCommitLink(); ?>">
<a target="_blank" href="<?= $build->getCommitLink(); ?>">
<?php print substr($build->getCommitId(), 0, 7); ?>
</a>
</td>

10
src/PHPCensor/View/BuildStatus/view.phtml
View file

@ -75,7 +75,7 @@
<strong>Branch: </strong> <?php print $latest->getBranch(); ?><br />
<strong>Committer: </strong> <?php print $latest->getCommitterEmail(); ?>
<?php if ($latest->getCommitId() != 'Manual'): ?>
<?php if (!empty($latest->getCommitId())): ?>
<br /><strong>Commit: </strong> <?php print $latest->getCommitId(); ?><br>
<?php endif; ?>
</p>
@ -145,15 +145,15 @@
<td><?= $build->getCreated()->format('Y-m-d H:i:s'); ?></td>
<td>
<?php
if ($build->getCommitId() !== 'Manual') {
if (!empty($build->getCommitId())) {
print sprintf(
'<a href="%s" target="_blank">%s (%s)</a>',
'<a href="%s" target="_blank">%s %s</a>',
$build->getCommitLink(),
substr($build->getCommitId(), 0, 7),
$build->getCommitterEmail()
$build->getCommitterEmail() ? ('(' . $build->getCommitterEmail() . ')') : ''
);
} else {
print 'Manual';
print '&mdash;';
}
?>
</td>

28
src/PHPCensor/View/Home/ajax-timeline.phtml
View file

@ -74,7 +74,7 @@ use PHPCensor\Model\Build;
Build #<?= $build->getId(); ?>
</a>
&mdash;
<?php print $label; ?>
<?php Lang::out($build->getSourceHumanize()); ?>
</h3>
<div class="timeline-body">
@ -85,21 +85,21 @@ use PHPCensor\Model\Build;
<i class="fa fa-tag"></i> <?= $tag; ?>
</a>
<?php endif; ?>
&mdash;
<?php
if ($build->getCommitId() !== 'Manual') {
print sprintf(
'<a href="%s" target="_blank">%s (%s)</a>',
$build->getCommitLink(),
substr($build->getCommitId(), 0, 7),
$build->getCommitterEmail()
);
} else {
print Lang::get('manual_build');
}
if (!empty($build->getCommitId())) {
echo ' &mdash; ';
echo sprintf(
'<a href="%s" target="_blank">%s %s</a>',
$build->getCommitLink(),
substr($build->getCommitId(), 0, 7),
$build->getCommitterEmail() ? ('(' . $build->getCommitterEmail() . ')') : ''
);
if (!empty($build->getCommitMessage())) {
echo ' &mdash; ';
print $build->getCommitMessage();
}
}
?>
&mdash;
<?php print $build->getCommitMessage(); ?>
</div>
</div>
</li>

30
src/PHPCensor/View/Home/index.phtml
View file

@ -104,8 +104,8 @@ use PHPCensor\Model\Build;
<a href="<?= APP_URL; ?>build/view/<?= $build->getId(); ?>">
Build #<?= $build->getId(); ?>
</a>
&mdash;
<?= $label; ?>
&mdash;
<?php Lang::out($build->getSourceHumanize()); ?>
</h3>
<div class="timeline-body">
@ -116,21 +116,21 @@ use PHPCensor\Model\Build;
<i class="fa fa-tag"></i> <?= $tag; ?>
</a>
<?php endif; ?>
&mdash;
<?php
if ($build->getCommitId() !== 'Manual') {
print sprintf(
'<a href="%s" target="_blank">%s (%s)</a>',
$build->getCommitLink(),
substr($build->getCommitId(), 0, 7),
$build->getCommitterEmail()
);
} else {
print Lang::get('manual_build');
}
if (!empty($build->getCommitId())) {
echo ' &mdash; ';
echo sprintf(
'<a href="%s" target="_blank">%s %s</a>',
$build->getCommitLink(),
substr($build->getCommitId(), 0, 7),
$build->getCommitterEmail() ? ('(' . $build->getCommitterEmail() . ')') : ''
);
if (!empty($build->getCommitMessage())) {
echo ' &mdash; ';
print $build->getCommitMessage();
}
}
?>
&mdash;
<?php print $build->getCommitMessage(); ?>
</div>
</div>
</li>

15
src/PHPCensor/View/Project/ajax-builds.phtml
View file

@ -40,20 +40,21 @@ switch($build->getStatus())
$branches = $build->getExtra('branches');
?>
<tr>
<td><a href="<?php echo APP_URL ?>build/view/<?php print $build->getId(); ?>">#<?php print str_pad($build->getId(), 6, '0', STR_PAD_LEFT); ?></a></td>
<td><span class='label label-<?php echo $subcls ?>'><?php echo $status ?></span></td>
<td><?php print $build->getCreated()->format('Y-m-d H:i:s'); ?></td>
<td><a href="<?= APP_URL ?>build/view/<?= $build->getId(); ?>">#<?= str_pad($build->getId(), 6, '0', STR_PAD_LEFT); ?></a></td>
<td><span class='label label-<?= $subcls ?>'><?= $status ?></span></td>
<td><?= $build->getCreated()->format('Y-m-d H:i:s'); ?></td>
<td><?php Lang::out($build->getSourceHumanize()); ?></td>
<td class="hidden-md hidden-sm hidden-xs">
<?php
if ($build->getCommitId() !== 'Manual') {
if (!empty($build->getCommitId())) {
print sprintf(
'<a href="%s" target="_blank">%s (%s)</a>',
'<a href="%s" target="_blank">%s %s</a>',
$build->getCommitLink(),
substr($build->getCommitId(), 0, 7),
$build->getCommitterEmail()
$build->getCommitterEmail() ? ('(' . $build->getCommitterEmail() . ')') : ''
);
} else {
print Lang::get('manual_build');
print '&mdash;';
}
?>
</td>

1
src/PHPCensor/View/Project/view.phtml
View file

@ -103,6 +103,7 @@
<th><?php Lang::out('id'); ?></th>
<th><?php Lang::out('status'); ?></th>
<th><?php Lang::out('date'); ?></th>
<th><?php Lang::out('build_source'); ?></th>
<th class="hidden-md hidden-sm hidden-xs"><?php Lang::out('commit'); ?></th>
<th><?php Lang::out('branch'); ?></th>
<th><?php Lang::out('environment'); ?></th>