* code for task #5030.

module/doc/control.php

@@ -158,23 +158,24 @@ class doc extends control
             $this->view->itemCounts = $this->doc->statLibCounts(array_keys($libs));
         }
 
-        $modules = $this->doc->getDocMenu($libID, $moduleID, $orderBy == 'title_asc' ? 'name_asc' : 'id_desc', $browseType);
+        $attachLibs = array();
         if(!empty($lib) and (!empty($lib->product) or !empty($lib->project)))
         {
             $count = $this->dao->select('count(*) as count')->from(TABLE_DOCLIB)->where('project')->eq($lib->project)->andWhere('product')->eq($lib->product)->fetch('count');
             if($count == 1)
             {
                 $objectLibs = $this->doc->getLibsByObject($type, $lib->$type);
-                if(isset($objectLibs['project'])) $modules['project'] = $objectLibs['project'];
-                if(isset($objectLibs['files']))   $modules['files']   = $objectLibs['files'];
+                if(isset($objectLibs['project'])) $attachLibs['project'] = $objectLibs['project'];
+                if(isset($objectLibs['files']))   $attachLibs['files']   = $objectLibs['files'];
             }
         }
 
         $this->view->breadTitle = $title;
         $this->view->libID      = $libID;
         $this->view->moduleID   = $moduleID;
-        $this->view->modules    = $modules;
+        $this->view->modules    = $this->doc->getDocMenu($libID, $moduleID, $orderBy == 'title_asc' ? 'name_asc' : 'id_desc', $browseType);
         $this->view->docs       = $this->doc->getDocsByBrowseType($libID, $browseType, $queryID, $moduleID, $sort, $pager);
+        $this->view->attachLibs = $attachLibs;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
         $this->view->orderBy    = $orderBy;
         $this->view->browseType = $browseType;
@@ -183,7 +184,7 @@ class doc extends control
         $this->view->from       = $from;
         $this->view->pager      = $pager;
         $this->view->libs       = $libs;
-        $this->view->lib        = $libID ? $lib : '';
+        $this->view->currentLib = $libID ? $lib : '';
 
         $this->display();
     }

module/doc/view/browse.html.php

@@ -46,7 +46,7 @@ var browseType = '<?php echo $browseType;?>';
           </div>
         </nav>
       </div>
-      <?php if(empty($docs) and empty($modules) and empty($libs)):?>
+      <?php if(empty($docs) and empty($modules) and empty($libs) and empty($attachLibs)):?>
       <div class="table-empty-tip">
         <p>
           <?php if($libID):?>
@@ -98,29 +98,35 @@ var browseType = '<?php echo $browseType;?>';
             </tr>
             <?php endforeach;?>
             <?php endif;?>
