diff --git a/app/Controller/Board.php b/app/Controller/Board.php index 758dea1e5..e859348ee 100644 --- a/app/Controller/Board.php +++ b/app/Controller/Board.php @@ -283,7 +283,7 @@ class Board extends Base if ($valid) { - if ($this->board->addColumn($project['id'], $data['title'],$data['task_limit'],$data['description'])) { + if ($this->board->addColumn($project['id'], $data['title'], $data['task_limit'], $data['description'])) { $this->session->flash(t('Board updated successfully.')); $this->response->redirect('?controller=board&action=edit&project_id='.$project['id']); } diff --git a/app/Integration/BitbucketWebhook.php b/app/Integration/BitbucketWebhook.php index 9f82d5c07..ccb89e13b 100644 --- a/app/Integration/BitbucketWebhook.php +++ b/app/Integration/BitbucketWebhook.php @@ -2,7 +2,6 @@ namespace Integration; -use Event\GenericEvent; use Event\TaskEvent; use Model\Task; diff --git a/app/Template/board/edit.php b/app/Template/board/edit.php index 75f2b4f5a..b9b1788a6 100644 --- a/app/Template/board/edit.php +++ b/app/Template/board/edit.php @@ -59,6 +59,12 @@ formLabel(t('Description'), 'description') ?>
+
+ formTextarea('description', $values, $errors) ?> +
+
+
+
-
- formTextarea('description', $values, $errors) ?> -
-
-
-
diff --git a/app/Template/board/edit_column.php b/app/Template/board/edit_column.php index 397e1d230..ef76b1809 100644 --- a/app/Template/board/edit_column.php +++ b/app/Template/board/edit_column.php @@ -18,6 +18,13 @@ formLabel(t('Description'), 'description') ?>
+ +
+ formTextarea('description', $values, $errors) ?> +
+
+
+
-
- formTextarea('description', $values, $errors) ?> -
-
-
-
diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php index 23e170d97..f0a00fc13 100644 --- a/app/Template/board/swimlane.php +++ b/app/Template/board/swimlane.php @@ -24,7 +24,9 @@ a('+', 'task', 'create', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'task-creation-popover', t('Add a new task')) ?> + e($column['title']) ?> + diff --git a/app/Template/project/show.php b/app/Template/project/show.php index 888eea2ad..b8bfd5101 100644 --- a/app/Template/project/show.php +++ b/app/Template/project/show.php @@ -47,12 +47,14 @@ - e($column['title']) ?> - - - - - + + e($column['title']) ?> + + + + + + diff --git a/assets/css/app.css b/assets/css/app.css index 2f410dc0f..844d16419 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -1022,6 +1022,10 @@ input.form-input-large { } /* preview tabs */ +label + .form-tabs { + margin-top: 10px; +} + .form-tabs { width: 100%; max-width: 800px; @@ -1261,7 +1265,13 @@ div.ui-tooltip { .tooltip-large { width: 550px; -}/* header */ +} + +.column-tooltip { + color: #999; + font-size: 0.95em; +} +/* header */ header { margin-top: 10px; padding-bottom: 15px; diff --git a/assets/css/src/form.css b/assets/css/src/form.css index 7eec0e726..60dccd4c8 100644 --- a/assets/css/src/form.css +++ b/assets/css/src/form.css @@ -176,6 +176,10 @@ input.form-input-large { } /* preview tabs */ +label + .form-tabs { + margin-top: 10px; +} + .form-tabs { width: 100%; max-width: 800px; diff --git a/assets/js/app.js b/assets/js/app.js index 114c8fae5..48eac8715 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -136,16 +136,16 @@ var Kanboard=function(){jQuery(document).ready(function(){Kanboard.Init()});retu $("#popover-content").click(function(a){a.stopPropagation()});$(".close-popover").click(function(a){a.preventDefault();$("#popover-container").remove()});Mousetrap.bind("esc",function(){$("#popover-container").remove()});c&&c()})},IsVisible:function(){var a="";"undefined"!==typeof document.hidden?a="visibilityState":"undefined"!==typeof document.mozHidden?a="mozVisibilityState":"undefined"!==typeof document.msHidden?a="msVisibilityState":"undefined"!==typeof document.webkitHidden&&(a="webkitVisibilityState"); return""!=a?"visible"==document[a]:!0},SetStorageItem:function(a,c){"undefined"!==typeof Storage&&localStorage.setItem(a,c)},GetStorageItem:function(a){return"undefined"!==typeof Storage?localStorage.getItem(a):""},MarkdownPreview:function(a){a.preventDefault();var c=$(this),b=$(this).closest("ul"),d=$(".write-area"),e=$(".preview-area"),f=$("textarea");$.ajax({url:"?controller=app&action=preview",contentType:"application/json",type:"POST",processData:!1,dataType:"html",data:JSON.stringify({text:f.val()})}).done(function(a){b.find("li").removeClass("form-tab-selected"); 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()});$.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()}}}(); +$("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);$(".column-tooltip").tooltip({content:function(a){return $(this).attr("title")}});$(".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 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'+$(this).attr("title")+'
'; + return '
' + $(this).attr("title") + '
'; } }); diff --git a/assets/js/src/board.js b/assets/js/src/board.js index 2a51eef4f..e4ba4ed59 100644 --- a/assets/js/src/board.js +++ b/assets/js/src/board.js @@ -272,7 +272,6 @@ Kanboard.Board = (function() { filter_load_events(); keyboard_shortcuts(); } - }); })();