Skip to content
This repository has been archived by the owner on Jan 19, 2021. It is now read-only.

Commit

Permalink
[fix bug 809243] Display logout link while user registers.
Browse files Browse the repository at this point in the history
  • Loading branch information
@glogiotatidis
glogiotatidis committed Nov 20, 2012
1 parent 543ade2 commit bc90ea2
Showing 1 changed file with 45 additions and 33 deletions.
78 changes: 45 additions & 33 deletions templates/base.html
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -56,40 +56,49 @@
{% endblock %} {% endblock %}
{% endif %} {% endif %}
<ul class="nav pull-right"> <ul class="nav pull-right">
{% if user.is_authenticated() and user.userprofile.is_complete() %} {% if user.is_authenticated() %}
<li class="{{ nav_about}}"><a href="{{ url('about') }}">About</a></li> {% if user.userprofile.is_complete() %}
<li class="dropdown" id="profile_menu"> <li class="{{ nav_about}}"><a href="{{ url('about') }}">About</a></li>
<a class="dropdown-toggle" data-toggle="dropdown" href="#profile_menu"> <li class="dropdown" id="profile_menu">
{{ user.username }} <a class="dropdown-toggle" data-toggle="dropdown" href="#profile_menu">
<b class="caret"></b> {{ user.username }}
</a> <b class="caret"></b>
<ul class="dropdown-menu"> </a>
<li> <ul class="dropdown-menu">
<a id="profile" href="{{ url('profile', user.username) }}"> <li>
{{ _('View Profile') }} <a id="profile" href="{{ url('profile', user.username) }}">
</a> {{ _('View Profile') }}
</li>
{% if user.get_profile().is_vouched %}
<li class="{{nav_invite}}">
<a id="invite" href="{{ url('invite') }}">
{{ _('Invite') }}
</a> </a>
</li> </li>
{% endif %} {% if user.get_profile().is_vouched %}
<li class="divider"></li> <li class="{{nav_invite}}">
<li> <a id="invite" href="{{ url('invite') }}">
<a id="edit_profile" href="{{ url('profile.edit') }}"> {{ _('Invite') }}
{{ _('Settings') }} </a>
</a> </li>
</li> {% endif %}
<li> <li class="divider"></li>
<a id="logout" href="{{ url('logout') }}" <li>
class="browserid-logout"> <a id="edit_profile" href="{{ url('profile.edit') }}">
{{ _('Log Out') }} {{ _('Settings') }}
</a> </a>
</li> </li>
</ul> <li>
</li> <a id="logout" href="{{ url('logout') }}"
class="browserid-logout">
{{ _('Log Out') }}
</a>
</li>
</ul>
</li>
{% else %}
<li class="{{ nav_about}}">
<a id="logout" href="{{ url('logout') }}"
class="browserid-logout">
{{ _('Log Out') }}
</a>
</li>
{% endif %}
{% else %} {% else %}
<li class="pull-right"> <li class="pull-right">
<a class="browserid-login" href="#join_us"> <a class="browserid-login" href="#join_us">
Expand All @@ -113,7 +122,10 @@
{% for message in messages %} {% for message in messages %}
{% with %} {% with %}
{% set label = message.tags in ['error', 'success', 'info'] %} {% set label = message.tags in ['error', 'success', 'info'] %}
<div class="alert{% if label %} alert-{{ message.tags }}{% endif %} offset1 span8" id="pending-approval">{{ message }}</div> <div class="alert{% if label %} alert-{{ message.tags }}{% endif %} offset1 span8"
id="pending-approval">
{{ message }}
</div>
{% endwith %} {% endwith %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
Expand Down

0 comments on commit bc90ea2

Please sign in to comment.