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

lib/base/front/front.class.php

@@ -496,12 +496,13 @@ class baseHTML
             $label = $lang->goback;
         }
 
+        $tab           = $_COOKIE['openApp'];
+        $misc         .= "data-app='{$tab}'";
         $referer       = $_SERVER['HTTP_REFERER'];
         $refererParts  = parse_url($referer);
         $refererLink   = $config->requestType == 'PATH_INFO' ? $refererParts['path'] : $refererParts['query'];
         $currentModule = $app->getModuleName();
         $currentMethod = $app->getMethodName();
-        $tab           = $_COOKIE['openApp'];
         $gobackList    = isset($_COOKIE['goback']) ? json_decode($_COOKIE['goback'], true) : array();
         $gobackLink    = isset($gobackList[$tab]) ? $gobackList[$tab] : '';
 

module/custom/model.php

@@ -242,6 +242,7 @@ class customModel extends model
                 $link = explode('|', $link);
                 list($label, $module, $method) = $link;
                 $hasPriv = commonModel::hasPriv($module, $method);
+                if($module == 'execution' and $method == 'more') $hasPriv = true;
             }
 
             if($isTutorialMode || $hasPriv)

module/doc/model.php

@@ -255,6 +255,8 @@ class docModel extends model
                 ->fetchAll('id');
         }
 
+        if(empty($docs)) return array();
+
         /* Get projects, executions and products by docIdList. */
         list($projects, $executions, $products) = $this->getObjectsByDoc(array_keys($docs));
 

module/execution/css/story.css

@@ -7,5 +7,5 @@ tbody > tr > td > .btn-icon {margin-right: 4px;}
 @media (max-width: 820px) {#storyList .c-sort, #storyList .c-stage {display: none !important;};}
 #batchToTask .checkbox-primary {display: inline-block; margin-left: 10px;}
 th.c-pri{width:50px;}
-.c-estimate {width: 40px;}
-.c-status {width: 80px;}
+.c-estimate {width: 50px;}
+.c-status, .c-user {width: 80px;}

module/pipeline/model.php

@@ -59,7 +59,7 @@ class pipelineModel extends model
             ->where('deleted')->eq('0')
             ->AndWhere('type')->eq($type)
             ->orderBy('id')->fetchPairs('id', 'name');
-        $pipeline = array('' => '') + $pipeline;
+        $pipeline = $pipeline;
         return $pipeline;
     }
 

module/product/control.php

@@ -855,6 +855,8 @@ class product extends control
      */
     public function dashboard($productID = 0)
     {
+        $this->session->set('productPlanList', $this->app->getURI(true), 'product');
+
         $productID = $this->product->saveState($productID, $this->products);
         $product   = $this->product->getStatByID($productID);
         if(!$product) die(js::locate('product', 'all'));

module/program/view/browsebylist.html.php

@@ -8,13 +8,13 @@
           <a class='table-nest-toggle table-nest-toggle-global' data-expand-text='<?php echo $lang->expand; ?>' data-collapse-text='<?php echo $lang->collapse;?>'></a>
           <?php echo $lang->nameAB;?>
         </th>
-        <th class='w-90px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->program->status);?></th>
-        <th class='w-100px'><?php common::printOrderLink('PM',     $orderBy, $vars, $lang->program->PM);?></th>
-        <th class='text-right w-100px'><?php common::printOrderLink('budget', $orderBy, $vars, $lang->project->budget);?></th>
-        <th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->project->begin);?></th>
-        <th class='w-100px'><?php common::printOrderLink('end',   $orderBy, $vars, $lang->project->end);?></th>
-        <th class='w-60px'><?php echo $lang->project->progress;?></th>
-        <th class='text-center w-180px'><?php echo $lang->actions;?></th>
+        <th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->program->status);?></th>
+        <th class='c-user'><?php common::printOrderLink('PM',     $orderBy, $vars, $lang->program->PM);?></th>
+        <th class='text-right c-budget'><?php common::printOrderLink('budget', $orderBy, $vars, $lang->project->budget);?></th>
+        <th class='c-date'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->project->begin);?></th>
+        <th class='c-date'><?php common::printOrderLink('end',   $orderBy, $vars, $lang->project->end);?></th>
+        <th class='c-progress'><?php echo $lang->project->progress;?></th>
+        <th class='text-center c-actions-6'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody id='programTableList'>

module/program/view/kanban.html.php

@@ -58,7 +58,7 @@
                 <div class='board-item' style='border-left: 3px solid #ccc'>
                   <div class='table-row'>
                     <div class='table-col'>
-                      <?php echo html::a($this->createLink('project', 'view', "projectID=$project->id"), $project->name);?>
+                      <?php echo html::a($this->createLink('project', 'index', "projectID=$project->id"), $project->name);?>
                     </div>
                   </div>
                 </div>
@@ -74,7 +74,7 @@
                       <div class='board-item' <?php echo "style='border-left: 3px solid " . (isset($project->delay) ? 'red' : "#0BD986") . "'";?>>
                         <div class='table-row'>
                           <div class='table-col'>
-                            <?php echo html::a($this->createLink('project', 'view', "projectID=$project->id"), $project->name);?>
+                            <?php echo html::a($this->createLink('project', 'index', "projectID=$project->id"), $project->name);?>
                           </div>
                           <div class='table-col'>
                             <div class="c-progress">
@@ -92,7 +92,7 @@
                       <div class='board-item' <?php echo "style='border-left: 3px solid " . (isset($project->execution->delay) ? 'red' : "#0BD986") . "'";?>>
                         <div class='table-row'>
                           <div class='table-col'>
-                            <?php echo html::a($this->createLink('execution', 'view', "executionID={$project->execution->id}"), $project->execution->name);?>
+                            <?php echo html::a($this->createLink('execution', 'task', "executionID={$project->execution->id}"), $project->execution->name);?>
                           </div>
                           <div class='table-col'>
                             <div class="c-progress">

module/project/css/batchedit.css

@@ -0,0 +1,3 @@
+.c-id {width: 40px;}
+.c-date {width: 120px;}
+.c-parent {width: 200px;}

module/project/css/group.css

@@ -0,0 +1,3 @@
+.c-id {width: 60px;}
+.c-name {width: 130px;}
+.c-desc {width: 300px;}

module/project/css/managemembers.css

@@ -1,2 +1,5 @@
 #dept_chosen    .chosen-single {width: 220px;}
 #project_chosen .chosen-single {width: 220px;}
+.c-days {width: 100px;}
+.c-hours {width: 90px;}
+.c-limited {width: 110px;}

module/project/view/batchedit.html.php

@@ -23,13 +23,13 @@
     <table class="table table-form">
       <thead>
         <tr>
-          <th class='w-40px'><?php echo $lang->idAB;?></th>
-          <th class='w-200px'><?php echo $lang->project->parent;?></th>
+          <th class='c-id'><?php echo $lang->idAB;?></th>
+          <th class='c-parent'><?php echo $lang->project->parent;?></th>
           <th class='c-name required'><?php echo $lang->project->name;?></th>
-          <th class="w-150px <?php echo strpos($requiredFields, 'PM') !== false ?  'required' : '';?>"> <?php echo $lang->project->PM;?></th>
-          <th class='w-120px required'><?php echo $lang->project->begin;?></th>
-          <th class='w-120px required'><?php echo $lang->project->end;?></th>
-          <th class='w-260px'><?php echo $lang->project->acl;?></th>
+          <th class="c-user-box <?php echo strpos($requiredFields, 'PM') !== false ?  'required' : '';?>"> <?php echo $lang->project->PM;?></th>
+          <th class='c-date required'><?php echo $lang->project->begin;?></th>
+          <th class='c-date required'><?php echo $lang->project->end;?></th>
+          <th class='c-acl'><?php echo $lang->project->acl;?></th>
         </tr>
       </thead>
       <tbody>

module/project/view/bug.html.php

@@ -55,13 +55,13 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='w-80px'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
+          <th class='c-severity'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
           <th class='c-pri'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
           <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-user'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-          <th class='w-110px c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-          <th class='w-100px'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
-          <th class='w-100px'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
+          <th class='c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+          <th class='c-user'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
+          <th class='c-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
           <th class='c-actions-5'><?php echo $lang->actions;?></th>
         </tr>
       </thead>

module/project/view/group.html.php

@@ -26,9 +26,9 @@
   <table class='table tablesorter' id='groupList'>
     <thead>
       <tr>
-        <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 class='c-id text-center'><?php echo $lang->group->id;?></th>
+        <th class='c-name'><?php echo $lang->group->name;?></th>
+        <th class='c-desc'><?php echo $lang->group->desc;?></th>
         <th><?php echo $lang->group->users;?></th>
         <th class='c-actions-6 text-center'><?php echo $lang->actions;?></th>
       </tr>

