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

Merge branch 'dev/gfl_fixbug' into 'master'

Browse Source 
* Adjust code for bug icon-diamond in btn-group .

See merge request easycorp/zentaopms!7526
This commit is contained in:
刘刚
2023-04-21 01:52:19 +00:00
parent 05a3165b2a 74d165887e
commit 8ec658f0c2
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/css/view.css
+2 -1
View File
@@ -1,7 +1,7 @@
.h-full-adjust {overflow-y: auto; height: calc(100vh - 125px);}
.main-col .block-files .panel-heading {padding-right: 20px;}
.main-col .block-files .panel-heading .panel-title {height: 35px; line-height: 30px;}
.main-col .doc-title {display: flex; font-size: 16px; margin-bottom: 10px;}
.main-col .doc-title {display: flex; font-size: 16px; margin-bottom: 10px; justify-content: space-between;}
.main-col .doc-title .title {margin-right: 10px; line-height: 32px; font-size: 20px;}
.main-col .doc-title .info {flex: 1 1 0;}
.main-col .doc-title .version a {font-size: 13px; color: #8c8c8c;}
@@ -40,6 +40,7 @@
#outline li.has-list.open:before {content: unset;}
#fileTree {margin-bottom: 40px; max-height: calc(100vh - 180px); overflow: auto;}
#closeBtn {position: absolute; right: 10px; top: 10px;}
.actions > .btn-group {display: inline-block;}
.article-content.comment {width: 100% !important;}
module/doc/view/content.html.php
+23 -17
View File
@@ -11,6 +11,8 @@
<span class='label label-danger'><?php echo $lang->doc->deleted;?></span>
<?php endif;?>
</div>
<?php if($doc->status != 'draft'):?>
<div class="info">
<?php $version = $version ? $version : $doc->version;?>
<div class="version" data-version='<?php echo $version;?>'>
@@ -35,12 +37,33 @@
</div>
</div>
</div>
<?php endif;?>
<div class="actions">
<?php echo html::a("javascript:fullScreen()", '<span class="icon-fullscreen"></span>', '', "title='{$lang->fullscreen}' class='btn btn-link fullscreen-btn'");?>
<?php if(common::hasPriv('doc', 'collect')):?>
<?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'star' : 'star-empty';?>
<a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $lang->doc->collect;?>" class='ajaxCollect btn btn-link'><?php echo html::image("static/svg/{$star}.svg", "class='$star'");?></a>
<?php endif;?>
<?php if($config->vision == 'rnd' and $config->edition == 'max' and $app->tab == 'project'):?>
<?php
$canImportToPracticeLib = (common::hasPriv('doc', 'importToPracticeLib') and helper::hasFeature('practicelib'));
$canImportToComponentLib = (common::hasPriv('doc', 'importToComponentLib') and helper::hasFeature('componentlib'));
if($canImportToPracticeLib or $canImportToComponentLib)
{
echo "<div class='btn-group inline'>";
echo html::a('javascript:;', "<span class='icon icon-diamond'></span>", '', "data-toggle='dropdown' id='more' title='{$lang->import}' class='btn btn-link'");
echo "<ul class='dropdown-menu pull-right'>";
if($canImportToPracticeLib) echo '<li>' . html::a('#importToPracticeLib', $lang->doc->importToPracticeLib, '', 'data-toggle="modal"') . '</li>';
if($canImportToComponentLib) echo '<li>' . html::a('#importToComponentLib', $lang->doc->importToComponentLib, '', 'data-toggle="modal"') . '</li>';
echo '</ul></div>';
}
?>
<?php endif;?>
<?php
if(common::hasPriv('doc', 'edit'))
{
@@ -59,23 +82,6 @@
echo html::a("javascript:ajaxDeleteDoc(\"$deleteURL\", \"docList\", confirmDelete)", '<span class="icon-trash"></span>', '', "title='{$lang->doc->delete}' class='btn btn-link'");
}?>
<a id="hisTrigger" href="###" class="btn btn-link" title=<?php echo $lang->history?>><span class="icon icon-clock"></span></a>
<?php if($config->vision == 'rnd' and $config->edition == 'max' and $app->tab == 'project'):?>
<?php
$canImportToPracticeLib = (common::hasPriv('doc', 'importToPracticeLib') and helper::hasFeature('practicelib'));
$canImportToComponentLib = (common::hasPriv('doc', 'importToComponentLib') and helper::hasFeature('componentlib'));
if($canImportToPracticeLib or $canImportToComponentLib)
{
echo "<div class='btn-group' id='more' title='{$lang->import}'>";
echo html::a('javascript:;', "<span class='icon icon-diamond'></span>", '', "data-toggle='dropdown' class='btn btn-link'");
echo "<ul class='dropdown-menu pull-right'>";
if($canImportToPracticeLib) echo '<li>' . html::a('#importToPracticeLib', $lang->doc->importToPracticeLib, '', 'data-toggle="modal"') . '</li>';
if($canImportToComponentLib) echo '<li>' . html::a('#importToComponentLib', $lang->doc->importToComponentLib, '', 'data-toggle="modal"') . '</li>';
echo '</ul></div>';
}
?>
<?php endif;?>
</div>
<?php if(!empty($editors)):?>
<div id='editorBox'>