Add task links (Merge pull-request #610)

6 files changed, 41 insertions, 0 deletions

diff --git a/assets/css/app.css b/assets/css/app.css
index 8ad66d15..42c0ff64 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -901,6 +901,8 @@ textarea {
 
 select {
     max-width: 95%;
+    paddin-top: 5px;
+    paddin-bottom: 5px;
 }
 
 ::-webkit-input-placeholder {
@@ -1267,6 +1269,9 @@ div.ui-tooltip {
     width: 550px;
 }
 
+.tooltip-tasklinks ul{
+    padding-left: 13px;
+}
 .column-tooltip {
 	color: #999;
 	font-size: 0.95em;
@@ -1632,6 +1637,7 @@ a.task-board-nobody {
     padding: 3px;
 }
 
+<<<<<<< HEAD
 .task-days-age {
     font-size: 0.8em;
     border: #888 1px solid;
@@ -1651,6 +1657,12 @@ a.task-board-nobody {
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
 }
+=======
+.task-closed {
+    text-decoration: line-through;
+}
+
+>>>>>>> 3ba416a8c3c0cbf9119f97de86eb447dbf8a18db
 /* comments */
 .comment {
     margin-bottom: 20px;
diff --git a/assets/css/src/form.css b/assets/css/src/form.css
index 60dccd4c..059cb49a 100644
--- a/assets/css/src/form.css
+++ b/assets/css/src/form.css
@@ -55,6 +55,8 @@ textarea {
 
 select {
     max-width: 95%;
+    paddin-top: 5px;
+    paddin-bottom: 5px;
 }
 
 ::-webkit-input-placeholder {
diff --git a/assets/css/src/task.css b/assets/css/src/task.css
index 11414364..9cd6f241 100644
--- a/assets/css/src/task.css
+++ b/assets/css/src/task.css
@@ -225,3 +225,7 @@ a.task-board-nobody {
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
 }
+
+.task-closed {
+    text-decoration: line-through;
+}
diff --git a/assets/css/src/tooltip.css b/assets/css/src/tooltip.css
index a940bc16..2c6070e4 100644
--- a/assets/css/src/tooltip.css
+++ b/assets/css/src/tooltip.css
@@ -64,6 +64,9 @@ div.ui-tooltip {
     width: 550px;
 }
 
+.tooltip-tasklinks ul{
+    padding-left: 13px;
+}
 .column-tooltip {
 	color: #999;
 	font-size: 0.95em;
diff --git a/assets/js/app.js b/assets/js/app.js
index 48eac871..1217cb76 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -154,6 +154,7 @@ Kanboard.Analytic=function(){jQuery(document).ready(function(){Kanboard.Exists("
 Kanboard.Analytic.CFD=function(){return{Init:function(){jQuery.getJSON($("#chart").attr("data-url"),function(a){var c=a.labels,b=a.columns,d=a.metrics;a=[];for(var e=0;e<d.length;e++){var f={};f[c.column]=d[e].column_title;f[c.day]=d[e].day;f[c.total]=d[e].total;a.push(f)}d=dimple.newSvg("#chart","100%",380);a=new dimple.chart(d,a);a.addCategoryAxis("x",c.day).addOrderRule("Date");a.addMeasureAxis("y",c.total);a.addSeries(c.column,dimple.plot.area).addOrderRule(b.reverse());a.addLegend(10,10,500,
 30,"left");a.draw()})}}}();Kanboard.Analytic.TaskRepartition=function(){return{Init:function(){jQuery.getJSON($("#chart").attr("data-url"),function(a){var c=a.labels,b=a.metrics;a=[];for(var d=0;d<b.length;d++){var e={};e[c.nb_tasks]=b[d].nb_tasks;e[c.column_title]=b[d].column_title;a.push(e)}b=dimple.newSvg("#chart","100%",350);a=new dimple.chart(b,a);a.addMeasureAxis("p",c.nb_tasks);a.addSeries(c.column_title,dimple.plot.pie).innerRadius="50%";a.addLegend(0,0,100,"100%","left");a.draw()})}}}();
 Kanboard.Analytic.UserRepartition=function(){return{Init:function(){jQuery.getJSON($("#chart").attr("data-url"),function(a){var c=a.labels,b=a.metrics;a=[];for(var d=0;d<b.length;d++){var e={};e[c.nb_tasks]=b[d].nb_tasks;e[c.user]=b[d].user;a.push(e)}b=dimple.newSvg("#chart","100%",350);a=new dimple.chart(b,a);a.addMeasureAxis("p",c.nb_tasks);a.addSeries(c.user,dimple.plot.pie).innerRadius="50%";a.addLegend(0,0,100,"100%","left");a.draw()})}}}();
+Kanboard.Link=function(){function a(){$(".behaviour").prop("checked")?$(".link-inverse-label").hide():$(".link-inverse-label").show()}jQuery(document).ready(function(){Kanboard.Exists("link-edit-section")&&(a(),$(".behaviour").click(a))})}();
 Kanboard.Swimlane=function(){function a(a){$(".swimlane-row-"+a).css("display","none");$(".show-icon-swimlane-"+a).css("display","inline");$(".hide-icon-swimlane-"+a).css("display","none")}function c(){var a="hidden_swimlanes_"+$("#board").data("project-id");return JSON.parse(Kanboard.GetStorageItem(a))||[]}jQuery(document).ajaxComplete(function(){c().map(function(b){a(b)})});jQuery(document).ready(function(){c().map(function(b){a(b)})});jQuery(document).on("click",".board-swimlane-toggle",function(b){b.preventDefault();
 b=$(this).data("swimlane-id");if(-1<c().indexOf(b)){var d="hidden_swimlanes_"+$("#board").data("project-id"),e=JSON.parse(Kanboard.GetStorageItem(d))||[],f=e.indexOf(b);-1<f&&e.splice(f,1);Kanboard.SetStorageItem(d,JSON.stringify(e));$(".swimlane-row-"+b).css("display","table-row");$(".show-icon-swimlane-"+b).css("display","none");$(".hide-icon-swimlane-"+b).css("display","inline")}else d="hidden_swimlanes_"+$("#board").data("project-id"),e=JSON.parse(Kanboard.GetStorageItem(d))||[],e.push(b),Kanboard.SetStorageItem(d,
 JSON.stringify(e)),a(b)})}();
diff --git a/assets/js/src/link.js b/assets/js/src/link.js
new file mode 100644
index 00000000..31eeafad
--- /dev/null
+++ b/assets/js/src/link.js
@@ -0,0 +1,19 @@
+Kanboard.Link = (function() {
+
+    function on_change() {
+        if ($('.behaviour').prop('checked')) {
+            $('.link-inverse-label').hide();
+        }
+        else {
+            $('.link-inverse-label').show();
+        }
+    }
+
+    jQuery(document).ready(function() {
+        if (Kanboard.Exists("link-edit-section")) {
+            on_change();
+            $(".behaviour").click(on_change);
+        }
+    });
+
+})();
\ No newline at end of file