summaryrefslogtreecommitdiff
path: root/app/Template/board
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-02-09 21:37:31 -0500
committerFrederic Guillot <fred@kanboard.net>2015-02-09 21:37:31 -0500
commit755b38f09e9f6494129f55b96baff6672981a073 (patch)
tree6814720b5c42d785410cd9ee0c1e64b77893436b /app/Template/board
parent77a307e4ff8cfb4afcd34990b147f0ad38dfc558 (diff)
Code cleanup + minor css improvement
Diffstat (limited to 'app/Template/board')
-rw-r--r--app/Template/board/edit.php12
-rw-r--r--app/Template/board/edit_column.php13
-rw-r--r--app/Template/board/swimlane.php2
3 files changed, 15 insertions, 12 deletions
diff --git a/app/Template/board/edit.php b/app/Template/board/edit.php
index 75f2b4f5..b9b1788a 100644
--- a/app/Template/board/edit.php
+++ b/app/Template/board/edit.php
@@ -59,6 +59,12 @@
<?= $this->formLabel(t('Description'), 'description') ?>
<div class="form-tabs">
+ <div class="write-area">
+ <?= $this->formTextarea('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>
@@ -67,12 +73,6 @@
<a id="markdown-preview" href="#"><i class="fa fa-eye fa-fw"></i><?= t('Preview') ?></a>
</li>
</ul>
- <div class="write-area">
- <?= $this->formTextarea('description', $values, $errors) ?>
- </div>
- <div class="preview-area">
- <div class="markdown"></div>
- </div>
</div>
<div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
diff --git a/app/Template/board/edit_column.php b/app/Template/board/edit_column.php
index 397e1d23..ef76b180 100644
--- a/app/Template/board/edit_column.php
+++ b/app/Template/board/edit_column.php
@@ -18,6 +18,13 @@
<?= $this->formLabel(t('Description'), 'description') ?>
<div class="form-tabs">
+
+ <div class="write-area">
+ <?= $this->formTextarea('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>
@@ -26,12 +33,6 @@
<a id="markdown-preview" href="#"><i class="fa fa-eye fa-fw"></i><?= t('Preview') ?></a>
</li>
</ul>
- <div class="write-area">
- <?= $this->formTextarea('description', $values, $errors) ?>
- </div>
- <div class="preview-area">
- <div class="markdown"></div>
- </div>
</div>
<div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php
index 23e170d9..f0a00fc1 100644
--- a/app/Template/board/swimlane.php
+++ b/app/Template/board/swimlane.php
@@ -24,7 +24,9 @@
<?= $this->a('+', 'task', 'create', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'task-creation-popover', t('Add a new task')) ?>
</div>
<?php endif ?>
+
<?= $this->e($column['title']) ?>
+
<?php if (! empty($column['description'])): ?>
<span class="column-tooltip pull-right" title="<?= $this->markdown($column['description']) ?>">
<i class="fa fa-info-circle"></i>