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

Merge branch 'sprint/master_zhouxudong_60383' into 'master'

Browse Source 
* Finish task #60387 #60386 #60383.

See merge request easycorp/zentaopms!4459
This commit is contained in:
王怡栋
2022-07-12 00:47:35 +00:00
parent 5fcb433409 c035264e3c
commit af542ae500
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/file/lang/en.php
+1 -1
View File
@@ -18,7 +18,7 @@ $lang->file->deleted = 'Deleted';
$lang->file->uploadImages = 'Batch Upload Images';
$lang->file->download = 'Download Files';
$lang->file->uploadDate = 'Uploaded';
$lang->file->edit = 'Rename File';
$lang->file->edit = 'Rename';
$lang->file->inputFileName = 'Enter File Name';
$lang->file->delete = 'Delete File';
$lang->file->label = 'Label:';
module/file/view/buildform.html.php
+3 -2
View File
@@ -2,6 +2,7 @@
<style>
.file-input .file-editbox{max-width:40%;}
.file-input-list .input-group-btn{float:left}
.fileAction {color: #0c64eb !important;}
</style>
<?php js::set('dangerExtensions', ',' . $this->config->file->dangers . ',');?>
<?php js::set('maxUploadSize', $maxUploadSize);?>
@@ -25,8 +26,8 @@
<small class="file-size muted"></small>
</div>
<div class="input-group-btn">
<button type="button" class="btn btn-link file-input-rename"><?php echo $lang->file->edit;?></button>
<button type="button" class="btn btn-link file-input-delete"><?php echo $lang->delete;?></button>
<button type="button" class="btn btn-link file-input-rename fileAction"><?php echo $lang->file->edit;?></button>
<button type="button" class="btn btn-link file-input-delete fileAction"><?php echo $lang->delete;?></button>
</div>
</div>
<input type="file" name="<?php echo $filesName;?>[]" onchange="checkDangerExtension(this)" />
module/file/view/viewfiles.html.php
+6 -7
View File
@@ -8,8 +8,7 @@
<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;}
.fileAction {color: #0c64eb !important;}
</style>
<script>
/* Delete a file. */
@@ -107,7 +106,7 @@
/* For the open source version of the file judgment. */
if(stripos('txt|jpg|jpeg|gif|png|bmp', $file->extension) !== false)
{
echo html::a($downloadLink, $lang->file->preview, '_blank', "class='text-primary' onclick=\"return downloadFile($file->id, '$file->extension', $imageWidth, '$file->title')\"");
echo html::a($downloadLink, $lang->file->preview, '_blank', "class='btn btn-link text-primary fileAction' onclick=\"return downloadFile($file->id, '$file->extension', $imageWidth, '$file->title')\"");
}
/* For the max version of the file judgment. */
@@ -116,13 +115,13 @@
$officeTypes = 'doc|docx|xls|xlsx|ppt|pptx|pdf';
if(stripos($officeTypes, $file->extension) !== false)
{
echo html::a($downloadLink, $lang->file->preview, '_blank', "class='text-primary' onclick=\"return downloadFile($file->id, '$file->extension', $imageWidth, '$file->title')\"");
echo html::a($downloadLink, $lang->file->preview, '_blank', "class='btn btn-link text-primary fileAction' onclick=\"return downloadFile($file->id, '$file->extension', $imageWidth, '$file->title')\"");
}
}
common::printLink('file', 'download', "fileID=$file->id", $lang->file->downloadFile, '_blank', "class='text-primary' title='{$lang->file->downloadFile}'");
common::printLink('file', 'edit', "fileID=$file->id", $lang->file->edit, '', "data-width='400' class='edit iframe text-primary' title='{$lang->file->edit}'");
if(common::hasPriv('file', 'delete')) echo html::a('###', $lang->delete, '', "class='text-primary' onclick='deleteFile($file->id)' title='$lang->delete'");
common::printLink('file', 'download', "fileID=$file->id", $lang->file->downloadFile, '_blank', "class='btn btn-link text-primary fileAction' title='{$lang->file->downloadFile}'");
common::printLink('file', 'edit', "fileID=$file->id", $lang->file->edit, '', "data-width='400' class='btn btn-link edit iframe text-primary fileAction' title='{$lang->file->edit}'");
if(common::hasPriv('file', 'delete')) echo html::a('###', $lang->delete, '', "class='btn btn-link text-primary fileAction' onclick='deleteFile($file->id)' title='$lang->delete'");
echo '</span>';
}
echo '</li>';
module/productplan/view/view.html.php
+1 -1
View File
@@ -88,7 +88,7 @@
$createMisc = common::hasPriv('story', 'create') ? 'btn btn-secondary' : " btn btn-secondary disabled";
echo html::a($createLink, "<i class='icon icon-plus'></i><span class='text'>" . $lang->story->create . "</span><span class='caret'>", '', "class='$createMisc'");
?>
<ul class='dropdown-menu'>
<ul class='dropdown-menu pull-right'>
<?php $disabled = common::hasPriv('story', 'batchCreate') ? '' : "class='disabled'";?>
<li <?php echo $disabled?>>
<?php