Merge branch 'sprint/200_zhouxudong_56379' into 'master'
Sprint/200 zhouxudong 56379 See merge request easycorp/zentaopms!3785
This commit is contained in:
孙广明
@@ -7,7 +7,9 @@
|
||||
#spaceList .spaceActions > a{margin-left: 10px;}
|
||||
.space .menu {margin-left: 5px; margin-right:5px;}
|
||||
.space .table-empty-tip {padding: 40px 10px;}
|
||||
.space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 255px)}
|
||||
.space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 150px)}
|
||||
.spaceDesc {font-size: 13px; color: #838A9D; margin: -5px 0 5px 18px;}
|
||||
#more .setting {margin-left: -25px; min-width: 80px}
|
||||
|
||||
.kanbans > .col {width: 25% !important;}
|
||||
@media screen and (max-width: 1500px) {.kanbans > .col {width: 25%;}}
|
||||
|
||||
@@ -26,6 +26,7 @@ $lang->kanban->columnWidth = 'Column Width';
|
||||
$lang->kanban->setColumnWidth = 'Set Column Width';
|
||||
$lang->kanban->deleteLane = 'Delete Lane';
|
||||
$lang->kanban->createColumn = 'Create Column';
|
||||
$lang->kanban->emptyDesc = 'No description';
|
||||
$lang->kanban->editColumn = 'Edit Column';
|
||||
$lang->kanban->sortColumn = 'Sort Column';
|
||||
$lang->kanban->deleteColumn = 'Delete Column';
|
||||
@@ -275,14 +276,14 @@ $lang->kanbanspace->empty = 'No Space';
|
||||
$lang->kanbanspace->aclList['open'] = 'Open (Accessible with kanban view permissions)';
|
||||
$lang->kanbanspace->aclList['private'] = 'Private (For the space owner, team and whitelist members only)';
|
||||
|
||||
$lang->kanbanspace->featureBar['private'] = 'Private Space';
|
||||
$lang->kanbanspace->featureBar['involved'] = 'Involved';
|
||||
$lang->kanbanspace->featureBar['cooperation'] = 'Cooperation Space';
|
||||
$lang->kanbanspace->featureBar['public'] = 'Public Space';
|
||||
$lang->kanbanspace->featureBar['involved'] = 'Involved';
|
||||
$lang->kanbanspace->featureBar['private'] = 'Private Space';
|
||||
|
||||
$lang->kanbanspace->typeList['private'] = 'Private Space';
|
||||
$lang->kanbanspace->typeList['cooperation'] = 'Cooperation Space';
|
||||
$lang->kanbanspace->typeList['public'] = 'Public Space';
|
||||
$lang->kanbanspace->typeList['private'] = 'Private Space';
|
||||
|
||||
$lang->kanbancolumn = new stdclass();
|
||||
$lang->kanbancolumn->name = $lang->kanban->columnName;
|
||||
|
||||
@@ -26,6 +26,7 @@ $lang->kanban->columnWidth = '列宽度';
|
||||
$lang->kanban->setColumnWidth = '设置列宽度';
|
||||
$lang->kanban->deleteLane = '删除泳道';
|
||||
$lang->kanban->createColumn = '创建看板列';
|
||||
$lang->kanban->emptyDesc = '暂无描述';
|
||||
$lang->kanban->editColumn = '编辑看板列';
|
||||
$lang->kanban->sortColumn = '看板列排序';
|
||||
$lang->kanban->deleteColumn = '删除看板列';
|
||||
@@ -275,14 +276,14 @@ $lang->kanbanspace->empty = '暂时没有空间';
|
||||
$lang->kanbanspace->aclList['open'] = '公开（有看板空间视图权限即可访问）';
|
||||
$lang->kanbanspace->aclList['private'] = '私有（只有看板空间负责人、团队成员、白名单可访问）';
|
||||
|
||||
$lang->kanbanspace->featureBar['private'] = '私人空间';
|
||||
$lang->kanbanspace->featureBar['involved'] = '我参与的';
|
||||
$lang->kanbanspace->featureBar['cooperation'] = '协作空间';
|
||||
$lang->kanbanspace->featureBar['public'] = '公共空间';
|
||||
$lang->kanbanspace->featureBar['involved'] = '我参与的';
|
||||
$lang->kanbanspace->featureBar['private'] = '私人空间';
|
||||
|
||||
$lang->kanbanspace->typeList['private'] = '私人空间';
|
||||
$lang->kanbanspace->typeList['cooperation'] = '协作空间';
|
||||
$lang->kanbanspace->typeList['public'] = '公共空间';
|
||||
$lang->kanbanspace->typeList['private'] = '私人空间';
|
||||
|
||||
$lang->kanbancolumn = new stdclass();
|
||||
$lang->kanbancolumn->name = $lang->kanban->columnName;
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<table class='table table-form'>
|
||||
<tr>
|
||||
<th><?php echo $lang->kanbanspace->type;?></th>
|
||||
<td><?php echo html::select('type', $typeList, $type, "onchange='changeType(this.value)' class='form-control chosen'");?></td>
|
||||
<td><?php echo html::radio('type', $typeList, $type, "onchange='changeType(this.value)'");?></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<table class='table table-form'>
|
||||
<tr>
|
||||
<th><?php echo $lang->kanbanspace->type;?></th>
|
||||
<td><?php echo html::select('type', $typeList, $defaultType, "onchange='changeType(this.value)' class='form-control chosen'");?></td>
|
||||
<td><?php echo html::radio('type', $typeList, $defaultType, "onchange='changeType(this.value)'");?></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -47,17 +47,23 @@
|
||||
<?php echo $space->name;?>
|
||||
</h4>
|
||||
</div>
|
||||
<p class="spaceDesc text-ellipsis text-primary" title='<?php echo empty($space->desc) ? $lang->kanban->emptyDesc : $space->desc;?>'><?php echo empty($space->desc) ? $lang->kanban->emptyDesc : $space->desc;?></p>
|
||||
</div>
|
||||
<div class='spaceActions pull-right'>
|
||||
<?php $class = $space->status == 'closed' ? 'disabled' : '';?>
|
||||
<?php if($space->status != 'closed' and $browseType != 'involved' and !empty($unclosedSpace)) common::printLink('kanban', 'create', "spaceID={$space->id}&type={$space->type}", '<i class="icon icon-plus"></i> ' . $lang->kanban->create, '', "class='iframe' data-width='75%'", '', true);?>
|
||||
<?php common::printLink('kanban', 'editSpace', "spaceID={$space->id}", '<i class="icon icon-cog-outline"></i> ' . $lang->kanban->setting, '', "class='iframe' data-width='75%'", '', true);?>
|
||||
<?php if($class == 'disabled'):?>
|
||||
<?php common::printLink('kanban', 'activateSpace', "spaceID={$space->id}", '<i class="icon icon-magic"></i> ' . $lang->activate, '', "class='iframe'", '', true);?>
|
||||
<?php else:?>
|
||||
<?php common::printLink('kanban', 'closeSpace', "spaceID={$space->id}", '<i class="icon icon-off"></i> ' . $lang->close, '', "class='iframe'", '', true);?>
|
||||
<?php endif;?>
|
||||
<?php common::printLink('kanban', 'deleteSpace', "spaceID={$space->id}", '<i class="icon icon-trash"></i> ' . $lang->delete, 'hiddenwin', '', '', true);?>
|
||||
<div class="btn-group" id="more">
|
||||
<a href="javascript:;" data-toggle="dropdown" class="btn btn-link " style="border-radius: 4px;"><?php echo $lang->kanban->setting;?><span class="caret"></span></a>
|
||||
<ul class="dropdown-menu setting">
|
||||
<li><?php common::printLink('kanban', 'editSpace', "spaceID={$space->id}", '<i class="icon icon-cog-outline"></i> ' . $lang->kanban->setting, '', "class='iframe' data-width='75%'", '', true);?></li>
|
||||
<li><?php if($class == 'disabled'):?>
|
||||
<?php common::printLink('kanban', 'activateSpace', "spaceID={$space->id}", '<i class="icon icon-magic"></i> ' . $lang->activate, '', "class='iframe'", '', true);?>
|
||||
<?php else:?>
|
||||
<?php common::printLink('kanban', 'closeSpace', "spaceID={$space->id}", '<i class="icon icon-off"></i> ' . $lang->close, '', "class='iframe'", '', true);?>
|
||||
<?php endif;?></li>
|
||||
<li><?php common::printLink('kanban', 'deleteSpace', "spaceID={$space->id}", '<i class="icon icon-trash"></i> ' . $lang->delete, 'hiddenwin', '', '', true);?></li>
|
||||
<ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php if(isset($space->kanbans)):?>
|
||||
|
||||
Reference in New Issue
Block a user