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

module/action/view/trash.html.php

@@ -43,8 +43,13 @@
           <td><?php echo $action->objectID;?></td>
           <td class='text-left'>
             <?php
-            $methodName = $module == 'caselib' ? 'libview' : 'view';
             $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
+            $methodName = 'view';
+            if($module == 'caselib')
+            {
+                $methodName = 'libview';
+                $module     = 'testsuite';
+            }
             if($module == 'doclib' or $module == 'module')
             {
                 echo $action->objectName;

module/bug/view/browse.html.php

@@ -380,7 +380,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
       </div>
       <?php elseif(common::hasPriv('bug', 'create')):?>
       <div class="table-empty-tip">
-        <p><span class="text-muted"><?php echo $lang->bug->noBug;?></span> <?php common::printLink('bug', 'create', "productID={$productID}", "<i class='icon icon-plus'> </i>" . $lang->bug->create, '', "class='btn btn-info'");?></p>
+        <p><span class="text-muted"><?php echo $lang->bug->noBug;?></span> <?php common::printLink('bug', 'create', "productID={$productID}", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-info'");?></p>
       </div>
       <?php endif;?>
     </form>

module/bug/view/confirmbug.html.php

@@ -32,7 +32,7 @@ js::set('page', 'confirmbug');
       <table class='table table-form'>
         <tr>
           <th class='w-80px'><?php echo $lang->bug->assignedTo;?></th>
-          <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-controlform-control chosen'");?></td>
+          <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?></td>
           <td></td>
         </tr>
         <tr>

module/company/view/browse.html.php

@@ -27,8 +27,8 @@ js::set('confirmDelete', $lang->user->confirmDelete);
   </div>
   <div class='btn-toolbar pull-right'>
     <?php common::printIcon('group', 'create', '', '', 'button', '', '', 'iframe', true, "data-width='550px'");?>
-    <?php common::printLink('user', 'batchCreate', "dept={$deptID}", "<i class='icon icon-plus'> </i>" . $lang->user->batchCreate, '', "class='btn btn-secondary'");?>
-    <?php common::printLink('user', 'create', "dept={$deptID}", "<i class='icon icon-plus'> </i>" . $lang->user->create, '', "class='btn btn-primary'");?>
+    <?php common::printLink('user', 'batchCreate', "dept={$deptID}", "<i class='icon icon-plus'></i> " . $lang->user->batchCreate, '', "class='btn btn-secondary'");?>
+    <?php common::printLink('user', 'create', "dept={$deptID}", "<i class='icon icon-plus'></i> " . $lang->user->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id='mainContent' class='main-row'>

module/group/view/browse.html.php

@@ -23,47 +23,47 @@
     <?php endif;?>
   </div>
 </div>
-<div id='mainContent' class='main-content'>
+<div id='mainContent' class='main-table'>
   <table class='table' id='groupList'>
     <thead>
       <tr>
-       <th class='w-id text-center'><?php echo $lang->group->id;?></th>
-       <th class='w-100px'><?php echo $lang->group->name;?></th>
-       <th class='w-300px'><?php echo $lang->group->desc;?></th>
-       <th><?php echo $lang->group->users;?></th>
-       <th class='c-actions text-center'><?php echo $lang->actions;?></th>
+        <th class='w-id text-center'><?php echo $lang->group->id;?></th>
+        <th class='w-130px'><?php echo $lang->group->name;?></th>
+        <th class='w-300px'><?php echo $lang->group->desc;?></th>
+        <th><?php echo $lang->group->users;?></th>
+        <th class='c-actions text-center'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>
-    <?php foreach($groups as $group):?>
-    <?php $users = implode(',', $groupUsers[$group->id]);?>
-    <tr>
-      <td class='text-center'><?php echo $group->id;?></td>
-      <td><?php echo $group->name;?></td>
-      <td title='<?php echo $group->desc?>'><?php echo $group->desc;?></td>
-      <td title='<?php echo $users;?>'><?php echo $users;?></td>
-      <td class='c-actions'>
-        <?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
-        <?php common::printIcon('group', 'manageView', "groupID=$group->id", $group, 'list', 'eye');?>
-        <?php common::printIcon('group', 'managepriv', "type=byGroup&param=$group->id", $group, 'list', 'lock');?>
-        <?php $lang->group->managemember = $lang->group->manageMember;?>
-        <?php common::printIcon('group', 'managemember', "groupID=$group->id", $group, 'list', 'persons', '', 'iframe', 'yes', "data-width='750'");?>
-        <?php common::printIcon('group', 'edit', "groupID=$group->id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
-        <?php common::printIcon('group', 'copy', "groupID=$group->id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
-        <?php
-        if(common::hasPriv('group', 'delete') and $group->role != 'limited')
-        {
-            $deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
-            echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '<i class="icon icon-trash"></i>', '', "title='{$lang->group->delete}' class='btn'");
-        }
-        else
-        {
-            echo "<button class='btn disabled'><i class='icon icon-trash disabled' title='{$lang->group->delete}'></i></button>";
-        }
-        ?>
-      </td>
-    </tr>
-    <?php endforeach;?>
+      <?php foreach($groups as $group):?>
+      <?php $users = implode(',', $groupUsers[$group->id]);?>
+      <tr>
+        <td class='text-center'><?php echo $group->id;?></td>
+        <td><?php echo $group->name;?></td>
+        <td title='<?php echo $group->desc?>'><?php echo $group->desc;?></td>
+        <td title='<?php echo $users;?>'><?php echo $users;?></td>
+        <td class='c-actions'>
+          <?php $lang->group->managepriv = $lang->group->managePrivByGroup;?>
+          <?php common::printIcon('group', 'manageView', "groupID=$group->id", $group, 'list', 'eye');?>
+          <?php common::printIcon('group', 'managepriv', "type=byGroup&param=$group->id", $group, 'list', 'lock');?>
+          <?php $lang->group->managemember = $lang->group->manageMember;?>
+          <?php common::printIcon('group', 'managemember', "groupID=$group->id", $group, 'list', 'persons', '', 'iframe', 'yes', "data-width='750'");?>
+          <?php common::printIcon('group', 'edit', "groupID=$group->id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
+          <?php common::printIcon('group', 'copy', "groupID=$group->id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>
+          <?php
+          if(common::hasPriv('group', 'delete') and $group->role != 'limited')
+          {
+              $deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
+              echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '<i class="icon icon-trash"></i>', '', "title='{$lang->group->delete}' class='btn'");
+          }
+          else
+          {
+              echo "<button class='btn disabled'><i class='icon icon-trash disabled' title='{$lang->group->delete}'></i></button>";
+          }
+          ?>
+        </td>
+      </tr>
+      <?php endforeach;?>
     </tbody>
   </table>
 </div>

module/my/view/todo.html.php

@@ -36,8 +36,8 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::hasPriv('todo', 'export')) echo html::a(helper::createLink('todo', 'export', "account=$account&orderBy=$orderBy", 'html', true), "<i class='icon-export muted'> </i> " . $lang->todo->export, '', "class='btn btn-link iframe'");?>
-    <?php common::printLink('todo', 'batchCreate', '', "<i class='icon icon-plus'> </i>" . $lang->todo->batchCreate, '', "id='batchCreate' class='btn btn-secondary iframe' data-width='80%'", '', 'true');?>
-    <?php common::printLink('todo', 'create', '', "<i class='icon icon-plus'> </i>" . $lang->todo->create, '', "id='create' class='btn btn-primary iframe' data-width='80%'", '', 'true');?>
+    <?php common::printLink('todo', 'batchCreate', '', "<i class='icon icon-plus'></i> " . $lang->todo->batchCreate, '', "id='batchCreate' class='btn btn-secondary iframe' data-width='80%'", '', 'true');?>
+    <?php common::printLink('todo', 'create', '', "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "id='create' class='btn btn-primary iframe' data-width='80%'", '', 'true');?>
   </div>
 </div>
 <div id="mainContent">

module/product/view/build.html.php

@@ -16,7 +16,7 @@
   <div class='btn-toolbar pull-left'>
     <a class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->product->build;?></span><span class='label label-light label-badge'><?php echo count($builds);?></span></a>
   </div>
-  <div class='btn-toolbar pull-right'><?php common::printLink('build', 'create', "product=$product->id", "<i class='icon icon-plus'> </i>" . $lang->build->create, '', "class='btn btn-primary'");?></div>
+  <div class='btn-toolbar pull-right'><?php common::printLink('build', 'create', "product=$product->id", "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-primary'");?></div>
 </div>
 <div id='mainContent' class='main-table'>
   <table class='table' id='buildList'>

module/product/view/index.html.php

@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php if(empty($products)):?>
 <div class="table-empty-tip">
-  <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('product', 'create', '', "<i class='icon icon-plus'> </i>" . $lang->product->create, '', "class='btn btn-info'");?></p>
+  <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('product', 'create', '', "<i class='icon icon-plus'></i> " . $lang->product->create, '', "class='btn btn-info'");?></p>
 </div>
 <?php else:?>
 <?php echo $this->fetch('block', 'dashboard', 'module=product');?>

module/product/view/showerrornone.html.php

@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div class="table-empty-tip">
-  <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('product', 'create', '', "<i class='icon icon-plus'> </i>" . $lang->product->create, '', "class='btn btn-info'");?></p>
+  <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('product', 'create', '', "<i class='icon icon-plus'></i> " . $lang->product->create, '', "class='btn btn-info'");?></p>
 </div>
 <?php include '../../common/view/footer.html.php';?>
 

module/project/css/manageproducts.css

@@ -6,4 +6,4 @@
 .product + .product {margin-left: 0;}
 #productsBox .row > .product.has-branch label {margin-right: 40%;}
 #productsBox .row > .product.has-branch > .form-control,
-#productsBox .row > .product.has-branch > .chosen-container {position: absolute; width: 40%!important; right: 3px; top: 3px;}
+#productsBox .row > .product.has-branch > .chosen-container {position: absolute; width: 40%!important; right: 1px; top: 1px;}

module/project/view/bug.html.php

@@ -22,7 +22,7 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php common::printLink('bug', 'export', "productID=$productID&orderBy=$orderBy", "<i class='icon icon-export muted'> </i>" . $lang->bug->export, '', "class='btn btn-link export'");?>
-    <?php common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extra=projectID=$project->id", "<i class='icon icon-plus'> </i>" . $lang->bug->create, '', "class='btn btn-primary'");?>
+    <?php common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extra=projectID=$project->id", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id="mainContent">

module/project/view/build.html.php

@@ -24,7 +24,7 @@
     </span>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php common::printLink('build', 'create', "project=$project->id", "<i class='icon icon-plus'> </i>" . $lang->build->create, '', "class='btn btn-primary'");?>
+    <?php common::printLink('build', 'create', "project=$project->id", "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id="mainContent">

module/project/view/story.html.php

@@ -62,8 +62,8 @@
     $this->lang->story->create = $this->lang->project->createStory;
     if($productID and !$this->loadModel('story')->checkForceReview())
     {
-        common::printLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'> </i>" . $lang->story->batchCreate, '', "class='btn btn-secondary'");
-        common::printLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'> </i>" . $lang->story->create, '', "class='btn btn-primary'");
+        common::printLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'></i> " . $lang->story->batchCreate, '', "class='btn btn-secondary'");
+        common::printLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'></i> " . $lang->story->create, '', "class='btn btn-primary'");
     }
     ?>
   </div>

module/project/view/storykanban.html.php

@@ -36,7 +36,7 @@
     }
     ?>
     </div>
-    <?php if($productID and !$this->loadModel('story')->checkForceReview()) common::printLink('story', 'create', "productID=$productID&branch=&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'> </i>" . $lang->project->createStory, '', "class='btn btn-primary'");?>
+    <?php if($productID and !$this->loadModel('story')->checkForceReview()) common::printLink('story', 'create', "productID=$productID&branch=&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'></i> " . $lang->project->createStory, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <?php

module/project/view/testtask.html.php

@@ -27,7 +27,7 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php common::printIcon('testreport', 'browse', "objectID=$projectID&objectType=project", '', 'button','flag');?>
-    <?php common::printLink('testtask', 'create', "product=0&project=$projectID", "<i class='icon icon-plus'> </i>" . $lang->testtask->create, '', "class='btn btn-primary'");?>
+    <?php common::printLink('testtask', 'create', "product=0&project=$projectID", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <div id="mainContent">

module/search/view/buildform.html.php

@@ -189,7 +189,7 @@ foreach($fieldParams as $fieldName => $param)
         <ul>
           <?php foreach($queries as $queryID => $queryName):?>
           <?php if(empty($queryID)) continue;?>
-          <li><?php echo html::a("javascript:executeQuery($queryID)", $queryName . (common::hasPriv('search', 'deleteQuery') ? '<i class="icon icon-close"></i>' : ''), '', "class='label user-query' data-query-id='$queryID'");?></li>
+          <li><?php echo html::a("javascript:executeQuery($queryID)", $queryName . (common::hasPriv('search', 'deleteQuery') ? '<i class="icon icon-close"></i>' : ''), '', "class='label user-query' data-query-id='$queryID' title='{$queryName}'");?></li>
           <?php endforeach;?>
         </ul>
       </td>

module/testcase/view/browse.html.php

@@ -198,7 +198,7 @@ js::set('branch',         $branch);
       </div>
       <?php elseif(common::hasPriv('testcase', 'create')):?>
       <div class="table-empty-tip">
-        <p><span class="text-muted"><?php echo $lang->testcase->noCase;?></span> <?php common::printLink('testcase', 'create', "productID={$productID}", "<i class='icon icon-plus'> </i>" . $lang->testcase->create, '', "class='btn btn-info'");?></p>
+        <p><span class="text-muted"><?php echo $lang->testcase->noCase;?></span> <?php common::printLink('testcase', 'create', "productID={$productID}", "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?></p>
       </div>
       <?php endif;?>
     </form>

module/testsuite/view/browse.html.php

@@ -22,7 +22,7 @@
     </a>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php common::printLink('testsuite', 'create', "product=$productID", "<i class='icon icon-plus'> </i>" . $lang->testsuite->create, '', "class='btn btn-primary'");?>
+    <?php common::printLink('testsuite', 'create', "product=$productID", "<i class='icon icon-plus'></i> " . $lang->testsuite->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <?php endif;?>

module/testtask/view/browse.html.php

@@ -45,12 +45,12 @@ $status = $this->session->testTaskVersionStatus;
       <div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $endTime, "class='form-control form-date' onchange='changeDate(\"$beginTime\", this.value, \"$condition\")'");?></div>
     </div>
   </div>
-  <div class="btn-toolbar pull-right"><?php common::printLink('testtask', 'create', "product=$productID", "<i class='icon icon-plus'> </i>" . $lang->testtask->create, '', "class='btn btn-primary'");?></div>
+  <div class="btn-toolbar pull-right"><?php common::printLink('testtask', 'create', "product=$productID", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?></div>
 </div>
 <?php endif;?>
 <?php if($scope == 'local' && $status == 'totalStatus' && empty($tasks)):?>
 <div class="table-empty-tip">
-  <p><span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span> <?php common::printLink('testtask', 'create', "productID={$productID}", "<i class='icon icon-plus'> </i>" . $lang->testtask->create, '', "class='btn btn-info'");?></p>
+  <p><span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span> <?php common::printLink('testtask', 'create', "productID={$productID}", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-info'");?></p>
 </div>
 <?php else:?>
 <div id='mainContent' class='main-table'>