Merge branch 'stable' of https://github.com/kanboard/kanboard

4 files changed, 79 insertions, 0 deletions

diff --git a/app/Template/tag/create.php b/app/Template/tag/create.php
new file mode 100644
index 00000000..9b32bc46
--- /dev/null
+++ b/app/Template/tag/create.php
@@ -0,0 +1,16 @@
+<div class="page-header">
+    <h2><?= t('Add new tag') ?></h2>
+</div>
+<form method="post" class="popover-form" action="<?= $this->url->href('TagController', 'save') ?>" autocomplete="off">
+    <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('project_id', $values) ?>
+
+    <?= $this->form->label(t('Name'), 'name') ?>
+    <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="255"')) ?>
+
+    <div class="form-actions">
+        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'TagController', 'index', array(), false, 'close-popover') ?>
+    </div>
+</form>
diff --git a/app/Template/tag/edit.php b/app/Template/tag/edit.php
new file mode 100644
index 00000000..f751ff49
--- /dev/null
+++ b/app/Template/tag/edit.php
@@ -0,0 +1,17 @@
+<div class="page-header">
+    <h2><?= t('Edit a tag') ?></h2>
+</div>
+<form method="post" class="popover-form" action="<?= $this->url->href('TagController', 'update', array('tag_id' => $tag['id'])) ?>" autocomplete="off">
+    <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('id', $values) ?>
+    <?= $this->form->hidden('project_id', $values) ?>
+
+    <?= $this->form->label(t('Name'), 'name') ?>
+    <?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="255"')) ?>
+
+    <div class="form-actions">
+        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'TagController', 'index', array(), false, 'close-popover') ?>
+    </div>
+</form>
diff --git a/app/Template/tag/index.php b/app/Template/tag/index.php
new file mode 100644
index 00000000..2a495eb3
--- /dev/null
+++ b/app/Template/tag/index.php
@@ -0,0 +1,31 @@
+<div class="page-header">
+    <h2><?= t('Global tags') ?></h2>
+    <ul>
+        <li>
+            <i class="fa fa-plus" aria-hidden="true"></i>
+            <?= $this->url->link(t('Add new tag'), 'TagController', 'create', array(), false, 'popover') ?>
+        </li>
+    </ul>
+</div>
+
+<?php if (empty($tags)): ?>
+    <p class="alert"><?= t('There is no global tag at the moment.') ?></p>
+<?php else: ?>
+    <table class="table-striped">
+        <tr>
+            <th class="column-80"><?= t('Tag') ?></th>
+            <th><?= t('Action') ?></th>
+        </tr>
+        <?php foreach ($tags as $tag): ?>
+            <tr>
+                <td><?= $this->text->e($tag['name']) ?></td>
+                <td>
+                    <i class="fa fa-times" aria-hidden="true"></i>
+                    <?= $this->url->link(t('Remove'), 'TagController', 'confirm', array('tag_id' => $tag['id']), false, 'popover') ?>
+                    <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
+                    <?= $this->url->link(t('Edit'), 'TagController', 'edit', array('tag_id' => $tag['id']), false, 'popover') ?>
+                </td>
+            </tr>
+        <?php endforeach ?>
+    </table>
+<?php endif ?>
diff --git a/app/Template/tag/remove.php b/app/Template/tag/remove.php
new file mode 100644
index 00000000..46ea3f99
--- /dev/null
+++ b/app/Template/tag/remove.php
@@ -0,0 +1,15 @@
+<div class="page-header">
+    <h2><?= t('Remove a tag') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to remove this tag: "%s"?', $tag['name']) ?>
+    </p>
+
+    <div class="form-actions">
+        <?= $this->url->link(t('Yes'), 'TagController', 'remove', array('tag_id' => $tag['id']), true, 'btn btn-red popover-link') ?>
+        <?= t('or') ?>
+        <?= $this->url->link(t('cancel'), 'TagController', 'index', array(), false, 'close-popover') ?>
+    </div>
+</div>