diff options
| -rw-r--r-- | assets/css/app.css | 13 | ||||
| -rw-r--r-- | assets/css/src/board.css | 11 | ||||
| -rw-r--r-- | assets/css/src/task.css | 2 | ||||
| -rw-r--r-- | assets/js/app.js | 4 | ||||
| -rw-r--r-- | assets/js/src/board.js | 4 |
5 files changed, 12 insertions, 22 deletions
diff --git a/assets/css/app.css b/assets/css/app.css index de7525ed..0804b37a 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -727,11 +727,6 @@ nav .active a { font-size: 0.95em; } -.filter-on { - font-weight: bold; - color: #333; -} - /* public board */ .public-board { margin-top: 5px; @@ -745,13 +740,13 @@ nav .active a { /* board table */ #board-container { - overflow-x: auto; + overflow-x: scroll; + padding-bottom: 150px; /* Space to avoid dropdown menu truncated */ } #board td, #board th { - min-width: 230px; - max-width: 230px; + min-width: 240px; } #board th a { @@ -898,7 +893,7 @@ a.task-board-nobody { .task-board-icons span { opacity: 0.5; - margin-left: 5px; + margin-left: 2px; } .task-board-icons a:hover, diff --git a/assets/css/src/board.css b/assets/css/src/board.css index 00e0ad7c..bbd9fd52 100644 --- a/assets/css/src/board.css +++ b/assets/css/src/board.css @@ -3,11 +3,6 @@ font-size: 0.95em; } -.filter-on { - font-weight: bold; - color: #333; -} - /* public board */ .public-board { margin-top: 5px; @@ -21,13 +16,13 @@ /* board table */ #board-container { - overflow-x: auto; + overflow-x: scroll; + padding-bottom: 150px; /* Space to avoid dropdown menu truncated */ } #board td, #board th { - min-width: 230px; - max-width: 230px; + min-width: 240px; } #board th a { diff --git a/assets/css/src/task.css b/assets/css/src/task.css index 7942d8d3..b7a5cb9c 100644 --- a/assets/css/src/task.css +++ b/assets/css/src/task.css @@ -97,7 +97,7 @@ a.task-board-nobody { .task-board-icons span { opacity: 0.5; - margin-left: 5px; + margin-left: 2px; } .task-board-icons a:hover, diff --git a/assets/js/app.js b/assets/js/app.js index 8e7d6798..892f153d 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -148,8 +148,8 @@ Kanboard.SetStorageItem(d(),"expanded")});$(".filter-collapse-link").click(funct (Kanboard.GetStorageItem(d())||"expanded")?f():e()}function k(){$(".column").sortable({delay:300,distance:5,connectWith:".column",placeholder:"draggable-placeholder",stop:function(a,b){n(b.item.attr("data-task-id"),b.item.parent().attr("data-column-id"),b.item.index()+1,b.item.parent().attr("data-swimlane-id"))}});$("#board").on("click",".task-board-popover",a);$("#board").on("click",".task-board",function(){window.location=$(this).data("task-url")});$(".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;$("<div>").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").not(".popover").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'<i class="fa fa-refresh fa-spin fa-2x"></i>'}}}).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)});var b=parseInt($("#board").attr("data-check-interval"));0<b&&(l=window.setInterval(m,1E3*b))}function n(a,b,c,d){clearInterval(l);$.ajax({cache:!1,url:$("#board").attr("data-save-url"),contentType:"application/json",type:"POST",processData:!1,data:JSON.stringify({task_id:a,column_id:b,swimlane_id:d,position:c}),success:function(a){$("#board").remove();$("#main").append(a);Kanboard.InitAfterAjax();k();h(); -g()}})}function m(){Kanboard.IsVisible()&&$.ajax({cache:!1,url:$("#board").attr("data-check-url"),statusCode:{200:function(a){$("#board").remove();$("#main").append(a);Kanboard.InitAfterAjax();clearInterval(l);k();h();g()}}})}function h(){var a=$("#form-user_id").val(),b=$("#form-category_id").val(),c=$("#more-filters option[value=filter-due-date]").is(":selected"),d=$("#more-filters option[value=filter-recent]").is(":selected"),e=$("#board").data("project-id");$("[data-task-id]").each(function(e, +var b=this;setTimeout(function(){$(".ui-tooltip:hover").length||$(b).tooltip("close")},100)});var b=parseInt($("#board").attr("data-check-interval"));0<b&&(l=window.setInterval(m,1E3*b))}function n(a,b,c,d){clearInterval(l);$.ajax({cache:!1,url:$("#board").attr("data-save-url"),contentType:"application/json",type:"POST",processData:!1,data:JSON.stringify({task_id:a,column_id:b,swimlane_id:d,position:c}),success:function(a){$("#board-container").remove();$("#main").append(a);Kanboard.InitAfterAjax(); +k();h();g()}})}function m(){Kanboard.IsVisible()&&$.ajax({cache:!1,url:$("#board").attr("data-check-url"),statusCode:{200:function(a){$("#board-container").remove();$("#main").append(a);Kanboard.InitAfterAjax();clearInterval(l);k();h();g()}}})}function h(){var a=$("#form-user_id").val(),b=$("#form-category_id").val(),c=$("#more-filters option[value=filter-due-date]").is(":selected"),d=$("#more-filters option[value=filter-recent]").is(":selected"),e=$("#board").data("project-id");$("[data-task-id]").each(function(e, g){var k=g.getAttribute("data-owner-id"),f=g.getAttribute("data-due-date"),m=g.getAttribute("data-category-id"),h=$(g).hasClass("task-board-recent");g.style.display=k!=a&&-1!=a?"none":"block";!c||""!=f&&"0"!=f||(g.style.display="none");m!=b&&-1!=b&&(g.style.display="none");d&&!h&&(g.style.display="none")});Kanboard.SetStorageItem("board_filter_"+e+"_form-user_id",a);Kanboard.SetStorageItem("board_filter_"+e+"_form-category_id",b);Kanboard.SetStorageItem("board_filter_"+e+"_filter-due-date",~~c);Kanboard.SetStorageItem("board_filter_"+ e+"_filter-recent",~~d)}function q(){var a=$("#board").data("project-id");$("#form-user_id").chosen({width:"180px"});$("#form-category_id").chosen({width:"200px"});$("#more-filters").chosen({width:"30%"});$(".apply-filters").change(function(a){h()});$("#form-user_id").val(Kanboard.GetStorageItem("board_filter_"+a+"_form-user_id")||-1);$("#form-user_id").trigger("chosen:updated");$("#form-category_id").val(Kanboard.GetStorageItem("board_filter_"+a+"_form-category_id")||-1);$("#form-category_id").trigger("chosen:updated"); +Kanboard.GetStorageItem("board_filter_"+a+"_filter-due-date")&&$("#more-filters option[value=filter-due-date]").attr("selected",!0);+Kanboard.GetStorageItem("board_filter_"+a+"_filter-recent")&&$("#more-filters option[value=filter-recent]").attr("selected",!0);$("#more-filters").trigger("chosen:updated");h()}var l=null;jQuery(document).ready(function(){Kanboard.Exists("board")&&(k(),q(),b(),c())})}(); diff --git a/assets/js/src/board.js b/assets/js/src/board.js index 487b808a..75c44f2e 100644 --- a/assets/js/src/board.js +++ b/assets/js/src/board.js @@ -235,7 +235,7 @@ Kanboard.Board = (function() { "position": position }), success: function(data) { - $("#board").remove(); + $("#board-container").remove(); $("#main").append(data); Kanboard.InitAfterAjax(); board_load_events(); @@ -254,7 +254,7 @@ Kanboard.Board = (function() { url: $("#board").attr("data-check-url"), statusCode: { 200: function(data) { - $("#board").remove(); + $("#board-container").remove(); $("#main").append(data); Kanboard.InitAfterAjax(); board_unload_events(); |