From 8d036dc06cd6b5f6ed2f8866e6370a20f8ee1baa Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 19 Mar 2016 15:18:58 -0400
Subject: Change cards layout

---
 app/Template/board/task_footer.php  | 15 ++++++++++++---
 app/Template/board/task_private.php | 13 ++-----------
 app/Template/board/task_public.php  |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'app')

diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index f5614f1d..f1b97c78 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -20,12 +20,12 @@
 
 <?php if (! empty($task['owner_id'])): ?>
 <div class="task-board-avatars">
+    <span
     <?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
-    <div
         class="task-board-assignee task-board-change-assignee"
         data-url="<?= $this->url->href('BoardPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
     <?php else: ?>
-        <div class="task-board-assignee">
+        class="task-board-assignee">
     <?php endif ?>
         <?= $this->avatar->small(
             $task['owner_id'],
@@ -34,7 +34,7 @@
             $task['assignee_email'],
             'avatar-inline'
         ) ?>
-    </div>
+    </span>
 </div>
 <?php endif ?>
 
@@ -95,6 +95,15 @@
     <?php endif ?>
 
     <?= $this->task->formatPriority($project, $task) ?>
+
+    <?php if ($task['is_active'] == 1): ?>
+        <div class="task-board-age">
+            <span title="<?= t('Task age in days')?>" class="task-board-age-total"><?= $this->dt->age($task['date_creation']) ?></span>
+            <span title="<?= t('Days in this column')?>" class="task-board-age-column"><?= $this->dt->age($task['date_moved']) ?></span>
+        </div>
+    <?php else: ?>
+        <span class="task-board-closed"><i class="fa fa-ban fa-fw"></i><?= t('Closed') ?></span>
+    <?php endif ?>
 </div>
 
 <?= $this->hook->render('template:board:task:footer', array('task' => $task)) ?>
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index a066ad1e..42e59b72 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -44,20 +44,11 @@
             </span>
             <?php endif ?>
 
-            <?php if ($task['is_active'] == 1): ?>
-            <div class="task-board-days">
-                <span title="<?= t('Task age in days')?>" class="task-days-age"><?= $this->dt->age($task['date_creation']) ?></span>
-                <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= $this->dt->age($task['date_moved']) ?></span>
-            </div>
-            <?php else: ?>
-                <div class="task-board-closed"><i class="fa fa-ban fa-fw"></i><?= t('Closed') ?></div>
-            <?php endif ?>
-
             <?= $this->hook->render('template:board:private:task:before-title', array('task' => $task)) ?>
 
-            <div class="task-board-title">
+            <span class="task-board-title">
                 <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
-            </div>
+            </span>
 
             <?= $this->hook->render('template:board:private:task:after-title', array('task' => $task)) ?>
 
diff --git a/app/Template/board/task_public.php b/app/Template/board/task_public.php
index c62cce1a..15834fa8 100644
--- a/app/Template/board/task_public.php
+++ b/app/Template/board/task_public.php
@@ -10,9 +10,9 @@
 
     <?= $this->hook->render('template:board:public:task:before-title', array('task' => $task)) ?>
 
-    <div class="task-board-title">
+    <span class="task-board-title">
         <?= $this->url->link($this->text->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
-    </div>
+    </span>
 
     <?= $this->hook->render('template:board:public:task:after-title', array('task' => $task)) ?>
 
-- 
cgit v1.2.3