Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/244_tianshujie_28241' into 'master'

Browse Source 
Sprint/244 tianshujie 28241

See merge request easycorp/zentaopms!5646
This commit is contained in:
李玉春
2022-09-30 05:21:40 +00:00
parent 6823f93bf6 e43a0cfab7
commit 05046906ea
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/css/view.css
+1
View File
@@ -32,3 +32,4 @@ ol, ul {padding-left: 20px;}
#mainMenu .btn-toolbar .page-title .label {top: 9px; margin-right: 10px; height: 16px;}
#mainMenu .btn-toolbar .page-title .text {max-width: 434px; overflow: hidden; white-space:nowrap; margin-right: 6px;}
#actionsBox a:last-of-type + .divider {display: none;}
#actionsBox div.divider:first-child {display: none;}
module/productplan/js/view.js
-2
View File
@@ -44,8 +44,6 @@ function loadURL(url, type)
$(function()
{
$('#actionsBox a').first().prevAll('.divider').hide();
/* Recalculate the maximum width of the title. */
var maxWidth = $('#mainMenu').width() - $('#actionsBox').width() - $('#mainMenu .btn-toolbar .page-title .label-info').width() - 177;
$('#mainMenu .btn-toolbar .page-title .text').css('max-width', maxWidth.toString() + 'px');
module/testcase/config.php
+5 -5
View File
@@ -181,16 +181,16 @@ $config->testcase->datatable->fieldList['lastRunner']['fixed'] = 'no';
$config->testcase->datatable->fieldList['lastRunner']['width'] = '70';
$config->testcase->datatable->fieldList['lastRunner']['required'] = 'no';
$config->testcase->datatable->fieldList['lastRunResult']['title'] = 'lastRunResult';
$config->testcase->datatable->fieldList['lastRunResult']['fixed'] = 'no';
$config->testcase->datatable->fieldList['lastRunResult']['width'] = '70';
$config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no';
$config->testcase->datatable->fieldList['lastRunDate']['title'] = 'lastRunDate';
$config->testcase->datatable->fieldList['lastRunDate']['fixed'] = 'no';
$config->testcase->datatable->fieldList['lastRunDate']['width'] = '90';
$config->testcase->datatable->fieldList['lastRunDate']['required'] = 'no';
$config->testcase->datatable->fieldList['lastRunResult']['title'] = 'lastRunResult';
$config->testcase->datatable->fieldList['lastRunResult']['fixed'] = 'no';
$config->testcase->datatable->fieldList['lastRunResult']['width'] = '70';
$config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no';
$config->testcase->datatable->fieldList['lastEditedBy']['title'] = 'lastEditedBy';
$config->testcase->datatable->fieldList['lastEditedBy']['fixed'] = 'no';
$config->testcase->datatable->fieldList['lastEditedBy']['width'] = '92';