diff --git a/module/common/model.php b/module/common/model.php index 5d84cb4e22..7fc17cbb3d 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -785,14 +785,14 @@ EOD; } else { - return html::a($link, "", $target, "class='btn $extraClass' title='$title' $misc", false); + return html::a($link, "", $target, "class='btn $extraClass' title='$title' $misc", false) . "\n"; } } else { if($type == 'list') { - return ""; + return "\n"; } } } diff --git a/module/common/view/pastetext.html.php b/module/common/view/pastetext.html.php index 6f561e27ad..0e4858b285 100644 --- a/module/common/view/pastetext.html.php +++ b/module/common/view/pastetext.html.php @@ -30,7 +30,7 @@ $(function() { var importText = $importLines.val(); var lines = importText.split('\n'); - var $lastRow; + var $lastRow, $firstRow; $.each(lines, function(index, line) { line = $.trim(line); @@ -45,12 +45,20 @@ $(function() { $row = batchForm.createRow(); } - $row.find('.input-story-title').val(line); + $row.find('.input-story-title').val(line).addClass('highlight'); $lastRow = $row; + if(!$firstRow) $firstRow = $row; }); $importLines.val(''); $dialog.removeClass('loading'); - $modal.modal('hide'); + $modal.on('hidden.zui.modal', function() + { + $firstRow[0].scrollIntoView(); + }).modal('hide'); + setTimeout(function() + { + $form.find('.input-story-title.highlight').removeClass('highlight'); + }, 3000); }, 200); }); diff --git a/module/datatable/model.php b/module/datatable/model.php index 577ad6b7a2..4b0b5d6d35 100644 --- a/module/datatable/model.php +++ b/module/datatable/model.php @@ -129,7 +129,7 @@ class datatableModel extends model $width = is_numeric($col->width) ? "{$col->width}px" : $col->width; $title = isset($col->name) ? "title='$col->name'" : ''; if($id == 'id' and (int)$width < 90) $width = '90px'; - $width = $id != 'actions' ? "data-width='$width' style='width:$width'" : ''; + $width = "data-width='$width' style='width:$width'"; echo ""; if($id == 'actions') diff --git a/module/story/config.php b/module/story/config.php index 3c117df04c..6af3cf4beb 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -91,12 +91,12 @@ $config->story->datatable->fieldList['sourceNote']['required'] = 'no'; $config->story->datatable->fieldList['status']['title'] = 'statusAB'; $config->story->datatable->fieldList['status']['fixed'] = 'no'; -$config->story->datatable->fieldList['status']['width'] = '60'; +$config->story->datatable->fieldList['status']['width'] = '80'; $config->story->datatable->fieldList['status']['required'] = 'no'; $config->story->datatable->fieldList['estimate']['title'] = 'estimateAB'; $config->story->datatable->fieldList['estimate']['fixed'] = 'no'; -$config->story->datatable->fieldList['estimate']['width'] = '55'; +$config->story->datatable->fieldList['estimate']['width'] = '65'; $config->story->datatable->fieldList['estimate']['required'] = 'no'; $config->story->datatable->fieldList['stage']['title'] = 'stageAB'; @@ -193,5 +193,5 @@ $config->story->datatable->fieldList['caseCount']['name'] = $lang->story->ca $config->story->datatable->fieldList['actions']['title'] = 'actions'; $config->story->datatable->fieldList['actions']['fixed'] = 'right'; -$config->story->datatable->fieldList['actions']['width'] = '140'; +$config->story->datatable->fieldList['actions']['width'] = '160'; $config->story->datatable->fieldList['actions']['required'] = 'yes'; diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index 2f19429a45..900171359e 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -91,7 +91,7 @@ - + save, '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', "btn btn-wide");?> @@ -104,13 +104,6 @@ $(function() { $('#batchCreateForm').batchActionForm( { - colorPicker: - { - updateBtn: function(color, $btn) - { - $btn.find('.color-bar').css('background', color || ''); - } - }, rowCreator: function($row, index) { $row.find('select').each(function() diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 9e63a5682f..ca4932ff42 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -315,9 +315,8 @@ -div> -iv id="mainActions"> +
deleted):?>