module/project/view/kanban.html.php

@@ -18,7 +18,7 @@
 <?php else:?>
 
 <?php foreach($kanbanGroup as $type => $projectGroup):?>
-<?php if(!empty($projectGroup)):?>
+<?php if(empty($projectGroup)) continue;?>
 <div id="kanban" class="main-table fade auto-fade-in" data-ride="table" data-checkable="false" data-group="true">
   <div class="cell">
     <div class='detail'>
@@ -137,7 +137,6 @@
     </div>
   </div>
 </div>
-<?php endif;?>
 <?php endforeach;?>
 
 <?php endif;?>

module/project/view/managemembers.html.php

@@ -27,10 +27,10 @@
         <tr class='text-center'>
           <th><?php echo $lang->team->account;?></th>
           <th><?php echo $lang->team->role;?></th>
-          <th class='w-100px'><?php echo $lang->team->days;?></th>
-          <th class='w-100px'><?php echo $lang->team->hours;?></th>
-          <th class='w-110px'><?php echo $lang->team->limited;?></th>
-          <th class="w-90px"> <?php echo $lang->actions;?></th>
+          <th class='c-days'><?php echo $lang->team->days;?></th>
+          <th class='c-hours'><?php echo $lang->team->hours;?></th>
+          <th class='c-limited'><?php echo $lang->team->limited;?></th>
+          <th class="c-actions"><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>

module/project/view/testtask.html.php

@@ -56,10 +56,10 @@
           </th>
           <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
           <th><?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
-          <th class='w-user'><?php common::printOrderLink('owner', $orderBy, $vars, $lang->testtask->owner);?></th>
-          <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-user'><?php common::printOrderLink('owner', $orderBy, $vars, $lang->testtask->owner);?></th>
+          <th class='c-date'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
+          <th class='c-date'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
+          <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
           <th class='<?php echo $project->model == 'scrum' ? 'c-actions-5' : 'c-actions-4';?> text-center'><?php echo $lang->actions;?></th>
         </tr>
       </thead>

module/projectrelease/css/browse.css

@@ -1,2 +1,5 @@
 #releaseList {font-size: 13px;}
 td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+
+.c-build {width: 100px;}
+.c-product, .c-execution {width: 120px;}

module/projectrelease/css/common.css

@@ -1,3 +1,4 @@
 .contentDiv {height: 190px; overflow-y: auto; margin-bottom: 10px !important;}
 .contentDiv .panel-heading {line-height: 14px;}
 .checkbox-primary {display: inline-block;}
+.c-estimate {width: 70px;}

module/projectrelease/model.php

@@ -322,17 +322,4 @@ class projectreleaseModel extends model
         $this->loadModel('action');
         foreach($this->post->bugs as $bugID) $this->action->create('bug', $bugID, 'linked2release', '', $releaseID);
     }
-
-    /**
-     * Send mail.
-     *
-     * @param  int    $releaseID
-     * @param  int    $actionID
-     * @access public
-     * @return void
-     */
-    public function sendmail($releaseID, $actionID)
-    {
-        $this->loadModel('release')->sendmail($releaseID, $actionID);
-    }
 }

module/projectrelease/view/browse.html.php

@@ -39,13 +39,13 @@
   <table class="table" id='releaseList'>
     <thead>
       <tr>
-        <th class='w-id'><?php echo $lang->release->id;?></th>
+        <th class='c-id'><?php echo $lang->release->id;?></th>
         <th><?php echo $lang->release->name;?></th>
-        <th class='w-product'><?php echo $lang->release->product;?></th>
-        <th class='w-execution'><?php echo $lang->executionCommon;?></th>
-        <th class='w-100px'><?php echo $lang->release->build;?></th>
-        <th class='c-date text-center w-100px'><?php echo $lang->release->date;?></th>
-        <th class='text-center w-90px'><?php echo $lang->release->status;?></th>
+        <th class='c-product'><?php echo $lang->release->product;?></th>
+        <th class='c-execution'><?php echo $lang->executionCommon;?></th>
+        <th class='c-build'><?php echo $lang->release->build;?></th>
+        <th class='c-date text-center'><?php echo $lang->release->date;?></th>
+        <th class='c-status text-center'><?php echo $lang->release->status;?></th>
         <?php
         $extendFields = $this->projectrelease->getFlowExtendFields();
         foreach($extendFields as $extendField) echo "<th>{$extendField->name}</th>";

module/projectrelease/view/linkbug.html.php

@@ -35,7 +35,7 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->bug->resolvedBy;?></th>
-          <th class='w-80px'><?php echo $lang->statusAB;?></th>
+          <th class='c-status'><?php echo $lang->statusAB;?></th>
         </tr>
       </thead>
       <tbody class='text-center'>

module/projectrelease/view/linkstory.html.php

@@ -31,9 +31,9 @@
           <th class='text-left'><?php echo $lang->story->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->assignedToAB;?></th>
-          <th class='w-70px text-right'><?php echo $lang->story->estimateAB;?></th>
+          <th class='c-estimate text-right'><?php echo $lang->story->estimateAB;?></th>
           <th class='c-status'><?php echo $lang->statusAB;?></th>
-          <th class='w-80px'><?php echo $lang->story->stageAB;?></th>
+          <th class='c-stage'><?php echo $lang->story->stageAB;?></th>
         </tr>
       </thead>
       <tbody>

module/release/css/browse.css

@@ -1,2 +1,6 @@
 #releaseList {font-size: 13px;}
 td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+
+.c-id {width: 60px}
+.c-branch {width: 100px}
+.c-project, c-build {width: 200px;}

module/release/css/common.css

@@ -1,3 +1,4 @@
 .contentDiv {height: 190px; overflow-y: auto; margin-bottom: 10px !important;}
 .contentDiv .panel-heading {line-height: 14px;}
 .checkbox-primary {display: inline-block;}
+.c-estimate {width: 70px;}

module/release/view/browse.html.php

@@ -41,15 +41,15 @@
   <table class="table" id='releaseList'>
     <thead>
       <tr>
-        <th class='w-id'><?php echo $lang->release->id;?></th>
+        <th class='c-id'><?php echo $lang->release->id;?></th>
         <th class="c-name"><?php echo $lang->release->name;?></th>
-        <th class="w-200px"><?php echo $lang->release->project;?></th>
-        <th class="w-200px"><?php echo $lang->release->build;?></th>
+        <th class="c-project"><?php echo $lang->release->project;?></th>
+        <th class="c-build"><?php echo $lang->release->build;?></th>
         <?php if($product->type != 'normal'):?>
-        <th class='text-center w-100px'><?php echo $lang->product->branch;?></th>
+        <th class='text-center c-branch'><?php echo $lang->product->branch;?></th>
         <?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='text-center c-status'><?php echo $lang->release->status;?></th>
         <?php
         $extendFields = $this->release->getFlowExtendFields();
         foreach($extendFields as $extendField) echo "<th>{$extendField->name}</th>";

module/release/view/linkbug.html.php

@@ -35,7 +35,7 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
           <th class='text-left'><?php echo $lang->bug->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->bug->resolvedBy;?></th>
-          <th class='w-80px'><?php echo $lang->statusAB;?></th>
+          <th class='c-status'><?php echo $lang->statusAB;?></th>
         </tr>
       </thead>
       <tbody class='text-center'>

module/release/view/linkstory.html.php

@@ -31,9 +31,9 @@
           <th class='text-left'><?php echo $lang->story->title;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='c-user'><?php echo $lang->assignedToAB;?></th>
-          <th class='w-70px text-right'><?php echo $lang->story->estimateAB;?></th>
+          <th class='c-estimate text-right'><?php echo $lang->story->estimateAB;?></th>
           <th class='c-status'><?php echo $lang->statusAB;?></th>
-          <th class='w-80px'><?php echo $lang->story->stageAB;?></th>
+          <th class='c-stage'><?php echo $lang->story->stageAB;?></th>
         </tr>
       </thead>
       <tbody>

module/repo/css/maintain.css

@@ -0,0 +1,3 @@
+.c-id {width: 60px;}
+.c-name {width: 200px;}
+.c-product {width: 400px;}

module/repo/js/create.js

@@ -26,6 +26,7 @@ $(function()
         $('#name').val($option.data('name'));
     });
 
+    $('#gitlabHost').change();
 });
 
 function scmChanged(scm)

module/repo/view/maintain.html.php

@@ -22,12 +22,12 @@
       <thead>
         <tr>
           <?php $vars = "objectID=$objectID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
