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

Merge branch 'sprint212_leiyong_fix_bug' into 'master'

Browse Source 
* Fix bug#24812.

See merge request easycorp/zentaopms!4408
This commit is contained in:
王怡栋
2022-07-08 02:09:43 +00:00
parent 272ba58696 b7074c0ec0
commit f61cacca8f
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/file/view/printfiles.html.php
+2
View File
@@ -7,6 +7,8 @@
<style>
.files-list>li>a {display: inline; word-wrap: break-word;}
.files-list>li>.right-icon {opacity: 1;}
.files-list>li>.right-icon>a {padding-left: 7px;}
html[lang|="zh"] .files-list>li>.right-icon>a {padding-left: 3px;}
</style>
<script>
/* Delete a file. */
module/file/view/viewfiles.html.php
+2
View File
@@ -8,6 +8,8 @@
<style>
.files-list>li>a {display: inline; word-wrap: break-word;}
.files-list>li>.right-icon {opacity: 1;}
.files-list>li>.right-icon>a {padding-left: 7px;}
html[lang|="zh"] .files-list>li>.right-icon>a {padding-left: 3px;}
</style>
<script>
/* Delete a file. */
module/kanban/view/createexeclane.html.php
+1 -1
View File
@@ -50,7 +50,7 @@
<th><?php echo $lang->kanbanlane->color;?></th>
<td colspan='3'>
<div id='color-picker'></div>
<?php echo html::input('color', '#7ec5ff', "class='hidden'");?>
<?php echo html::input('color', '#3C4353', "class='hidden'");?>
</td>
</tr>
<tr>
module/projectrelease/view/create.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
<tr>
<th><?php echo $lang->release->name;?></th>
<td><?php echo html::input('name', '', "class='form-control' required");?></td>
<td class='muted'>
<td>
<div id='markerBox' class='checkbox-primary'>
<input id='marker' name='marker' value='1' type='checkbox' />
<label for='marker'><?php echo $lang->release->marker;?></label>
module/search/view/buildform.html.php
+5 -2
View File
@@ -64,7 +64,10 @@ $formId = 'searchForm-' . uniqid('');
html[lang^='zh-'] .fieldWidth {width: 110px !important;}
html[lang^='zh-'] .operatorWidth {width: 90px !important;}
.table tbody tr td input {display: block !important;}
#save-query {color: #0061f2;}
#save-query {float: unset !important; position: absolute; right: 50px;}
#save-query .text {top: 0px;}
#save-query .text:after {border-bottom: 0px solid #0c64eb;}
</style>
<?php if($style != 'simple'):?>
<div id='toggle-queries'>
@@ -245,7 +248,7 @@ foreach($fieldParams as $fieldName => $param)
echo html::submitButton($lang->search->common, '', 'btn btn-primary') . " &nbsp; ";
if($style != 'simple') echo html::commonButton($lang->search->reset, '', 'btn-reset-form btn');
echo html::commonButton('<i class="icon icon-chevron-double-down"></i>', '', 'btn-expand-form btn btn-info pull-right');
if($style != 'simple' and common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), '<i class="icon-bug-confirmBug icon-ok"></i> ' . $lang->search->saveCondition, '', "class='btn-save-form btn btn-link iframe pull-right' id='save-query'");
if($style != 'simple' and common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), '<span class="text"><i class="icon-bug-confirmBug icon-ok"></i> ' . $lang->search->saveCondition . '</span>', '', "class='btn-save-form btn btn-link btn-active-text text iframe' id='save-query'");
echo html::hidden('formType', zget($formSession, 'formType', 'lite'));
?>
</td>