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

module/bug/model.php

@@ -2416,6 +2416,7 @@ class bugModel extends model
                 if($bug->assignedTo == $account) $class .= ' red';
             }
             if($id == 'deadline' && isset($bug->delay)) $class .= ' delayed';
+            if(strpos(',project,story,plan,task,openedBuild,', ",{$id},") !== false) $class .= ' text-ellipsis';
 
             echo "<td class='" . $class . "' $title>";
             switch($id)

module/datatable/model.php

@@ -127,7 +127,7 @@ class datatableModel extends model
         {
             $fixed = $col->fixed == 'no' ? 'true': 'false';
             $width = is_numeric($col->width) ? "{$col->width}px" : $col->width;
-            $title = isset($col->name) ? "title='$col->name'" : '';
+            $title = isset($col->title) ? "title='$col->title'" : '';
             if($id == 'id' and (int)$width < 90) $width = '90px';
             $width = "data-width='$width' style='width:$width'";
             $align = $id == 'actions' ? 'text-center' : '';

module/story/model.php

@@ -2354,7 +2354,11 @@ class storyModel extends model
 
             $title = '';
             if($id == 'title') $title = $story->title;
-            if($id == 'plan')  $title = $story->planTitle;
+            if($id == 'plan')
+            {
+                $title  = $story->planTitle;
+                $class .= ' text-ellipsis';
+            }
 
             echo "<td class='" . $class . "' title='$title'>";
             switch($id)

module/task/config.php

@@ -145,7 +145,7 @@ $config->task->datatable->fieldList['finishedBy']['required'] = 'no';
 
 $config->task->datatable->fieldList['finishedDate']['title']    = 'finishedDateAB';
 $config->task->datatable->fieldList['finishedDate']['fixed']    = 'no';
-$config->task->datatable->fieldList['finishedDate']['width']    = '80';
+$config->task->datatable->fieldList['finishedDate']['width']    = '90';
 $config->task->datatable->fieldList['finishedDate']['required'] = 'no';
 
 $config->task->datatable->fieldList['canceledBy']['title']    = 'canceledBy';
@@ -155,7 +155,7 @@ $config->task->datatable->fieldList['canceledBy']['required'] = 'no';
 
 $config->task->datatable->fieldList['canceledDate']['title']    = 'canceledDate';
 $config->task->datatable->fieldList['canceledDate']['fixed']    = 'no';
-$config->task->datatable->fieldList['canceledDate']['width']    = '80';
+$config->task->datatable->fieldList['canceledDate']['width']    = '90';
 $config->task->datatable->fieldList['canceledDate']['required'] = 'no';
 
 $config->task->datatable->fieldList['closedBy']['title']    = 'closedBy';

module/testcase/model.php

@@ -1288,7 +1288,7 @@ class testcaseModel extends model
         $id = $col->id;
         if($col->show)
         {
-            $class = '';
+            $class = 'c-' . $id;
             $title = '';
             if($id == 'title')
             {
@@ -1301,7 +1301,8 @@ class testcaseModel extends model
                 $title  = "title='" . zget($this->lang->testcase->statusList, $case->status) . "'";
             }
             if($id == 'actions') $class .= ' c-actions';
-            if($id == 'lastRunResult') $class .= $case->lastRunResult;
+            if($id == 'lastRunResult') $class .= " {$case->lastRunResult}";
+            if(strpos(',stage,precondition,keywords,story,', ",{$id},") !== false) $class .= ' text-ellipsis';
 
             echo "<td class='{$class}' {$title}>";
             switch($id)

module/testcase/view/view.html.php

@@ -284,11 +284,11 @@
   <div class="btn-toolbar">
     <?php common::printBack($browseLink);?>
     <?php if(!$case->deleted):?>
-    <div class='divider'></div>
+    <?php if(!isonlybody()) echo "<div class='divider'></div>";?>
     <?php
     if(!$isLibCase)
     {
-        echo "<div class='divider'></div>";
+        if(!isonlybody()) echo "<div class='divider'></div>";
         common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', '', '', 'runCase', false, "data-width='95%'");
         common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'results', false, "data-width='95%'");