-          <th class='w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->repo->id); ?></th>
-          <th class='w-120px'><?php common::printOrderLink('SCM', $orderBy, $vars, $lang->repo->type); ?></th>
-          <th class='w-200px text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->repo->name); ?></th>
-          <th class='w-400px text-left'><?php common::printOrderLink('product', $orderBy, $vars, $lang->repo->product); ?></th>
+          <th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->repo->id); ?></th>
+          <th class='c-type'><?php common::printOrderLink('SCM', $orderBy, $vars, $lang->repo->type); ?></th>
+          <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->repo->name); ?></th>
+          <th class='c-product text-left'><?php common::printOrderLink('product', $orderBy, $vars, $lang->repo->product); ?></th>
           <th class='text-left'><?php echo $lang->repo->path; ?></th>
-          <th class='w-100px c-actions-4'><?php echo $lang->actions; ?></th>
+          <th class='c-actions-3'><?php echo $lang->actions; ?></th>
         </tr>
       </thead>
       <tbody>

module/stakeholder/css/issue.css

@@ -0,0 +1,2 @@
+.c-id {width: 50px}
+.c-pri {width: 80px}

module/stakeholder/view/issue.html.php

@@ -5,20 +5,20 @@
     <?php if(!empty($issues)):?>
     <form class='main-table' method='post' id='issueForm'>
       <table class='table'>
-        <thead> 
+        <thead>
           <tr>
-            <th class='w-50px'><?php echo $lang->issue->id;?></th>
-            <th class='w-100px'><?php echo $lang->issue->type;?></th>
+            <th class='c-id'><?php echo $lang->issue->id;?></th>
+            <th class='c-type'><?php echo $lang->issue->type;?></th>
             <th><?php echo $lang->issue->title;?></th>
-            <th class='w-80px'><?php echo $lang->issue->severity;?></th>
-            <th class='w-80px'><?php echo $lang->issue->pri;?></th>
-            <th class='w-80px'><?php echo $lang->issue->owner;?></th>
-            <th class='w-120px'><?php echo $lang->issue->status;?></th>
-            <th class='w-120px'><?php echo $lang->issue->createdDate;?></th>
+            <th class='c-severity'><?php echo $lang->issue->severity;?></th>
+            <th class='c-pri'><?php echo $lang->issue->pri;?></th>
+            <th class='c-user'><?php echo $lang->issue->owner;?></th>
+            <th class='c-status'><?php echo $lang->issue->status;?></th>
+            <th class='c-date'><?php echo $lang->issue->createdDate;?></th>
             <th class='c-actions'><?php echo $lang->actions;?></th>
           </tr>
-        </thead> 
-        <tbody> 
+        </thead>
+        <tbody>
           <?php foreach($issues as $issue):?>
           <tr>
            <td><?php echo $issue->id;?></td>
@@ -35,7 +35,7 @@
            </td>
           </tr>
           <?php endforeach;?>
-        </tbody> 
+        </tbody>
       </table>
     </form>
     <?php else:?>

module/story/control.php

