diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css index 57346b1598..98a5f15b7a 100644 --- a/module/task/css/batchcreate.css +++ b/module/task/css/batchcreate.css @@ -9,11 +9,6 @@ .chosen-container[id^="module"] .chosen-drop {min-width: 400px !important;} [id^=name] {min-width: 165px;} -#zeroTaskStory{background-color: #fafafa; color: #808080; padding: 5px 8px; text-align: center; margin-left: 10px; border: 1px solid #ddd;} -#zeroTaskStory .icon{display:none;} -#zeroTaskStory.zeroTask {background-color: #006af1; color: #fff; border-color: #006af1;} -#zeroTaskStory.zeroTask .icon{display:inline;} - #batchCreateForm .input-group, #batchCreateForm .input-group .form-control {position: static;} #batchCreateForm .input-group .colorpicker {z-index: 2;} @@ -21,3 +16,8 @@ #importLines {white-space: nowrap; background: repeat-y url("data:image/png;base64,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"); background-position: 0 6px; padding-left: 30px; line-height: 20px;} .main-header .pull-left {max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} + +#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.checked {border-color: #00a9fc; background: #E9F2FB;} \ No newline at end of file diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js index 768ff306a2..526fedf638 100755 --- a/module/task/js/batchcreate.js +++ b/module/task/js/batchcreate.js @@ -71,32 +71,25 @@ function setStoryRelated(num) /* Toggle zero task story. */ function toggleZeroTaskStory() { - if($('#zeroTaskStory').hasClass('zeroTask')) - { - $('#zeroTaskStory').removeClass('zeroTask'); - zeroTask = false; - } - else - { - $('#zeroTaskStory').addClass('zeroTask'); - zeroTask = true; - } + var $toggle = $('#zeroTaskStory').toggleClass('checked'); + var zeroTask = $toggle.hasClass('checked'); $.cookie('zeroTask', zeroTask, {expires:config.cookieLife, path:config.webRoot}); $('select[name^="story"]').each(function() { - selectVal = $(this).val(); - $(this).find('option').each(function() + var $select = $(this); + var selectVal = $select.val(); + $select.find('option').each(function() { - value = $(this).attr('value'); - $(this).show(); + var $option = $(this); + var value = $option.attr('value'); + $option.show(); if(value != 'ditto' && storyTasks[value] > 0 && zeroTask) { - $(this).hide(); - if(selectVal == value) selectVal = ''; + $option.hide(); + if(selectVal == value) selectVal = ''; } }) - $(this).val(selectVal); - $(this).trigger("chosen:updated"); + $select.val(selectVal).trigger("chosen:updated"); }) } diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 73c5f90ec0..707230675c 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -12,19 +12,21 @@ ?> -
-
-

+
+
+

task->batchCreateChildren;?> task->batchCreate;?> - type != 'ops'):?> - story->zeroTask;?> -

+ type != 'ops'):?> + + + +
createLink('custom', 'ajaxSaveCustomFields', 'module=task§ion=custom&key=batchCreateFields')?> @@ -115,7 +117,7 @@
-
    +
    • story->colorTag;?>
    @@ -133,7 +135,7 @@ - + diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index 4f17f4b949..8ea8f16176 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -13,10 +13,10 @@ lang->task->dittoNotice);?> -
    +

    - task->common . $lang->colon . $lang->task->batchEdit;?> + task->common . $lang->colon . $lang->task->batchEdit;?> icons['project']) . ' ' . $lang->task->project . $lang->colon . ' ' . $projectName;?> @@ -85,9 +85,15 @@ -
    - color, "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->task->colorTag}' data-update-text='#names\\[{$taskID}\\]'");?> - name, "class='form-control' autocomplete='off'");?> +
    + name, "class='form-control' autocomplete='off'");?> +
    + +
      +
    • story->colorTag;?>
      • +
    + color, "data-provide='colorpicker' data-wrapper='input-control-icon-right' data-icon='color' data-btn-tip='{$lang->task->colorTag}' data-update-text='#names\\[{$taskID}\\]'");?> +
    ' style='overflow:visible'>module, "class='form-control chosen'")?> @@ -109,7 +115,7 @@ - +