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

Merge branch 'sprint/205_hufangzhou_24153' into 'master'

Browse Source 
* Fix bug #24157,#24155,#24154,#24153.

See merge request easycorp/zentaopms!4080
This commit is contained in:
朱金勇
2022-06-22 09:44:34 +00:00
parent 626fc121a1 ee7960af51
commit bdca637fcf
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/lang/en.php
+2 -2
View File
@@ -90,8 +90,8 @@ $lang->block->remove = 'Remove';
$lang->block->refresh = 'Refresh';
$lang->block->nbsp = ' ';
$lang->block->hidden = 'Hide';
$lang->block->dynamicInfo = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <em>%s</em> %s <a href='%s' title='%s'>%s</a></span>";
$lang->block->noLinkDynamic = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s <em>%s</em> %s %s</span>";
$lang->block->dynamicInfo = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <span class='label-action'>%s</span> %s <a href='%s' title='%s'>%s</a></span>";
$lang->block->noLinkDynamic = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s <span class='label-action'>%s</span> %s <span class='label-name'>%s</span></span>";
$lang->block->cannotPlaceInLeft = 'Cannot place the block at left side.';
$lang->block->cannotPlaceInRight = 'Cannot place the block at right side.';
module/block/lang/zh-cn.php
+1 -1
View File
@@ -91,7 +91,7 @@ $lang->block->refresh = '刷新';
$lang->block->nbsp = '';
$lang->block->hidden = '隐藏';
$lang->block->dynamicInfo = "<span class='timeline-tag'>%s</span> <span class='timeline-text'>%s <span class='label-action'>%s</span> %s <a href='%s' title='%s'>%s</a></span>";
$lang->block->noLinkDynamic = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s <em>%s</em> %s %s</span>";
$lang->block->noLinkDynamic = "<span class='timeline-tag'>%s</span> <span class='timeline-text' title='%s'>%s <span class='label-action'>%s</span> %s <span class='label-name'>%s</span></span>";
$lang->block->cannotPlaceInLeft = '此区块无法放置在左侧。';
$lang->block->cannotPlaceInRight = '此区块无法放置在右侧。';
module/block/view/dynamic.html.php
+2 -1
View File
@@ -5,7 +5,8 @@
.block-dynamic .timeline > li .timeline-text {max-width: 600px; display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-height: 20px;}
.block-dynamic .panel-body {padding-top: 0;}
.block-dynamic .label-action {margin-left: 12px;}
.block-dynamic .label-action + a {color: #838A9D;}
.block-dynamic .label-action + a,
.block-dynamic .label-name {color: #838A9D;}
</style>
<div class='panel-body scrollbar-hover'>
<ul class="timeline timeline-tag-left no-margin">
module/block/view/projectdynamicblock.html.php
+2
View File
@@ -4,6 +4,8 @@
<style>
.timeline > li .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; max-height: 20px; display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; }
.panel-body {padding-top: 0;}
.block-projectdynamic .label-action {margin-left: 12px;}
.block-projectdynamic .label-action + a {color: #838A9D;}
</style>
<div class='panel-body scrollbar-hover'>
<ul class="timeline timeline-tag-left no-margin">