From 7c4bdea324d8074ffcc3fa353fcfd85ee8066634 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sat, 14 Feb 2015 21:03:25 -0500 Subject: [PATCH] Add board filter: collapse/expand tasks --- app/Locale/da_DK/translations.php | 2 + app/Locale/de_DE/translations.php | 2 + app/Locale/es_ES/translations.php | 2 + app/Locale/fi_FI/translations.php | 2 + app/Locale/fr_FR/translations.php | 2 + app/Locale/hu_HU/translations.php | 2 + app/Locale/it_IT/translations.php | 2 + app/Locale/ja_JP/translations.php | 2 + app/Locale/pl_PL/translations.php | 2 + app/Locale/pt_BR/translations.php | 2 + app/Locale/ru_RU/translations.php | 2 + app/Locale/sv_SE/translations.php | 2 + app/Locale/th_TH/translations.php | 2 + app/Locale/zh_CN/translations.php | 2 + app/Template/board/filters.php | 8 ++ app/Template/board/show.php | 3 +- app/Template/board/swimlane.php | 8 +- app/Template/board/task.php | 146 ++++++++--------------------- app/Template/board/task_footer.php | 45 +++++++++ app/Template/board/task_public.php | 26 +++++ assets/css/app.css | 10 ++ assets/css/src/task.css | 10 ++ assets/js/app.js | 17 ++-- assets/js/src/board.js | 65 ++++++++++++- 24 files changed, 241 insertions(+), 125 deletions(-) create mode 100644 app/Template/board/task_footer.php create mode 100644 app/Template/board/task_public.php diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index b6186a334..44d3c9f8a 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index f954ce78c..e768c33c0 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index 60a90c9ab..997d0d502 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index 420546461..facbafdd7 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index 26372c485..a69816626 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -724,4 +724,6 @@ return array( '<1h' => '<1h', '%dh' => '%dh', '%b %e' => '%e %b', + 'Expand tasks' => 'Déplier les tâches', + 'Collapse tasks' => 'Replier les tâches', ); diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index 487492b2d..8407ca558 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index f395caffa..dc369ba39 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index ab62128c4..e6cfe83e4 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 688230faf..c1583cd8e 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index d7759fc81..30c4dca3d 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index 0afd3643d..ebaca4fc6 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index c9a9b041a..6a6d09731 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index 502b1135f..f78f198aa 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index 756907084..45d9203ae 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Template/board/filters.php b/app/Template/board/filters.php index 0e9c4d5f0..db2108ab4 100644 --- a/app/Template/board/filters.php +++ b/app/Template/board/filters.php @@ -46,5 +46,13 @@
    • +
  • + + + + +
    • \ No newline at end of file diff --git a/app/Template/board/show.php b/app/Template/board/show.php index 5fbb576c1..dc524737b 100644 --- a/app/Template/board/show.php +++ b/app/Template/board/show.php @@ -1,4 +1,3 @@ - @@ -25,4 +24,4 @@ )) ?> -
    + \ No newline at end of file diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php index f0a00fc13..ec5272f36 100644 --- a/app/Template/board/swimlane.php +++ b/app/Template/board/swimlane.php @@ -26,13 +26,13 @@ e($column['title']) ?> - + - + - + (/e($column['task_limit']) ?>) @@ -65,7 +65,7 @@ - render('board/task', array( + render($not_editable ? 'board/task_public' : 'board/task', array( 'project' => $project, 'task' => $task, 'categories' => $categories, diff --git a/app/Template/board/task.php b/app/Template/board/task.php index 638078c3a..5f73a5c24 100644 --- a/app/Template/board/task.php +++ b/app/Template/board/task.php @@ -1,31 +1,3 @@ - - -
    - - a('#'.$task['id'], 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> - - - - () - - - -  -  - - - - - - - - - -
    - a($this->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> -
    - - -
    -
      -
    • - -
        -
      • a(t('Change assignee'), 'board', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'assignee-popover') ?>
        • -
      • a(t('Change category'), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'category-popover') ?>
        • -
      • a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-description-popover') ?>
        • -
      • a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-edit-popover') ?>
        • -
      • a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes', 'redirect' => 'board'), true) ?>
        • - - -
      - - - - () - - - - - a( - (! empty($task['owner_id']) ? ($task['assignee_name'] ?: $task['assignee_username']) : t('Nobody assigned')), - 'board', - 'changeAssignee', - array('task_id' => $task['id'], 'project_id' => $task['project_id']), - false, - 'assignee-popover', - t('Change assignee') - ) ?> - - - getTaskAge($task['date_creation']) ?> - getTaskAge($task['date_moved']) ?> - -
      - a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + - +
      +
        +
      • + +
          +
        • a(t('Change assignee'), 'board', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'assignee-popover') ?>
          • +
        • a(t('Change category'), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'category-popover') ?>
          • +
        • a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-description-popover') ?>
          • +
        • a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-edit-popover') ?>
          • +
        • a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes', 'redirect' => 'board'), true) ?>
          • + + +
        - -
        - - a( - $this->inList($task['category_id'], $categories), - 'board', - 'changeCategory', - array('task_id' => $task['id'], 'project_id' => $task['project_id']), - false, - 'category-popover', - t('Change category') - ) ?> - -
        - - -
        - - -   + + + () - + - - - - - - - - - - - - - - - - - - - + + a( + (! empty($task['owner_id']) ? ($task['assignee_name'] ?: $task['assignee_username']) : t('Nobody assigned')), + 'board', + 'changeAssignee', + array('task_id' => $task['id'], 'project_id' => $task['project_id']), + false, + 'assignee-popover', + t('Change assignee') + ) ?> - -
        + getTaskAge($task['date_creation']) ?> + getTaskAge($task['date_moved']) ?> + +
        + a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> +
        + + render('board/task_footer', array('task' => $task, 'categories' => $categories)) ?> +
      diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php new file mode 100644 index 000000000..04d425e86 --- /dev/null +++ b/app/Template/board/task_footer.php @@ -0,0 +1,45 @@ + +
      + + a( + $this->inList($task['category_id'], $categories), + 'board', + 'changeCategory', + array('task_id' => $task['id'], 'project_id' => $task['project_id']), + false, + 'category-popover', + t('Change category') + ) ?> + +
      + + +
      + + +   + + + + + + + + + + + + + + + + + + + + + + + + +
      \ No newline at end of file diff --git a/app/Template/board/task_public.php b/app/Template/board/task_public.php new file mode 100644 index 000000000..4e3ad18c7 --- /dev/null +++ b/app/Template/board/task_public.php @@ -0,0 +1,26 @@ +
      + + a('#'.$task['id'], 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> + + + + () + + + +  -  + + + + + + + + + +
      + a($this->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> +
      + + render('board/task_footer', array('task' => $task, 'categories' => $categories)) ?> +
      \ No newline at end of file diff --git a/assets/css/app.css b/assets/css/app.css index 8a0ad3070..967054330 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -817,6 +817,16 @@ div.task-board-recent { text-decoration: underline; } +.task-board-collapsed { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +a.task-board-collapsed-title { + font-weight: normal; +} + .task-board-title { margin-top: 10px; font-size: 1.1em; diff --git a/assets/css/src/task.css b/assets/css/src/task.css index 7a5b61c94..77bcc48cf 100644 --- a/assets/css/src/task.css +++ b/assets/css/src/task.css @@ -26,6 +26,16 @@ div.task-board-recent { text-decoration: underline; } +.task-board-collapsed { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +a.task-board-collapsed-title { + font-weight: normal; +} + .task-board-title { margin-top: 10px; font-size: 1.1em; diff --git a/assets/js/app.js b/assets/js/app.js index c1b3ef377..7175ad437 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -141,14 +141,15 @@ return""!=a?"visible"==document[a]:!0},SetStorageItem:function(a,c){"undefined"! c.parent().addClass("form-tab-selected");e.find(".markdown").html(a);e.css("height",f.css("height"));e.css("width",f.css("width"));d.hide();e.show()})},MarkdownWriter:function(a){a.preventDefault();$(this).closest("ul").find("li").removeClass("form-tab-selected");$(this).parent().addClass("form-tab-selected");$(".write-area").show();$(".preview-area").hide()},CheckSession:function(){$(".form-login").length||$.ajax({cache:!1,url:$("body").data("status-url"),statusCode:{401:function(a){window.location= $("body").data("login-url")}}})},Init:function(){$("#board-selector").chosen({width:180});$("#board-selector").change(function(){window.location=$(this).attr("data-board-url").replace(/PROJECT_ID/g,$(this).val())});window.setInterval(Kanboard.CheckSession,6E4);$(".popover-subtask-restriction").click(Kanboard.Popover);$(".file-popover").click(Kanboard.Popover);Mousetrap.bind("ctrl+enter",function(){$("form").submit()});$(".column-tooltip").tooltip({content:function(a){return'
      '+ $(this).attr("title")+"
      "}});$.datepicker.setDefaults($.datepicker.regional[$("body").data("js-lang")]);Kanboard.InitAfterAjax()},InitAfterAjax:function(){$(".form-date").datepicker({showOtherMonths:!0,selectOtherMonths:!0,dateFormat:"yy-mm-dd",constrainInput:!1});$("#markdown-preview").click(Kanboard.MarkdownPreview);$("#markdown-write").click(Kanboard.MarkdownWriter);$(".auto-select").focus(function(){$(this).select()});$(".dropit-submenu").hide();$(".dropdown").not(".dropit").dropit()}}}(); -Kanboard.Board=function(){function a(a){Kanboard.Popover(a,Kanboard.InitAfterAjax)}function c(){Mousetrap.bind("n",function(){Kanboard.OpenPopover($(".task-creation-popover").attr("href"),Kanboard.InitAfterAjax)})}function b(){$(".column").sortable({delay:300,distance:5,connectWith:".column",placeholder:"draggable-placeholder",stop:function(a,b){e(b.item.attr("data-task-id"),b.item.parent().attr("data-column-id"),b.item.index()+1,b.item.parent().attr("data-swimlane-id"))}});$(".assignee-popover").click(a); -$(".category-popover").click(a);$(".task-edit-popover").click(a);$(".task-creation-popover").click(a);$(".task-description-popover").click(a);$(".task-board-tooltip").tooltip({track:!1,position:{my:"left-20 top",at:"center bottom+9",using:function(a,b){$(this).css(a);var c=b.target.left+b.target.width/2-b.element.left-20;$("
      ").addClass("tooltip-arrow").addClass(b.vertical).addClass(0==c?"align-left":"align-right").appendTo(this)}},content:function(a){if(a=$(this).attr("data-href")){var b=this; -$.get(a,function l(a){$(".ui-tooltip-content:visible").html(a);a=$(".ui-tooltip:visible");a.css({top:"",left:""});a.children(".tooltip-arrow").remove();var c=$(b).tooltip("option","position");c.of=$(b);a.position(c);$("#tooltip-subtasks a").click(function(a){a.preventDefault();a.stopPropagation();$(this).hasClass("popover-subtask-restriction")?(Kanboard.OpenPopover($(this).attr("href")),$(b).tooltip("close")):$.get($(this).attr("href"),l)})});return''}}}).on("mouseenter", -function(){var a=this;$(this).tooltip("open");$(".ui-tooltip").on("mouseleave",function(){$(a).tooltip("close")})}).on("mouseleave focusout",function(a){a.stopImmediatePropagation();var b=this;setTimeout(function(){$(".ui-tooltip:hover").length||$(b).tooltip("close")},100)});$("[data-task-url]").each(function(){$(this).click(function(){window.location=$(this).attr("data-task-url")})});var b=parseInt($("#board").attr("data-check-interval"));0").addClass("tooltip-arrow").addClass(b.vertical).addClass(0== +c?"align-left":"align-right").appendTo(this)}},content:function(a){if(a=$(this).attr("data-href")){var b=this;$.get(a,function p(a){$(".ui-tooltip-content:visible").html(a);a=$(".ui-tooltip:visible");a.css({top:"",left:""});a.children(".tooltip-arrow").remove();var c=$(b).tooltip("option","position");c.of=$(b);a.position(c);$("#tooltip-subtasks a").click(function(a){a.preventDefault();a.stopPropagation();$(this).hasClass("popover-subtask-restriction")?(Kanboard.OpenPopover($(this).attr("href")),$(b).tooltip("close")): +$.get($(this).attr("href"),p)})});return''}}}).on("mouseenter",function(){var a=this;$(this).tooltip("open");$(".ui-tooltip").on("mouseleave",function(){$(a).tooltip("close")})}).on("mouseleave focusout",function(a){a.stopImmediatePropagation();var b=this;setTimeout(function(){$(".ui-tooltip:hover").length||$(b).tooltip("close")},100)});$("[data-task-url]").each(function(){$(this).click(function(){window.location=$(this).attr("data-task-url")})});var b=parseInt($("#board").attr("data-check-interval")); +0