@@ -898,6 +898,8 @@ class story extends control
      */
     public function view($storyID, $version = 0, $param = 0)
     {
+        $this->session->set('productList', $this->app->getURI(true), 'product');
+
         $storyID = (int)$storyID;
         $story   = $this->story->getById($storyID, $version, true);
         if(!$story) die(js::error($this->lang->notFound) . js::locate('back'));

module/story/css/affected.css

@@ -0,0 +1,2 @@
+.c-consumed {width :100px;}
+.c-left {width :90px;}

module/story/css/batchclose.css

@@ -1 +1,2 @@
-
+.c-id {width: 50px;}
+.c-reason {width: 150px;}

module/story/css/batchedit.css

@@ -1 +1,10 @@
 #suhosinInfo {margin-bottom: 0;}
+.c-id {width: 40px;}
+.c-estimate {width: 50px;}
+.c-branch, .c-module {width: 120px;}
+.c-plan, .c-title {width: 150px;}
+.c-category {width: 90px;}
+.c-pri {width: 70px;}
+.c-source {width: 130px;}
+.c-note, .c-stage, .c-reason {width: 100px;}
+.c-keywords {width: 80px;}

module/story/css/bugs.css

@@ -1,3 +1,4 @@
 body {background: white;}
 .bugsList {padding: 10px;}
 .bugsList .table {border: 1px solid #ddd;}
+.c-id {width: 40px}

module/story/css/cases.css

@@ -1,3 +1,4 @@
 body {background: white;}
 .casesList {padding: 10px;}
 .casesList .table {border: 1px solid #ddd;}
+.c-id, .c-result {width: 50px;}

module/story/css/common.css

@@ -11,3 +11,8 @@
 #batchCreateForm .input-group .form-control, #batchEditForm .input-group .form-control {position: static;}
 #batchCreateForm .input-group .colorpicker, #batchEditForm .input-group .colorpicker {z-index: 2;}
 #batchCreateForm .input-group .colorpicker.open, #batchEditForm .input-group .colorpicker.open {z-index: 5;}
+
+.c-branch, .c-spec {width: 150px}
+.c-source {width: 130px}
+.c-note {width: 100px}
+.c-category {width: 90px}

module/story/css/tasks.css

@@ -1,3 +1,4 @@
 body {background: white;}
 .tasksList {padding: 10px;}
 .tasksList .table {border: 1px solid #ddd;}
+.c-id, .c-estiamte, .c-consumed, .c-left, .c-progress {width: 40px;}

module/story/model.php

@@ -1636,6 +1636,9 @@ class storyModel extends model
             if(empty($oldPlanID)) $story->plan = $planID;
             if($oldStory->branch) $story->plan = $planID;
 
+            /* Append the plan id to plan field if product is multi and story is all branch. */
+            if($this->session->currentProductType != 'normal' and empty($story->branch)) $story->plan = $oldStory->plan ? $oldStory->plan . ",$planID" : ",$planID";
+
             /* Change stage. */
             if($planID and $oldStory->stage == 'wait') $story->stage = 'planned';
             if($planID and $this->session->currentProductType != 'normal' and $oldStory->branch == 0)

module/story/view/affected.html.php

@@ -17,10 +17,10 @@
               <tr class='text-center'>
                 <th class='c-id'><?php echo $lang->task->id;?></th>
                 <th class='text-left'><?php echo $lang->task->name;?></th>
-                <th class='w-100px'><?php echo $lang->task->assignedTo;?></th>
+                <th class='c-user'><?php echo $lang->task->assignedTo;?></th>
                 <th class='c-status'><?php echo $lang->task->status;?></th>
-                <th class='w-100px'><?php echo $lang->task->consumed;?></th>
-                <th class='w-90px'><?php echo $lang->task->left;?></th>
+                <th class='c-consumed'><?php echo $lang->task->consumed;?></th>
+                <th class='c-left'><?php echo $lang->task->left;?></th>
               </tr>
             </thead>
             <?php if(isset($story->tasks[$executionID])):?>
@@ -49,10 +49,10 @@
             <th class='c-id'><?php echo $lang->idAB;?></th>
             <th class='text-left'><?php echo $lang->bug->title;?></th>
             <th class='c-status'><?php echo $lang->statusAB;?></th>
-            <th class='w-100px'><?php echo $lang->bug->openedBy;?></th>
-            <th class='w-100px'><?php echo $lang->bug->resolvedBy;?></th>
+            <th class='c-user'><?php echo $lang->bug->openedBy;?></th>
+            <th class='c-user'><?php echo $lang->bug->resolvedBy;?></th>
             <th class='text-left'><?php echo $lang->bug->resolution;?></th>
-            <th class='w-100px'><?php echo $lang->bug->lastEditedBy;?></th>
+            <th class='c-user'><?php echo $lang->bug->lastEditedBy;?></th>
           </tr>
         </thead>
         <tbody class= '<?php if(count($story->bugs) > $config->story->affectedFixedNum) echo "linkbox";?>'>
@@ -79,8 +79,8 @@
             <th class='c-id'><?php echo $lang->idAB;?></th>
             <th class='text-left'><?php echo $lang->testcase->title;?></th>
             <th class='c-status'><?php echo $lang->statusAB;?></th>
-            <th class='w-100px'><?php echo $lang->testcase->openedBy;?></th>
-            <th class='w-100px'><?php echo $lang->testcase->lastEditedBy;?></th>
+            <th class='c-user'><?php echo $lang->testcase->openedBy;?></th>
+            <th class='c-user'><?php echo $lang->testcase->lastEditedBy;?></th>
           </tr>
         </thead>
         <tbody class='<?php if(count($story->cases) > $config->story->affectedFixedNum)  echo "linkbox";?>'>

module/story/view/batchclose.html.php

@@ -24,11 +24,11 @@
     <table class='table table-fixed table-form with-border'>
     <thead>
       <tr class='text-center'>
-        <th class='w-50px'> <?php echo $lang->idAB;?></th> 
+        <th class='c-id'><?php echo $lang->idAB;?></th>
         <th class='text-left'><?php echo $lang->story->title;?></th>
-        <th class='w-80px'> <?php echo $lang->story->status;?></th>
-        <th class='w-150px'><?php echo $lang->story->closedReason;?></th>
-        <th class='w-p40 '> <?php echo $lang->story->comment;?></th>
+        <th class='c-status'><?php echo $lang->story->status;?></th>
+        <th class='c-reason'><?php echo $lang->story->closedReason;?></th>
+        <th class='w-p40'><?php echo $lang->story->comment;?></th>
       </tr>
     </thead>
       <?php foreach($stories as $storyID => $story):?>
@@ -53,7 +53,7 @@
           </table>
         </td>
         <td><?php echo html::input("comments[$storyID]", '', "class='form-control'");?></td>
-      </tr>  
+      </tr>
       <?php endforeach;?>
       <tr>
         <td colspan='5' class='text-center form-actions'>

module/story/view/batchcreate.html.php

@@ -45,23 +45,23 @@
         <thead>
           <tr>
             <th class='col-id'><?php echo $lang->idAB;?></th>
-            <th class='w-150px<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo $lang->product->branch;?></th>
+            <th class='c-branch<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo $lang->product->branch;?></th>
             <th class='col-module<?php echo zget($requiredFields, 'module', '', ' required');?>'><?php echo $lang->story->module;?></th>
             <th class='col-plan<?php echo zget($visibleFields, 'plan', ' hidden') . zget($requiredFields, 'plan', '', ' required');?>'><?php echo $lang->story->plan;?></th>
             <th class='col-name required has-btn'><?php echo $lang->story->title;?></th>
-            <th class='w-150px<?php      echo zget($visibleFields, 'spec',     ' hidden') . zget($requiredFields, 'spec',     '', ' required');?>'><?php echo $lang->story->spec;?></th>
-            <th class='w-130px<?php      echo zget($visibleFields, 'source',   ' hidden') . zget($requiredFields, 'source',   '', ' required');?>'><?php echo $lang->story->source;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'source', ' hidden') . zget($requiredFields, 'sourceNote', '', ' required');?>'><?php echo $lang->story->sourceNote;?></th>
-            <th class='w-150px<?php        echo zget($visibleFields, 'verify',   ' hidden') . zget($requiredFields, 'verify',   '', ' required');?>'><?php echo $lang->story->verify;?></th>
-            <th class='w-90px'><?php echo $lang->story->category;?></th>
-            <th class='col-pri<?php      echo zget($visibleFields, 'pri',      ' hidden') . zget($requiredFields, 'pri',      '', ' required');?>'><?php echo $lang->story->pri;?></th>
+            <th class='c-spec<?php echo zget($visibleFields, 'spec', ' hidden') . zget($requiredFields, 'spec', '', ' required');?>'><?php echo $lang->story->spec;?></th>
+            <th class='c-source<?php echo zget($visibleFields, 'source', ' hidden') . zget($requiredFields, 'source', '', ' required');?>'><?php echo $lang->story->source;?></th>
+            <th class='c-note<?php echo zget($visibleFields, 'source', ' hidden') . zget($requiredFields, 'sourceNote', '', ' required');?>'><?php echo $lang->story->sourceNote;?></th>
+            <th class='c-verify<?php echo zget($visibleFields, 'verify', ' hidden') . zget($requiredFields, 'verify', '', ' required');?>'><?php echo $lang->story->verify;?></th>
+            <th class='c-category'><?php echo $lang->story->category;?></th>
+            <th class='col-pri<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->story->pri;?></th>
             <th class='col-estimate<?php echo zget($visibleFields, 'estimate', ' hidden') . zget($requiredFields, 'estimate', '', ' required');?>'><?php echo $lang->story->estimate;?></th>
             <th class='col-review<?php   echo zget($visibleFields, 'review',   ' hidden') . zget($requiredFields, 'review',   '', ' required');?>'><?php echo $lang->story->needReview;?></th>
             <th class='<?php echo zget($visibleFields, 'review',   ' hidden');?>' style="width: 200px !important"><?php echo $lang->story->reviewedBy;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->story->keywords;?></th>
+            <th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->story->keywords;?></th>
             <?php
             $extendFields = $this->story->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='w-100px'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>

module/story/view/batchedit.html.php

@@ -41,27 +41,27 @@ foreach(explode(',', $showFields) as $field)
     <table class='table table-form'>
       <thead>
         <tr>
-          <th class='w-40px'> <?php echo $lang->idAB;?></th>
+          <th class='c-id'> <?php echo $lang->idAB;?></th>
           <?php if($branchProduct):?>
-          <th class='w-120px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->story->branch;?></th>
+          <th class='c-branch<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->story->branch;?></th>
           <?php endif;?>
-          <th class='w-120px'><?php echo $lang->story->module;?></th>
-          <th class='w-150px<?php echo zget($visibleFields, 'plan', ' hidden')?> col-plan'><?php echo $lang->story->planAB;?></th>
-          <th class='w-150px required'><?php echo $lang->story->title;?></th>
-          <th class='w-50px<?php   echo zget($visibleFields, 'estimate', ' hidden')?>'> <?php echo $lang->story->estimateAB;?></th>
-          <th class='w-90px'><?php echo $lang->story->category;?></th>
-          <th class='w-70px<?php   echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->priAB;?></th>
-          <th class='w-100px<?php  echo zget($visibleFields, 'assignedTo', ' hidden')?>'> <?php echo $lang->story->assignedTo;?></th>
-          <th class='w-130px<?php  echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->source;?></th>
-          <th class='w-100px<?php  echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->sourceNote;?></th>
-          <th class='w-80px'><?php echo $lang->story->status;?></th>
-          <th class='w-100px<?php  echo zget($visibleFields, 'stage', ' hidden')?>'> <?php echo $lang->story->stageAB;?></th>
-          <th class='w-130px<?php  echo zget($visibleFields, 'closedBy', ' hidden')?>'><?php echo $lang->story->closedBy;?></th>
-          <th class='w-100px<?php  echo zget($visibleFields, 'closedReason', ' hidden')?>'> <?php echo $lang->story->closedReason;?></th>
-          <th class='w-80px<?php   echo zget($visibleFields, 'keywords', ' hidden')?>'><?php echo $lang->story->keywords;?></th>
+          <th class='c-module'><?php echo $lang->story->module;?></th>
+          <th class='c-plan<?php echo zget($visibleFields, 'plan', ' hidden')?> col-plan'><?php echo $lang->story->planAB;?></th>
+          <th class='c-title required'><?php echo $lang->story->title;?></th>
+          <th class='c-estimate<?php echo zget($visibleFields, 'estimate', ' hidden')?>'> <?php echo $lang->story->estimateAB;?></th>
+          <th class='c-category'><?php echo $lang->story->category;?></th>
+          <th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->priAB;?></th>
+          <th class='c-user<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'> <?php echo $lang->story->assignedTo;?></th>
+          <th class='c-source<?php echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->source;?></th>
+          <th class='c-note<?php echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->sourceNote;?></th>
+          <th class='c-status'><?php echo $lang->story->status;?></th>
+          <th class='c-stage<?php echo zget($visibleFields, 'stage', ' hidden')?>'> <?php echo $lang->story->stageAB;?></th>
+          <th class='c-user-box<?php echo zget($visibleFields, 'closedBy', ' hidden')?>'><?php echo $lang->story->closedBy;?></th>
+          <th class='c-reason<?php echo zget($visibleFields, 'closedReason', ' hidden')?>'> <?php echo $lang->story->closedReason;?></th>
+          <th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden')?>'><?php echo $lang->story->keywords;?></th>
           <?php
           $extendFields = $this->story->getFlowExtendFields();
-          foreach($extendFields as $extendField) echo "<th class='w-100px'>{$extendField->name}</th>";
+          foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
           ?>
         </tr>
       </thead>

module/story/view/bugs.html.php

@@ -10,14 +10,14 @@
     <table class='table table-fixed'>
       <thead>
         <tr class='text-center'>
-          <th class='w-40px'><?php echo $lang->idAB;?></th>
-          <th class='w-p30'> <?php echo $lang->bug->title;?></th>
-          <th class='w-pri'> <?php echo $lang->priAB;?></th>
-          <th class='w-type'><?php echo $lang->bug->type;?></th>
-          <th class='w-40px'><?php echo $lang->statusAB;?></th>
-          <th class='w-user'><?php echo $lang->bug->assignedTo;?></th>
-          <th class='w-50px'><?php echo $lang->bug->resolvedBy;?></th>
-          <th class='w-50px'><?php echo $lang->bug->resolution;?></th>
+          <th class='c-id'>        <?php echo $lang->idAB;?></th>
+          <th class='w-p30'>       <?php echo $lang->bug->title;?></th>
+          <th class='c-pri'>       <?php echo $lang->priAB;?></th>
+          <th class='c-type'>      <?php echo $lang->bug->type;?></th>
+          <th class='c-status'>    <?php echo $lang->statusAB;?></th>
+          <th class='c-user'>      <?php echo $lang->bug->assignedTo;?></th>
+          <th class='c-user'>      <?php echo $lang->bug->resolvedBy;?></th>
+          <th class='c-resolution'><?php echo $lang->bug->resolution;?></th>
         </tr>
       </thead>
       <tbody>

module/story/view/cases.html.php

@@ -10,14 +10,14 @@
     <table class='table table-fixed'>
       <thead>
         <tr class='text-center'>
-          <th class='w-50px'>  <?php echo $lang->idAB;?></th>
+          <th class='c-id'>    <?php echo $lang->idAB;?></th>
           <th class='w-p30'>   <?php echo $lang->testcase->title;?></th>
-          <th class='w-pri'>   <?php echo $lang->priAB;?></th>
-          <th class='w-type'>  <?php echo $lang->testcase->type;?></th>
-          <th class='w-status'><?php echo $lang->statusAB;?></th>
-          <th class='w-user'>  <?php echo $lang->testcase->lastRunner;?></th>
-          <th class='w-60px'>  <?php echo $lang->testcase->lastRunDate;?></th>
-          <th class='w-40px'>  <?php echo $lang->testcase->lastRunResult;?></th>
+          <th class='c-pri'>   <?php echo $lang->priAB;?></th>
+          <th class='c-type'>  <?php echo $lang->testcase->type;?></th>
+          <th class='c-status'><?php echo $lang->statusAB;?></th>
+          <th class='c-user'>  <?php echo $lang->testcase->lastRunner;?></th>
+          <th class='c-date'>  <?php echo $lang->testcase->lastRunDate;?></th>
+          <th class='c-result'><?php echo $lang->testcase->lastRunResult;?></th>
         </tr>
       </thead>
       <tbody>

module/story/view/edit.html.php

@@ -62,7 +62,7 @@
             <?php
             echo html::hidden('lastEditedDate', $story->lastEditedDate);
             echo html::submitButton($lang->save);
-            if(!isonlybody()) echo html::a($app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), $lang->goback, '', 'class="btn btn-wide"');
+            if(!isonlybody()) echo html::backButton();
             ?>
           </div>
           <hr class='small' />

module/story/view/linkstory.html.php

@@ -37,12 +37,12 @@
         </th>
         <th class='c-pri'><?php echo $lang->priAB;?></th>
         <th><?php echo $lang->story->title;?></th>
-        <th class='w-80px'><?php echo $lang->story->status;?></th>
+        <th class='c-status'><?php echo $lang->story->status;?></th>
         <?php if($story->type == 'requirement'):?>
-        <th class='w-80px'><?php echo $lang->story->stage;?></th>
+        <th class='c-stage'><?php echo $lang->story->stage;?></th>
         <?php endif;?>
         <th class='w-user'><?php echo $lang->openedByAB;?></th>
-        <th class='w-80px text-right'><?php echo $lang->story->estimateAB;?></th>
+        <th class='c-estimate text-right'><?php echo $lang->story->estimateAB;?></th>
       </tr>
       </thead>
       <tbody>

module/story/view/tasks.html.php

@@ -13,15 +13,15 @@ include '../../common/view/chart.html.php';
     <table class='table table-fixed'>
       <thead>
         <tr class='text-center'>
-          <th class='w-40px'>    <?php echo $lang->idAB;?></th>
-          <th class='w-p30'>   <?php echo $lang->task->name;?></th>
-          <th class='w-pri'>   <?php echo $lang->priAB;?></th>
-          <th class='w-status'><?php echo $lang->statusAB;?></th>
-          <th class='w-user'>  <?php echo $lang->task->assignedToAB;?></th>
-          <th class='w-40px'>  <?php echo $lang->task->estimateAB;?></th>
-          <th class='w-40px'>  <?php echo $lang->task->consumedAB;?></th>
-          <th class='w-40px'>  <?php echo $lang->task->leftAB;?></th>
-          <th class='w-40px'>  <?php echo $lang->task->progress;?></th>
+          <th class='c-id'>      <?php echo $lang->idAB;?></th>
+          <th class='w-p30'>     <?php echo $lang->task->name;?></th>
+          <th class='c-pri'>     <?php echo $lang->priAB;?></th>
+          <th class='c-status'>  <?php echo $lang->statusAB;?></th>
+          <th class='c-user'>    <?php echo $lang->task->assignedToAB;?></th>
+          <th class='c-estimate'><?php echo $lang->task->estimateAB;?></th>
+          <th class='c-consumed'><?php echo $lang->task->consumedAB;?></th>
+          <th class='c-left'>    <?php echo $lang->task->leftAB;?></th>
+          <th class='c-progress'><?php echo $lang->task->progress;?></th>
         </tr>
       </thead>
       <tbody>

module/story/view/zerocase.html.php

@@ -33,16 +33,16 @@
           </div>
           <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
         </th>
-        <th class='w-pri'>  <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
-        <th class='w-p30'>  <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
-        <th>                <?php common::printOrderLink('plan',       $orderBy, $vars, $lang->story->planAB);?></th>
-        <th class='thWidth'><?php common::printOrderLink('source',     $orderBy, $vars, $lang->story->source);?></th>
-        <th class='w-100px'><?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-        <th class='w-100px'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-        <th class='w-70px'> <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
-        <th class='w-80px'> <?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='c-actions-5'><?php echo $lang->actions;?></th>
+        <th class='c-pri'>     <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+        <th class='w-p30'>     <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
+        <th>                   <?php common::printOrderLink('plan',       $orderBy, $vars, $lang->story->planAB);?></th>
+        <th class='thWidth'>   <?php common::printOrderLink('source',     $orderBy, $vars, $lang->story->source);?></th>
+        <th class='c-user'>    <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+        <th class='c-user'>    <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+        <th class='c-estiamte'><?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-5 text-center'><?php echo $lang->actions;?></th>
       </tr>
       </thead>
       <tbody>

module/task/css/batchcreate.css

@@ -19,3 +19,8 @@ select[id^="story"] + .picker-single {width: 130px; max-width: 130px;}
 .chosen-results > li.has-new-task {position: relative; color: #388E3C;}
 .chosen-results > li.has-task.highlighted,
 .chosen-results > li.has-new-task.highlighted {color: #fff;}
+
+.c-id {width: 30px;}
+.c-module {width: 150px;}
+.c-story {width: 200px;}
+.c-assigned {width: 130px;}

module/task/css/batchedit.css

@@ -0,0 +1,4 @@
+.c-id {width: 50px;}
+.c-pri, .c-record, .c-left {width: 70px;}
+.c-reason {width: 100px;}
+.c-module, .c-assigned {width: 150px;}

module/task/view/batchcreate.html.php

@@ -59,19 +59,19 @@
       <table class="table table-form" id="tableBody">
         <thead>
           <tr>
-            <th class='w-30px'><?php echo $lang->idAB;?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden') . zget($requiredFields, 'module', '', ' required');?>'><?php echo $lang->task->module?></th>
+            <th class='c-id'><?php echo $lang->idAB;?></th>
+            <th class='c-module<?php echo zget($visibleFields, 'module', ' hidden') . zget($requiredFields, 'module', '', ' required');?>'><?php echo $lang->task->module?></th>
             <?php if($execution->type != 'ops'):?>
-            <th class='w-200px<?php echo zget($visibleFields, 'story', ' hidden') . zget($requiredFields, 'story', '', ' required'); echo $hiddenStory;?>'><?php echo $lang->task->story;?></th>
+            <th class='c-story<?php echo zget($visibleFields, 'story', ' hidden') . zget($requiredFields, 'story', '', ' required'); echo $hiddenStory;?>'><?php echo $lang->task->story;?></th>
             <?php endif;?>
             <th class='c-name required has-btn'><?php echo $lang->task->name;?></span></th>
-            <th class='w-80px required'><?php echo $lang->typeAB;?></span></th>
-            <th class='w-130px<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->task->assignedTo;?></th>
-            <th class='w-60px<?php  echo zget($visibleFields, 'estimate',   ' hidden') . zget($requiredFields, 'estimate',   '', ' required');?>'><?php echo $lang->task->estimateAB;?></th>
-            <th class='w-120px<?php echo zget($visibleFields, 'estStarted', ' hidden') . zget($requiredFields, 'estStarted', '', ' required');?>'><?php echo $lang->task->estStarted;?></th>
-            <th class='w-120px<?php echo zget($visibleFields, 'deadline',   ' hidden') . zget($requiredFields, 'deadline',   '', ' required');?>'><?php echo $lang->task->deadline;?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'desc',       ' hidden') . zget($requiredFields, 'desc',       '', ' required');?>'><?php echo $lang->task->desc;?></th>
-            <th class='w-80px<?php  echo zget($visibleFields, 'pri',        ' hidden') . zget($requiredFields, 'pri',        '', ' required');?>'><?php echo $lang->task->pri;?></th>
+            <th class='c-type required'><?php echo $lang->typeAB;?></span></th>
+            <th class='c-assigned<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->task->assignedTo;?></th>
+            <th class='c-estimate<?php  echo zget($visibleFields, 'estimate', ' hidden') . zget($requiredFields, 'estimate', '', ' required');?>'><?php echo $lang->task->estimateAB;?></th>
+            <th class='c-full-date<?php echo zget($visibleFields, 'estStarted', ' hidden') . zget($requiredFields, 'estStarted', '', ' required');?>'><?php echo $lang->task->estStarted;?></th>
+            <th class='w-120px<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline',   '', ' required');?>'><?php echo $lang->task->deadline;?></th>
+            <th class='w-150px<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', '', ' required');?>'><?php echo $lang->task->desc;?></th>
+            <th class='w-80px<?php  echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->task->pri;?></th>
             <?php
             $extendFields = $this->task->getFlowExtendFields();
             foreach($extendFields as $extendField) echo "<th class='w-100px'>{$extendField->name}</th>";

module/task/view/batchedit.html.php

@@ -53,25 +53,25 @@ js::set('dittoNotice', $dittoNotice);
       <table class='table table-form table-fixed with-border'>
         <thead>
           <tr>
-            <th class='w-50px'><?php echo $lang->idAB;?></th>
-            <th class='required <?php if(count($visibleFields) > 10) echo 'w-150px';?>'><?php echo $lang->task->name?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden') . zget($requiredFields, 'module', '', ' required');?>'><?php echo $lang->task->module?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->task->assignedTo;?></th>
-            <th class='w-80px required'><?php echo $lang->typeAB;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'status',       ' hidden') . zget($requiredFields, 'status',       '', ' required');?>'><?php echo $lang->task->status;?></th>
-            <th class='w-100px<?php  echo zget($visibleFields, 'estStarted',   ' hidden') . zget($requiredFields, 'estStarted',   '', ' required');?>'><?php echo $lang->task->estStarted?></th>
-            <th class='w-100px<?php  echo zget($visibleFields, 'deadline',     ' hidden') . zget($requiredFields, 'deadline',     '', ' required');?>'><?php echo $lang->task->deadline?></th>
-            <th class='w-70px<?php  echo zget($visibleFields, 'pri',          ' hidden') . zget($requiredFields, 'pri',          '', ' required');?>'><?php echo $lang->task->pri;?></th>
-            <th class='w-70px<?php  echo zget($visibleFields, 'estimate',     ' hidden') . zget($requiredFields, 'estimate',     '', ' required');?>'><?php echo $lang->task->estimateAB;?></th>
-            <th class='w-70px<?php  echo zget($visibleFields, 'record',       ' hidden') . zget($requiredFields, 'record',       '', ' required');?>'><?php echo $lang->task->consumedThisTime;?></th>
-            <th class='w-70px<?php  echo zget($visibleFields, 'left',         ' hidden') . zget($requiredFields, 'left',         '', ' required');?>'><?php echo $lang->task->leftAB?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'finishedBy',   ' hidden') . zget($requiredFields, 'finishedBy',   '', ' required');?>'><?php echo $lang->task->finishedBy;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'canceledBy',   ' hidden') . zget($requiredFields, 'canceledBy',   '', ' required');?>'><?php echo $lang->task->canceledBy;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'closedBy',     ' hidden') . zget($requiredFields, 'closedBy',     '', ' required');?>'><?php echo $lang->task->closedBy;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'closedReason', ' hidden') . zget($requiredFields, 'closedReason', '', ' required');?>'><?php echo $lang->task->closedReason;?></th>
+            <th class='c-id'><?php echo $lang->idAB;?></th>
+            <th class='required <?php if(count($visibleFields) > 10) echo 'c-name';?>'><?php echo $lang->task->name?></th>
+            <th class='c-module<?php echo zget($visibleFields,    'module',       ' hidden') . zget($requiredFields, 'module', '', ' required');?>'><?php echo $lang->task->module?></th>
+            <th class='c-assigned<?php echo zget($visibleFields,  'assignedTo',   ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->task->assignedTo;?></th>
+            <th class='c-type required'><?php echo $lang->typeAB; ?></th>
+            <th class='c-status<?php echo zget($visibleFields,    'status',       ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->task->status;?></th>
+            <th class='c-date<?php  echo zget($visibleFields,     'estStarted',   ' hidden') . zget($requiredFields, 'estStarted', '', ' required');?>'><?php echo $lang->task->estStarted?></th>
+            <th class='c-date<?php  echo zget($visibleFields,     'deadline',     ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->task->deadline?></th>
+            <th class='c-pri<?php  echo zget($visibleFields,      'pri',          ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->task->pri;?></th>
+            <th class='c-estimate<?php  echo zget($visibleFields, 'estimate',     ' hidden') . zget($requiredFields, 'estimate',     '', ' required');?>'><?php echo $lang->task->estimateAB;?></th>
+            <th class='c-record<?php  echo zget($visibleFields,   'record',       ' hidden') . zget($requiredFields, 'record',       '', ' required');?>'><?php echo $lang->task->consumedThisTime;?></th>
+            <th class='c-left<?php  echo zget($visibleFields,     'left',         ' hidden') . zget($requiredFields, 'left',         '', ' required');?>'><?php echo $lang->task->leftAB?></th>
+            <th class='c-user<?php echo zget($visibleFields,      'finishedBy',   ' hidden') . zget($requiredFields, 'finishedBy',   '', ' required');?>'><?php echo $lang->task->finishedBy;?></th>
+            <th class='c-user<?php echo zget($visibleFields,      'canceledBy',   ' hidden') . zget($requiredFields, 'canceledBy',   '', ' required');?>'><?php echo $lang->task->canceledBy;?></th>
+            <th class='c-user<?php echo zget($visibleFields,      'closedBy',     ' hidden') . zget($requiredFields, 'closedBy',     '', ' required');?>'><?php echo $lang->task->closedBy;?></th>
+            <th class='c-reason<?php echo zget($visibleFields,    'closedReason', ' hidden') . zget($requiredFields, 'closedReason', '', ' required');?>'><?php echo $lang->task->closedReason;?></th>
             <?php
             $extendFields = $this->task->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='w-100px'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>

