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

Merge branch 'sprint/177_liumengyi_fixbug' into 'kanban'

Browse Source 
* Fix bug for view card.

See merge request easycorp/zentaopms!929
This commit is contained in:
孙广明
2021-12-14 06:07:00 +00:00
parent 7d35d1c878 4244e0cc23
commit f3a2bdce00
6 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/resource.php
+1 -1
View File
@@ -646,7 +646,7 @@ $lang->resource->kanban->createCard = 'createCard';
$lang->resource->kanban->editCard = 'editCard';
$lang->resource->kanban->viewCard = 'viewCard';
$lang->resource->kanban->sortCard = 'sortCard';
$lang->resource->kanban->archivedCard = 'archivedCard';
$lang->resource->kanban->archiveCard = 'archiveCard';
$lang->resource->kanban->laneMove = 'laneMove';
$lang->resource->kanban->cardsSort = 'cardsSort';
module/kanban/config.php
+1 -1
View File
@@ -36,8 +36,8 @@ $config->kanban->editor->createspace = array('id' => 'desc', 'tools' => 'simpleT
$config->kanban->editor->editspace = array('id' => 'desc', 'tools' => 'simpleTools');
$config->kanban->editor->createcard = array('id' => 'desc', 'tools' => 'simpleTools');
$config->kanban->editor->close = array('id' => 'comment', 'tools' => 'simpleTools');
$config->kanban->editor->editcard = array('id' => 'desc', 'tools' => 'simpleTools');
$config->kanban->editor->viewcard = array('id' => 'comment', 'tools' => 'simpleTools');
$config->kanban->default = new stdclass();
$config->kanban->default->story = new stdclass();
module/kanban/css/viewcard.css
+1
View File
@@ -1 +1,2 @@
[lang^='en'] .table-data tbody>tr>th {width: 100px;}
.pull-left div {float: left !important;}
module/kanban/lang/en.php
+8 -8
View File
@@ -25,7 +25,7 @@ $lang->kanban->deleteColumn = 'Delete Column';
$lang->kanban->createCard = 'Create Card';
$lang->kanban->editCard = 'Edit Card';
$lang->kanban->viewCard = 'View Card';
$lang->kanban->archivedCard = 'Archive Card';
$lang->kanban->archiveCard = 'Archive Card';
$lang->kanban->sortCard = 'Sort Card';
$lang->kanban->setting = 'Setting';
$lang->kanban->splitColumn = 'Split Column';
@@ -216,13 +216,13 @@ $lang->kanbanregion->name = 'Kanban Region';
$lang->kanbanregion->default = 'Default Region';
$lang->kanbancard = new stdclass();
$lang->kanbancard->create = 'Create Card';
$lang->kanbancard->edit = 'Edit Card';
$lang->kanbancard->view = 'View Card';
$lang->kanbancard->archiv = 'Archive';
$lang->kanbancard->assign = 'Assign';
$lang->kanbancard->copy = 'Copy';
$lang->kanbancard->delete = 'Delete';
$lang->kanbancard->create = 'Create Card';
$lang->kanbancard->edit = 'Edit Card';
$lang->kanbancard->view = 'View Card';
$lang->kanbancard->archive = 'Archive';
$lang->kanbancard->assign = 'Assign';
$lang->kanbancard->copy = 'Copy';
$lang->kanbancard->delete = 'Delete';
$lang->kanbancard->name = 'Card Name';
$lang->kanbancard->legendBasicInfo = 'Basic Info';
module/kanban/lang/zh-cn.php
+8 -8
View File
@@ -25,7 +25,7 @@ $lang->kanban->deleteColumn = '删除看板列';
$lang->kanban->createCard = '创建卡片';
$lang->kanban->editCard = '编辑卡片';
$lang->kanban->viewCard = '查看卡片';
$lang->kanban->archivedCard = '归档卡片';
$lang->kanban->archiveCard = '归档卡片';
$lang->kanban->sortCard = '卡片排序';
$lang->kanban->setting = '设置';
$lang->kanban->splitColumn = '新增子看板列';
@@ -217,13 +217,13 @@ $lang->kanbanregion->name = '看板区域';
$lang->kanbanregion->default = '默认区域';
$lang->kanbancard = new stdclass();
$lang->kanbancard->create = '创建卡片';
$lang->kanbancard->edit = '编辑卡片';
$lang->kanbancard->view = '查看卡片';
$lang->kanbancard->archiv = '归档';
$lang->kanbancard->assign = '指派';
$lang->kanbancard->copy = '复制';
$lang->kanbancard->delete = '删除';
$lang->kanbancard->create = '创建卡片';
$lang->kanbancard->edit = '编辑卡片';
$lang->kanbancard->view = '查看卡片';
$lang->kanbancard->archive = '归档';
$lang->kanbancard->assign = '指派';
$lang->kanbancard->copy = '复制';
$lang->kanbancard->delete = '删除';
$lang->kanbancard->name = '卡片名称';
$lang->kanbancard->legendBasicInfo = '基本信息';
module/kanban/view/viewcard.html.php
+4 -2
View File
@@ -11,6 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<div class='main-header'>
@@ -30,6 +31,7 @@
</div>
</div>
<div class='cell'>
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=kanbancard&objectID=$card->id");?>
<?php include '../../common/view/action.html.php';?>
</div>
<div class='main-actions'>
@@ -37,11 +39,11 @@
<?php if(!$card->deleted):?>
<?php
common::printLink('kanban', 'assigntocard', "cardID=$card->id", "<i class='icon icon-hand-right'></i><span class='text'>{$lang->kanbancard->assign}</span>", '', "class='btn btn-link iframe' title='{$lang->kanbancard->assign}'", true, true);
common::printLink('kanban', 'archivecard', "cardID=$card->id", "<i class='icon icon-ban-circle'></i><span class='text'>{$lang->kanbancard->archiv}</span>", '', "class='btn btn-link iframe' title='{$lang->kanbancard->archiv}'", true, true);
common::printLink('kanban', 'archivecard', "cardID=$card->id", "<i class='icon icon-ban-circle'></i><span class='text'>{$lang->kanbancard->archive}</span>", '', "class='btn btn-link iframe' title='{$lang->kanbancard->archive}'", true, true);
echo "<div class='divider'></div>";
common::printLink('kanban', 'editcard', "cardID=$card->id", '<i class="icon icon-edit"></i>', '', "class='btn btn-link iframe' title='{$lang->kanbancard->edit}'", true, true);
common::printLink('kanban', 'editcard', "cardID=$card->id", '<i class="icon icon-edit"></i>', '', "class='btn btn-link iframe' data-width='80%' title='{$lang->kanbancard->edit}'", true, true);
common::printLink('kanban', 'copycard', "cardID=$card->id", '<i class="icon icon-copy"></i>', '', "class='btn btn-link iframe' title='{$lang->kanbancard->copy}'", true, true);
common::printLink('kanban', 'deletecard', "cardID=$card->id", '<i class="icon icon-trash"></i>', '', "class='btn btn-link iframe' title='{$lang->kanbancard->delete}'",true, true);
?>