From d0d590dd5f4b451cc35e0ae2e639582b2aa4992a Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Sat, 8 Aug 2009 21:59:25 -0300
Subject: Changes for preguntalo project's header.  * give priorty to "ask
 question"  * small airy space to header

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

(limited to 'templates/header.html')

diff --git a/templates/header.html b/templates/header.html
index db08a39a..c3f5cc89 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -26,6 +26,10 @@
             	</td>
 				<td width="77%" valign="bottom">
                 <div class="nav">
+                    <div class="focus">
+                    <a id="nav_ask" href="/questions/ask/" class="special">{% trans "ask a question" %}</a>
+                    </div>
+
                     <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>
@@ -38,9 +42,6 @@
                     <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>
-- 
cgit v1.2.3-1-g7c22


From d93c8261fe3a16fd9232aab7fbed8718a41439cf Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Sun, 9 Aug 2009 20:30:34 -0300
Subject: Added revers urls for links to work with i18n.

---
 templates/header.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'templates/header.html')

diff --git a/templates/header.html b/templates/header.html
index c3f5cc89..5751bed0 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -7,12 +7,12 @@
 				<!--<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 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">
@@ -27,15 +27,15 @@
 				<td width="77%" valign="bottom">
                 <div class="nav">
                     <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>
 
-                    <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>
+                    <!--<a id="nav_books" href="{% url books %}">{% trans "books" %}</a>-->
+                    <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 %}
-- 
cgit v1.2.3-1-g7c22


From 2d1e60db89453f2c12132d657551090c7ea92506 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Sun, 9 Aug 2009 23:52:33 -0300
Subject: Included i18n for links site-wide. Hope there is no bit left.

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

(limited to 'templates/header.html')

diff --git a/templates/header.html b/templates/header.html
index 5751bed0..6f8657b3 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -6,7 +6,7 @@
 			<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 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>
@@ -39,7 +39,7 @@
                     
 					{% 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>
@@ -52,7 +52,7 @@
 			<table width="100%" height="60" 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" >
-- 
cgit v1.2.3-1-g7c22


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