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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2018-05-28 15:34:44 +08:00
parent 0b36b54ab5 f4a8590d62
commit 68d3d9a11e
19 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/config.php
+6
View File
@@ -23,3 +23,9 @@ $config->action->objectNameFields['entry'] = 'name';
$config->action->objectNameFields['webhook'] = 'name';
$config->action->commonImgSize = 870;
$config->action->majorList = array();
$config->action->majorList['task'] = array('assigned', 'finished', 'activated');
$config->action->majorList['bug'] = array('assigned', 'resolved');
$config->action->majorList['release'] = array('opened');
$config->action->majorList['build'] = array('opened');
module/action/model.php
+2
View File
@@ -782,6 +782,8 @@ class actionModel extends model
{
$action->objectLink = '';
}
$action->major = (isset($this->config->action->majorList[$action->objectType]) && in_array($action->action, $this->config->action->majorList[$action->objectType])) ? 1 : 0;
}
return $actions;
}
module/block/css/admin.css
+1
View File
@@ -1,3 +1,4 @@
#blockAdmin {min-height: 280px;}
#blockAdmin .form-actions {visibility: hidden;}
#blockAdmin.form-inited .form-actions {visibility: visible;}
.form-group .btn + .btn{margin-left: 10px;}
module/block/view/admin.html.php
+1 -1
View File
@@ -33,7 +33,7 @@ include '../../common/view/chosen.html.php';
<?php endif;?>
<div id="blocksList"><?php if(!empty($blocks)) echo $blocks;?></div>
<div id="blockParams"></div>
<div class="form-group form-actions">
<div class="form-group">
<div class="col-sm-7 col-sm-offset-3">
<button type="submit" class="btn btn-wide btn-primary"><?php echo $lang->save;?></button>
<button type="cancel" class="btn btn-wide" data-dismiss="modal"><?php echo $lang->cancel;?></button>
module/block/view/dynamic.html.php
+1 -1
View File
@@ -6,7 +6,7 @@
{
$user = isset($users[$action->actor]) ? $users[$action->actor] : $action->actor;
if($action->action == 'login' or $action->action == 'logout' or empty($action->objectLink)) $action->objectName = $action->objectLabel = '';
$class = $action->actor == $this->app->user->account ? "class='active'" : '';
$class = $action->major ? "class='active'" : '';
echo "<li $class><div>";
printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName);
echo "</div></li>";
module/block/view/flowchart.html.php
+1 -1
View File
@@ -11,7 +11,7 @@
.block-flowchart .table > thead > tr > th:first-child {width: auto;padding: 10px 10px 15px 10px;background: none;}
.block-flowchart .table > thead > tr > th:first-child + th > div {background: none;}
.block-flowchart .table > thead > tr > th,
.block-flowchart .table > thead > tr > th > div {padding: 0;background: url('data:image/gif;base64,R0lGODlhLQAPAJEAAAAAAP///+7u7v///yH5BAEAAAMALAAAAAAtAA8AAAJPlIY5psn92jrSUGVrRFlfvHHh9JGS6aVQ2K2l+LYOO6KuCpby/No8DjvtgrfiD+gj5ozLpvMIfSanu2FyiKX1qqOsrsaNdbXCcfm8Ok1OBQA7') no-repeat;background-position: right -22px top 15px;}
.block-flowchart .table > thead > tr > th > div {padding: 0;background: url('data:image/gif;base64,R0lGODlhLQAPAJEAAAAAAP///+7u7v///yH5BAEAAAMALAAAAAAtAA8AAAJEnH8imMvKopzKofrg3FRfb2Dc+FmNOYgkqZ4ZunZwm4KxHNH0nds1uuOFfDqf8NcDGoW7IuzYtAWZROmSF1U+oc+qsAAAOw==') no-repeat;background-position: right -22px top 15px;}
.block-flowchart .table > thead > tr > th > div {padding: 10px 10px 15px 10px;background-position: left -23px top 15px;}
.block-flowchart .table > thead > tr > th:last-child {background: none;}
.block-flowchart .table > tbody > tr > td {color: #3c4353;}
module/bug/view/create.html.php
+1 -1
View File
@@ -252,7 +252,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
</tbody>
<tfoot>
<tr>
<td colspan="3" class="text-center">
<td colspan="3" class="text-center form-actions">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('case', (int)$caseID) . html::hidden('caseVersion', (int)$version);?>
module/company/view/dynamic.html.php
+1 -1
View File
@@ -52,7 +52,7 @@
<?php if($direction == 'next') $actions = array_reverse($actions);?>
<?php foreach($actions as $i => $action):?>
<?php if(empty($firstAction)) $firstAction = $action;?>
<li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
<li <?php if($action->major) echo "class='active'";?>>
<div>
<span class="timeline-tag"><?php echo $action->time?></span>
<span class="timeline-text">
module/my/view/dynamic.html.php
+1 -1
View File
@@ -45,7 +45,7 @@
<?php if($direction == 'next') $actions = array_reverse($actions);?>
<?php foreach($actions as $i => $action):?>
<?php if(empty($firstAction)) $firstAction = $action;?>
<li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
<li <?php if($action->major) echo "class='active'";?>>
<div>
<span class="timeline-tag"><?php echo $action->time?></span>
<span class="timeline-text">
module/product/view/dynamic.html.php
+1 -1
View File
@@ -48,7 +48,7 @@
<?php if($direction == 'next') $actions = array_reverse($actions);?>
<?php foreach($actions as $i => $action):?>
<?php if(empty($firstAction)) $firstAction = $action;?>
<li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
<li <?php if($action->major) echo "class='active'";?>>
<div>
<span class="timeline-tag"><?php echo $action->time?></span>
<span class="timeline-text">
module/product/view/view.html.php
+1 -1
View File
@@ -52,7 +52,7 @@
<div class="panel-body">
<ul class="timeline timeline-tag-left">
<?php foreach($actions as $action):?>
<li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
<li <?php if($action->major) echo "class='active'";?>>
<div>
<span class="timeline-tag"><?php echo $action->date;?></span>
<span class="timeline-text"><?php echo zget($users, $action->actor) . ' ' . $action->actionLabel . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName);?></span>
module/project/view/create.html.php
+2 -2
View File
@@ -13,10 +13,10 @@
<?php if(isset($tips)):?>
<?php $defaultURL = $this-> createLink('project', 'task', 'projectID=' . $projectID);?>
<?php include '../../common/view/header.lite.html.php';?>
<body style='background: #e5e5e5'>
<body>
<div class='modal-dialog mw-500px' id='tipsModal'>
<div class='modal-header'>
<a href='<?php echo $defaultURL;?>' class='close'>&times;</a>
<a href='<?php echo $defaultURL;?>' class='close'><i class="icon icon-close"></i></a>
<h4 class='modal-title' id='myModalLabel'><?php echo $lang->project->tips;?></h4>
</div>
<div class='modal-body'>
module/project/view/dynamic.html.php
+1 -1
View File
@@ -49,7 +49,7 @@
<?php if($direction == 'next') $actions = array_reverse($actions);?>
<?php foreach($actions as $i => $action):?>
<?php if(empty($firstAction)) $firstAction = $action;?>
<li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
<li <?php if($action->major) echo "class='active'";?>>
<div>
<span class="timeline-tag"><?php echo $action->time?></span>
<span class="timeline-text">
module/project/view/taskheader.html.php
+2 -2
View File
@@ -8,7 +8,7 @@
$product = $this->product->getById($productID);
$removeLink = $browseType == 'byproduct' ? inlink('task', "projectID=$projectID&browseType=$status&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("productBrowseParam")';
echo '<i class="icon icon-cube"></i> ' . $product->name;
echo html::a($removeLink, "<span class='close'>&times;</span>", '', "class='text-muted'");
echo html::a($removeLink, "<span class='close'><i class='icon icon-close'></i></span>", '', "class='text-muted'");
}
elseif(!empty($moduleID))
{
@@ -16,7 +16,7 @@
$module = $this->tree->getById($moduleID);
$removeLink = $browseType == 'bymodule' ? inlink('task', "projectID=$projectID&browseType=$status&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("moduleBrowseParam")';
echo $module->name;
echo html::a($removeLink, "<span class='close'>&times;</span>", '', "class='text-muted'");
echo html::a($removeLink, "<span class='close'><i class='icon icon-close'></i></span>", '', "class='text-muted'");
}
else
{
module/project/view/view.html.php
+1 -1
View File
@@ -49,7 +49,7 @@
<div class="panel-body">
<ul class="timeline timeline-tag-left">
<?php foreach($actions as $action):?>
<li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
<li <?php if($action->major) echo "class='active'";?>>
<div>
<span class="timeline-tag"><?php echo $action->date;?></span>
<span class="timeline-text"><?php echo zget($users, $action->actor) . ' ' . $action->actionLabel . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName);?></span>
module/testcase/view/create.html.php
+1 -1
View File
@@ -228,7 +228,7 @@
<div class='modal-dialog'>
<div class='modal-content'>
<div class='modal-header'>
<button type='button' class='close' data-dismiss='modal'>&times;</button>
<button type='button' class='close' data-dismiss='modal'><i class='icon icon-close'></i></button>
<div class='searchInput w-p90'>
<input id='storySearchInput' type='text' class='form-control' placeholder='<?php echo $lang->testcase->searchStories?>'>
<i class='icon icon-search'></i>
module/testsuite/view/createcase.html.php
+1 -1
View File
@@ -203,7 +203,7 @@
<div class='modal-dialog'>
<div class='modal-content'>
<div class='modal-header'>
<button type='button' class='close' data-dismiss='modal'>&times;</button>
<button type='button' class='close' data-dismiss='modal'><i class='icon icon-close'></i></button>
<div class='searchInput w-p90'>
<input id='storySearchInput' type='text' class='form-control' placeholder='<?php echo $lang->testcase->searchStories?>'>
<i class='icon icon-search'></i>
module/tree/view/browse.html.php
-1
View File
@@ -252,7 +252,6 @@ $(function()
var tree = $tree.data('zui.tree');
if(<?php echo $currentModuleID ?>)
if(0)
{
var $currentLi = $tree.find('.module-name[data-id=' + <?php echo $currentModuleID ?> + ']').closest('li');
if($currentLi.length) tree.show($currentLi);
module/user/view/dynamic.html.php
+1 -1
View File
@@ -47,7 +47,7 @@
<?php if($direction == 'next') $actions = array_reverse($actions);?>
<?php foreach($actions as $i => $action):?>
<?php if(empty($firstAction)) $firstAction = $action;?>
<li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
<li <?php if($action->major) echo "class='active'";?>>
<div>
<span class="timeline-tag"><?php echo $action->time?></span>
<span class="timeline-text">