module/testcase/css/batchcreate.css

@@ -7,3 +7,10 @@
 #batchCreateForm .input-group .form-control {position: static;}
 #batchCreateForm .input-group .colorpicker {z-index: 2;}
 #batchCreateForm .input-group .colorpicker.open {z-index: 5;}
+
+.c-id {width: 50px;}
+.c-pri, .c-keywords, .c-review {width: 100px;}
+.c-branch, .c-type {width: 120px;}
+.c-stage {width: 140px;}
+.c-precondition {width: 150px;}
+.c-story {width: 180px;}

module/testcase/css/batchedit.css

@@ -5,3 +5,10 @@
 #batchEditForm .input-group .form-control {position: static;}
 #batchEditForm .input-group .colorpicker {z-index: 2;}
 #batchEditForm .input-group .colorpicker.open {z-index: 5;}
+
+.c-id {width: 50px;}
+.c-pri, .c-keywords, .c-review {width: 100px;}
+.c-branch, .c-type {width: 120px;}
+.c-stage {width: 140px;}
+.c-precondition {width: 150px;}
+.c-story {width: 180px;}

module/testcase/css/bugs.css

@@ -1,3 +1,5 @@
 body {background: white;}
 .bugsList {padding: 10px;}
 .bugsList .table {border: 1px solid #ddd;}
+.c-id {width: 50px;}
+.c-user {width: 70px;}

module/testcase/css/groupcase.css

@@ -1,2 +1,4 @@
 .title {white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
 .group-header > a {line-height: 20px; display: block; max-height: 40px; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden;}
+.c-result {width: 80px;}
+.c-bugs, .c-results, .c-steps {width: 30px;}

module/testcase/css/showimport.css

@@ -1 +1,6 @@
 .table table td,.outer .table table tbody > tr:last-child td {padding: 2px 0 2px 5px !important; border: none !important;}
+.c-line-number {width: 50px;}
+.c-id {width: 40px;}
+.c-story, .c-module, .c-type {width: 120px;}
+.c-stage {width: 160px;}
+.c-step {width: 300px;}

module/testcase/view/batchcreate.html.php

@@ -53,20 +53,20 @@
       <table class="table table-form" id="tableBody">
         <thead>
           <tr class='text-center'>
-            <th class='w-50px'><?php echo $lang->idAB;?></th>
-            <th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo $lang->product->branch;?></th>
-            <th class='w-180px<?php echo zget($visibleFields, 'module', ' hidden') . zget($requiredFields, 'module', '', ' required');?>'><?php echo $lang->testcase->module;?></th>
-            <th class='w-180px<?php echo zget($visibleFields, 'story',  ' hidden') . zget($requiredFields, 'story',  '', ' required'); echo $hiddenStory;?>'> <?php echo $lang->testcase->story;?></th>
+            <th class='c-id'><?php echo $lang->idAB;?></th>
+            <th class='c-branch<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo $lang->product->branch;?></th>
+            <th class='c-module<?php echo zget($visibleFields, 'module', ' hidden') . zget($requiredFields, 'module', '', ' required');?>'><?php echo $lang->testcase->module;?></th>
+            <th class='c-story<?php echo zget($visibleFields, 'story', ' hidden') . zget($requiredFields, 'story', '', ' required'); echo $hiddenStory;?>'> <?php echo $lang->testcase->story;?></th>
             <th class='text-left required has-btn c-title'><?php echo $lang->testcase->title;?></th>
-            <th class='w-120px text-left required'><?php echo $lang->testcase->type;?></th>
-            <th class='w-80px<?php  echo zget($visibleFields, 'pri',          ' hidden') . zget($requiredFields, 'pri',          '', ' required')?>'><?php echo $lang->testcase->pri;?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'precondition', ' hidden') . zget($requiredFields, 'precondition', '', ' required')?>'><?php echo $lang->testcase->precondition;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'keywords',     ' hidden') . zget($requiredFields, 'keywords',     '', ' required')?>'><?php echo $lang->testcase->keywords;?></th>
-            <th class='w-140px<?php echo zget($visibleFields, 'stage',        ' hidden') . zget($requiredFields, 'stage',        '', ' required')?>'><?php echo $lang->testcase->stage;?></th>
-            <th class='w-100px<?php  echo zget($visibleFields, 'review',       ' hidden') . zget($requiredFields, 'review',       '', ' required')?>'><?php echo $lang->testcase->review;?></th>
+            <th class='c-type text-left required'><?php echo $lang->testcase->type;?></th>
+            <th class='c-pri<?php  echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required')?>'><?php echo $lang->testcase->pri;?></th>
+            <th class='c-precondition<?php echo zget($visibleFields, 'precondition', ' hidden') . zget($requiredFields, 'precondition', '', ' required')?>'><?php echo $lang->testcase->precondition;?></th>
+            <th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required')?>'><?php echo $lang->testcase->keywords;?></th>
+            <th class='c-stage<?php echo zget($visibleFields, 'stage', ' hidden') . zget($requiredFields, 'stage', '', ' required')?>'><?php echo $lang->testcase->stage;?></th>
+            <th class='c-review<?php  echo zget($visibleFields, 'review', ' hidden') . zget($requiredFields, 'review', '', ' required')?>'><?php echo $lang->testcase->review;?></th>
             <?php
             $extendFields = $this->testcase->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='w-100px'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>

