diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
| commit | 8de2b9131ddcef647799cf8e1e79921284523073 (patch) | |
| tree | 81e17d84530990e35a0accba3a7886266a601482 /templates/header.html | |
| parent | 7e95e6481d1e81e43d4b442cbcf3fe37f20d89cc (diff) | |
| parent | 9d1fb9890b97beb55461ca34f9757bc685461130 (diff) | |
| download | askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.gz askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.bz2 askbot-8de2b9131ddcef647799cf8e1e79921284523073.zip | |
Merge branch 'evgenyfadeev/master'
Conflicts:
.gitignore
INSTALL
TODO
cnprog.wsgi
django_authopenid/urls.py
django_authopenid/views.py
drop-all-tables.sh
forum/auth.py
forum/managers.py
forum/models.py
forum/templatetags/extra_tags.py
forum/views.py
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
settings.py
settings_local.py.dist
sql_scripts/update_2009_01_25_001.sql
sql_scripts/update_2009_02_26_001.sql
sql_scripts/update_2009_04_10_001.sql
templates/authopenid/confirm_email.txt
templates/authopenid/sendpw_email.txt
templates/content/js/compress.bat
templates/content/js/flot-build.bat
templates/content/style/style.css
templates/footer.html
templates/question.html
templates/user_reputation.html
templates/user_stats.html
templates/user_votes.html
templates/users_questions.html
urls.py
Diffstat (limited to 'templates/header.html')
| -rw-r--r-- | templates/header.html | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/templates/header.html b/templates/header.html index c9b01a20..ede6cce5 100644 --- a/templates/header.html +++ b/templates/header.html @@ -4,23 +4,21 @@ <div id="roof"> <div id="navBar"> <div id="top"> - <!--<div id="header">--> - {% if request.user.is_authenticated %} - <a href="{% url users %}{{ request.user.id }}/{{ request.user.username }}/">{{ request.user.username }}</a> {% get_score_badge request.user %} - <a href="{% url logout %}">{% trans "logout" %}</a> - {% else %} - <a href="{% url user_signin %}">{% trans "login" %}</a> - {% endif %} - <a href="{% url about %}">{% trans "about" %}</a> - <a href="{% url faq %}">{% trans "faq" %}</a> - <!--</div>--> + {% if request.user.is_authenticated %} + <a href="{% url users %}{{ request.user.id }}/{{ request.user.username }}/">{{ request.user.username }}</a> {% get_score_badge request.user %} + <a href="{% url logout %}">{% trans "logout" %}</a> + {% else %} + <a href="{% url user_signin %}">{% trans "login" %}</a> + {% endif %} + <a href="{% url about %}">{% trans "about" %}</a> + <a href="{% url faq %}">{% trans "faq" %}</a> </div> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td width="23%"> <div id="logo"> - <a href="/"> - <img src="/content/images/logo.png" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/> + <a href="{% url index %}"> + <img src="{% href "/content/images/logo.png" %}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/> </a> </div> </td> @@ -60,9 +58,9 @@ </div> <div class="options"> <input id="type-question" type="radio" value="question" name="t" - checked="checked" />{% trans "questions" %} - <input id="type-tag" type="radio" value="tag" name="t" />{% trans "tags" %} - <input id="type-user" type="radio" value="user" name="t" />{% trans "users" %} + checked="checked" /><label for="type-question">{% trans "questions" %}</label> + <input id="type-tag" type="radio" value="tag" name="t" /><label for="type-tag">{% trans "tags" %}</label> + <input id="type-user" type="radio" value="user" name="t" /><label for="type-user">{% trans "users" %}</label> </div> </form> </td> |