From 3833c12ccce59bcc49c4cfa892401973558f604d Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Mon, 2 Jan 2017 17:01:27 -0500
Subject: Refactoring/rewrite of modal boxes handling

---
 app/Template/task_modification/show.php | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'app/Template/task_modification/show.php')

diff --git a/app/Template/task_modification/show.php b/app/Template/task_modification/show.php
index 734b247a..23a0a43b 100644
--- a/app/Template/task_modification/show.php
+++ b/app/Template/task_modification/show.php
@@ -1,13 +1,13 @@
 <div class="page-header">
     <h2><?= $this->text->e($project['name']) ?> &gt; <?= $this->text->e($task['title']) ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('TaskModificationController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form method="post" action="<?= $this->url->href('TaskModificationController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('id', $values) ?>
     <?= $this->form->hidden('project_id', $values) ?>
 
-    <div class="form-columns">
-        <div class="form-column">
+    <div class="task-form-container">
+        <div class="task-form-main-column">
             <?= $this->task->selectTitle($values, $errors) ?>
             <?= $this->task->selectDescription($values, $errors) ?>
             <?= $this->task->selectTags($project, $tags) ?>
@@ -15,30 +15,28 @@
             <?= $this->hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?>
         </div>
 
-        <div class="form-column">
+        <div class="task-form-secondary-column">
             <?= $this->task->selectColor($values) ?>
             <?= $this->task->selectAssignee($users_list, $values, $errors) ?>
             <?= $this->task->selectCategory($categories_list, $values, $errors) ?>
             <?= $this->task->selectPriority($project, $values) ?>
-            <?= $this->task->selectScore($values, $errors) ?>
-            <?= $this->task->selectReference($values, $errors) ?>
 
             <?= $this->hook->render('template:task:form:second-column', array('values' => $values, 'errors' => $errors)) ?>
         </div>
 
-        <div class="form-column">
+        <div class="task-form-secondary-column">
+            <?= $this->task->selectDueDate($values, $errors) ?>
+            <?= $this->task->selectStartDate($values, $errors) ?>
             <?= $this->task->selectTimeEstimated($values, $errors) ?>
             <?= $this->task->selectTimeSpent($values, $errors) ?>
-            <?= $this->task->selectStartDate($values, $errors) ?>
-            <?= $this->task->selectDueDate($values, $errors) ?>
+            <?= $this->task->selectScore($values, $errors) ?>
+            <?= $this->task->selectReference($values, $errors) ?>
 
             <?= $this->hook->render('template:task:form:third-column', array('values' => $values, 'errors' => $errors)) ?>
         </div>
-    </div>
 
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue" tabindex="15"><?= t('Save') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
+        <div class="task-form-bottom">
+            <?= $this->modal->submitButtons() ?>
+        </div>
     </div>
 </form>
-- 
cgit v1.2.3