got the menu bar changing when a user is logged in again

pull/1/head
Ed Summers 2011-09-04 01:29:18 -04:00
parent 98301544a8
commit b7ae2146c4
5 changed files with 13 additions and 1 deletions

View File

@ -17,7 +17,8 @@
<div class="topmenu">
<ul class="menu">
{% if user.is_authenticated %}
<li class="first"><a href="{% url auth_logout %}"><span>Sign Out</span></a></li>
<li class="first"><span id="welcome">Welcome, {{ user.username }}</span></li>
<li><a href="{% url auth_logout %}"><span>Sign Out</span></a></li>
{% else %}
<li class="first"><a href="{% url auth_login %}"><span>Sign In</span></a></li>
{% endif %}

View File

@ -1,10 +1,12 @@
{% extends "registration/registration_base.html" %}
{% block title %}{% if account %}Activation complete{% else %}Activation problem{% endif %}{% endblock %}
{% block content %}
<div id="registration">
{% if account %}
Thanks {{ account }}, activation complete! You may now <a href='{% url auth_login %}'>login</a> using the username and password you set at registration.
{% else %}
Oops &ndash; it seems that your activation key is invalid. Please check the url again.
{% endif %}
</div>
{% endblock %}

View File

@ -1,7 +1,9 @@
{% extends "registration/registration_base.html" %}
{% block title %}Activation complete{% endblock %}
{% block content %}
<div id="registration">
Thanks, activation complete! You may now <a href='{% url auth_login %}'>login</a> using the username and password you set at registration.
</div>
{% endblock %}

View File

@ -65,6 +65,12 @@ TEMPLATE_LOADERS = (
)
TEMPLATE_CONTEXT_PROCESSORS = (
'django.contrib.auth.context_processors.auth',
'django.core.context_processors.debug',
'django.core.context_processors.i18n',
'django.core.context_processors.media',
'django.core.context_processors.static',
'django.contrib.messages.context_processors.messages',
'django.core.context_processors.request',
)

View File

@ -23,6 +23,7 @@ body{
.topmenu{ float:right; padding-top:25px;}
.topmenu ul li{ float:left; padding:0 10px;}
.topmenu ul li a{ height:36px; line-height:36px; display:block; color:#fff; text-decoration:none; font-weight:bold; font-size:13px; letter-spacing:1px; text-transform:capitalize;}
.topmenu ul li span#welcome { height:36px; line-height:36px; display:block; color:yellow; text-decoration:none; font-weight:bold; font-size:13px; letter-spacing:1px; text-transform:capitalize;}
.topmenu ul li.last a{ background: url(../images/bg.png) right top no-repeat;}
.topmenu ul li.last a span{ background:url(../images/bg.png) -770px -36px no-repeat; margin-right:29px; display:block; padding:0 5px 0 15px;}