From 339c990577a0c6fa8fd99959fe52aa25eff59c8f Mon Sep 17 00:00:00 2001
From: Fabiano Pereira <fabiano.pereira@serpro.gov.br>
Date: Thu, 3 Sep 2015 16:27:28 -0300
Subject: #1144 Add description field to swimlane.

---
 app/Template/board/table_swimlane.php |  8 ++++++++
 app/Template/swimlane/edit.php        | 21 +++++++++++++++++++++
 app/Template/swimlane/index.php       | 20 ++++++++++++++++++++
 app/Template/swimlane/table.php       |  2 +-
 4 files changed, 50 insertions(+), 1 deletion(-)

(limited to 'app/Template')

diff --git a/app/Template/board/table_swimlane.php b/app/Template/board/table_swimlane.php
index be401633..ab4735b1 100644
--- a/app/Template/board/table_swimlane.php
+++ b/app/Template/board/table_swimlane.php
@@ -65,6 +65,14 @@
 
             <div title="<?= t('Task count') ?>" class="board-column-header-task-count">
                 (<span><?= $swimlane['nb_tasks'] ?></span>)
+
+            <?php if (! empty($swimlane['description'])): ?>
+                <span title="<?= t('Description') ?>" class="tooltip" 
+                data-href="<?= $this->url->href('swimlane', 'description', array('swimlane_id' => $swimlane['id'], 'project_id' => $swimlane['project_id'])) ?>">
+                    <i class="fa fa-file-text-o"></i>
+                </span>
+            <?php endif ?>
+
             </div>
         </th>
     <?php endif ?>
diff --git a/app/Template/swimlane/edit.php b/app/Template/swimlane/edit.php
index 1788fed2..dfc5cf0b 100644
--- a/app/Template/swimlane/edit.php
+++ b/app/Template/swimlane/edit.php
@@ -12,6 +12,27 @@
     <?= $this->form->label(t('Name'), 'name') ?>
     <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
 
+    <?= $this->form->label(t('Description'), 'description') ?>
+
+    <div class="form-tabs">
+
+        <div class="write-area">
+          <?= $this->form->textarea('description', $values, $errors) ?>
+        </div>
+        <div class="preview-area">
+            <div class="markdown"></div>
+        </div>
+        <ul class="form-tabs-nav">
+            <li class="form-tab form-tab-selected">
+                <i class="fa fa-pencil-square-o fa-fw"></i><a id="markdown-write" href="#"><?= t('Write') ?></a>
+            </li>
+            <li class="form-tab">
+                <a id="markdown-preview" href="#"><i class="fa fa-eye fa-fw"></i><?= t('Preview') ?></a>
+            </li>
+        </ul>
+    </div>
+    <div class="form-help"><?= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?></div>
+
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
         <?= t('or') ?>
diff --git a/app/Template/swimlane/index.php b/app/Template/swimlane/index.php
index daee6af5..1bf31afa 100644
--- a/app/Template/swimlane/index.php
+++ b/app/Template/swimlane/index.php
@@ -16,6 +16,26 @@
     <?= $this->form->label(t('Name'), 'name') ?>
     <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="50"')) ?>
 
+    <?= $this->form->label(t('Description'), 'description') ?>
+
+    <div class="form-tabs">
+        <div class="write-area">
+          <?= $this->form->textarea('description', $values, $errors) ?>
+        </div>
+        <div class="preview-area">
+            <div class="markdown"></div>
+        </div>
+        <ul class="form-tabs-nav">
+            <li class="form-tab form-tab-selected">
+                <i class="fa fa-pencil-square-o fa-fw"></i><a id="markdown-write" href="#"><?= t('Write') ?></a>
+            </li>
+            <li class="form-tab">
+                <a id="markdown-preview" href="#"><i class="fa fa-eye fa-fw"></i><?= t('Preview') ?></a>
+            </li>
+        </ul>
+    </div>
+    <div class="form-help"><?= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?></div>
+
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
     </div>
diff --git a/app/Template/swimlane/table.php b/app/Template/swimlane/table.php
index f38572a3..b708e633 100644
--- a/app/Template/swimlane/table.php
+++ b/app/Template/swimlane/table.php
@@ -25,7 +25,7 @@
                     </li>
                 <?php endif ?>
                 <li>
-                    <?= $this->url->link(t('Rename'), 'swimlane', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id'])) ?>
+                    <?= $this->url->link(t('Edit'), 'swimlane', 'edit', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id'])) ?>
                 </li>
                 <li>
                     <?php if ($swimlane['is_active']): ?>
-- 
cgit v1.2.3