From 917e6cab7469c408babebde18848824765d551fa Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Wed, 10 Sep 2014 21:13:13 +0200
Subject: Improve user interface for tablets

---
 app/Controller/Board.php   |  5 ++++-
 app/Templates/layout.php   |  6 +++---
 app/Templates/user_new.php | 34 +++++++++++++---------------------
 3 files changed, 20 insertions(+), 25 deletions(-)

(limited to 'app')

diff --git a/app/Controller/Board.php b/app/Controller/Board.php
index 71d94a29..33140f95 100644
--- a/app/Controller/Board.php
+++ b/app/Controller/Board.php
@@ -233,6 +233,9 @@ class Board extends Base
             $this->notfound();
         }
 
+        $board_selector = $projects;
+        unset($board_selector[$project_id]);
+
         $this->response->html($this->template->layout('board_index', array(
             'users' => $this->project->getUsersList($project_id, true, true),
             'filters' => array('user_id' => $user_id),
@@ -243,7 +246,7 @@ class Board extends Base
             'categories' => $this->category->getList($project_id, true, true),
             'menu' => 'boards',
             'title' => $projects[$project_id],
-            'board_selector' => $projects,
+            'board_selector' => $board_selector,
         )));
     }
 
diff --git a/app/Templates/layout.php b/app/Templates/layout.php
index 99382ae1..f2082db7 100644
--- a/app/Templates/layout.php
+++ b/app/Templates/layout.php
@@ -38,7 +38,7 @@
                 <a class="logo" href="?">kanboard</a>
 
                 <ul>
-                    <?php if (isset($board_selector)): ?>
+                    <?php if (isset($board_selector) && ! empty($board_selector)): ?>
                     <li>
                         <select id="board-selector" data-placeholder="<?= t('Display another project') ?>">
                             <option value=""></option>
@@ -58,13 +58,13 @@
                         <a href="?controller=user"><?= t('Users') ?></a>
                     </li>
                     <?php if (Helper\is_admin()): ?>
-                        <li <?= isset($menu) && $menu === 'config' ? 'class="active"' : '' ?>>
+                        <li class="hide-tablet <?= isset($menu) && $menu === 'config' ? 'active' : '' ?>">
                             <a href="?controller=config"><?= t('Settings') ?></a>
                         </li>
                     <?php endif ?>
                     <li>
                         <a href="?controller=user&amp;action=logout<?= Helper\param_csrf() ?>"><?= t('Logout') ?></a>
-                        (<a class="username" href="?controller=user&amp;action=show&amp;user_id=<?= Helper\get_user_id() ?>"><?= Helper\escape(Helper\get_username()) ?></a>)
+                        <span class="username">(<a href="?controller=user&amp;action=show&amp;user_id=<?= Helper\get_user_id() ?>"><?= Helper\escape(Helper\get_username()) ?></a>)</span>
                     </li>
                 </ul>
             </nav>
diff --git a/app/Templates/user_new.php b/app/Templates/user_new.php
index 48d7b6d3..158813cb 100644
--- a/app/Templates/user_new.php
+++ b/app/Templates/user_new.php
@@ -10,33 +10,25 @@
 
         <?= Helper\form_csrf() ?>
 
-        <div class="form-column">
+        <?= Helper\form_label(t('Username'), 'username') ?>
+        <?= Helper\form_text('username', $values, $errors, array('autofocus', 'required')) ?><br/>
 
-            <?= Helper\form_label(t('Username'), 'username') ?>
-            <?= Helper\form_text('username', $values, $errors, array('autofocus', 'required')) ?><br/>
+        <?= Helper\form_label(t('Name'), 'name') ?>
+        <?= Helper\form_text('name', $values, $errors) ?><br/>
 
-            <?= Helper\form_label(t('Name'), 'name') ?>
-            <?= Helper\form_text('name', $values, $errors) ?><br/>
+        <?= Helper\form_label(t('Email'), 'email') ?>
+        <?= Helper\form_email('email', $values, $errors) ?><br/>
 
-            <?= Helper\form_label(t('Email'), 'email') ?>
-            <?= Helper\form_email('email', $values, $errors) ?><br/>
+        <?= Helper\form_label(t('Password'), 'password') ?>
+        <?= Helper\form_password('password', $values, $errors, array('required')) ?><br/>
 
-        </div>
-
-        <div class="form-column">
-
-            <?= Helper\form_label(t('Password'), 'password') ?>
-            <?= Helper\form_password('password', $values, $errors, array('required')) ?><br/>
+        <?= Helper\form_label(t('Confirmation'), 'confirmation') ?>
+        <?= Helper\form_password('confirmation', $values, $errors, array('required')) ?><br/>
 
-            <?= Helper\form_label(t('Confirmation'), 'confirmation') ?>
-            <?= Helper\form_password('confirmation', $values, $errors, array('required')) ?><br/>
+        <?= Helper\form_label(t('Default project'), 'default_project_id') ?>
+        <?= Helper\form_select('default_project_id', $projects, $values, $errors) ?><br/>
 
-            <?= Helper\form_label(t('Default project'), 'default_project_id') ?>
-            <?= Helper\form_select('default_project_id', $projects, $values, $errors) ?><br/>
-
-            <?= Helper\form_checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?>
-
-        </div>
+        <?= Helper\form_checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?>
 
         <div class="form-actions">
             <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-- 
cgit v1.2.3