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

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

Browse Source
This commit is contained in:
hufangzhou
2020-12-24 16:10:53 +08:00
parent 98090bcc33 d74eb05817
commit 1136d9202c
17 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/issue/lang/de.php
+1 -1
View File
@@ -32,7 +32,7 @@ $lang->issue->editedBy = 'EditedBy';
$lang->issue->editedDate = 'EditedDate';
$lang->issue->activateBy = 'ActivatedBy';
$lang->issue->activateDate = 'ActivatedDate';
$lang->issue->closeBy = 'ClosedBy';
$lang->issue->closedBy = 'ClosedBy';
$lang->issue->closedDate = 'ClosedDate';
$lang->issue->assignedTo = 'AssignedTo';
$lang->issue->assignedBy = 'AssignedBy';
module/issue/lang/en.php
+1 -1
View File
@@ -32,7 +32,7 @@ $lang->issue->editedBy = 'EditedBy';
$lang->issue->editedDate = 'EditedDate';
$lang->issue->activateBy = 'ActivatedBy';
$lang->issue->activateDate = 'ActivatedDate';
$lang->issue->closeBy = 'ClosedBy';
$lang->issue->closedBy = 'ClosedBy';
$lang->issue->closedDate = 'ClosedDate';
$lang->issue->assignedTo = 'AssignedTo';
$lang->issue->assignedBy = 'AssignedBy';
module/issue/lang/fr.php
+1 -1
View File
@@ -32,7 +32,7 @@ $lang->issue->editedBy = 'EditedBy';
$lang->issue->editedDate = 'EditedDate';
$lang->issue->activateBy = 'ActivatedBy';
$lang->issue->activateDate = 'ActivatedDate';
$lang->issue->closeBy = 'ClosedBy';
$lang->issue->closedBy = 'ClosedBy';
$lang->issue->closedDate = 'ClosedDate';
$lang->issue->assignedTo = 'AssignedTo';
$lang->issue->assignedBy = 'AssignedBy';
module/issue/lang/vi.php
+1 -1
View File
@@ -32,7 +32,7 @@ $lang->issue->editedBy = 'EditedBy';
$lang->issue->editedDate = 'EditedDate';
$lang->issue->activateBy = 'ActivatedBy';
$lang->issue->activateDate = 'ActivatedDate';
$lang->issue->closeBy = 'ClosedBy';
$lang->issue->closedBy = 'ClosedBy';
$lang->issue->closedDate = 'ClosedDate';
$lang->issue->assignedTo = 'AssignedTo';
$lang->issue->assignedBy = 'AssignedBy';
module/issue/lang/zh-cn.php
+1 -1
View File
@@ -32,7 +32,7 @@ $lang->issue->editedBy = '由谁编辑';
$lang->issue->editedDate = '编辑日期';
$lang->issue->activateBy = '由谁激活';
$lang->issue->activateDate = '激活日期';
$lang->issue->closeBy = '由谁关闭';
$lang->issue->closedBy = '由谁关闭';
$lang->issue->closedDate = '关闭日期';
$lang->issue->assignedTo = '指派给';
$lang->issue->assignedBy = '由谁指派';
module/issue/lang/zh-tw.php
+1 -1
View File
@@ -32,7 +32,7 @@ $lang->issue->editedBy = '由誰編輯';
$lang->issue->editedDate = '編輯日期';
$lang->issue->activateBy = '由誰激活';
$lang->issue->activateDate = '激活日期';
$lang->issue->closeBy = '由誰關閉';
$lang->issue->closedBy = '由誰關閉';
$lang->issue->closedDate = '關閉日期';
$lang->issue->assignedTo = '指派給';
$lang->issue->assignedBy = '由誰指派';
module/issue/view/view.html.php
+2 -2
View File
@@ -151,8 +151,8 @@ foreach($issue as $field => $value)
<td><?php echo $issue->activateDate;?></td>
</tr>
<tr valign="middle">
<th class="thWidth w-80px"><?php echo $lang->issue->closeBy;?></th>
<td><?php echo zget($users, $issue->closeBy);?></td>
<th class="thWidth w-80px"><?php echo $lang->issue->closedBy;?></th>
<td><?php echo zget($users, $issue->closedBy);?></td>
</tr>
<tr valign="middle">
<th class="thWidth w-80px"><?php echo $lang->issue->status;?></th>
module/my/view/story.html.php
+14 -11
View File
@@ -16,13 +16,16 @@
<div class="btn-toolbar pull-left">
<?php
$recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
echo "<span class='nav-title'>{$URCommon}</span>";
echo "<span class='nav-title label label-badge label-primary label-outline'>{$URCommon}</span>";
echo "<span class='nav-title'></span>";
echo html::a(inlink($app->rawMethod, "mode=requirement&type=assignedTo&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->assignedToMe}</span>" . ($type == 'assignedTo' && $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' && $mode == 'requirement' ? ' btn-active-text' : '') . "'");
echo html::a(inlink($app->rawMethod, "mode=requirement&type=openedBy&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->openedByMe}</span>" . ($type == 'openedBy' && $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy' && $mode == 'requirement' ? ' btn-active-text' : '') . "'");
echo html::a(inlink($app->rawMethod, "mode=requirement&type=reviewedBy&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->reviewedByMe}</span>" . ($type == 'reviewedBy' && $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'reviewedBy' && $mode == 'requirement' ? ' btn-active-text' : '') . "'");
if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=requirement&type=closedBy&&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->closedByMe}</span>" . ($type == 'closedBy' && $mode == 'requirement' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy' && $mode == 'requirement' ? ' btn-active-text' : '') . "'");
echo "<span class='nav-title'> | </span>";
echo "<span class='nav-title'>{$SRCommon}</span>";
echo "<span class='nav-title'></span>";
echo "<span class='nav-title label label-badge label-primary label-outline'>{$SRCommon}</span>";
echo "<span class='nav-title'></span>";
echo html::a(inlink($app->rawMethod, "mode=story&type=assignedTo&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->assignedToMe}</span>" . ($type == 'assignedTo' && $mode == 'story' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' && $mode == 'story' ? ' btn-active-text' : '') . "'");
echo html::a(inlink($app->rawMethod, "mode=story&type=openedBy&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->openedByMe}</span>" . ($type == 'openedBy' && $mode == 'story' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy' && $mode == 'story' ? ' btn-active-text' : '') . "'");
echo html::a(inlink($app->rawMethod, "mode=story&type=reviewedBy&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pagerID=$pageID"), "<span class='text'>{$lang->my->storyMenu->reviewedByMe}</span>" . ($type == 'reviewedBy' && $mode == 'story' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'reviewedBy' && $mode == 'story' ? ' btn-active-text' : '') . "'");
@@ -59,17 +62,17 @@
<?php endif;?>
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
</th>
<th class='c-pri w-40px'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='c-name'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->my->name);?></th>
<th class='c-product'> <?php common::printOrderLink('productTitle', $orderBy, $vars, $lang->story->product);?></th>
<th class='c-pri w-40px'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='c-name'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->my->name);?></th>
<th class='c-product'> <?php common::printOrderLink('productTitle', $orderBy, $vars, $lang->story->product);?></th>
<?php if($mode == 'story'):?>
<th class='c-plan'> <?php common::printOrderLink('plan', $orderBy, $vars, $lang->story->plan);?></th>
<th class='c-plan'> <?php common::printOrderLink('plan', $orderBy, $vars, $lang->story->plan);?></th>
<?php endif;?>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='c-hours'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-stage'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
<th class='c-actions-5'><?php echo $lang->actions;?></th>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='c-hours'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-stage'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
<th class='c-actions-5'> <?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
module/program/js/prjcreate.js
+1 -1
View File
@@ -21,7 +21,7 @@ $(function()
});
}
$('[data-toggle="tooltip"]').tooltip({placement: 'right'});
$('[data-toggle="popover"]').popover();
});
/**
module/program/view/pgmbrowsebylist.html.php
+8 -8
View File
@@ -72,24 +72,24 @@
<?php if(common::hasPriv('program', 'PGMDelete')) echo html::a($this->createLink("program", "pgmdelete", "programID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PGMDelete}'");?>
<?php else:?>
<?php common::printIcon('program', 'PRJStart', "programID=$program->id", $program, 'list', 'play', '', 'iframe', true);?>
<?php common::printIcon('program', 'PRJStart', "projectID=$program->id", $program, 'list', 'play', '', 'iframe', true);?>
<div class='btn-group'>
<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"></button>
<ul class='dropdown-menu pull-right' role='menu'>
<?php common::printIcon('program', 'PRJActivate', "programID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
<?php common::printIcon('program', 'PRJSuspend', "programID=$program->id", $program, 'list', 'pause', '', 'iframe', true, '', $this->lang->program->PGMSuspend);?>
<?php common::printIcon('program', 'PRJClose', "programID=$program->id", $program, 'list', 'off', '', 'iframe', true);?>
<?php common::printIcon('program', 'PRJActivate', "projectID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
<?php common::printIcon('program', 'PRJSuspend', "projectID=$program->id", $program, 'list', 'pause', '', 'iframe', true);?>
<?php common::printIcon('program', 'PRJClose', "projectID=$program->id", $program, 'list', 'off', '', 'iframe', true);?>
</ul>
</div>
<?php if(common::hasPriv('program','PRJEdit')) echo html::a($this->createLink("program", "prjedit", "programID=$program->id"), "<i class='icon-edit'></i>", '', "class='btn' title='{$this->lang->program->PRJEdit}'");?>
<?php common::printIcon('program', 'PRJManageMembers', "programID=$program->id", $program, 'list', 'persons');?>
<?php common::printIcon('program', 'PRJGroup', "programID=$program->id", $program, 'list', 'icon icon-lock');?>
<?php if(common::hasPriv('program','PRJEdit')) echo html::a($this->createLink("program", "prjedit", "projectID=$program->id"), "<i class='icon-edit'></i>", '', "class='btn' title='{$this->lang->program->PRJEdit}'");?>
<?php common::printIcon('program', 'PRJManageMembers', "projectID=$program->id", $program, 'list', 'persons');?>
<?php common::printIcon('program', 'PRJGroup', "projectID=$program->id", $program, 'list', 'icon icon-lock');?>
<div class='btn-group'>
<button type='button' class='btn icon-more-circle dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"></button>
<ul class='dropdown-menu pull-right' role='menu'>
<?php common::printIcon('program', 'PRJManageProducts', "projectID=$program->id", $program, 'list', 'icon icon-menu-project');?>
<?php common::printIcon('program', 'PRJWhitelist', "projectID=$program->id", $program, 'list', 'group');?>
<?php if(common::hasPriv('program','PRJDelete')) echo html::a($this->createLink("program", "prjdelete", "programID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PRJDelete}'");?>
<?php if(common::hasPriv('program','PRJDelete')) echo html::a($this->createLink("program", "prjdelete", "projectID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PRJDelete}'");?>
</ul>
</div>
<?php endif;?>
module/program/view/prjcreate.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
<th class='w-120px'><?php echo $lang->program->PGMParent;?></th>
<td><?php echo html::select('parent', $programList, $programID, "class='form-control chosen' onchange='setParentProgram(this.value)'");?></td>
<td>
<icon class='icon icon-help' data-toggle='tooltip' data-placement='right' title=<?php echo $lang->program->PGMTips;?>></icon>
<icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted' data-content=<?php echo $lang->program->PGMTips;?>></icon>
</td>
<td></td>
</tr>
module/programplan/model.php
+1 -1
View File
@@ -562,7 +562,7 @@ class programplanModel extends model
$member->days = $data->days;
$member->hours = $this->config->project->defaultWorkhours;
$this->dao->insert(TABLE_TEAM)->data($member)->exec();
$this->project->addExecutionMembers($data->project, array($member));
$this->project->addProjectMembers($data->project, array($member));
$this->setTreePath($stageID);
if($data->acl != 'open') $this->user->updateUserView($stageID, 'sprint');
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/zui/fonts/ZentaoIcon.eot
Executable → Regular
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.svg
Executable → Regular
+25 -4
View File
File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 170 KiB

www/theme/zui/fonts/ZentaoIcon.ttf
Executable → Regular
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.woff
Executable → Regular
BIN
View File
Binary file not shown.