diff --git a/module/doc/css/edit.css b/module/doc/css/edit.css index a6a00155ce..329f8d0d08 100644 --- a/module/doc/css/edit.css +++ b/module/doc/css/edit.css @@ -1 +1,2 @@ #whiteListBox .input-group:last-child {margin-top: 10px;} +#mainContent .main-header h2 {width: 90%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css index d6593b15a2..1a681d5e54 100644 --- a/module/doc/css/objectlibs.css +++ b/module/doc/css/objectlibs.css @@ -15,6 +15,7 @@ .main-col .doc-title .version .dropdown-menu a:hover {color: #ffffff;} .main-col .doc-title .actions a {margin-right: 8px;} .main-col .doc-title .actions i {font-size: 15px; color: #8c8c8c;} +#content .title {width: 60%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} #mainContent .scrollbar-hover {max-height: 2000px; overflow: scroll;} #sidebar {width: 275px;} #sidebar>.cell {width: 100%;} diff --git a/module/doc/model.php b/module/doc/model.php index acda0e8a00..079442df2c 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1668,6 +1668,7 @@ class docModel extends model $query = $this->dao->select('t1.id,t1.title,t2.type,t2.product,t2.project,t2.execution')->from(TABLE_DOC)->alias('t1') ->leftJoin(TABLE_DOCLIB)->alias('t2')->on('t1.lib=t2.id') ->where('t1.deleted')->eq(0) + ->andWhere('t1.assetLib')->eq(0) ->andWhere('t1.lib')->eq($libID) ->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi() ->get(); @@ -2092,7 +2093,11 @@ class docModel extends model if($startModule) $startModulePath = $startModule->path . '%'; } - $docs = $this->dao->select('*')->from(TABLE_DOC)->where('lib')->eq($rootID)->andWhere('deleted')->eq(0)->fetchAll(); + $docs = $this->dao->select('*')->from(TABLE_DOC) + ->where('lib')->eq($rootID) + ->andWhere('assetLib')->eq(0) + ->andWhere('deleted')->eq(0) + ->fetchAll(); $moduleDocs = array(); foreach($docs as $doc) { diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index 7b8b8f1684..f04f8bbb4c 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -11,7 +11,7 @@ $sessionString .= session_name() . '=' . session_id();
-
title;?>
+
title;?>