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

Merge branch 'fixbug_doc' into 'master'

Browse Source 
fixbug_doc

See merge request easycorp/zentaopms!4076
This commit is contained in:
孙广明
2022-06-22 09:12:40 +00:00
parent c070183b29 ddd5818fc1
commit bc35c845ec
6 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/css/objectlibs.css
+1 -1
View File
@@ -32,7 +32,7 @@
.article-content {width: 100%; display: inline-block;}
.outline {position: relative;}
.outline .outline-toggle i.icon-angle-right, i.icon-angle-left {width: 18px; height: 18px; background: #efefef; border-radius: 50%; position: absolute; padding-left: 2px; padding-top: 1px;}
.outline .outline-toggle i.icon-angle-right, i.icon-angle-left {width: 18px; height: 18px; border-radius: 50%; position: absolute; padding-left: 2px; padding-top: 1px;}
.outline .outline-toggle i.icon-angle-right:before {content: "\e314"; cursor: pointer;}
.outline .outline-toggle i.icon-angle-left:before {content: "\e315"; cursor: pointer;}
.outline ul li {list-style: none;}
module/doc/js/browse.js
-4
View File
@@ -5,7 +5,3 @@ $('.ajaxCollect').click(function()
window.location.reload();
}
})
$(function()
{
$('#pageActions .btn-toolbar').prepend("<a class='btn btn-link querybox-toggle querybox-opened' id='bysearchTab'><i class='icon icon-search muted'></i>" + docLang.search + "</a>");
});
module/doc/js/tablecontents.js
-2
View File
@@ -19,8 +19,6 @@ $(function()
$('.menu-actions > a').blur(function() {$(this).css('background', 'none');})
$('#pageActions .btn-toolbar').prepend("<a class='btn btn-link querybox-toggle' id='bysearchTab'><i class='icon icon-search muted'></i>" + docLang.search + "</a>");
/* Make modules tree sortable. */
$('#modules').sortable(
{
module/doc/model.php
+1 -4
View File
@@ -2159,10 +2159,7 @@ class docModel extends model
$html .= html::submitButton("<i class='icon icon-search'></i>", '', "btn btn-icon btn-link input-control-icon-right");
$html .= '</form></div>';
}
else
{
$html = '';
}
$html = '<a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i>' . $this->lang->doc->search . '</a>';
$html .= "<div class='btn-group dropdown-hover'>";
$html .= "<a href='javascript:;' class='btn btn-link' data-toggle='dropdown'>{$this->lang->doc->myCollection}</a>";
$html .= "<ul class='dropdown-menu pull-right' id='collection-menu'>";
module/doc/view/browse.html.php
+4 -3
View File
@@ -65,9 +65,10 @@
?>
</td>
<?php else:?>
<?php if(common::hasPriv('doc', 'view')):?>
<td class="c-id"><?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id&version=0", '', true), $doc->id, '', "title='{$doc->id}' class='iframe' data-width='90%'");?></td>
<td class="c-name"><?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id&version=0", '', true), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "title='{$doc->title}' class='iframe' data-width='90%'");?></td>
<?php if(common::hasPriv('doc', 'objectLibs')):?>
<?php $objectID = $doc->{$type};?>
<td class="c-id"><?php echo html::a($this->createLink('doc', 'objectLibs', "type=$type&objectID=$objectID&libID=$doc->lib&docID=$doc->id"), $doc->id, '', "title='{$doc->id}' data-app='{$this->app->tab}'");?></td>
<td class="c-name"><?php echo html::a($this->createLink('doc', 'objectLibs', "type=$type&objectID=$objectID&libID=$doc->lib&docID=$doc->id"), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "title='{$doc->title}' data-app='{$this->app->tab}'");?></td>
<?php else:?>
<td class='c-id' title='<?php echo $doc->id;?>'><?php echo "<i class='icon icon-file-text text-muted'></i> {$doc->id}";?></td>
<td class='c-name' title='<?php echo $doc->title;?>'><?php echo "<i class='icon icon-file-text text-muted'></i> {$doc->title}";?></td>
module/doc/view/objectlibs.html.php
+1
View File
@@ -14,6 +14,7 @@
<?php if($app->tab == 'execution'):;?>
<style>.panel-body{min-height: 180px}</style>
<?php endif;?>
<div class="cell<?php if($type == 'bySearch') echo ' show';?>" id="queryBox" data-module=<?php echo $type . 'Doc';?>></div>
<div class="fade main-row split-row" id="mainRow">
<?php if($libID):?>
<?php include './side.html.php';?>