From 6739dba792f210a1836489a191527747d21e3da4 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Thu, 4 Dec 2014 21:04:33 -0500
Subject: Move user templates to a subfolder

---
 app/Controller/User.php             | 32 ++++++++---------
 app/Locale/fr_FR/translations.php   |  2 +-
 app/Model/ProjectPermission.php     |  2 +-
 app/Template/user/edit.php          | 32 +++++++++++++++++
 app/Template/user/external.php      | 39 ++++++++++++++++++++
 app/Template/user/index.php         | 72 +++++++++++++++++++++++++++++++++++++
 app/Template/user/last.php          | 24 +++++++++++++
 app/Template/user/layout.php        | 18 ++++++++++
 app/Template/user/login.php         | 32 +++++++++++++++++
 app/Template/user/new.php           | 39 ++++++++++++++++++++
 app/Template/user/notifications.php | 26 ++++++++++++++
 app/Template/user/password.php      | 26 ++++++++++++++
 app/Template/user/remove.php        | 13 +++++++
 app/Template/user/sessions.php      | 26 ++++++++++++++
 app/Template/user/show.php          | 12 +++++++
 app/Template/user/sidebar.php       | 39 ++++++++++++++++++++
 app/Template/user_edit.php          | 30 ----------------
 app/Template/user_external.php      | 39 --------------------
 app/Template/user_index.php         | 72 -------------------------------------
 app/Template/user_last.php          | 24 -------------
 app/Template/user_layout.php        | 18 ----------
 app/Template/user_login.php         | 32 -----------------
 app/Template/user_new.php           | 38 --------------------
 app/Template/user_notifications.php | 25 -------------
 app/Template/user_password.php      | 23 ------------
 app/Template/user_remove.php        | 12 -------
 app/Template/user_sessions.php      | 26 --------------
 app/Template/user_show.php          | 12 -------
 app/Template/user_sidebar.php       | 39 --------------------
 29 files changed, 416 insertions(+), 408 deletions(-)
 create mode 100644 app/Template/user/edit.php
 create mode 100644 app/Template/user/external.php
 create mode 100644 app/Template/user/index.php
 create mode 100644 app/Template/user/last.php
 create mode 100644 app/Template/user/layout.php
 create mode 100644 app/Template/user/login.php
 create mode 100644 app/Template/user/new.php
 create mode 100644 app/Template/user/notifications.php
 create mode 100644 app/Template/user/password.php
 create mode 100644 app/Template/user/remove.php
 create mode 100644 app/Template/user/sessions.php
 create mode 100644 app/Template/user/show.php
 create mode 100644 app/Template/user/sidebar.php
 delete mode 100644 app/Template/user_edit.php
 delete mode 100644 app/Template/user_external.php
 delete mode 100644 app/Template/user_index.php
 delete mode 100644 app/Template/user_last.php
 delete mode 100644 app/Template/user_layout.php
 delete mode 100644 app/Template/user_login.php
 delete mode 100644 app/Template/user_new.php
 delete mode 100644 app/Template/user_notifications.php
 delete mode 100644 app/Template/user_password.php
 delete mode 100644 app/Template/user_remove.php
 delete mode 100644 app/Template/user_sessions.php
 delete mode 100644 app/Template/user_show.php
 delete mode 100644 app/Template/user_sidebar.php

(limited to 'app')

diff --git a/app/Controller/User.php b/app/Controller/User.php
index 0a4d66f2..31413fc0 100644
--- a/app/Controller/User.php
+++ b/app/Controller/User.php
@@ -34,7 +34,7 @@ class User extends Base
             $this->response->redirect('?controller=app');
         }
 
