Merge branch 'master' of https://github.com/easysoft/zentaopms

module/doc/control.php

@@ -40,7 +40,7 @@ class doc extends control
         $this->doc->setMenu();
 
         $this->app->loadClass('pager', $static = true);
-        $pager = new pager(6, 6, 1);
+        $pager = new pager(0, 5, 1);
 
         $this->view->title            = $this->lang->doc->common . $this->lang->colon . $this->lang->doc->index;
         $this->view->position[]       = $this->lang->doc->index;

module/doc/css/browse.css

@@ -0,0 +1,2 @@
+.panel{padding-bottom: 40px;}
+.panel .table-footer{position: absolute; bottom: 0; width: 100%;}

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();
 

module/doc/view/browse.html.php

@@ -81,6 +81,7 @@ var browseType = '<?php echo $browseType;?>';
           </tbody>
         </table>
       </div>
+      <div class='table-footer'><?php echo $pager->show('right', 'pagerjs');?></div>
     </div>
   </div>
   <?php endif;?>

module/doc/view/browsebygrid.html.php

@@ -11,36 +11,36 @@
     </div>
     <div class="panel-body">
       <div class="row row-grid files-grid" data-size="300">
-          <?php foreach($modules as $module):?>
-          <?php $star = strpos($module->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
-          <div class="col">
-            <a class="file" href="<?php echo inlink('browse', "libID=$libID&browseType=bymodule&param=$module->id&orderBy=$orderBy&from=$from");?>">
-              <i class="file-icon icon icon-folder text-yellow"></i>
-              <div class="file-name"><?php echo (strpos($module->collector, $this->app->user->account) !== false ? "<i class='icon icon-star text-yellow'></i> " : '') . $module->name;?></div>
-              <div class="text-primary file-info"><?php echo $module->docCount . $lang->doc->item;?></div>
-            </a>
-            <div class="actions">
-              <?php common::printLink('doc', 'collect', "objectID={$module->id}&objectType=module", "<i class='icon {$star}'></i>", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?>
-            </div>
+        <?php foreach($modules as $module):?>
+        <?php $star = strpos($module->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
+        <div class="col">
+          <a class="file" href="<?php echo inlink('browse', "libID=$libID&browseType=bymodule&param=$module->id&orderBy=$orderBy&from=$from");?>">
+            <i class="file-icon icon icon-folder text-yellow"></i>
+            <div class="file-name"><?php echo (strpos($module->collector, $this->app->user->account) !== false ? "<i class='icon icon-star text-yellow'></i> " : '') . $module->name;?></div>
+            <div class="text-primary file-info"><?php echo $module->docCount . $lang->doc->item;?></div>
+          </a>
+          <div class="actions">
+            <?php common::printLink('doc', 'collect', "objectID={$module->id}&objectType=module", "<i class='icon {$star}'></i>", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'");?>
           </div>
-          <?php endforeach;?>
-          <?php foreach($docs as $doc):?>
-          <?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
-          <div class="col">
-            <a class="file" href="<?php echo inlink('view', "docID=$doc->id");?>">
-              <i class="file-icon icon icon-file-text text-muted"></i>
-              <div class="file-name"><?php echo (strpos($doc->collector, $this->app->user->account) !== false ? "<i class='icon icon-star text-yellow'></i> " : '') . $doc->title;?></div>
-              <div class="text-primary file-info"><?php echo zget($users, $doc->addedBy);?></div>
-            </a>
-            <div class="actions">
-              <?php common::printLink('doc', 'collect', "objectID={$doc->id}&objectType=doc", "<i class='icon {$star}'></i>", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?>
-              <?php common::printLink('doc', 'edit', "docID={$doc->id}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link' data-toggle='modal'")?>
-              <?php common::printLink('doc', 'delete', "docID={$doc->id}", "<i class='icon icon-trash'></i>", '', "title='{$lang->delete}' class='btn btn-link'")?>
-            </div>
-          </div>
-          <?php endforeach;?>
         </div>
+        <?php endforeach;?>
+        <?php foreach($docs as $doc):?>
+        <?php $star = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
+        <div class="col">
+          <a class="file" href="<?php echo inlink('view', "docID=$doc->id");?>">
+            <i class="file-icon icon icon-file-text text-muted"></i>
+            <div class="file-name"><?php echo (strpos($doc->collector, $this->app->user->account) !== false ? "<i class='icon icon-star text-yellow'></i> " : '') . $doc->title;?></div>
+            <div class="text-primary file-info"><?php echo zget($users, $doc->addedBy);?></div>
+          </a>
+          <div class="actions">
+            <?php common::printLink('doc', 'collect', "objectID={$doc->id}&objectType=doc", "<i class='icon {$star}'></i>", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?>
+            <?php common::printLink('doc', 'edit', "docID={$doc->id}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link' data-toggle='modal'")?>
+            <?php common::printLink('doc', 'delete', "docID={$doc->id}", "<i class='icon icon-trash'></i>", '', "title='{$lang->delete}' class='btn btn-link'")?>
+          </div>
+        </div>
+        <?php endforeach;?>
       </div>
     </div>
+    <div class='table-footer'><?php echo $pager->show('right', 'pagerjs');?></div>
   </div>
 </div>

module/doc/view/side.html.php

@@ -75,7 +75,7 @@ $projectSubLibs = $this->doc->getSubLibGroups('project', array_keys($projects));
         <ul>
           <?php foreach($projects as $project):?>
           <li>
-            <?php echo html::a($this->createLink('doc', 'objectLibs', "type=project&objectID=$project->id"), "<i class='icon icon-cube'></i> " . $project->name);?>
+            <?php echo html::a($this->createLink('doc', 'objectLibs', "type=project&objectID=$project->id"), "<i class='icon icon-stack'></i> " . $project->name);?>
             <?php if(isset($projectSubLibs[$project->id])):?>
             <ul>
               <?php foreach($projectSubLibs[$project->id] as $subLibID => $subLibName):?>
@@ -88,7 +88,7 @@ $projectSubLibs = $this->doc->getSubLibGroups('project', array_keys($projects));
               else 
               {
                   $subLibLink = inlink('browse', "libID=$subLibID");
-                  $icon = 'icon-paper-outline';
+                  $icon = 'icon-folder-o';
               }
               ?>
               <li>