From 755b38f09e9f6494129f55b96baff6672981a073 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Mon, 9 Feb 2015 21:37:31 -0500
Subject: Code cleanup + minor css improvement

---
 app/Controller/Board.php             |  2 +-
 app/Integration/BitbucketWebhook.php |  1 -
 app/Template/board/edit.php          | 12 ++++++------
 app/Template/board/edit_column.php   | 13 +++++++------
 app/Template/board/swimlane.php      |  2 ++
 app/Template/project/show.php        | 14 ++++++++------
 6 files changed, 24 insertions(+), 20 deletions(-)

(limited to 'app')

diff --git a/app/Controller/Board.php b/app/Controller/Board.php
index 758dea1e..e859348e 100644
--- a/app/Controller/Board.php
+++ b/app/Controller/Board.php
@@ -283,7 +283,7 @@ class Board extends Base
 
         if ($valid) {
 
-            if ($this->board->addColumn($project['id'], $data['title'],$data['task_limit'],$data['description'])) {
+            if ($this->board->addColumn($project['id'], $data['title'], $data['task_limit'], $data['description'])) {
                 $this->session->flash(t('Board updated successfully.'));
                 $this->response->redirect('?controller=board&action=edit&project_id='.$project['id']);
             }
diff --git a/app/Integration/BitbucketWebhook.php b/app/Integration/BitbucketWebhook.php
index 9f82d5c0..ccb89e13 100644
--- a/app/Integration/BitbucketWebhook.php
+++ b/app/Integration/BitbucketWebhook.php
@@ -2,7 +2,6 @@
 
 namespace Integration;
 
-use Event\GenericEvent;
 use Event\TaskEvent;
 use Model\Task;
 
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>
diff --git a/app/Template/project/show.php b/app/Template/project/show.php
index 888eea2a..b8bfd510 100644
--- a/app/Template/project/show.php
+++ b/app/Template/project/show.php
@@ -47,12 +47,14 @@
     </tr>
     <?php foreach ($stats['columns'] as $column): ?>
     <tr>
-        <td><?= $this->e($column['title']) ?>
-        <?php if (! empty($column['description'])): ?>
-            <span class="column-tooltip" title="<?= $this->markdown($column['description']) ?>">     
-                <i class="fa fa-info-circle"></i>
-            </span>
-        <?php endif ?></td>
+        <td>
+            <?= $this->e($column['title']) ?>
+            <?php if (! empty($column['description'])): ?>
+                <span class="column-tooltip" title="<?= $this->markdown($column['description']) ?>">
+                    <i class="fa fa-info-circle"></i>
+                </span>
+            <?php endif ?>
+        </td>
         <td><?= $column['task_limit'] ?: '∞' ?></td>
         <td><?= $column['nb_active_tasks'] ?></td>
     </tr>
-- 
cgit v1.2.3