Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
hufangzhou
2021-07-23 14:07:32 +08:00
parent 9b638436cf 4c82e0cd9e
commit 4cc45d1e81
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlabpipeline/lang/zh-cn.php
+3
View File
@@ -0,0 +1,3 @@
<?php
$lang->gitlabpipeline->exec = '运行流水线'; // run pipeline manually
module/index/css/index.css
+1
View File
@@ -84,6 +84,7 @@ body.menu-hide {padding-left: 0;}
#globalBarLogo a:first-child {margin-right: 10px;}
#globalBarLogo a {float: right; margin: 0px 2px;}
#globalBarLogo a .icon {font-size: 24px; color: #16a8f8;}
#globalBarLogo a .version {font-size: 13px; position: relative; bottom: 3px;}
#searchbox a {float: left; width: 100%;}
#searchbox a:hover {color: white;}
module/index/view/index.html.php
+4 -1
View File
@@ -68,7 +68,10 @@ js::set('defaultOpen', $open);
<div id='poweredBy'>
<div id="globalBarLogo">
<a href='javascript:void(0)' id='proLink' class='btn btn-link' style='color: red;'><?php echo $lang->index->upgrade;?> <i class='text-danger icon-pro-version'></i></a>
<a href='<?php echo $lang->website;?>' class="btn btn-sm btn-link" target='_blank' title='<?php echo $config->version;?>'><i class="icon icon-zentao" style="font-size: 24px;"></i> <?php echo $config->version;?></a>
<a href='<?php echo $lang->website;?>' class="btn btn-sm btn-link" target='_blank' title='<?php echo $config->version;?>'>
<i class="icon icon-zentao" style="font-size: 24px;"></i>
<span class='version'><?php echo $lang->zentaoPMS . $config->version;?></span>
</a>
<!--<a href='javascript:void(0)' class="btn btn-sm btn-link" type="button"><i class="icon icon-message"></i></a>-->
<div id="globalSearchDiv">
<div class="input-group">
module/job/view/browse.html.php
+2 -2
View File
@@ -56,8 +56,8 @@
<?php
common::printIcon('compile', 'browse', "jobID=$id", '', 'list', 'history');
common::printIcon('job', 'edit', "jobID=$id", '', 'list', 'edit');
if($job->engine == 'jenkins') common::printIcon('job', 'exec', "jobID=$id", '', 'list', 'play', 'hiddenwin');
if($job->engine == 'gitlab') common::printIcon('gitlabpipeline', 'exec', "jobID=$id", '', 'list', 'play', 'hiddenwin');
if(strtolower($job->engine) == 'jenkins') common::printIcon('job', 'exec', "jobID=$id", '', 'list', 'play', 'hiddenwin');
if(strtolower($job->engine) == 'gitlab') common::printIcon('gitlabpipeline', 'exec', "jobID=$id", '', 'list', 'play', 'hiddenwin');
if(common::hasPriv('job', 'delete')) echo html::a($this->createLink('job', 'delete', "jobID=$id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->job->delete}' class='btn'");
?>
</td>