diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css index 0469aab8d1..43d589faab 100644 --- a/module/task/css/batchcreate.css +++ b/module/task/css/batchcreate.css @@ -12,7 +12,7 @@ select[id^="story"] + .picker-single {width: 130px; max-width: 130px;} #zeroTaskStory {margin: 0 0 0 20px; height: 32px; padding: 5px 5px 5px 5px; border-radius: 3px; border: 2px solid transparent;} #zeroTaskStory > label:before {top: 7px; left: 5px;} -#zeroTaskStory > label:after {top: 5px; left: 5px;} +#zeroTaskStory > label:after {top: 7px; left: 5px;} #zeroTaskStory.checked {border-color: #00a9fc; background: #E9F2FB;} .chosen-results > li.has-task, diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js index 9d68a3483c..12bc4b399f 100755 --- a/module/task/js/batchcreate.js +++ b/module/task/js/batchcreate.js @@ -2,18 +2,18 @@ $(function() { removeDitto(); - if($('th.c-name').width() < 200) $('th.c-name').width(200); + if($('th.c-name').width() < 165) $('th.c-name').width(165); if(taskConsumed > 0) bootbox.alert(addChildTask); $('#customField').on('click', function(){$('#tableBody .chosen-with-drop').removeClass('chosen-with-drop chosen-container-active')}); $('#customField').click(function() { - disabledRequireFields(); + hiddenRequireFields(); }); + /* Implement a custom form without feeling refresh. */ $('#formSettingForm .btn-primary').click(function() { - $('#formSettingForm > .checkboxes > .checkbox-primary > input').removeAttr('disabled'); var fields = ''; $('#formSettingForm > .checkboxes > .checkbox-primary > input:checked').each(function() { @@ -24,8 +24,12 @@ $(function() $.post(link, {'fields' : fields}, function() { checkedShowFields(fields); - disabledRequireFields(); $('#formSetting').parent().removeClass('open'); + + var fieldCount = $('#batchCreateForm .table thead>tr>th:visible').length; + $('.form-actions').attr('colspan', fieldCount); + + if($('th.c-name').width() < 165) $('th.c-name').width(165); }); return false; diff --git a/module/task/js/common.js b/module/task/js/common.js index 8556c357e9..8e21cea27c 100644 --- a/module/task/js/common.js +++ b/module/task/js/common.js @@ -33,16 +33,17 @@ function checkedShowFields(fields) $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function() { var field = ',' + $(this).val() + ','; + var $field = $('#' + $(this).val()); var $fieldBox = $('.' + $(this).val() + 'Box' ); if(fieldList.indexOf(field) >= 0) { - - $(this).attr('checked', true); $fieldBox.removeClass('hidden'); + $field.removeAttr('disabled'); } - else + else if(!$fieldBox.hasClass('hidden')) { - if(!$fieldBox.hasClass('hidden')) $fieldBox.addClass('hidden'); + $fieldBox.addClass('hidden'); + $field.attr('disabled', true); } }); @@ -66,17 +67,17 @@ function checkedShowFields(fields) } /** - * Disabled require field. + * Hidden require field. * * @access public * @return void */ -function disabledRequireFields() +function hiddenRequireFields() { $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function() { var field = ',' + $(this).val() + ','; var required = ',' + requiredFields + ','; - if(required.indexOf(field) >= 0) $(this).attr('disabled', 'disabled'); + if(required.indexOf(field) >= 0) $(this).closest('div').addClass('hidden'); }); } diff --git a/module/task/js/create.js b/module/task/js/create.js index c187786901..d656899e8f 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -2,12 +2,11 @@ $(function() { $('#customField').click(function() { - disabledRequireFields(); + hiddenRequireFields(); }); $('#formSettingForm .btn-primary').click(function() { - $('#formSettingForm > .checkboxes > .checkbox-primary > input').removeAttr('disabled'); var fields = ''; $('#formSettingForm > .checkboxes > .checkbox-primary > input:checked').each(function() { @@ -18,7 +17,6 @@ $(function() $.post(link, {'fields' : fields}, function() { checkedShowFields(fields); - disabledRequireFields(); $('#formSetting').parent().removeClass('open'); }); diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 26c152c7b4..7430395279 100755 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -115,7 +115,7 @@ $colspan = count($visibleFields) + 3; ?>