diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-06 11:09:00 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-06 11:09:00 -0600 |
| commit | 0b39716196977f9a368cfded6a1d05244ca724d0 (patch) | |
| tree | fd1a31f04a866cab270a7c4ea846206782009823 /templates/header.html | |
| parent | 02409029d958cced911b3b18e025cf495656cb04 (diff) | |
| parent | 8d5ef067c8c4e7de276d559af67417f5324f9171 (diff) | |
| download | askbot-0b39716196977f9a368cfded6a1d05244ca724d0.tar.gz askbot-0b39716196977f9a368cfded6a1d05244ca724d0.tar.bz2 askbot-0b39716196977f9a368cfded6a1d05244ca724d0.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master
Conflicts:
forum/auth.py
forum/models.py
forum/views.py
Diffstat (limited to 'templates/header.html')
| -rw-r--r-- | templates/header.html | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/templates/header.html b/templates/header.html index fb07a4c0..db08a39a 100644 --- a/templates/header.html +++ b/templates/header.html @@ -1,70 +1,70 @@ -<!-- template header.html -->
-{% load extra_tags %}
-{% load i18n %}
- <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="{% url user_signout %}">{% trans "logout" %}</a>
- {% else %}
- <a href="{% url user_signin %}">{% trans "login" %}</a>
- {% endif %}
- <a href="/about">{% trans "about" %}</a>
- <a href="/faq">{% trans "faq" %}</a>
- </div>
- </div>
- <div id="roof">
- <div id="navBar">
- <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" %}" />
- </a>
- </div>
- </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>
-
- {% 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>
- {% endif %}
- {% endcomment %}
- <div class="focus">
- <a id="nav_ask" href="/questions/ask/" class="special">{% trans "ask a question" %}</a>
- </div>
- </div>
-
- </td>
- </tr>
- </table>
- </div>
- <div id="searchBar">
- <table width="100%" height="60" border="0" cellpadding="0" cellspacing="0" class="content">
- <tr>
- <td align="center" valign="middle">
- <form action="/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" >
- </div>
- <div class="options">
- <input id="type-question" type="radio" class="" value="question" name="t" checked >{% trans "questions" %}
- <input id="type-tag" type="radio" class="" value="tag" name="t" >{% trans "tags" %}
- <input id="type-user" type="radio" class="" value="user" name="t" >{% trans "users" %}
- </div>
- </form>
- </td>
- </tr>
- </table>
- </div>
- </div>
-<!-- end template header.html -->
+<!-- template header.html --> +{% load extra_tags %} +{% load i18n %} + <div id="roof"> + <div id="navBar"> + <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> + {% else %} + <a href="/account/signin">{% trans "login" %}</a> + {% endif %} + <a href="/about">{% trans "about" %}</a> + <a href="/faq">{% trans "faq" %}</a> + <!--</div>--> + </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" %}" /> + </a> + </div> + </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> + + {% 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> + {% endif %} + {% endcomment %} + <div class="focus"> + <a id="nav_ask" href="/questions/ask/" class="special">{% trans "ask a question" %}</a> + </div> + </div> + + </td> + </tr> + </table> + </div> + <div id="searchBar"> + <table width="100%" height="60" border="0" cellpadding="0" cellspacing="0" class="content"> + <tr> + <td align="center" valign="middle"> + <form action="/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" > + </div> + <div class="options"> + <input id="type-question" type="radio" class="" value="question" name="t" checked >{% trans "questions" %} + <input id="type-tag" type="radio" class="" value="tag" name="t" >{% trans "tags" %} + <input id="type-user" type="radio" class="" value="user" name="t" >{% trans "users" %} + </div> + </form> + </td> + </tr> + </table> + </div> + </div> +<!-- end template header.html --> |