module/testcase/view/batchedit.html.php

@@ -44,22 +44,22 @@
       <table class='table table-form table-fixed'>
         <thead>
           <tr class='text-center'>
-            <th class='w-50px'><?php  echo $lang->idAB;?></th>
-            <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->priAB;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->statusAB;?></th>
+            <th class='c-id'><?php  echo $lang->idAB;?></th>
+            <th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->priAB;?></th>
+            <th class='c-status<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->statusAB;?></th>
             <?php if($branchProduct):?>
-            <th class='w-150px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->testcase->branch;?></th>
+            <th class='c-branch<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->testcase->branch;?></th>
             <?php endif;?>
-            <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
-            <th class='w-150px<?php echo zget($visibleFields, 'story', ' hidden') . zget($requiredFields, 'story', '', ' required');?>'><?php echo $lang->testcase->story;?></th>
+            <th class='c-module<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
+            <th class='c-story<?php echo zget($visibleFields, 'story', ' hidden') . zget($requiredFields, 'story', '', ' required');?>'><?php echo $lang->testcase->story;?></th>
             <th class='text-left required'><?php echo $lang->testcase->title;?></th>
-            <th class='w-120px required'><?php echo $lang->testcase->type;?></th>
+            <th class='c-type required'><?php echo $lang->testcase->type;?></th>
             <th class='<?php echo zget($visibleFields, 'precondition', 'hidden') . zget($requiredFields, 'precondition', '', ' required');?>'><?php echo $lang->testcase->precondition;?></th>
