* adjust for batchcreate page.

This commit is contained in:
wangyidong
2018-04-13 09:36:34 +08:00
parent de2cedd799
commit 579cae8b25
6 changed files with 19 additions and 19 deletions
+2 -2
View File
@@ -785,14 +785,14 @@ EOD;
}
else
{
return html::a($link, "<i class='$class'></i>", $target, "class='btn $extraClass' title='$title' $misc", false);
return html::a($link, "<i class='$class'></i>", $target, "class='btn $extraClass' title='$title' $misc", false) . "\n";
}
}
else
{
if($type == 'list')
{
return "<button type='button' class='disabled btn $extraClass'><i class='$class' title='$title' $misc></i></button>";
return "<button type='button' class='disabled btn $extraClass'><i class='$class' title='$title' $misc></i></button>\n";
}
}
}
+11 -3
View File
@@ -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);
});
+1 -1
View File
@@ -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 "<th data-flex='$fixed' $width class='c-$id' $title>";
if($id == 'actions')
+3 -3
View File
@@ -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';
+1 -8
View File
@@ -91,7 +91,7 @@
</tbody>
<tfoot>
<tr>
<td colspan="<?php echo count($visibleFields) + 2?>" class="text-center">
<td colspan="<?php echo count($visibleFields) + 3?>" class="text-center">
<?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary') . '&nbsp;' . html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
@@ -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()
+1 -2
View File
@@ -315,9 +315,8 @@
</div>
</div>
</div>
div>
iv id="mainActions">
<div id="mainActions">
<?php common::printPreAndNext($preAndNext);?>
<div class="btn-toolbar">
<?php if(!$story->deleted):?>