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

Implement new topbar according to new card based UI

Browse Source
This commit is contained in:
Soumya97 2017-03-08 12:56:11 +05:30 committed by Sunil Mohan Adapa
parent f9bd2542a7
commit 384327af71
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plinth/templates/base.html
View File

@ -91,12 +91,21 @@
title="{{ box_name }}"> title="{{ box_name }}">
<img src="{% static 'theme/img/freedombox-logo-32px.png' %}" <img src="{% static 'theme/img/freedombox-logo-32px.png' %}"
alt="{{ box_name }}" /> alt="{{ box_name }}" />
{% if user.is_authenticated %}
<span class="navbar-logo-text">{% trans "Home" %}</span>
{% endif %}
</a> </a>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<a href="{% url 'apps:index' %}" class="navbar-brand" <a href="{% url 'apps:index' %}" class="navbar-brand"
title="{% trans "Applications" %}"> title="{% trans "Applications" %}">
<span class="glyphicon glyphicon-th"></span> <span class="glyphicon glyphicon-th"></span>
<span class="navbar-logo-text">{% trans "Apps" %}</span>
</a> </a>
<a href="{% url 'system:index' %}"
title="{% trans "System Configuration" %}" class="navbar-brand">
<span class="glyphicon-cog glyphicon nav-icon"></span>
<span class="navbar-logo-text">{% trans "Configuration" %}</span>
</a>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
</div> </div>
@ -110,18 +119,14 @@
</li> </li>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li>
<a href="{% url 'system:index' %}" title="{% trans "System Configuration" %}">
<span class="glyphicon-cog glyphicon nav-icon"></span>
</a>
</li>
<li class="dropdown"> <li class="dropdown">
<a href="{% url 'users:edit' user.username %}" <a href="{% url 'users:edit' user.username %}"
class="dropdown-toggle" data-toggle="dropdown" class="dropdown-toggle" data-toggle="dropdown"
role="button" aria-expanded="false"> role="button" aria-expanded="false">
<i class="glyphicon glyphicon-user nav-icon"></i> <i class="glyphicon glyphicon-user nav-icon"></i>
{{ user.username }} <span class="navbar-logo-text">{{ user.username }}</span>
<span class="caret"></span></a> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{% url 'users:edit' user.username %}" <li><a href="{% url 'users:edit' user.username %}"
@ -129,17 +134,18 @@
<li><a href="{% url 'users:change_password' user.username %}" <li><a href="{% url 'users:change_password' user.username %}"
title="{% trans "Change password" %}"> title="{% trans "Change password" %}">
{% trans "Change password" %}</a></li> {% trans "Change password" %}</a></li>
<li class="divider"></li>
<li><a href="{% url 'users:logout' %}"
title="{% trans "Log out" %}">
{% trans "Log out" %}</a></li>
</ul> </ul>
</li> </li>
<li>
<a href="{% url 'users:logout' %}" title="{% trans "Log out" %}">
<span class="glyphicon-off glyphicon nav-icon"></span>
</a>
</li>
{% else %} {% else %}
<li> <li>
<a href="{% url 'users:login' %}" title="{% trans "Log in" %}"> <a href="{% url 'users:login' %}" title="{% trans "Log in" %}">
<i class="glyphicon glyphicon-user nav-icon"></i> <i class="glyphicon glyphicon-user nav-icon"></i>
{% trans "Log in" %}</a> <span class="navbar-logo-text">{% trans "Log in" %}</span></a>
</li> </li>
{% endif %} {% endif %}

11
static/themes/default/css/plinth.css
View File

@ -12,7 +12,16 @@ body {
margin-top: -14px; margin-top: -14px;
padding: 8px; padding: 8px;
} }
.navbar-brand > .glyphicon{
top:3px;
}
.navbar-brand{
padding-right: 30px;
}
.navbar-logo-text{
font-size: small;
padding-left: 2px;
}
.nav-tabs { .nav-tabs {
margin-bottom: 20px; margin-bottom: 20px;
} }