From 2799d50d7f02d5311f12a27ba71ff13bc931ecae Mon Sep 17 00:00:00 2001 From: daitingting Date: Tue, 8 May 2018 10:18:38 +0800 Subject: [PATCH 1/4] * Add pager for doc. --- module/doc/css/browse.css | 2 + module/doc/model.php | 3 +- module/doc/view/browse.html.php | 1 + module/doc/view/browsebygrid.html.php | 54 +++++++++++++-------------- 4 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 module/doc/css/browse.css diff --git a/module/doc/css/browse.css b/module/doc/css/browse.css new file mode 100644 index 0000000000..63bf714968 --- /dev/null +++ b/module/doc/css/browse.css @@ -0,0 +1,2 @@ +.panel{padding-bottom: 40px;} +.panel .table-footer{position: absolute; bottom: 0; width: 100%;} diff --git a/module/doc/model.php b/module/doc/model.php index c3e90723f7..054394f976 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -466,7 +466,7 @@ class docModel extends model $stmt = $this->dao->select('*')->from(TABLE_DOC) ->where('deleted')->eq(0) ->beginIF($libID)->andWhere('lib')->in($libID)->fi() - ->beginIF($module)->andWhere('module')->in($module)->fi() + ->andWhere('module')->in($module) ->query(); @@ -1145,6 +1145,7 @@ class docModel extends model $docCounts= $this->dao->select("lib, count(id) as docCount")->from(TABLE_DOC) ->where('lib')->in($idList) ->andWhere('deleted')->eq(0) + ->andWhere('module')->eq(0) ->groupBy('lib') ->fetchPairs(); diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index d75096496b..2a025da51a 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -81,6 +81,7 @@ var browseType = ''; +
show('right', 'pagerjs');?>
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php index a3b2036067..0f31b542a3 100644 --- a/module/doc/view/browsebygrid.html.php +++ b/module/doc/view/browsebygrid.html.php @@ -11,36 +11,36 @@
- - collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?> -
- id&orderBy=$orderBy&from=$from");?>"> - -
collector, $this->app->user->account) !== false ? " " : '') . $module->name;?>
-
docCount . $lang->doc->item;?>
- -
- id}&objectType=module", "", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?> -
+ + collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?> +
+ id&orderBy=$orderBy&from=$from");?>"> + +
collector, $this->app->user->account) !== false ? " " : '') . $module->name;?>
+
docCount . $lang->doc->item;?>
+ +
+ id}&objectType=module", "", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'");?>
- - - collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?> -
- id");?>"> - -
collector, $this->app->user->account) !== false ? " " : '') . $doc->title;?>
-
addedBy);?>
- -
- id}&objectType=doc", "", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?> - id}", "", '', "title='{$lang->edit}' class='btn btn-link' data-toggle='modal'")?> - id}", "", '', "title='{$lang->delete}' class='btn btn-link'")?> -
-
-
+ + + collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?> +
+ id");?>"> + +
collector, $this->app->user->account) !== false ? " " : '') . $doc->title;?>
+
addedBy);?>
+ +
+ id}&objectType=doc", "", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?> + id}", "", '', "title='{$lang->edit}' class='btn btn-link' data-toggle='modal'")?> + id}", "", '', "title='{$lang->delete}' class='btn btn-link'")?> +
+
+
+
show('right', 'pagerjs');?>
From 29dc19bf162802a329b6f56631ce12fad61117e7 Mon Sep 17 00:00:00 2001 From: daitingting Date: Tue, 8 May 2018 10:37:05 +0800 Subject: [PATCH 2/4] * Adjust icon. --- module/doc/view/side.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php index 33ec9c42ad..01775f1421 100644 --- a/module/doc/view/side.html.php +++ b/module/doc/view/side.html.php @@ -75,7 +75,7 @@ $projectSubLibs = $this->doc->getSubLibGroups('project', array_keys($projects));