From 4bb422b41fd995cb67c41ad4b7ba155a84c6f1eb Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Thu, 12 Oct 2017 14:01:39 -0700
Subject: Render a dropdown menu for external task providers

---
 app/Helper/TaskHelper.php | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'app/Helper/TaskHelper.php')

diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php
index f3084759..3b9e9745 100644
--- a/app/Helper/TaskHelper.php
+++ b/app/Helper/TaskHelper.php
@@ -256,4 +256,58 @@ class TaskHelper extends Base
         $html .= '</ul></div></small>';
         return $html;
     }
+
+    public function getNewBoardTaskButton(array $swimlane, array $column)
+    {
+        $html = '<div class="board-add-icon">';
+        $providers = $this->externalTaskManager->getProviders();
+
+        if (empty($providers)) {
+            $html .= $this->helper->modal->largeIcon(
+                'plus',
+                t('Add a new task'),
+                'TaskCreationController',
+                'show', array(
+                    'project_id'  => $column['project_id'],
+                    'column_id'   => $column['id'],
+                    'swimlane_id' => $swimlane['id'],
+                )
+            );
+        } else {
+            $html .= '<div class="dropdown">';
+            $html .= '<a href="#" class="dropdown-menu"><i class="fa fa-plus" aria-hidden="true"></i></a><ul>';
+
+            $link = $this->helper->modal->large(
+                'plus',
+                t('Add a new Kanboard task'),
+                'TaskCreationController',
+                'show', array(
+                    'project_id'  => $column['project_id'],
+                    'column_id'   => $column['id'],
+                    'swimlane_id' => $swimlane['id'],
+                )
+            );
+
+            $html .= '<li>'.$link.'</li>';
+
+            foreach ($providers as $provider) {
+                $link = $this->helper->url->link(
+                    $provider->getMenuAddLabel(),
+                    'ExternalTaskCreationController',
+                    'step1',
+                    array('project_id' => $column['project_id'], 'swimlane_id' => $swimlane['id'], 'column_id' => $column['id'], 'provider_name' => $provider->getName()),
+                    false,
+                    'js-modal-large'
+                );
+
+                $html .= '<li>'.$provider->getIcon().' '.$link.'</li>';
+            }
+
+            $html .= '</ul></div>';
+        }
+
+        $html .= '</div>';
+
+        return $html;
+    }
 }
-- 
cgit v1.2.3


From 7c52546ed2b5ed724d19af95fe97726ab6156291 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Thu, 12 Oct 2017 15:25:13 -0700
Subject: Generate a link if the reference is a URL

---
 app/Helper/TaskHelper.php             | 15 +++++++++++++++
 app/Template/board/task_footer.php    |  2 +-
 app/Template/task/details.php         |  2 +-
 app/Template/task_list/task_icons.php |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'app/Helper/TaskHelper.php')

diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php
index 3b9e9745..065ece10 100644
--- a/app/Helper/TaskHelper.php
+++ b/app/Helper/TaskHelper.php
@@ -220,6 +220,21 @@ class TaskHelper extends Base
         return $html;
     }
 
+    public function renderReference(array $task)
+    {
+        if (! empty($task['reference'])) {
+            $reference = $this->helper->text->e($task['reference']);
+
+            if (filter_var($task['reference'], FILTER_VALIDATE_URL) !== false) {
+                return sprintf('<a href="%s" target=_blank">%s</a>', $reference, $reference);
+            }
+
+            return $reference;
+        }
+
+        return '';
+    }
+
     public function getProgress($task)
     {
         if (! isset($this->columns[$task['project_id']])) {
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index c78616e9..4ea5bb31 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -32,7 +32,7 @@
     <div class="task-board-icons-row">
         <?php if ($task['reference']): ?>
             <span class="task-board-reference" title="<?= t('Reference') ?>">
-                <?= $this->text->e($task['reference']) ?>
+                <?= $this->task->renderReference($task) ?>
             </span>
         <?php endif ?>
     </div>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index a42e09d1..3b4d4b38 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -22,7 +22,7 @@
                     </li>
                     <?php if (! empty($task['reference'])): ?>
                         <li>
-                            <strong><?= t('Reference:') ?></strong> <span><?= $this->text->e($task['reference']) ?></span>
+                            <strong><?= t('Reference:') ?></strong> <span><?= $this->task->renderReference($task) ?></span>
                         </li>
                     <?php endif ?>
                     <?php if (! empty($task['score'])): ?>
diff --git a/app/Template/task_list/task_icons.php b/app/Template/task_list/task_icons.php
index 03a891a2..d02c9021 100644
--- a/app/Template/task_list/task_icons.php
+++ b/app/Template/task_list/task_icons.php
@@ -1,7 +1,7 @@
 <div class="task-list-icons">
     <?php if ($task['reference']): ?>
         <span class="task-board-reference" title="<?= t('Reference') ?>">
-            <?= $this->text->e($task['reference']) ?>
+            <?= $this->task->renderReference($task) ?>
         </span>
     <?php endif ?>
     <?php if ($task['is_milestone'] == 1): ?>
-- 
cgit v1.2.3