-        $this->response->html($this->template->layout('user_login', array(
+        $this->response->html($this->template->layout('user/login', array(
             'errors' => array(),
             'values' => array(),
             'no_layout' => true,
@@ -63,7 +63,7 @@ class User extends Base
             }
         }
 
-        $this->response->html($this->template->layout('user_login', array(
+        $this->response->html($this->template->layout('user/login', array(
             'errors' => $errors,
             'values' => $values,
             'no_layout' => true,
@@ -90,7 +90,7 @@ class User extends Base
             $params['title'] = ($params['user']['name'] ?: $params['user']['username']).' (#'.$params['user']['id'].')';
         }
 
-        return $this->template->layout('user_layout', $params);
+        return $this->template->layout('user/layout', $params);
     }
 
     /**
@@ -130,7 +130,7 @@ class User extends Base
         $nb_users = $this->user->count();
 
         $this->response->html(
-            $this->template->layout('user_index', array(
+            $this->template->layout('user/index', array(
                 'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
                 'projects' => $this->project->getList(),
                 'nb_users' => $nb_users,
@@ -156,7 +156,7 @@ class User extends Base
      */
     public function create()
     {
-        $this->response->html($this->template->layout('user_new', array(
+        $this->response->html($this->template->layout('user/new', array(
             'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
             'projects' => $this->project->getList(),
             'errors' => array(),
@@ -186,7 +186,7 @@ class User extends Base
             }
         }
 
-        $this->response->html($this->template->layout('user_new', array(
+        $this->response->html($this->template->layout('user/new', array(
             'board_selector' => $this->projectPermission->getAllowedProjects($this->acl->getUserId()),
             'projects' => $this->project->getList(),
             'errors' => $errors,
@@ -203,7 +203,7 @@ class User extends Base
     public function show()
     {
         $user = $this->getUser();
-        $this->response->html($this->layout('user_show', array(
+        $this->response->html($this->layout('user/show', array(
             'projects' => $this->projectPermission->getAllowedProjects($user['id']),
             'user' => $user,
         )));
@@ -217,7 +217,7 @@ class User extends Base
     public function last()
     {
         $user = $this->getUser();
-        $this->response->html($this->layout('user_last', array(
+        $this->response->html($this->layout('user/last', array(
             'last_logins' => $this->lastLogin->getAll($user['id']),
             'user' => $user,
         )));
@@ -231,7 +231,7 @@ class User extends Base
     public function sessions()
     {
         $user = $this->getUser();
-        $this->response->html($this->layout('user_sessions', array(
+        $this->response->html($this->layout('user/sessions', array(
             'sessions' => $this->authentication->backend('rememberMe')->getAll($user['id']),
             'user' => $user,
         )));
@@ -266,7 +266,7 @@ class User extends Base
             $this->response->redirect('?controller=user&action=notifications&user_id='.$user['id']);
         }
 
-        $this->response->html($this->layout('user_notifications', array(
+        $this->response->html($this->layout('user/notifications', array(
             'projects' => $this->projectPermission->getAllowedProjects($user['id']),
             'notifications' => $this->notification->readSettings($user['id']),
             'user' => $user,
@@ -281,7 +281,7 @@ class User extends Base
     public function external()
     {
         $user = $this->getUser();
-        $this->response->html($this->layout('user_external', array(
+        $this->response->html($this->layout('user/external', array(
             'last_logins' => $this->lastLogin->getAll($user['id']),
             'user' => $user,
         )));
@@ -316,7 +316,7 @@ class User extends Base
             }
         }
 
-        $this->response->html($this->layout('user_password', array(
+        $this->response->html($this->layout('user/password', array(
             'values' => $values,
             'errors' => $errors,
             'user' => $user,
@@ -365,7 +365,7 @@ class User extends Base
             }
         }
 
-        $this->response->html($this->layout('user_edit', array(
+        $this->response->html($this->layout('user/edit', array(
             'values' => $values,
             'errors' => $errors,
             'projects' => $this->projectPermission->filterProjects($this->project->getList(), $user['id']),
@@ -395,7 +395,7 @@ class User extends Base
             $this->response->redirect('?controller=user');
         }
 
-        $this->response->html($this->layout('user_remove', array(
+        $this->response->html($this->layout('user/remove', array(
             'user' => $user,
         )));
     }
@@ -431,7 +431,7 @@ class User extends Base
                     $this->response->redirect('?controller=app');
                 }
                 else {
-                    $this->response->html($this->template->layout('user_login', array(
+                    $this->response->html($this->template->layout('user/login', array(
                         'errors' => array('login' => t('Google authentication failed')),
                         'values' => array(),
                         'no_layout' => true,
@@ -493,7 +493,7 @@ class User extends Base
                     $this->response->redirect('?controller=app');
                 }
                 else {
-                    $this->response->html($this->template->layout('user_login', array(
+                    $this->response->html($this->template->layout('user/login', array(
                         'errors' => array('login' => t('GitHub authentication failed')),
                         'values' => array(),
                         'no_layout' => true,
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index 4eb0dc72..94ed70d2 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -457,7 +457,7 @@ return array(
     'Edit profile' => 'Modifier le profil',
     'Change password' => 'Changer le mot de passe',
     'Password modification' => 'Changement de mot de passe',
-    'External authentications' => 'Authentifications externe',
+    'External authentications' => 'Authentifications externes',
     'Google Account' => 'Compte Google',
     'Github Account' => 'Compte Github',
     'Never connected.' => 'Jamais connecté.',
diff --git a/app/Model/ProjectPermission.php b/app/Model/ProjectPermission.php
index c890a94f..8984ef3e 100644
--- a/app/Model/ProjectPermission.php
+++ b/app/Model/ProjectPermission.php
@@ -176,7 +176,7 @@ class ProjectPermission extends Base
      */
     public function isUserAllowed($project_id, $user_id)
     {
-        return $this->user->isAdmin($user_id) || $this->isMember($project_id, $user_id);
+        return $project_id === 0 || $this->user->isAdmin($user_id) || $this->isMember($project_id, $user_id);
     }
 
     /**
diff --git a/app/Template/user/edit.php b/app/Template/user/edit.php
new file mode 100644
index 00000000..bc942567
--- /dev/null
+++ b/app/Template/user/edit.php
@@ -0,0 +1,32 @@
+<div class="page-header">
+    <h2><?= t('Edit user') ?></h2>
+</div>
+<form method="post" action="<?= Helper\u('user', 'edit', array('user_id' => $user['id'])) ?>" autocomplete="off">
+
+    <?= Helper\form_csrf() ?>
+
+    <?= Helper\form_hidden('id', $values) ?>
+    <?= Helper\form_hidden('is_ldap_user', $values) ?>
+
+    <?= Helper\form_label(t('Username'), 'username') ?>
+    <?= Helper\form_text('username', $values, $errors, array('required', $values['is_ldap_user'] == 1 ? 'readonly' : '')) ?><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('Default project'), 'default_project_id') ?>
+    <?= Helper\form_select('default_project_id', $projects, $values, $errors) ?><br/>
+
+    <?php if (Helper\is_admin()): ?>
+        <?= Helper\form_checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?><br/>
+    <?php endif ?>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <?= t('or') ?>
+        <?= Helper\a(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/Template/user/external.php b/app/Template/user/external.php
new file mode 100644
index 00000000..31ffcb75
--- /dev/null
+++ b/app/Template/user/external.php
@@ -0,0 +1,39 @@
+<div class="page-header">
+    <h2><?= t('External authentications') ?></h2>
+</div>
+
+<?php if (GOOGLE_AUTH): ?>
+    <h3><i class="fa fa-google"></i> <?= t('Google Account') ?></h3>
+
+    <p class="listing">
+    <?php if (Helper\is_current_user($user['id'])): ?>
+        <?php if (empty($user['google_id'])): ?>
+            <?= Helper\a(t('Link my Google Account'), 'user', 'google', array(), true) ?>
+        <?php else: ?>
+            <?= Helper\a(t('Unlink my Google Account'), 'user', 'unlinkGoogle', array(), true) ?>
+        <?php endif ?>
+    <?php else: ?>
+        <?= empty($user['google_id']) ? t('No account linked.') : t('Account linked.') ?>
+    <?php endif ?>
+    </p>
+<?php endif ?>
+
+<?php if (GITHUB_AUTH): ?>
+    <h3><i class="fa fa-github"></i> <?= t('Github Account') ?></h3>
+
+    <p class="listing">
+    <?php if (Helper\is_current_user($user['id'])): ?>
+        <?php if (empty($user['github_id'])): ?>
+            <?= Helper\a(t('Link my GitHub Account'), 'user', 'github', array(), true) ?>
+        <?php else: ?>
+            <?= Helper\a(t('Unlink my GitHub Account'), 'user', 'unlinkGitHub', array(), true) ?>
+        <?php endif ?>
+    <?php else: ?>
+        <?= empty($user['github_id']) ? t('No account linked.') : t('Account linked.') ?>
+    <?php endif ?>
+    </p>
+<?php endif ?>
+
+<?php if (! GOOGLE_AUTH && ! GITHUB_AUTH): ?>
+    <p class="alert"><?= t('No external authentication enabled.') ?></p>
+<?php endif ?>
diff --git a/app/Template/user/index.php b/app/Template/user/index.php
new file mode 100644
index 00000000..73612b0b
--- /dev/null
+++ b/app/Template/user/index.php
@@ -0,0 +1,72 @@
+<section id="main">
+    <div class="page-header">
+        <?php if (Helper\is_admin()): ?>
+        <ul>
+            <li><i class="fa fa-plus fa-fw"></i><?= Helper\a(t('New user'), 'user', 'create') ?></li>
+        </ul>
+        <?php endif ?>
+    </div>
+    <section>
+    <?php if (empty($users)): ?>
+        <p class="alert"><?= t('No user') ?></p>
+    <?php else: ?>
+        <table>
+            <tr>
+                <th><?= Helper\order(t('Id'), 'id', $pagination) ?></th>
+                <th><?= Helper\order(t('Username'), 'username', $pagination) ?></th>
+                <th><?= Helper\order(t('Name'), 'name', $pagination) ?></th>
+                <th><?= Helper\order(t('Email'), 'email', $pagination) ?></th>
+                <th><?= Helper\order(t('Administrator'), 'is_admin', $pagination) ?></th>
+                <th><?= Helper\order(t('Default project'), 'default_project_id', $pagination) ?></th>
+                <th><?= Helper\order(t('Notifications'), 'notifications_enabled', $pagination) ?></th>
+                <th><?= t('External accounts') ?></th>
+                <th><?= Helper\order(t('Account type'), 'is_ldap_user', $pagination) ?></th>
+            </tr>
+            <?php foreach ($users as $user): ?>
+            <tr>
+                <td>
+                    <?= Helper\a('#'.$user['id'], 'user', 'show', array('user_id' => $user['id'])) ?>
+                </td>
+                <td>
+                    <?= Helper\a(Helper\escape($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?>
+                </td>
+                <td>
+                    <?= Helper\escape($user['name']) ?>
+                </td>
+                <td>
+                    <a href="mailto:<?= Helper\escape($user['email']) ?>"><?= Helper\escape($user['email']) ?></a>
+                </td>
+                <td>
+                    <?= $user['is_admin'] ? t('Yes') : t('No') ?>
+                </td>
+                <td>
+                    <?= (isset($user['default_project_id']) && isset($projects[$user['default_project_id']])) ? Helper\escape($projects[$user['default_project_id']]) : t('None'); ?>
+                </td>
+                <td>
+                    <?php if ($user['notifications_enabled'] == 1): ?>
+                        <?= t('Enabled') ?>
+                    <?php else: ?>
+                        <?= t('Disabled') ?>
+                    <?php endif ?>
+                </td>
+                <td>
+                    <ul class="no-bullet">
+                    <?php if ($user['google_id']): ?>
+                        <li><i class="fa fa-google fa-fw"></i><?= t('Google account linked') ?></li>
+                    <?php endif ?>
+                    <?php if ($user['github_id']): ?>
+                        <li><i class="fa fa-github fa-fw"></i><?= t('Github account linked') ?></li>
+                    <?php endif ?>
+                    </ul>
+                </td>
+                <td>
+                    <?= $user['is_ldap_user'] ? t('Remote') : t('Local') ?>
+                </td>
+            </tr>
+            <?php endforeach ?>
+        </table>
+
+        <?= Helper\paginate($pagination) ?>
+    <?php endif ?>
+    </section>
+</section>
diff --git a/app/Template/user/last.php b/app/Template/user/last.php
new file mode 100644
index 00000000..0b55b0d5
--- /dev/null
+++ b/app/Template/user/last.php
@@ -0,0 +1,24 @@
+<div class="page-header">
+    <h2><?= t('Last logins') ?></h2>
+</div>
+
+<?php if (empty($last_logins)): ?>
+    <p class="alert"><?= t('Never connected.') ?></p>
+<?php else: ?>
+    <table class="table-small">
+    <tr>
+        <th><?= t('Login date') ?></th>
+        <th><?= t('Authentication method') ?></th>
+        <th><?= t('IP address') ?></th>
+        <th><?= t('User agent') ?></th>
+    </tr>
+    <?php foreach($last_logins as $login): ?>
+    <tr>
+        <td><?= dt('%B %e, %Y at %k:%M %p', $login['date_creation']) ?></td>
+        <td><?= Helper\escape($login['auth_type']) ?></td>
+        <td><?= Helper\escape($login['ip']) ?></td>
+        <td><?= Helper\escape(Helper\summary($login['user_agent'])) ?></td>
+    </tr>
+    <?php endforeach ?>
+    </table>
+<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/user/layout.php b/app/Template/user/layout.php
new file mode 100644
index 00000000..0778b716
--- /dev/null
+++ b/app/Template/user/layout.php
@@ -0,0 +1,18 @@
+<section id="main">
+    <div class="page-header">
+        <?php if (Helper\is_admin()): ?>
+        <ul>
+            <li><i class="fa fa-user fa-fw"></i><?= Helper\a(t('All users'), 'user', 'index') ?></li>
+            <li><i class="fa fa-plus fa-fw"></i><?= Helper\a(t('New user'), 'user', 'create') ?></li>
+        </ul>
+        <?php endif ?>
+    </div>
+    <section class="sidebar-container" id="user-section">
+
+        <?= Helper\template('user/sidebar', array('user' => $user)) ?>
+
+        <div class="sidebar-content">
+            <?= $user_content_for_layout ?>
+        </div>
+    </section>
+</section>
\ No newline at end of file
diff --git a/app/Template/user/login.php b/app/Template/user/login.php
new file mode 100644
index 00000000..fea44a01
--- /dev/null
+++ b/app/Template/user/login.php
@@ -0,0 +1,32 @@
+<div class="form-login">
+
+    <?php if (isset($errors['login'])): ?>
+        <p class="alert alert-error"><?= Helper\escape($errors['login']) ?></p>
+    <?php endif ?>
+
+    <form method="post" action="<?= Helper\u('user', 'check', array('redirect_query' => urlencode($redirect_query))) ?>">
+
+        <?= Helper\form_csrf() ?>
+
+        <?= Helper\form_label(t('Username'), 'username') ?>
+        <?= Helper\form_text('username', $values, $errors, array('autofocus', 'required')) ?><br/>
+
+        <?= Helper\form_label(t('Password'), 'password') ?>
+        <?= Helper\form_password('password', $values, $errors, array('required')) ?>
+
+        <?= Helper\form_checkbox('remember_me', t('Remember Me'), 1) ?><br/>
+
+        <?php if (GOOGLE_AUTH): ?>
+            <?= Helper\a(t('Login with my Google Account'), 'user', 'google') ?>
+        <?php endif ?>
+
+        <?php if (GITHUB_AUTH): ?>
+            <?= Helper\a(t('Login with my GitHub Account'), 'user', 'gitHub') ?>
+        <?php endif ?>
+
+        <div class="form-actions">
+            <input type="submit" value="<?= t('Sign in') ?>" class="btn btn-blue"/>
+        </div>
+    </form>
+
+</div>
\ No newline at end of file
diff --git a/app/Template/user/new.php b/app/Template/user/new.php
new file mode 100644
index 00000000..af5824e0
--- /dev/null
+++ b/app/Template/user/new.php
@@ -0,0 +1,39 @@
+<section id="main">
+    <div class="page-header">
+        <ul>
+            <li><i class="fa fa-user fa-fw"></i><?= Helper\a(t('All users'), 'user', 'index') ?></li>
+        </ul>
+    </div>
+    <section>
+    <form method="post" action="<?= Helper\u('user', 'save') ?>" autocomplete="off">
+
+        <?= Helper\form_csrf() ?>
+
+        <?= 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('Email'), 'email') ?>
+        <?= Helper\form_email('email', $values, $errors) ?><br/>
+
+        <?= 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('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 class="form-actions">
+            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+            <?= t('or') ?>
+            <?= Helper\a(t('cancel'), 'user', 'index') ?>
+        </div>
+    </form>
+    </section>
+</section>
\ No newline at end of file
diff --git a/app/Template/user/notifications.php b/app/Template/user/notifications.php
new file mode 100644
index 00000000..33da61fb
--- /dev/null
+++ b/app/Template/user/notifications.php
@@ -0,0 +1,26 @@
+<div class="page-header">
+    <h2><?= t('Email notifications') ?></h2>
+</div>
+
+<form method="post" action="<?= Helper\u('user', 'notifications', array('user_id' => $user['id'])) ?>" autocomplete="off">
+
+    <?= Helper\form_csrf() ?>
+
+    <?= Helper\form_checkbox('notifications_enabled', t('Enable email notifications'), '1', $notifications['notifications_enabled'] == 1) ?><br/>
+
+    <?php if (! empty($projects)): ?>
+        <p><?= t('I want to receive notifications only for those projects:') ?><br/><br/></p>
+
+        <div class="form-checkbox-group">
+        <?php foreach ($projects as $project_id => $project_name): ?>
+            <?= Helper\form_checkbox('projects['.$project_id.']', $project_name, '1', isset($notifications['project_'.$project_id])) ?><br/>
+        <?php endforeach ?>
+        </div>
+    <?php endif ?>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <?= t('or') ?>
+        <?= Helper\a(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/Template/user/password.php b/app/Template/user/password.php
new file mode 100644
index 00000000..76e0ab15
--- /dev/null
+++ b/app/Template/user/password.php
@@ -0,0 +1,26 @@
+<div class="page-header">
+    <h2><?= t('Password modification') ?></h2>
+</div>
+
+<form method="post" action="<?= Helper\u('user', 'password', array('user_id' => $user['id'])) ?>" autocomplete="off">
+
+    <?= Helper\form_hidden('id', $values) ?>
+    <?= Helper\form_csrf() ?>
+
+    <div class="alert alert-error">
+        <?= Helper\form_label(t('Current password for the user "%s"', Helper\get_username()), 'current_password') ?>
+        <?= Helper\form_password('current_password', $values, $errors) ?><br/>
+    </div>
+
+    <?= Helper\form_label(t('New password for the user "%s"', Helper\get_username($user)), 'password') ?>
+    <?= Helper\form_password('password', $values, $errors) ?><br/>
+
+    <?= Helper\form_label(t('Confirmation'), 'confirmation') ?>
+    <?= Helper\form_password('confirmation', $values, $errors) ?><br/>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <?= t('or') ?>
+        <?= Helper\a(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
+    </div>
+</form>
diff --git a/app/Template/user/remove.php b/app/Template/user/remove.php
new file mode 100644
index 00000000..5f58b631
--- /dev/null
+++ b/app/Template/user/remove.php
@@ -0,0 +1,13 @@
+<div class="page-header">
+    <h2><?= t('Remove user') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info"><?= t('Do you really want to remove this user: "%s"?', $user['name'] ?: $user['username']) ?></p>
+
+    <div class="form-actions">
+        <?= Helper\a(t('Yes'), 'user', 'remove', array('user_id' => $user['id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?>
+        <?= Helper\a(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/user/sessions.php b/app/Template/user/sessions.php
new file mode 100644
index 00000000..d05d5b6d
--- /dev/null
+++ b/app/Template/user/sessions.php
@@ -0,0 +1,26 @@
+<div class="page-header">
+    <h2><?= t('Persistent connections') ?></h2>
+</div>
+
+<?php if (empty($sessions)): ?>
+    <p class="alert"><?= t('No session.') ?></p>
+<?php else: ?>
+    <table class="table-small">
+    <tr>
+        <th><?= t('Creation date') ?></th>
+        <th><?= t('Expiration date') ?></th>
+        <th><?= t('IP address') ?></th>
+        <th><?= t('User agent') ?></th>
+        <th><?= t('Action') ?></th>
+    </tr>
+    <?php foreach($sessions as $session): ?>
+    <tr>
+        <td><?= dt('%B %e, %Y at %k:%M %p', $session['date_creation']) ?></td>
+        <td><?= dt('%B %e, %Y at %k:%M %p', $session['expiration']) ?></td>
+        <td><?= Helper\escape($session['ip']) ?></td>
+        <td><?= Helper\escape(Helper\summary($session['user_agent'])) ?></td>
+        <td><?= Helper\a(t('Remove'), 'user', 'removeSession', array('user_id' => $user['id'], 'id' => $session['id']), true) ?></td>
+    </tr>
+    <?php endforeach ?>
+    </table>
+<?php endif ?>
diff --git a/app/Template/user/show.php b/app/Template/user/show.php
new file mode 100644
index 00000000..1c843751
--- /dev/null
+++ b/app/Template/user/show.php
@@ -0,0 +1,12 @@
+<div class="page-header">
+    <h2><?= t('Summary') ?></h2>
+</div>
+<ul class="listing">
+    <li><?= t('Username:') ?> <strong><?= Helper\escape($user['username']) ?></strong></li>
+    <li><?= t('Name:') ?> <strong><?= Helper\escape($user['name']) ?></strong></li>
+    <li><?= t('Email:') ?> <strong><?= Helper\escape($user['email']) ?></strong></li>
+    <li><?= t('Default project:') ?> <strong><?= (isset($user['default_project_id']) && isset($projects[$user['default_project_id']])) ? Helper\escape($projects[$user['default_project_id']]) : t('None'); ?></strong></li>
+    <li><?= t('Notifications:') ?> <strong><?= $user['notifications_enabled'] == 1 ? t('Enabled') : t('Disabled') ?></strong></li>
+    <li><?= t('Group:') ?> <strong><?= $user['is_admin'] ? t('Administrator') : t('Regular user') ?></strong></li>
+    <li><?= t('Account type:') ?> <strong><?= $user['is_ldap_user'] ? t('Remote') : t('Local') ?></strong></li>
+</ul>
diff --git a/app/Template/user/sidebar.php b/app/Template/user/sidebar.php
new file mode 100644
index 00000000..0a1a0764
--- /dev/null
+++ b/app/Template/user/sidebar.php
@@ -0,0 +1,39 @@
+<div class="sidebar">
+    <h2><?= t('Actions') ?></h2>
+    <ul>
+        <li>
+            <?= Helper\a(t('Summary'), 'user', 'show', array('user_id' => $user['id'])) ?>
+        </li>
+
+        <?php if (Helper\is_admin() || Helper\is_current_user($user['id'])): ?>
+            <li>
+                <?= Helper\a(t('Edit profile'), 'user', 'edit', array('user_id' => $user['id'])) ?>
+            </li>
+
+            <?php if ($user['is_ldap_user'] == 0): ?>
+                <li>
+                    <?= Helper\a(t('Change password'), 'user', 'password', array('user_id' => $user['id'])) ?>
+                </li>
+            <?php endif ?>
+
+            <li>
+                <?= Helper\a(t('Email notifications'), 'user', 'notifications', array('user_id' => $user['id'])) ?>
+            </li>
+            <li>
+                <?= Helper\a(t('External accounts'), 'user', 'external', array('user_id' => $user['id'])) ?>
+            </li>
+            <li>
+                <?= Helper\a(t('Last logins'), 'user', 'last', array('user_id' => $user['id'])) ?>
+            </li>
+            <li>
+                <?= Helper\a(t('Persistent connections'), 'user', 'sessions', array('user_id' => $user['id'])) ?>
+            </li>
+        <?php endif ?>
+
+        <?php if (Helper\is_admin() && ! Helper\is_current_user($user['id'])): ?>
+            <li>
+                <?= Helper\a(t('Remove'), 'user', 'remove', array('user_id' => $user['id'])) ?>
+            </li>
+        <?php endif ?>
+    </ul>
+</div>
\ No newline at end of file
diff --git a/app/Template/user_edit.php b/app/Template/user_edit.php
deleted file mode 100644
index 14063d49..00000000
--- a/app/Template/user_edit.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Edit user') ?></h2>
-</div>
-<form method="post" action="?controller=user&amp;action=edit&amp;user_id=<?= $user['id'] ?>" autocomplete="off">
-
-    <?= Helper\form_csrf() ?>
-
-    <?= Helper\form_hidden('id', $values) ?>
-    <?= Helper\form_hidden('is_ldap_user', $values) ?>
-
-    <?= Helper\form_label(t('Username'), 'username') ?>
-    <?= Helper\form_text('username', $values, $errors, array('required', $values['is_ldap_user'] == 1 ? 'readonly' : '')) ?><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('Default project'), 'default_project_id') ?>
-    <?= Helper\form_select('default_project_id', $projects, $values, $errors) ?><br/>
-
-    <?php if (Helper\is_admin()): ?>
-        <?= Helper\form_checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?><br/>
-    <?php endif ?>
-
-    <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> <?= t('or') ?> <a href="?controller=user&amp;action=show&amp;user_id=<?= $user['id'] ?>"><?= t('cancel') ?></a>
-    </div>
-</form>
\ No newline at end of file
diff --git a/app/Template/user_external.php b/app/Template/user_external.php
deleted file mode 100644
index 676b2c73..00000000
--- a/app/Template/user_external.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="page-header">
-    <h2><?= t('External authentications') ?></h2>
-</div>
-
-<?php if (GOOGLE_AUTH): ?>
-    <h3><i class="fa fa-google"></i> <?= t('Google Account') ?></h3>
-
-    <p class="listing">
-    <?php if (Helper\is_current_user($user['id'])): ?>
-        <?php if (empty($user['google_id'])): ?>
-            <a href="?controller=user&amp;action=google<?= Helper\param_csrf() ?>"><?= t('Link my Google Account') ?></a>
-        <?php else: ?>
-            <a href="?controller=user&amp;action=unlinkGoogle<?= Helper\param_csrf() ?>"><?= t('Unlink my Google Account') ?></a>
-        <?php endif ?>
-    <?php else: ?>
-        <?= empty($user['google_id']) ? t('No account linked.') : t('Account linked.') ?>
-    <?php endif ?>
-    </p>
-<?php endif ?>
-
-<?php if (GITHUB_AUTH): ?>
-    <h3><i class="fa fa-github"></i> <?= t('Github Account') ?></h3>
-
-    <p class="listing">
-    <?php if (Helper\is_current_user($user['id'])): ?>
-        <?php if (empty($user['github_id'])): ?>
-            <a href="?controller=user&amp;action=gitHub<?= Helper\param_csrf() ?>"><?= t('Link my GitHub Account') ?></a>
-        <?php else: ?>
-            <a href="?controller=user&amp;action=unlinkGitHub<?= Helper\param_csrf() ?>"><?= t('Unlink my GitHub Account') ?></a>
-        <?php endif ?>
-    <?php else: ?>
-        <?= empty($user['github_id']) ? t('No account linked.') : t('Account linked.') ?>
-    <?php endif ?>
-    </p>
-<?php endif ?>
-
-<?php if (! GOOGLE_AUTH && ! GITHUB_AUTH): ?>
-    <p class="alert"><?= t('No external authentication enabled.') ?></p>
-<?php endif ?>
diff --git a/app/Template/user_index.php b/app/Template/user_index.php
deleted file mode 100644
index 73612b0b..00000000
--- a/app/Template/user_index.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <?php if (Helper\is_admin()): ?>
-        <ul>
-            <li><i class="fa fa-plus fa-fw"></i><?= Helper\a(t('New user'), 'user', 'create') ?></li>
-        </ul>
-        <?php endif ?>
-    </div>
-    <section>
-    <?php if (empty($users)): ?>
-        <p class="alert"><?= t('No user') ?></p>
-    <?php else: ?>
-        <table>
-            <tr>
-                <th><?= Helper\order(t('Id'), 'id', $pagination) ?></th>
-                <th><?= Helper\order(t('Username'), 'username', $pagination) ?></th>
-                <th><?= Helper\order(t('Name'), 'name', $pagination) ?></th>
-                <th><?= Helper\order(t('Email'), 'email', $pagination) ?></th>
-                <th><?= Helper\order(t('Administrator'), 'is_admin', $pagination) ?></th>
-                <th><?= Helper\order(t('Default project'), 'default_project_id', $pagination) ?></th>
-                <th><?= Helper\order(t('Notifications'), 'notifications_enabled', $pagination) ?></th>
-                <th><?= t('External accounts') ?></th>
-                <th><?= Helper\order(t('Account type'), 'is_ldap_user', $pagination) ?></th>
-            </tr>
-            <?php foreach ($users as $user): ?>
-            <tr>
-                <td>
-                    <?= Helper\a('#'.$user['id'], 'user', 'show', array('user_id' => $user['id'])) ?>
-                </td>
-                <td>
-                    <?= Helper\a(Helper\escape($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?>
-                </td>
-                <td>
-                    <?= Helper\escape($user['name']) ?>
-                </td>
-                <td>
-                    <a href="mailto:<?= Helper\escape($user['email']) ?>"><?= Helper\escape($user['email']) ?></a>
-                </td>
-                <td>
-                    <?= $user['is_admin'] ? t('Yes') : t('No') ?>
-                </td>
-                <td>
-                    <?= (isset($user['default_project_id']) && isset($projects[$user['default_project_id']])) ? Helper\escape($projects[$user['default_project_id']]) : t('None'); ?>
-                </td>
-                <td>
-                    <?php if ($user['notifications_enabled'] == 1): ?>
-                        <?= t('Enabled') ?>
-                    <?php else: ?>
-                        <?= t('Disabled') ?>
-                    <?php endif ?>
-                </td>
-                <td>
-                    <ul class="no-bullet">
-                    <?php if ($user['google_id']): ?>
-                        <li><i class="fa fa-google fa-fw"></i><?= t('Google account linked') ?></li>
-                    <?php endif ?>
-                    <?php if ($user['github_id']): ?>
-                        <li><i class="fa fa-github fa-fw"></i><?= t('Github account linked') ?></li>
-                    <?php endif ?>
-                    </ul>
-                </td>
-                <td>
-                    <?= $user['is_ldap_user'] ? t('Remote') : t('Local') ?>
-                </td>
-            </tr>
-            <?php endforeach ?>
-        </table>
-
-        <?= Helper\paginate($pagination) ?>
-    <?php endif ?>
-    </section>
-</section>
diff --git a/app/Template/user_last.php b/app/Template/user_last.php
deleted file mode 100644
index 0b55b0d5..00000000
--- a/app/Template/user_last.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Last logins') ?></h2>
-</div>
-
-<?php if (empty($last_logins)): ?>
-    <p class="alert"><?= t('Never connected.') ?></p>
-<?php else: ?>
-    <table class="table-small">
-    <tr>
-        <th><?= t('Login date') ?></th>
-        <th><?= t('Authentication method') ?></th>
-        <th><?= t('IP address') ?></th>
-        <th><?= t('User agent') ?></th>
-    </tr>
-    <?php foreach($last_logins as $login): ?>
-    <tr>
-        <td><?= dt('%B %e, %Y at %k:%M %p', $login['date_creation']) ?></td>
-        <td><?= Helper\escape($login['auth_type']) ?></td>
-        <td><?= Helper\escape($login['ip']) ?></td>
-        <td><?= Helper\escape(Helper\summary($login['user_agent'])) ?></td>
-    </tr>
-    <?php endforeach ?>
-    </table>
-<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/user_layout.php b/app/Template/user_layout.php
deleted file mode 100644
index 1fbc1ea0..00000000
--- a/app/Template/user_layout.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <?php if (Helper\is_admin()): ?>
-        <ul>
-            <li><i class="fa fa-user fa-fw"></i><?= Helper\a(t('All users'), 'user', 'index') ?></li>
-            <li><i class="fa fa-plus fa-fw"></i><?= Helper\a(t('New user'), 'user', 'create') ?></li>
-        </ul>
-        <?php endif ?>
-    </div>
-    <section class="sidebar-container" id="user-section">
-
-        <?= Helper\template('user_sidebar', array('user' => $user)) ?>
-
-        <div class="sidebar-content">
-            <?= $user_content_for_layout ?>
-        </div>
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/user_login.php b/app/Template/user_login.php
deleted file mode 100644
index a8e8fc15..00000000
--- a/app/Template/user_login.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="form-login">
-
-    <?php if (isset($errors['login'])): ?>
-        <p class="alert alert-error"><?= Helper\escape($errors['login']) ?></p>
-    <?php endif ?>
-
-    <form method="post" action="?controller=user&amp;action=check&amp;redirect_query=<?= urlencode($redirect_query) ?>">
-
-        <?= Helper\form_csrf() ?>
-
-        <?= Helper\form_label(t('Username'), 'username') ?>
-        <?= Helper\form_text('username', $values, $errors, array('autofocus', 'required')) ?><br/>
-
-        <?= Helper\form_label(t('Password'), 'password') ?>
-        <?= Helper\form_password('password', $values, $errors, array('required')) ?>
-
-        <?= Helper\form_checkbox('remember_me', t('Remember Me'), 1) ?><br/>
-
-        <?php if (GOOGLE_AUTH): ?>
-            <a href="?controller=user&amp;action=google"><?= t('Login with my Google Account') ?></a>
-        <?php endif ?>
-
-        <?php if (GITHUB_AUTH): ?>
-            <a href="?controller=user&amp;action=gitHub"><?= t('Login with my GitHub Account') ?></a>
-        <?php endif ?>
-
-        <div class="form-actions">
-            <input type="submit" value="<?= t('Sign in') ?>" class="btn btn-blue"/>
-        </div>
-    </form>
-
-</div>
\ No newline at end of file
diff --git a/app/Template/user_new.php b/app/Template/user_new.php
deleted file mode 100644
index 1e483ade..00000000
--- a/app/Template/user_new.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<section id="main">
-    <div class="page-header">
-        <ul>
-            <li><i class="fa fa-user fa-fw"></i><?= Helper\a(t('All users'), 'user', 'index') ?></li>
-        </ul>
-    </div>
-    <section>
-    <form method="post" action="<?= Helper\u('user', 'save') ?>" autocomplete="off">
-
-        <?= Helper\form_csrf() ?>
-
-        <?= 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('Email'), 'email') ?>
-        <?= Helper\form_email('email', $values, $errors) ?><br/>
-
-        <?= 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('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 class="form-actions">
-            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-            <?= t('or') ?> <?= Helper\a(t('cancel'), 'user', 'index') ?>
-        </div>
-    </form>
-    </section>
-</section>
\ No newline at end of file
diff --git a/app/Template/user_notifications.php b/app/Template/user_notifications.php
deleted file mode 100644
index 4a32a41d..00000000
--- a/app/Template/user_notifications.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Email notifications') ?></h2>
-</div>
-
-<form method="post" action="?controller=user&amp;action=notifications&amp;user_id=<?= $user['id'] ?>" autocomplete="off">
-
-    <?= Helper\form_csrf() ?>
-
-    <?= Helper\form_checkbox('notifications_enabled', t('Enable email notifications'), '1', $notifications['notifications_enabled'] == 1) ?><br/>
-
-    <?php if (! empty($projects)): ?>
-        <p><?= t('I want to receive notifications only for those projects:') ?><br/><br/></p>
-
-        <div class="form-checkbox-group">
-        <?php foreach ($projects as $project_id => $project_name): ?>
-            <?= Helper\form_checkbox('projects['.$project_id.']', $project_name, '1', isset($notifications['project_'.$project_id])) ?>
-        <?php endforeach ?>
-        </div>
-    <?php endif ?>
-
-    <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-        <?= t('or') ?> <a href="?controller=user&amp;action=show&amp;user_id=<?= $user['id'] ?>"><?= t('cancel') ?></a>
-    </div>
-</form>
\ No newline at end of file
diff --git a/app/Template/user_password.php b/app/Template/user_password.php
deleted file mode 100644
index 5da38595..00000000
--- a/app/Template/user_password.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Password modification') ?></h2>
-</div>
-
-<form method="post" action="?controller=user&amp;action=password&amp;user_id=<?= $user['id'] ?>" autocomplete="off">
-
-    <?= Helper\form_hidden('id', $values) ?>
-    <?= Helper\form_csrf() ?>
-
-    <?= Helper\form_label(t('Current password for the user "%s"', Helper\get_username()), 'current_password') ?>
-    <?= Helper\form_password('current_password', $values, $errors) ?><br/>
-
-    <?= Helper\form_label(t('New password for the user "%s"', Helper\get_username($user)), 'password') ?>
-    <?= Helper\form_password('password', $values, $errors) ?><br/>
-
-    <?= Helper\form_label(t('Confirmation'), 'confirmation') ?>
-    <?= Helper\form_password('confirmation', $values, $errors) ?><br/>
-
-    <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> <?= t('or') ?> <a href="?controller=user&amp;action=show&amp;user_id=<?= $user['id'] ?>"><?= t('cancel') ?></a>
-    </div>
-
-</form>
\ No newline at end of file
diff --git a/app/Template/user_remove.php b/app/Template/user_remove.php
deleted file mode 100644
index c20ccbba..00000000
--- a/app/Template/user_remove.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Remove user') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info"><?= t('Do you really want to remove this user: "%s"?', $user['name'] ?: $user['username']) ?></p>
-
-    <div class="form-actions">
-        <a href="?controller=user&amp;action=remove&amp;confirmation=yes&amp;user_id=<?= $user['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a>
-        <?= t('or') ?> <a href="?controller=user&amp;action=show&amp;user_id=<?= $user['id'] ?>"><?= t('cancel') ?></a>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/user_sessions.php b/app/Template/user_sessions.php
deleted file mode 100644
index b647d726..00000000
--- a/app/Template/user_sessions.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Persistent connections') ?></h2>
-</div>
-
-<?php if (empty($sessions)): ?>
-    <p class="alert"><?= t('No session.') ?></p>
-<?php else: ?>
-    <table class="table-small">
-    <tr>
-        <th><?= t('Creation date') ?></th>
-        <th><?= t('Expiration date') ?></th>
-        <th><?= t('IP address') ?></th>
-        <th><?= t('User agent') ?></th>
-        <th><?= t('Action') ?></th>
-    </tr>
-    <?php foreach($sessions as $session): ?>
-    <tr>
-        <td><?= dt('%B %e, %Y at %k:%M %p', $session['date_creation']) ?></td>
-        <td><?= dt('%B %e, %Y at %k:%M %p', $session['expiration']) ?></td>
-        <td><?= Helper\escape($session['ip']) ?></td>
-        <td><?= Helper\escape(Helper\summary($session['user_agent'])) ?></td>
-        <td><a href="?controller=user&amp;action=removeSession&amp;user_id=<?= $user['id'] ?>&amp;id=<?= $session['id'].Helper\param_csrf() ?>"><?= t('Remove') ?></a></td>
-    </tr>
-    <?php endforeach ?>
-    </table>
-<?php endif ?>
diff --git a/app/Template/user_show.php b/app/Template/user_show.php
deleted file mode 100644
index 1c843751..00000000
--- a/app/Template/user_show.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Summary') ?></h2>
-</div>
-<ul class="listing">
-    <li><?= t('Username:') ?> <strong><?= Helper\escape($user['username']) ?></strong></li>
-    <li><?= t('Name:') ?> <strong><?= Helper\escape($user['name']) ?></strong></li>
-    <li><?= t('Email:') ?> <strong><?= Helper\escape($user['email']) ?></strong></li>
-    <li><?= t('Default project:') ?> <strong><?= (isset($user['default_project_id']) && isset($projects[$user['default_project_id']])) ? Helper\escape($projects[$user['default_project_id']]) : t('None'); ?></strong></li>
-    <li><?= t('Notifications:') ?> <strong><?= $user['notifications_enabled'] == 1 ? t('Enabled') : t('Disabled') ?></strong></li>
-    <li><?= t('Group:') ?> <strong><?= $user['is_admin'] ? t('Administrator') : t('Regular user') ?></strong></li>
-    <li><?= t('Account type:') ?> <strong><?= $user['is_ldap_user'] ? t('Remote') : t('Local') ?></strong></li>
-</ul>
diff --git a/app/Template/user_sidebar.php b/app/Template/user_sidebar.php
deleted file mode 100644
index 16532143..00000000
--- a/app/Template/user_sidebar.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<div class="sidebar">
-    <h2><?= t('Actions') ?></h2>
-    <ul>
-        <li>
-            <?= Helper\a(t('Summary'), 'user', 'show', array('user_id' => $user['id'])) ?>
-        </li>
-
-        <?php if (Helper\is_admin() || Helper\is_current_user($user['id'])): ?>
-            <li>
-                <?= Helper\a(t('Edit profile'), 'user', 'edit', array('user_id' => $user['id'])) ?>
-            </li>
-
-            <?php if ($user['is_ldap_user'] == 0): ?>
-                <li>
-                    <?= Helper\a(t('Change password'), 'user', 'password', array('user_id' => $user['id'])) ?>
-                </li>
-            <?php endif ?>
-
-            <li>
-                <?= Helper\a(t('Email notifications'), 'user', 'notifications', array('user_id' => $user['id'])) ?>
-            </li>
-            <li>
-                <?= Helper\a(t('External accounts'), 'user', 'external', array('user_id' => $user['id'])) ?>
-            </li>
-            <li>
-                <?= Helper\a(t('Last logins'), 'user', 'last', array('user_id' => $user['id'])) ?>
-            </li>
-            <li>
-                <?= Helper\a(t('Persistent connections'), 'user', 'sessions', array('user_id' => $user['id'])) ?>
-            </li>
-        <?php endif ?>
-
-        <?php if (Helper\is_admin()): ?>
-            <li>
-                <?= Helper\a(t('Remove'), 'user', 'remove', array('user_id' => $user['id'])) ?>
-            </li>
-        <?php endif ?>
-    </ul>
-</div>
\ No newline at end of file
-- 
cgit v1.2.3