fmartingr
/
shelfzilla
Archived
1
0
Fork 0
Code Releases Activity

Navbar improvements

This commit is contained in:
Felipe Martín 2014-08-24 17:44:14 +02:00
parent 66ca8ccde5
commit aee0eded8e
4 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shelfzilla/apps/users/context_processors.py
View File

@ -1,3 +1,6 @@
from .models import User
def user_is_staff(request): def user_is_staff(request):
return { return {
'USER_IS_STAFF': request.user.is_staff 'USER_IS_STAFF': request.user.is_staff
@ -10,3 +13,10 @@ def user_configuration(request):
'show_admin_links': False 'show_admin_links': False
} }
} }
def auth(request):
result = {}
if request.user.is_authenticated:
result['user'] = User.objects.get(pk=request.user.pk)
return result

1
shelfzilla/settings/base.py
View File

@ -79,6 +79,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'shelfzilla.apps.pjax.context_processors.pjax', 'shelfzilla.apps.pjax.context_processors.pjax',
'shelfzilla.apps.manga.context_processors.user_have_volumes', 'shelfzilla.apps.manga.context_processors.user_have_volumes',
'shelfzilla.apps.manga.context_processors.user_wishlisted_volumes', 'shelfzilla.apps.manga.context_processors.user_wishlisted_volumes',
'shelfzilla.apps.users.context_processors.auth',
'shelfzilla.apps.users.context_processors.user_is_staff', 'shelfzilla.apps.users.context_processors.user_is_staff',
'shelfzilla.apps.users.context_processors.user_configuration', 'shelfzilla.apps.users.context_processors.user_configuration',
) )

4
shelfzilla/themes/bootflat/static/less/fixes.less
View File

@ -72,6 +72,10 @@
color: #fff; color: #fff;
background-color: #000; background-color: #000;
} }
.avatar {
width: 22px;
}
} }
.alert-error { .alert-error {

31
shelfzilla/themes/bootflat/templates/_layout.html
View File

@ -39,21 +39,22 @@
{% endif %} {% endif %}
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li class="dropdown"> <li><a href="{% url 'profile' %}" title="{% trans "Profile" %}">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.username }} <b class="caret"></b></a> <img src="{{ user.avatar }}" class="avatar img-rounded"/>
<ul class="dropdown-menu"> {{ user.username }}</a>
{% if user.is_superuser %} </li>
<li><a data-pjax-unnav href="/admin/">Admin</a></li> {% if user.is_superuser %}
{% endif %} <li><a data-pjax-unnav href="/admin/" title="Admin"><i class="glyphicon glyphicon-tower"></i></a></li>
<li><a data-pjax-unnav href="{% url 'profile' %}" data-pjax>{% trans "Profile" %}</a></li> {% endif %}
<!-- <li><a data-pjax-unnav href="{% url 'profile' %}" data-pjax
<li class="divider"></li> title="{% trans "Profile" %}">
<li><a data-pjax-unnav href="#">{% trans "My collection" %}</a></li> <i class="glyphicon glyphicon-user"></i>
<li><a data-pjax-unnav href="#">{% trans "My wishlist" %}</a></li> </a>
--> </li>
<li class="divider"></li> <li><a data-pjax-unnav href="{% url "logout" %}"
<li><a data-pjax-unnav href="{% url "logout" %}">{% trans "Logout" %}</a></li> title="{% trans "Logout" %}">
</ul> <i class="glyphicon glyphicon-off"></i>
</a>
</li> </li>
{% else %} {% else %}
<li> <li>