-            <?php if(isset($modules)):?>
-            <?php foreach($modules as $moduleID => $module):?>
-            <?php if($moduleID != 'project' and $moduleID != 'files'):?>
-            <?php $star = strpos($module->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
-            <?php $collectTitle = strpos($module->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
-            <?php endif;?>
+            <?php if(!empty($attachLibs)):?>
+            <?php foreach($attachLibs as $libID => $attachLib):?>
             <tr>
-              <?php if($moduleID == 'project'):?>
-              <td class="c-name"><?php echo html::a(inlink('allLibs', "type=project&product={$lib->product}"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $module->name);?></td>
-              <?php elseif($moduleID == 'files'):?>
-              <td class="c-name"><?php echo html::a(inlink('showFiles', "type=$type&objectID={$lib->$type}"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $module->name);?></td>
-              <?php else:?>
-              <td class="c-name"><?php echo html::a(inlink('browse', "libID=$libID&browseType=bymodule&param=$module->id&orderBy=$orderBy&from=$from"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $module->name);?></td>
+              <?php if($libID == 'project'):?>
+              <td class="c-name"><?php echo html::a(inlink('allLibs', "type=project&product={$currentLib->product}"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $attachLib->name);?></td>
+              <?php elseif($libID == 'files'):?>
+              <td class="c-name"><?php echo html::a(inlink('showFiles', "type=$type&objectID={$currentLib->$type}"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $attachLib->name);?></td>
               <?php endif;?>
               <td class="c-num"></td>
               <td class="c-user"></td>
               <td class="c-datetime"></td>
               <td class="c-datetime"></td>
+              <td></td>
+            </tr>
+            <?php endforeach;?>
+            <?php endif;?>
+            <?php if(isset($modules)):?>
+            <?php foreach($modules as $module):?>
+            <?php $star = strpos($module->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
+            <?php $collectTitle = strpos($module->collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
+            <tr>
+              <td class="c-name"><?php echo html::a(inlink('browse', "libID=$libID&browseType=bymodule&param=$module->id&orderBy=$orderBy&from=$from"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $module->name);?></td>
+              <td class="c-num"></td>
+              <td class="c-user"></td>
+              <td class="c-datetime"></td>
+              <td class="c-datetime"></td>
               <td>
-                <?php if($moduleID != 'project' and $moduleID != 'files'):?>
                 <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$module->id&objectType=module");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
                 <?php common::printLink('tree', 'browse', "rootID=$libID&type=doc", "<i class='icon icon-cog'></i>", '', "title='{$lang->tree->manage}' class='btn btn-link'")?>
-                <?php endif;?>
               </td>
             </tr>
             <?php endforeach;?>

module/doc/view/browsebygrid.html.php

@@ -9,7 +9,7 @@
         </div>
       </nav>
     </div>
-    <?php if(empty($docs) and empty($modules) and empty($libs)):?>
+    <?php if(empty($docs) and empty($modules) and empty($libs) and empty($attachLibs)):?>
     <div class="table-empty-tip">
       <p><span class="text-muted"><?php echo $lang->doc->noDoc;?></span> <?php common::printLink('doc', 'create', "libID={$libID}", "<i class='icon icon-plus'></i> " . $lang->doc->create, '', "class='btn btn-info'");?></p>
     </div>
@@ -31,36 +31,39 @@
           </div>
         </div>
         <?php endforeach;?>
-        <?php foreach($modules as $moduleID => $module):?>
-        <?php if($moduleID != 'project' and $moduleID != 'files'):?>
-        <?php $star = strpos($module->collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
-        <?php endif;?>
+        <?php foreach($attachLibs as $libID => $attachLib):?>
         <div class="col">
           <?php
           $browseLink = '';
-          if($moduleID == 'project')
+          if($libID == 'project')
           {
-              $browseLink = inlink('allLibs', "type=project&product={$lib->product}");
+              $browseLink = inlink('allLibs', "type=project&product={$currentLib->product}");
           }
-          elseif($moduleID == 'files')
+          elseif($libID == 'files')
           {
-              $browseLink = inlink('showFiles', "type=$type&objectID={$lib->$type}");
-          }
-          else
-          {
-              $browseLink = inlink('browse', "libID=$libID&browseType=bymodule&param=$module->id&orderBy=$orderBy&from=$from");
+              $browseLink = inlink('showFiles', "type=$type&objectID={$currentLib->$type}");
           }
           ?>
           <a class="file" href="<?php echo $browseLink;?>">
             <i class="file-icon icon icon-folder text-yellow"></i>
-            <div class="file-name"><?php echo (($moduleID != 'project' and $moduleID != 'files' and 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 (isset($module->docCount) ? $module->docCount : $module->allCount) . $lang->doc->item;?></div>
+            <div class="file-name"><?php echo $attachLib->name;?></div>
+            <div class="text-primary file-info"><?php echo $attachLib->allCount . $lang->doc->item;?></div>
+          </a>
+          <div class="actions"></div>
+        </div>
+        <?php endforeach;?>
+        <?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">
+          <?php $browseLink = inlink('browse', "libID=$libID&browseType=bymodule&param=$module->id&orderBy=$orderBy&from=$from");?>
+          <a class="file" href="<?php echo $browseLink;?>">
+            <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 if($moduleID != 'project' and $moduleID != 'files'):?>
             <?php common::printLink('doc', 'collect', "objectID={$module->id}&objectType=module", "<i class='icon {$star}'></i>", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'");?>
             <?php common::printLink('tree', 'browse', "rootID=$libID&type=doc", "<i class='icon icon-cog'></i>", '', "title='{$lang->tree->manage}' class='btn btn-link'")?>
-            <?php endif;?>
           </div>
         </div>
         <?php endforeach;?>