Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/gitlab/view/browse.html.php

@@ -16,6 +16,16 @@
     <?php if(common::hasPriv('gitlab', 'create')) common::printLink('gitlab', 'create', "", "<i class='icon icon-plus'></i> " . $lang->gitlab->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
+<?php if(empty($gitlabList)):?>
+<div class="table-empty-tip">
+  <p>
+    <span class="text-muted"><?php echo $lang->noData;?></span>
+    <?php if(common::hasPriv('gitlab', 'create')):?>
+    <?php echo html::a($this->createLink('gitlab', 'create'), "<i class='icon icon-plus'></i> " . $lang->gitlab->create, '', "class='btn btn-info'");?>
+    <?php endif;?>
+  </p>
+</div>
+<?php else:?>
 <div id='mainContent' class='main-row'>
   <form class='main-table' id='ajaxForm' method='post'>
     <table id='gitlabList' class='table has-sort-head table-fixed'>
@@ -25,7 +35,7 @@
           <th class='w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->gitlab->id);?></th>
           <th class='w-200px text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->name);?></th>
           <th class='text-left'><?php common::printOrderLink('url', $orderBy, $vars, $lang->gitlab->url);?></th>
-          <th class='w-150px c-actions-4'><?php echo $lang->actions;?></th>
+          <th class='c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
@@ -50,4 +60,5 @@
     <?php endif;?>
   </form>
 </div>
+<?php endif;?>
 <?php include '../../common/view/footer.html.php';?>

module/repo/lang/zh-cn.php

@@ -43,7 +43,7 @@ $lang->repo->line     = '行';
 $lang->repo->expand   = '点击展开';
 $lang->repo->collapse = '点击折叠';
 
-$lang->repo->id        = '编号';
+$lang->repo->id        = 'ID';
 $lang->repo->SCM       = '类型';
 $lang->repo->name      = '名称';
 $lang->repo->path      = '地址';