From 0960a4d0b00c9491b554cd49557b052414168e86 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 8 Jan 2017 21:18:54 -0500
Subject: Improve link labels pages navigation

---
 app/Template/link/create.php | 12 +++---------
 app/Template/link/index.php  | 33 ---------------------------------
 app/Template/link/show.php   | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 42 deletions(-)
 delete mode 100644 app/Template/link/index.php
 create mode 100644 app/Template/link/show.php

(limited to 'app/Template/link')

diff --git a/app/Template/link/create.php b/app/Template/link/create.php
index 23990604..37610a3b 100644
--- a/app/Template/link/create.php
+++ b/app/Template/link/create.php
@@ -1,18 +1,12 @@
 <div class="page-header">
-    <h2><?= t('Add a new link') ?></h2>
+    <h2><?= t('Add link label') ?></h2>
 </div>
 
 <form action="<?= $this->url->href('LinkController', 'save') ?>" method="post" autocomplete="off">
-
     <?= $this->form->csrf() ?>
-
     <?= $this->form->label(t('Label'), 'label') ?>
-    <?= $this->form->text('label', $values, $errors, array('required')) ?>
-
+    <?= $this->form->text('label', $values, $errors, array('required', 'autofocus')) ?>
     <?= $this->form->label(t('Opposite label'), 'opposite_label') ?>
     <?= $this->form->text('opposite_label', $values, $errors) ?>
-
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-    </div>
+    <?= $this->modal->submitButtons() ?>
 </form>
diff --git a/app/Template/link/index.php b/app/Template/link/index.php
deleted file mode 100644
index b0dcad1e..00000000
--- a/app/Template/link/index.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Link labels') ?></h2>
-</div>
-<?php if (! empty($links)): ?>
-<table class="table-striped table-scrolling">
-    <tr>
-        <th class="column-70"><?= t('Link labels') ?></th>
-        <th><?= t('Actions') ?></th>
-    </tr>
-    <?php foreach ($links as $link): ?>
-    <tr>
-        <td>
-            <strong><?= t($link['label']) ?></strong>
-
-            <?php if (! empty($link['opposite_label'])): ?>
-                | <?= t($link['opposite_label']) ?>
-            <?php endif ?>
-        </td>
-        <td>
-            <ul>
-                <?= $this->modal->medium('edit', t('Edit'), 'LinkController', 'edit', array('link_id' => $link['id'])) ?>
-                <?= t('or') ?>
-                <?= $this->modal->confirm('trash-o', t('Remove'), 'LinkController', 'confirm', array('link_id' => $link['id'])) ?>
-            </ul>
-        </td>
-    </tr>
-    <?php endforeach ?>
-</table>
-<?php else: ?>
-    <?= t('There is no link.') ?>
-<?php endif ?>
-
-<?= $this->render('link/create', array('values' => $values, 'errors' => $errors)) ?>
diff --git a/app/Template/link/show.php b/app/Template/link/show.php
new file mode 100644
index 00000000..6aadd66b
--- /dev/null
+++ b/app/Template/link/show.php
@@ -0,0 +1,36 @@
+<div class="page-header">
+    <h2><?= t('Link labels') ?></h2>
+    <ul>
+        <li>
+            <?= $this->modal->medium('plus', t('Add link label'), 'LinkController', 'create') ?>
+        </li>
+    </ul>
+</div>
+<?php if (! empty($links)): ?>
+    <table class="table-striped table-scrolling">
+        <tr>
+            <th class="column-70"><?= t('Link labels') ?></th>
+            <th><?= t('Actions') ?></th>
+        </tr>
+        <?php foreach ($links as $link): ?>
+        <tr>
+            <td>
+                <strong><?= t($link['label']) ?></strong>
+
+                <?php if (! empty($link['opposite_label'])): ?>
+                    | <?= t($link['opposite_label']) ?>
+                <?php endif ?>
+            </td>
+            <td>
+                <ul>
+                    <?= $this->modal->medium('edit', t('Edit'), 'LinkController', 'edit', array('link_id' => $link['id'])) ?>
+                    <?= t('or') ?>
+                    <?= $this->modal->confirm('trash-o', t('Remove'), 'LinkController', 'confirm', array('link_id' => $link['id'])) ?>
+                </ul>
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+<?php else: ?>
+    <?= t('There is no link.') ?>
+<?php endif ?>
-- 
cgit v1.2.3