AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace logout link by a dropdown menu

This commit is contained in:
Frederic Guillot 2016-01-21 20:58:12 -05:00
parent f3e5fdb137
commit fcdfdeabfa
7 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@ New features:
Improvements:
* Replace logout link by a dropdown menu
* Handle notification for group members attached to a project
* Return the highest role for a project when a user is member of multiple groups
* Show in user interface the saving state of the task

16
app/Helper/User.php
View File

@ -50,22 +50,6 @@ class User extends \Kanboard\Core\Base
return $this->userSession->getId();
}
/**
* Get user profile
*
* @access public
* @return string
*/
public function getProfileLink()
{
return $this->helper->url->link(
$this->helper->e($this->getFullname()),
'user',
'show',
array('user_id' => $this->userSession->getId())
);
}
/**
* Check if the given user_id is the connected user
*

23
app/Template/header.php
View File

@ -1,6 +1,12 @@
<header>
<nav>
<h1><?= $this->url->link('K<span>B</span>', 'app', 'index', array(), false, 'logo', t('Dashboard')).' '.$this->e($title) ?>
<h1>
<span class="logo">
<?= $this->url->link('K<span>B</span>', 'app', 'index', array(), false, '', t('Dashboard')) ?>
</span>
<span class="title">
<?= $this->e($title) ?>
</span>
<?php if (! empty($description)): ?>
<span class="tooltip" title='<?= $this->e($this->text->markdown($description)) ?>'>
<i class="fa fa-info-circle"></i>
@ -26,11 +32,20 @@
<?php endif ?>
<li>
<?php if ($this->user->hasNotifications()): ?>
<?= $this->url->link('<i class="fa fa-bell web-notification-icon"></i>', 'app', 'notifications', array('user_id' => $this->user->getId()), false, '', t('Unread notifications')) ?>
<span class="notification">
<?= $this->url->link('<i class="fa fa-bell web-notification-icon"></i>', 'app', 'notifications', array('user_id' => $this->user->getId()), false, '', t('Unread notifications')) ?>
</span>
<?php endif ?>
<?= $this->url->link(t('Logout'), 'auth', 'logout') ?>
<span class="username hide-tablet">(<?= $this->user->getProfileLink() ?>)</span>
<span class="dropdown">
<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>
</ul>
</span>
</li>
</ul>
</nav>

2
assets/css/app.css
View File

File diff suppressed because one or more lines are too long

6
assets/css/src/dropdown.css
View File

@ -35,6 +35,10 @@ ul.dropdown-submenu-open {
cursor: pointer;
}
.dropdown-submenu-open li.no-hover {
cursor: default;
}
.textarea-dropdown li:last-child,
.dropdown-submenu-open li:last-child {
border: none;
@ -42,7 +46,7 @@ ul.dropdown-submenu-open {
.textarea-dropdown .active,
.textarea-dropdown li:hover,
.dropdown-submenu-open li:hover {
.dropdown-submenu-open li:not(.no-hover):hover {
background: #4078C0;
color: #fff;
}

22
assets/css/src/header.css
View File

@ -35,19 +35,9 @@ nav .active a {
font-weight: bold;
}
/* username */
.username a {
color: #000;
}
.username a:hover {
color: #DF5353;
text-decoration: underline;
}
/* logo */
.logo {
opacity: 0.3;
.logo a {
opacity: 0.5;
color: #d40000;
}
@ -55,12 +45,13 @@ nav .active a {
color: #333;
}
.logo:hover {
.logo a:hover {
opacity: 0.8;
color: #333;
}
.logo:focus span,
.logo:hover span {
.logo a:focus span,
.logo a:hover span {
color: #d40000;
}
@ -105,7 +96,6 @@ nav .active a {
}
@media only screen and (max-width: 640px) {
.page-header-mobile li {
display: block;
margin-bottom: 5px;

5
assets/css/src/responsive.css
View File

@ -11,11 +11,6 @@
@media only screen and (max-width: 1024px) {
li.hide-tablet,
.hide-tablet {
display: none;
}
body {
font-size: 0.85em;
}