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

lib/pager/pager.class.php

@@ -39,7 +39,7 @@ class pager extends basePager
                 if(strtolower($key) == 'recperpage') $params[$key] = '{recPerPage}';
                 if(strtolower($key) == 'pageid')     $params[$key] = '{page}';
             }
-            echo "<ul class='pager' data-ride='pager' data-rec-total='{$this->recTotal}' data-rec-per-page='{$this->recPerPage}' data-page='{$this->pageID}' data-link-creator='" . helper::createLink($this->moduleName, $this->methodName, $params) . "'></ul>";
+            echo "<ul class='pager' data-page-cookie='{$this->pageCookie}' data-ride='pager' data-rec-total='{$this->recTotal}' data-rec-per-page='{$this->recPerPage}' data-page='{$this->pageID}' data-link-creator='" . helper::createLink($this->moduleName, $this->methodName, $params) . "'></ul>";
         }
         else
         {

module/admin/view/checkweak.html.php

@@ -21,18 +21,18 @@
   <div class='main-table pd-0'>
     <table class='table table-condensed table-hover table-striped table-fixed'>
       <thead>
-        <th class='w-id'><?php echo $lang->idAB;?></th>
+        <th class='c-id-sm text-center'><?php echo $lang->idAB;?></th>
         <th class='w-150px'><?php echo $lang->user->realname;?></th>
         <th><?php echo $lang->user->account;?></th>
         <th class='w-150px'><?php echo $lang->user->phone;?></th>
         <th class='w-150px'><?php echo $lang->user->mobile;?></th>
         <th class='w-150px'><?php echo $lang->admin->safe->reason;?></th>
-        <th class='w-50px'><?php echo $lang->actions;?></th>
+        <th class='c-actions-1'><?php echo $lang->actions;?></th>
       </thead>
       <tbody>
         <?php foreach($weakUsers as $user):?>
         <tr>
-          <td class='text-right'><?php echo $user->id?></td>
+          <td class='text-center'><?php echo $user->id?></td>
           <td class='text-left'><?php echo $user->realname?></td>
           <td class='text-left'><?php echo $user->account?></td>
           <td><?php echo $user->phone?></td>

module/bug/view/linkbugs.html.php

@@ -70,7 +70,4 @@
   </form>
   <?php endif;?>
 </div>
-<script>
-$(function(){ajaxGetSearchForm();});
-</script>
 <?php include '../../common/view/footer.html.php';?>

module/build/view/view.html.php

@@ -106,7 +106,7 @@ tbody tr td:first-child input{display:none;}
                 <th class='w-70px'>   <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
                 <th class='w-70px'>   <?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
                 <th class='w-100px'>  <?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
-                <th class='w-60px'>   <?php echo $lang->actions?></th>
+                <th class='c-actions-1'>   <?php echo $lang->actions?></th>
               </tr>
             </thead>
             <tbody class='text-center'>

module/company/view/browse.html.php

@@ -65,8 +65,8 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           <th><?php common::printOrderLink('phone', $orderBy, $vars, $lang->user->phone);?></th>
           <th><?php common::printOrderLink('qq', $orderBy, $vars, $lang->user->qq);?></th>
           <th class="c-date"><?php common::printOrderLink('last', $orderBy, $vars, $lang->user->last);?></th>
-          <th class="c-num"><?php common::printOrderLink('visits', $orderBy, $vars, $lang->user->visits);?></th>
-          <th class='c-actions-2'><?php echo $lang->actions;?></th>
+          <th class="w-90px"><?php common::printOrderLink('visits', $orderBy, $vars, $lang->user->visits);?></th>
+          <th class='c-actions'><?php echo $lang->actions;?></th>
         </tr>
         </thead>
         <tbody>
@@ -89,16 +89,12 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           <td class='c-date'><?php if($user->last) echo date('Y-m-d', $user->last);?></td>
           <td class='c-num text-center'><?php echo $user->visits;?></td>
           <td class='c-actions'>
-            <div class='more'>
-              <?php
-              if(true or $user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin");
-              if(true or (strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
-              {
-                  common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', 'unlock', "hiddenwin");
-              }
-              ?>
-            </div>
             <?php
+            if(true or $user->ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin");
+            if(true or (strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60)
+            {
+                common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', 'unlock', "hiddenwin");
+            }
             common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list');
             if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete'))
             {

module/doc/view/browse.html.php

@@ -59,7 +59,7 @@ var browseType = '<?php echo $browseType;?>';
               <th class="c-user"><?php echo $lang->doc->addedBy;?></th>
               <th class="c-datetime"><?php echo $lang->doc->addedDate;?></th>
               <th class="c-datetime"><?php echo $lang->doc->editedDate;?></th>
-              <th class="c-actions"><?php echo $lang->actions;?></th>
+              <th class="c-actions-3"><?php echo $lang->actions;?></th>
             </tr>
           </thead>
           <tbody>

module/entry/view/browse.html.php

@@ -12,7 +12,7 @@
 ?>
 <?php include 'header.html.php';?>
 <?php js::set('confirmDelete', $lang->entry->confirmDelete);?>
-<div id='mainContent' class='main-content'>
+<div id='mainContent'>
   <form id='ajaxForm' class='main-table' method='post'>
     <table id='entryList' class='table has-sort-head table-fix'>
       <thead>
@@ -24,7 +24,7 @@
           <th class='w-200px'><?php common::printOrderLink('key',  $orderBy, $vars, $lang->entry->key);?></th>
           <th class='w-200px'><?php common::printOrderLink('ip',   $orderBy, $vars, $lang->entry->ip);?></th>
           <th><?php echo common::printOrderLink('desc', $orderBy, $vars, $lang->entry->desc);?></th>
-          <th class='w-130px'><?php echo $lang->actions;?></th>
+          <th class='c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/entry/view/create.html.php

@@ -13,14 +13,14 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/form.html.php';?>
 <div id='mainContent' class='main-content'>
-  <div class='center-block mw-800px'>
+  <div class='center-block mw-800px center-block-sm'>
     <div class="main-header">
       <h2>
         <?php echo $lang->entry->api;?>
-        <small class="text-muted"> <?php echo $lang->entry->create;?></small>
+        <small><?php echo $lang->arrow . ' ' . $lang->entry->create;?></small>
       </h2>
     </div>
-    <form id='entryForm' method='post' class='ajaxForm'>
+    <form class='main-form' id='entryForm' method='post' class='ajaxForm'>
       <table class='table table-form'>
         <tr>
           <th class='w-80px'><?php echo $lang->entry->name;?></th>

module/entry/view/edit.html.php

@@ -13,14 +13,14 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/form.html.php';?>
 <div id='mainContent' class='main-content'>
-<div class='center-block mw-800px'>
+<div class='center-block mw-800px center-block-sm'>
   <div class="main-header">
     <h2>
       <?php echo $lang->entry->api;?>
-      <small class="text-muted"> <?php echo $lang->entry->edit;?></small>
+      <small><?php echo $lang->arrow . ' ' . $lang->entry->edit;?></small>
     </h2>
   </div>
-  <form id='entryForm' method='post' class='ajaxForm'>
+  <form class='main-form' id='entryForm' method='post' class='ajaxForm'>
     <table class='table table-form'>
       <tr>
         <th class='w-80px'><?php echo $lang->entry->name;?></th>

module/entry/view/header.html.php

@@ -16,6 +16,6 @@
     <?php common::printLink('entry', 'browse', '', "<span class='text'>{$lang->entry->common}</span>", '', "class='btn btn-link btn-active-text'");?>
   </div>
   <div class='btn-toolbar pull-right'>
-    <?php common::printIcon('entry', 'create', '', '', 'button', '', '', 'btn-primary');?>
+    <?php echo html::a($this->createLink('entry', 'create'), "<i class='icon icon-plus'></i> {$lang->entry->create}", '', "class='btn btn-primary'"); ?>
   </div>
 </div>

module/group/css/browse.css

@@ -1,2 +1 @@
-.user{display:block; width:80px; float:left; overflow:hidden}
-.c-actions{width: 220px;}
+.user {display:block; width:80px; float:left; overflow:hidden}

module/group/view/browse.html.php

@@ -31,7 +31,7 @@
         <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>
+        <th class='c-actions-6 text-center'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>

module/mail/view/browse.html.php

@@ -35,7 +35,7 @@
           <th class='w-150px'> <?php common::printOrderLink('sendTime',    $orderBy, $vars, $lang->mail->sendTime);?></th>
           <th class='w-80px'>  <?php common::printOrderLink('status',      $orderBy, $vars, $lang->mail->status);?></th>
           <th>                 <?php echo $lang->mail->failReason;?></th>
-          <th class='w-80px'>  <?php echo $lang->actions;?></th>
+          <th class='c-actions-2'>  <?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/my/css/todo.css

@@ -1,3 +1,2 @@
 .datepicker-wrapper{width: 110px!important;}
-.datepicker-wrapper .form-control {max-width: 110px; line-height: 25px; height: 26px!important}
-th.c-actions{width:160px !important;}
+.datepicker-wrapper .form-control {max-width: 110px; line-height: 25px; height: 26px!important}

module/my/view/bug.html.php

@@ -44,7 +44,7 @@
           <th class='w-user'>      <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedTo);?></th>
           <th class='w-user'>      <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
           <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
-          <th class='w-180px'> <?php echo $lang->actions;?></th>
+          <th class='c-actions-5'> <?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/my/view/story.html.php

@@ -47,7 +47,7 @@
           <th class='c-hours'>    <?php common::printOrderLink('estimate',     $orderBy, $vars, $lang->story->estimateAB);?></th>
           <th class='c-status'>   <?php common::printOrderLink('status',       $orderBy, $vars, $lang->statusAB);?></th>
           <th class='c-stage'>    <?php common::printOrderLink('stage',        $orderBy, $vars, $lang->story->stageAB);?></th>
-          <th class='c-actions-4'><?php echo $lang->actions;?></th>
+          <th class='c-actions-5'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/my/view/task.html.php

@@ -49,7 +49,7 @@
           <th class='c-hours'>   <?php common::printOrderLink('left',        $orderBy, $vars, $lang->task->leftAB);?></th>
           <th class='c-date'>    <?php common::printOrderLink('deadline',    $orderBy, $vars, $lang->task->deadlineAB);?></th>
           <th class='c-status'>  <?php common::printOrderLink('status',      $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='c-actions-4'><?php echo $lang->actions;?></th>
+          <th class='c-actions-5'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/my/view/testcase.html.php

@@ -52,7 +52,7 @@
           <th class='w-120px'> <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
           <th class='w-80px'>  <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
           <th class='w-status'><?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='w-130px'> <?php echo $lang->actions;?></th>
+          <th class='c-actions-5'> <?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
@@ -80,19 +80,9 @@
           <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
           <td class='<?php if(isset($run)) echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
           <td class='c-actions'>
-            <div class='more'>
-              <?php
-              common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug');
-              common::printIcon('testcase', 'create',  "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$caseID", $case, 'list', 'copy');
-
-              if(common::hasPriv('testcase', 'delete'))
-              {
-                  $deleteURL = $this->createLink('testcase', 'delete', "caseID=$caseID&confirm=yes");
-                  echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$lang->testcase->delete}'");
-              }
-              ?>
-            </div>
             <?php
+            common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug');
+            common::printIcon('testcase', 'create',  "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$caseID", $case, 'list', 'copy');
             common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', '', "data-width='95%'");
             common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', '', "data-width='95%'");
             common::printIcon('testcase', 'edit',    "caseID=$caseID", $case, 'list', 'edit');

module/my/view/testtask.html.php

@@ -34,7 +34,7 @@
         <th class='w-90px'> <?php common::printOrderLink('begin',   $orderBy, $vars, $lang->testtask->begin);?></th>
         <th class='w-90px'> <?php common::printOrderLink('end',     $orderBy, $vars, $lang->testtask->end);?></th>
         <th class='w-80px'> <?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
-        <th class='w-150px'><?php echo $lang->actions;?></th>
+        <th class='c-actions-3'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>
@@ -52,12 +52,6 @@
           common::printIcon('testtask', 'cases',    "taskID=$task->id", 'play', 'list', 'sitemap');
           common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list', 'link');
           common::printIcon('testtask', 'edit',     "taskID=$task->id", '', 'list');
-
-          if(common::hasPriv('testtask', 'delete'))
-          {
-              $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
-              echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
-          }
           ?>
         </td>
       </tr>

module/product/view/build.html.php

@@ -28,7 +28,7 @@
         <th><?php echo $lang->build->filePath;?></th>
         <th class='c-date'><?php echo $lang->build->date;?></th>
         <th class='c-user'><?php echo $lang->build->builder;?></th>
-        <th class='w-130px'><?php echo $lang->actions;?></th>
+        <th class='c-actions-3'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>

module/productplan/view/browse.html.php

@@ -52,7 +52,7 @@
         <th class='w-60px'> <?php echo $lang->productplan->hour;?></th>
         <th class='w-60px'> <?php echo $lang->productplan->project;?></th>
         <th>                <?php echo $lang->productplan->desc;?></th>
-        <th class='c-actions-4'><?php echo $lang->actions;?></th>
+        <th class='c-actions-5'><?php echo $lang->actions;?></th>
       </tr>
       </thead>
       <tbody>

module/productplan/view/view.html.php

@@ -111,7 +111,7 @@
                 <th class='w-70px'> <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
                 <th class='w-70px'> <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
                 <th class='w-80px'> <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
-                <th class='w-50px'> <?php echo $lang->actions?></th>
+                <th class='c-actions-1'> <?php echo $lang->actions?></th>
               </tr>
             </thead>
             <tbody class='text-center'>

module/project/view/bug.html.php

@@ -48,7 +48,7 @@
           <th class='w-110px'>   <?php common::printOrderLink('assignedTo',   $orderBy, $vars, $lang->assignedToAB);?></th>
           <th class='w-user'>    <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedBy);?></th>
           <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
-          <th class='w-130px text-center'><?php echo $lang->actions;?></th>
+          <th class='c-actions text-center'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
@@ -78,10 +78,8 @@
         <td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy);?></td>
         <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
         <td class='c-actions'>
-          <div class='more'>
-            <?php if($bug->status == 'active') common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'search', '', 'iframe', true);?>
-          </div>
           <?php
+          if($bug->status == 'active') common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'search', '', 'iframe', true);
           if($bug->status == 'active') common::printIcon('bug', 'resolve', $params, $bug, 'list', 'check', '', 'iframe', true);
           if($bug->status != 'active') common::printIcon('bug', 'close',   $params, $bug, 'list', '', '', 'iframe', true);
           common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy');

module/project/view/build.html.php

@@ -39,7 +39,7 @@
           <th class="c-url"><?php echo $lang->build->filePath;?></th>
           <th class="c-date"><?php echo $lang->build->date;?></th>
           <th class="c-user"><?php echo $lang->build->builder;?></th>
-          <th class="c-actions-3"><?php echo $lang->actions;?></th>
+          <th class="c-actions-4"><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/project/view/story.html.php

@@ -112,7 +112,7 @@
             <th title='<?php echo $lang->story->taskCount?>' class='w-30px'><?php echo $lang->story->taskCountAB;?></th>
             <th title='<?php echo $lang->story->bugCount?>'  class='w-30px'><?php echo $lang->story->bugCountAB;?></th>
             <th title='<?php echo $lang->story->caseCount?>' class='w-30px'><?php echo $lang->story->caseCountAB;?></th>
-            <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
+            <th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody id='storyTableList' class='sortable'>

module/project/view/testtask.html.php

@@ -52,7 +52,7 @@
           <th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
           <th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
           <th class='w-80px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
+          <th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/release/view/browse.html.php

@@ -35,7 +35,7 @@
         <?php endif;?>
         <th class='c-date text-center'><?php echo $lang->release->date;?></th>
         <th class='text-center w-90px'><?php echo $lang->release->status;?></th>
-        <th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
+        <th class='c-actions-5 text-center'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>

module/release/view/view.html.php

@@ -86,7 +86,7 @@
                     <th class='w-80px'>   <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
                     <th class='w-90px'>   <?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
                     <th class='w-100px'>  <?php common::printOrderLink('stage',    $orderBy, $vars, $lang->story->stageAB);?></th>
-                    <th class='w-50px'>   <?php echo $lang->actions?></th>
+                    <th class='c-actions-1'>   <?php echo $lang->actions?></th>
                   </tr>
                 </thead>
                 <tbody class='text-center'>

module/story/view/zerocase.html.php

@@ -33,7 +33,7 @@
         <th class='w-hour'><?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
         <th>               <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
         <th>               <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
-        <th class='w-180px'><?php echo $lang->actions;?></th>
+        <th class='c-actions-5'><?php echo $lang->actions;?></th>
       </tr>
       </thead>
       <tbody>

module/task/view/recordestimate.html.php

@@ -45,7 +45,7 @@
             <th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
             <th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
             <th><?php echo $lang->comment;?></th>
-            <th class='c-actions'><?php echo $lang->actions;?></th>
+            <th class='c-actions-2'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody>

module/testcase/view/groupcase.html.php

@@ -35,7 +35,7 @@
         <th class='w-30px' title='<?php echo $lang->testcase->bugs?>'><?php echo $lang->testcase->bugsAB;?></th>
         <th class='w-30px' title='<?php echo $lang->testcase->results?>'><?php echo $lang->testcase->resultsAB;?></th>
         <th class='w-30px' title='<?php echo $lang->testcase->stepNumber?>'><?php echo $lang->testcase->stepNumberAB;?></th>
-        <th class='w-100px'> <?php echo $lang->actions;?></th>
+        <th class='c-actions-2'> <?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>

module/testreport/view/browse.html.php

@@ -30,7 +30,7 @@
         <th class='w-150px'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->testreport->createdDate);?></th>
         <th class='w-250px text-left'><?php common::printOrderLink('project', $orderBy, $vars, $lang->testreport->project);?></th>
         <th class='w-250px text-left'><?php echo $lang->testreport->testtask;?></th>
-        <th class='w-80px'> <?php echo $lang->actions;?></th>
+        <th class='c-actions-2'> <?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <?php if($reports):?>

module/testsuite/view/browse.html.php

@@ -36,7 +36,7 @@
         <th><?php echo $lang->testsuite->desc;?></th>
         <th class='w-90px'><?php common::printOrderLink('addedBy',   $orderBy, $vars, $lang->testsuite->addedBy);?></th>
         <th class='w-150px'><?php common::printOrderLink('addedDate', $orderBy, $vars, $lang->testsuite->addedDate);?></th>
-        <th class='w-130px text-center'><?php echo $lang->actions;?></th>
+        <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>
@@ -44,8 +44,8 @@
     <tr class='text-left'>
       <td><?php echo sprintf('%03d', $suite->id);?></td>
       <td class='text-left' title="<?php echo $suite->name?>">
-        <?php if($suite->type == 'public') echo "<span class='label label-info'>{$lang->testsuite->authorList['public']}</span> ";?>
-        <?php if($suite->type == 'private') echo "<span class='label label-warning'>{$lang->testsuite->authorList['private']}</span> ";?>
+        <?php if($suite->type == 'public') echo "<span class='label label-success label-badge'>{$lang->testsuite->authorList['public']}</span> ";?>
+        <?php if($suite->type == 'private') echo "<span class='label label-info label-badge'>{$lang->testsuite->authorList['private']}</span> ";?>
         <?php echo html::a(inlink('view', "suiteID=$suite->id"), $suite->name);?>
       </td>
       <td><?php echo $suite->desc;?></td>

module/testsuite/view/library.html.php

@@ -150,7 +150,7 @@ js::set('flow',   $this->config->global->flow);
             <th class='c-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
             <th class='c-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
             <th class='c-status'><?php common::printOrderLink('status',   $orderBy, $vars, $lang->statusAB);?></th>
-            <th class='c-actions text-center'><?php echo $lang->actions;?></th>
+            <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody>

module/testsuite/view/view.html.php

@@ -67,7 +67,7 @@
               <th class='w-30px' title='<?php echo $lang->testcase->bugs?>'><?php echo $lang->testcase->bugsAB;?></th>
               <th class='w-30px' title='<?php echo $lang->testcase->results?>'><?php echo $lang->testcase->resultsAB;?></th>
               <th class='w-30px' title='<?php echo $lang->testcase->stepNumber?>'><?php echo $lang->testcase->stepNumberAB;?></th>
-              <th class='w-130px text-center'><?php echo $lang->actions;?></th>
+              <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
             </tr>
           </thead>
           <?php if($cases):?>

module/testtask/view/browse.html.php

@@ -69,7 +69,7 @@ $status = $this->session->testTaskVersionStatus;
         <th class='w-100px text-left'><?php common::printOrderLink('begin',   $orderBy, $vars, $lang->testtask->begin);?></th>
         <th class='w-100px text-left'><?php common::printOrderLink('end',     $orderBy, $vars, $lang->testtask->end);?></th>
         <th class='w-80px text-left'> <?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
-        <th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
+        <th class='c-actions-6 text-center'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>
@@ -93,19 +93,16 @@ $status = $this->session->testTaskVersionStatus;
       </td>
       <td class='c-actions'>
         <?php
-        if(common::hasPriv('testtask', 'delete', $task))
-        {
-            echo "<div class='more'>";
-            $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
-            echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
-            echo "</div>";
-        }
-
         common::printIcon('testtask',   'cases',    "taskID=$task->id", $task, 'list', 'sitemap');
         common::printIcon('testtask',   'view',     "taskID=$task->id", '', 'list', 'list-alt','','iframe',true, 'data-width=800px');
         common::printIcon('testtask',   'linkCase', "taskID=$task->id", $task, 'list', 'link');
         common::printIcon('testreport', 'browse',   "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag');
         common::printIcon('testtask',   'edit',     "taskID=$task->id", $task, 'list','','','',true);
+        if(common::hasPriv('testtask', 'delete', $task))
+        {
+            $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
+            echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
+        }
         ?>
       </td>
     </tr>

module/testtask/view/groupcase.html.php

@@ -36,7 +36,7 @@
         <th class='w-30px' title='<?php echo $lang->testcase->bugs?>'><?php echo $lang->testcase->bugsAB;?></th>
         <th class='w-30px' title='<?php echo $lang->testcase->results?>'><?php echo $lang->testcase->resultsAB;?></th>
         <th class='w-30px' title='<?php echo $lang->testcase->stepNumber?>'><?php echo $lang->testcase->stepNumberAB;?></th>
-        <th class='w-130px'> <?php echo $lang->actions;?></th>
+        <th class='c-actions-3'> <?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>

module/user/css/edit.css

@@ -1 +1 @@
-.table caption {border: none; border-bottom: 1px solid #ddd}
+.main-form .table + .table {margin-top: 10px;}

module/user/view/edit.html.php

@@ -17,9 +17,9 @@
   <div class="center-block">
     <div class="main-header">
       <h2>
-      <span class='prefix' title='USER'><?php echo $user->id;?></span>
-      <strong><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname)) echo $user->realname;?> (<small><?php echo $user->account;?></small>)</strong>
-      <small><?php echo $lang->arrow . $lang->user->edit;?></small>
+        <span class="label label-id"><?php echo $user->id;?></span>
+        <strong><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname)) echo $user->realname;?> <small>(<?php echo $user->account;?>)</small></strong>
+        <small><?php echo $lang->arrow . $lang->user->edit;?></small>
       </h2>
     </div>
     <form class="load-indicator main-form form-ajax" id="createForm" method="post" target='hiddenwin'>
@@ -94,7 +94,7 @@
           <th><?php echo $lang->user->mobile;?></th>
           <td><?php echo html::input('mobile', $user->mobile, "class='form-control' autocomplete='off'");?></td>
         </tr>
-         <tr>
+        <tr>
           <th><?php echo $lang->user->phone;?></th>
           <td><?php echo html::input('phone', $user->phone, "class='form-control' autocomplete='off'");?></td>
           <th><?php echo $lang->user->address;?></th>

module/webhook/view/browse.html.php

@@ -22,7 +22,7 @@
           <th class='w-60px'><?php common::printOrderLink('type', $orderBy, $vars, $lang->webhook->type);?></th>
           <th class='w-200px text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->webhook->name);?></th>
           <th><?php common::printOrderLink('url', $orderBy, $vars, $lang->webhook->url);?></th>
-          <th class='w-110px'><?php echo $lang->actions;?></th>
+          <th class='c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>