From 1ca83b5863d5bc8ed41626131f24168b64fd933c Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 31 Jan 2016 18:03:00 -0500
Subject: Move homepage menu to the user dropdown

---
 ChangeLog                              |  1 +
 app/Locale/bs_BA/translations.php      |  5 +++++
 app/Locale/cs_CZ/translations.php      |  5 +++++
 app/Locale/da_DK/translations.php      |  5 +++++
 app/Locale/de_DE/translations.php      |  5 +++++
 app/Locale/el_GR/translations.php      |  5 +++++
 app/Locale/es_ES/translations.php      |  5 +++++
 app/Locale/fi_FI/translations.php      |  5 +++++
 app/Locale/fr_FR/translations.php      |  5 +++++
 app/Locale/hu_HU/translations.php      |  5 +++++
 app/Locale/id_ID/translations.php      |  5 +++++
 app/Locale/it_IT/translations.php      |  5 +++++
 app/Locale/ja_JP/translations.php      |  5 +++++
 app/Locale/my_MY/translations.php      |  5 +++++
 app/Locale/nb_NO/translations.php      |  5 +++++
 app/Locale/nl_NL/translations.php      |  5 +++++
 app/Locale/pl_PL/translations.php      |  5 +++++
 app/Locale/pt_BR/translations.php      |  5 +++++
 app/Locale/pt_PT/translations.php      |  5 +++++
 app/Locale/ru_RU/translations.php      |  5 +++++
 app/Locale/sr_Latn_RS/translations.php |  5 +++++
 app/Locale/sv_SE/translations.php      |  5 +++++
 app/Locale/th_TH/translations.php      |  5 +++++
 app/Locale/tr_TR/translations.php      |  5 +++++
 app/Locale/zh_CN/translations.php      |  5 +++++
 app/Template/app/layout.php            | 10 ---------
 app/Template/header.php                | 37 +++++++++++++++++++++++++++++++---
 27 files changed, 155 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25b013dc..0345e020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ New features:
 
 Improvements:
 
+* Move homepage menus to the user dropdown
 * Have a new task assigned to the creator by default instead of "no assignee"
 * Show progress for task links in board tooltips
 * Simplify code to handle ajax popover and redirects
diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php
index c6005e78..eafdfd0b 100644
--- a/app/Locale/bs_BA/translations.php
+++ b/app/Locale/bs_BA/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php
index 8d153279..ef615066 100644
--- a/app/Locale/cs_CZ/translations.php
+++ b/app/Locale/cs_CZ/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index c6a3d099..6ac60df5 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index 01defc76..ac0fbb47 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php
index 5e62b6ed..ffed12b8 100644
--- a/app/Locale/el_GR/translations.php
+++ b/app/Locale/el_GR/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index 05f3ce1b..9f922391 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index 06eba55f..84da392f 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index c85ba6ba..ea5e901a 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -1128,4 +1128,9 @@ return array(
     'There is no internal link for the moment.' => 'Il n\'y a pas de lien interne pour le moment.',
     'Assign to me' => 'Assigner à moi',
     'Me' => 'Moi',
+    'Do not duplicate anything' => 'Ne rien dupliquer',
+    'Projects management' => 'Gestion des projets',
+    'Users management' => 'Gestion des utilisateurs',
+    'Groups management' => 'Gestion des groupes',
+    'Create from another project' => 'Créer depuis un autre projet',
 );
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index ec8e7cd8..e3df67b4 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php
index ce51b418..5eeb1492 100644
--- a/app/Locale/id_ID/translations.php
+++ b/app/Locale/id_ID/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index 2ce440f2..9e96e470 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index 1a023b5a..b95c960d 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php
index c112f6c1..cbea7c16 100644
--- a/app/Locale/my_MY/translations.php
+++ b/app/Locale/my_MY/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php
index d0fce9ec..28980448 100644
--- a/app/Locale/nb_NO/translations.php
+++ b/app/Locale/nb_NO/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index 2394d505..4d2dd0ea 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index 6122f7fd..02c7d066 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index e5f6c152..91dde38d 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php
index 9961a943..e5406c17 100644
--- a/app/Locale/pt_PT/translations.php
+++ b/app/Locale/pt_PT/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index 9d1a0a7c..6832a8f5 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 50abe032..cebe208e 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index bfbc4cbb..4b5b318d 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index e9e67c8f..75808182 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index 6dc9aa7c..ebcc0527 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index ebb12115..b5cdec78 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -1125,4 +1125,9 @@ return array(
     // 'There is no internal link for the moment.' => '',
     // 'Assign to me' => '',
     // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );
diff --git a/app/Template/app/layout.php b/app/Template/app/layout.php
index d5bb1d8e..8a745327 100644
--- a/app/Template/app/layout.php
+++ b/app/Template/app/layout.php
@@ -19,16 +19,6 @@
                 <i class="fa fa-folder fa-fw"></i>
                 <?= $this->url->link(t('Project management'), 'project', 'index') ?>
             </li>
-            <?php if ($this->user->hasAccess('user', 'index')): ?>
-                <li>
-                    <i class="fa fa-user fa-fw"></i>
-                    <?= $this->url->link(t('User management'), 'user', 'index') ?>
-                </li>
-                <li>
-                    <i class="fa fa-cog fa-fw"></i>
-                    <?= $this->url->link(t('Settings'), 'config', 'index') ?>
-                </li>
-            <?php endif ?>
         </ul>
     </div>
     <section class="sidebar-container" id="dashboard">
diff --git a/app/Template/header.php b/app/Template/header.php
index 074f8fd3..36db54d5 100644
--- a/app/Template/header.php
+++ b/app/Template/header.php
@@ -54,9 +54,40 @@
                     <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-user fa-fw"></i><i class="fa fa-caret-down"></i></a>
                     <ul>
                         <li class="no-hover"><strong><?= $this->e($this->user->getFullname()) ?></strong></li>
-                        <li><?= $this->url->link(t('My dashboard'), 'app', 'index', array('user_id' => $this->user->getId())) ?></li>
-                        <li><?= $this->url->link(t('My profile'), 'user', 'show', array('user_id' => $this->user->getId())) ?></li>
-                        <li><?= $this->url->link(t('Logout'), 'auth', 'logout') ?></li>
+                        <li>
+                            <i class="fa fa-tachometer fa-fw"></i>
+                            <?= $this->url->link(t('My dashboard'), 'app', 'index', array('user_id' => $this->user->getId())) ?>
+                        </li>
+                        <li>
+                            <i class="fa fa-home fa-fw"></i>
+                            <?= $this->url->link(t('My profile'), 'user', 'show', array('user_id' => $this->user->getId())) ?>
+                        </li>
+                        <li>
+                            <i class="fa fa-folder fa-fw"></i>
+                            <?= $this->url->link(t('Projects management'), 'project', 'index') ?>
+                        </li>
+                        <?php if ($this->user->hasAccess('user', 'index')): ?>
+                            <li>
+                                <i class="fa fa-user fa-fw"></i>
+                                <?= $this->url->link(t('Users management'), 'user', 'index') ?>
+                            </li>
+                            <li>
+                                <i class="fa fa-group fa-fw"></i>
+                                <?= $this->url->link(t('Groups management'), 'group', 'index') ?>
+                            </li>
+                            <li>
+                                <i class="fa fa-cog fa-fw"></i>
+                                <?= $this->url->link(t('Settings'), 'config', 'index') ?>
+                            </li>
+                        <?php endif ?>
+                        <li>
+                            <i class="fa fa-life-ring fa-fw"></i>
+                            <?= $this->url->link(t('Documentation'), 'doc', 'show') ?>
+                        </li>
+                        <li>
+                            <i class="fa fa-sign-out fa-fw"></i>
+                            <?= $this->url->link(t('Logout'), 'auth', 'logout') ?>
+                        </li>
                     </ul>
                 </div>
             </li>
-- 
cgit v1.2.3