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

module/bug/lang/en.php

@@ -129,7 +129,7 @@ $lang->bug->resolvedByMeAB = 'Resolved By Me';
 $lang->bug->ditto       = 'Ditto';
 $lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!';
 $lang->bug->noAssigned  = 'Not Assigned';
-$lang->bug->noBug       = 'No BUG. You could ';
+$lang->bug->noBug       = 'No Bug. You could ';
 $lang->bug->noModule    = '<div>You have no modules</div><div>Manage now</div>';
 
 /* 页面标签。*/

module/bug/lang/zh-cn.php

@@ -129,7 +129,7 @@ $lang->bug->resolvedByMeAB = '由我解决';
 $lang->bug->ditto       = '同上';
 $lang->bug->dittoNotice = '该bug与上一bug不属于同一产品！';
 $lang->bug->noAssigned  = '未指派';
-$lang->bug->noBug       = '暂时没有BUG，您现在可以';
+$lang->bug->noBug       = '暂时没有Bug，您现在可以';
 $lang->bug->noModule    = '<div>您现在还没有模块信息</div><div>请维护测试模块</div>';
 
 /* 页面标签。*/

module/doc/lang/en.php

@@ -142,6 +142,7 @@ $lang->doc->errorEmptyProject  = "No {$lang->projectCommon}. It cannot be create
 $lang->doc->errorMainSysLib    = "This library cannot be deleted.";
 $lang->doc->accessDenied       = "Access denied!";
 $lang->doc->versionNotFount    = 'It does not exist in this build.';
+$lang->doc->noDoc              = 'It does not exist.';
 
 $lang->doc->placeholder = new stdclass();
 $lang->doc->placeholder->url = 'Url';

module/doc/lang/zh-cn.php

@@ -142,6 +142,7 @@ $lang->doc->errorEmptyProject  = "没有{$lang->projectCommon}，无法创建文
 $lang->doc->errorMainSysLib    = "该系统文档库不能删除！";
 $lang->doc->accessDenied       = "您没有权限访问！";
 $lang->doc->versionNotFount    = '该版本文档不存在';
+$lang->doc->noDoc              = '文档不存在';
 
 $lang->doc->placeholder = new stdclass();
 $lang->doc->placeholder->url = '相应的链接地址';

module/doc/view/browse.html.php

@@ -45,6 +45,11 @@ var browseType = '<?php echo $browseType;?>';
           </div>
         </nav>
       </div>
+      <?php if(empty($docs)):?>
+      <div class="table-empty-tip">
+        <p><span class="text-muted"><?php echo $lang->doc->noDoc;?></span></p>
+      </div>
+      <?php else:?>
       <div class="panel-body has-table">
         <table class="table table-borderless table-hover table-files">
           <thead>
@@ -95,6 +100,7 @@ var browseType = '<?php echo $browseType;?>';
         </table>
       </div>
       <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
+      <?php endif;?>
     </div>
   </div>
   <?php endif;?>

module/doc/view/browsebygrid.html.php

@@ -4,11 +4,16 @@
       <div class="panel-title font-normal"><i class="icon icon-folder-open-o text-muted"></i> <?php echo $title;?></div>
       <nav class="panel-actions btn-toolbar">
         <div class="btn-group">
-          <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon btn-gray'");?>
-          <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon btn-gray text-primary'");?>
+          <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon btn-gray'");?>
+          <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon btn-gray text-primary'");?>
         </div>
       </nav>
     </div>
+    <?php if(empty($docs)):?>
+    <div class="table-empty-tip">
+      <p><span class="text-muted"><?php echo $lang->doc->noDoc;?></span></p>
+    </div>
+    <?php else:?>
     <div class="panel-body">
       <div class="row row-grid files-grid" data-size="300">
         <?php foreach($modules as $module):?>
@@ -44,5 +49,6 @@
       </div>
     </div>
     <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
+    <?php endif;?>
   </div>
 </div>

module/testtask/lang/zh-cn.php

@@ -104,7 +104,7 @@ $lang->testtask->showFail      = '失败<span class="text-danger">%s</span>次';
 $lang->testtask->confirmDelete     = '您确认要删除该版本吗？';
 $lang->testtask->confirmUnlinkCase = '您确认要移除该用例吗？';
 $lang->testtask->noticeNoOther     = '该产品还没有其他测试版本';
-$lang->testtask->noTesttask        = '暂时没有记录，您现在可以';
+$lang->testtask->noTesttask        = '暂时没有测试版本，您现在可以';
 
 $lang->testtask->assignedToMe  = '指派给我';
 $lang->testtask->allCases      = '所有用例';

module/testtask/view/linkcase.html.php

@@ -24,7 +24,8 @@
 
     echo "<div class='btn-group'>";
     $suitViewName = $type == 'bysuite'? $suiteList[$param]->name : $lang->testtask->linkBySuite;
-    echo "<a href='javascript:;' class='btn btn-link' data-toggle='dropdown'><span class='text'>{$suitViewName}</span> <span class='caret'></span></a>";
+    $suitActive   = $type == 'bysuite' ? 'btn-active-text' : '';
+    echo "<a href='javascript:;' class='btn btn-link {$suitActive}' data-toggle='dropdown'><span class='text'>{$suitViewName}</span> <span class='caret'></span></a>";
     echo "<ul class='dropdown-menu' style='max-height:240px;overflow-y:auto'>";
     if($suiteList)
     {
@@ -43,7 +44,8 @@
 
     echo "<div class='btn-group'>";
     $buildViewName = $type == 'bybuild'? zget($testTask, $param) : $lang->testtask->linkByBuild;
-    echo "<a href='javascript:;' class='btn btn-link' data-toggle='dropdown'><span class='text'>{$buildViewName}</span> <span class='caret'></span></a>";
+    $buildActive   = $type == 'bybuild' ? 'btn-active-text' : '';
+    echo "<a href='javascript:;' class='btn btn-link {$buildActive}' data-toggle='dropdown'><span class='text'>{$buildViewName}</span> <span class='caret'></span></a>";
     echo "<ul class='dropdown-menu' style='max-height:240px;overflow-y:auto'>";
     if($testTask)
     {

module/tree/view/browse.html.php

@@ -26,7 +26,7 @@
         <?php
         if($viewType == 'doc')
         {
-            echo $lang->doc->manageType;
+            echo $lang->doc->manageType . $lang->colon . $root->name;
         }
         elseif($viewType == 'line')
         {
@@ -34,9 +34,8 @@
         }
         else
         {
-            echo $lang->tree->common;
+            echo $lang->tree->common . $lang->colon . $root->name;
         }
-        echo $lang->colon . $root->name;
         ?>
       </span>
     </div>
@@ -266,7 +265,7 @@ $(function()
         e.stopPropagation();
     });
 
-    $('#modulemenu > .nav > li > a[href*=tree][href*=browse]').not('[href*=<?php echo $viewType;?>]').parent().removeClass('active');
+    $('#subNavbar > ul > li > a[href*=tree][href*=browse]').not('[href*=<?php echo $viewType;?>]').parent().removeClass('active');
     if(window.config.viewType == 'line') $('#modulemenu > .nav > li > a[href*=product][href*=all]').parent('li[data-id=all]').addClass('active');
 });
 </script>