From 5c6fceae98c0916c94ec5b919950c67475f44b67 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 12 Aug 2009 15:26:56 -0400
Subject: merged Bruno url translations, removed his local mods, added
 settings.BOOKS_ON, validated more templates

---
 templates/header.html | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'templates/header.html')

diff --git a/templates/header.html b/templates/header.html
index 077de586..e1097802 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -26,14 +26,12 @@
             	</td>
 				<td width="77%" valign="bottom">
                 <div class="nav">
-                    <div class="focus">
-                    <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
-                    </div>
-
                     <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>
-                    <!--<a id="nav_books" href="{% url books %}">{% trans "books" %}</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>
                     
@@ -42,6 +40,9 @@
                     <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="{% url ask %}" class="special">{% trans "ask a question" %}</a>
+                    </div>
                 </div>
 
               </td>
@@ -52,7 +53,7 @@
 			<table width="100%" border="0" cellpadding="0" cellspacing="0" class="content">
             <tr>
                 <td align="center" valign="middle">
-                    <form action="{% url 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" />
-- 
cgit v1.2.3-1-g7c22