nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

power: Merge power merge into the user dropdown

Browse Source 
Closes #1074.

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
Joseph Nuthalapati 2017-10-18 16:42:20 +05:30 committed by Sunil Mohan Adapa
parent 511c957ece
commit 3b3dafe893
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plinth/templates/base.html
View File

@ -147,6 +147,22 @@
{% trans "Change password" %} {% trans "Change password" %}
</a> </a>
</li> </li>
<li class="divider"></li>
{% if user_is_admin %}
<li>
<a href="{% url 'power:restart' %}"
title="{% trans "Restart"%}">
{% trans "Restart" %}
</a>
</li>
<li>
<a href="{% url 'power:shutdown' %}"
title="{% trans "Shut down" %}">
{% trans "Shut down" %}
</a>
</li>
<li class="divider"></li>
{% endif %}
<li> <li>
<a href="{% url 'users:logout' %}" <a href="{% url 'users:logout' %}"
title="{% trans "Log out" %}"> title="{% trans "Log out" %}">
@ -155,28 +171,6 @@
</li> </li>
</ul> </ul>
</li> </li>
<li class="dropdown">
<a href="{% url 'power:index' %}"
class="dropdown-toggle" data-toggle="dropdown"
role="button" aria-expanded="false">
<i class="glyphicon glyphicon-off nav-icon"></i>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="{% url 'power:restart' %}"
title="{% trans "Restart"%}">
{% trans "Restart" %}
</a>
</li>
<li>
<a href="{% url 'power:shutdown' %}"
title="{% trans "Shut down" %}">
{% trans "Shut down" %}
</a>
</li>
</ul>
</li>
{% else %} {% else %}
<li> <li>
<a href="{% url 'users:login' %}" title="{% trans "Log in" %}"> <a href="{% url 'users:login' %}" title="{% trans "Log in" %}">