-            <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->testcase->keywords;?></th>
-            <th class='w-250px<?php echo zget($visibleFields, 'stage', ' hidden') . zget($requiredFields, 'stage', '', ' required');?>'><?php echo $lang->testcase->stage;?></th>
+            <th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->testcase->keywords;?></th>
+            <th class='c-stage<?php echo zget($visibleFields, 'stage', ' hidden') . zget($requiredFields, 'stage', '', ' required');?>'><?php echo $lang->testcase->stage;?></th>
             <?php
             $extendFields = $this->testcase->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='w-100px'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
             ?>
           </tr>
         </thead>

module/testcase/view/bugs.html.php

@@ -7,14 +7,14 @@
     <table class='table table-fixed'>
       <thead>
         <tr class='text-center'>
-          <th class='w-50px'><?php echo $lang->idAB;?></th>
+          <th class='c-id'><?php echo $lang->idAB;?></th>
           <th class='w-p30'> <?php echo $lang->bug->title;?></th>
-          <th class='w-pri'> <?php echo $lang->priAB;?></th>
-          <th class='w-type'><?php echo $lang->bug->type;?></th>
-          <th class='w-40px'><?php echo $lang->statusAB;?></th>
-          <th class='w-user'><?php echo $lang->bug->assignedTo;?></th>
-          <th class='w-50px'><?php echo $lang->bug->resolvedBy;?></th>
-          <th class='w-50px'><?php echo $lang->bug->resolution;?></th>
+          <th class='c-pri'> <?php echo $lang->priAB;?></th>
+          <th class='c-type'><?php echo $lang->bug->type;?></th>
+          <th class='c-status'><?php echo $lang->statusAB;?></th>
+          <th class='c-user'><?php echo $lang->bug->assignedTo;?></th>
+          <th class='c-user'><?php echo $lang->bug->resolvedBy;?></th>
+          <th class='c-resolution'><?php echo $lang->bug->resolution;?></th>
         </tr>
       </thead>
       <tbody>

module/testcase/view/groupcase.html.php

@@ -35,16 +35,16 @@
           </div>
         </th>
         <th class='c-id-sm'><?php echo $lang->idAB;?></th>
-        <th class='w-pri'>  <?php echo $lang->priAB;?></th>
+        <th class='c-pri'>  <?php echo $lang->priAB;?></th>
         <th><?php echo $lang->testcase->title;?></th>
-        <th class='w-80px'> <?php echo $lang->typeAB;?></th>
-        <th class='w-80px'> <?php echo $lang->testtask->lastRunAccount;?></th>
-        <th class='w-120px'><?php echo $lang->testtask->lastRunTime;?></th>
-        <th class='w-80px'> <?php echo $lang->testtask->lastRunResult;?></th>
-        <th class='w-80px'> <?php echo $lang->testcase->status;?></th>
-        <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='c-type'> <?php echo $lang->typeAB;?></th>
+        <th class='c-user'> <?php echo $lang->testtask->lastRunAccount;?></th>
+        <th class='c-date'><?php echo $lang->testtask->lastRunTime;?></th>
+        <th class='c-result'> <?php echo $lang->testtask->lastRunResult;?></th>
+        <th class='c-status'> <?php echo $lang->testcase->status;?></th>
+        <th class='c-bugs' title='<?php echo $lang->testcase->bugs?>'><?php echo $lang->testcase->bugsAB;?></th>
+        <th class='c-results' title='<?php echo $lang->testcase->results?>'><?php echo $lang->testcase->resultsAB;?></th>
+        <th class='c-steps' title='<?php echo $lang->testcase->stepNumber?>'><?php echo $lang->testcase->stepNumberAB;?></th>
         <th class='c-actions-2'> <?php echo $lang->actions;?></th>
       </tr>
     </thead>

module/testcase/view/importfromlib.html.php

@@ -34,13 +34,13 @@
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
           <?php if($branches):?>
-          <th class='w-110px'><?php echo $lang->testcase->branch ?></th>
+          <th class='c-branch'><?php echo $lang->testcase->branch ?></th>
           <?php endif;?>
-          <th class='w-pri'>  <?php common::printOrderLink('pri',   $orderBy, $vars, $lang->priAB);?></th>
+          <th class='c-pri'>  <?php common::printOrderLink('pri',   $orderBy, $vars, $lang->priAB);?></th>
           <th>                <?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
