diff --git a/module/bug/model.php b/module/bug/model.php index 2fb4bc333d..6e83dfb6d9 100644 --- a/module/bug/model.php +++ b/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 ""; switch($id) diff --git a/module/datatable/model.php b/module/datatable/model.php index ff4ec16d33..739c609ebb 100644 --- a/module/datatable/model.php +++ b/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' : ''; diff --git a/module/story/model.php b/module/story/model.php index b527b369d8..e20d95d8e1 100644 --- a/module/story/model.php +++ b/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 ""; switch($id) diff --git a/module/task/config.php b/module/task/config.php index a5dc045cd3..56e0300ed4 100644 --- a/module/task/config.php +++ b/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'; diff --git a/module/testcase/model.php b/module/testcase/model.php index 7f4b7a800c..53d8cc4568 100644 --- a/module/testcase/model.php +++ b/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 ""; switch($id) diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index c4f9843b8e..b8654dec71 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -284,11 +284,11 @@
deleted):?> -
+
";?> "; + if(!isonlybody()) echo "
"; 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%'"); diff --git a/www/js/zui/min.js b/www/js/zui/min.js index d24e37e8bf..6fa7eec460 100644 --- a/www/js/zui/min.js +++ b/www/js/zui/min.js @@ -1,5 +1,5 @@ /*! - * ZUI: Zentao template - v1.8.1 - 2018-05-31 + * ZUI: Zentao template - v1.8.1 - 2018-06-01 * http://zui.sexy * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2018 cnezsoft.com; Licensed MIT @@ -75,4 +75,4 @@ if(!t.fn.droppable)return void console.error("Sortable requires droppable.js");v * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/ */ function(t){function e(e){if("string"==typeof e.data){var i=e.handler,n=e.data.toLowerCase().split(" ");e.handler=function(e){if(this===e.target||!/textarea|select/i.test(e.target.nodeName)&&"text"!==e.target.type){var s="keypress"!==e.type&&t.hotkeys.specialKeys[e.which],o=String.fromCharCode(e.which).toLowerCase(),a="",r={};e.altKey&&"alt"!==s&&(a+="alt+"),e.ctrlKey&&"ctrl"!==s&&(a+="ctrl+"),e.metaKey&&!e.ctrlKey&&"meta"!==s&&(a+="meta+"),e.shiftKey&&"shift"!==s&&(a+="shift+"),s?r[a+s]=!0:(r[a+o]=!0,r[a+t.hotkeys.shiftNums[o]]=!0,"shift+"===a&&(r[t.hotkeys.shiftNums[o]]=!0));for(var l=0,h=n.length;l","/":"?","\\":"|"}},t.each(["keydown","keyup","keypress"],function(){t.event.special[this]={add:e}})}(jQuery),function(t){"use strict";function e(e,i){if(e===!1)return e;if(!e)return i;e===!0?e={add:!0,"delete":!0,edit:!0,sort:!0}:"string"==typeof e&&(e=e.split(","));var n;return t.isArray(e)&&(n={},t.each(e,function(e,i){t.isPlainObject(i)?n[i.action]=i:n[i]=!0}),e=n),t.isPlainObject(e)&&(n={},t.each(e,function(e,i){i?n[e]=t.extend({type:e},a[e],t.isPlainObject(i)?i:null):n[e]=!1}),e=n),i?t.extend(!0,{},i,e):e}function i(e,i,n){return i=i||e.type,t(n||e.template).addClass("tree-action").attr(t.extend({"data-type":i,title:e.title||""},e.attr)).data("action",e)}var n="zui.tree",s=0,o=function(e,i){this.name=n,this.$=t(e),this.getOptions(i),this._init()},a={sort:{template:''},add:{template:''},edit:{template:''},"delete":{template:''}};o.DEFAULTS={animate:null,initialState:"normal",toggleTemplate:''},o.prototype.add=function(e,i,n,s,o){var a,r=t(e),l=this.options;if(r.is("li")?(a=r.children("ul"),a.length||(a=t("