diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:05:27 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:05:27 -0600 |
| commit | a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf (patch) | |
| tree | 5bf13b5605e40c755e20edf9be45e3a20308d5dd /templates/header.html | |
| parent | fa30dc90be82aa0f818e14110e9b86373f7c8a35 (diff) | |
| parent | f15cb4dc7d9284a24f75dc8b56248916140ceb09 (diff) | |
| download | askbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.tar.gz askbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.tar.bz2 askbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.zip | |
Merge branch 'evgenyfadeev/master'
Conflicts:
locale/en/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
Diffstat (limited to 'templates/header.html')
| -rw-r--r-- | templates/header.html | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/templates/header.html b/templates/header.html index d606e9e7..e1097802 100644 --- a/templates/header.html +++ b/templates/header.html @@ -6,13 +6,13 @@ <div id="top"> <!--<div id="header">--> {% if request.user.is_authenticated %} - <a href="/users/{{ request.user.id }}/{{ request.user.username }}/">{{ request.user.username }}</a> {% get_score_badge request.user %} - <a href="/logout/">{% trans "logout" %}</a> + <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="/account/signin">{% trans "login" %}</a> + <a href="{% url user_signin %}">{% trans "login" %}</a> {% endif %} - <a href="/about">{% trans "about" %}</a> - <a href="/faq">{% trans "faq" %}</a> + <a href="{% url about %}">{% trans "about" %}</a> + <a href="{% url faq %}">{% trans "faq" %}</a> <!--</div>--> </div> <table width="100%" border="0" cellspacing="0" cellpadding="0"> @@ -26,20 +26,22 @@ </td> <td width="77%" valign="bottom"> <div class="nav"> - <a id="nav_questions" href="/questions/" >{% trans "questions" %}</a> - <a id="nav_tags" href="/tags/">{% trans "tags" %}</a> - <a id="nav_users" href="/users/">{% trans "users" %}</a> - <!--<a id="nav_books" href="/books/">{% trans "books" %}</a>--> - <a id="nav_badges" href="/badges/">{% trans "badges" %}</a> - <a id="nav_unanswered" href="/questions/unanswered/">{% trans "unanswered questions" %}</a> + <a id="nav_questions" href="{% url questions %}" >{% trans "questions" %}</a> + <a id="nav_tags" href="{% url tags %}">{% trans "tags" %}</a> + <a id="nav_users" href="{% url users %}">{% trans "users" %}</a> + {% if settings.BOOKS_ON %} + <a id="nav_books" href="{% url books %}">{% trans "books" %}</a> + {% endif %} + <a id="nav_badges" href="{% url badges %}">{% trans "badges" %}</a> + <a id="nav_unanswered" href="{% url unanswered %}">{% trans "unanswered questions" %}</a> {% comment %}<!-- i think this needs to be removed -e.f. --> {% if request.user.is_authenticated %} - <a id="nav_profile" href="/users/{{ request.user.id }}/{{ request.user.username }}/">{% trans "my profile" %}</a> + <a id="nav_profile" href="{% url user %}{{ request.user.id }}/{{ request.user.username }}/">{% trans "my profile" %}</a> {% endif %} {% endcomment %} <div class="focus"> - <a id="nav_ask" href="/questions/ask/" class="special">{% trans "ask a question" %}</a> + <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a> </div> </div> @@ -51,7 +53,7 @@ <table width="100%" border="0" cellpadding="0" cellspacing="0" class="content"> <tr> <td align="center" valign="middle"> - <form action="/search/" method="get"> + <form action="{% url search %}" method="get"> <div> <input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" /> <input type="submit" name="Submit" value="{% trans "search" %}" class="searchBtn" /> |