-          <th class='w-200px'><?php echo $lang->testcase->fromModule ?></th>
-          <th class='w-200px'><?php echo $lang->testcase->module ?></th>
-          <th class='w-100px'><?php common::printOrderLink('type',  $orderBy, $vars, $lang->testcase->type)?></th>
+          <th class='c-module'><?php echo $lang->testcase->fromModule ?></th>
+          <th class='c-module'><?php echo $lang->testcase->module ?></th>
+          <th class='c-type'><?php common::printOrderLink('type',  $orderBy, $vars, $lang->testcase->type)?></th>
         </tr>
       </thead>
       <tbody>

module/testcase/view/linkcases.html.php

@@ -32,12 +32,12 @@
             </div>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='w-pri'><?php echo $lang->priAB;?></th>
+          <th class='c-pri'><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->testcase->product;?></th>
           <th><?php echo $lang->testcase->title;?></th>
-          <th class='w-type'><?php echo $lang->testcase->type;?></th>
-          <th class='w-user'><?php echo $lang->openedByAB;?></th>
-          <th class='w-status'><?php echo $lang->statusAB;?></th>
+          <th class='c-type'><?php echo $lang->testcase->type;?></th>
+          <th class='c-user'><?php echo $lang->openedByAB;?></th>
+          <th class='c-status'><?php echo $lang->statusAB;?></th>
         </tr>
       </thead>
       <tbody>

module/testcase/view/showimport.html.php

@@ -30,21 +30,21 @@ $(function()
     <table class='table table-form' id='showData'>
       <thead>
         <tr>
-          <th class='w-50px'><?php echo $lang->lineNumber?></th>
-          <th class='w-40px'><?php echo $lang->idAB?></th>
+          <th class='c-line-number'><?php echo $lang->lineNumber?></th>
+          <th class='c-id'><?php echo $lang->idAB?></th>
           <th><?php echo $lang->testcase->title?></th>
-          <th class='w-180px'><?php echo $lang->testcase->module?></th>
-          <th class='w-120px'><?php echo $lang->testcase->story?></th>
-          <th class='w-80px'><?php echo $lang->testcase->pri?></th>
-          <th class='w-120px'><?php echo $lang->testcase->type?></th>
-          <th class='w-160px'><?php echo $lang->testcase->stage?></th>
+          <th class='c-module'><?php echo $lang->testcase->module?></th>
+          <th class='c-story'><?php echo $lang->testcase->story?></th>
+          <th class='c-pri-box'><?php echo $lang->testcase->pri?></th>
+          <th class='c-type'><?php echo $lang->testcase->type?></th>
+          <th class='c-stage'><?php echo $lang->testcase->stage?></th>
           <th><?php echo $lang->testcase->precondition?></th>
           <?php if(!empty($appendFields)):?>
           <?php foreach($appendFields as $appendField):?>
-          <th class='w-100px'><?php echo $lang->testcase->{$appendField->field}?></th>
+          <th class='c-other'><?php echo $lang->testcase->{$appendField->field}?></th>
           <?php endforeach;?>
           <?php endif;?>
-          <th class='w-300px'>
+          <th class='c-step'>
             <table class='w-p100 table-borderless'>
               <tr>
                 <th class="no-padding"><?php echo $lang->testcase->stepDesc?></th>

module/testtask/css/browse.css

@@ -1,2 +1,3 @@
 #taskList tbody>tr>td, #taskList thead>tr>th {white-space: nowrap;}
 td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+.c-name {width: 200px;}

module/testtask/css/linkcase.css

@@ -1,2 +1,3 @@
 td.title {overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
-.main-table .table-header {box-shadow: none;}
+.main-table .table-header {box-shadow: none;}
+.c-version, .c-result {width: 80px;}

module/testtask/view/browse.html.php

@@ -66,15 +66,15 @@ $status = $this->session->testTaskVersionStatus;
     <thead>
     <?php $vars = "productID=$productID&branch=$branch&type=$scope,$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
       <tr>
-        <th class='c-id text-left'>   <?php common::printOrderLink('id',        $orderBy, $vars, $lang->idAB);?></th>
-        <th class='w-200px text-left'><?php common::printOrderLink('name',      $orderBy, $vars, $lang->testtask->name);?></th>
-        <th class='text-left'>        <?php common::printOrderLink('product',   $orderBy, $vars, $lang->testtask->product);?></th>
-        <th class='text-left'>        <?php common::printOrderLink('execution', $orderBy, $vars, $lang->testtask->execution);?></th>
-        <th class='text-left'>        <?php common::printOrderLink('build',     $orderBy, $vars, $lang->testtask->build);?></th>
-        <th class='c-user text-left'> <?php common::printOrderLink('owner',     $orderBy, $vars, $lang->testtask->owner);?></th>
-        <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-id text-left'>    <?php common::printOrderLink('id',        $orderBy, $vars, $lang->idAB);?></th>
+        <th class='c-name text-left'>  <?php common::printOrderLink('name',      $orderBy, $vars, $lang->testtask->name);?></th>
+        <th class='text-left'>         <?php common::printOrderLink('product',   $orderBy, $vars, $lang->testtask->product);?></th>
+        <th class='text-left'>         <?php common::printOrderLink('execution', $orderBy, $vars, $lang->testtask->execution);?></th>
+        <th class='text-left'>         <?php common::printOrderLink('build',     $orderBy, $vars, $lang->testtask->build);?></th>
+        <th class='c-user text-left'>  <?php common::printOrderLink('owner',     $orderBy, $vars, $lang->testtask->owner);?></th>
+        <th class='c-date text-left'>  <?php common::printOrderLink('begin',     $orderBy, $vars, $lang->testtask->begin);?></th>
+        <th class='c-date text-left'>  <?php common::printOrderLink('end',       $orderBy, $vars, $lang->testtask->end);?></th>
+        <th class='c-status text-left'><?php common::printOrderLink('status',    $orderBy, $vars, $lang->statusAB);?></th>
         <?php
         $extendFields = $this->testtask->getFlowExtendFields();
         foreach($extendFields as $extendField) echo "<th>{$extendField->name}</th>";

module/testtask/view/linkcase.html.php

@@ -83,14 +83,14 @@
             <?php endif;?>
             <?php echo $lang->idAB;?>
           </th>
-          <th class='w-80px text-center'><nobr><?php echo $lang->testtask->linkVersion;?></nobr></th>
+          <th class='c-version text-center'><nobr><?php echo $lang->testtask->linkVersion;?></nobr></th>
           <th class='c-pri'><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->testcase->title;?></th>
           <th class='c-type'><?php echo $lang->testcase->type;?></th>
           <th class='c-user'><?php echo $lang->openedByAB;?></th>
-          <th class='w-80px'><?php echo $lang->testtask->lastRunAccount;?></th>
-          <th class='w-120px'><?php echo $lang->testtask->lastRunTime;?></th>
-          <th class='w-80px'><?php echo $lang->testtask->lastRunResult;?></th>
+          <th class='c-user'><?php echo $lang->testtask->lastRunAccount;?></th>
+          <th class='c-date'><?php echo $lang->testtask->lastRunTime;?></th>
+          <th class='c-result'><?php echo $lang->testtask->lastRunResult;?></th>
           <th class='c-status'><?php echo $lang->statusAB;?></th>
         </tr>
       </thead>

module/tree/view/browse.html.php

@@ -160,7 +160,7 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete] {display: none
               <?php endif;?>
               <td colspan="2" class="form-actions">
                 <?php if($canBeChanged) echo html::submitButton();?>
-                <?php if(!isonlybody()) echo html::a($backLink, $lang->goback, '', "class='btn btn-wide'");?>
+                <?php if(!isonlybody()) echo html::backButton();?>
                 <?php echo html::hidden('parentModuleID', $currentModuleID);?>
                 <?php echo html::hidden('maxOrder', $maxOrder);?>
               </td>

www/theme/default/style.css

@@ -54,9 +54,10 @@ a.showMoreImage:hover {opacity: 1;}
 .c-pri {width: 40px;}
 .c-severity {width: 50px;}
 .c-sort, .c-progress {width: 60px;}
+.c-estimate {width: 70px;}
 .c-number, .c-stage, .c-role, .c-estimate-box, .c-result {width: 80px;}
 .c-company, .c-budget {width: 80px;}
-.c-status, .c-type, .c-user, .c-date, .c-encode, .c-resolution, .c-pri-box {width: 100px;}
+.c-status, .c-type, .c-user, .c-date, .c-encode, .c-resolution, .c-pri-box, .c-other {width: 100px;}
 .c-object-type {width: 130px;}
 .c-full-date, .c-mobile, .c-email, .c-text, .c-subject, .c-assigned-box, .c-user-box {width: 150px;}
 .c-module, .c-date-box {width: 180px;}