Improve task summary sections

2 files changed, 54 insertions, 60 deletions

diff --git a/app/Template/task_external_link/show.php b/app/Template/task_external_link/show.php
index e9339e86..8ed11803 100644
--- a/app/Template/task_external_link/show.php
+++ b/app/Template/task_external_link/show.php
@@ -1,60 +1,12 @@
-<div class="task-show-title color-<?= $task['color_id'] ?>">
-    <h2><?= $this->text->e($task['title']) ?></h2>
-</div>
-
-<div class="page-header">
-    <h2><?= t('External links') ?></h2>
-    <ul>
-        <li>
-            <i class="fa fa-external-link fa-fw"></i>
-            <?= $this->url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
-        </li>
-    </ul>
-</div>
-
-<?php if (empty($links)): ?>
-    <p class="alert"><?= t('There is no external link for the moment.') ?></p>
-<?php else: ?>
-    <table class="table-stripped table-small">
-        <tr>
-            <th class="column-10"><?= t('Type') ?></th>
-            <th><?= t('Title') ?></th>
-            <th class="column-10"><?= t('Dependency') ?></th>
-            <th class="column-15"><?= t('Creator') ?></th>
-            <th class="column-15"><?= t('Date') ?></th>
-            <?php if ($this->user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?>
-                <th class="column-5"><?= t('Action') ?></th>
-            <?php endif ?>
-        </tr>
-        <?php foreach ($links as $link): ?>
-            <tr>
-                <td>
-                    <?= $link['type'] ?>
-                </td>
-                <td>
-                    <a href="<?= $link['url'] ?>" target="_blank"><?= $this->text->e($link['title']) ?></a>
-                </td>
-                <td>
-                    <?= $this->text->e($link['dependency_label']) ?>
-                </td>
-                <td>
-                    <?= $this->text->e($link['creator_name'] ?: $link['creator_username']) ?>
-                </td>
-                <td>
-                    <?= $this->dt->date($link['date_creation']) ?>
-                </td>
-                <?php if ($this->user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?>
-                <td>
-                    <div class="dropdown">
-                    <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
-                    <ul>
-                        <li><?= $this->url->link(t('Edit'), 'TaskExternalLink', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
-                        <li><?= $this->url->link(t('Remove'), 'TaskExternalLink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
-                    </ul>
-                    </div>
-                </td>
-                <?php endif ?>
-            </tr>
-        <?php endforeach ?>
-    </table>
-<?php endif ?>
+<section class="accordion-section <?= empty($links) ? 'accordion-collapsed' : '' ?>">
+    <div class="accordion-title">
+        <h3><a href="#" class="fa accordion-toggle"></a> <?= t('External links') ?></h3>
+    </div>
+    <div class="accordion-content">
+        <?= $this->render('task_external_link/table', array(
+            'links' => $links,
+            'task' => $task,
+            'project' => $project,
+        )) ?>
+    </div>
+</section>
diff --git a/app/Template/task_external_link/table.php b/app/Template/task_external_link/table.php
new file mode 100644
index 00000000..d1cdeca1
--- /dev/null
+++ b/app/Template/task_external_link/table.php
@@ -0,0 +1,42 @@
+<table class="table-stripped table-small">
+    <tr>
+        <th class="column-10"><?= t('Type') ?></th>
+        <th><?= t('Title') ?></th>
+        <th class="column-10"><?= t('Dependency') ?></th>
+        <th class="column-15"><?= t('Creator') ?></th>
+        <th class="column-15"><?= t('Date') ?></th>
+        <?php if ($this->user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?>
+            <th class="column-5"><?= t('Action') ?></th>
+        <?php endif ?>
+    </tr>
+    <?php foreach ($links as $link): ?>
+        <tr>
+            <td>
+                <?= $link['type'] ?>
+            </td>
+            <td>
+                <a href="<?= $link['url'] ?>" target="_blank"><?= $this->text->e($link['title']) ?></a>
+            </td>
+            <td>
+                <?= $this->text->e($link['dependency_label']) ?>
+            </td>
+            <td>
+                <?= $this->text->e($link['creator_name'] ?: $link['creator_username']) ?>
+            </td>
+            <td>
+                <?= $this->dt->date($link['date_creation']) ?>
+            </td>
+            <?php if ($this->user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?>
+                <td>
+                    <div class="dropdown">
+                        <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
+                        <ul>
+                            <li><?= $this->url->link(t('Edit'), 'TaskExternalLink', 'edit', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
+                            <li><?= $this->url->link(t('Remove'), 'TaskExternalLink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?></li>
+                        </ul>
+                    </div>
+                </td>
+            <?php endif ?>
+        </tr>
+    <?php endforeach ?>
+</table>
\ No newline at end of file