-- 
cgit v1.2.3-1-g7c22

From b4b14fad956c9a135df770716826ef7c35f2fa98 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Mon, 20 Jul 2009 02:29:50 -0300
Subject: little templatetags translation modifications

---
 templates/badges.html | 12 ++++--------
 templates/header.html |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/templates/badges.html b/templates/badges.html
index 8a3b7eab..7fd1402a 100644
--- a/templates/badges.html
+++ b/templates/badges.html
@@ -18,8 +18,7 @@
 </div>
 <div id="main-body" style="width:100%">
     <p>
-	{% trans "Community gives you awards for your questions, answers and votes." %}<br>
-	{% trans "Below is the list of available badges and number of times each type of badge has been awarded." %}
+	{% trans "Community gives you awards for your questions, answers and votes. Below is the list of available badges and number of times each type of badge has been awarded." %}
     </p>
     <br>
     <div id="medalList">
@@ -52,9 +51,7 @@
         <a style="cursor:default;" title="gold badge: the highest honor and is very rare" class="medal"><span class="badge1">&#9679;</span>&nbsp;{% trans "gold" %}</a>
     </p>
     <p>
-    {% trans "Gold badge is very rare." %}
-	{% trans "To obtain it you have to show profound knowledge and ability in addition to actively participating in the community." %}
-	{% trans "Gold badge is the highest award in this community." %}
+    {% trans "Gold badge is very rare. To obtain it you have to show profound knowledge and ability in addition to actively participating in the community. Gold badge is the highest award in this community." %}
     </p>
     <p>
         <a style="cursor:default;" 
@@ -62,15 +59,14 @@
 			class="medal"><span class="badge2">&#9679;</span>&nbsp;{% trans "silver" %}</a>
     </p>
     <p>
-	{% trans "Obtaining silver badge requires significant patience." %}
-	{% trans "If you got one, you've very significantly contributed to this community" %}
+	{% trans "Obtaining silver badge requires significant patience. If you got one, you've very significantly contributed to this community" %}
     </p>
     <p>
         <a style="cursor:default;" title="{% trans "bronze badge: often given as a special honor" %}" class="medal">
 		<span class="badge3">&#9679;</span>&nbsp;{% trans "bronze" %}</a>
     </p>
     <p>
-	{% trans "If you are active in this community, you will will get this medal - still it is a special honor." %}
+	{% trans "If you are active in this community, you will get this medal - still it is a special honor." %}
     </p>
     </div>
 </div>
diff --git a/templates/header.html b/templates/header.html
index 0aa02886..fb07a4c0 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -5,9 +5,9 @@
         <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 user_signout %}">{% 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>
-- 
cgit v1.2.3-1-g7c22


From a7a5d993c680a2fa2a541951d99742090a716807 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Thu, 23 Jul 2009 01:18:20 -0300
Subject: Spanish translation.  * Still some bits left like capital letters and
 maybe some errors of context of texts.  * Need to fix JS to work, will do
 later.  * Need to modify some variables

---
 locale/es/LC_MESSAGES/django.po | 721 ++++++++++++++++++++++------------------
 1 file changed, 393 insertions(+), 328 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b26bde1a..fe0aab7c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 02:06-0300\n"
+"POT-Creation-Date: 2009-07-23 01:11-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -459,7 +459,8 @@ msgstr "Fecha de nacimiento"
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD"
 
-#: forum/forms.py:165 templates/authopenid/settings.html:20
+#: forum/forms.py:165 templates/base.html:64
+#: templates/authopenid/settings.html:20
 msgid "Profile"
 msgstr "Perfil"
 
@@ -824,15 +825,14 @@ msgid "Badges"
 msgstr "Distinciones"
 
 #: templates/badges.html:21
-#, fuzzy
 msgid ""
 "Community gives you awards for your questions, answers and votes. Below is "
 "the list of available badges and number of times each type of badge has been "
 "awarded."
 msgstr ""
 "La comunidad te condecora con distinciones por tus preguntas, respuestas y "
-"votos. Debajo esta la lista de las distinciones disponibles y la cantidad "
-"de veces que han sido asignadas."
+"votos. Debajo esta la lista de las distinciones disponibles y la cantidad de "
+"veces que han sido asignadas."
 
 #: templates/badges.html:48
 msgid "Community badges"
@@ -859,108 +859,119 @@ msgstr ""
 #: templates/badges.html:65
 msgid "bronze badge: often given as a special honor"
 msgstr ""
-"distinción de bronce: con frecuencia entregada como reconocimiento "
-"especial."
+"distinción de bronce: con frecuencia entregada como reconocimiento especial."
 
 #: templates/badges.html:69
 msgid ""
-"If you are active in this community, you will get this medal - still it "
-"is a special honor."
-msgstr "Si eres un usuario activo de esta comunidad, recibiras esta "
-
-#: templates/base.html:60 templates/base_content.html:61
-msgid "congratulations, community gave you a badge"
+"If you are active in this community, you will get this medal - still it is a "
+"special honor."
 msgstr ""
+"Si eres un usuario activo de esta comunidad, recibirás esta distinción - de "
+"todas maneras es un honor especial."
 
-#: templates/base.html:62 templates/base_content.html:63
-msgid "profile"
-msgstr ""
+#: templates/base.html:62
+#, fuzzy
+msgid "Congratulations! You have new badges: "
+msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
+
+#: templates/base.html:63
+#, fuzzy
+msgid "go to see"
+msgstr "OK para cerrar"
+
+#: templates/base_content.html:61
+msgid "congratulations, community gave you a badge"
+msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
 
 #: templates/base_content.html:62
 msgid "see"
-msgstr ""
+msgstr "ver"
+
+#: templates/base_content.html:63
+msgid "profile"
+msgstr "perfil"
 
 #: templates/book.html:7
 msgid "reading channel"
-msgstr ""
+msgstr "canal de lectura"
 
 #: templates/book.html:26
 msgid "[author]"
-msgstr ""
+msgstr "[autor]"
 
 #: templates/book.html:30
 msgid "[publisher]"
-msgstr ""
+msgstr "[editorial]"
 
 #: templates/book.html:34
 msgid "[publication date]"
-msgstr ""
+msgstr "[fecha de publicación]"
 
 #: templates/book.html:38
 msgid "[price]"
-msgstr ""
+msgstr "[precio]"
 
 #: templates/book.html:39
 msgid "currency unit"
-msgstr ""
+msgstr "unidad de moneda"
 
 #: templates/book.html:42
 msgid "[pages]"
-msgstr ""
+msgstr "[páginas]"
 
 #: templates/book.html:43
 msgid "pages abbreviation"
-msgstr ""
+msgstr "abreviación de páginas"
 
 #: templates/book.html:46
 msgid "[tags]"
-msgstr ""
+msgstr "[etiquetas]"
 
 #: templates/book.html:56
 msgid "author blog"
-msgstr ""
+msgstr "blog del autor"
 
 #: templates/book.html:62
 msgid "book directory"
-msgstr ""
+msgstr "directorio del libro"
 
 #: templates/book.html:66
 msgid "buy online"
-msgstr ""
+msgstr "comprar en-linea"
 
 #: templates/book.html:79
 msgid "reader questions"
-msgstr ""
+msgstr "pregunta de lector"
 
 #: templates/book.html:82
 msgid "ask the author"
-msgstr ""
+msgstr "preguntar al autor"
 
 #: templates/book.html:88 templates/book.html.py:93
 #: templates/users_questions.html:17
 msgid "this question was selected as favorite"
-msgstr ""
+msgstr "esta pregunta ha sido seleccionada como favorita"
 
 #: templates/book.html:88 templates/book.html.py:93
 #: templates/users_questions.html:11 templates/users_questions.html.py:17
 msgid "number of times"
-msgstr ""
+msgstr "numero de veces"
 
 #: templates/book.html:105 templates/index.html:47 templates/questions.html:46
 #: templates/unanswered.html:37 templates/users_questions.html:30
 #: templates/tough/unanswered.html:35
 msgid "votes"
-msgstr ""
+msgstr "votos"
 
 #: templates/book.html:108
 msgid "the answer has been accepted to be correct"
-msgstr ""
+msgstr "la respuesta ha sido aceptada como correcta"
 
 #: templates/book.html:115 templates/index.html:48 templates/questions.html:47
 #: templates/unanswered.html:38 templates/users_questions.html:40
 #: templates/tough/unanswered.html:36
 msgid "views"
-msgstr ""
+msgstr "vistas"
 
 #: templates/book.html:125 templates/index.html:68 templates/question.html:112
 #: templates/question.html.py:479 templates/questions.html:84
@@ -969,65 +980,71 @@ msgstr ""
 #: templates/users_questions.html:52 templates/tough/unanswered.html:72
 #: templates/tough/unanswered.html:105
 msgid "using tags"
-msgstr ""
+msgstr "usando etiquetas"
 
 #: templates/book.html:147
 msgid "subscribe to book RSS feed"
-msgstr ""
+msgstr "suscribirse al RSS del libro"
 
 #: templates/book.html:147 templates/index.html:116
 msgid "subscribe to the questions feed"
-msgstr ""
+msgstr "suscribirse al agregado de noticias"
 
 #: templates/close.html:6 templates/close.html.py:16
 msgid "Close question"
-msgstr ""
+msgstr "Cerrar pregunta"
 
 #: templates/close.html:19
 msgid "Close the question"
-msgstr ""
+msgstr "Cerrar la pregunta"
 
 #: templates/close.html:25
 msgid "Reasons"
-msgstr ""
+msgstr "Razón"
 
 #: templates/close.html:28
 msgid "OK to close"
-msgstr ""
+msgstr "OK para cerrar"
 
 #: templates/faq.html:11 templates/tough/faq.html:9
 msgid "Frequently Asked Questions "
-msgstr ""
+msgstr "Preguntas Frecuentes"
 
 #: templates/faq.html:15 templates/tough/faq.html:13
 msgid "What kinds of questions can I ask here?"
-msgstr ""
+msgstr "¿Qué clase de preguntas puedo hacer aquí?"
 
 #: templates/faq.html:16 templates/tough/faq.html:14
 msgid ""
 "Most importanly - questions should be <strong>relevant</strong> to this "
 "community."
 msgstr ""
+"Por encima de todo - las preguntas deben ser <strong>relevantes</strong>a "
+"esta comunidad."
 
 #: templates/faq.html:17 templates/tough/faq.html:15
 msgid ""
 "Before asking the question - please make sure to use search to see whether "
 "your question has alredy been answered."
 msgstr ""
+"Antes de hacer tu pregunta - por favor usa el buscador para asegurarte que "
+"la pregunta no este ya hecha."
 
 #: templates/faq.html:20 templates/tough/faq.html:18
 msgid "What questions should I avoid asking?"
-msgstr ""
+msgstr "¿Qué preguntas debería evitar preguntar?"
 
 #: templates/faq.html:21 templates/tough/faq.html:19
 msgid ""
 "Please avoid asking questions that are not relevant to this community, too "
 "subjective and argumentative."
 msgstr ""
+"Evita hacer preguntas que no son relevantes a la comunidad, demasiado "
+"subjetivas o argumentativas."
 
 #: templates/faq.html:24 templates/tough/faq.html:22
 msgid "What should I avoid in my answers?"
-msgstr ""
+msgstr "¿Que debo evitar en mis respuestas?"
 
 #: templates/faq.html:25 templates/tough/faq.html:23
 msgid ""
@@ -1035,137 +1052,162 @@ msgid ""
 "discussions in your answers, comment facility allows some space for brief "
 "discussions."
 msgstr ""
+"es un sitio de Preguntas y Respuestas, no un grupo de discusión. Por ende, "
+"intenta evitar discusiones en tus respuestas. Los comentarios permiten "
+"realizar pequeñas discusiones."
 
 #: templates/faq.html:28 templates/tough/faq.html:26
 msgid "Who moderates this community?"
-msgstr ""
+msgstr "¿Quién modera esta comunidad?"
 
 #: templates/faq.html:29 templates/tough/faq.html:27
 msgid "The short answer is: <strong>you</strong>."
-msgstr ""
+msgstr "La respuesta corta es: <strong>tú</strong>"
 
 #: templates/faq.html:30 templates/tough/faq.html:28
 msgid "This website is moderated by the users."
-msgstr ""
+msgstr "Este sitio es moderado por los usuarios."
 
 #: templates/faq.html:31 templates/tough/faq.html:29
 msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
 msgstr ""
+"El sistema de reputación permite a los usuarios adquirir autorización para "
+"realizar diversas tareas de moderación."
 
 #: templates/faq.html:34 templates/tough/faq.html:32
 msgid "How does reputation system work?"
-msgstr ""
+msgstr "¿Cómo funciona el sistema de reputación?"
 
 #: templates/faq.html:35 templates/tough/faq.html:33
 msgid ""
 "Anyone can ask questions and give answers, points are not necessary for that."
 msgstr ""
+"Cualquier usuario puede hacer preguntas y dar respuestas, no es necesario "
+"tener reputación para ello."
 
 #: templates/faq.html:36 templates/tough/faq.html:34
 msgid ""
 "As we've said before, users help running this site. Point system helps "
 "select users who can administer this community."
 msgstr ""
+"Como dijimos antes, los usuarios ayudan a crear este sitio. El sistema de "
+"reputación permite seleccionar usuarios que pueden moderar esta comunidad."
 
 #: templates/faq.html:37 templates/tough/faq.html:35
 msgid ""
 "Reputation points roughly measure how community trusts you. These points are "
 "given to you directly by other members of the community."
 msgstr ""
+"Los puntos de reputación miden a groso modo que tan respetado eres en la "
+"comunidad. Los puntos son dados a ti directamente por otros miembros de la "
+"comunidad"
 
 #: templates/faq.html:40 templates/tough/faq.html:38
 msgid ""
 "For example, if you ask an interesting question or give a helpful answer, "
 "your input will be upvoted and you will gain more trust in the community."
 msgstr ""
+"Por ejemplo, si haces una pregunta interesante, o das una respuesta valiosa, "
+"tu entrada va a ser votada positivamente y tu ganarás confianza en la "
+"comunidad."
 
 #: templates/faq.html:41 templates/tough/faq.html:39
 msgid ""
 "If on the other hand someone gives a misleading answer, the answer will be "
 "voted down and he/she loses some points."
 msgstr ""
+"Si por el contrario, alguien da una respuesta que no corresponde, la "
+"respuesta será votada negativamente y el usuario perderá puntos."
 
 #: templates/faq.html:42 templates/tough/faq.html:40
 msgid ""
 "Each vote in favor will generate <strong>10</strong> points, each vote "
 "against will subtract <strong>2</strong> points."
 msgstr ""
+"Cada voto a favor generará <strong>10</strong> puntos, cada voto negativo "
+"restará <strong>2</strong> puntos."
 
 #: templates/faq.html:43 templates/tough/faq.html:41
 msgid ""
 "Through the votes of other people you can accumulate a maximum of "
 "<strong>200</strong> points."
 msgstr ""
+"A través del voto de otras personas puedes acumular un máximo de "
+"<strong>200</strong> puntos."
 
 #: templates/faq.html:44
 msgid "After accumulating certain number of points, you can do more:"
-msgstr ""
+msgstr "Luego de haber acumulado cierta cantidad de puntos, puedes hacer más:"
 
 #: templates/faq.html:52 templates/user_votes.html:14
 #: templates/tough/faq.html:50
 msgid "upvote"
-msgstr ""
+msgstr "votar positivo"
 
 #: templates/faq.html:56 templates/tough/faq.html:54
 msgid "use tags"
-msgstr ""
+msgstr "etiquetas usadas"
 
 #: templates/faq.html:60 templates/tough/faq.html:58
 msgid "add comments"
-msgstr ""
+msgstr "agregar comentarios"
 
 #: templates/faq.html:64 templates/user_votes.html:16
 #: templates/tough/faq.html:62
 msgid "downvote"
-msgstr ""
+msgstr "votar negativo"
 
 #: templates/faq.html:71 templates/tough/faq.html:69
 msgid "retag questions"
-msgstr ""
+msgstr "re-etiquetar preguntas"
 
 #: templates/faq.html:75 templates/tough/faq.html:73
 msgid "edit community wiki questions"
-msgstr ""
+msgstr "editar preguntas de la wiki comunitaria"
 
 #: templates/faq.html:79 templates/tough/faq.html:77
 msgid "edit any answer"
-msgstr ""
+msgstr "editar cualquier pregunta"
 
 #: templates/faq.html:83 templates/tough/faq.html:81
 msgid "open any closed question"
-msgstr ""
+msgstr "abrir cualquier pregunta cerrada"
 
 #: templates/faq.html:87 templates/tough/faq.html:85
 msgid "delete any comment"
-msgstr ""
+msgstr "borrar cualquier comentario"
 
 #: templates/faq.html:91 templates/tough/faq.html:89
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
+"borrar cualquier pregunta o respuesta y realizar otras tareas de "
+"administración."
 
 #: templates/faq.html:98
 msgid "To register, do I need to create new password?"
-msgstr ""
+msgstr "¿Para registrarme, debo crearme una cuenta?"
 
 #: templates/faq.html:99 templates/tough/faq.html:97
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
 msgstr ""
+"No tienes porqué. Puedes ingresar usando cualquiera de los servicios que "
+"soportan OpenID, ej. Google, Yahoo, AOL, MyOpenID, etc."
 
 #: templates/faq.html:100 templates/tough/faq.html:98
 msgid "Login now!"
-msgstr ""
+msgstr "Ingresa ahora!"
 
 #: templates/faq.html:103 templates/tough/faq.html:101
 msgid "Why other people can edit my questions/answers?"
-msgstr ""
+msgstr "¿Porqué otras personas pueden editar mis preguntas y respuestas?"
 
 #: templates/faq.html:104 templates/tough/faq.html:102
 msgid "Goal of this site is..."
-msgstr ""
+msgstr "El objetivo de este sitio es..."
 
 #: templates/faq.html:104 templates/tough/faq.html:102
 msgid ""
@@ -1173,18 +1215,22 @@ msgid ""
 "of this site and this improves the overall quality of the knowledge base "
 "content."
 msgstr ""
+"Entonces, las preguntas y respuestas pueden ser editadas como wiki por "
+"usuarios con experiencia, y esto mejora la calidad general del conocimiento "
+"guardado."
 
 #: templates/faq.html:105 templates/tough/faq.html:103
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
+"Si esta forma de funcionamiento no es de tu agrado, respetamos tu elección."
 
 #: templates/faq.html:107 templates/tough/faq.html:105
 msgid "Still have questions?"
-msgstr ""
+msgstr "¿Aún tienes preguntas?"
 
 #: templates/faq.html:108
 msgid "Please ask your question, help make our community better!"
-msgstr ""
+msgstr "Por favor haz tu pregunta, ¡ayudanos a mejorar nuestra comunidad!"
 
 #: templates/faq.html:108 templates/header.html:29 templates/header.html.py:60
 #: templates/tough/faq.html:106
@@ -1198,75 +1244,75 @@ msgstr ""
 
 #: templates/footer.html:7 templates/header.html:12 templates/index.html:83
 msgid "about"
-msgstr ""
+msgstr "acerca de"
 
 #: templates/footer.html:8 templates/header.html:13 templates/index.html:84
 msgid "faq"
-msgstr ""
+msgstr "preguntas frecuentes"
 
 #: templates/footer.html:9
 msgid "blog"
-msgstr ""
+msgstr "blog"
 
 #: templates/footer.html:10
 msgid "contact us"
-msgstr ""
+msgstr "contactenos"
 
 #: templates/footer.html:11
 msgid "privacy policy"
-msgstr ""
+msgstr "código de privacidad"
 
 #: templates/footer.html:12
 msgid "give feedback"
-msgstr ""
+msgstr "envía comentarios"
 
 #: templates/footer.html:18
 msgid "current revision"
-msgstr ""
+msgstr "revisión actual"
 
 #: templates/header.html:8
 msgid "logout"
-msgstr ""
+msgstr "salir"
 
 #: templates/header.html:10 templates/authopenid/signup.html:39
 msgid "login"
-msgstr ""
+msgstr "entrar"
 
 #: templates/header.html:23
 msgid "back to home page"
-msgstr ""
+msgstr "volver al inicio"
 
 #: templates/header.html:31 templates/header.html.py:62
 msgid "users"
-msgstr ""
+msgstr "usuarios"
 
 #: templates/header.html:32
 msgid "books"
-msgstr ""
+msgstr "libros"
 
 #: templates/header.html:34 templates/index.html:121
 msgid "unanswered questions"
-msgstr "unanswered"
+msgstr "sin respuesta"
 
 #: templates/header.html:38
 msgid "my profile"
-msgstr ""
+msgstr "mi perfil"
 
 #: templates/header.html:42
 msgid "ask a question"
-msgstr ""
+msgstr "hacer una pregunta"
 
 #: templates/header.html:57
 msgid "search"
-msgstr ""
+msgstr "buscar"
 
 #: templates/index.html:6
 msgid "Home"
-msgstr ""
+msgstr "Inicio"
 
 #: templates/index.html:7
 msgid "meta site keywords, comma separated"
-msgstr ""
+msgstr "palabras claves"
 
 #: templates/index.html:21 templates/questions.html:7
 msgid "Questions"
@@ -1274,38 +1320,38 @@ msgstr "Preguntas"
 
 #: templates/index.html:23
 msgid "last updated questions"
-msgstr ""
+msgstr "ultimas preguntas actualizadas"
 
 #: templates/index.html:23 templates/questions.html:25
 #: templates/unanswered.html:20 templates/tough/unanswered.html:18
 msgid "newest"
-msgstr ""
+msgstr "más nuevas"
 
 #: templates/index.html:24 templates/questions.html:27
 msgid "hottest questions"
-msgstr ""
+msgstr "preguntas más calientes"
 
 #: templates/index.html:24 templates/questions.html:27
 msgid "hottest"
-msgstr ""
+msgstr "más calientes"
 
 #: templates/index.html:25 templates/questions.html:28
 msgid "most voted questions"
-msgstr ""
+msgstr "preguntas más votadas"
 
 #: templates/index.html:25 templates/questions.html:28
 msgid "most voted"
-msgstr ""
+msgstr "más votadas"
 
 #: templates/index.html:26
 msgid "all questions"
-msgstr ""
+msgstr "todas las preguntas"
 
 #: templates/index.html:46 templates/questions.html:45
 #: templates/unanswered.html:36 templates/users_questions.html:35
 #: templates/tough/unanswered.html:34
 msgid "answers"
-msgstr ""
+msgstr "respuestas"
 
 #: templates/index.html:68 templates/question.html:112
 #: templates/question.html.py:479 templates/questions.html:84
@@ -1314,211 +1360,216 @@ msgstr ""
 #: templates/users_questions.html:52 templates/tough/unanswered.html:72
 #: templates/tough/unanswered.html:105
 msgid "see questions tagged"
-msgstr ""
+msgstr "ver preguntas etiquetadas"
 
 #: templates/index.html:79
 msgid "welcome to website"
-msgstr ""
+msgstr "bienvenido a sitio"
 
 #: templates/index.html:81
 msgid "what is this website"
-msgstr ""
+msgstr "que es este sitio"
 
 #: templates/index.html:82
 msgid "what can one do on this website"
-msgstr ""
+msgstr "que puede uno hacer en este sitio"
 
 #: templates/index.html:89
 msgid "Recent tags"
-msgstr ""
+msgstr "Etiquetas recientes"
 
 #: templates/index.html:94
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
-msgstr ""
+msgstr "ver preguntas etiquetadas '%(tagname)s'"
 
 #: templates/index.html:97 templates/index.html.py:121
 msgid "popular tags"
-msgstr ""
+msgstr "etiquetas populares"
 
 #: templates/index.html:101
 msgid "Recent awards"
-msgstr ""
+msgstr "Reconocimientos recientes"
 
 #: templates/index.html:107
 msgid "given to"
-msgstr ""
+msgstr "dados a"
 
 #: templates/index.html:112
 msgid "all awards"
-msgstr ""
+msgstr "todos los reconocimientos"
 
 #: templates/index.html:116
 msgid "subscribe to last 30 questions by RSS"
-msgstr ""
+msgstr "suscribirse a las últimas 30 preguntas por RSS"
 
 #: templates/index.html:121
 msgid "Still looking for more? See"
-msgstr ""
+msgstr "¿Aún sigues buscando más? Ver"
 
 #: templates/index.html:121
 msgid "complete list of quesionts"
-msgstr ""
+msgstr "lista completa de preguntas"
 
 #: templates/index.html:121
 msgid "or"
-msgstr ""
+msgstr "ó"
 
 #: templates/index.html:121
 msgid "Please help us answer"
-msgstr ""
+msgstr "Ayudanos a responder"
 
 #: templates/logout.html:6 templates/logout.html.py:17
 msgid "Logout"
-msgstr ""
+msgstr "Salir"
 
 #: templates/logout.html:20
 msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
+"Como usuario registrado puedes ingresar con tu OpenID, salir del sitio o "
+"eliminar de forma permanente tu cuenta."
 
 #: templates/logout.html:21
 msgid "Logout now"
-msgstr ""
+msgstr "Salir ahora"
 
 #: templates/pagesize.html:6
 msgid "posts per page"
-msgstr ""
+msgstr "entradas por página"
 
 #: templates/paginator.html:6 templates/paginator.html.py:7
 msgid "previous"
-msgstr ""
+msgstr "previo"
 
 #: templates/paginator.html:20
 msgid "current page"
-msgstr ""
+msgstr "página actúal"
 
 #: templates/paginator.html:23 templates/paginator.html.py:30
 msgid "page number "
-msgstr ""
+msgstr "número de página"
 
 #: templates/paginator.html:23 templates/paginator.html.py:30
 msgid "number - make blank in english"
-msgstr ""
+msgstr " "
 
 #: templates/paginator.html:34
 msgid "next page"
-msgstr ""
+msgstr "próxima página"
 
 #: templates/privacy.html:6 templates/privacy.html.py:11
 msgid "Privacy policy"
-msgstr ""
+msgstr "Código de Privacidad"
 
 #: templates/privacy.html:15
 msgid "general message about privacy"
-msgstr ""
+msgstr "mensaje de privacidad"
 
 #: templates/privacy.html:18
 msgid "Site Visitors"
-msgstr ""
+msgstr "Visitantes del Sitio"
 
 #: templates/privacy.html:20
 msgid "what technical information is collected about visitors"
-msgstr ""
+msgstr "que información es recolectada sobre los usuarios"
 
 #: templates/privacy.html:23
 msgid "Personal Information"
-msgstr ""
+msgstr "Información Personal"
 
 #: templates/privacy.html:25
 msgid "details on personal information policies"
-msgstr ""
+msgstr "describir código de manejo de la información personal"
 
 #: templates/privacy.html:28
 msgid "Other Services"
-msgstr ""
+msgstr "Otros servicios"
 
 #: templates/privacy.html:30
 msgid "details on sharing data with third parties"
-msgstr ""
+msgstr "detalles sobre compartir información con terceros"
 
 #: templates/privacy.html:35
 msgid "cookie policy details"
-msgstr ""
+msgstr "uso de cookies"
 
 #: templates/privacy.html:37
 msgid "Policy Changes"
-msgstr ""
+msgstr "Cambios de Códigos"
 
 #: templates/privacy.html:38
 msgid "how privacy policies can be changed"
-msgstr ""
+msgstr "como pueden ser cambiados los códigos de privacidad"
 
 #: templates/question.html:66 templates/question.html.py:78
 msgid "i like this post (click again to cancel)"
-msgstr ""
+msgstr "Me gusta esta entrada (clickear devuelta para cancelar)"
 
 #: templates/question.html:68 templates/question.html.py:80
 #: templates/question.html:273
 msgid "current number of votes"
-msgstr ""
+msgstr "número actual de votos"
 
 #: templates/question.html:73 templates/question.html.py:84
 msgid "i dont like this post (click again to cancel)"
-msgstr ""
+msgstr "No me gusta esta entrada (clickear devuelta para cancelar)"
 
 #: templates/question.html:90
 msgid "mark this question as favorite (click again to cancel)"
-msgstr ""
+msgstr "marcar esta pregunta como favorita (clickear devuelta para cancelar)"
 
 #: templates/question.html:96
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
+"remover marca de favorito a esta pregunta (clickear devuelta para volver a "
+"marcar)"
 
 #: templates/question.html:121 templates/question.html.py:304
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
-msgstr ""
+msgstr "editar"
 
 #: templates/question.html:125 templates/question.html.py:314
 msgid "delete"
-msgstr ""
+msgstr "borrar"
 
 #: templates/question.html:130
 msgid "reopen"
-msgstr ""
+msgstr "re-abrir"
 
 #: templates/question.html:135
 msgid "close"
-msgstr ""
+msgstr "cerrar"
 
 #: templates/question.html:141 templates/question.html.py:327
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
+"reportar como ofensivo (ej. contiene spam, publicidad, texto malicioso, etc.)"
 
 #: templates/question.html:142 templates/question.html.py:328
 msgid "flag offensive"
-msgstr ""
+msgstr "marcar como ofensivo"
 
 #: templates/question.html:154 templates/question.html.py:337
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
-msgstr ""
+msgstr "actualizado"
 
 #: templates/question.html:203 templates/question.html.py:384
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
-msgstr ""
+msgstr "preguntado"
 
 #: templates/question.html:233 templates/question.html.py:411
 msgid "comments"
-msgstr ""
+msgstr "comentarios"
 
 #: templates/question.html:234 templates/question.html.py:412
 msgid "add comment"
-msgstr ""
+msgstr "agregar comentario"
 
 #: templates/question.html:247
 #, python-format
@@ -1526,79 +1577,81 @@ msgid ""
 "The question has been closed for the following reason \"%(question."
 "get_close_reason_display)s\" by"
 msgstr ""
+"La pregunta ha sido cerrada por el siguiente motivo \"%(question."
+"get_close_reason_display)s\" por"
 
 #: templates/question.html:249
 #, python-format
 msgid "close date %(question.closed_at)s"
-msgstr ""
+msgstr "fecha de cerrada %(question.closed_at)s"
 
 #: templates/question.html:256 templates/user_stats.html:28
 msgid "Answers"
-msgstr " Answers"
+msgstr "Respuestas"
 
 #: templates/question.html:258
 msgid "oldest answers will be shown first"
-msgstr ""
+msgstr "la respuesta mas vieja será mostrada primero"
 
 #: templates/question.html:258
 msgid "oldest answers"
-msgstr "oldest"
+msgstr "pregunta más vieja"
 
 #: templates/question.html:259
 msgid "newest answers will be shown first"
-msgstr ""
+msgstr "preguntas más nuevas serán mostradas primero"
 
 #: templates/question.html:259
 msgid "newest answers"
-msgstr "newest"
+msgstr "más nuevas"
 
 #: templates/question.html:260
 msgid "most voted answers will be shown first"
-msgstr ""
+msgstr "las preguntas más votadas serán mostradas primero"
 
 #: templates/question.html:260
 msgid "popular answers"
-msgstr "most voted"
+msgstr "respuestas populares serán mostradas primero"
 
 #: templates/question.html:272
 msgid "i like this answer (click again to cancel)"
-msgstr ""
+msgstr "me gusta esta respuesta (clickear devuelta para cancelar)"
 
 #: templates/question.html:278
 msgid "i dont like this answer (click again to cancel)"
-msgstr ""
+msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)"
 
 #: templates/question.html:284
 msgid "mark this answer as favorite (click again to undo)"
-msgstr ""
+msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)"
 
 #: templates/question.html:289
 msgid "the author of the question has selected this answer as correct"
-msgstr ""
+msgstr "el autor de esta pregunta ha seleccionado esta respuesta como correcta"
 
 #: templates/question.html:311
 msgid "undelete"
-msgstr ""
+msgstr "deshacer eliminar"
 
 #: templates/question.html:321
 msgid "answer permanent link"
-msgstr ""
+msgstr "enlace permanente a respuesta"
 
 #: templates/question.html:322
 msgid "permanent link"
-msgstr ""
+msgstr "enlace permanente"
 
 #: templates/question.html:436
 msgid "Your answer"
-msgstr ""
+msgstr "Tu respuesta"
 
 #: templates/question.html:460
 msgid "Answer the question"
-msgstr ""
+msgstr "Responde la pregunta"
 
 #: templates/question.html:462
 msgid "Login to answer"
-msgstr ""
+msgstr "Ingresa para responder"
 
 #: templates/question.html:474
 msgid "Question tags"
@@ -1606,94 +1659,88 @@ msgstr "Etiquetas de la pregunta"
 
 #: templates/question.html:484
 msgid "question asked"
-msgstr "Asked"
+msgstr "pregunta preguntada"
 
 #: templates/question.html:484 templates/question.html.py:490
 #: templates/user_info.html:51
 msgid "ago"
-msgstr ""
+msgstr "atrás"
 
 #: templates/question.html:487
 msgid "question was seen"
-msgstr "Seen"
+msgstr "la pregunta fue vista"
 
 #: templates/question.html:487
 msgid "times"
-msgstr ""
+msgstr "veces"
 
 #: templates/question.html:490
 msgid "last updated"
-msgstr "Last updated"
+msgstr "última vez actualizada"
 
 #: templates/question.html:495
 msgid "Related questions"
-msgstr ""
+msgstr "Preguntas relacionadas"
 
 #: templates/question_edit.html:4 templates/question_edit.html.py:65
 msgid "Edit question"
-msgstr ""
+msgstr "Editar pregunta"
 
 #: templates/question_edit_tips.html:4
 msgid "question tips"
-msgstr "Tips"
+msgstr "sugerencias sobre pregunta"
 
 #: templates/question_edit_tips.html:7
 msgid "please ask a relevant question"
-msgstr ""
+msgstr "por favor hacer preguntas relevantes"
 
 #: templates/question_edit_tips.html:10
 msgid "please try provide enough details"
-msgstr "provide enough details"
+msgstr "intente proveer suficientes detalles"
 
 #: templates/questions.html:23
 msgid "Found by tags"
-msgstr "Tagged questions"
+msgstr "Encontradas por etiqueta"
 
 #: templates/questions.html:23
 msgid "Found by title"
-msgstr ""
+msgstr "Encontradas por titulo"
 
 #: templates/questions.html:23
 msgid "All questions"
-msgstr ""
+msgstr "Todas las preguntas"
 
 #: templates/questions.html:25 templates/unanswered.html:20
 #: templates/tough/unanswered.html:18
 msgid "most recently asked questions"
-msgstr ""
+msgstr "preguntas hechas más recientemente"
 
 #: templates/questions.html:26
 msgid "most recently updated questions"
-msgstr ""
+msgstr "preguntas actualizadas más recientemente"
 
 #: templates/questions.html:26
 msgid "active"
-msgstr ""
+msgstr "actividad"
 
 #: templates/questions.html:109
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
+"\t\t\thave total %(q_num)s question tagged %(tagname)s\n"
 "\t\t\t"
 msgid_plural ""
 "\n"
 "\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
 "\t\t\t"
-msgstr[0] ""
-"\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>question tagged</p><p><span "
-"class=\"tag\">%(tagname)s</span></p>"
-msgstr[1] ""
-"\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</"
-"p><p><span class=\"tag\">%(tagname)s</span></p>"
+msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
+msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
 
 #: templates/questions.html:116
 #, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\thave total %(q_num)s question containing %(searchtitle)s\n"
 "\t\t\t"
 msgid_plural ""
 "\n"
@@ -1701,42 +1748,41 @@ msgid_plural ""
 "\t\t\t"
 msgstr[0] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>question with title "
-"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
-"p>"
+"\t\t\thay un total de %(q_num)s preguntas que contienen %(searchtitle)s\n"
+"\t\t\t"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions with title "
-"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
-"p>"
+"\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n"
+"\t\t\t"
 
 #: templates/questions.html:124
 msgid "latest questions info"
-msgstr "<strong>Newest</strong> questions are shown first."
+msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
 #: templates/questions.html:128
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
+"Las preguntas estan ordenadas por <strong>fecha de último update</strong>."
 
 #: templates/questions.html:129
 msgid "Most recently answered ones are shown first."
-msgstr ""
+msgstr "Las más recientemente respondidas son mostradas primero."
 
 #: templates/questions.html:133
 msgid "Questions sorted by <strong>number of responses</strong>."
-msgstr ""
+msgstr "Preguntas ordenadas por <strong>número de respuestas</strong>."
 
 #: templates/questions.html:134
 msgid "Most answered questions are shown first."
-msgstr ""
+msgstr "Preguntas más respondidas aparecen primero."
 
 #: templates/questions.html:138
 msgid "Questions are sorted by the <strong>number of votes</strong>."
-msgstr ""
+msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>."
 
 #: templates/questions.html:139
 msgid "Most voted questions are shown first."
-msgstr ""
+msgstr "Las preguntas más votadas son mostradas primero."
 
 #: templates/questions.html:146 templates/unanswered.html:105
 #: templates/tough/unanswered.html:101
@@ -1745,108 +1791,108 @@ msgstr "Etiquetas relacionadas"
 
 #: templates/reopen.html:6 templates/reopen.html.py:16
 msgid "Reopen question"
-msgstr ""
+msgstr "Re-abrir pregunta"
 
 #: templates/reopen.html:19
 msgid "Open the previously closed question"
-msgstr ""
+msgstr "Abrir pregunta previamente cerrada"
 
 #: templates/reopen.html:22
 msgid "The question was closed for the following reason "
-msgstr ""
+msgstr "La pregunta fue cerrada por el siguiente motivo "
 
 #: templates/reopen.html:22
 msgid "reason - leave blank in english"
-msgstr ""
+msgstr "razón - "
 
 #: templates/reopen.html:22
 msgid "on "
-msgstr ""
+msgstr "el "
 
 #: templates/reopen.html:22
 msgid "date closed"
-msgstr ""
+msgstr "fecha cerrada"
 
 #: templates/reopen.html:29
 msgid "Reopen this question"
-msgstr ""
+msgstr "Re-abrir esta pregunta"
 
 #: templates/revisions_answer.html:7 templates/revisions_answer.html.py:36
 #: templates/revisions_question.html:8 templates/revisions_question.html:36
 msgid "Revision history"
-msgstr ""
+msgstr "Historial de revisiones"
 
 #: templates/tags.html:6 templates/tags.html.py:29
 msgid "Tag list"
-msgstr ""
+msgstr "Lista de etiquetas"
 
 #: templates/tags.html:31
 msgid "sorted alphabetically"
-msgstr ""
+msgstr "ordenar alfabéticamente"
 
 #: templates/tags.html:31
 msgid "by name"
-msgstr ""
+msgstr "por nombre"
 
 #: templates/tags.html:32
 msgid "sorted by frequency of tag use"
-msgstr ""
+msgstr "ordenar por frecuencia de uso de la etiqueta"
 
 #: templates/tags.html:32
 msgid "by popularity"
-msgstr ""
+msgstr "por popularidad"
 
 #: templates/tags.html:38
 msgid "All tags matching query"
-msgstr ""
+msgstr "Todas las etiquetas que coincidan con la busqueda"
 
 #: templates/tags.html:38
 msgid "all tags - make this empty in english"
-msgstr ""
+msgstr "todas las tags"
 
 #: templates/tags.html:41
 msgid "Nothing found"
-msgstr ""
+msgstr "Nada encontrado"
 
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
 #: templates/tough/unanswered.html:5 templates/tough/unanswered.html.py:16
 msgid "Unanswered questions"
-msgstr ""
+msgstr "Preguntas sin respuesta"
 
 #: templates/unanswered.html:97
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
-"questions"
+"<div class=\"questions-count\">%(num_q)s</div> preguntas <strong>sin "
+"respuesta</strong> "
 
 #: templates/unanswered.html:99
 msgid "Have a total of"
-msgstr ""
+msgstr "Hay un total de"
 
 #: templates/user_edit.html:6
 msgid "Edit user profile"
-msgstr ""
+msgstr "Editar perfil de usuario"
 
 #: templates/user_edit.html:19
 msgid "edit profile"
-msgstr ""
+msgstr "editar perfil"
 
 #: templates/user_edit.html:31
 msgid "image associated with your email address"
-msgstr ""
+msgstr "imagen asociada con tu email"
 
 #: templates/user_edit.html:31
 msgid "avatar"
-msgstr ""
+msgstr "avatar"
 
 #: templates/user_edit.html:36 templates/user_info.html:31
 msgid "Registered user"
-msgstr ""
+msgstr "Usuario registrado"
 
 #: templates/user_edit.html:82
 msgid "Update"
-msgstr ""
+msgstr "Actualización"
 
 #: templates/user_info.html:34
 msgid "update profile"
@@ -1854,69 +1900,70 @@ msgstr ""
 
 #: templates/user_info.html:40
 msgid "real name"
-msgstr ""
+msgstr "nombre real"
 
 #: templates/user_info.html:45
 msgid "member for"
-msgstr ""
+msgstr "miembro de"
 
 #: templates/user_info.html:50
 msgid "last seen"
-msgstr ""
+msgstr "última vez visto"
 
 #: templates/user_info.html:56
 msgid "user website"
-msgstr ""
+msgstr "sitio web del usuario"
 
 #: templates/user_info.html:62
 msgid "location"
-msgstr ""
+msgstr "ubicación"
 
 #: templates/user_info.html:69
 msgid "age"
-msgstr ""
+msgstr "edad"
 
 #: templates/user_info.html:70
 msgid "age unit"
-msgstr ""
+msgstr "unidad de edad"
 
 #: templates/user_info.html:75
 msgid "todays unused votes"
-msgstr ""
+msgstr "votos de hoy no usados"
 
 #: templates/user_info.html:76
 msgid "votes left"
-msgstr ""
+msgstr "votos restantes"
 
 #: templates/user_stats.html:15
 msgid "User questions"
-msgstr ""
+msgstr "Preguntas del usuario"
 
 #: templates/user_stats.html:37
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
-msgstr ""
+msgstr "la respuesta ha sido votada %(vote_count)s veces"
 
 #: templates/user_stats.html:37
 msgid "this answer has been selected as correct"
-msgstr ""
+msgstr "esta respuesta ha sido seleccionada como correcta"
 
 #: templates/user_stats.html:43
 #, python-format
 msgid "the answer has been commented %(answered_question.comment_count)s times"
 msgstr ""
+"la respuesta ha sido comentada %(answered_question.comment_count)s veces"
 
 #: templates/user_stats.html:56
 msgid "votes total"
-msgstr "Votes"
+msgstr "votos totales"
 
 #: templates/user_stats.html:65
 msgid "user has voted up this many times"
-msgstr ""
+msgstr "el usuario ha votado positivo esta cantidad de veces"
 
 #: templates/user_stats.html:70
 msgid "user voted down this many times"
-msgstr ""
+msgstr "el usuario voto negativo esta cantidad de veces"
 
 #: templates/user_stats.html:84
 msgid "Tags"
@@ -1925,64 +1972,64 @@ msgstr "Etiquetas"
 #: templates/user_stats.html:94
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
-msgstr ""
+msgstr "ver otras preguntas etiqueteadas '%(tag)s'"
 
 #: templates/user_tabs.html:7
 msgid "User profile"
-msgstr ""
+msgstr "Perfil de usuario"
 
 #: templates/user_tabs.html:16
 msgid "graph of user reputation"
-msgstr ""
+msgstr "gráfica de la reputación del usuario"
 
 #: templates/user_tabs.html:17
 msgid "reputation history"
-msgstr ""
+msgstr "historial de reputación"
 
 #: templates/user_tabs.html:24
 msgid "favorites"
-msgstr ""
+msgstr "favoritos"
 
 #: templates/user_tabs.html:29
 msgid "settings"
-msgstr ""
+msgstr "preferencias"
 
 #: templates/users.html:6 templates/users.html.py:24
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: templates/users.html:27
 msgid "recent"
-msgstr ""
+msgstr "reciente"
 
 #: templates/users.html:28
 msgid "oldest"
-msgstr ""
+msgstr "más viejo"
 
 #: templates/users.html:29
 msgid "by username"
-msgstr ""
+msgstr "por nombre de usuario"
 
 #: templates/users.html:35
 #, python-format
 msgid "users matching query %(suser)s:"
-msgstr ""
+msgstr "usuarios que coincidan con la busqueda %(suser)s:"
 
 #: templates/users.html:39
 msgid "Nothing found."
-msgstr ""
+msgstr "Nada encontrado."
 
 #: templates/users_questions.html:11
 msgid "this questions was selected as favorite"
-msgstr ""
+msgstr "esta pregunta ha sido seleccionada como favorita"
 
 #: templates/users_questions.html:33
 msgid "this answer has been accepted to be correct"
-msgstr ""
+msgstr "esta respuesta ha sido aceptada como correcta"
 
 #: templates/authopenid/changeemail.html:6
 msgid "Account: change email"
-msgstr ""
+msgstr "Cuenta: cambiar el email"
 
 #: templates/authopenid/changeemail.html:9
 msgid ""
@@ -1990,342 +2037,360 @@ msgid ""
 "Please keep this email address up to date so we can send you a password-"
 "reset email if you request one."
 msgstr ""
+"Aquí es donde puedes cambiar el email asociado a tu cuenta de usuario.Por "
+"favor manten esta dirección de correo al día de forma que podamos mandarte "
+"un cambio de contraseña si tu así lo requieres."
 
 #: templates/authopenid/changeemail.html:11
 #: templates/authopenid/changeopenid.html:13
 #: templates/authopenid/changepw.html:18 templates/authopenid/delete.html:14
 #: templates/authopenid/delete.html:24
 msgid "Please correct errors below:"
-msgstr ""
+msgstr "Por favor corrija los errores debajo: "
 
 #: templates/authopenid/changeemail.html:28
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: templates/authopenid/changeemail.html:29
 #: templates/authopenid/signin.html:60
 msgid "Password"
-msgstr ""
+msgstr "Contraseña"
 
 #: templates/authopenid/changeemail.html:31
 msgid "Change email"
-msgstr ""
+msgstr "Cambiar dirección email"
 
 #: templates/authopenid/changeopenid.html:7
 msgid "Account: change OpenID URL"
-msgstr ""
+msgstr "Cuenta: cambiar la URL de OpenID"
 
 #: templates/authopenid/changeopenid.html:11
 msgid ""
 "This is where you can change your OpenID URL. Make sure you remember it!"
-msgstr ""
+msgstr "Aquí es donde puedes cambiar tu OpenID URL. Asegurate de recordarla!"
 
 #: templates/authopenid/changeopenid.html:28
 msgid "OpenID URL:"
-msgstr ""
+msgstr "URL de OpenID:"
 
 #: templates/authopenid/changeopenid.html:29
 msgid "Change OpenID"
-msgstr ""
+msgstr "Cambiar OpenID"
 
 #: templates/authopenid/changepw.html:13
 msgid "Account: change password"
-msgstr ""
+msgstr "Cuenta: cambiar contraseña"
 
 #: templates/authopenid/changepw.html:16
 msgid "This is where you can change your password. Make sure you remember it!"
-msgstr ""
+msgstr "Aquí es donde puedes cambiar tu contraseña. Asegurate de recordarlo!"
 
 #: templates/authopenid/changepw.html:26
 msgid "Current password"
-msgstr ""
+msgstr "Contraseña actual"
 
 #: templates/authopenid/changepw.html:27
 msgid "New password"
-msgstr ""
+msgstr "Nueva contraseña"
 
 #: templates/authopenid/changepw.html:28
 msgid "New password again"
-msgstr ""
+msgstr "Nueva contraseña nuevamente"
 
 #: templates/authopenid/changepw.html:29 templates/authopenid/settings.html:28
 msgid "Change password"
-msgstr ""
+msgstr "Cambiar contraseña"
 
 #: templates/authopenid/complete.html:4
 msgid "Connect your OpenID with this site"
-msgstr ""
+msgstr "Vincular tu OpenID con este sitio"
 
 #: templates/authopenid/complete.html:7
 msgid "Connect your OpenID with your account on this site"
-msgstr ""
+msgstr "Vincular tu OpenID con tu cuenta en este sitio"
 
 #: templates/authopenid/complete.html:10
 msgid "Your OpenID is accepted. Please complete this to finish registration."
 msgstr ""
+"Tu OpenID es aceptada. Por favor completa lo siguiente para finalizar el "
+"registro."
 
 #: templates/authopenid/complete.html:11
 msgid "This account already exists, please use another."
-msgstr ""
+msgstr "Esta cuenta ya existe, por favor usar otra."
 
 #: templates/authopenid/complete.html:16 templates/authopenid/complete.html:29
 #: templates/authopenid/signin.html:43
 msgid "Sorry, looks like we have some errors:"
-msgstr ""
+msgstr "Ups, parece que hay errores:"
 
 #: templates/authopenid/complete.html:45
 msgid "New account"
-msgstr ""
+msgstr "Nueva cuenta"
 
 #: templates/authopenid/complete.html:46
 msgid "User name (<i>will be shown to others, cannot be modified</i>)"
 msgstr ""
+"Nombre de usuario (<i>será mostrado a otros, no puede ser modificado</i>)"
 
 #: templates/authopenid/complete.html:47
 msgid "Email (<i>not shared with anyone</i>)"
-msgstr ""
+msgstr "Email (<i>no será compartido con nadie</i>)"
 
 #: templates/authopenid/complete.html:48
 msgid "create account"
-msgstr ""
+msgstr "crear cuenta"
 
 #: templates/authopenid/complete.html:56
 msgid "Existing account"
-msgstr ""
+msgstr "Cuenta existente"
 
 #: templates/authopenid/complete.html:57
 msgid "user name"
-msgstr ""
+msgstr "nombre de usuario"
 
 #: templates/authopenid/complete.html:58
 msgid "password"
-msgstr ""
+msgstr "contraseña"
 
 #: templates/authopenid/complete.html:61
 msgid "Register"
-msgstr ""
+msgstr "Registrarse"
 
 #: templates/authopenid/complete.html:62 templates/authopenid/signin.html:62
 msgid "Forgot your password?"
-msgstr ""
+msgstr "¿Olvidaste tu contraseña?"
 
 #: templates/authopenid/delete.html:8
 msgid "Account: delete account"
-msgstr ""
+msgstr "Cuenta: borrar cuenta"
 
 #: templates/authopenid/delete.html:12
 msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
 msgstr ""
+"Nota: Luego de borrar tu cuenta, cualquiera podrá registrarse con este "
+"nombre de usuario."
 
 #: templates/authopenid/delete.html:16
 msgid "Check confirm box, if you want delete your account."
-msgstr ""
+msgstr "Marca caja de confirmación, si deseas borrar tu cuenta."
 
 #: templates/authopenid/delete.html:19
 msgid "Password:"
-msgstr ""
+msgstr "Contraseña"
 
 #: templates/authopenid/delete.html:31
 msgid "I am sure I want to delete my account."
-msgstr ""
+msgstr "Estoy seguro que quiero borrar mi cuenta."
 
 #: templates/authopenid/delete.html:32
 msgid "Password/OpenID URL"
-msgstr ""
+msgstr "Contraseña/OpenID URL"
 
 #: templates/authopenid/delete.html:32
 msgid "(required for your security)"
-msgstr ""
+msgstr "(requerido por tu seguridad)"
 
 #: templates/authopenid/delete.html:34
 msgid "Delete account permanently"
-msgstr ""
+msgstr "Borrar la cuenta de forma permanente"
 
 #: templates/authopenid/sendpw.html:3 templates/authopenid/sendpw.html.py:7
 msgid "Send new password"
-msgstr ""
+msgstr "Enviar nueva contraseña"
 
 #: templates/authopenid/sendpw.html:11
 msgid "Lost your password? No problem - here you can reset it."
-msgstr ""
+msgstr "¿Haz perdido tu contraseña? No hay problema - aquí puedes re-crearla."
 
 #: templates/authopenid/sendpw.html:12
 msgid ""
 "Please enter your username below and new password will be sent to your "
 "registered e-mail"
 msgstr ""
+"Por favor, ingresa tu nombre de usuario y una nueva contraseña será enviada "
+"a la dirección de email registrada."
 
 #: templates/authopenid/sendpw.html:29
 msgid "Reset password"
-msgstr ""
+msgstr "Re-crear contraseña"
 
 #: templates/authopenid/sendpw.html:29
 msgid "return to login"
-msgstr ""
+msgstr "volver a 'Ingresar'"
 
 #: templates/authopenid/sendpw.html:32
 msgid ""
 "Note: your new password will be activated only after you click the "
 "activation link in the email message"
 msgstr ""
+"Nota: tu nueva contraseña solo será activada luego de que hagas click en el "
+"link de activación en el email enviado."
 
 #: templates/authopenid/settings.html:29
 msgid "Give your  account a new password."
-msgstr ""
+msgstr "Crea una nueva contraseña para tu cuenta."
 
 #: templates/authopenid/settings.html:30
 msgid "Change email "
-msgstr ""
+msgstr "Cambiar email "
 
 #: templates/authopenid/settings.html:31
 msgid "Add or update the email address associated with your account."
-msgstr ""
+msgstr "Agrega o actualiza el email asociado a tu cuenta."
 
 #: templates/authopenid/settings.html:34
 msgid "Change openid associated to your account"
-msgstr ""
+msgstr "Cambia el OpenID asociado a tu cuenta"
 
 #: templates/authopenid/settings.html:37
 msgid "Delete account"
-msgstr ""
+msgstr "Eliminar cuenta"
 
 #: templates/authopenid/settings.html:38
 msgid "Erase your username and all your data from website"
-msgstr ""
+msgstr "Eliminar tu nombre de usuario y toda tu información del sitio"
 
 #: templates/authopenid/signin.html:3 templates/authopenid/signin.html:16
 msgid "User login"
-msgstr ""
+msgstr "Ingreso de usuario"
 
 #: templates/authopenid/signin.html:21
 msgid "we support two login modes"
 msgstr ""
-"You can log in either through one of these services or traditionally - using "
-"local username/password."
+"Puedes ingresar por cualquiera de los siguientes servicios, o "
+"tradicionalmente- usando nombre de usuario y contraseña locales"
 
 #: templates/authopenid/signin.html:26 templates/authopenid/signup.html:49
 msgid "Login with your OpenID"
-msgstr ""
+msgstr "Ingresar con tu OpenID"
 
 #: templates/authopenid/signin.html:28
 msgid "select openid provider"
-msgstr "1) Please select your id service provider."
+msgstr "1) Selecciona tu proveedor de OpenID"
 
 #: templates/authopenid/signin.html:32
 msgid "verify openid link and login"
 msgstr ""
-"2) Please verify the OpenID URL (type your login name over {username}, if "
-"present) and then log in."
+"2) Varifica la URL de tu OpenID (escribe tu nombre de usuario donde dice "
+"{nombre de usuario} si lo ves) y luego clickea 'ingresar'"
 
 #: templates/authopenid/signin.html:58
 msgid "Use login name and password"
-msgstr ""
+msgstr "Nombre de usuario y contraseña"
 
 #: templates/authopenid/signin.html:59
 msgid "Login name"
-msgstr ""
+msgstr "Nombre de usuario"
 
 #: templates/authopenid/signin.html:63
 msgid "Create new acccount"
-msgstr ""
+msgstr "Crear cuenta nueva"
 
 #: templates/authopenid/signin.html:72
 msgid "Why use OpenID?"
-msgstr ""
+msgstr "¿Porqué usar OpenID?"
 
 #: templates/authopenid/signin.html:76
 msgid "with openid it is easier"
-msgstr "With the OpenID you don't need to create new username and password."
+msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña."
 
 #: templates/authopenid/signin.html:79
 msgid "reuse openid"
-msgstr "You can safely re-use the same login for all OpenID-enabled websites."
+msgstr ""
+"Puedes de forma segura re-usar el mismo nombre de usuario para todos los "
+"sitios que acepten OpenID."
 
 #: templates/authopenid/signin.html:82
 msgid "openid is widely adopted"
 msgstr ""
-"There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
-"enabled."
+"OpenID es extensamente usado. Hay más de 160,000,000 cuentas de OpenID en "
+"uso en el mundo. Mas de 10,000 sitios aceptan OpenID."
 
 #: templates/authopenid/signin.html:85
 msgid "openid is supported open standard"
-msgstr "OpenID is based on an open standard, supported by many organizations."
+msgstr ""
+"OpenID es basado en un standard abierto, apoyado por muchas organizaciones."
 
 #: templates/authopenid/signin.html:89
 msgid "Find out more"
-msgstr ""
+msgstr "Averigua más"
 
 #: templates/authopenid/signin.html:90
 msgid "Get OpenID"
-msgstr ""
+msgstr "Adquiere una OpenID"
 
 #: templates/authopenid/signup.html:2 templates/authopenid/signup.html.py:6
 msgid "Signup"
-msgstr ""
+msgstr "Registrate"
 
 #: templates/authopenid/signup.html:10
 msgid ""
 "We support two types of user registration: conventional username/password, "
 "and"
 msgstr ""
+"Soportamos dos formas de registro de usuario: convencional usuario/"
+"contraseña, y"
 
 #: templates/authopenid/signup.html:10
 msgid "the OpenID method"
-msgstr ""
+msgstr "OpenID"
 
 #: templates/authopenid/signup.html:15
 msgid "Sorry, looks like we have some errors"
-msgstr ""
+msgstr "Ups, parece que hay errores."
 
 #: templates/authopenid/signup.html:33
 msgid "Conventional registration"
-msgstr ""
+msgstr "Registro clásico"
 
 #: templates/authopenid/signup.html:34
 msgid "choose a user name"
-msgstr ""
+msgstr "elije un nombre de usuario"
 
 #: templates/authopenid/signup.html:40
 msgid "back to login"
-msgstr ""
+msgstr "volver al ingreso de usuario"
 
 #: templates/authopenid/signup.html:46
 msgid "Register with your OpenID"
-msgstr ""
+msgstr "Registrate con tu OpenID"
 
 #: templates/tough/question_retag.html:2
 msgid "Revise tags"
-msgstr ""
+msgstr "Revisar etiquetas"
 
 #: templates/tough/question_retag.html:37
 msgid "tags are requried"
-msgstr ""
+msgstr "las etiquetas son requeridas"
 
 #: templates/tough/question_retag.html:38
 msgid "up to 5 tags, less than 20 characters each"
-msgstr ""
+msgstr "hasta 5 etiquetas, menos de 20 caracteres cada una"
 
 #: templates/tough/question_retag.html:51
 msgid "Change tags"
-msgstr ""
+msgstr "Cambiar etiquetas"
 
 #: templates/tough/question_retag.html:74
 msgid "Change now"
-msgstr ""
+msgstr "Cambiar ahora"
 
 #: templates/tough/question_retag.html:85
 msgid "Why use and modify tags?"
-msgstr ""
+msgstr "¿Porqué usar y modificar etiquetas?"
 
 #: templates/tough/question_retag.html:96
 msgid "tag editors receive special awards from the community"
 msgstr ""
+"los editores de etiquetas reciben distinciones especiales de la comunidad"
 
 #: templates/tough/unanswered.html:95
 msgid "number of <strong>unanswered</strong> questions"
-msgstr ""
+msgstr "número de respuestas <strong>sin responder</strong>"
 
 #~ msgid "Community gives you awards for your questions, answers and votes."
 #~ msgstr ""
-- 
cgit v1.2.3-1-g7c22


From faf167aed99ac4e28927f729b7c7bc94a47ef139 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 26 Jul 2009 22:33:56 -0400
Subject: merged in latest Mikes changes

---
 INSTALL                                        |   33 +
 LICENSE                                        |   20 +-
 context.py                                     |    9 +
 development.log                                |   30 +
 django_authopenid/models.py                    |    4 +-
 django_authopenid/util.py                      |    4 +-
 forum/management/commands/once_award_badges.py |   37 +-
 forum/managers.py                              |   55 +-
 forum/models.py                                |    3 +-
 forum/templatetags/extra_tags.py               |   20 +-
 forum/user.py                                  |    1 +
 forum/views.py                                 |  132 +-
 locale/zh_CN/LC_MESSAGES/django.po             |  629 ++++++
 middleware/pagesize.py                         |   29 +
 mikes.patch                                    | 2862 ++++++++++++++++++++++++
 settings.py                                    |   95 +-
 settings_local.py.dist                         |   25 +
 templates/base.html                            |    2 +-
 templates/base_content.html                    |    6 +-
 templates/content/js/com.cnprog.post.js        |    2 +-
 templates/content/js/com.cnprog.utils.js       |    2 +-
 templates/content/style/openid.css             |    2 +-
 templates/pagesize.html                        |    4 +-
 templates/question_retag.html                  |  109 +
 templates/user_preferences.html                |   15 +-
 urls.py                                        |    1 +
 26 files changed, 3946 insertions(+), 185 deletions(-)
 create mode 100644 INSTALL
 create mode 100644 context.py
 create mode 100644 development.log
 create mode 100644 locale/zh_CN/LC_MESSAGES/django.po
 create mode 100644 middleware/pagesize.py
 create mode 100644 mikes.patch
 create mode 100644 settings_local.py.dist
 create mode 100644 templates/question_retag.html

diff --git a/INSTALL b/INSTALL
new file mode 100644
index 00000000..59f2dd0b
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,33 @@
+PRE-REQUIREMENTS:
+-----------------------------------------------
+1. Python2.5, MySQL, Django v1.0+
+
+2. Python-openid v2.2
+http://openidenabled.com/python-openid/
+
+3. django-authopenid(Included in project already)
+http://code.google.com/p/django-authopenid/
+
+4. html5lib
+http://code.google.com/p/html5lib/
+Used for HTML sanitizer
+
+5. Markdown2
+http://code.google.com/p/python-markdown2/
+
+
+INSTALL STEPS:
+-----------------------------------------------
+1. Copy settings_local.py.dist to settings_local.py and 
+update all your settings. Check settings.py and update 
+it as well if necessory.
+
+2. Prepare your database by using the same database/account 
+configuration from above.
+
+3. Run "python manager.py runserver" to startup django 
+development environment.
+
+4. There are some demo scripts under sql_scripts folder, 
+including badges and test accounts for CNProg.com. You 
+don't need them to run your sample.
diff --git a/LICENSE b/LICENSE
index e23e4b67..cb24f678 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,12 +1,14 @@
-��Ȩ����(c) 2008 CNProg.com
+Copyright (C) 2009.  Chen Gang
 
-����2.0�汾Apache����֤("����֤")��Ȩ��
-���ݱ�����֤���û����Բ�ʹ�ô��ļ���
-�û��ɴ�������ַ�������֤������
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-http://www.apache.org/licenses/LICENSE-2.0
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-���������÷�����Ҫ������ͬ�⣬
-��������֤�ַ��������ǻ���"��ԭ��"�����ṩ��
-���κ���ʾ�Ļ�ʾ�ı�֤��������
-�����������֤�����£��ض����ԵĹ�ϽȨ�޺����ơ�
\ No newline at end of file
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/context.py b/context.py
new file mode 100644
index 00000000..f420b154
--- /dev/null
+++ b/context.py
@@ -0,0 +1,9 @@
+from django.conf import settings
+def application_settings(context):
+    return {
+        'APP_TITLE' : settings.APP_TITLE,
+        'APP_URL'   : settings.APP_URL,
+        'APP_KEYWORDS' : settings.APP_KEYWORDS,
+        'APP_DESCRIPTION' : settings.APP_DESCRIPTION,
+        'APP_INTRO' : settings.APP_INTRO
+        }
diff --git a/development.log b/development.log
new file mode 100644
index 00000000..7ad467e0
--- /dev/null
+++ b/development.log
@@ -0,0 +1,30 @@
+# development 
+
+==July 26 2009, Evgeny==
+
+django_authopenid:
+considerably changed user interface
+
+log/forum/forms.py:
+- added tag input validation using regex
+- fixed bug with date type mismatch near self.fields['birthday'] = 
+  in EditUserForm.__init__()
+
+/forum/templatetags/extra_tags.py:
+- fixed date type mismatch in get_age()
+
+/templates/content/js/com.cnprog.post.js:
+- fixed bug with post deletion/recovery
+
+javascript:
+- changed to use of non-minified code - better for editing 
+and debugging
+
+/templates/question.html:
+- fixed display of delete/undelete links
+
+templates:
+added comments in the beginning/end of each template
+for the debugging purposes - so that you know which template outputs what html
+<!-- user_favorites.html -->
+<!-- end user_favorites.html -->
diff --git a/django_authopenid/models.py b/django_authopenid/models.py
index 9826c452..e6fb8111 100644
--- a/django_authopenid/models.py
+++ b/django_authopenid/models.py
@@ -3,7 +3,7 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.db import models
 
-import md5, random, sys, os, time
+import hashlib, random, sys, os, time
 
 __all__ = ['Nonce', 'Association', 'UserAssociation', 
         'UserPasswordQueueManager', 'UserPasswordQueue']
@@ -47,7 +47,7 @@ class UserPasswordQueueManager(models.Manager):
         # The random module is seeded when this Apache child is created.
         # Use SECRET_KEY as added salt.
         while 1:
-            confirm_key = md5.new("%s%s%s%s" % (
+            confirm_key = hashlib.md5("%s%s%s%s" % (
                 random.randint(0, sys.maxint - 1), os.getpid(),
                 time.time(), settings.SECRET_KEY)).hexdigest()
             try:
diff --git a/django_authopenid/util.py b/django_authopenid/util.py
index 841a81c7..54c1246b 100644
--- a/django_authopenid/util.py
+++ b/django_authopenid/util.py
@@ -15,7 +15,7 @@ try:
 except:
     from yadis import xri
 
-import time, base64, md5, operator
+import time, base64, hashlib, operator
 import urllib
 
 from models import Association, Nonce
@@ -128,7 +128,7 @@ class DjangoOpenIDStore(OpenIDStore):
 
     def getAuthKey(self):
         # Use first AUTH_KEY_LEN characters of md5 hash of SECRET_KEY
-        return md5.new(settings.SECRET_KEY).hexdigest()[:self.AUTH_KEY_LEN]
+        return hashlib.md5(settings.SECRET_KEY).hexdigest()[:self.AUTH_KEY_LEN]
     
     def isDumb(self):
         return False
diff --git a/forum/management/commands/once_award_badges.py b/forum/management/commands/once_award_badges.py
index 011c28fd..c26251d7 100644
--- a/forum/management/commands/once_award_badges.py
+++ b/forum/management/commands/once_award_badges.py
@@ -157,7 +157,8 @@ class Command(BaseCommand):
         """
         activity_types = ','.join('%s' % item for item in BADGE_AWARD_TYPE_FIRST.keys())
         # ORDER BY user_id, activity_type
-        query = "SELECT id, user_id, activity_type, content_type_id, object_id FROM activity WHERE is_auditted = 0 AND activity_type IN (%s) ORDER BY user_id, activity_type" % activity_types
+        query = "SELECT id, user_id, activity_type, content_type_id, object_id "+
+            "FROM activity WHERE is_auditted = 0 AND activity_type IN (%s) ORDER BY user_id, activity_type" % activity_types
 
         cursor = connection.cursor()
         try:
@@ -205,7 +206,10 @@ class Command(BaseCommand):
 
         (13, '学生', 3, '学生', '第一次提问并且有一次以上赞成票', 0, 0),
         """
-        query = "SELECT act.user_id, q.vote_up_count, act.object_id FROM activity act, question q WHERE act.activity_type = %s AND act.object_id = q.id AND act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ASK_QUESTION, 13)
+        query = "SELECT act.user_id, q.vote_up_count, act.object_id FROM "+
+                    "activity act, question q WHERE act.activity_type = %s AND "+
+                    "act.object_id = q.id AND "+
+                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ASK_QUESTION, 13)
         cursor = connection.cursor()
         try:
             cursor.execute(query)
@@ -232,7 +236,10 @@ class Command(BaseCommand):
 
         (15, '教师', 3, '教师', '第一次回答问题并且得到一个以上赞成票', 0, 0),
         """
-        query = "SELECT act.user_id, a.vote_up_count, act.object_id FROM activity act, answer a WHERE act.activity_type = %s AND act.object_id = a.id AND act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 15)
+        query = "SELECT act.user_id, a.vote_up_count, act.object_id FROM "+
+                    "activity act, answer a WHERE act.activity_type = %s AND "+
+                    "act.object_id = a.id AND "+
+                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 15)
         cursor = connection.cursor()
         try:
             cursor.execute(query)
@@ -257,7 +264,11 @@ class Command(BaseCommand):
         """
         (32, '学问家', 2, '学问家', '第一次回答被投赞成票10次以上', 0, 0)
         """
-        query = "SELECT act.user_id, act.object_id FROM activity act, answer a WHERE act.object_id = a.id AND act.activity_type = %s AND a.vote_up_count >= 10 AND act.user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 32)
+        query = "SELECT act.user_id, act.object_id FROM "+
+                    "activity act, answer a WHERE act.object_id = a.id AND "+
+                    "act.activity_type = %s AND "+
+                    "a.vote_up_count >= 10 AND "+
+                    "act.user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 32)
         cursor = connection.cursor()
         try:
             cursor.execute(query)
@@ -281,7 +292,11 @@ class Command(BaseCommand):
         """
         (26, '优秀市民', 2, '优秀市民', '投票300次以上', 0, 0)
         """
-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 300" % (TYPE_ACTIVITY_VOTE_UP, TYPE_ACTIVITY_VOTE_DOWN, 26)
+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+
+                    "activity_type = %s OR "+
+                    "activity_type = %s AND "+
+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+
+                    "GROUP BY user_id HAVING vote_count >= 300" % (TYPE_ACTIVITY_VOTE_UP, TYPE_ACTIVITY_VOTE_DOWN, 26)
 
         self.__award_for_count_num(query, 26)
 
@@ -289,7 +304,11 @@ class Command(BaseCommand):
         """
         (27, '编辑主任', 2, '编辑主任', '编辑了100个帖子', 0, 0)
         """
-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 100" % (TYPE_ACTIVITY_UPDATE_QUESTION, TYPE_ACTIVITY_UPDATE_ANSWER, 27)
+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+
+                    "activity_type = %s OR "+
+                    "activity_type = %s AND "+
+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+
+                    "GROUP BY user_id HAVING vote_count >= 100" % (TYPE_ACTIVITY_UPDATE_QUESTION, TYPE_ACTIVITY_UPDATE_ANSWER, 27)
 
         self.__award_for_count_num(query, 27)
 
@@ -297,7 +316,11 @@ class Command(BaseCommand):
         """
         (5, '评论家', 3, '评论家', '评论10次以上', 0, 0),
         """
-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 10" % (TYPE_ACTIVITY_COMMENT_QUESTION, TYPE_ACTIVITY_COMMENT_ANSWER, 5)
+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+
+                    "activity_type = %s OR "+
+                    "activity_type = %s AND "+
+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+
+                    "GROUP BY user_id HAVING vote_count >= 10" % (TYPE_ACTIVITY_COMMENT_QUESTION, TYPE_ACTIVITY_COMMENT_ANSWER, 5)
         self.__award_for_count_num(query, 5)
 
     def __award_for_count_num(self, query, badge):
diff --git a/forum/managers.py b/forum/managers.py
index 94f58ea7..0f22c59c 100644
--- a/forum/managers.py
+++ b/forum/managers.py
@@ -4,8 +4,29 @@ from django.contrib.auth.models import User, UserManager
 from django.db import connection, models, transaction
 from django.db.models import Q
 from forum.models import *
+from urllib import quote, unquote
 
 class QuestionManager(models.Manager):
+    def get_translation_questions(self, orderby, page_size):
+        questions = self.filter(deleted=False, author__id__in=[28,29]).order_by(orderby)[:page_size]
+        return questions
+    
+    def get_questions_by_pagesize(self, orderby, page_size):
+        questions = self.filter(deleted=False).order_by(orderby)[:page_size]
+        return questions
+    
+    def get_questions_by_tag(self, tagname, orderby):
+        questions = self.filter(deleted=False, tags__name = unquote(tagname)).order_by(orderby)
+        return questions
+    
+    def get_unanswered_questions(self, orderby):
+        questions = self.filter(deleted=False, answer_count=0).order_by(orderby)
+        return questions
+    
+    def get_questions(self, orderby):
+        questions = self.filter(deleted=False).order_by(orderby)
+        return questions
+    
     def update_tags(self, question, tagnames, user):
         """
         Updates Tag associations for a question to match the given
@@ -92,7 +113,12 @@ class TagManager(models.Manager):
             'WHERE tag_id = tag.id'
         ') '
         'WHERE id IN (%s)')
-
+    
+    def get_valid_tags(self, page_size):
+      from forum.models import Tag
+      tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:page_size]
+      return tags
+    
     def get_or_create_multiple(self, names, user):
         """
         Fetches a list of Tags with the given names, creating any Tags
@@ -123,6 +149,19 @@ class TagManager(models.Manager):
         query = self.UPDATE_USED_COUNTS_QUERY % ','.join(['%s'] * len(tags))
         cursor.execute(query, [tag.id for tag in tags])
         transaction.commit_unless_managed()
+    
+    def get_tags_by_questions(self, questions):
+        question_ids = []
+        for question in questions:
+            question_ids.append(question.id)
+
+        question_ids_str = ','.join([str(id) for id in question_ids])
+        related_tags = self.extra(
+                tables=['tag', 'question_tags'],
+                where=["tag.id = question_tags.tag_id AND question_tags.question_id IN (" + question_ids_str + ")"]
+        ).distinct()
+        
+        return related_tags
 
 class AnswerManager(models.Manager):
     GET_ANSWERS_FROM_USER_QUESTIONS = u'SELECT answer.* FROM answer INNER JOIN question ON answer.question_id = question.id WHERE question.author_id =%s AND answer.author_id <> %s'
@@ -205,4 +244,16 @@ class ReputeManager(models.Manager):
             return row[0]
 
         else:
-            return 0    
\ No newline at end of file
+            return 0    
+class AwardManager(models.Manager):
+    def get_recent_awards(self):
+        awards = super(AwardManager, self).extra(
+            select={'badge_id': 'badge.id', 'badge_name':'badge.name',
+                          'badge_description': 'badge.description', 'badge_type': 'badge.type',
+                          'user_id': 'auth_user.id', 'user_name': 'auth_user.username'
+                          },
+            tables=['award', 'badge', 'auth_user'],
+            order_by=['-awarded_at'],
+            where=['auth_user.id=award.user_id AND badge_id=badge.id'],
+        ).values('badge_id', 'badge_name', 'badge_description', 'badge_type', 'user_id', 'user_name')
+        return awards
diff --git a/forum/models.py b/forum/models.py
index aba2bf0b..570db274 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -351,7 +351,8 @@ class Award(models.Model):
     content_object = generic.GenericForeignKey('content_type', 'object_id')
     awarded_at = models.DateTimeField(default=datetime.datetime.now)
     notified   = models.BooleanField(default=False)
-
+    objects = AwardManager()
+    
     def __unicode__(self):
         return u'[%s] is awarded a badge [%s] at %s' % (self.user.username, self.badge.name, self.awarded_at)
 
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index de853135..1a4d3641 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -1,4 +1,4 @@
-import time
+import time
 import datetime
 import math
 import re
@@ -50,10 +50,10 @@ def tag_font_size(max_size, min_size, current_size):
         weight = 0
     return MIN_FONTSIZE + round((MAX_FONTSIZE - MIN_FONTSIZE) * weight)
 
-    
+
 LEADING_PAGE_RANGE_DISPLAYED = TRAILING_PAGE_RANGE_DISPLAYED = 5
 LEADING_PAGE_RANGE = TRAILING_PAGE_RANGE = 4
-NUM_PAGES_OUTSIDE_RANGE = 1 
+NUM_PAGES_OUTSIDE_RANGE = 1
 ADJACENT_PAGES = 2
 @register.inclusion_tag("paginator.html")
 def cnprog_paginator(context):
@@ -65,10 +65,10 @@ def cnprog_paginator(context):
         " Initialize variables "
         in_leading_range = in_trailing_range = False
         pages_outside_leading_range = pages_outside_trailing_range = range(0)
- 
+
         if (context["pages"] <= LEADING_PAGE_RANGE_DISPLAYED):
             in_leading_range = in_trailing_range = True
-            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]           
+            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
         elif (context["page"] <= LEADING_PAGE_RANGE):
             in_leading_range = True
             page_numbers = [n for n in range(1, LEADING_PAGE_RANGE_DISPLAYED + 1) if n > 0 and n <= context["pages"]]
@@ -77,11 +77,11 @@ def cnprog_paginator(context):
             in_trailing_range = True
             page_numbers = [n for n in range(context["pages"] - TRAILING_PAGE_RANGE_DISPLAYED + 1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
             pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
-        else: 
+        else:
             page_numbers = [n for n in range(context["page"] - ADJACENT_PAGES, context["page"] + ADJACENT_PAGES + 1) if n > 0 and n <= context["pages"]]
             pages_outside_leading_range = [n + context["pages"] for n in range(0, -NUM_PAGES_OUTSIDE_RANGE, -1)]
             pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
-            
+
         extend_url = context.get('extend_url', '')
         return {
             "base_url": context["base_url"],
@@ -205,12 +205,12 @@ def format_number(value):
         m = re.match(pattern, strValue)
     return first + result
 
-@register.simple_tag   
+@register.simple_tag
 def convert2tagname_list(question):
     question['tagnames'] = [name for name in question['tagnames'].split(u' ')]
     return ''
 
-@register.simple_tag    
+@register.simple_tag
 def diff_date(date, limen=2):
     current_time = datetime.datetime(*time.localtime()[0:6])
     diff = current_time - date
@@ -237,4 +237,4 @@ def get_latest_changed_timestamp():
         timestr = strftime("%H:%M %b-%d-%Y %Z", localtime(latest))
     except:
         timestr = ''
-    return timestr
+    return timestr
\ No newline at end of file
diff --git a/forum/user.py b/forum/user.py
index 13e9be30..233baf0c 100644
--- a/forum/user.py
+++ b/forum/user.py
@@ -1,3 +1,4 @@
+# coding=utf-8
 from django.utils.translation import ugettext as _
 class UserView:
     def __init__(self, id, tab_title, tab_description, page_title, view_name, template_file, data_size=0):
diff --git a/forum/views.py b/forum/views.py
index 25574e0b..08a0e958 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -77,29 +77,17 @@ def index(request):
         orderby = "-last_activity_at"
     # group questions by author_id of 28,29
     if view_id == 'trans':
-        questions = Question.objects.filter(deleted=False, author__id__in=[28,29]).order_by(orderby)[:INDEX_PAGE_SIZE]
+        questions = Question.objects.get_translation_questions(orderby, INDEX_PAGE_SIZE)
     else:
-        questions = Question.objects.filter(deleted=False).order_by(orderby)[:INDEX_PAGE_SIZE]
+        questions = Question.objects.get_questions_by_pagesize(orderby, INDEX_PAGE_SIZE)
     # RISK - inner join queries
-    questions = questions.select_related();
-    tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:INDEX_TAGS_SIZE]
+    questions = questions.select_related()
+    tags = Tag.objects.get_valid_tags(INDEX_TAGS_SIZE)
 
-    awards = Award.objects.extra(
-        select={'badge_id': 'badge.id', 'badge_name':'badge.name',
-                      'badge_description': 'badge.description', 'badge_type': 'badge.type',
-                      'user_id': 'auth_user.id', 'user_name': 'auth_user.username'
-                      },
-        tables=['award', 'badge', 'auth_user'],
-        order_by=['-awarded_at'],
-        where=['auth_user.id=award.user_id AND badge_id=badge.id'],
-    ).values('badge_id', 'badge_name', 'badge_description', 'badge_type', 'user_id', 'user_name')
-
-    class testvar:
-        content = 'haha'
+    awards = Award.objects.get_recent_awards()
 
     return render_to_response('index.html', {
         "questions" : questions,
-        'testvar':testvar,
         "tab_id" : view_id,
         "tags" : tags,
         "awards" : awards[:INDEX_AWARD_SIZE],
@@ -127,29 +115,11 @@ def questions(request, tagname=None, unanswered=False):
     # Set flag to False by default. If it is equal to True, then need to be saved.
     pagesize_changed = False
     # get pagesize from session, if failed then get default value
-    user_page_size = request.session.get("pagesize", QUESTIONS_PAGE_SIZE)
-    # set pagesize equal to logon user specified value in database
-    if request.user.is_authenticated() and request.user.questions_per_page > 0:
-        user_page_size = request.user.questions_per_page
-
+    pagesize = request.session.get("pagesize")
     try:
         page = int(request.GET.get('page', '1'))
-        # get new pagesize from UI selection
-        pagesize = int(request.GET.get('pagesize', user_page_size))
-        if pagesize <> user_page_size:
-            pagesize_changed = True
-
     except ValueError:
         page = 1
-        pagesize  = user_page_size
-
-    # save this pagesize to user database
-    if pagesize_changed:
-        request.session["pagesize"] = pagesize
-        if request.user.is_authenticated():
-            user = request.user
-            user.questions_per_page = pagesize
-            user.save()
 
     view_id = request.GET.get('sort', None)
     view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
@@ -161,29 +131,24 @@ def questions(request, tagname=None, unanswered=False):
 
     # check if request is from tagged questions
     if tagname is not None:
-        #print datetime.datetime.now()
-        objects = Question.objects.filter(deleted=False, tags__name = unquote(tagname)).order_by(orderby)
-        #print datetime.datetime.now()
+        objects = Question.objects.get_questions_by_tag(tagname, orderby)
     elif unanswered:
         #check if request is from unanswered questions
         template_file = "unanswered.html"
-        objects = Question.objects.filter(deleted=False, answer_count=0).order_by(orderby)
+        objects = Question.objects.get_unanswered_questions(orderby)
     else:
-        objects = Question.objects.filter(deleted=False).order_by(orderby)
+        objects = Question.objects.get_questions(orderby)
 
     # RISK - inner join queries
-    objects = objects.select_related();
+    objects = objects.select_related(depth=1);
     objects_list = Paginator(objects, pagesize)
     questions = objects_list.page(page)
 
     # Get related tags from this page objects
-    related_tags = []
-    for question in questions.object_list:
-        tags = list(question.tags.all())
-        for tag in tags:
-            if tag not in related_tags:
-                related_tags.append(tag)
-
+    if questions.object_list.count() > 0:
+        related_tags = Tag.objects.get_tags_by_questions(questions.object_list)
+    else:
+        related_tags = None
     return render_to_response(template_file, {
         "questions" : questions,
         "tab_id" : view_id,
@@ -1022,6 +987,7 @@ def user_stats(request, user_id, user_view):
                         'title',
                         'author_id',
                         'accepted',
+                        'vote_count',
                         'answer_count',
                         'vote_up_count',
                         'vote_down_count')[:100]
@@ -1090,7 +1056,8 @@ def user_recent(request, user_id, user_view):
             'activity_type' : 'activity.activity_type'
             },
         tables=['activity', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = question.id AND activity.user_id = %s AND activity.activity_type = %s'],
+        where=['activity.content_type_id = %s AND activity.object_id = ' +
+            'question.id AND activity.user_id = %s AND activity.activity_type = %s'],
         params=[question_type_id, user_id, TYPE_ACTIVITY_ASK_QUESTION],
         order_by=['-activity.active_at']
     ).values(
@@ -1114,8 +1081,8 @@ def user_recent(request, user_id, user_view):
             'activity_type' : 'activity.activity_type'
             },
         tables=['activity', 'answer', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = answer.id '
-			     'AND answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
+        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' + 
+            'answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
         params=[answer_type_id, user_id, TYPE_ACTIVITY_ANSWER],
         order_by=['-activity.active_at']
     ).values(
@@ -1140,7 +1107,9 @@ def user_recent(request, user_id, user_view):
             },
         tables=['activity', 'question', 'comment'],
 
-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND activity.user_id = comment.user_id AND comment.object_id=question.id AND comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
+        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
+            'activity.user_id = comment.user_id AND comment.object_id=question.id AND '+
+            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
         params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],
         order_by=['-comment.added_at']
     ).values(
@@ -1166,7 +1135,10 @@ def user_recent(request, user_id, user_view):
             },
         tables=['activity', 'question', 'answer', 'comment'],
 
-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND activity.user_id = comment.user_id AND comment.object_id=answer.id AND comment.content_type_id=%s AND question.id = answer.question_id AND activity.user_id = %s AND activity.activity_type=%s'],
+        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
+            'activity.user_id = comment.user_id AND comment.object_id=answer.id AND '+
+            'comment.content_type_id=%s AND question.id = answer.question_id AND '+
+            'activity.user_id = %s AND activity.activity_type=%s'],
         params=[comment_type_id, answer_type_id, user_id, TYPE_ACTIVITY_COMMENT_ANSWER],
         order_by=['-comment.added_at']
     ).values(
@@ -1192,7 +1164,9 @@ def user_recent(request, user_id, user_view):
             'summary' : 'question_revision.summary'
             },
         tables=['activity', 'question_revision'],
-        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND activity.user_id = question_revision.author_id AND activity.user_id = %s AND activity.activity_type=%s'],
+        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND '+
+            'activity.user_id = question_revision.author_id AND activity.user_id = %s AND '+
+            'activity.activity_type=%s'],
         params=[question_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_QUESTION],
         order_by=['-activity.active_at']
     ).values(
@@ -1220,7 +1194,10 @@ def user_recent(request, user_id, user_view):
             },
         tables=['activity', 'answer_revision', 'question', 'answer'],
 
-        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND activity.user_id = answer_revision.author_id AND activity.user_id = %s AND answer_revision.answer_id=answer.id AND answer.question_id = question.id AND activity.activity_type=%s'],
+        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND '+
+            'activity.user_id = answer_revision.author_id AND activity.user_id = %s AND '+
+            'answer_revision.answer_id=answer.id AND answer.question_id = question.id AND '+
+            'activity.activity_type=%s'],
         params=[answer_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_ANSWER],
         order_by=['-activity.active_at']
     ).values(
@@ -1246,7 +1223,9 @@ def user_recent(request, user_id, user_view):
             'activity_type' : 'activity.activity_type',
             },
         tables=['activity', 'answer', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND activity.user_id = question.author_id AND activity.user_id = %s AND answer.question_id=question.id AND activity.activity_type=%s'],
+        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND '+
+            'activity.user_id = question.author_id AND activity.user_id = %s AND '+
+            'answer.question_id=question.id AND activity.activity_type=%s'],
         params=[answer_type_id, user_id, TYPE_ACTIVITY_MARK_ANSWER],
         order_by=['-activity.active_at']
     ).values(
@@ -1267,7 +1246,8 @@ def user_recent(request, user_id, user_view):
             'activity_type' : 'activity.activity_type'
             },
         tables=['activity', 'award', 'badge'],
-        where=['activity.user_id = award.user_id AND activity.user_id = %s AND award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
+        where=['activity.user_id = award.user_id AND activity.user_id = %s AND '+
+            'award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
         params=[user_id, TYPE_ACTIVITY_PRIZE],
         order_by=['-activity.active_at']
     ).values(
@@ -1320,7 +1300,8 @@ def user_responses(request, user_id, user_view):
             },
         select_params=[user_id],
         tables=['answer', 'question', 'auth_user'],
-        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
+        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
+            'question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
         params=[user_id, user_id],
         order_by=['-answer.id']
     ).values(
@@ -1349,7 +1330,8 @@ def user_responses(request, user_id, user_view):
             'user_id' : 'auth_user.id'
             },
         tables=['question', 'auth_user', 'comment'],
-        where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
+        where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND '+
+            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
         params=[user_id, question_type_id, user_id],
         order_by=['-comment.added_at']
     ).values(
@@ -1378,7 +1360,9 @@ def user_responses(request, user_id, user_view):
             'user_id' : 'auth_user.id'
             },
         tables=['answer', 'auth_user', 'comment', 'question'],
-        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id AND question.id = answer.question_id'],
+        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND '+
+            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id '+
+            'AND question.id = answer.question_id'],
         params=[user_id, answer_type_id, user_id],
         order_by=['-comment.added_at']
     ).values(
@@ -1409,7 +1393,8 @@ def user_responses(request, user_id, user_view):
             },
         select_params=[user_id],
         tables=['answer', 'question', 'auth_user'],
-        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
+        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
+            'answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
         params=[user_id],
         order_by=['-answer.id']
     ).values(
@@ -1453,7 +1438,8 @@ def user_votes(request, user_id, user_view):
             },
         select_params=[user_id],
         tables=['vote', 'question', 'auth_user'],
-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id AND vote.user_id=auth_user.id'],
+        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id '+
+            'AND vote.user_id=auth_user.id'],
         params=[question_type_id, user_id],
         order_by=['-vote.id']
     ).values(
@@ -1476,7 +1462,8 @@ def user_votes(request, user_id, user_view):
             },
         select_params=[user_id],
         tables=['vote', 'answer', 'question', 'auth_user'],
-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
+        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id '+
+            'AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
         params=[answer_type_id, user_id],
         order_by=['-vote.id']
     ).values(
@@ -1501,7 +1488,8 @@ def user_votes(request, user_id, user_view):
 def user_reputation(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
     reputation = Repute.objects.extra(
-        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 'title': 'question.title'},
+        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 
+            'title': 'question.title'},
         tables=['repute', 'question'],
         order_by=['-reputed_at'],
         where=['user_id=%s AND question_id=question.id'],
@@ -1510,6 +1498,7 @@ def user_reputation(request, user_id, user_view):
 
     reputation.query.group_by = ['question_id']
 
+
     rep_list = []
     for rep in Repute.objects.filter(user=user).order_by('reputed_at'):
         dic = '[%s,%s]' % (calendar.timegm(rep.reputed_at.timetuple()) * 1000, rep.reputation)
@@ -1531,7 +1520,8 @@ def user_favorites(request, user_id, user_view):
     questions = Question.objects.extra(
         select={
             'vote_count' : 'question.vote_up_count + question.vote_down_count',
-            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s AND f.question_id = question.id',
+            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s '+
+                'AND f.question_id = question.id',
             'la_user_id' : 'auth_user.id',
             'la_username' : 'auth_user.username',
             'la_user_gold' : 'auth_user.gold',
@@ -1541,7 +1531,8 @@ def user_favorites(request, user_id, user_view):
             },
         select_params=[user_id],
         tables=['question', 'auth_user', 'favorite_question'],
-        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
+        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id '+
+            'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
         params=[user_id],
         order_by=['-vote_count', '-question.id']
     ).values('vote_count',
@@ -1672,7 +1663,12 @@ def badges(request):
 def badge(request, id):
     badge = get_object_or_404(Badge, id=id)
     awards = Award.objects.extra(
-        select={'id': 'auth_user.id', 'name': 'auth_user.username', 'rep':'auth_user.reputation', 'gold': 'auth_user.gold', 'silver': 'auth_user.silver', 'bronze': 'auth_user.bronze'},
+        select={'id': 'auth_user.id', 
+                'name': 'auth_user.username', 
+                'rep':'auth_user.reputation', 
+                'gold': 'auth_user.gold', 
+                'silver': 'auth_user.silver', 
+                'bronze': 'auth_user.bronze'},
         tables=['award', 'auth_user'],
         where=['badge_id=%s AND user_id=auth_user.id'],
         params=[id]
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
new file mode 100644
index 00000000..176e41dc
--- /dev/null
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -0,0 +1,629 @@
+# Chinese translations for CNProg.com
+# Copyright (C) 2009
+# This file is distributed under the same license as the CNPROG package.
+# Mike Chen <chagel@gmail.com>, 2009.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-15 13:53+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: settings.py:12
+msgid "account/"
+msgstr ""
+
+#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:11
+msgid "signin/"
+msgstr ""
+
+#: django_authopenid/forms.py:67 django_authopenid/views.py:93
+msgid "i-names are not supported"
+msgstr "i-names不支持。"
+
+#: django_authopenid/forms.py:102 django_authopenid/forms.py:207
+msgid ""
+"Usernames can only contain                     letters, numbers and "
+"underscores"
+msgstr "用户名格式有误。只有字母，数字和下划线是允许的。"
+
+#: django_authopenid/forms.py:109
+msgid ""
+"This username does not exist                     in our database. Please "
+"choose another."
+msgstr "用户名不存在。请重新输入。"
+
+#: django_authopenid/forms.py:126 django_authopenid/forms.py:231
+msgid ""
+"Please enter a valid                     username and password. Note that "
+"both fields are                     case-sensitive."
+msgstr "请输入用户名和密码。注意区分大小写。"
+
+#: django_authopenid/forms.py:130 django_authopenid/forms.py:235
+msgid "This account is inactive."
+msgstr "用户已冻结。"
+
+#: django_authopenid/forms.py:184
+msgid ""
+"This email is already                 registered in our database. Please "
+"choose another."
+msgstr "电子邮件已被注册。请使用一个新的邮件地址。"
+
+#: django_authopenid/forms.py:214
+msgid ""
+"This username don't exist.                         Please choose another."
+msgstr "用户名不存在"
+
+#: django_authopenid/forms.py:330
+msgid ""
+"Old password is incorrect.                     Please enter the correct "
+"password."
+msgstr "旧密码错误。"
+
+#: django_authopenid/forms.py:342
+msgid "new passwords do not match"
+msgstr "新密码不匹配"
+
+#: django_authopenid/forms.py:434
+msgid "Incorrect username."
+msgstr "用户名不正确"
+
+#: django_authopenid/urls.py:10
+msgid "signout/"
+msgstr ""
+
+#: django_authopenid/urls.py:11
+msgid "complete/"
+msgstr ""
+
+#: django_authopenid/urls.py:13
+msgid "register/"
+msgstr ""
+
+#: django_authopenid/urls.py:14
+msgid "signup/"
+msgstr ""
+
+#: django_authopenid/urls.py:16
+msgid "sendpw/"
+msgstr ""
+
+#: django_authopenid/urls.py:26
+msgid "delete/"
+msgstr ""
+
+#: django_authopenid/views.py:99
+#, python-format
+msgid "非法OpenID地址： %s"
+msgstr ""
+
+#: django_authopenid/views.py:366 templates/index.html:78
+msgid "Welcome"
+msgstr "欢迎"
+
+#: django_authopenid/views.py:456
+msgid "Password changed."
+msgstr "密码已更新。"
+
+#: django_authopenid/views.py:488
+msgid "Email changed."
+msgstr "邮件地址已更新。"
+
+#: django_authopenid/views.py:519 django_authopenid/views.py:671
+#, python-format
+msgid "No OpenID %s found associated in our database"
+msgstr "该OpenID %s 不在系统中。"
+
+#: django_authopenid/views.py:523 django_authopenid/views.py:678
+#, python-format
+msgid "The OpenID %s isn't associated to current user logged in"
+msgstr "OpenID %s 没有和当前登录用户绑定。"
+
+#: django_authopenid/views.py:531
+msgid "Email Changed."
+msgstr "邮件地址已更新。"
+
+#: django_authopenid/views.py:606
+msgid "This OpenID is already associated with another account."
+msgstr "这个OpenID已经绑定到另外一个帐号。"
+
+#: django_authopenid/views.py:611
+#, python-format
+msgid "OpenID %s is now associated with your account."
+msgstr "OpenID %s 已经绑定到您的帐号。"
+
+#: django_authopenid/views.py:681
+msgid "Account deleted."
+msgstr "帐号已删除。"
+
+#: django_authopenid/views.py:721
+msgid "Request for new password"
+msgstr "找回密码"
+
+#: django_authopenid/views.py:734
+msgid "A new password has been sent to your email address."
+msgstr "新的密码已经发送到您的邮件帐号。"
+
+#: django_authopenid/views.py:764
+#, python-format
+msgid ""
+"Could not change password. Confirmation key '%s'                is not "
+"registered."
+msgstr "不能修改密码。确认信息 '%s' 有误。"
+
+#: django_authopenid/views.py:773
+msgid ""
+"Can not change password. User don't exist anymore                 in our "
+"database."
+msgstr "不能修改密码。用户帐号不存在。"
+
+#: django_authopenid/views.py:782
+#, python-format
+msgid "Password changed for %s. You may now sign in."
+msgstr "帐号 %s 的密码已经修改。您现在可以用它来登录。"
+
+#: forum/user.py:17
+msgid "Overview"
+msgstr "概览"
+
+#: forum/user.py:18
+msgid "User overview"
+msgstr "用户概览"
+
+#: forum/user.py:19
+msgid "Overview - User Profile"
+msgstr "概览-用户资料"
+
+#: forum/user.py:25
+msgid "Recent"
+msgstr "最近活动"
+
+#: forum/user.py:26
+msgid "Recent activities"
+msgstr "用户最近活动情况"
+
+#: forum/user.py:27
+msgid "Recent - User Profile"
+msgstr "最近活动-用户资料"
+
+#: forum/user.py:34
+msgid "Response"
+msgstr "回应"
+
+#: forum/user.py:35
+msgid "Responses from others"
+msgstr "其他用户的回答和评论"
+
+#: forum/user.py:36
+msgid "Response - User Profile"
+msgstr "回应-用户资料"
+
+#: forum/user.py:43
+msgid "Reputation"
+msgstr "积分"
+
+#: forum/user.py:44
+msgid "Community reputation"
+msgstr "社区积分"
+
+#: forum/user.py:45
+msgid "Reputation - User Profile"
+msgstr "积分-用户资料"
+
+#: forum/user.py:51
+msgid "Favorites"
+msgstr "收藏"
+
+#: forum/user.py:52
+msgid "User's favorite questions"
+msgstr "用户收藏的问题"
+
+#: forum/user.py:53
+msgid "Favorites - User Profile"
+msgstr "收藏-用户资料"
+
+#: forum/user.py:60 templates/index.html:46 templates/questions.html:45
+msgid "Votes"
+msgstr "投票"
+
+#: forum/user.py:61
+msgid "Votes history"
+msgstr "用户投票历史"
+
+#: forum/user.py:62
+msgid "Votes - User Profile"
+msgstr "投票-用户资料"
+
+#: forum/user.py:69
+msgid "Preferences"
+msgstr "设置"
+
+#: forum/user.py:70
+msgid "User preferences"
+msgstr "用户参数设置"
+
+#: forum/user.py:71
+msgid "Preferences - User Profile"
+msgstr "设置-用户资料"
+
+#: templates/badges.html:5 templates/badges.html.py:16
+#: templates/header.html:31
+msgid "Badges"
+msgstr "奖牌榜"
+
+#: templates/base.html:53 templates/base_content.html:52
+msgid "Congratulations! You have new badges: "
+msgstr "恭喜您被授予奖牌："
+
+#: templates/base.html:54 templates/base_content.html:53
+msgid "go to see"
+msgstr "查看"
+
+#: templates/base.html:55 templates/base_content.html:54
+#: templates/header.html:35
+msgid "Profile"
+msgstr "我的资料"
+
+#: templates/footer.html:5 templates/header.html:10 templates/index.html:81
+msgid "About us"
+msgstr "关于我们"
+
+#: templates/footer.html:6 templates/header.html:11
+msgid "faq"
+msgstr "常见问题"
+
+#: templates/footer.html:8
+msgid "Contact"
+msgstr "联系我们"
+
+#: templates/footer.html:9
+msgid "Privacy"
+msgstr "隐私政策"
+
+#: templates/footer.html:10
+msgid "Feedback"
+msgstr "用户反馈"
+
+#: templates/header.html:6 templates/logout.html:5 templates/logout.html.py:16
+msgid "Logout"
+msgstr "退出登录"
+
+#: templates/header.html:8
+msgid "Login"
+msgstr "登录"
+
+#: templates/header.html:21
+msgid "link to homepage"
+msgstr "返回首页"
+
+#: templates/header.html:27 templates/header.html.py:56
+#: templates/index.html:21
+msgid "Questions"
+msgstr "问题"
+
+#: templates/header.html:28 templates/header.html.py:57
+msgid "Tags"
+msgstr "标签"
+
+#: templates/header.html:29 templates/header.html.py:58
+msgid "Users"
+msgstr "用户"
+
+#: templates/header.html:30
+msgid "Books"
+msgstr "读书"
+
+#: templates/header.html:32
+msgid "Unanswered"
+msgstr "没有回答的问题"
+
+#: templates/header.html:38
+msgid "Ask a question"
+msgstr "我要提问"
+
+#: templates/header.html:53
+msgid "Search"
+msgstr "搜索"
+
+#: templates/index.html:6
+msgid "Home"
+msgstr "首页"
+
+#: templates/index.html:23 templates/questions.html:25
+msgid "Newest updated questions"
+msgstr "最新更新的问题"
+
+#: templates/index.html:23 templates/questions.html:24
+msgid "Newest"
+msgstr "最新问题"
+
+#: templates/index.html:24 templates/questions.html:26
+msgid "Questions with most answers"
+msgstr "被回复最多的问题"
+
+#: templates/index.html:24 templates/questions.html:26
+msgid "Hottest"
+msgstr "最热问题"
+
+#: templates/index.html:25 templates/questions.html:27
+msgid "Questions with most votes"
+msgstr "被投票最多的问题"
+
+#: templates/index.html:25 templates/questions.html:27
+msgid "Best"
+msgstr "最有价值问题"
+
+#: templates/index.html:26 templates/index.html.py:118
+#: templates/questions.html:22
+msgid "All questions"
+msgstr "所有问题"
+
+#: templates/index.html:26
+msgid "All"
+msgstr "所有问题"
+
+#: templates/index.html:45 templates/questions.html:44
+msgid "Answers"
+msgstr "回答"
+
+#: templates/index.html:47 templates/questions.html:46
+msgid "Visits"
+msgstr "访问"
+
+#: templates/index.html:55 templates/questions.html:57
+#: templates/questions.html.py:69
+msgid "Community wiki"
+msgstr "社区wiki"
+
+#: templates/index.html:67 templates/index.html.py:91
+#: templates/questions.html:83
+msgid "Browse questions with tag of "
+msgstr "查看所有以下主题问题："
+
+#: templates/index.html:87
+msgid "Recent tags"
+msgstr "最新标签"
+
+#: templates/index.html:94 templates/index.html.py:118
+msgid "Popular tags"
+msgstr "受欢迎的标签"
+
+#: templates/index.html:98
+msgid "Recent badges"
+msgstr "最新奖牌"
+
+#: templates/index.html:109
+msgid "All badges"
+msgstr "所有奖牌"
+
+#: templates/index.html:113
+msgid "RSS feed of recent 30 questions"
+msgstr "RSS订阅最新30个问题"
+
+#: templates/index.html:113
+msgid "Subscribe"
+msgstr "订阅最新问题"
+
+#: templates/index.html:118
+msgid "Are you looking for more questions? Try to browse"
+msgstr "在寻找更多问题吗？请查阅"
+
+#: templates/index.html:118
+msgid " or "
+msgstr " 或者 "
+
+#: templates/index.html:118
+msgid ". Please help us answer "
+msgstr "。请帮助我们回答"
+
+#: templates/index.html:118
+msgid "Unanswered questions"
+msgstr "没有回答的问题"
+
+#: templates/pagesize.html:5
+msgid "Size per page:"
+msgstr "每页显示："
+
+#: templates/paginator.html:5
+msgid "Previous"
+msgstr "上一页"
+
+#: templates/questions.html:6
+msgid "Question list"
+msgstr "问题列表"
+
+#: templates/questions.html:22
+msgid "Tagged questions"
+msgstr "标签问题"
+
+#: templates/questions.html:22
+msgid "Query result"
+msgstr "查询结果"
+
+#: templates/questions.html:24
+msgid "New questions"
+msgstr "最新问题"
+
+#: templates/questions.html:25
+msgid "Active"
+msgstr "活跃问题"
+
+#: templates/questions.html:125
+msgid "Related tags"
+msgstr "相关标签"
+
+#: templates/authopenid/changeemail.html:10
+msgid "Account: change email"
+msgstr "修改电子邮件"
+
+#: templates/authopenid/changeemail.html:13
+msgid ""
+"This is where you can change the email address associated with your account. "
+"Please keep this email address up to date so we can send you a password-"
+"reset email if you request one."
+msgstr ""
+"您可以在这里修改您的电子邮件，请确保这个邮件地址有效-找回密码将发送新密码到您"
+"的邮件地址。"
+
+#: templates/authopenid/changeemail.html:15
+#: templates/authopenid/changeopenid.html:13
+#: templates/authopenid/changepw.html:18 templates/authopenid/delete.html:14
+#: templates/authopenid/delete.html:24
+msgid "Please correct errors below:"
+msgstr "请改正以下错误："
+
+#: templates/authopenid/changeemail.html:32
+msgid "Email"
+msgstr "电子邮件"
+
+#: templates/authopenid/changeemail.html:33
+msgid "Password"
+msgstr "密码"
+
+#: templates/authopenid/changeemail.html:35
+msgid "Change email"
+msgstr "修改电子邮件"
+
+#: templates/authopenid/changeopenid.html:7
+msgid "Account: change OpenID URL"
+msgstr "修改OpenID地址"
+
+#: templates/authopenid/changeopenid.html:11
+msgid ""
+"This is where you can change your OpenID URL. Make sure you remember it!"
+msgstr "请修改您的OpenID地址，请不要忘记这个地址！"
+
+#: templates/authopenid/changeopenid.html:28
+msgid "OpenID URL:"
+msgstr "OpenID地址："
+
+#: templates/authopenid/changeopenid.html:29
+msgid "Change OpenID"
+msgstr "修改OpenID"
+
+#: templates/authopenid/changepw.html:13
+msgid "Account: change password"
+msgstr "修改密码"
+
+#: templates/authopenid/changepw.html:16
+msgid "This is where you can change your password. Make sure you remember it!"
+msgstr "请修改您的密码，切记不要忘记！"
+
+#: templates/authopenid/changepw.html:26
+msgid "Current password"
+msgstr "旧密码"
+
+#: templates/authopenid/changepw.html:27
+msgid "New password"
+msgstr "新密码"
+
+#: templates/authopenid/changepw.html:28
+msgid "New password again"
+msgstr "重复密码"
+
+#: templates/authopenid/changepw.html:29
+msgid "Change password"
+msgstr "修改密码"
+
+#: templates/authopenid/delete.html:8
+msgid "Account: delete account"
+msgstr "删除帐号"
+
+#: templates/authopenid/delete.html:12
+msgid ""
+"Note: After deleting your account, anyone will be able to register this "
+"username."
+msgstr "注意：删除您的帐号后，任何其他人可以再注册这个帐号。"
+
+#: templates/authopenid/delete.html:16
+msgid "Check confirm box, if you want delete your account."
+msgstr "如果确定删除，请选中多选框。"
+
+#: templates/authopenid/delete.html:19
+msgid "Password:"
+msgstr "密码："
+
+#: templates/authopenid/delete.html:31
+msgid "I am sure I want to delete my account."
+msgstr "我确认要删除这个帐号。"
+
+#: templates/authopenid/delete.html:32
+msgid "Password/OpenID URL"
+msgstr "密码/OpenID地址"
+
+#: templates/authopenid/delete.html:32
+msgid "(required for your security)"
+msgstr "（必需）"
+
+#: templates/authopenid/delete.html:34
+msgid "Delete account permanently"
+msgstr "永久删除帐号"
+
+#: templates/authopenid/settings.html:29
+msgid "Give your  account a new password."
+msgstr "修改密码"
+
+#: templates/authopenid/settings.html:31
+msgid "Add or update the email address associated with your account."
+msgstr "添加或者更新您的邮件地址。"
+
+#: templates/authopenid/settings.html:34
+msgid "Change openid associated to your account"
+msgstr "修改和你帐号绑定的OpenID地址"
+
+#: templates/authopenid/settings.html:38
+msgid "Erase your username and all your data from website"
+msgstr "删除您的帐号和所有内容"
+
+#, fuzzy
+#~ msgid "Badges "
+#~ msgstr "奖牌列表"
+
+#~ msgid ""
+#~ "This username is already                 taken. Please choose another."
+#~ msgstr "用户名已经被注册，请选用一个新的帐号。"
+
+#~ msgid "Your OpenID is verified! "
+#~ msgstr "您的OpenID帐号已经验证通过"
+
+#~ msgid "Associate your OpenID"
+#~ msgstr "绑定您的OpenID"
+
+#~ msgid ""
+#~ "\n"
+#~ "\t<p>If you're joining <strong>Sitename</strong>, associate your OpenID "
+#~ "with a new account. If you're already a member, associate with your "
+#~ "existing account.</p>\n"
+#~ "\t"
+#~ msgstr ""
+#~ "\n"
+#~ "\t<p>输入您的新帐号或者指定已经存在的帐号。</p>\n"
+#~ "\t"
+
+#~ msgid "A new account"
+#~ msgstr "新帐号"
+
+#~ msgid "An exisiting account"
+#~ msgstr "已经存在的帐号"
+
+#~ msgid "Account: Send a new password"
+#~ msgstr "发送一个新的密码"
+
+#~ msgid ""
+#~ "Lost your password ? Here you can ask to reset your password. Enter the "
+#~ "username you use  and you will get a confirmation email with your new "
+#~ "password. This new password will be activated only after you have clicked "
+#~ "on the link in the email."
+#~ msgstr ""
+#~ "丢失了您的密码？你可以在这里重设密码。输入用户名你会收到新的密码的邮件。密"
+#~ "码只有您在激活邮件中的链接才会被激活。"
+
+#~ msgid "Send new password"
+#~ msgstr "发送新密码"
diff --git a/middleware/pagesize.py b/middleware/pagesize.py
new file mode 100644
index 00000000..bb6c7aa3
--- /dev/null
+++ b/middleware/pagesize.py
@@ -0,0 +1,29 @@
+# used in questions
+QUESTIONS_PAGE_SIZE = 10
+class QuestionsPageSizeMiddleware(object):
+    def process_request(self, request):
+        # Set flag to False by default. If it is equal to True, then need to be saved.
+        pagesize_changed = False
+        # get pagesize from session, if failed then get default value
+        user_page_size = request.session.get("pagesize", QUESTIONS_PAGE_SIZE)
+        # set pagesize equal to logon user specified value in database
+        if request.user.is_authenticated() and request.user.questions_per_page > 0:
+            user_page_size = request.user.questions_per_page
+
+        try:
+            # get new pagesize from UI selection
+            pagesize = int(request.GET.get('pagesize', user_page_size))
+            if pagesize <> user_page_size:
+                pagesize_changed = True
+
+        except ValueError:
+            pagesize  = user_page_size
+        
+        # save this pagesize to user database
+        if pagesize_changed:
+            if request.user.is_authenticated():
+                user = request.user
+                user.questions_per_page = pagesize
+                user.save()
+        # put pagesize into session
+        request.session["pagesize"] = pagesize
\ No newline at end of file
diff --git a/mikes.patch b/mikes.patch
new file mode 100644
index 00000000..58437fb1
--- /dev/null
+++ b/mikes.patch
@@ -0,0 +1,2862 @@
+diff -ruN CNPROG/context.py mikes/context.py
+--- CNPROG/context.py	1969-12-31 19:00:00.000000000 -0500
++++ mikes/context.py	2009-07-25 19:09:58.098151134 -0400
+@@ -0,0 +1,9 @@
++from django.conf import settings
++def application_settings(context):
++    return {
++        'APP_TITLE' : settings.APP_TITLE,
++        'APP_URL'   : settings.APP_URL,
++        'APP_KEYWORDS' : settings.APP_KEYWORDS,
++        'APP_DESCRIPTION' : settings.APP_DESCRIPTION,
++        'APP_INTRO' : settings.APP_INTRO
++        }
+diff -ruN CNPROG/development.log mikes/development.log
+--- CNPROG/development.log	1969-12-31 19:00:00.000000000 -0500
++++ mikes/development.log	2009-07-25 19:09:58.098151134 -0400
+@@ -0,0 +1 @@
++# development log
+\ No newline at end of file
+diff -ruN CNPROG/django_authopenid/models.py mikes/django_authopenid/models.py
+--- CNPROG/django_authopenid/models.py	2009-06-22 21:42:50.000000000 -0400
++++ mikes/django_authopenid/models.py	2009-07-25 19:09:58.098151134 -0400
+@@ -3,7 +3,7 @@
+ from django.contrib.auth.models import User
+ from django.db import models
+ 
+-import md5, random, sys, os, time
++import hashlib, random, sys, os, time
+ 
+ __all__ = ['Nonce', 'Association', 'UserAssociation', 
+         'UserPasswordQueueManager', 'UserPasswordQueue']
+@@ -47,7 +47,7 @@
+         # The random module is seeded when this Apache child is created.
+         # Use SECRET_KEY as added salt.
+         while 1:
+-            confirm_key = md5.new("%s%s%s%s" % (
++            confirm_key = hashlib.md5("%s%s%s%s" % (
+                 random.randint(0, sys.maxint - 1), os.getpid(),
+                 time.time(), settings.SECRET_KEY)).hexdigest()
+             try:
+diff -ruN CNPROG/django_authopenid/util.py mikes/django_authopenid/util.py
+--- CNPROG/django_authopenid/util.py	2009-06-22 21:42:50.000000000 -0400
++++ mikes/django_authopenid/util.py	2009-07-25 19:09:58.098151134 -0400
+@@ -15,7 +15,7 @@
+ except:
+     from yadis import xri
+ 
+-import time, base64, md5, operator
++import time, base64, hashlib, operator
+ import urllib
+ 
+ from models import Association, Nonce
+@@ -128,7 +128,7 @@
+ 
+     def getAuthKey(self):
+         # Use first AUTH_KEY_LEN characters of md5 hash of SECRET_KEY
+-        return md5.new(settings.SECRET_KEY).hexdigest()[:self.AUTH_KEY_LEN]
++        return hashlib.md5(settings.SECRET_KEY).hexdigest()[:self.AUTH_KEY_LEN]
+     
+     def isDumb(self):
+         return False
+diff -ruN CNPROG/forum/const.py mikes/forum/const.py
+--- CNPROG/forum/const.py	2009-07-26 16:01:31.559063617 -0400
++++ mikes/forum/const.py	2009-07-25 19:09:58.098151134 -0400
+@@ -53,22 +52,24 @@
+ #TYPE_ACTIVITY_EDIT_ANSWER=18
+ 
+ TYPE_ACTIVITY = (
+     (TYPE_ACTIVITY_ASK_QUESTION, _('question')),
+     (TYPE_ACTIVITY_ANSWER, _('answer')),
+     (TYPE_ACTIVITY_COMMENT_QUESTION, _('commented question')),
+     (TYPE_ACTIVITY_COMMENT_ANSWER, _('commented answer')),
+     (TYPE_ACTIVITY_UPDATE_QUESTION, _('edited question')),
+     (TYPE_ACTIVITY_UPDATE_ANSWER, _('edited answer')),
+     (TYPE_ACTIVITY_PRIZE, _('received award')),
+     (TYPE_ACTIVITY_MARK_ANSWER, _('marked best answer')),
+     (TYPE_ACTIVITY_VOTE_UP, _('upvoted')),
+     (TYPE_ACTIVITY_VOTE_DOWN, _('downvoted')),
+     (TYPE_ACTIVITY_CANCEL_VOTE, _('canceled vote')),
+     (TYPE_ACTIVITY_DELETE_QUESTION, _('deleted question')),
+     (TYPE_ACTIVITY_DELETE_ANSWER, _('deleted answer')),
+     (TYPE_ACTIVITY_MARK_OFFENSIVE, _('marked offensive')),
+     (TYPE_ACTIVITY_UPDATE_TAGS, _('updated tags')),
+     (TYPE_ACTIVITY_FAVORITE, _('selected favorite')),
+     (TYPE_ACTIVITY_USER_FULL_UPDATED, _('completed user profile')),
++    #(TYPE_ACTIVITY_EDIT_QUESTION, u'编辑问题'),
++    #(TYPE_ACTIVITY_EDIT_ANSWER, u'编辑答案'),
+ )
+  
+diff -ruN CNPROG/forum/management/commands/once_award_badges.py mikes/forum/management/commands/once_award_badges.py
+--- CNPROG/forum/management/commands/once_award_badges.py	2009-06-22 21:42:50.000000000 -0400
++++ mikes/forum/management/commands/once_award_badges.py	2009-07-25 19:09:58.098151134 -0400
+@@ -157,7 +157,8 @@
+         """
+         activity_types = ','.join('%s' % item for item in BADGE_AWARD_TYPE_FIRST.keys())
+         # ORDER BY user_id, activity_type
+-        query = "SELECT id, user_id, activity_type, content_type_id, object_id FROM activity WHERE is_auditted = 0 AND activity_type IN (%s) ORDER BY user_id, activity_type" % activity_types
++        query = "SELECT id, user_id, activity_type, content_type_id, object_id "+
++            "FROM activity WHERE is_auditted = 0 AND activity_type IN (%s) ORDER BY user_id, activity_type" % activity_types
+ 
+         cursor = connection.cursor()
+         try:
+@@ -205,7 +206,10 @@
+ 
+         (13, '学生', 3, '学生', '第一次提问并且有一次以上赞成票', 0, 0),
+         """
+-        query = "SELECT act.user_id, q.vote_up_count, act.object_id FROM activity act, question q WHERE act.activity_type = %s AND act.object_id = q.id AND act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ASK_QUESTION, 13)
++        query = "SELECT act.user_id, q.vote_up_count, act.object_id FROM "+
++                    "activity act, question q WHERE act.activity_type = %s AND "+
++                    "act.object_id = q.id AND "+
++                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ASK_QUESTION, 13)
+         cursor = connection.cursor()
+         try:
+             cursor.execute(query)
+@@ -232,7 +236,10 @@
+ 
+         (15, '教师', 3, '教师', '第一次回答问题并且得到一个以上赞成票', 0, 0),
+         """
+-        query = "SELECT act.user_id, a.vote_up_count, act.object_id FROM activity act, answer a WHERE act.activity_type = %s AND act.object_id = a.id AND act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 15)
++        query = "SELECT act.user_id, a.vote_up_count, act.object_id FROM "+
++                    "activity act, answer a WHERE act.activity_type = %s AND "+
++                    "act.object_id = a.id AND "+
++                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 15)
+         cursor = connection.cursor()
+         try:
+             cursor.execute(query)
+@@ -257,7 +264,11 @@
+         """
+         (32, '学问家', 2, '学问家', '第一次回答被投赞成票10次以上', 0, 0)
+         """
+-        query = "SELECT act.user_id, act.object_id FROM activity act, answer a WHERE act.object_id = a.id AND act.activity_type = %s AND a.vote_up_count >= 10 AND act.user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 32)
++        query = "SELECT act.user_id, act.object_id FROM "+
++                    "activity act, answer a WHERE act.object_id = a.id AND "+
++                    "act.activity_type = %s AND "+
++                    "a.vote_up_count >= 10 AND "+
++                    "act.user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 32)
+         cursor = connection.cursor()
+         try:
+             cursor.execute(query)
+@@ -281,7 +292,11 @@
+         """
+         (26, '优秀市民', 2, '优秀市民', '投票300次以上', 0, 0)
+         """
+-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 300" % (TYPE_ACTIVITY_VOTE_UP, TYPE_ACTIVITY_VOTE_DOWN, 26)
++        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+
++                    "activity_type = %s OR "+
++                    "activity_type = %s AND "+
++                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+
++                    "GROUP BY user_id HAVING vote_count >= 300" % (TYPE_ACTIVITY_VOTE_UP, TYPE_ACTIVITY_VOTE_DOWN, 26)
+ 
+         self.__award_for_count_num(query, 26)
+ 
+@@ -289,7 +304,11 @@
+         """
+         (27, '编辑主任', 2, '编辑主任', '编辑了100个帖子', 0, 0)
+         """
+-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 100" % (TYPE_ACTIVITY_UPDATE_QUESTION, TYPE_ACTIVITY_UPDATE_ANSWER, 27)
++        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+
++                    "activity_type = %s OR "+
++                    "activity_type = %s AND "+
++                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+
++                    "GROUP BY user_id HAVING vote_count >= 100" % (TYPE_ACTIVITY_UPDATE_QUESTION, TYPE_ACTIVITY_UPDATE_ANSWER, 27)
+ 
+         self.__award_for_count_num(query, 27)
+ 
+@@ -297,7 +316,11 @@
+         """
+         (5, '评论家', 3, '评论家', '评论10次以上', 0, 0),
+         """
+-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 10" % (TYPE_ACTIVITY_COMMENT_QUESTION, TYPE_ACTIVITY_COMMENT_ANSWER, 5)
++        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+
++                    "activity_type = %s OR "+
++                    "activity_type = %s AND "+
++                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+
++                    "GROUP BY user_id HAVING vote_count >= 10" % (TYPE_ACTIVITY_COMMENT_QUESTION, TYPE_ACTIVITY_COMMENT_ANSWER, 5)
+         self.__award_for_count_num(query, 5)
+ 
+     def __award_for_count_num(self, query, badge):
+diff -ruN CNPROG/forum/managers.py mikes/forum/managers.py
+--- CNPROG/forum/managers.py	2009-06-22 21:42:50.000000000 -0400
++++ mikes/forum/managers.py	2009-07-25 19:09:58.098151134 -0400
+@@ -4,8 +4,29 @@
+ from django.db import connection, models, transaction
+ from django.db.models import Q
+ from forum.models import *
++from urllib import quote, unquote
+ 
+ class QuestionManager(models.Manager):
++    def get_translation_questions(self, orderby, page_size):
++        questions = self.filter(deleted=False, author__id__in=[28,29]).order_by(orderby)[:page_size]
++        return questions
++    
++    def get_questions_by_pagesize(self, orderby, page_size):
++        questions = self.filter(deleted=False).order_by(orderby)[:page_size]
++        return questions
++    
++    def get_questions_by_tag(self, tagname, orderby):
++        questions = self.filter(deleted=False, tags__name = unquote(tagname)).order_by(orderby)
++        return questions
++    
++    def get_unanswered_questions(self, orderby):
++        questions = self.filter(deleted=False, answer_count=0).order_by(orderby)
++        return questions
++    
++    def get_questions(self, orderby):
++        questions = self.filter(deleted=False).order_by(orderby)
++        return questions
++    
+     def update_tags(self, question, tagnames, user):
+         """
+         Updates Tag associations for a question to match the given
+@@ -92,7 +113,12 @@
+             'WHERE tag_id = tag.id'
+         ') '
+         'WHERE id IN (%s)')
+-
++    
++    def get_valid_tags(self, page_size):
++      from forum.models import Tag
++      tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:page_size]
++      return tags
++    
+     def get_or_create_multiple(self, names, user):
+         """
+         Fetches a list of Tags with the given names, creating any Tags
+@@ -123,6 +149,19 @@
+         query = self.UPDATE_USED_COUNTS_QUERY % ','.join(['%s'] * len(tags))
+         cursor.execute(query, [tag.id for tag in tags])
+         transaction.commit_unless_managed()
++    
++    def get_tags_by_questions(self, questions):
++        question_ids = []
++        for question in questions:
++            question_ids.append(question.id)
++
++        question_ids_str = ','.join([str(id) for id in question_ids])
++        related_tags = self.extra(
++                tables=['tag', 'question_tags'],
++                where=["tag.id = question_tags.tag_id AND question_tags.question_id IN (" + question_ids_str + ")"]
++        ).distinct()
++        
++        return related_tags
+ 
+ class AnswerManager(models.Manager):
+     GET_ANSWERS_FROM_USER_QUESTIONS = u'SELECT answer.* FROM answer INNER JOIN question ON answer.question_id = question.id WHERE question.author_id =%s AND answer.author_id <> %s'
+@@ -205,4 +244,16 @@
+             return row[0]
+ 
+         else:
+-            return 0    
+\ No newline at end of file
++            return 0    
++class AwardManager(models.Manager):
++    def get_recent_awards(self):
++        awards = super(AwardManager, self).extra(
++            select={'badge_id': 'badge.id', 'badge_name':'badge.name',
++                          'badge_description': 'badge.description', 'badge_type': 'badge.type',
++                          'user_id': 'auth_user.id', 'user_name': 'auth_user.username'
++                          },
++            tables=['award', 'badge', 'auth_user'],
++            order_by=['-awarded_at'],
++            where=['auth_user.id=award.user_id AND badge_id=badge.id'],
++        ).values('badge_id', 'badge_name', 'badge_description', 'badge_type', 'user_id', 'user_name')
++        return awards
+diff -ruN CNPROG/forum/models.py mikes/forum/models.py
+--- CNPROG/forum/models.py	2009-06-22 21:42:50.000000000 -0400
++++ mikes/forum/models.py	2009-07-25 19:09:58.108151006 -0400
+@@ -351,7 +350,8 @@
+     content_object = generic.GenericForeignKey('content_type', 'object_id')
+     awarded_at = models.DateTimeField(default=datetime.datetime.now)
+     notified   = models.BooleanField(default=False)
+-
++    objects = AwardManager()
++    
+     def __unicode__(self):
+         return u'[%s] is awarded a badge [%s] at %s' % (self.user.username, self.badge.name, self.awarded_at)
+ 
+diff -ruN CNPROG/forum/templatetags/extra_tags.py mikes/forum/templatetags/extra_tags.py
+--- CNPROG/forum/templatetags/extra_tags.py	2009-06-22 21:42:50.000000000 -0400
++++ mikes/forum/templatetags/extra_tags.py	2009-07-25 19:09:58.108151006 -0400
+@@ -1,4 +1,4 @@
+-import time
++import time
+ import datetime
+ import math
+ import re
+@@ -50,10 +49,10 @@
+         weight = 0
+     return MIN_FONTSIZE + round((MAX_FONTSIZE - MIN_FONTSIZE) * weight)
+ 
+-    
++
+ LEADING_PAGE_RANGE_DISPLAYED = TRAILING_PAGE_RANGE_DISPLAYED = 5
+ LEADING_PAGE_RANGE = TRAILING_PAGE_RANGE = 4
+-NUM_PAGES_OUTSIDE_RANGE = 1 
++NUM_PAGES_OUTSIDE_RANGE = 1
+ ADJACENT_PAGES = 2
+ @register.inclusion_tag("paginator.html")
+ def cnprog_paginator(context):
+@@ -65,10 +64,10 @@
+         " Initialize variables "
+         in_leading_range = in_trailing_range = False
+         pages_outside_leading_range = pages_outside_trailing_range = range(0)
+- 
++
+         if (context["pages"] <= LEADING_PAGE_RANGE_DISPLAYED):
+             in_leading_range = in_trailing_range = True
+-            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]           
++            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
+         elif (context["page"] <= LEADING_PAGE_RANGE):
+             in_leading_range = True
+             page_numbers = [n for n in range(1, LEADING_PAGE_RANGE_DISPLAYED + 1) if n > 0 and n <= context["pages"]]
+@@ -77,11 +76,11 @@
+             in_trailing_range = True
+             page_numbers = [n for n in range(context["pages"] - TRAILING_PAGE_RANGE_DISPLAYED + 1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
+             pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
+-        else: 
++        else:
+             page_numbers = [n for n in range(context["page"] - ADJACENT_PAGES, context["page"] + ADJACENT_PAGES + 1) if n > 0 and n <= context["pages"]]
+             pages_outside_leading_range = [n + context["pages"] for n in range(0, -NUM_PAGES_OUTSIDE_RANGE, -1)]
+             pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
+-            
++
+         extend_url = context.get('extend_url', '')
+         return {
+             "base_url": context["base_url"],
+@@ -205,12 +197,12 @@
+         m = re.match(pattern, strValue)
+     return first + result
+ 
+-@register.simple_tag   
++@register.simple_tag
+ def convert2tagname_list(question):
+     question['tagnames'] = [name for name in question['tagnames'].split(u' ')]
+     return ''
+ 
+-@register.simple_tag    
++@register.simple_tag
+ def diff_date(date, limen=2):
+     current_time = datetime.datetime(*time.localtime()[0:6])
+     diff = current_time - date
+@@ -237,4 +229,4 @@
+         timestr = strftime("%H:%M %b-%d-%Y %Z", localtime(latest))
+     except:
+         timestr = ''
+-    return timestr
++    return timestr
+\ No newline at end of file
+diff -ruN CNPROG/forum/user.py mikes/forum/user.py
+--- CNPROG/forum/user.py	2009-06-22 21:42:50.000000000 -0400
++++ mikes/forum/user.py	2009-07-25 19:09:58.108151006 -0400
+@@ -1,3 +1,4 @@
++# coding=utf-8
+ from django.utils.translation import ugettext as _
+ class UserView:
+     def __init__(self, id, tab_title, tab_description, page_title, view_name, template_file, data_size=0):
+diff -ruN CNPROG/forum/views.py mikes/forum/views.py
+--- CNPROG/forum/views.py	2009-06-22 21:42:50.000000000 -0400
++++ mikes/forum/views.py	2009-07-25 19:09:58.108151006 -0400
+@@ -77,29 +76,17 @@
+         orderby = "-last_activity_at"
+     # group questions by author_id of 28,29
+     if view_id == 'trans':
+-        questions = Question.objects.filter(deleted=False, author__id__in=[28,29]).order_by(orderby)[:INDEX_PAGE_SIZE]
++        questions = Question.objects.get_translation_questions(orderby, INDEX_PAGE_SIZE)
+     else:
+-        questions = Question.objects.filter(deleted=False).order_by(orderby)[:INDEX_PAGE_SIZE]
++        questions = Question.objects.get_questions_by_pagesize(orderby, INDEX_PAGE_SIZE)
+     # RISK - inner join queries
+-    questions = questions.select_related();
+-    tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:INDEX_TAGS_SIZE]
++    questions = questions.select_related()
++    tags = Tag.objects.get_valid_tags(INDEX_TAGS_SIZE)
+ 
+-    awards = Award.objects.extra(
+-        select={'badge_id': 'badge.id', 'badge_name':'badge.name',
+-                      'badge_description': 'badge.description', 'badge_type': 'badge.type',
+-                      'user_id': 'auth_user.id', 'user_name': 'auth_user.username'
+-                      },
+-        tables=['award', 'badge', 'auth_user'],
+-        order_by=['-awarded_at'],
+-        where=['auth_user.id=award.user_id AND badge_id=badge.id'],
+-    ).values('badge_id', 'badge_name', 'badge_description', 'badge_type', 'user_id', 'user_name')
+-
+-    class testvar:
+-        content = 'haha'
++    awards = Award.objects.get_recent_awards()
+ 
+     return render_to_response('index.html', {
+         "questions" : questions,
+-        'testvar':testvar,
+         "tab_id" : view_id,
+         "tags" : tags,
+         "awards" : awards[:INDEX_AWARD_SIZE],
+@@ -127,29 +114,11 @@
+     # Set flag to False by default. If it is equal to True, then need to be saved.
+     pagesize_changed = False
+     # get pagesize from session, if failed then get default value
+-    user_page_size = request.session.get("pagesize", QUESTIONS_PAGE_SIZE)
+-    # set pagesize equal to logon user specified value in database
+-    if request.user.is_authenticated() and request.user.questions_per_page > 0:
+-        user_page_size = request.user.questions_per_page
+-
++    pagesize = request.session.get("pagesize")
+     try:
+         page = int(request.GET.get('page', '1'))
+-        # get new pagesize from UI selection
+-        pagesize = int(request.GET.get('pagesize', user_page_size))
+-        if pagesize <> user_page_size:
+-            pagesize_changed = True
+-
+     except ValueError:
+         page = 1
+-        pagesize  = user_page_size
+-
+-    # save this pagesize to user database
+-    if pagesize_changed:
+-        request.session["pagesize"] = pagesize
+-        if request.user.is_authenticated():
+-            user = request.user
+-            user.questions_per_page = pagesize
+-            user.save()
+ 
+     view_id = request.GET.get('sort', None)
+     view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
+@@ -161,29 +130,24 @@
+ 
+     # check if request is from tagged questions
+     if tagname is not None:
+-        #print datetime.datetime.now()
+-        objects = Question.objects.filter(deleted=False, tags__name = unquote(tagname)).order_by(orderby)
+-        #print datetime.datetime.now()
++        objects = Question.objects.get_questions_by_tag(tagname, orderby)
+     elif unanswered:
+         #check if request is from unanswered questions
+         template_file = "unanswered.html"
+-        objects = Question.objects.filter(deleted=False, answer_count=0).order_by(orderby)
++        objects = Question.objects.get_unanswered_questions(orderby)
+     else:
+-        objects = Question.objects.filter(deleted=False).order_by(orderby)
++        objects = Question.objects.get_questions(orderby)
+ 
+     # RISK - inner join queries
+-    objects = objects.select_related();
++    objects = objects.select_related(depth=1);
+     objects_list = Paginator(objects, pagesize)
+     questions = objects_list.page(page)
+ 
+     # Get related tags from this page objects
+-    related_tags = []
+-    for question in questions.object_list:
+-        tags = list(question.tags.all())
+-        for tag in tags:
+-            if tag not in related_tags:
+-                related_tags.append(tag)
+-
++    if questions.object_list.count() > 0:
++        related_tags = Tag.objects.get_tags_by_questions(questions.object_list)
++    else:
++        related_tags = None
+     return render_to_response(template_file, {
+         "questions" : questions,
+         "tab_id" : view_id,
+@@ -1022,6 +986,7 @@
+                         'title',
+                         'author_id',
+                         'accepted',
++                        'vote_count',
+                         'answer_count',
+                         'vote_up_count',
+                         'vote_down_count')[:100]
+@@ -1090,7 +1055,8 @@
+             'activity_type' : 'activity.activity_type'
+             },
+         tables=['activity', 'question'],
+-        where=['activity.content_type_id = %s AND activity.object_id = question.id AND activity.user_id = %s AND activity.activity_type = %s'],
++        where=['activity.content_type_id = %s AND activity.object_id = ' +
++            'question.id AND activity.user_id = %s AND activity.activity_type = %s'],
+         params=[question_type_id, user_id, TYPE_ACTIVITY_ASK_QUESTION],
+         order_by=['-activity.active_at']
+     ).values(
+@@ -1114,8 +1080,8 @@
+             'activity_type' : 'activity.activity_type'
+             },
+         tables=['activity', 'answer', 'question'],
+-        where=['activity.content_type_id = %s AND activity.object_id = answer.id '
+-			     'AND answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
++        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' + 
++            'answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
+         params=[answer_type_id, user_id, TYPE_ACTIVITY_ANSWER],
+         order_by=['-activity.active_at']
+     ).values(
+@@ -1140,7 +1106,9 @@
+             },
+         tables=['activity', 'question', 'comment'],
+ 
+-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND activity.user_id = comment.user_id AND comment.object_id=question.id AND comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
++        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
++            'activity.user_id = comment.user_id AND comment.object_id=question.id AND '+
++            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
+         params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],
+         order_by=['-comment.added_at']
+     ).values(
+@@ -1166,7 +1134,10 @@
+             },
+         tables=['activity', 'question', 'answer', 'comment'],
+ 
+-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND activity.user_id = comment.user_id AND comment.object_id=answer.id AND comment.content_type_id=%s AND question.id = answer.question_id AND activity.user_id = %s AND activity.activity_type=%s'],
++        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
++            'activity.user_id = comment.user_id AND comment.object_id=answer.id AND '+
++            'comment.content_type_id=%s AND question.id = answer.question_id AND '+
++            'activity.user_id = %s AND activity.activity_type=%s'],
+         params=[comment_type_id, answer_type_id, user_id, TYPE_ACTIVITY_COMMENT_ANSWER],
+         order_by=['-comment.added_at']
+     ).values(
+@@ -1192,7 +1163,9 @@
+             'summary' : 'question_revision.summary'
+             },
+         tables=['activity', 'question_revision'],
+-        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND activity.user_id = question_revision.author_id AND activity.user_id = %s AND activity.activity_type=%s'],
++        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND '+
++            'activity.user_id = question_revision.author_id AND activity.user_id = %s AND '+
++            'activity.activity_type=%s'],
+         params=[question_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_QUESTION],
+         order_by=['-activity.active_at']
+     ).values(
+@@ -1220,7 +1193,10 @@
+             },
+         tables=['activity', 'answer_revision', 'question', 'answer'],
+ 
+-        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND activity.user_id = answer_revision.author_id AND activity.user_id = %s AND answer_revision.answer_id=answer.id AND answer.question_id = question.id AND activity.activity_type=%s'],
++        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND '+
++            'activity.user_id = answer_revision.author_id AND activity.user_id = %s AND '+
++            'answer_revision.answer_id=answer.id AND answer.question_id = question.id AND '+
++            'activity.activity_type=%s'],
+         params=[answer_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_ANSWER],
+         order_by=['-activity.active_at']
+     ).values(
+@@ -1246,7 +1222,9 @@
+             'activity_type' : 'activity.activity_type',
+             },
+         tables=['activity', 'answer', 'question'],
+-        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND activity.user_id = question.author_id AND activity.user_id = %s AND answer.question_id=question.id AND activity.activity_type=%s'],
++        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND '+
++            'activity.user_id = question.author_id AND activity.user_id = %s AND '+
++            'answer.question_id=question.id AND activity.activity_type=%s'],
+         params=[answer_type_id, user_id, TYPE_ACTIVITY_MARK_ANSWER],
+         order_by=['-activity.active_at']
+     ).values(
+@@ -1267,7 +1245,8 @@
+             'activity_type' : 'activity.activity_type'
+             },
+         tables=['activity', 'award', 'badge'],
+-        where=['activity.user_id = award.user_id AND activity.user_id = %s AND award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
++        where=['activity.user_id = award.user_id AND activity.user_id = %s AND '+
++            'award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
+         params=[user_id, TYPE_ACTIVITY_PRIZE],
+         order_by=['-activity.active_at']
+     ).values(
+@@ -1320,7 +1299,8 @@
+             },
+         select_params=[user_id],
+         tables=['answer', 'question', 'auth_user'],
+-        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
++        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
++            'question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
+         params=[user_id, user_id],
+         order_by=['-answer.id']
+     ).values(
+@@ -1349,7 +1329,8 @@
+             'user_id' : 'auth_user.id'
+             },
+         tables=['question', 'auth_user', 'comment'],
+-        where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
++        where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND '+
++            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
+         params=[user_id, question_type_id, user_id],
+         order_by=['-comment.added_at']
+     ).values(
+@@ -1378,7 +1359,9 @@
+             'user_id' : 'auth_user.id'
+             },
+         tables=['answer', 'auth_user', 'comment', 'question'],
+-        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id AND question.id = answer.question_id'],
++        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND '+
++            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id '+
++            'AND question.id = answer.question_id'],
+         params=[user_id, answer_type_id, user_id],
+         order_by=['-comment.added_at']
+     ).values(
+@@ -1409,7 +1392,8 @@
+             },
+         select_params=[user_id],
+         tables=['answer', 'question', 'auth_user'],
+-        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
++        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
++            'answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
+         params=[user_id],
+         order_by=['-answer.id']
+     ).values(
+@@ -1453,7 +1437,8 @@
+             },
+         select_params=[user_id],
+         tables=['vote', 'question', 'auth_user'],
+-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id AND vote.user_id=auth_user.id'],
++        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id '+
++            'AND vote.user_id=auth_user.id'],
+         params=[question_type_id, user_id],
+         order_by=['-vote.id']
+     ).values(
+@@ -1476,7 +1461,8 @@
+             },
+         select_params=[user_id],
+         tables=['vote', 'answer', 'question', 'auth_user'],
+-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
++        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id '+
++            'AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
+         params=[answer_type_id, user_id],
+         order_by=['-vote.id']
+     ).values(
+@@ -1501,7 +1487,8 @@
+ def user_reputation(request, user_id, user_view):
+     user = get_object_or_404(User, id=user_id)
+     reputation = Repute.objects.extra(
+-        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 'title': 'question.title'},
++        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 
++            'title': 'question.title'},
+         tables=['repute', 'question'],
+         order_by=['-reputed_at'],
+         where=['user_id=%s AND question_id=question.id'],
+@@ -1510,6 +1497,7 @@
+ 
+     reputation.query.group_by = ['question_id']
+ 
++
+     rep_list = []
+     for rep in Repute.objects.filter(user=user).order_by('reputed_at'):
+         dic = '[%s,%s]' % (calendar.timegm(rep.reputed_at.timetuple()) * 1000, rep.reputation)
+@@ -1531,7 +1519,8 @@
+     questions = Question.objects.extra(
+         select={
+             'vote_count' : 'question.vote_up_count + question.vote_down_count',
+-            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s AND f.question_id = question.id',
++            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s '+
++                'AND f.question_id = question.id',
+             'la_user_id' : 'auth_user.id',
+             'la_username' : 'auth_user.username',
+             'la_user_gold' : 'auth_user.gold',
+@@ -1541,7 +1530,8 @@
+             },
+         select_params=[user_id],
+         tables=['question', 'auth_user', 'favorite_question'],
+-        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
++        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id '+
++            'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
+         params=[user_id],
+         order_by=['-vote_count', '-question.id']
+     ).values('vote_count',
+@@ -1672,7 +1662,12 @@
+ def badge(request, id):
+     badge = get_object_or_404(Badge, id=id)
+     awards = Award.objects.extra(
+-        select={'id': 'auth_user.id', 'name': 'auth_user.username', 'rep':'auth_user.reputation', 'gold': 'auth_user.gold', 'silver': 'auth_user.silver', 'bronze': 'auth_user.bronze'},
++        select={'id': 'auth_user.id', 
++                'name': 'auth_user.username', 
++                'rep':'auth_user.reputation', 
++                'gold': 'auth_user.gold', 
++                'silver': 'auth_user.silver', 
++                'bronze': 'auth_user.bronze'},
+         tables=['award', 'auth_user'],
+         where=['badge_id=%s AND user_id=auth_user.id'],
+         params=[id]
+diff -ruN CNPROG/INSTALL mikes/INSTALL
+--- CNPROG/INSTALL	1969-12-31 19:00:00.000000000 -0500
++++ mikes/INSTALL	2009-07-25 19:09:58.068150962 -0400
+@@ -0,0 +1,33 @@
++PRE-REQUIREMENTS:
++-----------------------------------------------
++1. Python2.5, MySQL, Django v1.0+
++
++2. Python-openid v2.2
++http://openidenabled.com/python-openid/
++
++3. django-authopenid(Included in project already)
++http://code.google.com/p/django-authopenid/
++
++4. html5lib
++http://code.google.com/p/html5lib/
++Used for HTML sanitizer
++
++5. Markdown2
++http://code.google.com/p/python-markdown2/
++
++
++INSTALL STEPS:
++-----------------------------------------------
++1. Copy settings_local.py.dist to settings_local.py and 
++update all your settings. Check settings.py and update 
++it as well if necessory.
++
++2. Prepare your database by using the same database/account 
++configuration from above.
++
++3. Run "python manager.py runserver" to startup django 
++development environment.
++
++4. There are some demo scripts under sql_scripts folder, 
++including badges and test accounts for CNProg.com. You 
++don't need them to run your sample.
+diff -ruN CNPROG/junk mikes/junk
+--- CNPROG/junk	2009-06-22 21:42:52.000000000 -0400
++++ mikes/junk	1969-12-31 19:00:00.000000000 -0500
+@@ -1,7 +0,0 @@
+-/branches/beta2/forum/feed.py   r110   line 17:
+-/branches/beta2/forum/feed.py   r110   line 20:
+-/branches/beta2/forum/forms.py   r110   line 63:
+-/branches/beta2/templates/question.html   r120   line 237:
+-/branches/beta2/templates/question.html   r120   line 57:
+-/branches/beta2/templates/question.html   r120   line 456:
+-/branches/beta2/forum/views.py   r127   line 1088:
+diff -ruN CNPROG/lanai.psproj mikes/lanai.psproj
+--- CNPROG/lanai.psproj	2009-06-22 21:42:52.000000000 -0400
++++ mikes/lanai.psproj	1969-12-31 19:00:00.000000000 -0500
+@@ -1,557 +0,0 @@
+-[PyScripter]
+-Version=1.9.9.3
+-
+-[Project]
+-ClassName=TProjectRootNode
+-StoreRelativePaths=FALSE
+-ShowFileExtensions=FALSE
+-
+-[Project\ChildNodes]
+-Count=2
+-
+-[Project\ChildNodes\Node0]
+-ClassName=TProjectFilesNode
+-
+-[Project\ChildNodes\Node0\ChildNodes]
+-Count=1
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0]
+-ClassName=TProjectFolderNode
+-Name=src
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
+-Count=10
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
+-ClassName=TProjectFolderNode
+-Name=django_authopenid
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
+-Count=9
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\django_authopenid\__init__.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\django_authopenid\admin.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\django_authopenid\forms.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\django_authopenid\middleware.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\django_authopenid\mimeparse.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node5]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\django_authopenid\models.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node6]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\django_authopenid\urls.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node7]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\django_authopenid\util.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node8]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\django_authopenid\views.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
+-ClassName=TProjectFolderNode
+-Name=forum
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes]
+-Count=12
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0]
+-ClassName=TProjectFolderNode
+-Name=management
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes]
+-Count=2
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0]
+-ClassName=TProjectFolderNode
+-Name=commands
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
+-Count=3
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\management\commands\__init__.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\management\commands\mark_offensive_cron.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\management\commands\sample_command.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node1]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\management\__init__.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1]
+-ClassName=TProjectFolderNode
+-Name=templatetags
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes]
+-Count=3
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node0]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\templatetags\__init__.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node1]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\templatetags\extra_filters.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node2]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\templatetags\extra_tags.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node2]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\__init__.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node3]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\admin.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node4]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\auth.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node5]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\const.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node6]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\diff.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node7]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\forms.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node8]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\managers.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node9]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\models.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node10]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\user.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node11]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\forum\views.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
+-ClassName=TProjectFolderNode
+-Name=sql_scripts
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes]
+-Count=6
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node0]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\sql_scripts\cnprog_new_install.sql
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node1]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_01_13_001.sql
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node2]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_01_13_002.sql
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node3]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_12_24_001.sql
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node4]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_12_27_001.sql
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node5]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_12_27_002.sql
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3]
+-ClassName=TProjectFolderNode
+-Name=templates
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes]
+-Count=44
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0]
+-ClassName=TProjectFolderNode
+-Name=authopenid
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes]
+-Count=10
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node0]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\authopenid\changeemail.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node1]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\authopenid\changeopenid.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node2]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\authopenid\changepw.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node3]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\authopenid\complete.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node4]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\authopenid\delete.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node5]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\authopenid\failure.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node6]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\authopenid\sendpw.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node7]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\authopenid\settings.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node8]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\authopenid\signin.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node9]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\authopenid\signup.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1]
+-ClassName=TProjectFolderNode
+-Name=content
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes]
+-Count=2
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0]
+-ClassName=TProjectFolderNode
+-Name=js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes]
+-Count=10
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0]
+-ClassName=TProjectFolderNode
+-Name=wmd
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
+-Count=3
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\wmd\showdown.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\wmd\wmd-base.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\wmd\wmd-plus.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node1]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\com.cnprog.editor.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node2]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\com.cnprog.post.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node3]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\com.cnprog.utils.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node4]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\excanvas.pack.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node5]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\jquery.flot.pack.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node6]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\jquery.openid.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node7]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\jquery.validate.pack.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node8]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\jquery-1.2.6.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node9]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\js\jquery-1.2.6.min.js
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1]
+-ClassName=TProjectFolderNode
+-Name=style
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes]
+-Count=4
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node0]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\style\default.css
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node1]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\style\jquery.autocomplete.css
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node2]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\style\openid.css
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node3]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\content\style\prettify.css
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node2]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\404.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node3]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\500.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node4]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\about.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node5]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\answer_edit.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node6]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\ask.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node7]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\badge.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node8]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\badges.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node9]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\base.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node10]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\base_content.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node11]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\close.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node12]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\faq.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node13]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\footer.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node14]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\header.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node15]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\index.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node16]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\logout.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node17]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\pagesize.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node18]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\paginator.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node19]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\privacy.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node20]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\question.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node21]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\question_edit.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node22]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\question_retag.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node23]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\questions.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node24]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\reopen.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node25]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\revisions_answer.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node26]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\revisions_question.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node27]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\sidebar.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node28]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\tags.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node29]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\unanswered.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node30]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node31]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user_edit.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node32]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user_favorites.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node33]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user_footer.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node34]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user_info.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node35]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user_preferences.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node36]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user_recent.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node37]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user_reputation.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node38]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user_responses.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node39]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user_stats.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node40]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user_tabs.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node41]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\user_votes.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node42]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\users.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node43]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\templates\users_questions.html
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4]
+-ClassName=TProjectFolderNode
+-Name=utils
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes]
+-Count=4
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node0]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\utils\__init__.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node1]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\utils\cache.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node2]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\utils\html.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node3]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\utils\lists.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node5]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\__init__.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node6]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\manage.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node7]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\settings.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node8]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\test.py
+-
+-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node9]
+-ClassName=TProjectFileNode
+-FileName=C:\Projects\Lanai\src\urls.py
+-
+-[Project\ChildNodes\Node1]
+-ClassName=TProjectRunConfiguationsNode
+-
+-[Project\ExtraPythonPath]
+-Count=0
+-
+diff -ruN CNPROG/LICENSE mikes/LICENSE
+--- CNPROG/LICENSE	2009-06-22 21:42:52.000000000 -0400
++++ mikes/LICENSE	2009-07-25 19:09:58.088150984 -0400
+@@ -1,12 +1,14 @@
+-��Ȩ����(c) 2008 CNProg.com
++Copyright (C) 2009.  Chen Gang
+ 
+-����2.0�汾Apache����֤("����֤")��Ȩ��
+-���ݱ�����֤���û����Բ�ʹ�ô��ļ���
+-�û��ɴ�������ַ�������֤������
++This program is free software: you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation, either version 3 of the License, or
++(at your option) any later version.
+ 
+-http://www.apache.org/licenses/LICENSE-2.0
++This program is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++GNU General Public License for more details.
+ 
+-���������÷�����Ҫ������ͬ�⣬
+-��������֤�ַ��������ǻ���"��ԭ��"�����ṩ��
+-���κ���ʾ�Ļ�ʾ�ı�֤��������
+-�����������֤�����£��ض����ԵĹ�ϽȨ�޺����ơ�
+\ No newline at end of file
++You should have received a copy of the GNU General Public License
++along with this program.  If not, see <http://www.gnu.org/licenses/>.
+diff -ruN CNPROG/locale/zh_CN/LC_MESSAGES/django.po mikes/locale/zh_CN/LC_MESSAGES/django.po
+--- CNPROG/locale/zh_CN/LC_MESSAGES/django.po	1969-12-31 19:00:00.000000000 -0500
++++ mikes/locale/zh_CN/LC_MESSAGES/django.po	2009-07-25 19:09:58.108151006 -0400
+@@ -0,0 +1,629 @@
++# Chinese translations for CNProg.com
++# Copyright (C) 2009
++# This file is distributed under the same license as the CNPROG package.
++# Mike Chen <chagel@gmail.com>, 2009.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2009-07-15 13:53+0000\n"
++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"Language-Team: LANGUAGE <LL@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: settings.py:12
++msgid "account/"
++msgstr ""
++
++#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:11
++msgid "signin/"
++msgstr ""
++
++#: django_authopenid/forms.py:67 django_authopenid/views.py:93
++msgid "i-names are not supported"
++msgstr "i-names不支持。"
++
++#: django_authopenid/forms.py:102 django_authopenid/forms.py:207
++msgid ""
++"Usernames can only contain                     letters, numbers and "
++"underscores"
++msgstr "用户名格式有误。只有字母，数字和下划线是允许的。"
++
++#: django_authopenid/forms.py:109
++msgid ""
++"This username does not exist                     in our database. Please "
++"choose another."
++msgstr "用户名不存在。请重新输入。"
++
++#: django_authopenid/forms.py:126 django_authopenid/forms.py:231
++msgid ""
++"Please enter a valid                     username and password. Note that "
++"both fields are                     case-sensitive."
++msgstr "请输入用户名和密码。注意区分大小写。"
++
++#: django_authopenid/forms.py:130 django_authopenid/forms.py:235
++msgid "This account is inactive."
++msgstr "用户已冻结。"
++
++#: django_authopenid/forms.py:184
++msgid ""
++"This email is already                 registered in our database. Please "
++"choose another."
++msgstr "电子邮件已被注册。请使用一个新的邮件地址。"
++
++#: django_authopenid/forms.py:214
++msgid ""
++"This username don't exist.                         Please choose another."
++msgstr "用户名不存在"
++
++#: django_authopenid/forms.py:330
++msgid ""
++"Old password is incorrect.                     Please enter the correct "
++"password."
++msgstr "旧密码错误。"
++
++#: django_authopenid/forms.py:342
++msgid "new passwords do not match"
++msgstr "新密码不匹配"
++
++#: django_authopenid/forms.py:434
++msgid "Incorrect username."
++msgstr "用户名不正确"
++
++#: django_authopenid/urls.py:10
++msgid "signout/"
++msgstr ""
++
++#: django_authopenid/urls.py:11
++msgid "complete/"
++msgstr ""
++
++#: django_authopenid/urls.py:13
++msgid "register/"
++msgstr ""
++
++#: django_authopenid/urls.py:14
++msgid "signup/"
++msgstr ""
++
++#: django_authopenid/urls.py:16
++msgid "sendpw/"
++msgstr ""
++
++#: django_authopenid/urls.py:26
++msgid "delete/"
++msgstr ""
++
++#: django_authopenid/views.py:99
++#, python-format
++msgid "非法OpenID地址： %s"
++msgstr ""
++
++#: django_authopenid/views.py:366 templates/index.html:78
++msgid "Welcome"
++msgstr "欢迎"
++
++#: django_authopenid/views.py:456
++msgid "Password changed."
++msgstr "密码已更新。"
++
++#: django_authopenid/views.py:488
++msgid "Email changed."
++msgstr "邮件地址已更新。"
++
++#: django_authopenid/views.py:519 django_authopenid/views.py:671
++#, python-format
++msgid "No OpenID %s found associated in our database"
++msgstr "该OpenID %s 不在系统中。"
++
++#: django_authopenid/views.py:523 django_authopenid/views.py:678
++#, python-format
++msgid "The OpenID %s isn't associated to current user logged in"
++msgstr "OpenID %s 没有和当前登录用户绑定。"
++
++#: django_authopenid/views.py:531
++msgid "Email Changed."
++msgstr "邮件地址已更新。"
++
++#: django_authopenid/views.py:606
++msgid "This OpenID is already associated with another account."
++msgstr "这个OpenID已经绑定到另外一个帐号。"
++
++#: django_authopenid/views.py:611
++#, python-format
++msgid "OpenID %s is now associated with your account."
++msgstr "OpenID %s 已经绑定到您的帐号。"
++
++#: django_authopenid/views.py:681
++msgid "Account deleted."
++msgstr "帐号已删除。"
++
++#: django_authopenid/views.py:721
++msgid "Request for new password"
++msgstr "找回密码"
++
++#: django_authopenid/views.py:734
++msgid "A new password has been sent to your email address."
++msgstr "新的密码已经发送到您的邮件帐号。"
++
++#: django_authopenid/views.py:764
++#, python-format
++msgid ""
++"Could not change password. Confirmation key '%s'                is not "
++"registered."
++msgstr "不能修改密码。确认信息 '%s' 有误。"
++
++#: django_authopenid/views.py:773
++msgid ""
++"Can not change password. User don't exist anymore                 in our "
++"database."
++msgstr "不能修改密码。用户帐号不存在。"
++
++#: django_authopenid/views.py:782
++#, python-format
++msgid "Password changed for %s. You may now sign in."
++msgstr "帐号 %s 的密码已经修改。您现在可以用它来登录。"
++
++#: forum/user.py:17
++msgid "Overview"
++msgstr "概览"
++
++#: forum/user.py:18
++msgid "User overview"
++msgstr "用户概览"
++
++#: forum/user.py:19
++msgid "Overview - User Profile"
++msgstr "概览-用户资料"
++
++#: forum/user.py:25
++msgid "Recent"
++msgstr "最近活动"
++
++#: forum/user.py:26
++msgid "Recent activities"
++msgstr "用户最近活动情况"
++
++#: forum/user.py:27
++msgid "Recent - User Profile"
++msgstr "最近活动-用户资料"
++
++#: forum/user.py:34
++msgid "Response"
++msgstr "回应"
++
++#: forum/user.py:35
++msgid "Responses from others"
++msgstr "其他用户的回答和评论"
++
++#: forum/user.py:36
++msgid "Response - User Profile"
++msgstr "回应-用户资料"
++
++#: forum/user.py:43
++msgid "Reputation"
++msgstr "积分"
++
++#: forum/user.py:44
++msgid "Community reputation"
++msgstr "社区积分"
++
++#: forum/user.py:45
++msgid "Reputation - User Profile"
++msgstr "积分-用户资料"
++
++#: forum/user.py:51
++msgid "Favorites"
++msgstr "收藏"
++
++#: forum/user.py:52
++msgid "User's favorite questions"
++msgstr "用户收藏的问题"
++
++#: forum/user.py:53
++msgid "Favorites - User Profile"
++msgstr "收藏-用户资料"
++
++#: forum/user.py:60 templates/index.html:46 templates/questions.html:45
++msgid "Votes"
++msgstr "投票"
++
++#: forum/user.py:61
++msgid "Votes history"
++msgstr "用户投票历史"
++
++#: forum/user.py:62
++msgid "Votes - User Profile"
++msgstr "投票-用户资料"
++
++#: forum/user.py:69
++msgid "Preferences"
++msgstr "设置"
++
++#: forum/user.py:70
++msgid "User preferences"
++msgstr "用户参数设置"
++
++#: forum/user.py:71
++msgid "Preferences - User Profile"
++msgstr "设置-用户资料"
++
++#: templates/badges.html:5 templates/badges.html.py:16
++#: templates/header.html:31
++msgid "Badges"
++msgstr "奖牌榜"
++
++#: templates/base.html:53 templates/base_content.html:52
++msgid "Congratulations! You have new badges: "
++msgstr "恭喜您被授予奖牌："
++
++#: templates/base.html:54 templates/base_content.html:53
++msgid "go to see"
++msgstr "查看"
++
++#: templates/base.html:55 templates/base_content.html:54
++#: templates/header.html:35
++msgid "Profile"
++msgstr "我的资料"
++
++#: templates/footer.html:5 templates/header.html:10 templates/index.html:81
++msgid "About us"
++msgstr "关于我们"
++
++#: templates/footer.html:6 templates/header.html:11
++msgid "faq"
++msgstr "常见问题"
++
++#: templates/footer.html:8
++msgid "Contact"
++msgstr "联系我们"
++
++#: templates/footer.html:9
++msgid "Privacy"
++msgstr "隐私政策"
++
++#: templates/footer.html:10
++msgid "Feedback"
++msgstr "用户反馈"
++
++#: templates/header.html:6 templates/logout.html:5 templates/logout.html.py:16
++msgid "Logout"
++msgstr "退出登录"
++
++#: templates/header.html:8
++msgid "Login"
++msgstr "登录"
++
++#: templates/header.html:21
++msgid "link to homepage"
++msgstr "返回首页"
++
++#: templates/header.html:27 templates/header.html.py:56
++#: templates/index.html:21
++msgid "Questions"
++msgstr "问题"
++
++#: templates/header.html:28 templates/header.html.py:57
++msgid "Tags"
++msgstr "标签"
++
++#: templates/header.html:29 templates/header.html.py:58
++msgid "Users"
++msgstr "用户"
++
++#: templates/header.html:30
++msgid "Books"
++msgstr "读书"
++
++#: templates/header.html:32
++msgid "Unanswered"
++msgstr "没有回答的问题"
++
++#: templates/header.html:38
++msgid "Ask a question"
++msgstr "我要提问"
++
++#: templates/header.html:53
++msgid "Search"
++msgstr "搜索"
++
++#: templates/index.html:6
++msgid "Home"
++msgstr "首页"
++
++#: templates/index.html:23 templates/questions.html:25
++msgid "Newest updated questions"
++msgstr "最新更新的问题"
++
++#: templates/index.html:23 templates/questions.html:24
++msgid "Newest"
++msgstr "最新问题"
++
++#: templates/index.html:24 templates/questions.html:26
++msgid "Questions with most answers"
++msgstr "被回复最多的问题"
++
++#: templates/index.html:24 templates/questions.html:26
++msgid "Hottest"
++msgstr "最热问题"
++
++#: templates/index.html:25 templates/questions.html:27
++msgid "Questions with most votes"
++msgstr "被投票最多的问题"
++
++#: templates/index.html:25 templates/questions.html:27
++msgid "Best"
++msgstr "最有价值问题"
++
++#: templates/index.html:26 templates/index.html.py:118
++#: templates/questions.html:22
++msgid "All questions"
++msgstr "所有问题"
++
++#: templates/index.html:26
++msgid "All"
++msgstr "所有问题"
++
++#: templates/index.html:45 templates/questions.html:44
++msgid "Answers"
++msgstr "回答"
++
++#: templates/index.html:47 templates/questions.html:46
++msgid "Visits"
++msgstr "访问"
++
++#: templates/index.html:55 templates/questions.html:57
++#: templates/questions.html.py:69
++msgid "Community wiki"
++msgstr "社区wiki"
++
++#: templates/index.html:67 templates/index.html.py:91
++#: templates/questions.html:83
++msgid "Browse questions with tag of "
++msgstr "查看所有以下主题问题："
++
++#: templates/index.html:87
++msgid "Recent tags"
++msgstr "最新标签"
++
++#: templates/index.html:94 templates/index.html.py:118
++msgid "Popular tags"
++msgstr "受欢迎的标签"
++
++#: templates/index.html:98
++msgid "Recent badges"
++msgstr "最新奖牌"
++
++#: templates/index.html:109
++msgid "All badges"
++msgstr "所有奖牌"
++
++#: templates/index.html:113
++msgid "RSS feed of recent 30 questions"
++msgstr "RSS订阅最新30个问题"
++
++#: templates/index.html:113
++msgid "Subscribe"
++msgstr "订阅最新问题"
++
++#: templates/index.html:118
++msgid "Are you looking for more questions? Try to browse"
++msgstr "在寻找更多问题吗？请查阅"
++
++#: templates/index.html:118
++msgid " or "
++msgstr " 或者 "
++
++#: templates/index.html:118
++msgid ". Please help us answer "
++msgstr "。请帮助我们回答"
++
++#: templates/index.html:118
++msgid "Unanswered questions"
++msgstr "没有回答的问题"
++
++#: templates/pagesize.html:5
++msgid "Size per page:"
++msgstr "每页显示："
++
++#: templates/paginator.html:5
++msgid "Previous"
++msgstr "上一页"
++
++#: templates/questions.html:6
++msgid "Question list"
++msgstr "问题列表"
++
++#: templates/questions.html:22
++msgid "Tagged questions"
++msgstr "标签问题"
++
++#: templates/questions.html:22
++msgid "Query result"
++msgstr "查询结果"
++
++#: templates/questions.html:24
++msgid "New questions"
++msgstr "最新问题"
++
++#: templates/questions.html:25
++msgid "Active"
++msgstr "活跃问题"
++
++#: templates/questions.html:125
++msgid "Related tags"
++msgstr "相关标签"
++
++#: templates/authopenid/changeemail.html:10
++msgid "Account: change email"
++msgstr "修改电子邮件"
++
++#: templates/authopenid/changeemail.html:13
++msgid ""
++"This is where you can change the email address associated with your account. "
++"Please keep this email address up to date so we can send you a password-"
++"reset email if you request one."
++msgstr ""
++"您可以在这里修改您的电子邮件，请确保这个邮件地址有效-找回密码将发送新密码到您"
++"的邮件地址。"
++
++#: templates/authopenid/changeemail.html:15
++#: templates/authopenid/changeopenid.html:13
++#: templates/authopenid/changepw.html:18 templates/authopenid/delete.html:14
++#: templates/authopenid/delete.html:24
++msgid "Please correct errors below:"
++msgstr "请改正以下错误："
++
++#: templates/authopenid/changeemail.html:32
++msgid "Email"
++msgstr "电子邮件"
++
++#: templates/authopenid/changeemail.html:33
++msgid "Password"
++msgstr "密码"
++
++#: templates/authopenid/changeemail.html:35
++msgid "Change email"
++msgstr "修改电子邮件"
++
++#: templates/authopenid/changeopenid.html:7
++msgid "Account: change OpenID URL"
++msgstr "修改OpenID地址"
++
++#: templates/authopenid/changeopenid.html:11
++msgid ""
++"This is where you can change your OpenID URL. Make sure you remember it!"
++msgstr "请修改您的OpenID地址，请不要忘记这个地址！"
++
++#: templates/authopenid/changeopenid.html:28
++msgid "OpenID URL:"
++msgstr "OpenID地址："
++
++#: templates/authopenid/changeopenid.html:29
++msgid "Change OpenID"
++msgstr "修改OpenID"
++
++#: templates/authopenid/changepw.html:13
++msgid "Account: change password"
++msgstr "修改密码"
++
++#: templates/authopenid/changepw.html:16
++msgid "This is where you can change your password. Make sure you remember it!"
++msgstr "请修改您的密码，切记不要忘记！"
++
++#: templates/authopenid/changepw.html:26
++msgid "Current password"
++msgstr "旧密码"
++
++#: templates/authopenid/changepw.html:27
++msgid "New password"
++msgstr "新密码"
++
++#: templates/authopenid/changepw.html:28
++msgid "New password again"
++msgstr "重复密码"
++
++#: templates/authopenid/changepw.html:29
++msgid "Change password"
++msgstr "修改密码"
++
++#: templates/authopenid/delete.html:8
++msgid "Account: delete account"
++msgstr "删除帐号"
++
++#: templates/authopenid/delete.html:12
++msgid ""
++"Note: After deleting your account, anyone will be able to register this "
++"username."
++msgstr "注意：删除您的帐号后，任何其他人可以再注册这个帐号。"
++
++#: templates/authopenid/delete.html:16
++msgid "Check confirm box, if you want delete your account."
++msgstr "如果确定删除，请选中多选框。"
++
++#: templates/authopenid/delete.html:19
++msgid "Password:"
++msgstr "密码："
++
++#: templates/authopenid/delete.html:31
++msgid "I am sure I want to delete my account."
++msgstr "我确认要删除这个帐号。"
++
++#: templates/authopenid/delete.html:32
++msgid "Password/OpenID URL"
++msgstr "密码/OpenID地址"
++
++#: templates/authopenid/delete.html:32
++msgid "(required for your security)"
++msgstr "（必需）"
++
++#: templates/authopenid/delete.html:34
++msgid "Delete account permanently"
++msgstr "永久删除帐号"
++
++#: templates/authopenid/settings.html:29
++msgid "Give your  account a new password."
++msgstr "修改密码"
++
++#: templates/authopenid/settings.html:31
++msgid "Add or update the email address associated with your account."
++msgstr "添加或者更新您的邮件地址。"
++
++#: templates/authopenid/settings.html:34
++msgid "Change openid associated to your account"
++msgstr "修改和你帐号绑定的OpenID地址"
++
++#: templates/authopenid/settings.html:38
++msgid "Erase your username and all your data from website"
++msgstr "删除您的帐号和所有内容"
++
++#, fuzzy
++#~ msgid "Badges "
++#~ msgstr "奖牌列表"
++
++#~ msgid ""
++#~ "This username is already                 taken. Please choose another."
++#~ msgstr "用户名已经被注册，请选用一个新的帐号。"
++
++#~ msgid "Your OpenID is verified! "
++#~ msgstr "您的OpenID帐号已经验证通过"
++
++#~ msgid "Associate your OpenID"
++#~ msgstr "绑定您的OpenID"
++
++#~ msgid ""
++#~ "\n"
++#~ "\t<p>If you're joining <strong>Sitename</strong>, associate your OpenID "
++#~ "with a new account. If you're already a member, associate with your "
++#~ "existing account.</p>\n"
++#~ "\t"
++#~ msgstr ""
++#~ "\n"
++#~ "\t<p>输入您的新帐号或者指定已经存在的帐号。</p>\n"
++#~ "\t"
++
++#~ msgid "A new account"
++#~ msgstr "新帐号"
++
++#~ msgid "An exisiting account"
++#~ msgstr "已经存在的帐号"
++
++#~ msgid "Account: Send a new password"
++#~ msgstr "发送一个新的密码"
++
++#~ msgid ""
++#~ "Lost your password ? Here you can ask to reset your password. Enter the "
++#~ "username you use  and you will get a confirmation email with your new "
++#~ "password. This new password will be activated only after you have clicked "
++#~ "on the link in the email."
++#~ msgstr ""
++#~ "丢失了您的密码？你可以在这里重设密码。输入用户名你会收到新的密码的邮件。密"
++#~ "码只有您在激活邮件中的链接才会被激活。"
++
++#~ msgid "Send new password"
++#~ msgstr "发送新密码"
+diff -ruN CNPROG/middleware/pagesize.py mikes/middleware/pagesize.py
+--- CNPROG/middleware/pagesize.py	1969-12-31 19:00:00.000000000 -0500
++++ mikes/middleware/pagesize.py	2009-07-25 19:09:58.108151006 -0400
+@@ -0,0 +1,29 @@
++# used in questions
++QUESTIONS_PAGE_SIZE = 10
++class QuestionsPageSizeMiddleware(object):
++    def process_request(self, request):
++        # Set flag to False by default. If it is equal to True, then need to be saved.
++        pagesize_changed = False
++        # get pagesize from session, if failed then get default value
++        user_page_size = request.session.get("pagesize", QUESTIONS_PAGE_SIZE)
++        # set pagesize equal to logon user specified value in database
++        if request.user.is_authenticated() and request.user.questions_per_page > 0:
++            user_page_size = request.user.questions_per_page
++
++        try:
++            # get new pagesize from UI selection
++            pagesize = int(request.GET.get('pagesize', user_page_size))
++            if pagesize <> user_page_size:
++                pagesize_changed = True
++
++        except ValueError:
++            pagesize  = user_page_size
++        
++        # save this pagesize to user database
++        if pagesize_changed:
++            if request.user.is_authenticated():
++                user = request.user
++                user.questions_per_page = pagesize
++                user.save()
++        # put pagesize into session
++        request.session["pagesize"] = pagesize
+\ No newline at end of file
+diff -ruN CNPROG/settings_local.py mikes/settings_local.py
+--- CNPROG/settings_local.py	2009-07-25 18:49:15.158341746 -0400
++++ mikes/settings_local.py	1969-12-31 19:00:00.000000000 -0500
+@@ -1,21 +0,0 @@
+-# encoding:utf-8
+-SITE_SRC_ROOT = '/change_me/'
+-
+-#for logging
+-import logging
+-LOG_FILENAME = SITE_SRC_ROOT + 'django.lanai.log'
+-logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,)
+-
+-DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
+-DATABASE_USER = 'root'               # Not used with sqlite3.
+-DATABASE_PASSWORD = ''               # Not used with sqlite3.
+-
+-MIDDLEWARE_CLASSES = (
+-    'django.middleware.gzip.GZipMiddleware',
+-    'django.contrib.sessions.middleware.SessionMiddleware',
+-    'django.middleware.locale.LocaleMiddleware',
+-    'django.middleware.common.CommonMiddleware',
+-    'django.contrib.auth.middleware.AuthenticationMiddleware',
+-    'django.middleware.transaction.TransactionMiddleware',
+-    #'debug_toolbar.middleware.DebugToolbarMiddleware',
+-)
+diff -ruN CNPROG/settings_local.py.dist mikes/settings_local.py.dist
+--- CNPROG/settings_local.py.dist	1969-12-31 19:00:00.000000000 -0500
++++ mikes/settings_local.py.dist	2009-07-25 19:09:58.108151006 -0400
+@@ -0,0 +1,25 @@
++SITE_SRC_ROOT = '/Users/sailing/Development/cnprog_beta2'
++
++#for logging
++import logging
++LOG_FILENAME = '/Users/sailing/Development/cnprog_beta2/django.lanai.log'
++logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,)
++
++
++#Database configuration 
++DATABASE_ENGINE = 'mysql'      
++DATABASE_HOST = ''            
++DATABASE_PORT = ''          
++DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
++DATABASE_USER = 'root'               # Not used with sqlite3.
++DATABASE_PASSWORD = ''               # Not used with sqlite3.
++
++
++# Absolute path to the directory that holds media.
++# Example: "/home/media/media.lawrence.com/"
++MEDIA_ROOT = '/Users/sailing/Development/cnprog_beta2/templates/upfiles/'
++
++# URL that handles the media served from MEDIA_ROOT. Make sure to use a
++# trailing slash if there is a path component (optional in other cases).
++# Examples: "http://media.lawrence.com", "http://example.com/media/"
++MEDIA_URL = 'http://127.0.0.1:8000/upfiles/'
+diff -ruN CNPROG/settings.py mikes/settings.py
+--- CNPROG/settings.py	2009-07-25 18:49:15.158341746 -0400
++++ mikes/settings.py	2009-07-25 19:09:58.108151006 -0400
+@@ -1,51 +1,24 @@
++# encoding:utf-8
+ # Django settings for lanai project.
+ import os.path
+ 
++#DEBUG SETTINGS
+ DEBUG = True
+ TEMPLATE_DEBUG = DEBUG
+-
+-
+-#David Cramer debug toolbar
+ INTERNAL_IPS = ('127.0.0.1',)
+-DEBUG_TOOLBAR_PANELS = (
+-    'debug_toolbar.panels.sql.SQLDebugPanel',
+-    'debug_toolbar.panels.headers.HeaderDebugPanel',
+-    'debug_toolbar.panels.cache.CacheDebugPanel',
+-    'debug_toolbar.panels.profiler.ProfilerDebugPanel',
+-    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
+-    'debug_toolbar.panels.templates.TemplatesDebugPanel',
+-    # If you are using the profiler panel you don't need the timer
+-    # 'debug_toolbar.panels.timer.TimerDebugPanel',
+-)
+-
+-DEBUG_TOOLBAR_CONFIG = {
+-    "INTERCEPT_REDIRECTS":False
+-}
+ 
+ #for OpenID auth
+ ugettext = lambda s: s
+ LOGIN_URL = '/%s%s' % (ugettext('account/'), ugettext('signin/'))
+ 
+-#system will send admins email about error stacktrace if DEBUG=False
++#EMAIL AND ADMINS
+ ADMINS = (
+-    ('you', 'you@where.com'),
++    ('CNProg team', 'team@cnprog.com'),
+ )
+-
+ MANAGERS = ADMINS
+ 
+-DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+-#DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
+-#DATABASE_USER = 'root'             # Not used with sqlite3.
+-#DATABASE_PASSWORD = ''         # Not used with sqlite3.
+-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
+-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+-
+-DATABASE_NAME = 'dbname'             # Or path to database file if using sqlite3.
+-DATABASE_USER = 'dbuser'             # Not used with sqlite3.
+-DATABASE_PASSWORD = 'dbpass'         # Not used with sqlite3.
+-
+-SERVER_EMAIL = 'server@where.com'
+-DEFAULT_FROM_EMAIL = 'from@where.com'
++SERVER_EMAIL = 'webmaster@cnprog.com'
++DEFAULT_FROM_EMAIL = 'webmaster@cnprog.com'
+ EMAIL_HOST_USER = ''
+ EMAIL_HOST_PASSWORD = ''
+ EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
+@@ -53,44 +26,21 @@
+ EMAIL_PORT='587'
+ EMAIL_USE_TLS=True
+ 
+-
+-
+-
+-# Local time zone for this installation. Choices can be found here:
+-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+-# although not all choices may be available on all operating systems.
+-# If running in a Windows environment this must be set to the same as your
+-# system time zone.
+-TIME_ZONE = 'America/Chicago'
+-
+-# Language code for this installation. All choices can be found here:
+-# http://www.i18nguy.com/unicode/language-identifiers.html
+-#LANGUAGE_CODE = 'en'
++#LOCALIZATIONS
++TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
++# LANGUAGE_CODE = 'en-us'
+ LANGUAGE_CODE = 'zh-cn'
+-
+ SITE_ID = 1
+-
+-# If you set this to False, Django will make some optimizations so as not
+-# to load the internationalization machinery.
+ USE_I18N = True
+ 
+-# Absolute path to the directory that holds media.
+-# Example: "/home/media/media.lawrence.com/"
+-MEDIA_ROOT = '/var/www/vhosts/cnprog/templates/upfiles/'
+-
+-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+-# trailing slash if there is a path component (optional in other cases).
+-# Examples: "http://media.lawrence.com", "http://example.com/media/"
+-MEDIA_URL = 'http://where.com/upfiles/'
+-
+-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+-# trailing slash.
+-# Examples: "http://foo.com/media/", "/media/".
++#OTHER SETTINS
++APP_TITLE = u'CNProg.com 程序员问答社区'
++APP_URL = 'http://www.cnprog.com'
++APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
++APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
++APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
+ ADMIN_MEDIA_PREFIX = '/admin/media/'
+-
+-# Make this unique, and don't share it with anybody.
+-SECRET_KEY = '$oo^&_m&qwbib=ffljk_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
+-
++SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
+ # List of callables that know how to import templates from various sources.
+ TEMPLATE_LOADERS = (
+     'django.template.loaders.filesystem.load_template_source',
+@@ -105,12 +55,15 @@
+     'django.middleware.common.CommonMiddleware',
+     'django.contrib.auth.middleware.AuthenticationMiddleware',
+     'django.middleware.transaction.TransactionMiddleware',
+-    'debug_toolbar.middleware.DebugToolbarMiddleware',
++    #'django.middleware.sqlprint.SqlPrintingMiddleware',
++    'middleware.pagesize.QuestionsPageSizeMiddleware',
++    #'debug_toolbar.middleware.DebugToolbarMiddleware',
+ )
+ 
+ TEMPLATE_CONTEXT_PROCESSORS = (
+     'django.core.context_processors.request',
+     'django.core.context_processors.auth',
++    'context.application_settings'
+ )
+ 
+ ROOT_URLCONF = 'urls'
+@@ -119,6 +72,7 @@
+     os.path.join(os.path.dirname(__file__), 'templates').replace('\\','/'),
+ )
+ 
++#UPLOAD SETTINGS
+ FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\\','/')
+ FILE_UPLOAD_HANDLERS = ("django.core.files.uploadhandler.MemoryFileUploadHandler",
+  "django.core.files.uploadhandler.TemporaryFileUploadHandler",)
+@@ -139,6 +93,7 @@
+     'django_authopenid',
+     'debug_toolbar' ,
+ )
+-#local configs
+-from settings_local import *
+-
++
++# User settings
++from settings_local import *
++
+diff -ruN CNPROG/templates/allfiles mikes/templates/allfiles
+--- CNPROG/templates/allfiles	2009-06-22 21:42:52.000000000 -0400
++++ mikes/templates/allfiles	1969-12-31 19:00:00.000000000 -0500
+@@ -1,30 +0,0 @@
+-404.html
+-500.html
+-about.html
+-ask.html
+-badges.html
+-base_content.html
+-base.html
+-book.html
+-close.html
+-faq.html
+-footer.html
+-header.html
+-index.html
+-logout.html
+-pagesize.html
+-paginator.html
+-privacy.html
+-question_edit_tips.html
+-question.html
+-questions.html
+-revisions_answer.html
+-tags.html
+-unanswered.html
+-user_edit.html
+-user_info.html
+-users.html
+-users_questions.html
+-user_stats.html
+-user_tabs.html
+-user_votes.html
+diff -ruN CNPROG/templates/authopenid/htmlfiles mikes/templates/authopenid/htmlfiles
+--- CNPROG/templates/authopenid/htmlfiles	2009-06-22 21:42:52.000000000 -0400
++++ mikes/templates/authopenid/htmlfiles	1969-12-31 19:00:00.000000000 -0500
+@@ -1,8 +0,0 @@
+-changeemail.html
+-changeopenid.html
+-changepw.html
+-delete.html
+-failure.html
+-sendpw.html
+-settings.html
+-signup.html
+diff -ruN CNPROG/templates/base_content.html mikes/templates/base_content.html
+--- CNPROG/templates/base_content.html	2009-06-22 21:49:26.000000000 -0400
++++ mikes/templates/base_content.html	2009-07-25 19:09:58.118151716 -0400
+@@ -1,9 +1,8 @@
++{% load i18n %}
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+-<!-- template base_content.html -->
+-{% load i18n %}
+ <html>
+     <head>
+-        <title>{% block title %}{% endblock %} - {% trans "site title" %} - {% trans "site slogan" %}</title>
++        <title>{% block title %}{% endblock %} - {{ APP_TITLE }}</title>
+         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+         <meta name="verify-v1" content="55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA=" />
+         <link rel="shortcut icon" href="/content/images/favicon.ico" >
+@@ -83,4 +74,3 @@
+         {% endblock %}
+     </body>
+ </html>
+-<!-- end template base_content.html -->
+diff -ruN CNPROG/templates/base.html mikes/templates/base.html
+--- CNPROG/templates/base.html	2009-06-22 21:49:58.000000000 -0400
++++ mikes/templates/base.html	2009-07-25 19:09:58.118151716 -0400
+@@ -48,6 +40,7 @@
+                 notify.show();
+             });
+         </script>
++       
+         {% endif %}
+         {% endwith %}
+       
+@@ -88,4 +81,3 @@
+         {% endblock %}
+     </body>
+ </html>
+-<!-- end template base.html -->
+diff -ruN CNPROG/templates/content/js/com.cnprog.post.js mikes/templates/content/js/com.cnprog.post.js
+--- CNPROG/templates/content/js/com.cnprog.post.js	2009-06-22 21:42:51.000000000 -0400
++++ mikes/templates/content/js/com.cnprog.post.js	2009-07-25 19:09:58.138152577 -0400
+@@ -613,4 +570,4 @@
+ Prettify
+ http://www.apache.org/licenses/LICENSE-2.0
+ */
+-var PR_SHOULD_USE_CONTINUATION = true; var PR_TAB_WIDTH = 8; var PR_normalizedHtml; var PR; var prettyPrintOne; var prettyPrint; function _pr_isIE6() { var isIE6 = navigator && navigator.userAgent && /\bMSIE 6\./.test(navigator.userAgent); _pr_isIE6 = function() { return isIE6; }; return isIE6; } (function() { function wordSet(words) { words = words.split(/ /g); var set = {}; for (var i = words.length; --i >= 0; ) { var w = words[i]; if (w) { set[w] = null; } } return set; } var FLOW_CONTROL_KEYWORDS = "break continue do else for if return while "; var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " + "double enum extern float goto int long register short signed sizeof " + "static struct switch typedef union unsigned void volatile "; var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " + "new operator private protected public this throw true try "; var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " + "concept concept_map const_cast constexpr decltype " + "dynamic_cast explicit export friend inline late_check " + "mutable namespace nullptr reinterpret_cast static_assert static_cast " + "template typeid typename typeof using virtual wchar_t where "; var JAVA_KEYWORDS = COMMON_KEYWORDS + "boolean byte extends final finally implements import instanceof null " + "native package strictfp super synchronized throws transient "; var CSHARP_KEYWORDS = JAVA_KEYWORDS + "as base by checked decimal delegate descending event " + "fixed foreach from group implicit in interface internal into is lock " + "object out override orderby params readonly ref sbyte sealed " + "stackalloc string select uint ulong unchecked unsafe ushort var "; var JSCRIPT_KEYWORDS = COMMON_KEYWORDS + "debugger eval export function get null set undefined var with " + "Infinity NaN "; var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " + "goto if import last local my next no our print package redo require " + "sub undef unless until use wantarray while BEGIN END "; var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " + "elif except exec finally from global import in is lambda " + "nonlocal not or pass print raise try with yield " + "False True None "; var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" + " defined elsif end ensure false in module next nil not or redo rescue " + "retry self super then true undef unless until when yield BEGIN END "; var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " + "function in local set then until "; var ALL_KEYWORDS = (CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS + PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS); var PR_STRING = 'str'; var PR_KEYWORD = 'kwd'; var PR_COMMENT = 'com'; var PR_TYPE = 'typ'; var PR_LITERAL = 'lit'; var PR_PUNCTUATION = 'pun'; var PR_PLAIN = 'pln'; var PR_TAG = 'tag'; var PR_DECLARATION = 'dec'; var PR_SOURCE = 'src'; var PR_ATTRIB_NAME = 'atn'; var PR_ATTRIB_VALUE = 'atv'; var PR_NOCODE = 'nocode'; function isWordChar(ch) { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'); } function spliceArrayInto(inserted, container, containerPosition, countReplaced) { inserted.unshift(containerPosition, countReplaced || 0); try { container.splice.apply(container, inserted); } finally { inserted.splice(0, 2); } } var REGEXP_PRECEDER_PATTERN = function() { var preceders = ["!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=", "&=", "(", "*", "*=", "+=", ",", "-=", "->", "/", "/=", ":", "::", ";", "<", "<<", "<<=", "<=", "=", "==", "===", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "||=", "~", "break", "case", "continue", "delete", "do", "else", "finally", "instanceof", "return", "throw", "try", "typeof"]; var pattern = '(?:' + '(?:(?:^|[^0-9.])\\.{1,3})|' + '(?:(?:^|[^\\+])\\+)|' + '(?:(?:^|[^\\-])-)'; for (var i = 0; i < preceders.length; ++i) { var preceder = preceders[i]; if (isWordChar(preceder.charAt(0))) { pattern += '|\\b' + preceder; } else { pattern += '|' + preceder.replace(/([^=<>:&])/g, '\\$1'); } } pattern += '|^)\\s*$'; return new RegExp(pattern); } (); var pr_amp = /&/g; var pr_lt = /</g; var pr_gt = />/g; var pr_quot = /\"/g; function attribToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;').replace(pr_quot, '&quot;'); } function textToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;'); } var pr_ltEnt = /&lt;/g; var pr_gtEnt = /&gt;/g; var pr_aposEnt = /&apos;/g; var pr_quotEnt = /&quot;/g; var pr_ampEnt = /&amp;/g; var pr_nbspEnt = /&nbsp;/g; function htmlToText(html) { var pos = html.indexOf('&'); if (pos < 0) { return html; } for (--pos; (pos = html.indexOf('&#', pos + 1)) >= 0; ) { var end = html.indexOf(';', pos); if (end >= 0) { var num = html.substring(pos + 3, end); var radix = 10; if (num && num.charAt(0) === 'x') { num = num.substring(1); radix = 16; } var codePoint = parseInt(num, radix); if (!isNaN(codePoint)) { html = (html.substring(0, pos) + String.fromCharCode(codePoint) + html.substring(end + 1)); } } } return html.replace(pr_ltEnt, '<').replace(pr_gtEnt, '>').replace(pr_aposEnt, "'").replace(pr_quotEnt, '"').replace(pr_ampEnt, '&').replace(pr_nbspEnt, ' '); } function isRawContent(node) { return 'XMP' === node.tagName; } function normalizedHtml(node, out) { switch (node.nodeType) { case 1: var name = node.tagName.toLowerCase(); out.push('<', name); for (var i = 0; i < node.attributes.length; ++i) { var attr = node.attributes[i]; if (!attr.specified) { continue; } out.push(' '); normalizedHtml(attr, out); } out.push('>'); for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } if (node.firstChild || !/^(?:br|link|img)$/.test(name)) { out.push('<\/', name, '>'); } break; case 2: out.push(node.name.toLowerCase(), '="', attribToHtml(node.value), '"'); break; case 3: case 4: out.push(textToHtml(node.nodeValue)); break; } } var PR_innerHtmlWorks = null; function getInnerHtml(node) { if (null === PR_innerHtmlWorks) { var testNode = document.createElement('PRE'); testNode.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />')); PR_innerHtmlWorks = !/</.test(testNode.innerHTML); } if (PR_innerHtmlWorks) { var content = node.innerHTML; if (isRawContent(node)) { content = textToHtml(content); } return content; } var out = []; for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } return out.join(''); } function makeTabExpander(tabWidth) { var SPACES = '                '; var charInLine = 0; return function(plainText) { var out = null; var pos = 0; for (var i = 0, n = plainText.length; i < n; ++i) { var ch = plainText.charAt(i); switch (ch) { case '\t': if (!out) { out = []; } out.push(plainText.substring(pos, i)); var nSpaces = tabWidth - (charInLine % tabWidth); charInLine += nSpaces; for (; nSpaces >= 0; nSpaces -= SPACES.length) { out.push(SPACES.substring(0, nSpaces)); } pos = i + 1; break; case '\n': charInLine = 0; break; default: ++charInLine; } } if (!out) { return plainText; } out.push(plainText.substring(pos)); return out.join(''); }; } var pr_chunkPattern = /(?:[^<]+|<!--[\s\S]*?-->|<!\[CDATA\[([\s\S]*?)\]\]>|<\/?[a-zA-Z][^>]*>|<)/g; var pr_commentPrefix = /^<!--/; var pr_cdataPrefix = /^<\[CDATA\[/; var pr_brPrefix = /^<br\b/i; var pr_tagNameRe = /^<(\/?)([a-zA-Z]+)/; function extractTags(s) { var matches = s.match(pr_chunkPattern); var sourceBuf = []; var sourceBufLen = 0; var extractedTags = []; if (matches) { for (var i = 0, n = matches.length; i < n; ++i) { var match = matches[i]; if (match.length > 1 && match.charAt(0) === '<') { if (pr_commentPrefix.test(match)) { continue; } if (pr_cdataPrefix.test(match)) { sourceBuf.push(match.substring(9, match.length - 3)); sourceBufLen += match.length - 12; } else if (pr_brPrefix.test(match)) { sourceBuf.push('\n'); ++sourceBufLen; } else { if (match.indexOf(PR_NOCODE) >= 0 && isNoCodeTag(match)) { var name = match.match(pr_tagNameRe)[2]; var depth = 1; end_tag_loop: for (var j = i + 1; j < n; ++j) { var name2 = matches[j].match(pr_tagNameRe); if (name2 && name2[2] === name) { if (name2[1] === '/') { if (--depth === 0) { break end_tag_loop; } } else { ++depth; } } } if (j < n) { extractedTags.push(sourceBufLen, matches.slice(i, j + 1).join('')); i = j; } else { extractedTags.push(sourceBufLen, match); } } else { extractedTags.push(sourceBufLen, match); } } } else { var literalText = htmlToText(match); sourceBuf.push(literalText); sourceBufLen += literalText.length; } } } return { source: sourceBuf.join(''), tags: extractedTags }; } function isNoCodeTag(tag) { return !!tag.replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g, ' $1="$2$3$4"').match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/); } function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) { var shortcuts = {}; (function() { var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns); for (var i = allPatterns.length; --i >= 0; ) { var patternParts = allPatterns[i]; var shortcutChars = patternParts[3]; if (shortcutChars) { for (var c = shortcutChars.length; --c >= 0; ) { shortcuts[shortcutChars.charAt(c)] = patternParts; } } } })(); var nPatterns = fallthroughStylePatterns.length; var notWs = /\S/; return function(sourceCode, opt_basePos) { opt_basePos = opt_basePos || 0; var decorations = [opt_basePos, PR_PLAIN]; var lastToken = ''; var pos = 0; var tail = sourceCode; while (tail.length) { var style; var token = null; var match; var patternParts = shortcuts[tail.charAt(0)]; if (patternParts) { match = tail.match(patternParts[1]); token = match[0]; style = patternParts[0]; } else { for (var i = 0; i < nPatterns; ++i) { patternParts = fallthroughStylePatterns[i]; var contextPattern = patternParts[2]; if (contextPattern && !contextPattern.test(lastToken)) { continue; } match = tail.match(patternParts[1]); if (match) { token = match[0]; style = patternParts[0]; break; } } if (!token) { style = PR_PLAIN; token = tail.substring(0, 1); } } decorations.push(opt_basePos + pos, style); pos += token.length; tail = tail.substring(token.length); if (style !== PR_COMMENT && notWs.test(token)) { lastToken = token; } } return decorations; }; } var PR_MARKUP_LEXER = createSimpleLexer([], [[PR_PLAIN, /^[^<]+/, null], [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/, null], [PR_COMMENT, /^<!--[\s\S]*?(?:-->|$)/, null], [PR_SOURCE, /^<\?[\s\S]*?(?:\?>|$)/, null], [PR_SOURCE, /^<%[\s\S]*?(?:%>|$)/, null], [PR_SOURCE, /^<(script|style|xmp)\b[^>]*>[\s\S]*?<\/\1\b[^>]*>/i, null], [PR_TAG, /^<\/?\w[^<>]*>/, null]]); var PR_SOURCE_CHUNK_PARTS = /^(<[^>]*>)([\s\S]*)(<\/[^>]*>)$/; function tokenizeMarkup(source) { var decorations = PR_MARKUP_LEXER(source); for (var i = 0; i < decorations.length; i += 2) { if (decorations[i + 1] === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var sourceChunk = source.substring(start, end); var match = sourceChunk.match(PR_SOURCE_CHUNK_PARTS); if (match) { decorations.splice(i, 2, start, PR_TAG, start + match[1].length, PR_SOURCE, start + match[1].length + (match[2] || '').length, PR_TAG); } } } return decorations; } var PR_TAG_LEXER = createSimpleLexer([[PR_ATTRIB_VALUE, /^\'[^\']*(?:\'|$)/, null, "'"], [PR_ATTRIB_VALUE, /^\"[^\"]*(?:\"|$)/, null, '"'], [PR_PUNCTUATION, /^[<>\/=]+/, null, '<>/=']], [[PR_TAG, /^[\w:\-]+/, /^</], [PR_ATTRIB_VALUE, /^[\w\-]+/, /^=/], [PR_ATTRIB_NAME, /^[\w:\-]+/, null], [PR_PLAIN, /^\s+/, null, ' \t\r\n']]); function splitTagAttributes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_TAG) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var chunk = source.substring(start, end); var subDecorations = PR_TAG_LEXER(chunk, start); spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function sourceDecorator(options) { var shortcutStylePatterns = [], fallthroughStylePatterns = []; if (options.tripleQuotedStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/, null, '\'"']); } else if (options.multiLineStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/, null, '\'"`']); } else { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, null, '"\'']); } fallthroughStylePatterns.push([PR_PLAIN, /^(?:[^\'\"\`\/\#]+)/, null, ' \r\n']); if (options.hashComments) { shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']); } if (options.cStyleComments) { fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]); fallthroughStylePatterns.push([PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]); } if (options.regexLiterals) { var REGEX_LITERAL = ('^/(?=[^/*])' + '(?:[^/\\x5B\\x5C]' + '|\\x5C[\\s\\S]' + '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+' + '(?:/|$)'); fallthroughStylePatterns.push([PR_STRING, new RegExp(REGEX_LITERAL), REGEXP_PRECEDER_PATTERN]); } var keywords = wordSet(options.keywords); options = null; var splitStringAndCommentTokens = createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns); var styleLiteralIdentifierPuncRecognizer = createSimpleLexer([], [[PR_PLAIN, /^\s+/, null, ' \r\n'], [PR_PLAIN, /^[a-z_$@][a-z_$@0-9]*/i, null], [PR_LITERAL, /^0x[a-f0-9]+[a-z]/i, null], [PR_LITERAL, /^(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?[a-z]*/i, null, '123456789'], [PR_PUNCTUATION, /^[^\s\w\.$@]+/, null]]); function splitNonStringNonCommentTokens(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_PLAIN) { var start, end, chunk, subDecs; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; chunk = source.substring(start, end); subDecs = styleLiteralIdentifierPuncRecognizer(chunk, start); for (var j = 0, m = subDecs.length; j < m; j += 2) { var subStyle = subDecs[j + 1]; if (subStyle === PR_PLAIN) { var subStart = subDecs[j]; var subEnd = j + 2 < m ? subDecs[j + 2] : chunk.length; var token = source.substring(subStart, subEnd); if (token === '.') { subDecs[j + 1] = PR_PUNCTUATION; } else if (token in keywords) { subDecs[j + 1] = PR_KEYWORD; } else if (/^@?[A-Z][A-Z$]*[a-z][A-Za-z$]*$/.test(token)) { subDecs[j + 1] = token.charAt(0) === '@' ? PR_LITERAL : PR_TYPE; } } } spliceArrayInto(subDecs, decorations, i, 2); i += subDecs.length - 2; } } return decorations; } return function(sourceCode) { var decorations = splitStringAndCommentTokens(sourceCode); decorations = splitNonStringNonCommentTokens(sourceCode, decorations); return decorations; }; } var decorateSource = sourceDecorator({ keywords: ALL_KEYWORDS, hashComments: true, cStyleComments: true, multiLineStrings: true, regexLiterals: true }); function splitSourceNodes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var subDecorations = decorateSource(source.substring(start, end)); for (var j = 0, m = subDecorations.length; j < m; j += 2) { subDecorations[j] += start; } spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function splitSourceAttributes(source, decorations) { var nextValueIsSource = false; for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; var start, end; if (style === PR_ATTRIB_NAME) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; nextValueIsSource = /^on|^style$/i.test(source.substring(start, end)); } else if (style === PR_ATTRIB_VALUE) { if (nextValueIsSource) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var attribValue = source.substring(start, end); var attribLen = attribValue.length; var quoted = (attribLen >= 2 && /^[\"\']/.test(attribValue) && attribValue.charAt(0) === attribValue.charAt(attribLen - 1)); var attribSource; var attribSourceStart; var attribSourceEnd; if (quoted) { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue; } else { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue.substring(1, attribValue.length - 1); } var attribSourceDecorations = decorateSource(attribSource); for (var j = 0, m = attribSourceDecorations.length; j < m; j += 2) { attribSourceDecorations[j] += attribSourceStart; } if (quoted) { attribSourceDecorations.push(attribSourceEnd, PR_ATTRIB_VALUE); spliceArrayInto(attribSourceDecorations, decorations, i + 2, 0); } else { spliceArrayInto(attribSourceDecorations, decorations, i, 2); } } nextValueIsSource = false; } } return decorations; } function decorateMarkup(sourceCode) { var decorations = tokenizeMarkup(sourceCode); decorations = splitTagAttributes(sourceCode, decorations); decorations = splitSourceNodes(sourceCode, decorations); decorations = splitSourceAttributes(sourceCode, decorations); return decorations; } function recombineTagsAndDecorations(sourceText, extractedTags, decorations) { var html = []; var outputIdx = 0; var openDecoration = null; var currentDecoration = null; var tagPos = 0; var decPos = 0; var tabExpander = makeTabExpander(PR_TAB_WIDTH); var adjacentSpaceRe = /([\r\n ]) /g; var startOrSpaceRe = /(^| ) /gm; var newlineRe = /\r\n?|\n/g; var trailingSpaceRe = /[ \r\n]$/; var lastWasSpace = true; function emitTextUpTo(sourceIdx) { if (sourceIdx > outputIdx) { if (openDecoration && openDecoration !== currentDecoration) { html.push('</span>'); openDecoration = null; } if (!openDecoration && currentDecoration) { openDecoration = currentDecoration; html.push('<span class="', openDecoration, '">'); } var htmlChunk = textToHtml(tabExpander(sourceText.substring(outputIdx, sourceIdx))).replace(lastWasSpace ? startOrSpaceRe : adjacentSpaceRe, '$1&nbsp;'); lastWasSpace = trailingSpaceRe.test(htmlChunk); html.push(htmlChunk.replace(newlineRe, '<br />')); outputIdx = sourceIdx; } } while (true) { var outputTag; if (tagPos < extractedTags.length) { if (decPos < decorations.length) { outputTag = extractedTags[tagPos] <= decorations[decPos]; } else { outputTag = true; } } else { outputTag = false; } if (outputTag) { emitTextUpTo(extractedTags[tagPos]); if (openDecoration) { html.push('</span>'); openDecoration = null; } html.push(extractedTags[tagPos + 1]); tagPos += 2; } else if (decPos < decorations.length) { emitTextUpTo(decorations[decPos]); currentDecoration = decorations[decPos + 1]; decPos += 2; } else { break; } } emitTextUpTo(sourceText.length); if (openDecoration) { html.push('</span>'); } return html.join(''); } var langHandlerRegistry = {}; function registerLangHandler(handler, fileExtensions) { for (var i = fileExtensions.length; --i >= 0; ) { var ext = fileExtensions[i]; if (!langHandlerRegistry.hasOwnProperty(ext)) { langHandlerRegistry[ext] = handler; } else if ('console' in window) { console.log('cannot override language handler %s', ext); } } } registerLangHandler(decorateSource, ['default-code']); registerLangHandler(decorateMarkup, ['default-markup', 'html', 'htm', 'xhtml', 'xml', 'xsl']); registerLangHandler(sourceDecorator({ keywords: CPP_KEYWORDS, hashComments: true, cStyleComments: true }), ['c', 'cc', 'cpp', 'cs', 'cxx', 'cyc']); registerLangHandler(sourceDecorator({ keywords: JAVA_KEYWORDS, cStyleComments: true }), ['java']); registerLangHandler(sourceDecorator({ keywords: SH_KEYWORDS, hashComments: true, multiLineStrings: true }), ['bsh', 'csh', 'sh']); registerLangHandler(sourceDecorator({ keywords: PYTHON_KEYWORDS, hashComments: true, multiLineStrings: true, tripleQuotedStrings: true }), ['cv', 'py']); registerLangHandler(sourceDecorator({ keywords: PERL_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['perl', 'pl', 'pm']); registerLangHandler(sourceDecorator({ keywords: RUBY_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['rb']); registerLangHandler(sourceDecorator({ keywords: JSCRIPT_KEYWORDS, cStyleComments: true, regexLiterals: true }), ['js']); function prettyPrintOne(sourceCodeHtml, opt_langExtension) { try { var sourceAndExtractedTags = extractTags(sourceCodeHtml); var source = sourceAndExtractedTags.source; var extractedTags = sourceAndExtractedTags.tags; if (!langHandlerRegistry.hasOwnProperty(opt_langExtension)) { opt_langExtension = /^\s*</.test(source) ? 'default-markup' : 'default-code'; } var decorations = langHandlerRegistry[opt_langExtension].call({}, source); return recombineTagsAndDecorations(source, extractedTags, decorations); } catch (e) { if ('console' in window) { console.log(e); console.trace(); } return sourceCodeHtml; } } function prettyPrint(opt_whenDone) { var isIE6 = _pr_isIE6(); var codeSegments = [document.getElementsByTagName('pre'), document.getElementsByTagName('code'), document.getElementsByTagName('xmp')]; var elements = []; for (var i = 0; i < codeSegments.length; ++i) { for (var j = 0; j < codeSegments[i].length; ++j) { elements.push(codeSegments[i][j]); } } codeSegments = null; var k = 0; function doWork() { var endTime = (PR_SHOULD_USE_CONTINUATION ? new Date().getTime() + 250 : Infinity); for (; k < elements.length && new Date().getTime() < endTime; k++) { var cs = elements[k]; if (cs.className && cs.className.indexOf('prettyprint') >= 0) { var langExtension = cs.className.match(/\blang-(\w+)\b/); if (langExtension) { langExtension = langExtension[1]; } var nested = false; for (var p = cs.parentNode; p; p = p.parentNode) { if ((p.tagName === 'pre' || p.tagName === 'code' || p.tagName === 'xmp') && p.className && p.className.indexOf('prettyprint') >= 0) { nested = true; break; } } if (!nested) { var content = getInnerHtml(cs); content = content.replace(/(?:\r\n?|\n)$/, ''); var newContent = prettyPrintOne(content, langExtension); if (!isRawContent(cs)) { cs.innerHTML = newContent; } else { var pre = document.createElement('PRE'); for (var i = 0; i < cs.attributes.length; ++i) { var a = cs.attributes[i]; if (a.specified) { var aname = a.name.toLowerCase(); if (aname === 'class') { pre.className = a.value; } else { pre.setAttribute(a.name, a.value); } } } pre.innerHTML = newContent; cs.parentNode.replaceChild(pre, cs); cs = pre; } if (isIE6 && cs.tagName === 'PRE') { var lineBreaks = cs.getElementsByTagName('br'); for (var j = lineBreaks.length; --j >= 0; ) { var lineBreak = lineBreaks[j]; lineBreak.parentNode.replaceChild(document.createTextNode('\r\n'), lineBreak); } } } } } if (k < elements.length) { setTimeout(doWork, 250); } else if (opt_whenDone) { opt_whenDone(); } } doWork(); } window['PR_normalizedHtml'] = normalizedHtml; window['prettyPrintOne'] = prettyPrintOne; window['prettyPrint'] = prettyPrint; window['PR'] = { 'createSimpleLexer': createSimpleLexer, 'registerLangHandler': registerLangHandler, 'sourceDecorator': sourceDecorator, 'PR_ATTRIB_NAME': PR_ATTRIB_NAME, 'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE, 'PR_COMMENT': PR_COMMENT, 'PR_DECLARATION': PR_DECLARATION, 'PR_KEYWORD': PR_KEYWORD, 'PR_LITERAL': PR_LITERAL, 'PR_NOCODE': PR_NOCODE, 'PR_PLAIN': PR_PLAIN, 'PR_PUNCTUATION': PR_PUNCTUATION, 'PR_SOURCE': PR_SOURCE, 'PR_STRING': PR_STRING, 'PR_TAG': PR_TAG, 'PR_TYPE': PR_TYPE }; })();
++var PR_SHOULD_USE_CONTINUATION = true; var PR_TAB_WIDTH = 8; var PR_normalizedHtml; var PR; var prettyPrintOne; var prettyPrint; function _pr_isIE6() { var isIE6 = navigator && navigator.userAgent && /\bMSIE 6\./.test(navigator.userAgent); _pr_isIE6 = function() { return isIE6; }; return isIE6; } (function() { function wordSet(words) { words = words.split(/ /g); var set = {}; for (var i = words.length; --i >= 0; ) { var w = words[i]; if (w) { set[w] = null; } } return set; } var FLOW_CONTROL_KEYWORDS = "break continue do else for if return while "; var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " + "double enum extern float goto int long register short signed sizeof " + "static struct switch typedef union unsigned void volatile "; var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " + "new operator private protected public this throw true try "; var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " + "concept concept_map const_cast constexpr decltype " + "dynamic_cast explicit export friend inline late_check " + "mutable namespace nullptr reinterpret_cast static_assert static_cast " + "template typeid typename typeof using virtual wchar_t where "; var JAVA_KEYWORDS = COMMON_KEYWORDS + "boolean byte extends final finally implements import instanceof null " + "native package strictfp super synchronized throws transient "; var CSHARP_KEYWORDS = JAVA_KEYWORDS + "as base by checked decimal delegate descending event " + "fixed foreach from group implicit in interface internal into is lock " + "object out override orderby params readonly ref sbyte sealed " + "stackalloc string select uint ulong unchecked unsafe ushort var "; var JSCRIPT_KEYWORDS = COMMON_KEYWORDS + "debugger eval export function get null set undefined var with " + "Infinity NaN "; var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " + "goto if import last local my next no our print package redo require " + "sub undef unless until use wantarray while BEGIN END "; var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " + "elif except exec finally from global import in is lambda " + "nonlocal not or pass print raise try with yield " + "False True None "; var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" + " defined elsif end ensure false in module next nil not or redo rescue " + "retry self super then true undef unless until when yield BEGIN END "; var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " + "function in local set then until "; var ALL_KEYWORDS = (CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS + PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS); var PR_STRING = 'str'; var PR_KEYWORD = 'kwd'; var PR_COMMENT = 'com'; var PR_TYPE = 'typ'; var PR_LITERAL = 'lit'; var PR_PUNCTUATION = 'pun'; var PR_PLAIN = 'pln'; var PR_TAG = 'tag'; var PR_DECLARATION = 'dec'; var PR_SOURCE = 'src'; var PR_ATTRIB_NAME = 'atn'; var PR_ATTRIB_VALUE = 'atv'; var PR_NOCODE = 'nocode'; function isWordChar(ch) { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'); } function spliceArrayInto(inserted, container, containerPosition, countReplaced) { inserted.unshift(containerPosition, countReplaced || 0); try { container.splice.apply(container, inserted); } finally { inserted.splice(0, 2); } } var REGEXP_PRECEDER_PATTERN = function() { var preceders = ["!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=", "&=", "(", "*", "*=", "+=", ",", "-=", "->", "/", "/=", ":", "::", ";", "<", "<<", "<<=", "<=", "=", "==", "===", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "||=", "~", "break", "case", "continue", "delete", "do", "else", "finally", "instanceof", "return", "throw", "try", "typeof"]; var pattern = '(?:' + '(?:(?:^|[^0-9.])\\.{1,3})|' + '(?:(?:^|[^\\+])\\+)|' + '(?:(?:^|[^\\-])-)'; for (var i = 0; i < preceders.length; ++i) { var preceder = preceders[i]; if (isWordChar(preceder.charAt(0))) { pattern += '|\\b' + preceder; } else { pattern += '|' + preceder.replace(/([^=<>:&])/g, '\\$1'); } } pattern += '|^)\\s*$'; return new RegExp(pattern); } (); var pr_amp = /&/g; var pr_lt = /</g; var pr_gt = />/g; var pr_quot = /\"/g; function attribToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;').replace(pr_quot, '&quot;'); } function textToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;'); } var pr_ltEnt = /&lt;/g; var pr_gtEnt = /&gt;/g; var pr_aposEnt = /&apos;/g; var pr_quotEnt = /&quot;/g; var pr_ampEnt = /&amp;/g; var pr_nbspEnt = /&nbsp;/g; function htmlToText(html) { var pos = html.indexOf('&'); if (pos < 0) { return html; } for (--pos; (pos = html.indexOf('&#', pos + 1)) >= 0; ) { var end = html.indexOf(';', pos); if (end >= 0) { var num = html.substring(pos + 3, end); var radix = 10; if (num && num.charAt(0) === 'x') { num = num.substring(1); radix = 16; } var codePoint = parseInt(num, radix); if (!isNaN(codePoint)) { html = (html.substring(0, pos) + String.fromCharCode(codePoint) + html.substring(end + 1)); } } } return html.replace(pr_ltEnt, '<').replace(pr_gtEnt, '>').replace(pr_aposEnt, "'").replace(pr_quotEnt, '"').replace(pr_ampEnt, '&').replace(pr_nbspEnt, ' '); } function isRawContent(node) { return 'XMP' === node.tagName; } function normalizedHtml(node, out) { switch (node.nodeType) { case 1: var name = node.tagName.toLowerCase(); out.push('<', name); for (var i = 0; i < node.attributes.length; ++i) { var attr = node.attributes[i]; if (!attr.specified) { continue; } out.push(' '); normalizedHtml(attr, out); } out.push('>'); for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } if (node.firstChild || !/^(?:br|link|img)$/.test(name)) { out.push('<\/', name, '>'); } break; case 2: out.push(node.name.toLowerCase(), '="', attribToHtml(node.value), '"'); break; case 3: case 4: out.push(textToHtml(node.nodeValue)); break; } } var PR_innerHtmlWorks = null; function getInnerHtml(node) { if (null === PR_innerHtmlWorks) { var testNode = document.createElement('PRE'); testNode.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />')); PR_innerHtmlWorks = !/</.test(testNode.innerHTML); } if (PR_innerHtmlWorks) { var content = node.innerHTML; if (isRawContent(node)) { content = textToHtml(content); } return content; } var out = []; for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } return out.join(''); } function makeTabExpander(tabWidth) { var SPACES = '                '; var charInLine = 0; return function(plainText) { var out = null; var pos = 0; for (var i = 0, n = plainText.length; i < n; ++i) { var ch = plainText.charAt(i); switch (ch) { case '\t': if (!out) { out = []; } out.push(plainText.substring(pos, i)); var nSpaces = tabWidth - (charInLine % tabWidth); charInLine += nSpaces; for (; nSpaces >= 0; nSpaces -= SPACES.length) { out.push(SPACES.substring(0, nSpaces)); } pos = i + 1; break; case '\n': charInLine = 0; break; default: ++charInLine; } } if (!out) { return plainText; } out.push(plainText.substring(pos)); return out.join(''); }; } var pr_chunkPattern = /(?:[^<]+|<!--[\s\S]*?-->|<!\[CDATA\[([\s\S]*?)\]\]>|<\/?[a-zA-Z][^>]*>|<)/g; var pr_commentPrefix = /^<!--/; var pr_cdataPrefix = /^<\[CDATA\[/; var pr_brPrefix = /^<br\b/i; var pr_tagNameRe = /^<(\/?)([a-zA-Z]+)/; function extractTags(s) { var matches = s.match(pr_chunkPattern); var sourceBuf = []; var sourceBufLen = 0; var extractedTags = []; if (matches) { for (var i = 0, n = matches.length; i < n; ++i) { var match = matches[i]; if (match.length > 1 && match.charAt(0) === '<') { if (pr_commentPrefix.test(match)) { continue; } if (pr_cdataPrefix.test(match)) { sourceBuf.push(match.substring(9, match.length - 3)); sourceBufLen += match.length - 12; } else if (pr_brPrefix.test(match)) { sourceBuf.push('\n'); ++sourceBufLen; } else { if (match.indexOf(PR_NOCODE) >= 0 && isNoCodeTag(match)) { var name = match.match(pr_tagNameRe)[2]; var depth = 1; end_tag_loop: for (var j = i + 1; j < n; ++j) { var name2 = matches[j].match(pr_tagNameRe); if (name2 && name2[2] === name) { if (name2[1] === '/') { if (--depth === 0) { break end_tag_loop; } } else { ++depth; } } } if (j < n) { extractedTags.push(sourceBufLen, matches.slice(i, j + 1).join('')); i = j; } else { extractedTags.push(sourceBufLen, match); } } else { extractedTags.push(sourceBufLen, match); } } } else { var literalText = htmlToText(match); sourceBuf.push(literalText); sourceBufLen += literalText.length; } } } return { source: sourceBuf.join(''), tags: extractedTags }; } function isNoCodeTag(tag) { return !!tag.replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g, ' $1="$2$3$4"').match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/); } function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) { var shortcuts = {}; (function() { var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns); for (var i = allPatterns.length; --i >= 0; ) { var patternParts = allPatterns[i]; var shortcutChars = patternParts[3]; if (shortcutChars) { for (var c = shortcutChars.length; --c >= 0; ) { shortcuts[shortcutChars.charAt(c)] = patternParts; } } } })(); var nPatterns = fallthroughStylePatterns.length; var notWs = /\S/; return function(sourceCode, opt_basePos) { opt_basePos = opt_basePos || 0; var decorations = [opt_basePos, PR_PLAIN]; var lastToken = ''; var pos = 0; var tail = sourceCode; while (tail.length) { var style; var token = null; var match; var patternParts = shortcuts[tail.charAt(0)]; if (patternParts) { match = tail.match(patternParts[1]); token = match[0]; style = patternParts[0]; } else { for (var i = 0; i < nPatterns; ++i) { patternParts = fallthroughStylePatterns[i]; var contextPattern = patternParts[2]; if (contextPattern && !contextPattern.test(lastToken)) { continue; } match = tail.match(patternParts[1]); if (match) { token = match[0]; style = patternParts[0]; break; } } if (!token) { style = PR_PLAIN; token = tail.substring(0, 1); } } decorations.push(opt_basePos + pos, style); pos += token.length; tail = tail.substring(token.length); if (style !== PR_COMMENT && notWs.test(token)) { lastToken = token; } } return decorations; }; } var PR_MARKUP_LEXER = createSimpleLexer([], [[PR_PLAIN, /^[^<]+/, null], [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/, null], [PR_COMMENT, /^<!--[\s\S]*?(?:-->|$)/, null], [PR_SOURCE, /^<\?[\s\S]*?(?:\?>|$)/, null], [PR_SOURCE, /^<%[\s\S]*?(?:%>|$)/, null], [PR_SOURCE, /^<(script|style|xmp)\b[^>]*>[\s\S]*?<\/\1\b[^>]*>/i, null], [PR_TAG, /^<\/?\w[^<>]*>/, null]]); var PR_SOURCE_CHUNK_PARTS = /^(<[^>]*>)([\s\S]*)(<\/[^>]*>)$/; function tokenizeMarkup(source) { var decorations = PR_MARKUP_LEXER(source); for (var i = 0; i < decorations.length; i += 2) { if (decorations[i + 1] === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var sourceChunk = source.substring(start, end); var match = sourceChunk.match(PR_SOURCE_CHUNK_PARTS); if (match) { decorations.splice(i, 2, start, PR_TAG, start + match[1].length, PR_SOURCE, start + match[1].length + (match[2] || '').length, PR_TAG); } } } return decorations; } var PR_TAG_LEXER = createSimpleLexer([[PR_ATTRIB_VALUE, /^\'[^\']*(?:\'|$)/, null, "'"], [PR_ATTRIB_VALUE, /^\"[^\"]*(?:\"|$)/, null, '"'], [PR_PUNCTUATION, /^[<>\/=]+/, null, '<>/=']], [[PR_TAG, /^[\w:\-]+/, /^</], [PR_ATTRIB_VALUE, /^[\w\-]+/, /^=/], [PR_ATTRIB_NAME, /^[\w:\-]+/, null], [PR_PLAIN, /^\s+/, null, ' \t\r\n']]); function splitTagAttributes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_TAG) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var chunk = source.substring(start, end); var subDecorations = PR_TAG_LEXER(chunk, start); spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function sourceDecorator(options) { var shortcutStylePatterns = [], fallthroughStylePatterns = []; if (options.tripleQuotedStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/, null, '\'"']); } else if (options.multiLineStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/, null, '\'"`']); } else { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, null, '"\'']); } fallthroughStylePatterns.push([PR_PLAIN, /^(?:[^\'\"\`\/\#]+)/, null, ' \r\n']); if (options.hashComments) { shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']); } if (options.cStyleComments) { fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]); fallthroughStylePatterns.push([PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]); } if (options.regexLiterals) { var REGEX_LITERAL = ('^/(?=[^/*])' + '(?:[^/\\x5B\\x5C]' + '|\\x5C[\\s\\S]' + '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+' + '(?:/|$)'); fallthroughStylePatterns.push([PR_STRING, new RegExp(REGEX_LITERAL), REGEXP_PRECEDER_PATTERN]); } var keywords = wordSet(options.keywords); options = null; var splitStringAndCommentTokens = createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns); var styleLiteralIdentifierPuncRecognizer = createSimpleLexer([], [[PR_PLAIN, /^\s+/, null, ' \r\n'], [PR_PLAIN, /^[a-z_$@][a-z_$@0-9]*/i, null], [PR_LITERAL, /^0x[a-f0-9]+[a-z]/i, null], [PR_LITERAL, /^(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?[a-z]*/i, null, '123456789'], [PR_PUNCTUATION, /^[^\s\w\.$@]+/, null]]); function splitNonStringNonCommentTokens(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_PLAIN) { var start, end, chunk, subDecs; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; chunk = source.substring(start, end); subDecs = styleLiteralIdentifierPuncRecognizer(chunk, start); for (var j = 0, m = subDecs.length; j < m; j += 2) { var subStyle = subDecs[j + 1]; if (subStyle === PR_PLAIN) { var subStart = subDecs[j]; var subEnd = j + 2 < m ? subDecs[j + 2] : chunk.length; var token = source.substring(subStart, subEnd); if (token === '.') { subDecs[j + 1] = PR_PUNCTUATION; } else if (token in keywords) { subDecs[j + 1] = PR_KEYWORD; } else if (/^@?[A-Z][A-Z$]*[a-z][A-Za-z$]*$/.test(token)) { subDecs[j + 1] = token.charAt(0) === '@' ? PR_LITERAL : PR_TYPE; } } } spliceArrayInto(subDecs, decorations, i, 2); i += subDecs.length - 2; } } return decorations; } return function(sourceCode) { var decorations = splitStringAndCommentTokens(sourceCode); decorations = splitNonStringNonCommentTokens(sourceCode, decorations); return decorations; }; } var decorateSource = sourceDecorator({ keywords: ALL_KEYWORDS, hashComments: true, cStyleComments: true, multiLineStrings: true, regexLiterals: true }); function splitSourceNodes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var subDecorations = decorateSource(source.substring(start, end)); for (var j = 0, m = subDecorations.length; j < m; j += 2) { subDecorations[j] += start; } spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function splitSourceAttributes(source, decorations) { var nextValueIsSource = false; for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; var start, end; if (style === PR_ATTRIB_NAME) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; nextValueIsSource = /^on|^style$/i.test(source.substring(start, end)); } else if (style === PR_ATTRIB_VALUE) { if (nextValueIsSource) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var attribValue = source.substring(start, end); var attribLen = attribValue.length; var quoted = (attribLen >= 2 && /^[\"\']/.test(attribValue) && attribValue.charAt(0) === attribValue.charAt(attribLen - 1)); var attribSource; var attribSourceStart; var attribSourceEnd; if (quoted) { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue; } else { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue.substring(1, attribValue.length - 1); } var attribSourceDecorations = decorateSource(attribSource); for (var j = 0, m = attribSourceDecorations.length; j < m; j += 2) { attribSourceDecorations[j] += attribSourceStart; } if (quoted) { attribSourceDecorations.push(attribSourceEnd, PR_ATTRIB_VALUE); spliceArrayInto(attribSourceDecorations, decorations, i + 2, 0); } else { spliceArrayInto(attribSourceDecorations, decorations, i, 2); } } nextValueIsSource = false; } } return decorations; } function decorateMarkup(sourceCode) { var decorations = tokenizeMarkup(sourceCode); decorations = splitTagAttributes(sourceCode, decorations); decorations = splitSourceNodes(sourceCode, decorations); decorations = splitSourceAttributes(sourceCode, decorations); return decorations; } function recombineTagsAndDecorations(sourceText, extractedTags, decorations) { var html = []; var outputIdx = 0; var openDecoration = null; var currentDecoration = null; var tagPos = 0; var decPos = 0; var tabExpander = makeTabExpander(PR_TAB_WIDTH); var adjacentSpaceRe = /([\r\n ]) /g; var startOrSpaceRe = /(^| ) /gm; var newlineRe = /\r\n?|\n/g; var trailingSpaceRe = /[ \r\n]$/; var lastWasSpace = true; function emitTextUpTo(sourceIdx) { if (sourceIdx > outputIdx) { if (openDecoration && openDecoration !== currentDecoration) { html.push('</span>'); openDecoration = null; } if (!openDecoration && currentDecoration) { openDecoration = currentDecoration; html.push('<span class="', openDecoration, '">'); } var htmlChunk = textToHtml(tabExpander(sourceText.substring(outputIdx, sourceIdx))).replace(lastWasSpace ? startOrSpaceRe : adjacentSpaceRe, '$1&nbsp;'); lastWasSpace = trailingSpaceRe.test(htmlChunk); html.push(htmlChunk.replace(newlineRe, '<br />')); outputIdx = sourceIdx; } } while (true) { var outputTag; if (tagPos < extractedTags.length) { if (decPos < decorations.length) { outputTag = extractedTags[tagPos] <= decorations[decPos]; } else { outputTag = true; } } else { outputTag = false; } if (outputTag) { emitTextUpTo(extractedTags[tagPos]); if (openDecoration) { html.push('</span>'); openDecoration = null; } html.push(extractedTags[tagPos + 1]); tagPos += 2; } else if (decPos < decorations.length) { emitTextUpTo(decorations[decPos]); currentDecoration = decorations[decPos + 1]; decPos += 2; } else { break; } } emitTextUpTo(sourceText.length); if (openDecoration) { html.push('</span>'); } return html.join(''); } var langHandlerRegistry = {}; function registerLangHandler(handler, fileExtensions) { for (var i = fileExtensions.length; --i >= 0; ) { var ext = fileExtensions[i]; if (!langHandlerRegistry.hasOwnProperty(ext)) { langHandlerRegistry[ext] = handler; } else if ('console' in window) { console.log('cannot override language handler %s', ext); } } } registerLangHandler(decorateSource, ['default-code']); registerLangHandler(decorateMarkup, ['default-markup', 'html', 'htm', 'xhtml', 'xml', 'xsl']); registerLangHandler(sourceDecorator({ keywords: CPP_KEYWORDS, hashComments: true, cStyleComments: true }), ['c', 'cc', 'cpp', 'cs', 'cxx', 'cyc']); registerLangHandler(sourceDecorator({ keywords: JAVA_KEYWORDS, cStyleComments: true }), ['java']); registerLangHandler(sourceDecorator({ keywords: SH_KEYWORDS, hashComments: true, multiLineStrings: true }), ['bsh', 'csh', 'sh']); registerLangHandler(sourceDecorator({ keywords: PYTHON_KEYWORDS, hashComments: true, multiLineStrings: true, tripleQuotedStrings: true }), ['cv', 'py']); registerLangHandler(sourceDecorator({ keywords: PERL_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['perl', 'pl', 'pm']); registerLangHandler(sourceDecorator({ keywords: RUBY_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['rb']); registerLangHandler(sourceDecorator({ keywords: JSCRIPT_KEYWORDS, cStyleComments: true, regexLiterals: true }), ['js']); function prettyPrintOne(sourceCodeHtml, opt_langExtension) { try { var sourceAndExtractedTags = extractTags(sourceCodeHtml); var source = sourceAndExtractedTags.source; var extractedTags = sourceAndExtractedTags.tags; if (!langHandlerRegistry.hasOwnProperty(opt_langExtension)) { opt_langExtension = /^\s*</.test(source) ? 'default-markup' : 'default-code'; } var decorations = langHandlerRegistry[opt_langExtension].call({}, source); return recombineTagsAndDecorations(source, extractedTags, decorations); } catch (e) { if ('console' in window) { console.log(e); console.trace(); } return sourceCodeHtml; } } function prettyPrint(opt_whenDone) { var isIE6 = _pr_isIE6(); var codeSegments = [document.getElementsByTagName('pre'), document.getElementsByTagName('code'), document.getElementsByTagName('xmp')]; var elements = []; for (var i = 0; i < codeSegments.length; ++i) { for (var j = 0; j < codeSegments[i].length; ++j) { elements.push(codeSegments[i][j]); } } codeSegments = null; var k = 0; function doWork() { var endTime = (PR_SHOULD_USE_CONTINUATION ? new Date().getTime() + 250 : Infinity); for (; k < elements.length && new Date().getTime() < endTime; k++) { var cs = elements[k]; if (cs.className && cs.className.indexOf('prettyprint') >= 0) { var langExtension = cs.className.match(/\blang-(\w+)\b/); if (langExtension) { langExtension = langExtension[1]; } var nested = false; for (var p = cs.parentNode; p; p = p.parentNode) { if ((p.tagName === 'pre' || p.tagName === 'code' || p.tagName === 'xmp') && p.className && p.className.indexOf('prettyprint') >= 0) { nested = true; break; } } if (!nested) { var content = getInnerHtml(cs); content = content.replace(/(?:\r\n?|\n)$/, ''); var newContent = prettyPrintOne(content, langExtension); if (!isRawContent(cs)) { cs.innerHTML = newContent; } else { var pre = document.createElement('PRE'); for (var i = 0; i < cs.attributes.length; ++i) { var a = cs.attributes[i]; if (a.specified) { var aname = a.name.toLowerCase(); if (aname === 'class') { pre.className = a.value; } else { pre.setAttribute(a.name, a.value); } } } pre.innerHTML = newContent; cs.parentNode.replaceChild(pre, cs); cs = pre; } if (isIE6 && cs.tagName === 'PRE') { var lineBreaks = cs.getElementsByTagName('br'); for (var j = lineBreaks.length; --j >= 0; ) { var lineBreak = lineBreaks[j]; lineBreak.parentNode.replaceChild(document.createTextNode('\r\n'), lineBreak); } } } } } if (k < elements.length) { setTimeout(doWork, 250); } else if (opt_whenDone) { opt_whenDone(); } } doWork(); } window['PR_normalizedHtml'] = normalizedHtml; window['prettyPrintOne'] = prettyPrintOne; window['prettyPrint'] = prettyPrint; window['PR'] = { 'createSimpleLexer': createSimpleLexer, 'registerLangHandler': registerLangHandler, 'sourceDecorator': sourceDecorator, 'PR_ATTRIB_NAME': PR_ATTRIB_NAME, 'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE, 'PR_COMMENT': PR_COMMENT, 'PR_DECLARATION': PR_DECLARATION, 'PR_KEYWORD': PR_KEYWORD, 'PR_LITERAL': PR_LITERAL, 'PR_NOCODE': PR_NOCODE, 'PR_PLAIN': PR_PLAIN, 'PR_PUNCTUATION': PR_PUNCTUATION, 'PR_SOURCE': PR_SOURCE, 'PR_STRING': PR_STRING, 'PR_TAG': PR_TAG, 'PR_TYPE': PR_TYPE }; })();
+\ No newline at end of file
+diff -ruN CNPROG/templates/content/js/com.cnprog.utils.js mikes/templates/content/js/com.cnprog.utils.js
+--- CNPROG/templates/content/js/com.cnprog.utils.js	2009-06-22 21:42:51.000000000 -0400
++++ mikes/templates/content/js/com.cnprog.utils.js	2009-07-25 19:09:58.138152577 -0400
+@@ -119,4 +113,4 @@
+ }();
+ //Search Engine Keyword Highlight with Javascript
+ //http://scott.yang.id.au/code/se-hilite/
+-Hilite={elementid:"content",exact:true,max_nodes:1000,onload:true,style_name:"hilite",style_name_suffix:true,debug_referrer:""};Hilite.search_engines=[["local","q"],["cnprog\\.","q"],["google\\.","q"],["search\\.yahoo\\.","p"],["search\\.msn\\.","q"],["search\\.live\\.","query"],["search\\.aol\\.","userQuery"],["ask\\.com","q"],["altavista\\.","q"],["feedster\\.","q"],["search\\.lycos\\.","q"],["alltheweb\\.","q"],["technorati\\.com/search/([^\\?/]+)",1],["dogpile\\.com/info\\.dogpl/search/web/([^\\?/]+)",1,true]];Hilite.decodeReferrer=function(d){var g=null;var e=new RegExp("");for(var c=0;c<Hilite.search_engines.length;c++){var f=Hilite.search_engines[c];e.compile("^http://(www\\.)?"+f[0],"i");var b=d.match(e);if(b){var a;if(isNaN(f[1])){a=Hilite.decodeReferrerQS(d,f[1])}else{a=b[f[1]+1]}if(a){a=decodeURIComponent(a);if(f.length>2&&f[2]){a=decodeURIComponent(a)}a=a.replace(/\'|"/g,"");a=a.split(/[\s,\+\.]+/);return a}break}}return null};Hilite.decodeReferrerQS=function(f,d){var b=f.indexOf("?");var c;if(b>=0){var a=new String(f.substring(b+1));b=0;c=0;while((b>=0)&&((c=a.indexOf("=",b))>=0)){var e,g;e=a.substring(b,c);b=a.indexOf("&",c)+1;if(e==d){if(b<=0){return a.substring(c+1)}else{return a.substring(c+1,b-1)}}else{if(b<=0){return null}}}}return null};Hilite.hiliteElement=function(f,e){if(!e||f.childNodes.length==0){return}var c=new Array();for(var b=0;b<e.length;b++){e[b]=e[b].toLowerCase();if(Hilite.exact){c.push("\\b"+e[b]+"\\b")}else{c.push(e[b])}}c=new RegExp(c.join("|"),"i");var a={};for(var b=0;b<e.length;b++){if(Hilite.style_name_suffix){a[e[b]]=Hilite.style_name+(b+1)}else{a[e[b]]=Hilite.style_name}}var d=function(m){var j=c.exec(m.data);if(j){var n=j[0];var i="";var h=m.splitText(j.index);var g=h.splitText(n.length);var l=m.ownerDocument.createElement("SPAN");m.parentNode.replaceChild(l,h);l.className=a[n.toLowerCase()];l.appendChild(h);return l}else{return m}};Hilite.walkElements(f.childNodes[0],1,d)};Hilite.hilite=function(){var a=Hilite.debug_referrer?Hilite.debug_referrer:document.referrer;var b=null;a=Hilite.decodeReferrer(a);if(a&&((Hilite.elementid&&(b=document.getElementById(Hilite.elementid)))||(b=document.body))){Hilite.hiliteElement(b,a)}};Hilite.walkElements=function(d,f,e){var a=/^(script|style|textarea)/i;var c=0;while(d&&f>0){c++;if(c>=Hilite.max_nodes){var b=function(){Hilite.walkElements(d,f,e)};setTimeout(b,50);return}if(d.nodeType==1){if(!a.test(d.tagName)&&d.childNodes.length>0){d=d.childNodes[0];f++;continue}}else{if(d.nodeType==3){d=e(d)}}if(d.nextSibling){d=d.nextSibling}else{while(f>0){d=d.parentNode;f--;if(d.nextSibling){d=d.nextSibling;break}}}}};if(Hilite.onload){if(window.attachEvent){window.attachEvent("onload",Hilite.hilite)}else{if(window.addEventListener){window.addEventListener("load",Hilite.hilite,false)}else{var __onload=window.onload;window.onload=function(){Hilite.hilite();__onload()}}}};
++Hilite={elementid:"content",exact:true,max_nodes:1000,onload:true,style_name:"hilite",style_name_suffix:true,debug_referrer:""};Hilite.search_engines=[["local","q"],["cnprog\\.","q"],["google\\.","q"],["search\\.yahoo\\.","p"],["search\\.msn\\.","q"],["search\\.live\\.","query"],["search\\.aol\\.","userQuery"],["ask\\.com","q"],["altavista\\.","q"],["feedster\\.","q"],["search\\.lycos\\.","q"],["alltheweb\\.","q"],["technorati\\.com/search/([^\\?/]+)",1],["dogpile\\.com/info\\.dogpl/search/web/([^\\?/]+)",1,true]];Hilite.decodeReferrer=function(d){var g=null;var e=new RegExp("");for(var c=0;c<Hilite.search_engines.length;c++){var f=Hilite.search_engines[c];e.compile("^http://(www\\.)?"+f[0],"i");var b=d.match(e);if(b){var a;if(isNaN(f[1])){a=Hilite.decodeReferrerQS(d,f[1])}else{a=b[f[1]+1]}if(a){a=decodeURIComponent(a);if(f.length>2&&f[2]){a=decodeURIComponent(a)}a=a.replace(/\'|"/g,"");a=a.split(/[\s,\+\.]+/);return a}break}}return null};Hilite.decodeReferrerQS=function(f,d){var b=f.indexOf("?");var c;if(b>=0){var a=new String(f.substring(b+1));b=0;c=0;while((b>=0)&&((c=a.indexOf("=",b))>=0)){var e,g;e=a.substring(b,c);b=a.indexOf("&",c)+1;if(e==d){if(b<=0){return a.substring(c+1)}else{return a.substring(c+1,b-1)}}else{if(b<=0){return null}}}}return null};Hilite.hiliteElement=function(f,e){if(!e||f.childNodes.length==0){return}var c=new Array();for(var b=0;b<e.length;b++){e[b]=e[b].toLowerCase();if(Hilite.exact){c.push("\\b"+e[b]+"\\b")}else{c.push(e[b])}}c=new RegExp(c.join("|"),"i");var a={};for(var b=0;b<e.length;b++){if(Hilite.style_name_suffix){a[e[b]]=Hilite.style_name+(b+1)}else{a[e[b]]=Hilite.style_name}}var d=function(m){var j=c.exec(m.data);if(j){var n=j[0];var i="";var h=m.splitText(j.index);var g=h.splitText(n.length);var l=m.ownerDocument.createElement("SPAN");m.parentNode.replaceChild(l,h);l.className=a[n.toLowerCase()];l.appendChild(h);return l}else{return m}};Hilite.walkElements(f.childNodes[0],1,d)};Hilite.hilite=function(){var a=Hilite.debug_referrer?Hilite.debug_referrer:document.referrer;var b=null;a=Hilite.decodeReferrer(a);if(a&&((Hilite.elementid&&(b=document.getElementById(Hilite.elementid)))||(b=document.body))){Hilite.hiliteElement(b,a)}};Hilite.walkElements=function(d,f,e){var a=/^(script|style|textarea)/i;var c=0;while(d&&f>0){c++;if(c>=Hilite.max_nodes){var b=function(){Hilite.walkElements(d,f,e)};setTimeout(b,50);return}if(d.nodeType==1){if(!a.test(d.tagName)&&d.childNodes.length>0){d=d.childNodes[0];f++;continue}}else{if(d.nodeType==3){d=e(d)}}if(d.nextSibling){d=d.nextSibling}else{while(f>0){d=d.parentNode;f--;if(d.nextSibling){d=d.nextSibling;break}}}}};if(Hilite.onload){if(window.attachEvent){window.attachEvent("onload",Hilite.hilite)}else{if(window.addEventListener){window.addEventListener("load",Hilite.hilite,false)}else{var __onload=window.onload;window.onload=function(){Hilite.hilite();__onload()}}}};
+\ No newline at end of file
+diff -ruN CNPROG/templates/content/style/openid.css mikes/templates/content/style/openid.css
+--- CNPROG/templates/content/style/openid.css	2009-06-22 21:42:51.000000000 -0400
++++ mikes/templates/content/style/openid.css	2009-07-25 19:09:58.168153308 -0400
+@@ -42,4 +42,4 @@
+ 	}
+ 	.openid_selected {
+ 		border: 4px solid #DDD;
+-	}	
++	}	
+\ No newline at end of file
+diff -ruN CNPROG/templates/okfiles mikes/templates/okfiles
+--- CNPROG/templates/okfiles	2009-06-22 21:42:52.000000000 -0400
++++ mikes/templates/okfiles	1969-12-31 19:00:00.000000000 -0500
+@@ -1,30 +0,0 @@
+-404.html
+-500.html
+-about.html
+-ask.html
+-badges.html
+-base_content.html
+-base.html
+-book.html
+-close.html
+-faq.html
+-footer.html
+-header.html
+-index.html
+-logout.html
+-pagesize.html
+-paginator.html
+-privacy.html
+-question_edit_tips.html
+-question.html
+-questions.html
+-revisions_answer.html
+-tags.html
+-unanswered.html
+-user_edit.html
+-user_info.html
+-users.html
+-users_questions.html
+-user_stats.html
+-user_tabs.html
+-user_votes.html
+diff -ruN CNPROG/templates/pagesize.html mikes/templates/pagesize.html
+--- CNPROG/templates/pagesize.html	2009-06-22 21:42:52.000000000 -0400
++++ mikes/templates/pagesize.html	2009-07-25 19:09:58.168153308 -0400
+@@ -1,9 +1,8 @@
+-<!-- template pagesize.html -->
+ {% spaceless %}
+ {% load i18n %}
+ {% if is_paginated %}
+ <div class="paginator">
+-    <span class="text">{% trans "posts per page" %}</span>
++    <span class="text">{% trans "Size per page:" %}</span>
+     {% ifequal pagesize 10 %}
+         <span class="curr">10</span>
+     {% else %}
+@@ -24,4 +23,3 @@
+ </div> 
+ {% endif %}
+ {% endspaceless %}
+-<!-- end template pagesize.html -->
+diff -ruN CNPROG/templates/question_retag.html mikes/templates/question_retag.html
+--- CNPROG/templates/question_retag.html	1969-12-31 19:00:00.000000000 -0500
++++ mikes/templates/question_retag.html	2009-07-25 19:09:58.178152900 -0400
+@@ -0,0 +1,109 @@
++{% extends "base.html" %}
++{% block title %}{% spaceless %}修改问题标签{% endspaceless %}{% endblock %}
++{% block forejs %}
++        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
++        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
++        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
++        <script type="text/javascript">
++        
++        $().ready(function(){
++            $("#nav_questions").attr('className',"on");
++            //Tags autocomplete action
++            var tags = {{ tags|safe }};
++        	$("#id_tags").autocomplete(tags, {
++                minChars: 1,
++        		matchContains: true,
++                max: 20,
++                multiple: true,
++                multipleSeparator: " ",
++        		formatItem: function(row, i, max) {
++        			return row.n + " ("+ row.c +")";
++        		},
++                formatResult: function(row, i, max){
++                    return row.n;
++                }
++                
++            });
++           
++             $("#fmretag").validate({
++                rules: {
++        			tags: {
++        				required: true,
++        				maxength: 105
++        			}
++        		},
++                messages: {
++        			tags: {
++                        required: " 标签不能为空。",
++                        maxlength: " 最多5个标签，每个标签长度小于20个字符。"
++                    }
++                }
++                
++            });
++            lanai.highlightSyntax();
++
++        });
++        </script>
++{% endblock %}
++        
++{% block content %}
++<div id="main-bar" class="headNormal">
++    修改标签 [<a href="{{ question.get_absolute_url }}">返回</a>]
++</div>
++<div id="main-body" class="ask-body">
++    <div id="askform">
++        <form id="fmretag" action="{% url edit_question question.id %}" method="post" >
++            <h3>
++                {{ question.get_question_title }}
++            </h3>
++            <div id="description" class="edit-content-html">
++                {{ question.html|safe }}
++            </div>
++           
++            
++            <div class="form-item">
++                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br>
++                {{ form.tags }}  {{ form.tags.errors }}
++                <div class="title-desc">
++                    {{ form.tags.help_text }}
++                </div>
++            </div>
++            <br>
++            
++            <div class="error" ></div>
++            <input type="submit" value="现在修改" class="submit" />
++            <input type="button" value="取消" class="submit" onclick="history.back(-1);" />
++            <br>
++            <br>
++        </form>
++    </div>
++</div>
++{% endblock %}
++
++{% block sidebar %}
++<div class="boxC">
++    <p class="subtitle">为什么我只能修改问题标签？</p>
++    <ul class="list-item">
++        
++        <li>
++            CNProg用标签来分类系统的信息
++
++        </li>
++        <li>
++            修改完整问题需要用户的积分达到一定条件（比如：积分 >= 3000分，自己发布的问题除外），而用户积分达到比较低的时候，就可以修改问题的标签（比如：积分 >= 500, 这里指所有问题的标签）。
++
++        </li>
++        <li>
++            修改标签的用户将授予特殊的社区奖牌 
++
++        </li>
++    </ul>
++    <a href="{% url faq %}" style="float:right;position:relative">faq »</a>
++    <br>  
++</div>
++
++{% endblock %}
++
++{% block endjs %}
++{% endblock %}
++
+diff -ruN CNPROG/templates/template.list mikes/templates/template.list
+--- CNPROG/templates/template.list	2009-06-22 21:42:52.000000000 -0400
++++ mikes/templates/template.list	1969-12-31 19:00:00.000000000 -0500
+@@ -1,18 +0,0 @@
+-close.html
+-book.html
+-base_content.html
+-badges.html
+-badge.html
+-ask.html
+-answer_edit_tips.html
+-answer_edit.html
+-about.html
+-500.html
+-404.html
+-pagesize.html
+-logout.html
+-header.html
+-footer.html
+-faq.html
+-base.html
+-question.html
+diff -ruN CNPROG/templates/tough/faq.html mikes/templates/tough/faq.html
+--- CNPROG/templates/tough/faq.html	2009-06-22 21:42:52.000000000 -0400
++++ mikes/templates/tough/faq.html	1969-12-31 19:00:00.000000000 -0500
+@@ -1,110 +0,0 @@
+-{% extends "base_content.html" %}
+-{% load extra_tags %}
+-{% load humanize %}
+-{% block title %}{% spaceless %}FAQ{% endspaceless %}{% endblock %}
+-{% block forejs %}
+-{% endblock %}
+-{% block content %}
+-<div class="headNormal">
+-    {% trans "Frequently Asked Questions " %}(FAQ)
+-</div>
+-<div id="main-body" style="width:100%">
+-    
+-    <h3 class="subtitle">{% trans "What kinds of questions can I ask here?" %}</h3>
+-    <p>{% trans "Most importanly - questions should be <strong>relevant</strong> to this community." %}<br>
+-	{% trans "Before asking the question - please make sure to use search to see whether your question has alredy been answered."%}<br>
+-    </p><br>
+-    
+-        <h3 class="subtitle">{% trans "What questions should I avoid asking?" %}</h3>
+-		<p>{% trans "Please avoid asking questions that are not relevant to this community, too subjective and argumentative." %}</p>
+-    </p><br>
+-    
+-        <h3 class="subtitle">{% trans "What should I avoid in my answers?" %}</h3>
+-        <p>{% trans "site title" %} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %} 
+-    </p><br>
+-    
+-        <h3 class="subtitle">{% trans "Who moderates this community?" %}</h3>
+-		<p>{% trans "The short answer is: <strong>you</strong>." %}<br>
+-		{% trans "This website is moderated by the users." %}
+-		{% trans "The reputation system allows users earn the authorization to perform a variety of moderation tasks." %}
+-    </p><br>
+-    
+-        <h3 class="subtitle">{% trans "How does reputation system work?" %}</h3>
+-		<p>{% trans "Anyone can ask questions and give answers, points are not necessary for that." %}<br>
+-        {% trans "As we've said before, users help running this site. Point system helps select users who can administer this community."%}
+-		{% trans "Reputation points roughly measure how community trusts you. These points are given to you directly by other members of the community." %}
+-		</p>
+-		<p>
+-		 {% trans "For example, if you ask an interesting question or give a helpful answer, your input will be upvoted and you will gain more trust in the community." %}
+-         {% trans "If on the other hand someone gives a misleading answer, the answer will be voted down and he/she loses some points." %}
+-		 {% trans "Each vote in favor will generate <strong>10</strong> points, each vote against will subtract <strong>2</strong> points." trans %}
+-		 {% trans "Through the votes of other people you can accumulate a maximum of <strong>200</strong> points." %}
+-		 {% "After accumulating certain number of points, you can do more:" %}
+-        <table style="font-family:arial;" cellspacing="3" cellpadding="3">
+-            <tr>
+-                <th width="40px" style="text-align:right"></th>
+-                <th width="300px"></th>
+-            </tr>
+-	        <tr>
+-                <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
+-                <td>{% trans "upvote" %}</td>
+-	        </tr>
+-	        <tr>
+-                <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
+-                <td>{% trans "use tags" %}</td>
+-	        </tr>
+-            <tr>
+-                <td style="text-align:right;padding-right:5px"><strong>50</strong></td>
+-                <td>{% trans "add comments" %}</td>
+-	        </tr>
+-            <tr>
+-                <td style="text-align:right;padding-right:5px"><strong>100</strong></td>
+-                <td>{% trans "downvote" %}</td>
+-	        </tr><tr>
+-                <td style="text-align:right;padding-right:5px"><strong>250</strong></td>
+-                <td>打开关闭自己的问题</td>
+-	        </tr>
+-            <tr>
+-                <td style="text-align:right;padding-right:5px"><strong>500</strong></td>
+-                <td>{% trans "retag questions" %}</td>
+-	        </tr>
+-            <tr>
+-                <td style="text-align:right;padding-right:5px"><strong>750</strong></td>
+-                <td>{% trans "edit community wiki questions" %}</td>
+-	        </tr>
+-            <tr>
+-                <td style="text-align:right;padding-right:5px"><strong>2000</strong></td>
+-                <td>{% trans "edit any answer" %}</td>
+-	        </tr>
+-            <tr>
+-                <td style="text-align:right;padding-right:5px"><strong>3000</strong></td>
+-                <td>{% trans "open any closed question" %}</td>
+-	        </tr>
+-            <tr>
+-                <td style="text-align:right;padding-right:5px"><strong>5000</strong></td>
+-                <td>{% trans "delete any comment" %}</td>
+-	        </tr>
+-            <tr>
+-                <td style="text-align:right;padding-right:5px"><strong>10000</strong></td>
+-                <td>{% trans "delete any questions and answers and perform other moderation tasks" %}</td>
+-	        </tr>
+-
+-        </table>
+-        
+-    </p><br>
+-   
+-        <h3 class="subtitle">{% trans "To register, do I need to create new password?"</h3>
+-        <p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %}
+-		<strong><a href="/account/signin">{% trans "Login now!" %}</a> »</strong>
+-    </p><br>
+-    
+-        <h3 class="subtitle">{% trans "Why other people can edit my questions/answers?" %}</h3>
+-    <p> {% trans "Goal of this site is..." %} {% trans "So questions and answers can be edited like wiki pages by experienced users of this site and this improves the overall quality of the knowledge base content." %}
+-	{% trans "If this approach is not for you, we respect your choice." %}
+-    </p><br>
+-        <h3 class="subtitle">{% trans "Still have questions?" %}</h3>
+-    <p>{% "Please ask your question, help make our community better!" %} <a href="/tags/faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
+-    </p>
+-    <br><br>
+-</div>
+-{% endblock %}
+diff -ruN CNPROG/templates/tough/question_retag.html mikes/templates/tough/question_retag.html
+--- CNPROG/templates/tough/question_retag.html	2009-06-22 21:42:52.000000000 -0400
++++ mikes/templates/tough/question_retag.html	1969-12-31 19:00:00.000000000 -0500
+@@ -1,107 +0,0 @@
+-{% extends "base.html" %}
+-{% block title %}{% spaceless %}{% trans "Revise tags" %}{% endspaceless %}{% endblock %}
+-{% block forejs %}
+-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
+-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
+-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
+-        <script type="text/javascript">
+-        
+-        $().ready(function(){
+-            $("#nav_questions").attr('className',"on");
+-            //Tags autocomplete action
+-            var tags = {{ tags|safe }};
+-        	$("#id_tags").autocomplete(tags, {
+-                minChars: 1,
+-        		matchContains: true,
+-                max: 20,
+-                multiple: true,
+-                multipleSeparator: " ",
+-        		formatItem: function(row, i, max) {
+-        			return row.n + " ("+ row.c +")";
+-        		},
+-                formatResult: function(row, i, max){
+-                    return row.n;
+-                }
+-                
+-            });
+-           
+-             $("#fmretag").validate({
+-                rules: {
+-        			tags: {
+-        				required: true,
+-        				maxength: 105
+-        			}
+-        		},
+-                messages: {
+-        			tags: {
+-                        required: ' ' + {% trans "tags are requried" %},
+-                        maxlength: ' ' + {% trans "up to 5 tags, less than 20 characters each" %},
+-                    }
+-                }
+-                
+-            });
+-            lanai.highlightSyntax();
+-
+-        });
+-        </script>
+-{% endblock %}
+-        
+-{% block content %}
+-<div id="main-bar" class="headNormal">
+-    {% trans "Change tags" %} [<a href="{{ question.get_absolute_url }}">{% trans "back" %}</a>]
+-</div>
+-<div id="main-body" class="ask-body">
+-    <div id="askform">
+-        <form id="fmretag" action="{% url edit_question question.id %}" method="post" >
+-            <h3>
+-                {{ question.get_question_title }}
+-            </h3>
+-            <div id="description" class="edit-content-html">
+-                {{ question.html|safe }}
+-            </div>
+-           
+-            
+-            <div class="form-item">
+-                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br>
+-                {{ form.tags }}  {{ form.tags.errors }}
+-                <div class="title-desc">
+-                    {{ form.tags.help_text }}
+-                </div>
+-            </div>
+-            <br>
+-            
+-            <div class="error" ></div>
+-            <input type="submit" value="{% trans "Change now" %}" class="submit" />
+-            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);" />
+-            <br>
+-            <br>
+-        </form>
+-    </div>
+-</div>
+-{% endblock %}
+-
+-{% block sidebar %}
+-<div class="boxC">
+-    <p class="subtitle">{% trans "Why use and modify tags?" %}</p>
+-    <ul class="list-item">
+-        
+-        <li>
+-            {% trans "site title" %} {% trans "uses tags for the classification of questions %}
+-        </li>
+-        <li>
+-            修改完整问题需要用户的积分达到一定条件（比如：积分 >= 3000分，自己发布的问题除外），而用户积分达到比较低的时候，就可以修改问题的标签（比如：积分 >= 500, 这里指所有问题的标签）。
+-
+-        </li>
+-        <li>
+-			{% trans "tag editors receive special awards from the community" %}
+-        </li>
+-    </ul>
+-    <a href="{% url faq %}" style="float:right;position:relative">faq »</a>
+-    <br>  
+-</div>
+-
+-{% endblock %}
+-
+-{% block endjs %}
+-{% endblock %}
+-
+diff -ruN CNPROG/templates/tough/unanswered.html mikes/templates/tough/unanswered.html
+--- CNPROG/templates/tough/unanswered.html	2009-06-22 21:42:52.000000000 -0400
++++ mikes/templates/tough/unanswered.html	1969-12-31 19:00:00.000000000 -0500
+@@ -1,115 +0,0 @@
+-{% extends "base.html" %}
+-{% load extra_tags %}
+-{% load humanize %}
+-{% load extra_filters %}
+-{% block title %}{% spaceless %}{% trans "Unanswered questions" %}{% endspaceless %}{% endblock %}
+-{% block forejs %}
+-       <script type="text/javascript">
+-        $().ready(function(){
+-            $("#nav_unanswered").attr('className',"on");
+-        });
+-         
+-        </script>
+-{% endblock %}
+-{% block content %}
+-<div class="tabBar">
+-    <span class="headQuestions">{% trans "Unanswered questions" %}</span>
+-    <div class="tabsA">
+-        <a id="latest" href="?sort=latest" class="on" title="{% trans "most recently asked questions" %}>{% trans "newest" %}</a> 
+-    </div>
+-</div>
+-
+-<div id="listA">
+-    {% for question in questions.object_list %}
+-    <div class="qstA">
+-        <h2><a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a></h2>
+-        <div class="stat">
+-            <table>
+-	            <tr>
+-                    <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
+-                    <td><span class="num">{{ question.score|intcomma }}</span> </td>
+-                    <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
+-	            </tr>  
+-                <tr>
+-                    <td><span class="unit">{% trans "answers" %}</span></td>
+-                    <td><span class="unit">{% trans "votes" %}</span></td>
+-                    <td><span class="unit">{% trans "views" %}</span></td>
+-	            </tr> 
+-            </table>
+-        </div>
+-        <div class="summary">
+-            {{ question.summary }}...                
+-        </div>
+-    
+-        {% ifequal tab_id 'active'%}
+-        {% if question.wiki %}
+-        <span class="from wiki">{% trans "community wiki" %}</span>
+-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+-        {% else %}
+-        <div class="from">
+-             {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
+-            <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+-            <span class="score">{% get_score_badge question.last_activity_by %} </span>
+-            <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+-        </div>
+-        {% endif %}
+-        {% else %}
+-        {% if question.wiki %}
+-        <span class="from wiki">{% trans "community wiki" %}</span>
+-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+-        {% else %}
+-        <div class="from">
+-             {% comment %}{% gravatar question.author 24 %}{% endcomment %}
+-            <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+-            <span class="score">{% get_score_badge question.author %} </span>
+-            <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+-        </div>
+-        {% endif %}
+-        {% endifequal %}
+-        
+-        <div class="tags">
+-        {% for tag in question.tagname_list %}
+-        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
+-        {% endfor %}
+-        </div>
+-    </div>
+-    {% endfor %}
+-</div>
+-{% endblock %}
+-
+-{% block tail %}
+-                        <div class="pager">
+-                            {% cnprog_paginator context %}
+-                            
+-                        </div>
+-                        <div class="pagesize">
+-                            {% cnprog_pagesize context %}
+-                        </div>
+-{% endblock %}
+-
+-{% block sidebar %}
+-<div class="boxC">
+-    <p>
+-		<!--todo: move this to blocktrans -->
+-		{% tans "Have a total of" %}<br><div class="questions-count">{{ questions_count|intcomma }}</div>
+-        <p>{% trans "number of <strong>unanswered</strong> questions" %}</p>
+-        <p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>
+-
+-    </p>
+-</div>
+-<div class="boxC">
+-	<h3 class="subtitle">{% trans "Related tags" %}</h3>
+-    <div class="body">
+-    <div class="tags">
+-        {% for tag in tags %}
+-            <a rel="tag" title="{% trans "see questions tagged"%}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
+-            <span class="tag-number">× {{ tag.used_count|intcomma }}</span>
+-            <br>
+-        {% endfor %}
+-        <br>
+-    </div>
+-    </div>
+-</div>
+-
+-{% endblock %}
+-
+diff -ruN CNPROG/templates/user_preferences.html mikes/templates/user_preferences.html
+--- CNPROG/templates/user_preferences.html	2009-06-22 21:42:52.000000000 -0400
++++ mikes/templates/user_preferences.html	2009-07-25 19:09:58.178152900 -0400
+@@ -1,11 +1,20 @@
+-<!-- user_preferences.html -->
+ {% extends "user.html" %}
+ {% load extra_tags %}
+ {% load humanize %}
+ 
+ {% block usercontent %}
+         <div style="padding:5px;">
+-            <h1>Surprise will be here soon ;-)</h1>
++        <fieldset>
++            <legend><b>同步Twitter消息</b></legend>
++            <form>
++                <label for="name">账号:</label>
++                <input id="name" /><br>
++                <label for="password">密码:</label>
++                <input id="password" type="password"/><br>
++                <input id="cbMessage" type="checkbox" />发布我的提问到我的Twitter<br>
++                <input id="cbReply" type="checkbox" />发布我的回答到我的Twitter<br>
++                <input type="submit" value="保存" />
++            </form>
++        </fieldset>
+         </div>
+ {% endblock %}
+-<!-- end user_preferences.html -->
+diff -ruN CNPROG/urls.py mikes/urls.py
+--- CNPROG/urls.py	2009-06-22 21:42:52.000000000 -0400
++++ mikes/urls.py	2009-07-25 19:09:58.178152900 -0400
+@@ -60,4 +60,5 @@
+     url(r'^books/ask/(?P<short_name>[^/]+)/$', app.ask_book, name='ask_book'),
+     url(r'^books/(?P<short_name>[^/]+)/$', app.book, name='book'),
+     url(r'^search/$', app.search, name='search'),
++    (r'^i18n/', include('django.conf.urls.i18n')),
+ )
diff --git a/settings.py b/settings.py
index 88dd0cc7..985de51a 100644
--- a/settings.py
+++ b/settings.py
@@ -1,51 +1,24 @@
+# encoding:utf-8
 # Django settings for lanai project.
 import os.path
 
+#DEBUG SETTINGS
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
-
-
-#David Cramer debug toolbar
 INTERNAL_IPS = ('127.0.0.1',)
-DEBUG_TOOLBAR_PANELS = (
-    'debug_toolbar.panels.sql.SQLDebugPanel',
-    'debug_toolbar.panels.headers.HeaderDebugPanel',
-    'debug_toolbar.panels.cache.CacheDebugPanel',
-    'debug_toolbar.panels.profiler.ProfilerDebugPanel',
-    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
-    'debug_toolbar.panels.templates.TemplatesDebugPanel',
-    # If you are using the profiler panel you don't need the timer
-    # 'debug_toolbar.panels.timer.TimerDebugPanel',
-)
-
-DEBUG_TOOLBAR_CONFIG = {
-    "INTERCEPT_REDIRECTS":False
-}
 
 #for OpenID auth
 ugettext = lambda s: s
 LOGIN_URL = '/%s%s' % (ugettext('account/'), ugettext('signin/'))
 
-#system will send admins email about error stacktrace if DEBUG=False
+#EMAIL AND ADMINS
 ADMINS = (
-    ('you', 'you@where.com'),
+    ('CNProg team', 'team@cnprog.com'),
 )
-
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-#DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
-#DATABASE_USER = 'root'             # Not used with sqlite3.
-#DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-
-DATABASE_NAME = 'dbname'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'dbuser'             # Not used with sqlite3.
-DATABASE_PASSWORD = 'dbpass'         # Not used with sqlite3.
-
-SERVER_EMAIL = 'server@where.com'
-DEFAULT_FROM_EMAIL = 'from@where.com'
+SERVER_EMAIL = 'webmaster@cnprog.com'
+DEFAULT_FROM_EMAIL = 'webmaster@cnprog.com'
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
 EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
@@ -53,44 +26,21 @@ EMAIL_HOST='smtp.gmail.com'
 EMAIL_PORT='587'
 EMAIL_USE_TLS=True
 
-
-
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-#LANGUAGE_CODE = 'en'
+#LOCALIZATIONS
+TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
+# LANGUAGE_CODE = 'en-us'
 LANGUAGE_CODE = 'zh-cn'
-
 SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
 USE_I18N = True
 
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = '/var/www/vhosts/cnprog/templates/upfiles/'
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = 'http://where.com/upfiles/'
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
+#OTHER SETTINS
+APP_TITLE = u'CNProg.com 程序员问答社区'
+APP_URL = 'http://www.cnprog.com'
+APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
+APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
+APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
 ADMIN_MEDIA_PREFIX = '/admin/media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '$oo^&_m&qwbib=ffljk_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
-
+SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.load_template_source',
@@ -105,12 +55,15 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
+    #'django.middleware.sqlprint.SqlPrintingMiddleware',
+    'middleware.pagesize.QuestionsPageSizeMiddleware',
+    #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'django.core.context_processors.auth',
+    'context.application_settings'
 )
 
 ROOT_URLCONF = 'urls'
@@ -119,6 +72,7 @@ TEMPLATE_DIRS = (
     os.path.join(os.path.dirname(__file__), 'templates').replace('\\','/'),
 )
 
+#UPLOAD SETTINGS
 FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\\','/')
 FILE_UPLOAD_HANDLERS = ("django.core.files.uploadhandler.MemoryFileUploadHandler",
  "django.core.files.uploadhandler.TemporaryFileUploadHandler",)
@@ -139,6 +93,7 @@ INSTALLED_APPS = (
     'django_authopenid',
     'debug_toolbar' ,
 )
-#local configs
-from settings_local import *
-
+
+# User settings
+from settings_local import *
+
diff --git a/settings_local.py.dist b/settings_local.py.dist
new file mode 100644
index 00000000..2c8f939d
--- /dev/null
+++ b/settings_local.py.dist
@@ -0,0 +1,25 @@
+SITE_SRC_ROOT = '/Users/sailing/Development/cnprog_beta2'
+
+#for logging
+import logging
+LOG_FILENAME = '/Users/sailing/Development/cnprog_beta2/django.lanai.log'
+logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,)
+
+
+#Database configuration 
+DATABASE_ENGINE = 'mysql'      
+DATABASE_HOST = ''            
+DATABASE_PORT = ''          
+DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
+DATABASE_USER = 'root'               # Not used with sqlite3.
+DATABASE_PASSWORD = ''               # Not used with sqlite3.
+
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+MEDIA_ROOT = '/Users/sailing/Development/cnprog_beta2/templates/upfiles/'
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash if there is a path component (optional in other cases).
+# Examples: "http://media.lawrence.com", "http://example.com/media/"
+MEDIA_URL = 'http://127.0.0.1:8000/upfiles/'
diff --git a/templates/base.html b/templates/base.html
index dca312e3..0852f7de 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -48,6 +48,7 @@
                 notify.show();
             });
         </script>
+       
         {% endif %}
         {% endwith %}
       
@@ -88,4 +89,3 @@
         {% endblock %}
     </body>
 </html>
-<!-- end template base.html -->
diff --git a/templates/base_content.html b/templates/base_content.html
index 98a09150..39627a0e 100644
--- a/templates/base_content.html
+++ b/templates/base_content.html
@@ -1,9 +1,8 @@
+{% load i18n %}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!-- template base_content.html -->
-{% load i18n %}
 <html>
     <head>
-        <title>{% block title %}{% endblock %} - {% trans "site title" %} - {% trans "site slogan" %}</title>
+        <title>{% block title %}{% endblock %} - {{ APP_TITLE }}</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <meta name="verify-v1" content="55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA=" />
         <link rel="shortcut icon" href="/content/images/favicon.ico" >
@@ -83,4 +82,3 @@
         {% endblock %}
     </body>
 </html>
-<!-- end template base_content.html -->
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index bd4b00fd..e3101ea7 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -613,4 +613,4 @@ var commentsFactory = {'question' : questionComments, 'answer' : answerComments}
 Prettify
 http://www.apache.org/licenses/LICENSE-2.0
 */
-var PR_SHOULD_USE_CONTINUATION = true; var PR_TAB_WIDTH = 8; var PR_normalizedHtml; var PR; var prettyPrintOne; var prettyPrint; function _pr_isIE6() { var isIE6 = navigator && navigator.userAgent && /\bMSIE 6\./.test(navigator.userAgent); _pr_isIE6 = function() { return isIE6; }; return isIE6; } (function() { function wordSet(words) { words = words.split(/ /g); var set = {}; for (var i = words.length; --i >= 0; ) { var w = words[i]; if (w) { set[w] = null; } } return set; } var FLOW_CONTROL_KEYWORDS = "break continue do else for if return while "; var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " + "double enum extern float goto int long register short signed sizeof " + "static struct switch typedef union unsigned void volatile "; var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " + "new operator private protected public this throw true try "; var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " + "concept concept_map const_cast constexpr decltype " + "dynamic_cast explicit export friend inline late_check " + "mutable namespace nullptr reinterpret_cast static_assert static_cast " + "template typeid typename typeof using virtual wchar_t where "; var JAVA_KEYWORDS = COMMON_KEYWORDS + "boolean byte extends final finally implements import instanceof null " + "native package strictfp super synchronized throws transient "; var CSHARP_KEYWORDS = JAVA_KEYWORDS + "as base by checked decimal delegate descending event " + "fixed foreach from group implicit in interface internal into is lock " + "object out override orderby params readonly ref sbyte sealed " + "stackalloc string select uint ulong unchecked unsafe ushort var "; var JSCRIPT_KEYWORDS = COMMON_KEYWORDS + "debugger eval export function get null set undefined var with " + "Infinity NaN "; var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " + "goto if import last local my next no our print package redo require " + "sub undef unless until use wantarray while BEGIN END "; var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " + "elif except exec finally from global import in is lambda " + "nonlocal not or pass print raise try with yield " + "False True None "; var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" + " defined elsif end ensure false in module next nil not or redo rescue " + "retry self super then true undef unless until when yield BEGIN END "; var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " + "function in local set then until "; var ALL_KEYWORDS = (CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS + PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS); var PR_STRING = 'str'; var PR_KEYWORD = 'kwd'; var PR_COMMENT = 'com'; var PR_TYPE = 'typ'; var PR_LITERAL = 'lit'; var PR_PUNCTUATION = 'pun'; var PR_PLAIN = 'pln'; var PR_TAG = 'tag'; var PR_DECLARATION = 'dec'; var PR_SOURCE = 'src'; var PR_ATTRIB_NAME = 'atn'; var PR_ATTRIB_VALUE = 'atv'; var PR_NOCODE = 'nocode'; function isWordChar(ch) { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'); } function spliceArrayInto(inserted, container, containerPosition, countReplaced) { inserted.unshift(containerPosition, countReplaced || 0); try { container.splice.apply(container, inserted); } finally { inserted.splice(0, 2); } } var REGEXP_PRECEDER_PATTERN = function() { var preceders = ["!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=", "&=", "(", "*", "*=", "+=", ",", "-=", "->", "/", "/=", ":", "::", ";", "<", "<<", "<<=", "<=", "=", "==", "===", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "||=", "~", "break", "case", "continue", "delete", "do", "else", "finally", "instanceof", "return", "throw", "try", "typeof"]; var pattern = '(?:' + '(?:(?:^|[^0-9.])\\.{1,3})|' + '(?:(?:^|[^\\+])\\+)|' + '(?:(?:^|[^\\-])-)'; for (var i = 0; i < preceders.length; ++i) { var preceder = preceders[i]; if (isWordChar(preceder.charAt(0))) { pattern += '|\\b' + preceder; } else { pattern += '|' + preceder.replace(/([^=<>:&])/g, '\\$1'); } } pattern += '|^)\\s*$'; return new RegExp(pattern); } (); var pr_amp = /&/g; var pr_lt = /</g; var pr_gt = />/g; var pr_quot = /\"/g; function attribToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;').replace(pr_quot, '&quot;'); } function textToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;'); } var pr_ltEnt = /&lt;/g; var pr_gtEnt = /&gt;/g; var pr_aposEnt = /&apos;/g; var pr_quotEnt = /&quot;/g; var pr_ampEnt = /&amp;/g; var pr_nbspEnt = /&nbsp;/g; function htmlToText(html) { var pos = html.indexOf('&'); if (pos < 0) { return html; } for (--pos; (pos = html.indexOf('&#', pos + 1)) >= 0; ) { var end = html.indexOf(';', pos); if (end >= 0) { var num = html.substring(pos + 3, end); var radix = 10; if (num && num.charAt(0) === 'x') { num = num.substring(1); radix = 16; } var codePoint = parseInt(num, radix); if (!isNaN(codePoint)) { html = (html.substring(0, pos) + String.fromCharCode(codePoint) + html.substring(end + 1)); } } } return html.replace(pr_ltEnt, '<').replace(pr_gtEnt, '>').replace(pr_aposEnt, "'").replace(pr_quotEnt, '"').replace(pr_ampEnt, '&').replace(pr_nbspEnt, ' '); } function isRawContent(node) { return 'XMP' === node.tagName; } function normalizedHtml(node, out) { switch (node.nodeType) { case 1: var name = node.tagName.toLowerCase(); out.push('<', name); for (var i = 0; i < node.attributes.length; ++i) { var attr = node.attributes[i]; if (!attr.specified) { continue; } out.push(' '); normalizedHtml(attr, out); } out.push('>'); for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } if (node.firstChild || !/^(?:br|link|img)$/.test(name)) { out.push('<\/', name, '>'); } break; case 2: out.push(node.name.toLowerCase(), '="', attribToHtml(node.value), '"'); break; case 3: case 4: out.push(textToHtml(node.nodeValue)); break; } } var PR_innerHtmlWorks = null; function getInnerHtml(node) { if (null === PR_innerHtmlWorks) { var testNode = document.createElement('PRE'); testNode.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />')); PR_innerHtmlWorks = !/</.test(testNode.innerHTML); } if (PR_innerHtmlWorks) { var content = node.innerHTML; if (isRawContent(node)) { content = textToHtml(content); } return content; } var out = []; for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } return out.join(''); } function makeTabExpander(tabWidth) { var SPACES = '                '; var charInLine = 0; return function(plainText) { var out = null; var pos = 0; for (var i = 0, n = plainText.length; i < n; ++i) { var ch = plainText.charAt(i); switch (ch) { case '\t': if (!out) { out = []; } out.push(plainText.substring(pos, i)); var nSpaces = tabWidth - (charInLine % tabWidth); charInLine += nSpaces; for (; nSpaces >= 0; nSpaces -= SPACES.length) { out.push(SPACES.substring(0, nSpaces)); } pos = i + 1; break; case '\n': charInLine = 0; break; default: ++charInLine; } } if (!out) { return plainText; } out.push(plainText.substring(pos)); return out.join(''); }; } var pr_chunkPattern = /(?:[^<]+|<!--[\s\S]*?-->|<!\[CDATA\[([\s\S]*?)\]\]>|<\/?[a-zA-Z][^>]*>|<)/g; var pr_commentPrefix = /^<!--/; var pr_cdataPrefix = /^<\[CDATA\[/; var pr_brPrefix = /^<br\b/i; var pr_tagNameRe = /^<(\/?)([a-zA-Z]+)/; function extractTags(s) { var matches = s.match(pr_chunkPattern); var sourceBuf = []; var sourceBufLen = 0; var extractedTags = []; if (matches) { for (var i = 0, n = matches.length; i < n; ++i) { var match = matches[i]; if (match.length > 1 && match.charAt(0) === '<') { if (pr_commentPrefix.test(match)) { continue; } if (pr_cdataPrefix.test(match)) { sourceBuf.push(match.substring(9, match.length - 3)); sourceBufLen += match.length - 12; } else if (pr_brPrefix.test(match)) { sourceBuf.push('\n'); ++sourceBufLen; } else { if (match.indexOf(PR_NOCODE) >= 0 && isNoCodeTag(match)) { var name = match.match(pr_tagNameRe)[2]; var depth = 1; end_tag_loop: for (var j = i + 1; j < n; ++j) { var name2 = matches[j].match(pr_tagNameRe); if (name2 && name2[2] === name) { if (name2[1] === '/') { if (--depth === 0) { break end_tag_loop; } } else { ++depth; } } } if (j < n) { extractedTags.push(sourceBufLen, matches.slice(i, j + 1).join('')); i = j; } else { extractedTags.push(sourceBufLen, match); } } else { extractedTags.push(sourceBufLen, match); } } } else { var literalText = htmlToText(match); sourceBuf.push(literalText); sourceBufLen += literalText.length; } } } return { source: sourceBuf.join(''), tags: extractedTags }; } function isNoCodeTag(tag) { return !!tag.replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g, ' $1="$2$3$4"').match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/); } function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) { var shortcuts = {}; (function() { var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns); for (var i = allPatterns.length; --i >= 0; ) { var patternParts = allPatterns[i]; var shortcutChars = patternParts[3]; if (shortcutChars) { for (var c = shortcutChars.length; --c >= 0; ) { shortcuts[shortcutChars.charAt(c)] = patternParts; } } } })(); var nPatterns = fallthroughStylePatterns.length; var notWs = /\S/; return function(sourceCode, opt_basePos) { opt_basePos = opt_basePos || 0; var decorations = [opt_basePos, PR_PLAIN]; var lastToken = ''; var pos = 0; var tail = sourceCode; while (tail.length) { var style; var token = null; var match; var patternParts = shortcuts[tail.charAt(0)]; if (patternParts) { match = tail.match(patternParts[1]); token = match[0]; style = patternParts[0]; } else { for (var i = 0; i < nPatterns; ++i) { patternParts = fallthroughStylePatterns[i]; var contextPattern = patternParts[2]; if (contextPattern && !contextPattern.test(lastToken)) { continue; } match = tail.match(patternParts[1]); if (match) { token = match[0]; style = patternParts[0]; break; } } if (!token) { style = PR_PLAIN; token = tail.substring(0, 1); } } decorations.push(opt_basePos + pos, style); pos += token.length; tail = tail.substring(token.length); if (style !== PR_COMMENT && notWs.test(token)) { lastToken = token; } } return decorations; }; } var PR_MARKUP_LEXER = createSimpleLexer([], [[PR_PLAIN, /^[^<]+/, null], [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/, null], [PR_COMMENT, /^<!--[\s\S]*?(?:-->|$)/, null], [PR_SOURCE, /^<\?[\s\S]*?(?:\?>|$)/, null], [PR_SOURCE, /^<%[\s\S]*?(?:%>|$)/, null], [PR_SOURCE, /^<(script|style|xmp)\b[^>]*>[\s\S]*?<\/\1\b[^>]*>/i, null], [PR_TAG, /^<\/?\w[^<>]*>/, null]]); var PR_SOURCE_CHUNK_PARTS = /^(<[^>]*>)([\s\S]*)(<\/[^>]*>)$/; function tokenizeMarkup(source) { var decorations = PR_MARKUP_LEXER(source); for (var i = 0; i < decorations.length; i += 2) { if (decorations[i + 1] === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var sourceChunk = source.substring(start, end); var match = sourceChunk.match(PR_SOURCE_CHUNK_PARTS); if (match) { decorations.splice(i, 2, start, PR_TAG, start + match[1].length, PR_SOURCE, start + match[1].length + (match[2] || '').length, PR_TAG); } } } return decorations; } var PR_TAG_LEXER = createSimpleLexer([[PR_ATTRIB_VALUE, /^\'[^\']*(?:\'|$)/, null, "'"], [PR_ATTRIB_VALUE, /^\"[^\"]*(?:\"|$)/, null, '"'], [PR_PUNCTUATION, /^[<>\/=]+/, null, '<>/=']], [[PR_TAG, /^[\w:\-]+/, /^</], [PR_ATTRIB_VALUE, /^[\w\-]+/, /^=/], [PR_ATTRIB_NAME, /^[\w:\-]+/, null], [PR_PLAIN, /^\s+/, null, ' \t\r\n']]); function splitTagAttributes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_TAG) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var chunk = source.substring(start, end); var subDecorations = PR_TAG_LEXER(chunk, start); spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function sourceDecorator(options) { var shortcutStylePatterns = [], fallthroughStylePatterns = []; if (options.tripleQuotedStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/, null, '\'"']); } else if (options.multiLineStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/, null, '\'"`']); } else { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, null, '"\'']); } fallthroughStylePatterns.push([PR_PLAIN, /^(?:[^\'\"\`\/\#]+)/, null, ' \r\n']); if (options.hashComments) { shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']); } if (options.cStyleComments) { fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]); fallthroughStylePatterns.push([PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]); } if (options.regexLiterals) { var REGEX_LITERAL = ('^/(?=[^/*])' + '(?:[^/\\x5B\\x5C]' + '|\\x5C[\\s\\S]' + '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+' + '(?:/|$)'); fallthroughStylePatterns.push([PR_STRING, new RegExp(REGEX_LITERAL), REGEXP_PRECEDER_PATTERN]); } var keywords = wordSet(options.keywords); options = null; var splitStringAndCommentTokens = createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns); var styleLiteralIdentifierPuncRecognizer = createSimpleLexer([], [[PR_PLAIN, /^\s+/, null, ' \r\n'], [PR_PLAIN, /^[a-z_$@][a-z_$@0-9]*/i, null], [PR_LITERAL, /^0x[a-f0-9]+[a-z]/i, null], [PR_LITERAL, /^(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?[a-z]*/i, null, '123456789'], [PR_PUNCTUATION, /^[^\s\w\.$@]+/, null]]); function splitNonStringNonCommentTokens(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_PLAIN) { var start, end, chunk, subDecs; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; chunk = source.substring(start, end); subDecs = styleLiteralIdentifierPuncRecognizer(chunk, start); for (var j = 0, m = subDecs.length; j < m; j += 2) { var subStyle = subDecs[j + 1]; if (subStyle === PR_PLAIN) { var subStart = subDecs[j]; var subEnd = j + 2 < m ? subDecs[j + 2] : chunk.length; var token = source.substring(subStart, subEnd); if (token === '.') { subDecs[j + 1] = PR_PUNCTUATION; } else if (token in keywords) { subDecs[j + 1] = PR_KEYWORD; } else if (/^@?[A-Z][A-Z$]*[a-z][A-Za-z$]*$/.test(token)) { subDecs[j + 1] = token.charAt(0) === '@' ? PR_LITERAL : PR_TYPE; } } } spliceArrayInto(subDecs, decorations, i, 2); i += subDecs.length - 2; } } return decorations; } return function(sourceCode) { var decorations = splitStringAndCommentTokens(sourceCode); decorations = splitNonStringNonCommentTokens(sourceCode, decorations); return decorations; }; } var decorateSource = sourceDecorator({ keywords: ALL_KEYWORDS, hashComments: true, cStyleComments: true, multiLineStrings: true, regexLiterals: true }); function splitSourceNodes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var subDecorations = decorateSource(source.substring(start, end)); for (var j = 0, m = subDecorations.length; j < m; j += 2) { subDecorations[j] += start; } spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function splitSourceAttributes(source, decorations) { var nextValueIsSource = false; for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; var start, end; if (style === PR_ATTRIB_NAME) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; nextValueIsSource = /^on|^style$/i.test(source.substring(start, end)); } else if (style === PR_ATTRIB_VALUE) { if (nextValueIsSource) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var attribValue = source.substring(start, end); var attribLen = attribValue.length; var quoted = (attribLen >= 2 && /^[\"\']/.test(attribValue) && attribValue.charAt(0) === attribValue.charAt(attribLen - 1)); var attribSource; var attribSourceStart; var attribSourceEnd; if (quoted) { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue; } else { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue.substring(1, attribValue.length - 1); } var attribSourceDecorations = decorateSource(attribSource); for (var j = 0, m = attribSourceDecorations.length; j < m; j += 2) { attribSourceDecorations[j] += attribSourceStart; } if (quoted) { attribSourceDecorations.push(attribSourceEnd, PR_ATTRIB_VALUE); spliceArrayInto(attribSourceDecorations, decorations, i + 2, 0); } else { spliceArrayInto(attribSourceDecorations, decorations, i, 2); } } nextValueIsSource = false; } } return decorations; } function decorateMarkup(sourceCode) { var decorations = tokenizeMarkup(sourceCode); decorations = splitTagAttributes(sourceCode, decorations); decorations = splitSourceNodes(sourceCode, decorations); decorations = splitSourceAttributes(sourceCode, decorations); return decorations; } function recombineTagsAndDecorations(sourceText, extractedTags, decorations) { var html = []; var outputIdx = 0; var openDecoration = null; var currentDecoration = null; var tagPos = 0; var decPos = 0; var tabExpander = makeTabExpander(PR_TAB_WIDTH); var adjacentSpaceRe = /([\r\n ]) /g; var startOrSpaceRe = /(^| ) /gm; var newlineRe = /\r\n?|\n/g; var trailingSpaceRe = /[ \r\n]$/; var lastWasSpace = true; function emitTextUpTo(sourceIdx) { if (sourceIdx > outputIdx) { if (openDecoration && openDecoration !== currentDecoration) { html.push('</span>'); openDecoration = null; } if (!openDecoration && currentDecoration) { openDecoration = currentDecoration; html.push('<span class="', openDecoration, '">'); } var htmlChunk = textToHtml(tabExpander(sourceText.substring(outputIdx, sourceIdx))).replace(lastWasSpace ? startOrSpaceRe : adjacentSpaceRe, '$1&nbsp;'); lastWasSpace = trailingSpaceRe.test(htmlChunk); html.push(htmlChunk.replace(newlineRe, '<br />')); outputIdx = sourceIdx; } } while (true) { var outputTag; if (tagPos < extractedTags.length) { if (decPos < decorations.length) { outputTag = extractedTags[tagPos] <= decorations[decPos]; } else { outputTag = true; } } else { outputTag = false; } if (outputTag) { emitTextUpTo(extractedTags[tagPos]); if (openDecoration) { html.push('</span>'); openDecoration = null; } html.push(extractedTags[tagPos + 1]); tagPos += 2; } else if (decPos < decorations.length) { emitTextUpTo(decorations[decPos]); currentDecoration = decorations[decPos + 1]; decPos += 2; } else { break; } } emitTextUpTo(sourceText.length); if (openDecoration) { html.push('</span>'); } return html.join(''); } var langHandlerRegistry = {}; function registerLangHandler(handler, fileExtensions) { for (var i = fileExtensions.length; --i >= 0; ) { var ext = fileExtensions[i]; if (!langHandlerRegistry.hasOwnProperty(ext)) { langHandlerRegistry[ext] = handler; } else if ('console' in window) { console.log('cannot override language handler %s', ext); } } } registerLangHandler(decorateSource, ['default-code']); registerLangHandler(decorateMarkup, ['default-markup', 'html', 'htm', 'xhtml', 'xml', 'xsl']); registerLangHandler(sourceDecorator({ keywords: CPP_KEYWORDS, hashComments: true, cStyleComments: true }), ['c', 'cc', 'cpp', 'cs', 'cxx', 'cyc']); registerLangHandler(sourceDecorator({ keywords: JAVA_KEYWORDS, cStyleComments: true }), ['java']); registerLangHandler(sourceDecorator({ keywords: SH_KEYWORDS, hashComments: true, multiLineStrings: true }), ['bsh', 'csh', 'sh']); registerLangHandler(sourceDecorator({ keywords: PYTHON_KEYWORDS, hashComments: true, multiLineStrings: true, tripleQuotedStrings: true }), ['cv', 'py']); registerLangHandler(sourceDecorator({ keywords: PERL_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['perl', 'pl', 'pm']); registerLangHandler(sourceDecorator({ keywords: RUBY_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['rb']); registerLangHandler(sourceDecorator({ keywords: JSCRIPT_KEYWORDS, cStyleComments: true, regexLiterals: true }), ['js']); function prettyPrintOne(sourceCodeHtml, opt_langExtension) { try { var sourceAndExtractedTags = extractTags(sourceCodeHtml); var source = sourceAndExtractedTags.source; var extractedTags = sourceAndExtractedTags.tags; if (!langHandlerRegistry.hasOwnProperty(opt_langExtension)) { opt_langExtension = /^\s*</.test(source) ? 'default-markup' : 'default-code'; } var decorations = langHandlerRegistry[opt_langExtension].call({}, source); return recombineTagsAndDecorations(source, extractedTags, decorations); } catch (e) { if ('console' in window) { console.log(e); console.trace(); } return sourceCodeHtml; } } function prettyPrint(opt_whenDone) { var isIE6 = _pr_isIE6(); var codeSegments = [document.getElementsByTagName('pre'), document.getElementsByTagName('code'), document.getElementsByTagName('xmp')]; var elements = []; for (var i = 0; i < codeSegments.length; ++i) { for (var j = 0; j < codeSegments[i].length; ++j) { elements.push(codeSegments[i][j]); } } codeSegments = null; var k = 0; function doWork() { var endTime = (PR_SHOULD_USE_CONTINUATION ? new Date().getTime() + 250 : Infinity); for (; k < elements.length && new Date().getTime() < endTime; k++) { var cs = elements[k]; if (cs.className && cs.className.indexOf('prettyprint') >= 0) { var langExtension = cs.className.match(/\blang-(\w+)\b/); if (langExtension) { langExtension = langExtension[1]; } var nested = false; for (var p = cs.parentNode; p; p = p.parentNode) { if ((p.tagName === 'pre' || p.tagName === 'code' || p.tagName === 'xmp') && p.className && p.className.indexOf('prettyprint') >= 0) { nested = true; break; } } if (!nested) { var content = getInnerHtml(cs); content = content.replace(/(?:\r\n?|\n)$/, ''); var newContent = prettyPrintOne(content, langExtension); if (!isRawContent(cs)) { cs.innerHTML = newContent; } else { var pre = document.createElement('PRE'); for (var i = 0; i < cs.attributes.length; ++i) { var a = cs.attributes[i]; if (a.specified) { var aname = a.name.toLowerCase(); if (aname === 'class') { pre.className = a.value; } else { pre.setAttribute(a.name, a.value); } } } pre.innerHTML = newContent; cs.parentNode.replaceChild(pre, cs); cs = pre; } if (isIE6 && cs.tagName === 'PRE') { var lineBreaks = cs.getElementsByTagName('br'); for (var j = lineBreaks.length; --j >= 0; ) { var lineBreak = lineBreaks[j]; lineBreak.parentNode.replaceChild(document.createTextNode('\r\n'), lineBreak); } } } } } if (k < elements.length) { setTimeout(doWork, 250); } else if (opt_whenDone) { opt_whenDone(); } } doWork(); } window['PR_normalizedHtml'] = normalizedHtml; window['prettyPrintOne'] = prettyPrintOne; window['prettyPrint'] = prettyPrint; window['PR'] = { 'createSimpleLexer': createSimpleLexer, 'registerLangHandler': registerLangHandler, 'sourceDecorator': sourceDecorator, 'PR_ATTRIB_NAME': PR_ATTRIB_NAME, 'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE, 'PR_COMMENT': PR_COMMENT, 'PR_DECLARATION': PR_DECLARATION, 'PR_KEYWORD': PR_KEYWORD, 'PR_LITERAL': PR_LITERAL, 'PR_NOCODE': PR_NOCODE, 'PR_PLAIN': PR_PLAIN, 'PR_PUNCTUATION': PR_PUNCTUATION, 'PR_SOURCE': PR_SOURCE, 'PR_STRING': PR_STRING, 'PR_TAG': PR_TAG, 'PR_TYPE': PR_TYPE }; })();
+var PR_SHOULD_USE_CONTINUATION = true; var PR_TAB_WIDTH = 8; var PR_normalizedHtml; var PR; var prettyPrintOne; var prettyPrint; function _pr_isIE6() { var isIE6 = navigator && navigator.userAgent && /\bMSIE 6\./.test(navigator.userAgent); _pr_isIE6 = function() { return isIE6; }; return isIE6; } (function() { function wordSet(words) { words = words.split(/ /g); var set = {}; for (var i = words.length; --i >= 0; ) { var w = words[i]; if (w) { set[w] = null; } } return set; } var FLOW_CONTROL_KEYWORDS = "break continue do else for if return while "; var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " + "double enum extern float goto int long register short signed sizeof " + "static struct switch typedef union unsigned void volatile "; var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " + "new operator private protected public this throw true try "; var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " + "concept concept_map const_cast constexpr decltype " + "dynamic_cast explicit export friend inline late_check " + "mutable namespace nullptr reinterpret_cast static_assert static_cast " + "template typeid typename typeof using virtual wchar_t where "; var JAVA_KEYWORDS = COMMON_KEYWORDS + "boolean byte extends final finally implements import instanceof null " + "native package strictfp super synchronized throws transient "; var CSHARP_KEYWORDS = JAVA_KEYWORDS + "as base by checked decimal delegate descending event " + "fixed foreach from group implicit in interface internal into is lock " + "object out override orderby params readonly ref sbyte sealed " + "stackalloc string select uint ulong unchecked unsafe ushort var "; var JSCRIPT_KEYWORDS = COMMON_KEYWORDS + "debugger eval export function get null set undefined var with " + "Infinity NaN "; var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " + "goto if import last local my next no our print package redo require " + "sub undef unless until use wantarray while BEGIN END "; var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " + "elif except exec finally from global import in is lambda " + "nonlocal not or pass print raise try with yield " + "False True None "; var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" + " defined elsif end ensure false in module next nil not or redo rescue " + "retry self super then true undef unless until when yield BEGIN END "; var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " + "function in local set then until "; var ALL_KEYWORDS = (CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS + PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS); var PR_STRING = 'str'; var PR_KEYWORD = 'kwd'; var PR_COMMENT = 'com'; var PR_TYPE = 'typ'; var PR_LITERAL = 'lit'; var PR_PUNCTUATION = 'pun'; var PR_PLAIN = 'pln'; var PR_TAG = 'tag'; var PR_DECLARATION = 'dec'; var PR_SOURCE = 'src'; var PR_ATTRIB_NAME = 'atn'; var PR_ATTRIB_VALUE = 'atv'; var PR_NOCODE = 'nocode'; function isWordChar(ch) { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'); } function spliceArrayInto(inserted, container, containerPosition, countReplaced) { inserted.unshift(containerPosition, countReplaced || 0); try { container.splice.apply(container, inserted); } finally { inserted.splice(0, 2); } } var REGEXP_PRECEDER_PATTERN = function() { var preceders = ["!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=", "&=", "(", "*", "*=", "+=", ",", "-=", "->", "/", "/=", ":", "::", ";", "<", "<<", "<<=", "<=", "=", "==", "===", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "||=", "~", "break", "case", "continue", "delete", "do", "else", "finally", "instanceof", "return", "throw", "try", "typeof"]; var pattern = '(?:' + '(?:(?:^|[^0-9.])\\.{1,3})|' + '(?:(?:^|[^\\+])\\+)|' + '(?:(?:^|[^\\-])-)'; for (var i = 0; i < preceders.length; ++i) { var preceder = preceders[i]; if (isWordChar(preceder.charAt(0))) { pattern += '|\\b' + preceder; } else { pattern += '|' + preceder.replace(/([^=<>:&])/g, '\\$1'); } } pattern += '|^)\\s*$'; return new RegExp(pattern); } (); var pr_amp = /&/g; var pr_lt = /</g; var pr_gt = />/g; var pr_quot = /\"/g; function attribToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;').replace(pr_quot, '&quot;'); } function textToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;'); } var pr_ltEnt = /&lt;/g; var pr_gtEnt = /&gt;/g; var pr_aposEnt = /&apos;/g; var pr_quotEnt = /&quot;/g; var pr_ampEnt = /&amp;/g; var pr_nbspEnt = /&nbsp;/g; function htmlToText(html) { var pos = html.indexOf('&'); if (pos < 0) { return html; } for (--pos; (pos = html.indexOf('&#', pos + 1)) >= 0; ) { var end = html.indexOf(';', pos); if (end >= 0) { var num = html.substring(pos + 3, end); var radix = 10; if (num && num.charAt(0) === 'x') { num = num.substring(1); radix = 16; } var codePoint = parseInt(num, radix); if (!isNaN(codePoint)) { html = (html.substring(0, pos) + String.fromCharCode(codePoint) + html.substring(end + 1)); } } } return html.replace(pr_ltEnt, '<').replace(pr_gtEnt, '>').replace(pr_aposEnt, "'").replace(pr_quotEnt, '"').replace(pr_ampEnt, '&').replace(pr_nbspEnt, ' '); } function isRawContent(node) { return 'XMP' === node.tagName; } function normalizedHtml(node, out) { switch (node.nodeType) { case 1: var name = node.tagName.toLowerCase(); out.push('<', name); for (var i = 0; i < node.attributes.length; ++i) { var attr = node.attributes[i]; if (!attr.specified) { continue; } out.push(' '); normalizedHtml(attr, out); } out.push('>'); for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } if (node.firstChild || !/^(?:br|link|img)$/.test(name)) { out.push('<\/', name, '>'); } break; case 2: out.push(node.name.toLowerCase(), '="', attribToHtml(node.value), '"'); break; case 3: case 4: out.push(textToHtml(node.nodeValue)); break; } } var PR_innerHtmlWorks = null; function getInnerHtml(node) { if (null === PR_innerHtmlWorks) { var testNode = document.createElement('PRE'); testNode.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />')); PR_innerHtmlWorks = !/</.test(testNode.innerHTML); } if (PR_innerHtmlWorks) { var content = node.innerHTML; if (isRawContent(node)) { content = textToHtml(content); } return content; } var out = []; for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } return out.join(''); } function makeTabExpander(tabWidth) { var SPACES = '                '; var charInLine = 0; return function(plainText) { var out = null; var pos = 0; for (var i = 0, n = plainText.length; i < n; ++i) { var ch = plainText.charAt(i); switch (ch) { case '\t': if (!out) { out = []; } out.push(plainText.substring(pos, i)); var nSpaces = tabWidth - (charInLine % tabWidth); charInLine += nSpaces; for (; nSpaces >= 0; nSpaces -= SPACES.length) { out.push(SPACES.substring(0, nSpaces)); } pos = i + 1; break; case '\n': charInLine = 0; break; default: ++charInLine; } } if (!out) { return plainText; } out.push(plainText.substring(pos)); return out.join(''); }; } var pr_chunkPattern = /(?:[^<]+|<!--[\s\S]*?-->|<!\[CDATA\[([\s\S]*?)\]\]>|<\/?[a-zA-Z][^>]*>|<)/g; var pr_commentPrefix = /^<!--/; var pr_cdataPrefix = /^<\[CDATA\[/; var pr_brPrefix = /^<br\b/i; var pr_tagNameRe = /^<(\/?)([a-zA-Z]+)/; function extractTags(s) { var matches = s.match(pr_chunkPattern); var sourceBuf = []; var sourceBufLen = 0; var extractedTags = []; if (matches) { for (var i = 0, n = matches.length; i < n; ++i) { var match = matches[i]; if (match.length > 1 && match.charAt(0) === '<') { if (pr_commentPrefix.test(match)) { continue; } if (pr_cdataPrefix.test(match)) { sourceBuf.push(match.substring(9, match.length - 3)); sourceBufLen += match.length - 12; } else if (pr_brPrefix.test(match)) { sourceBuf.push('\n'); ++sourceBufLen; } else { if (match.indexOf(PR_NOCODE) >= 0 && isNoCodeTag(match)) { var name = match.match(pr_tagNameRe)[2]; var depth = 1; end_tag_loop: for (var j = i + 1; j < n; ++j) { var name2 = matches[j].match(pr_tagNameRe); if (name2 && name2[2] === name) { if (name2[1] === '/') { if (--depth === 0) { break end_tag_loop; } } else { ++depth; } } } if (j < n) { extractedTags.push(sourceBufLen, matches.slice(i, j + 1).join('')); i = j; } else { extractedTags.push(sourceBufLen, match); } } else { extractedTags.push(sourceBufLen, match); } } } else { var literalText = htmlToText(match); sourceBuf.push(literalText); sourceBufLen += literalText.length; } } } return { source: sourceBuf.join(''), tags: extractedTags }; } function isNoCodeTag(tag) { return !!tag.replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g, ' $1="$2$3$4"').match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/); } function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) { var shortcuts = {}; (function() { var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns); for (var i = allPatterns.length; --i >= 0; ) { var patternParts = allPatterns[i]; var shortcutChars = patternParts[3]; if (shortcutChars) { for (var c = shortcutChars.length; --c >= 0; ) { shortcuts[shortcutChars.charAt(c)] = patternParts; } } } })(); var nPatterns = fallthroughStylePatterns.length; var notWs = /\S/; return function(sourceCode, opt_basePos) { opt_basePos = opt_basePos || 0; var decorations = [opt_basePos, PR_PLAIN]; var lastToken = ''; var pos = 0; var tail = sourceCode; while (tail.length) { var style; var token = null; var match; var patternParts = shortcuts[tail.charAt(0)]; if (patternParts) { match = tail.match(patternParts[1]); token = match[0]; style = patternParts[0]; } else { for (var i = 0; i < nPatterns; ++i) { patternParts = fallthroughStylePatterns[i]; var contextPattern = patternParts[2]; if (contextPattern && !contextPattern.test(lastToken)) { continue; } match = tail.match(patternParts[1]); if (match) { token = match[0]; style = patternParts[0]; break; } } if (!token) { style = PR_PLAIN; token = tail.substring(0, 1); } } decorations.push(opt_basePos + pos, style); pos += token.length; tail = tail.substring(token.length); if (style !== PR_COMMENT && notWs.test(token)) { lastToken = token; } } return decorations; }; } var PR_MARKUP_LEXER = createSimpleLexer([], [[PR_PLAIN, /^[^<]+/, null], [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/, null], [PR_COMMENT, /^<!--[\s\S]*?(?:-->|$)/, null], [PR_SOURCE, /^<\?[\s\S]*?(?:\?>|$)/, null], [PR_SOURCE, /^<%[\s\S]*?(?:%>|$)/, null], [PR_SOURCE, /^<(script|style|xmp)\b[^>]*>[\s\S]*?<\/\1\b[^>]*>/i, null], [PR_TAG, /^<\/?\w[^<>]*>/, null]]); var PR_SOURCE_CHUNK_PARTS = /^(<[^>]*>)([\s\S]*)(<\/[^>]*>)$/; function tokenizeMarkup(source) { var decorations = PR_MARKUP_LEXER(source); for (var i = 0; i < decorations.length; i += 2) { if (decorations[i + 1] === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var sourceChunk = source.substring(start, end); var match = sourceChunk.match(PR_SOURCE_CHUNK_PARTS); if (match) { decorations.splice(i, 2, start, PR_TAG, start + match[1].length, PR_SOURCE, start + match[1].length + (match[2] || '').length, PR_TAG); } } } return decorations; } var PR_TAG_LEXER = createSimpleLexer([[PR_ATTRIB_VALUE, /^\'[^\']*(?:\'|$)/, null, "'"], [PR_ATTRIB_VALUE, /^\"[^\"]*(?:\"|$)/, null, '"'], [PR_PUNCTUATION, /^[<>\/=]+/, null, '<>/=']], [[PR_TAG, /^[\w:\-]+/, /^</], [PR_ATTRIB_VALUE, /^[\w\-]+/, /^=/], [PR_ATTRIB_NAME, /^[\w:\-]+/, null], [PR_PLAIN, /^\s+/, null, ' \t\r\n']]); function splitTagAttributes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_TAG) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var chunk = source.substring(start, end); var subDecorations = PR_TAG_LEXER(chunk, start); spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function sourceDecorator(options) { var shortcutStylePatterns = [], fallthroughStylePatterns = []; if (options.tripleQuotedStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/, null, '\'"']); } else if (options.multiLineStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/, null, '\'"`']); } else { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, null, '"\'']); } fallthroughStylePatterns.push([PR_PLAIN, /^(?:[^\'\"\`\/\#]+)/, null, ' \r\n']); if (options.hashComments) { shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']); } if (options.cStyleComments) { fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]); fallthroughStylePatterns.push([PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]); } if (options.regexLiterals) { var REGEX_LITERAL = ('^/(?=[^/*])' + '(?:[^/\\x5B\\x5C]' + '|\\x5C[\\s\\S]' + '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+' + '(?:/|$)'); fallthroughStylePatterns.push([PR_STRING, new RegExp(REGEX_LITERAL), REGEXP_PRECEDER_PATTERN]); } var keywords = wordSet(options.keywords); options = null; var splitStringAndCommentTokens = createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns); var styleLiteralIdentifierPuncRecognizer = createSimpleLexer([], [[PR_PLAIN, /^\s+/, null, ' \r\n'], [PR_PLAIN, /^[a-z_$@][a-z_$@0-9]*/i, null], [PR_LITERAL, /^0x[a-f0-9]+[a-z]/i, null], [PR_LITERAL, /^(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?[a-z]*/i, null, '123456789'], [PR_PUNCTUATION, /^[^\s\w\.$@]+/, null]]); function splitNonStringNonCommentTokens(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_PLAIN) { var start, end, chunk, subDecs; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; chunk = source.substring(start, end); subDecs = styleLiteralIdentifierPuncRecognizer(chunk, start); for (var j = 0, m = subDecs.length; j < m; j += 2) { var subStyle = subDecs[j + 1]; if (subStyle === PR_PLAIN) { var subStart = subDecs[j]; var subEnd = j + 2 < m ? subDecs[j + 2] : chunk.length; var token = source.substring(subStart, subEnd); if (token === '.') { subDecs[j + 1] = PR_PUNCTUATION; } else if (token in keywords) { subDecs[j + 1] = PR_KEYWORD; } else if (/^@?[A-Z][A-Z$]*[a-z][A-Za-z$]*$/.test(token)) { subDecs[j + 1] = token.charAt(0) === '@' ? PR_LITERAL : PR_TYPE; } } } spliceArrayInto(subDecs, decorations, i, 2); i += subDecs.length - 2; } } return decorations; } return function(sourceCode) { var decorations = splitStringAndCommentTokens(sourceCode); decorations = splitNonStringNonCommentTokens(sourceCode, decorations); return decorations; }; } var decorateSource = sourceDecorator({ keywords: ALL_KEYWORDS, hashComments: true, cStyleComments: true, multiLineStrings: true, regexLiterals: true }); function splitSourceNodes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var subDecorations = decorateSource(source.substring(start, end)); for (var j = 0, m = subDecorations.length; j < m; j += 2) { subDecorations[j] += start; } spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function splitSourceAttributes(source, decorations) { var nextValueIsSource = false; for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; var start, end; if (style === PR_ATTRIB_NAME) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; nextValueIsSource = /^on|^style$/i.test(source.substring(start, end)); } else if (style === PR_ATTRIB_VALUE) { if (nextValueIsSource) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var attribValue = source.substring(start, end); var attribLen = attribValue.length; var quoted = (attribLen >= 2 && /^[\"\']/.test(attribValue) && attribValue.charAt(0) === attribValue.charAt(attribLen - 1)); var attribSource; var attribSourceStart; var attribSourceEnd; if (quoted) { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue; } else { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue.substring(1, attribValue.length - 1); } var attribSourceDecorations = decorateSource(attribSource); for (var j = 0, m = attribSourceDecorations.length; j < m; j += 2) { attribSourceDecorations[j] += attribSourceStart; } if (quoted) { attribSourceDecorations.push(attribSourceEnd, PR_ATTRIB_VALUE); spliceArrayInto(attribSourceDecorations, decorations, i + 2, 0); } else { spliceArrayInto(attribSourceDecorations, decorations, i, 2); } } nextValueIsSource = false; } } return decorations; } function decorateMarkup(sourceCode) { var decorations = tokenizeMarkup(sourceCode); decorations = splitTagAttributes(sourceCode, decorations); decorations = splitSourceNodes(sourceCode, decorations); decorations = splitSourceAttributes(sourceCode, decorations); return decorations; } function recombineTagsAndDecorations(sourceText, extractedTags, decorations) { var html = []; var outputIdx = 0; var openDecoration = null; var currentDecoration = null; var tagPos = 0; var decPos = 0; var tabExpander = makeTabExpander(PR_TAB_WIDTH); var adjacentSpaceRe = /([\r\n ]) /g; var startOrSpaceRe = /(^| ) /gm; var newlineRe = /\r\n?|\n/g; var trailingSpaceRe = /[ \r\n]$/; var lastWasSpace = true; function emitTextUpTo(sourceIdx) { if (sourceIdx > outputIdx) { if (openDecoration && openDecoration !== currentDecoration) { html.push('</span>'); openDecoration = null; } if (!openDecoration && currentDecoration) { openDecoration = currentDecoration; html.push('<span class="', openDecoration, '">'); } var htmlChunk = textToHtml(tabExpander(sourceText.substring(outputIdx, sourceIdx))).replace(lastWasSpace ? startOrSpaceRe : adjacentSpaceRe, '$1&nbsp;'); lastWasSpace = trailingSpaceRe.test(htmlChunk); html.push(htmlChunk.replace(newlineRe, '<br />')); outputIdx = sourceIdx; } } while (true) { var outputTag; if (tagPos < extractedTags.length) { if (decPos < decorations.length) { outputTag = extractedTags[tagPos] <= decorations[decPos]; } else { outputTag = true; } } else { outputTag = false; } if (outputTag) { emitTextUpTo(extractedTags[tagPos]); if (openDecoration) { html.push('</span>'); openDecoration = null; } html.push(extractedTags[tagPos + 1]); tagPos += 2; } else if (decPos < decorations.length) { emitTextUpTo(decorations[decPos]); currentDecoration = decorations[decPos + 1]; decPos += 2; } else { break; } } emitTextUpTo(sourceText.length); if (openDecoration) { html.push('</span>'); } return html.join(''); } var langHandlerRegistry = {}; function registerLangHandler(handler, fileExtensions) { for (var i = fileExtensions.length; --i >= 0; ) { var ext = fileExtensions[i]; if (!langHandlerRegistry.hasOwnProperty(ext)) { langHandlerRegistry[ext] = handler; } else if ('console' in window) { console.log('cannot override language handler %s', ext); } } } registerLangHandler(decorateSource, ['default-code']); registerLangHandler(decorateMarkup, ['default-markup', 'html', 'htm', 'xhtml', 'xml', 'xsl']); registerLangHandler(sourceDecorator({ keywords: CPP_KEYWORDS, hashComments: true, cStyleComments: true }), ['c', 'cc', 'cpp', 'cs', 'cxx', 'cyc']); registerLangHandler(sourceDecorator({ keywords: JAVA_KEYWORDS, cStyleComments: true }), ['java']); registerLangHandler(sourceDecorator({ keywords: SH_KEYWORDS, hashComments: true, multiLineStrings: true }), ['bsh', 'csh', 'sh']); registerLangHandler(sourceDecorator({ keywords: PYTHON_KEYWORDS, hashComments: true, multiLineStrings: true, tripleQuotedStrings: true }), ['cv', 'py']); registerLangHandler(sourceDecorator({ keywords: PERL_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['perl', 'pl', 'pm']); registerLangHandler(sourceDecorator({ keywords: RUBY_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['rb']); registerLangHandler(sourceDecorator({ keywords: JSCRIPT_KEYWORDS, cStyleComments: true, regexLiterals: true }), ['js']); function prettyPrintOne(sourceCodeHtml, opt_langExtension) { try { var sourceAndExtractedTags = extractTags(sourceCodeHtml); var source = sourceAndExtractedTags.source; var extractedTags = sourceAndExtractedTags.tags; if (!langHandlerRegistry.hasOwnProperty(opt_langExtension)) { opt_langExtension = /^\s*</.test(source) ? 'default-markup' : 'default-code'; } var decorations = langHandlerRegistry[opt_langExtension].call({}, source); return recombineTagsAndDecorations(source, extractedTags, decorations); } catch (e) { if ('console' in window) { console.log(e); console.trace(); } return sourceCodeHtml; } } function prettyPrint(opt_whenDone) { var isIE6 = _pr_isIE6(); var codeSegments = [document.getElementsByTagName('pre'), document.getElementsByTagName('code'), document.getElementsByTagName('xmp')]; var elements = []; for (var i = 0; i < codeSegments.length; ++i) { for (var j = 0; j < codeSegments[i].length; ++j) { elements.push(codeSegments[i][j]); } } codeSegments = null; var k = 0; function doWork() { var endTime = (PR_SHOULD_USE_CONTINUATION ? new Date().getTime() + 250 : Infinity); for (; k < elements.length && new Date().getTime() < endTime; k++) { var cs = elements[k]; if (cs.className && cs.className.indexOf('prettyprint') >= 0) { var langExtension = cs.className.match(/\blang-(\w+)\b/); if (langExtension) { langExtension = langExtension[1]; } var nested = false; for (var p = cs.parentNode; p; p = p.parentNode) { if ((p.tagName === 'pre' || p.tagName === 'code' || p.tagName === 'xmp') && p.className && p.className.indexOf('prettyprint') >= 0) { nested = true; break; } } if (!nested) { var content = getInnerHtml(cs); content = content.replace(/(?:\r\n?|\n)$/, ''); var newContent = prettyPrintOne(content, langExtension); if (!isRawContent(cs)) { cs.innerHTML = newContent; } else { var pre = document.createElement('PRE'); for (var i = 0; i < cs.attributes.length; ++i) { var a = cs.attributes[i]; if (a.specified) { var aname = a.name.toLowerCase(); if (aname === 'class') { pre.className = a.value; } else { pre.setAttribute(a.name, a.value); } } } pre.innerHTML = newContent; cs.parentNode.replaceChild(pre, cs); cs = pre; } if (isIE6 && cs.tagName === 'PRE') { var lineBreaks = cs.getElementsByTagName('br'); for (var j = lineBreaks.length; --j >= 0; ) { var lineBreak = lineBreaks[j]; lineBreak.parentNode.replaceChild(document.createTextNode('\r\n'), lineBreak); } } } } } if (k < elements.length) { setTimeout(doWork, 250); } else if (opt_whenDone) { opt_whenDone(); } } doWork(); } window['PR_normalizedHtml'] = normalizedHtml; window['prettyPrintOne'] = prettyPrintOne; window['prettyPrint'] = prettyPrint; window['PR'] = { 'createSimpleLexer': createSimpleLexer, 'registerLangHandler': registerLangHandler, 'sourceDecorator': sourceDecorator, 'PR_ATTRIB_NAME': PR_ATTRIB_NAME, 'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE, 'PR_COMMENT': PR_COMMENT, 'PR_DECLARATION': PR_DECLARATION, 'PR_KEYWORD': PR_KEYWORD, 'PR_LITERAL': PR_LITERAL, 'PR_NOCODE': PR_NOCODE, 'PR_PLAIN': PR_PLAIN, 'PR_PUNCTUATION': PR_PUNCTUATION, 'PR_SOURCE': PR_SOURCE, 'PR_STRING': PR_STRING, 'PR_TAG': PR_TAG, 'PR_TYPE': PR_TYPE }; })();
\ No newline at end of file
diff --git a/templates/content/js/com.cnprog.utils.js b/templates/content/js/com.cnprog.utils.js
index e271ed78..683b7a3f 100644
--- a/templates/content/js/com.cnprog.utils.js
+++ b/templates/content/js/com.cnprog.utils.js
@@ -119,4 +119,4 @@ var CPValidator = function(){
 }();
 //Search Engine Keyword Highlight with Javascript
 //http://scott.yang.id.au/code/se-hilite/
-Hilite={elementid:"content",exact:true,max_nodes:1000,onload:true,style_name:"hilite",style_name_suffix:true,debug_referrer:""};Hilite.search_engines=[["local","q"],["cnprog\\.","q"],["google\\.","q"],["search\\.yahoo\\.","p"],["search\\.msn\\.","q"],["search\\.live\\.","query"],["search\\.aol\\.","userQuery"],["ask\\.com","q"],["altavista\\.","q"],["feedster\\.","q"],["search\\.lycos\\.","q"],["alltheweb\\.","q"],["technorati\\.com/search/([^\\?/]+)",1],["dogpile\\.com/info\\.dogpl/search/web/([^\\?/]+)",1,true]];Hilite.decodeReferrer=function(d){var g=null;var e=new RegExp("");for(var c=0;c<Hilite.search_engines.length;c++){var f=Hilite.search_engines[c];e.compile("^http://(www\\.)?"+f[0],"i");var b=d.match(e);if(b){var a;if(isNaN(f[1])){a=Hilite.decodeReferrerQS(d,f[1])}else{a=b[f[1]+1]}if(a){a=decodeURIComponent(a);if(f.length>2&&f[2]){a=decodeURIComponent(a)}a=a.replace(/\'|"/g,"");a=a.split(/[\s,\+\.]+/);return a}break}}return null};Hilite.decodeReferrerQS=function(f,d){var b=f.indexOf("?");var c;if(b>=0){var a=new String(f.substring(b+1));b=0;c=0;while((b>=0)&&((c=a.indexOf("=",b))>=0)){var e,g;e=a.substring(b,c);b=a.indexOf("&",c)+1;if(e==d){if(b<=0){return a.substring(c+1)}else{return a.substring(c+1,b-1)}}else{if(b<=0){return null}}}}return null};Hilite.hiliteElement=function(f,e){if(!e||f.childNodes.length==0){return}var c=new Array();for(var b=0;b<e.length;b++){e[b]=e[b].toLowerCase();if(Hilite.exact){c.push("\\b"+e[b]+"\\b")}else{c.push(e[b])}}c=new RegExp(c.join("|"),"i");var a={};for(var b=0;b<e.length;b++){if(Hilite.style_name_suffix){a[e[b]]=Hilite.style_name+(b+1)}else{a[e[b]]=Hilite.style_name}}var d=function(m){var j=c.exec(m.data);if(j){var n=j[0];var i="";var h=m.splitText(j.index);var g=h.splitText(n.length);var l=m.ownerDocument.createElement("SPAN");m.parentNode.replaceChild(l,h);l.className=a[n.toLowerCase()];l.appendChild(h);return l}else{return m}};Hilite.walkElements(f.childNodes[0],1,d)};Hilite.hilite=function(){var a=Hilite.debug_referrer?Hilite.debug_referrer:document.referrer;var b=null;a=Hilite.decodeReferrer(a);if(a&&((Hilite.elementid&&(b=document.getElementById(Hilite.elementid)))||(b=document.body))){Hilite.hiliteElement(b,a)}};Hilite.walkElements=function(d,f,e){var a=/^(script|style|textarea)/i;var c=0;while(d&&f>0){c++;if(c>=Hilite.max_nodes){var b=function(){Hilite.walkElements(d,f,e)};setTimeout(b,50);return}if(d.nodeType==1){if(!a.test(d.tagName)&&d.childNodes.length>0){d=d.childNodes[0];f++;continue}}else{if(d.nodeType==3){d=e(d)}}if(d.nextSibling){d=d.nextSibling}else{while(f>0){d=d.parentNode;f--;if(d.nextSibling){d=d.nextSibling;break}}}}};if(Hilite.onload){if(window.attachEvent){window.attachEvent("onload",Hilite.hilite)}else{if(window.addEventListener){window.addEventListener("load",Hilite.hilite,false)}else{var __onload=window.onload;window.onload=function(){Hilite.hilite();__onload()}}}};
+Hilite={elementid:"content",exact:true,max_nodes:1000,onload:true,style_name:"hilite",style_name_suffix:true,debug_referrer:""};Hilite.search_engines=[["local","q"],["cnprog\\.","q"],["google\\.","q"],["search\\.yahoo\\.","p"],["search\\.msn\\.","q"],["search\\.live\\.","query"],["search\\.aol\\.","userQuery"],["ask\\.com","q"],["altavista\\.","q"],["feedster\\.","q"],["search\\.lycos\\.","q"],["alltheweb\\.","q"],["technorati\\.com/search/([^\\?/]+)",1],["dogpile\\.com/info\\.dogpl/search/web/([^\\?/]+)",1,true]];Hilite.decodeReferrer=function(d){var g=null;var e=new RegExp("");for(var c=0;c<Hilite.search_engines.length;c++){var f=Hilite.search_engines[c];e.compile("^http://(www\\.)?"+f[0],"i");var b=d.match(e);if(b){var a;if(isNaN(f[1])){a=Hilite.decodeReferrerQS(d,f[1])}else{a=b[f[1]+1]}if(a){a=decodeURIComponent(a);if(f.length>2&&f[2]){a=decodeURIComponent(a)}a=a.replace(/\'|"/g,"");a=a.split(/[\s,\+\.]+/);return a}break}}return null};Hilite.decodeReferrerQS=function(f,d){var b=f.indexOf("?");var c;if(b>=0){var a=new String(f.substring(b+1));b=0;c=0;while((b>=0)&&((c=a.indexOf("=",b))>=0)){var e,g;e=a.substring(b,c);b=a.indexOf("&",c)+1;if(e==d){if(b<=0){return a.substring(c+1)}else{return a.substring(c+1,b-1)}}else{if(b<=0){return null}}}}return null};Hilite.hiliteElement=function(f,e){if(!e||f.childNodes.length==0){return}var c=new Array();for(var b=0;b<e.length;b++){e[b]=e[b].toLowerCase();if(Hilite.exact){c.push("\\b"+e[b]+"\\b")}else{c.push(e[b])}}c=new RegExp(c.join("|"),"i");var a={};for(var b=0;b<e.length;b++){if(Hilite.style_name_suffix){a[e[b]]=Hilite.style_name+(b+1)}else{a[e[b]]=Hilite.style_name}}var d=function(m){var j=c.exec(m.data);if(j){var n=j[0];var i="";var h=m.splitText(j.index);var g=h.splitText(n.length);var l=m.ownerDocument.createElement("SPAN");m.parentNode.replaceChild(l,h);l.className=a[n.toLowerCase()];l.appendChild(h);return l}else{return m}};Hilite.walkElements(f.childNodes[0],1,d)};Hilite.hilite=function(){var a=Hilite.debug_referrer?Hilite.debug_referrer:document.referrer;var b=null;a=Hilite.decodeReferrer(a);if(a&&((Hilite.elementid&&(b=document.getElementById(Hilite.elementid)))||(b=document.body))){Hilite.hiliteElement(b,a)}};Hilite.walkElements=function(d,f,e){var a=/^(script|style|textarea)/i;var c=0;while(d&&f>0){c++;if(c>=Hilite.max_nodes){var b=function(){Hilite.walkElements(d,f,e)};setTimeout(b,50);return}if(d.nodeType==1){if(!a.test(d.tagName)&&d.childNodes.length>0){d=d.childNodes[0];f++;continue}}else{if(d.nodeType==3){d=e(d)}}if(d.nextSibling){d=d.nextSibling}else{while(f>0){d=d.parentNode;f--;if(d.nextSibling){d=d.nextSibling;break}}}}};if(Hilite.onload){if(window.attachEvent){window.attachEvent("onload",Hilite.hilite)}else{if(window.addEventListener){window.addEventListener("load",Hilite.hilite,false)}else{var __onload=window.onload;window.onload=function(){Hilite.hilite();__onload()}}}};
\ No newline at end of file
diff --git a/templates/content/style/openid.css b/templates/content/style/openid.css
index 0d201df2..7a892840 100644
--- a/templates/content/style/openid.css
+++ b/templates/content/style/openid.css
@@ -42,4 +42,4 @@
 	}
 	.openid_selected {
 		border: 4px solid #DDD;
-	}	
+	}	
\ No newline at end of file
diff --git a/templates/pagesize.html b/templates/pagesize.html
index 5037f1f6..e5e17a24 100644
--- a/templates/pagesize.html
+++ b/templates/pagesize.html
@@ -1,9 +1,8 @@
-<!-- template pagesize.html -->
 {% spaceless %}
 {% load i18n %}
 {% if is_paginated %}
 <div class="paginator">
-    <span class="text">{% trans "posts per page" %}</span>
+    <span class="text">{% trans "Size per page:" %}</span>
     {% ifequal pagesize 10 %}
         <span class="curr">10</span>
     {% else %}
@@ -24,4 +23,3 @@
 </div> 
 {% endif %}
 {% endspaceless %}
-<!-- end template pagesize.html -->
diff --git a/templates/question_retag.html b/templates/question_retag.html
new file mode 100644
index 00000000..aebf93a5
--- /dev/null
+++ b/templates/question_retag.html
@@ -0,0 +1,109 @@
+{% extends "base.html" %}
+{% block title %}{% spaceless %}修改问题标签{% endspaceless %}{% endblock %}
+{% block forejs %}
+        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
+        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
+        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
+        <script type="text/javascript">
+        
+        $().ready(function(){
+            $("#nav_questions").attr('className',"on");
+            //Tags autocomplete action
+            var tags = {{ tags|safe }};
+        	$("#id_tags").autocomplete(tags, {
+                minChars: 1,
+        		matchContains: true,
+                max: 20,
+                multiple: true,
+                multipleSeparator: " ",
+        		formatItem: function(row, i, max) {
+        			return row.n + " ("+ row.c +")";
+        		},
+                formatResult: function(row, i, max){
+                    return row.n;
+                }
+                
+            });
+           
+             $("#fmretag").validate({
+                rules: {
+        			tags: {
+        				required: true,
+        				maxength: 105
+        			}
+        		},
+                messages: {
+        			tags: {
+                        required: " 标签不能为空。",
+                        maxlength: " 最多5个标签，每个标签长度小于20个字符。"
+                    }
+                }
+                
+            });
+            lanai.highlightSyntax();
+
+        });
+        </script>
+{% endblock %}
+        
+{% block content %}
+<div id="main-bar" class="headNormal">
+    修改标签 [<a href="{{ question.get_absolute_url }}">返回</a>]
+</div>
+<div id="main-body" class="ask-body">
+    <div id="askform">
+        <form id="fmretag" action="{% url edit_question question.id %}" method="post" >
+            <h3>
+                {{ question.get_question_title }}
+            </h3>
+            <div id="description" class="edit-content-html">
+                {{ question.html|safe }}
+            </div>
+           
+            
+            <div class="form-item">
+                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br>
+                {{ form.tags }}  {{ form.tags.errors }}
+                <div class="title-desc">
+                    {{ form.tags.help_text }}
+                </div>
+            </div>
+            <br>
+            
+            <div class="error" ></div>
+            <input type="submit" value="现在修改" class="submit" />
+            <input type="button" value="取消" class="submit" onclick="history.back(-1);" />
+            <br>
+            <br>
+        </form>
+    </div>
+</div>
+{% endblock %}
+
+{% block sidebar %}
+<div class="boxC">
+    <p class="subtitle">为什么我只能修改问题标签？</p>
+    <ul class="list-item">
+        
+        <li>
+            CNProg用标签来分类系统的信息
+
+        </li>
+        <li>
+            修改完整问题需要用户的积分达到一定条件（比如：积分 >= 3000分，自己发布的问题除外），而用户积分达到比较低的时候，就可以修改问题的标签（比如：积分 >= 500, 这里指所有问题的标签）。
+
+        </li>
+        <li>
+            修改标签的用户将授予特殊的社区奖牌 
+
+        </li>
+    </ul>
+    <a href="{% url faq %}" style="float:right;position:relative">faq »</a>
+    <br>  
+</div>
+
+{% endblock %}
+
+{% block endjs %}
+{% endblock %}
+
diff --git a/templates/user_preferences.html b/templates/user_preferences.html
index 246a834e..3a760a25 100644
--- a/templates/user_preferences.html
+++ b/templates/user_preferences.html
@@ -1,11 +1,20 @@
-<!-- user_preferences.html -->
 {% extends "user.html" %}
 {% load extra_tags %}
 {% load humanize %}
 
 {% block usercontent %}
         <div style="padding:5px;">
-            <h1>Surprise will be here soon ;-)</h1>
+        <fieldset>
+            <legend><b>同步Twitter消息</b></legend>
+            <form>
+                <label for="name">账号:</label>
+                <input id="name" /><br>
+                <label for="password">密码:</label>
+                <input id="password" type="password"/><br>
+                <input id="cbMessage" type="checkbox" />发布我的提问到我的Twitter<br>
+                <input id="cbReply" type="checkbox" />发布我的回答到我的Twitter<br>
+                <input type="submit" value="保存" />
+            </form>
+        </fieldset>
         </div>
 {% endblock %}
-<!-- end user_preferences.html -->
diff --git a/urls.py b/urls.py
index 89b5127c..a219fd44 100644
--- a/urls.py
+++ b/urls.py
@@ -60,4 +60,5 @@ urlpatterns = patterns('',
     url(r'^books/ask/(?P<short_name>[^/]+)/$', app.ask_book, name='ask_book'),
     url(r'^books/(?P<short_name>[^/]+)/$', app.book, name='book'),
     url(r'^search/$', app.search, name='search'),
+    (r'^i18n/', include('django.conf.urls.i18n')),
 )
-- 
cgit v1.2.3-1-g7c22


From 6568706a83a94faa18a715ec5e50a6282dc85c1a Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Mon, 27 Jul 2009 20:44:51 -0400
Subject: added APP_TITLE, APP_KEYWORDS and APP_DESCRIPTION

---
 templates/base.html  | 2 +-
 templates/index.html | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 0852f7de..bf24c840 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
-        <title>{% block title %}{% endblock %} - {% trans "site title" %} - {% trans "site slogan" %}</title>
+        <title>{% block title %}{% endblock %} - {{ APP_TITLE }}</title>
         {% spaceless %}
         {% block meta %}{% endblock %}
         {% endspaceless %}
diff --git a/templates/index.html b/templates/index.html
index 2ef66d4e..db2bb12e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,8 +4,8 @@
 {% load humanize %}
 {% load extra_filters %}
 {% block title %}{% spaceless %}{% trans "Home" %}{% endspaceless %}{% endblock %}
-{% block meta %}<meta name="keywords" content="{% trans "meta site keywords, comma separated" %}" />
-        <meta name="description" content="{% trans "meta site content" %}" />{% endblock %}
+{% block meta %}<meta name="keywords" content="{{ APP_KEYWORDS }}" />
+        <meta name="description" content="{{ APP_DESCRIPTION }}" />{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
         $().ready(function(){
@@ -78,8 +78,7 @@
 <div class="boxA">
 	<h3>{% trans "welcome to website" %}</h3>
 	<div class="body">
-	  <p>{% trans "what is this website" %}</p>
-	  <p>{% trans "what can one do on this website" %}</p>
+      {{ APP_INTRO|safe }}
 	  <div class="more"><a href="/about">{% trans "about" %} »</a></div>
 	  <div class="more"><a href="/faq">{% trans "faq" %} »</a></div>
 	</div>
-- 
cgit v1.2.3-1-g7c22


From f447f1a79de3fefee498a79cf7d8262bc774b9e4 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Mon, 3 Aug 2009 00:56:40 -0400
Subject: removed junk files

---
 README                              |    6 -
 junk                                |    7 -
 lanai.psproj                        |  557 -------
 mikes.patch                         | 2862 -----------------------------------
 templates/allfiles                  |   30 -
 templates/authopenid/htmlfiles      |    8 -
 templates/okfiles                   |   30 -
 templates/template.list             |   18 -
 templates/tough/faq.html            |  110 --
 templates/tough/question_retag.html |  107 --
 templates/tough/unanswered.html     |  115 --
 11 files changed, 3850 deletions(-)
 delete mode 100644 README
 delete mode 100644 junk
 delete mode 100644 lanai.psproj
 delete mode 100644 mikes.patch
 delete mode 100644 templates/allfiles
 delete mode 100644 templates/authopenid/htmlfiles
 delete mode 100644 templates/okfiles
 delete mode 100644 templates/template.list
 delete mode 100644 templates/tough/faq.html
 delete mode 100644 templates/tough/question_retag.html
 delete mode 100644 templates/tough/unanswered.html

diff --git a/README b/README
deleted file mode 100644
index 7f397acf..00000000
--- a/README
+++ /dev/null
@@ -1,6 +0,0 @@
-this is based on May23 beta2 version on google code
-
-changes:
-* added internationalization (i18n) messages to templates and .py files
-* added i18n support for javascript + English and Chinese messages
-* site runs as English version
diff --git a/junk b/junk
deleted file mode 100644
index 3f3226d6..00000000
--- a/junk
+++ /dev/null
@@ -1,7 +0,0 @@
-/branches/beta2/forum/feed.py   r110   line 17:
-/branches/beta2/forum/feed.py   r110   line 20:
-/branches/beta2/forum/forms.py   r110   line 63:
-/branches/beta2/templates/question.html   r120   line 237:
-/branches/beta2/templates/question.html   r120   line 57:
-/branches/beta2/templates/question.html   r120   line 456:
-/branches/beta2/forum/views.py   r127   line 1088:
diff --git a/lanai.psproj b/lanai.psproj
deleted file mode 100644
index 7f44d7ff..00000000
--- a/lanai.psproj
+++ /dev/null
@@ -1,557 +0,0 @@
-[PyScripter]
-Version=1.9.9.3
-
-[Project]
-ClassName=TProjectRootNode
-StoreRelativePaths=FALSE
-ShowFileExtensions=FALSE
-
-[Project\ChildNodes]
-Count=2
-
-[Project\ChildNodes\Node0]
-ClassName=TProjectFilesNode
-
-[Project\ChildNodes\Node0\ChildNodes]
-Count=1
-
-[Project\ChildNodes\Node0\ChildNodes\Node0]
-ClassName=TProjectFolderNode
-Name=src
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
-Count=10
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
-ClassName=TProjectFolderNode
-Name=django_authopenid
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
-Count=9
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\django_authopenid\__init__.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\django_authopenid\admin.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\django_authopenid\forms.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\django_authopenid\middleware.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\django_authopenid\mimeparse.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node5]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\django_authopenid\models.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node6]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\django_authopenid\urls.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node7]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\django_authopenid\util.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node8]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\django_authopenid\views.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
-ClassName=TProjectFolderNode
-Name=forum
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes]
-Count=12
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0]
-ClassName=TProjectFolderNode
-Name=management
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes]
-Count=2
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0]
-ClassName=TProjectFolderNode
-Name=commands
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
-Count=3
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\management\commands\__init__.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\management\commands\mark_offensive_cron.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\management\commands\sample_command.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node1]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\management\__init__.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1]
-ClassName=TProjectFolderNode
-Name=templatetags
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes]
-Count=3
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node0]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\templatetags\__init__.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node1]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\templatetags\extra_filters.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node2]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\templatetags\extra_tags.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node2]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\__init__.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node3]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\admin.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node4]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\auth.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node5]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\const.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node6]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\diff.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node7]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\forms.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node8]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\managers.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node9]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\models.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node10]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\user.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node11]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\forum\views.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
-ClassName=TProjectFolderNode
-Name=sql_scripts
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes]
-Count=6
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node0]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\sql_scripts\cnprog_new_install.sql
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node1]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_01_13_001.sql
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node2]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_01_13_002.sql
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node3]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_12_24_001.sql
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node4]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_12_27_001.sql
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node5]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_12_27_002.sql
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3]
-ClassName=TProjectFolderNode
-Name=templates
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes]
-Count=44
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0]
-ClassName=TProjectFolderNode
-Name=authopenid
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes]
-Count=10
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node0]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\authopenid\changeemail.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node1]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\authopenid\changeopenid.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node2]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\authopenid\changepw.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node3]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\authopenid\complete.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node4]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\authopenid\delete.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node5]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\authopenid\failure.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node6]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\authopenid\sendpw.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node7]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\authopenid\settings.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node8]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\authopenid\signin.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node9]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\authopenid\signup.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1]
-ClassName=TProjectFolderNode
-Name=content
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes]
-Count=2
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0]
-ClassName=TProjectFolderNode
-Name=js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes]
-Count=10
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0]
-ClassName=TProjectFolderNode
-Name=wmd
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
-Count=3
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\wmd\showdown.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\wmd\wmd-base.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\wmd\wmd-plus.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node1]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\com.cnprog.editor.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node2]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\com.cnprog.post.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node3]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\com.cnprog.utils.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node4]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\excanvas.pack.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node5]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\jquery.flot.pack.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node6]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\jquery.openid.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node7]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\jquery.validate.pack.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node8]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\jquery-1.2.6.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node9]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\js\jquery-1.2.6.min.js
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1]
-ClassName=TProjectFolderNode
-Name=style
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes]
-Count=4
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node0]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\style\default.css
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node1]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\style\jquery.autocomplete.css
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node2]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\style\openid.css
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node3]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\content\style\prettify.css
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node2]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\404.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node3]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\500.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node4]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\about.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node5]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\answer_edit.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node6]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\ask.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node7]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\badge.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node8]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\badges.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node9]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\base.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node10]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\base_content.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node11]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\close.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node12]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\faq.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node13]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\footer.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node14]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\header.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node15]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\index.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node16]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\logout.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node17]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\pagesize.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node18]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\paginator.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node19]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\privacy.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node20]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\question.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node21]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\question_edit.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node22]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\question_retag.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node23]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\questions.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node24]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\reopen.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node25]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\revisions_answer.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node26]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\revisions_question.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node27]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\sidebar.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node28]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\tags.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node29]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\unanswered.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node30]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node31]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user_edit.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node32]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user_favorites.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node33]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user_footer.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node34]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user_info.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node35]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user_preferences.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node36]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user_recent.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node37]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user_reputation.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node38]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user_responses.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node39]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user_stats.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node40]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user_tabs.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node41]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\user_votes.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node42]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\users.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node43]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\templates\users_questions.html
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4]
-ClassName=TProjectFolderNode
-Name=utils
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes]
-Count=4
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node0]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\utils\__init__.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node1]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\utils\cache.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node2]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\utils\html.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node3]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\utils\lists.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node5]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\__init__.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node6]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\manage.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node7]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\settings.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node8]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\test.py
-
-[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node9]
-ClassName=TProjectFileNode
-FileName=C:\Projects\Lanai\src\urls.py
-
-[Project\ChildNodes\Node1]
-ClassName=TProjectRunConfiguationsNode
-
-[Project\ExtraPythonPath]
-Count=0
-
diff --git a/mikes.patch b/mikes.patch
deleted file mode 100644
index 58437fb1..00000000
--- a/mikes.patch
+++ /dev/null
@@ -1,2862 +0,0 @@
-diff -ruN CNPROG/context.py mikes/context.py
---- CNPROG/context.py	1969-12-31 19:00:00.000000000 -0500
-+++ mikes/context.py	2009-07-25 19:09:58.098151134 -0400
-@@ -0,0 +1,9 @@
-+from django.conf import settings
-+def application_settings(context):
-+    return {
-+        'APP_TITLE' : settings.APP_TITLE,
-+        'APP_URL'   : settings.APP_URL,
-+        'APP_KEYWORDS' : settings.APP_KEYWORDS,
-+        'APP_DESCRIPTION' : settings.APP_DESCRIPTION,
-+        'APP_INTRO' : settings.APP_INTRO
-+        }
-diff -ruN CNPROG/development.log mikes/development.log
---- CNPROG/development.log	1969-12-31 19:00:00.000000000 -0500
-+++ mikes/development.log	2009-07-25 19:09:58.098151134 -0400
-@@ -0,0 +1 @@
-+# development log
-\ No newline at end of file
-diff -ruN CNPROG/django_authopenid/models.py mikes/django_authopenid/models.py
---- CNPROG/django_authopenid/models.py	2009-06-22 21:42:50.000000000 -0400
-+++ mikes/django_authopenid/models.py	2009-07-25 19:09:58.098151134 -0400
-@@ -3,7 +3,7 @@
- from django.contrib.auth.models import User
- from django.db import models
- 
--import md5, random, sys, os, time
-+import hashlib, random, sys, os, time
- 
- __all__ = ['Nonce', 'Association', 'UserAssociation', 
-         'UserPasswordQueueManager', 'UserPasswordQueue']
-@@ -47,7 +47,7 @@
-         # The random module is seeded when this Apache child is created.
-         # Use SECRET_KEY as added salt.
-         while 1:
--            confirm_key = md5.new("%s%s%s%s" % (
-+            confirm_key = hashlib.md5("%s%s%s%s" % (
-                 random.randint(0, sys.maxint - 1), os.getpid(),
-                 time.time(), settings.SECRET_KEY)).hexdigest()
-             try:
-diff -ruN CNPROG/django_authopenid/util.py mikes/django_authopenid/util.py
---- CNPROG/django_authopenid/util.py	2009-06-22 21:42:50.000000000 -0400
-+++ mikes/django_authopenid/util.py	2009-07-25 19:09:58.098151134 -0400
-@@ -15,7 +15,7 @@
- except:
-     from yadis import xri
- 
--import time, base64, md5, operator
-+import time, base64, hashlib, operator
- import urllib
- 
- from models import Association, Nonce
-@@ -128,7 +128,7 @@
- 
-     def getAuthKey(self):
-         # Use first AUTH_KEY_LEN characters of md5 hash of SECRET_KEY
--        return md5.new(settings.SECRET_KEY).hexdigest()[:self.AUTH_KEY_LEN]
-+        return hashlib.md5(settings.SECRET_KEY).hexdigest()[:self.AUTH_KEY_LEN]
-     
-     def isDumb(self):
-         return False
-diff -ruN CNPROG/forum/const.py mikes/forum/const.py
---- CNPROG/forum/const.py	2009-07-26 16:01:31.559063617 -0400
-+++ mikes/forum/const.py	2009-07-25 19:09:58.098151134 -0400
-@@ -53,22 +52,24 @@
- #TYPE_ACTIVITY_EDIT_ANSWER=18
- 
- TYPE_ACTIVITY = (
-     (TYPE_ACTIVITY_ASK_QUESTION, _('question')),
-     (TYPE_ACTIVITY_ANSWER, _('answer')),
-     (TYPE_ACTIVITY_COMMENT_QUESTION, _('commented question')),
-     (TYPE_ACTIVITY_COMMENT_ANSWER, _('commented answer')),
-     (TYPE_ACTIVITY_UPDATE_QUESTION, _('edited question')),
-     (TYPE_ACTIVITY_UPDATE_ANSWER, _('edited answer')),
-     (TYPE_ACTIVITY_PRIZE, _('received award')),
-     (TYPE_ACTIVITY_MARK_ANSWER, _('marked best answer')),
-     (TYPE_ACTIVITY_VOTE_UP, _('upvoted')),
-     (TYPE_ACTIVITY_VOTE_DOWN, _('downvoted')),
-     (TYPE_ACTIVITY_CANCEL_VOTE, _('canceled vote')),
-     (TYPE_ACTIVITY_DELETE_QUESTION, _('deleted question')),
-     (TYPE_ACTIVITY_DELETE_ANSWER, _('deleted answer')),
-     (TYPE_ACTIVITY_MARK_OFFENSIVE, _('marked offensive')),
-     (TYPE_ACTIVITY_UPDATE_TAGS, _('updated tags')),
-     (TYPE_ACTIVITY_FAVORITE, _('selected favorite')),
-     (TYPE_ACTIVITY_USER_FULL_UPDATED, _('completed user profile')),
-+    #(TYPE_ACTIVITY_EDIT_QUESTION, u'编辑问题'),
-+    #(TYPE_ACTIVITY_EDIT_ANSWER, u'编辑答案'),
- )
-  
-diff -ruN CNPROG/forum/management/commands/once_award_badges.py mikes/forum/management/commands/once_award_badges.py
---- CNPROG/forum/management/commands/once_award_badges.py	2009-06-22 21:42:50.000000000 -0400
-+++ mikes/forum/management/commands/once_award_badges.py	2009-07-25 19:09:58.098151134 -0400
-@@ -157,7 +157,8 @@
-         """
-         activity_types = ','.join('%s' % item for item in BADGE_AWARD_TYPE_FIRST.keys())
-         # ORDER BY user_id, activity_type
--        query = "SELECT id, user_id, activity_type, content_type_id, object_id FROM activity WHERE is_auditted = 0 AND activity_type IN (%s) ORDER BY user_id, activity_type" % activity_types
-+        query = "SELECT id, user_id, activity_type, content_type_id, object_id "+
-+            "FROM activity WHERE is_auditted = 0 AND activity_type IN (%s) ORDER BY user_id, activity_type" % activity_types
- 
-         cursor = connection.cursor()
-         try:
-@@ -205,7 +206,10 @@
- 
-         (13, '学生', 3, '学生', '第一次提问并且有一次以上赞成票', 0, 0),
-         """
--        query = "SELECT act.user_id, q.vote_up_count, act.object_id FROM activity act, question q WHERE act.activity_type = %s AND act.object_id = q.id AND act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ASK_QUESTION, 13)
-+        query = "SELECT act.user_id, q.vote_up_count, act.object_id FROM "+
-+                    "activity act, question q WHERE act.activity_type = %s AND "+
-+                    "act.object_id = q.id AND "+
-+                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ASK_QUESTION, 13)
-         cursor = connection.cursor()
-         try:
-             cursor.execute(query)
-@@ -232,7 +236,10 @@
- 
-         (15, '教师', 3, '教师', '第一次回答问题并且得到一个以上赞成票', 0, 0),
-         """
--        query = "SELECT act.user_id, a.vote_up_count, act.object_id FROM activity act, answer a WHERE act.activity_type = %s AND act.object_id = a.id AND act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 15)
-+        query = "SELECT act.user_id, a.vote_up_count, act.object_id FROM "+
-+                    "activity act, answer a WHERE act.activity_type = %s AND "+
-+                    "act.object_id = a.id AND "+
-+                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 15)
-         cursor = connection.cursor()
-         try:
-             cursor.execute(query)
-@@ -257,7 +264,11 @@
-         """
-         (32, '学问家', 2, '学问家', '第一次回答被投赞成票10次以上', 0, 0)
-         """
--        query = "SELECT act.user_id, act.object_id FROM activity act, answer a WHERE act.object_id = a.id AND act.activity_type = %s AND a.vote_up_count >= 10 AND act.user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 32)
-+        query = "SELECT act.user_id, act.object_id FROM "+
-+                    "activity act, answer a WHERE act.object_id = a.id AND "+
-+                    "act.activity_type = %s AND "+
-+                    "a.vote_up_count >= 10 AND "+
-+                    "act.user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 32)
-         cursor = connection.cursor()
-         try:
-             cursor.execute(query)
-@@ -281,7 +292,11 @@
-         """
-         (26, '优秀市民', 2, '优秀市民', '投票300次以上', 0, 0)
-         """
--        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 300" % (TYPE_ACTIVITY_VOTE_UP, TYPE_ACTIVITY_VOTE_DOWN, 26)
-+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+
-+                    "activity_type = %s OR "+
-+                    "activity_type = %s AND "+
-+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+
-+                    "GROUP BY user_id HAVING vote_count >= 300" % (TYPE_ACTIVITY_VOTE_UP, TYPE_ACTIVITY_VOTE_DOWN, 26)
- 
-         self.__award_for_count_num(query, 26)
- 
-@@ -289,7 +304,11 @@
-         """
-         (27, '编辑主任', 2, '编辑主任', '编辑了100个帖子', 0, 0)
-         """
--        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 100" % (TYPE_ACTIVITY_UPDATE_QUESTION, TYPE_ACTIVITY_UPDATE_ANSWER, 27)
-+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+
-+                    "activity_type = %s OR "+
-+                    "activity_type = %s AND "+
-+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+
-+                    "GROUP BY user_id HAVING vote_count >= 100" % (TYPE_ACTIVITY_UPDATE_QUESTION, TYPE_ACTIVITY_UPDATE_ANSWER, 27)
- 
-         self.__award_for_count_num(query, 27)
- 
-@@ -297,7 +316,11 @@
-         """
-         (5, '评论家', 3, '评论家', '评论10次以上', 0, 0),
-         """
--        query = "SELECT count(*) vote_count, user_id FROM activity WHERE activity_type = %s OR activity_type = %s AND user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) GROUP BY user_id HAVING vote_count >= 10" % (TYPE_ACTIVITY_COMMENT_QUESTION, TYPE_ACTIVITY_COMMENT_ANSWER, 5)
-+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE "+
-+                    "activity_type = %s OR "+
-+                    "activity_type = %s AND "+
-+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) "+
-+                    "GROUP BY user_id HAVING vote_count >= 10" % (TYPE_ACTIVITY_COMMENT_QUESTION, TYPE_ACTIVITY_COMMENT_ANSWER, 5)
-         self.__award_for_count_num(query, 5)
- 
-     def __award_for_count_num(self, query, badge):
-diff -ruN CNPROG/forum/managers.py mikes/forum/managers.py
---- CNPROG/forum/managers.py	2009-06-22 21:42:50.000000000 -0400
-+++ mikes/forum/managers.py	2009-07-25 19:09:58.098151134 -0400
-@@ -4,8 +4,29 @@
- from django.db import connection, models, transaction
- from django.db.models import Q
- from forum.models import *
-+from urllib import quote, unquote
- 
- class QuestionManager(models.Manager):
-+    def get_translation_questions(self, orderby, page_size):
-+        questions = self.filter(deleted=False, author__id__in=[28,29]).order_by(orderby)[:page_size]
-+        return questions
-+    
-+    def get_questions_by_pagesize(self, orderby, page_size):
-+        questions = self.filter(deleted=False).order_by(orderby)[:page_size]
-+        return questions
-+    
-+    def get_questions_by_tag(self, tagname, orderby):
-+        questions = self.filter(deleted=False, tags__name = unquote(tagname)).order_by(orderby)
-+        return questions
-+    
-+    def get_unanswered_questions(self, orderby):
-+        questions = self.filter(deleted=False, answer_count=0).order_by(orderby)
-+        return questions
-+    
-+    def get_questions(self, orderby):
-+        questions = self.filter(deleted=False).order_by(orderby)
-+        return questions
-+    
-     def update_tags(self, question, tagnames, user):
-         """
-         Updates Tag associations for a question to match the given
-@@ -92,7 +113,12 @@
-             'WHERE tag_id = tag.id'
-         ') '
-         'WHERE id IN (%s)')
--
-+    
-+    def get_valid_tags(self, page_size):
-+      from forum.models import Tag
-+      tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:page_size]
-+      return tags
-+    
-     def get_or_create_multiple(self, names, user):
-         """
-         Fetches a list of Tags with the given names, creating any Tags
-@@ -123,6 +149,19 @@
-         query = self.UPDATE_USED_COUNTS_QUERY % ','.join(['%s'] * len(tags))
-         cursor.execute(query, [tag.id for tag in tags])
-         transaction.commit_unless_managed()
-+    
-+    def get_tags_by_questions(self, questions):
-+        question_ids = []
-+        for question in questions:
-+            question_ids.append(question.id)
-+
-+        question_ids_str = ','.join([str(id) for id in question_ids])
-+        related_tags = self.extra(
-+                tables=['tag', 'question_tags'],
-+                where=["tag.id = question_tags.tag_id AND question_tags.question_id IN (" + question_ids_str + ")"]
-+        ).distinct()
-+        
-+        return related_tags
- 
- class AnswerManager(models.Manager):
-     GET_ANSWERS_FROM_USER_QUESTIONS = u'SELECT answer.* FROM answer INNER JOIN question ON answer.question_id = question.id WHERE question.author_id =%s AND answer.author_id <> %s'
-@@ -205,4 +244,16 @@
-             return row[0]
- 
-         else:
--            return 0    
-\ No newline at end of file
-+            return 0    
-+class AwardManager(models.Manager):
-+    def get_recent_awards(self):
-+        awards = super(AwardManager, self).extra(
-+            select={'badge_id': 'badge.id', 'badge_name':'badge.name',
-+                          'badge_description': 'badge.description', 'badge_type': 'badge.type',
-+                          'user_id': 'auth_user.id', 'user_name': 'auth_user.username'
-+                          },
-+            tables=['award', 'badge', 'auth_user'],
-+            order_by=['-awarded_at'],
-+            where=['auth_user.id=award.user_id AND badge_id=badge.id'],
-+        ).values('badge_id', 'badge_name', 'badge_description', 'badge_type', 'user_id', 'user_name')
-+        return awards
-diff -ruN CNPROG/forum/models.py mikes/forum/models.py
---- CNPROG/forum/models.py	2009-06-22 21:42:50.000000000 -0400
-+++ mikes/forum/models.py	2009-07-25 19:09:58.108151006 -0400
-@@ -351,7 +350,8 @@
-     content_object = generic.GenericForeignKey('content_type', 'object_id')
-     awarded_at = models.DateTimeField(default=datetime.datetime.now)
-     notified   = models.BooleanField(default=False)
--
-+    objects = AwardManager()
-+    
-     def __unicode__(self):
-         return u'[%s] is awarded a badge [%s] at %s' % (self.user.username, self.badge.name, self.awarded_at)
- 
-diff -ruN CNPROG/forum/templatetags/extra_tags.py mikes/forum/templatetags/extra_tags.py
---- CNPROG/forum/templatetags/extra_tags.py	2009-06-22 21:42:50.000000000 -0400
-+++ mikes/forum/templatetags/extra_tags.py	2009-07-25 19:09:58.108151006 -0400
-@@ -1,4 +1,4 @@
--import time
-+import time
- import datetime
- import math
- import re
-@@ -50,10 +49,10 @@
-         weight = 0
-     return MIN_FONTSIZE + round((MAX_FONTSIZE - MIN_FONTSIZE) * weight)
- 
--    
-+
- LEADING_PAGE_RANGE_DISPLAYED = TRAILING_PAGE_RANGE_DISPLAYED = 5
- LEADING_PAGE_RANGE = TRAILING_PAGE_RANGE = 4
--NUM_PAGES_OUTSIDE_RANGE = 1 
-+NUM_PAGES_OUTSIDE_RANGE = 1
- ADJACENT_PAGES = 2
- @register.inclusion_tag("paginator.html")
- def cnprog_paginator(context):
-@@ -65,10 +64,10 @@
-         " Initialize variables "
-         in_leading_range = in_trailing_range = False
-         pages_outside_leading_range = pages_outside_trailing_range = range(0)
-- 
-+
-         if (context["pages"] <= LEADING_PAGE_RANGE_DISPLAYED):
-             in_leading_range = in_trailing_range = True
--            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]           
-+            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
-         elif (context["page"] <= LEADING_PAGE_RANGE):
-             in_leading_range = True
-             page_numbers = [n for n in range(1, LEADING_PAGE_RANGE_DISPLAYED + 1) if n > 0 and n <= context["pages"]]
-@@ -77,11 +76,11 @@
-             in_trailing_range = True
-             page_numbers = [n for n in range(context["pages"] - TRAILING_PAGE_RANGE_DISPLAYED + 1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
-             pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
--        else: 
-+        else:
-             page_numbers = [n for n in range(context["page"] - ADJACENT_PAGES, context["page"] + ADJACENT_PAGES + 1) if n > 0 and n <= context["pages"]]
-             pages_outside_leading_range = [n + context["pages"] for n in range(0, -NUM_PAGES_OUTSIDE_RANGE, -1)]
-             pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
--            
-+
-         extend_url = context.get('extend_url', '')
-         return {
-             "base_url": context["base_url"],
-@@ -205,12 +197,12 @@
-         m = re.match(pattern, strValue)
-     return first + result
- 
--@register.simple_tag   
-+@register.simple_tag
- def convert2tagname_list(question):
-     question['tagnames'] = [name for name in question['tagnames'].split(u' ')]
-     return ''
- 
--@register.simple_tag    
-+@register.simple_tag
- def diff_date(date, limen=2):
-     current_time = datetime.datetime(*time.localtime()[0:6])
-     diff = current_time - date
-@@ -237,4 +229,4 @@
-         timestr = strftime("%H:%M %b-%d-%Y %Z", localtime(latest))
-     except:
-         timestr = ''
--    return timestr
-+    return timestr
-\ No newline at end of file
-diff -ruN CNPROG/forum/user.py mikes/forum/user.py
---- CNPROG/forum/user.py	2009-06-22 21:42:50.000000000 -0400
-+++ mikes/forum/user.py	2009-07-25 19:09:58.108151006 -0400
-@@ -1,3 +1,4 @@
-+# coding=utf-8
- from django.utils.translation import ugettext as _
- class UserView:
-     def __init__(self, id, tab_title, tab_description, page_title, view_name, template_file, data_size=0):
-diff -ruN CNPROG/forum/views.py mikes/forum/views.py
---- CNPROG/forum/views.py	2009-06-22 21:42:50.000000000 -0400
-+++ mikes/forum/views.py	2009-07-25 19:09:58.108151006 -0400
-@@ -77,29 +76,17 @@
-         orderby = "-last_activity_at"
-     # group questions by author_id of 28,29
-     if view_id == 'trans':
--        questions = Question.objects.filter(deleted=False, author__id__in=[28,29]).order_by(orderby)[:INDEX_PAGE_SIZE]
-+        questions = Question.objects.get_translation_questions(orderby, INDEX_PAGE_SIZE)
-     else:
--        questions = Question.objects.filter(deleted=False).order_by(orderby)[:INDEX_PAGE_SIZE]
-+        questions = Question.objects.get_questions_by_pagesize(orderby, INDEX_PAGE_SIZE)
-     # RISK - inner join queries
--    questions = questions.select_related();
--    tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:INDEX_TAGS_SIZE]
-+    questions = questions.select_related()
-+    tags = Tag.objects.get_valid_tags(INDEX_TAGS_SIZE)
- 
--    awards = Award.objects.extra(
--        select={'badge_id': 'badge.id', 'badge_name':'badge.name',
--                      'badge_description': 'badge.description', 'badge_type': 'badge.type',
--                      'user_id': 'auth_user.id', 'user_name': 'auth_user.username'
--                      },
--        tables=['award', 'badge', 'auth_user'],
--        order_by=['-awarded_at'],
--        where=['auth_user.id=award.user_id AND badge_id=badge.id'],
--    ).values('badge_id', 'badge_name', 'badge_description', 'badge_type', 'user_id', 'user_name')
--
--    class testvar:
--        content = 'haha'
-+    awards = Award.objects.get_recent_awards()
- 
-     return render_to_response('index.html', {
-         "questions" : questions,
--        'testvar':testvar,
-         "tab_id" : view_id,
-         "tags" : tags,
-         "awards" : awards[:INDEX_AWARD_SIZE],
-@@ -127,29 +114,11 @@
-     # Set flag to False by default. If it is equal to True, then need to be saved.
-     pagesize_changed = False
-     # get pagesize from session, if failed then get default value
--    user_page_size = request.session.get("pagesize", QUESTIONS_PAGE_SIZE)
--    # set pagesize equal to logon user specified value in database
--    if request.user.is_authenticated() and request.user.questions_per_page > 0:
--        user_page_size = request.user.questions_per_page
--
-+    pagesize = request.session.get("pagesize")
-     try:
-         page = int(request.GET.get('page', '1'))
--        # get new pagesize from UI selection
--        pagesize = int(request.GET.get('pagesize', user_page_size))
--        if pagesize <> user_page_size:
--            pagesize_changed = True
--
-     except ValueError:
-         page = 1
--        pagesize  = user_page_size
--
--    # save this pagesize to user database
--    if pagesize_changed:
--        request.session["pagesize"] = pagesize
--        if request.user.is_authenticated():
--            user = request.user
--            user.questions_per_page = pagesize
--            user.save()
- 
-     view_id = request.GET.get('sort', None)
-     view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
-@@ -161,29 +130,24 @@
- 
-     # check if request is from tagged questions
-     if tagname is not None:
--        #print datetime.datetime.now()
--        objects = Question.objects.filter(deleted=False, tags__name = unquote(tagname)).order_by(orderby)
--        #print datetime.datetime.now()
-+        objects = Question.objects.get_questions_by_tag(tagname, orderby)
-     elif unanswered:
-         #check if request is from unanswered questions
-         template_file = "unanswered.html"
--        objects = Question.objects.filter(deleted=False, answer_count=0).order_by(orderby)
-+        objects = Question.objects.get_unanswered_questions(orderby)
-     else:
--        objects = Question.objects.filter(deleted=False).order_by(orderby)
-+        objects = Question.objects.get_questions(orderby)
- 
-     # RISK - inner join queries
--    objects = objects.select_related();
-+    objects = objects.select_related(depth=1);
-     objects_list = Paginator(objects, pagesize)
-     questions = objects_list.page(page)
- 
-     # Get related tags from this page objects
--    related_tags = []
--    for question in questions.object_list:
--        tags = list(question.tags.all())
--        for tag in tags:
--            if tag not in related_tags:
--                related_tags.append(tag)
--
-+    if questions.object_list.count() > 0:
-+        related_tags = Tag.objects.get_tags_by_questions(questions.object_list)
-+    else:
-+        related_tags = None
-     return render_to_response(template_file, {
-         "questions" : questions,
-         "tab_id" : view_id,
-@@ -1022,6 +986,7 @@
-                         'title',
-                         'author_id',
-                         'accepted',
-+                        'vote_count',
-                         'answer_count',
-                         'vote_up_count',
-                         'vote_down_count')[:100]
-@@ -1090,7 +1055,8 @@
-             'activity_type' : 'activity.activity_type'
-             },
-         tables=['activity', 'question'],
--        where=['activity.content_type_id = %s AND activity.object_id = question.id AND activity.user_id = %s AND activity.activity_type = %s'],
-+        where=['activity.content_type_id = %s AND activity.object_id = ' +
-+            'question.id AND activity.user_id = %s AND activity.activity_type = %s'],
-         params=[question_type_id, user_id, TYPE_ACTIVITY_ASK_QUESTION],
-         order_by=['-activity.active_at']
-     ).values(
-@@ -1114,8 +1080,8 @@
-             'activity_type' : 'activity.activity_type'
-             },
-         tables=['activity', 'answer', 'question'],
--        where=['activity.content_type_id = %s AND activity.object_id = answer.id '
--			     'AND answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
-+        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' + 
-+            'answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
-         params=[answer_type_id, user_id, TYPE_ACTIVITY_ANSWER],
-         order_by=['-activity.active_at']
-     ).values(
-@@ -1140,7 +1106,9 @@
-             },
-         tables=['activity', 'question', 'comment'],
- 
--        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND activity.user_id = comment.user_id AND comment.object_id=question.id AND comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
-+        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
-+            'activity.user_id = comment.user_id AND comment.object_id=question.id AND '+
-+            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
-         params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],
-         order_by=['-comment.added_at']
-     ).values(
-@@ -1166,7 +1134,10 @@
-             },
-         tables=['activity', 'question', 'answer', 'comment'],
- 
--        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND activity.user_id = comment.user_id AND comment.object_id=answer.id AND comment.content_type_id=%s AND question.id = answer.question_id AND activity.user_id = %s AND activity.activity_type=%s'],
-+        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
-+            'activity.user_id = comment.user_id AND comment.object_id=answer.id AND '+
-+            'comment.content_type_id=%s AND question.id = answer.question_id AND '+
-+            'activity.user_id = %s AND activity.activity_type=%s'],
-         params=[comment_type_id, answer_type_id, user_id, TYPE_ACTIVITY_COMMENT_ANSWER],
-         order_by=['-comment.added_at']
-     ).values(
-@@ -1192,7 +1163,9 @@
-             'summary' : 'question_revision.summary'
-             },
-         tables=['activity', 'question_revision'],
--        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND activity.user_id = question_revision.author_id AND activity.user_id = %s AND activity.activity_type=%s'],
-+        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND '+
-+            'activity.user_id = question_revision.author_id AND activity.user_id = %s AND '+
-+            'activity.activity_type=%s'],
-         params=[question_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_QUESTION],
-         order_by=['-activity.active_at']
-     ).values(
-@@ -1220,7 +1193,10 @@
-             },
-         tables=['activity', 'answer_revision', 'question', 'answer'],
- 
--        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND activity.user_id = answer_revision.author_id AND activity.user_id = %s AND answer_revision.answer_id=answer.id AND answer.question_id = question.id AND activity.activity_type=%s'],
-+        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND '+
-+            'activity.user_id = answer_revision.author_id AND activity.user_id = %s AND '+
-+            'answer_revision.answer_id=answer.id AND answer.question_id = question.id AND '+
-+            'activity.activity_type=%s'],
-         params=[answer_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_ANSWER],
-         order_by=['-activity.active_at']
-     ).values(
-@@ -1246,7 +1222,9 @@
-             'activity_type' : 'activity.activity_type',
-             },
-         tables=['activity', 'answer', 'question'],
--        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND activity.user_id = question.author_id AND activity.user_id = %s AND answer.question_id=question.id AND activity.activity_type=%s'],
-+        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND '+
-+            'activity.user_id = question.author_id AND activity.user_id = %s AND '+
-+            'answer.question_id=question.id AND activity.activity_type=%s'],
-         params=[answer_type_id, user_id, TYPE_ACTIVITY_MARK_ANSWER],
-         order_by=['-activity.active_at']
-     ).values(
-@@ -1267,7 +1245,8 @@
-             'activity_type' : 'activity.activity_type'
-             },
-         tables=['activity', 'award', 'badge'],
--        where=['activity.user_id = award.user_id AND activity.user_id = %s AND award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
-+        where=['activity.user_id = award.user_id AND activity.user_id = %s AND '+
-+            'award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
-         params=[user_id, TYPE_ACTIVITY_PRIZE],
-         order_by=['-activity.active_at']
-     ).values(
-@@ -1320,7 +1299,8 @@
-             },
-         select_params=[user_id],
-         tables=['answer', 'question', 'auth_user'],
--        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
-+        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
-+            'question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
-         params=[user_id, user_id],
-         order_by=['-answer.id']
-     ).values(
-@@ -1349,7 +1329,8 @@
-             'user_id' : 'auth_user.id'
-             },
-         tables=['question', 'auth_user', 'comment'],
--        where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
-+        where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND '+
-+            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
-         params=[user_id, question_type_id, user_id],
-         order_by=['-comment.added_at']
-     ).values(
-@@ -1378,7 +1359,9 @@
-             'user_id' : 'auth_user.id'
-             },
-         tables=['answer', 'auth_user', 'comment', 'question'],
--        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id AND question.id = answer.question_id'],
-+        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND '+
-+            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id '+
-+            'AND question.id = answer.question_id'],
-         params=[user_id, answer_type_id, user_id],
-         order_by=['-comment.added_at']
-     ).values(
-@@ -1409,7 +1392,8 @@
-             },
-         select_params=[user_id],
-         tables=['answer', 'question', 'auth_user'],
--        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
-+        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
-+            'answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
-         params=[user_id],
-         order_by=['-answer.id']
-     ).values(
-@@ -1453,7 +1437,8 @@
-             },
-         select_params=[user_id],
-         tables=['vote', 'question', 'auth_user'],
--        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id AND vote.user_id=auth_user.id'],
-+        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id '+
-+            'AND vote.user_id=auth_user.id'],
-         params=[question_type_id, user_id],
-         order_by=['-vote.id']
-     ).values(
-@@ -1476,7 +1461,8 @@
-             },
-         select_params=[user_id],
-         tables=['vote', 'answer', 'question', 'auth_user'],
--        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
-+        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id '+
-+            'AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
-         params=[answer_type_id, user_id],
-         order_by=['-vote.id']
-     ).values(
-@@ -1501,7 +1487,8 @@
- def user_reputation(request, user_id, user_view):
-     user = get_object_or_404(User, id=user_id)
-     reputation = Repute.objects.extra(
--        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 'title': 'question.title'},
-+        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 
-+            'title': 'question.title'},
-         tables=['repute', 'question'],
-         order_by=['-reputed_at'],
-         where=['user_id=%s AND question_id=question.id'],
-@@ -1510,6 +1497,7 @@
- 
-     reputation.query.group_by = ['question_id']
- 
-+
-     rep_list = []
-     for rep in Repute.objects.filter(user=user).order_by('reputed_at'):
-         dic = '[%s,%s]' % (calendar.timegm(rep.reputed_at.timetuple()) * 1000, rep.reputation)
-@@ -1531,7 +1519,8 @@
-     questions = Question.objects.extra(
-         select={
-             'vote_count' : 'question.vote_up_count + question.vote_down_count',
--            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s AND f.question_id = question.id',
-+            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s '+
-+                'AND f.question_id = question.id',
-             'la_user_id' : 'auth_user.id',
-             'la_username' : 'auth_user.username',
-             'la_user_gold' : 'auth_user.gold',
-@@ -1541,7 +1530,8 @@
-             },
-         select_params=[user_id],
-         tables=['question', 'auth_user', 'favorite_question'],
--        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
-+        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id '+
-+            'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
-         params=[user_id],
-         order_by=['-vote_count', '-question.id']
-     ).values('vote_count',
-@@ -1672,7 +1662,12 @@
- def badge(request, id):
-     badge = get_object_or_404(Badge, id=id)
-     awards = Award.objects.extra(
--        select={'id': 'auth_user.id', 'name': 'auth_user.username', 'rep':'auth_user.reputation', 'gold': 'auth_user.gold', 'silver': 'auth_user.silver', 'bronze': 'auth_user.bronze'},
-+        select={'id': 'auth_user.id', 
-+                'name': 'auth_user.username', 
-+                'rep':'auth_user.reputation', 
-+                'gold': 'auth_user.gold', 
-+                'silver': 'auth_user.silver', 
-+                'bronze': 'auth_user.bronze'},
-         tables=['award', 'auth_user'],
-         where=['badge_id=%s AND user_id=auth_user.id'],
-         params=[id]
-diff -ruN CNPROG/INSTALL mikes/INSTALL
---- CNPROG/INSTALL	1969-12-31 19:00:00.000000000 -0500
-+++ mikes/INSTALL	2009-07-25 19:09:58.068150962 -0400
-@@ -0,0 +1,33 @@
-+PRE-REQUIREMENTS:
-+-----------------------------------------------
-+1. Python2.5, MySQL, Django v1.0+
-+
-+2. Python-openid v2.2
-+http://openidenabled.com/python-openid/
-+
-+3. django-authopenid(Included in project already)
-+http://code.google.com/p/django-authopenid/
-+
-+4. html5lib
-+http://code.google.com/p/html5lib/
-+Used for HTML sanitizer
-+
-+5. Markdown2
-+http://code.google.com/p/python-markdown2/
-+
-+
-+INSTALL STEPS:
-+-----------------------------------------------
-+1. Copy settings_local.py.dist to settings_local.py and 
-+update all your settings. Check settings.py and update 
-+it as well if necessory.
-+
-+2. Prepare your database by using the same database/account 
-+configuration from above.
-+
-+3. Run "python manager.py runserver" to startup django 
-+development environment.
-+
-+4. There are some demo scripts under sql_scripts folder, 
-+including badges and test accounts for CNProg.com. You 
-+don't need them to run your sample.
-diff -ruN CNPROG/junk mikes/junk
---- CNPROG/junk	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/junk	1969-12-31 19:00:00.000000000 -0500
-@@ -1,7 +0,0 @@
--/branches/beta2/forum/feed.py   r110   line 17:
--/branches/beta2/forum/feed.py   r110   line 20:
--/branches/beta2/forum/forms.py   r110   line 63:
--/branches/beta2/templates/question.html   r120   line 237:
--/branches/beta2/templates/question.html   r120   line 57:
--/branches/beta2/templates/question.html   r120   line 456:
--/branches/beta2/forum/views.py   r127   line 1088:
-diff -ruN CNPROG/lanai.psproj mikes/lanai.psproj
---- CNPROG/lanai.psproj	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/lanai.psproj	1969-12-31 19:00:00.000000000 -0500
-@@ -1,557 +0,0 @@
--[PyScripter]
--Version=1.9.9.3
--
--[Project]
--ClassName=TProjectRootNode
--StoreRelativePaths=FALSE
--ShowFileExtensions=FALSE
--
--[Project\ChildNodes]
--Count=2
--
--[Project\ChildNodes\Node0]
--ClassName=TProjectFilesNode
--
--[Project\ChildNodes\Node0\ChildNodes]
--Count=1
--
--[Project\ChildNodes\Node0\ChildNodes\Node0]
--ClassName=TProjectFolderNode
--Name=src
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
--Count=10
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
--ClassName=TProjectFolderNode
--Name=django_authopenid
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
--Count=9
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\django_authopenid\__init__.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\django_authopenid\admin.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\django_authopenid\forms.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\django_authopenid\middleware.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\django_authopenid\mimeparse.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node5]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\django_authopenid\models.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node6]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\django_authopenid\urls.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node7]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\django_authopenid\util.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node8]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\django_authopenid\views.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
--ClassName=TProjectFolderNode
--Name=forum
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes]
--Count=12
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0]
--ClassName=TProjectFolderNode
--Name=management
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes]
--Count=2
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0]
--ClassName=TProjectFolderNode
--Name=commands
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
--Count=3
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\management\commands\__init__.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\management\commands\mark_offensive_cron.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\management\commands\sample_command.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node1]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\management\__init__.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1]
--ClassName=TProjectFolderNode
--Name=templatetags
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes]
--Count=3
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node0]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\templatetags\__init__.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node1]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\templatetags\extra_filters.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node2]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\templatetags\extra_tags.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node2]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\__init__.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node3]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\admin.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node4]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\auth.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node5]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\const.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node6]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\diff.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node7]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\forms.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node8]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\managers.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node9]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\models.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node10]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\user.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1\ChildNodes\Node11]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\forum\views.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
--ClassName=TProjectFolderNode
--Name=sql_scripts
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes]
--Count=6
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node0]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\sql_scripts\cnprog_new_install.sql
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node1]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_01_13_001.sql
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node2]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_01_13_002.sql
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node3]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_12_24_001.sql
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node4]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_12_27_001.sql
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2\ChildNodes\Node5]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\sql_scripts\update_2009_12_27_002.sql
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3]
--ClassName=TProjectFolderNode
--Name=templates
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes]
--Count=44
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0]
--ClassName=TProjectFolderNode
--Name=authopenid
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes]
--Count=10
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node0]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\authopenid\changeemail.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node1]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\authopenid\changeopenid.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node2]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\authopenid\changepw.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node3]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\authopenid\complete.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node4]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\authopenid\delete.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node5]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\authopenid\failure.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node6]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\authopenid\sendpw.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node7]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\authopenid\settings.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node8]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\authopenid\signin.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node0\ChildNodes\Node9]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\authopenid\signup.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1]
--ClassName=TProjectFolderNode
--Name=content
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes]
--Count=2
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0]
--ClassName=TProjectFolderNode
--Name=js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes]
--Count=10
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0]
--ClassName=TProjectFolderNode
--Name=wmd
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes]
--Count=3
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node0]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\wmd\showdown.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node1]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\wmd\wmd-base.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node2]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\wmd\wmd-plus.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node1]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\com.cnprog.editor.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node2]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\com.cnprog.post.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node3]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\com.cnprog.utils.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node4]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\excanvas.pack.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node5]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\jquery.flot.pack.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node6]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\jquery.openid.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node7]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\jquery.validate.pack.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node8]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\jquery-1.2.6.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node0\ChildNodes\Node9]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\js\jquery-1.2.6.min.js
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1]
--ClassName=TProjectFolderNode
--Name=style
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes]
--Count=4
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node0]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\style\default.css
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node1]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\style\jquery.autocomplete.css
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node2]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\style\openid.css
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node1\ChildNodes\Node1\ChildNodes\Node3]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\content\style\prettify.css
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node2]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\404.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node3]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\500.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node4]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\about.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node5]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\answer_edit.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node6]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\ask.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node7]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\badge.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node8]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\badges.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node9]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\base.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node10]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\base_content.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node11]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\close.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node12]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\faq.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node13]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\footer.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node14]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\header.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node15]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\index.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node16]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\logout.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node17]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\pagesize.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node18]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\paginator.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node19]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\privacy.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node20]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\question.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node21]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\question_edit.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node22]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\question_retag.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node23]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\questions.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node24]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\reopen.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node25]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\revisions_answer.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node26]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\revisions_question.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node27]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\sidebar.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node28]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\tags.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node29]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\unanswered.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node30]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node31]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user_edit.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node32]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user_favorites.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node33]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user_footer.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node34]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user_info.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node35]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user_preferences.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node36]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user_recent.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node37]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user_reputation.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node38]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user_responses.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node39]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user_stats.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node40]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user_tabs.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node41]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\user_votes.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node42]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\users.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node3\ChildNodes\Node43]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\templates\users_questions.html
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4]
--ClassName=TProjectFolderNode
--Name=utils
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes]
--Count=4
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node0]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\utils\__init__.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node1]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\utils\cache.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node2]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\utils\html.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node4\ChildNodes\Node3]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\utils\lists.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node5]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\__init__.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node6]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\manage.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node7]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\settings.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node8]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\test.py
--
--[Project\ChildNodes\Node0\ChildNodes\Node0\ChildNodes\Node9]
--ClassName=TProjectFileNode
--FileName=C:\Projects\Lanai\src\urls.py
--
--[Project\ChildNodes\Node1]
--ClassName=TProjectRunConfiguationsNode
--
--[Project\ExtraPythonPath]
--Count=0
--
-diff -ruN CNPROG/LICENSE mikes/LICENSE
---- CNPROG/LICENSE	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/LICENSE	2009-07-25 19:09:58.088150984 -0400
-@@ -1,12 +1,14 @@
--��Ȩ����(c) 2008 CNProg.com
-+Copyright (C) 2009.  Chen Gang
- 
--����2.0�汾Apache����֤("����֤")��Ȩ��
--���ݱ�����֤���û����Բ�ʹ�ô��ļ���
--�û��ɴ�������ַ�������֤������
-+This program is free software: you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation, either version 3 of the License, or
-+(at your option) any later version.
- 
--http://www.apache.org/licenses/LICENSE-2.0
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
- 
--���������÷�����Ҫ������ͬ�⣬
--��������֤�ַ��������ǻ���"��ԭ��"�����ṩ��
--���κ���ʾ�Ļ�ʾ�ı�֤��������
--�����������֤�����£��ض����ԵĹ�ϽȨ�޺����ơ�
-\ No newline at end of file
-+You should have received a copy of the GNU General Public License
-+along with this program.  If not, see <http://www.gnu.org/licenses/>.
-diff -ruN CNPROG/locale/zh_CN/LC_MESSAGES/django.po mikes/locale/zh_CN/LC_MESSAGES/django.po
---- CNPROG/locale/zh_CN/LC_MESSAGES/django.po	1969-12-31 19:00:00.000000000 -0500
-+++ mikes/locale/zh_CN/LC_MESSAGES/django.po	2009-07-25 19:09:58.108151006 -0400
-@@ -0,0 +1,629 @@
-+# Chinese translations for CNProg.com
-+# Copyright (C) 2009
-+# This file is distributed under the same license as the CNPROG package.
-+# Mike Chen <chagel@gmail.com>, 2009.
-+#
-+#, fuzzy
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: PACKAGE VERSION\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2009-07-15 13:53+0000\n"
-+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-+"Language-Team: LANGUAGE <LL@li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#: settings.py:12
-+msgid "account/"
-+msgstr ""
-+
-+#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:11
-+msgid "signin/"
-+msgstr ""
-+
-+#: django_authopenid/forms.py:67 django_authopenid/views.py:93
-+msgid "i-names are not supported"
-+msgstr "i-names不支持。"
-+
-+#: django_authopenid/forms.py:102 django_authopenid/forms.py:207
-+msgid ""
-+"Usernames can only contain                     letters, numbers and "
-+"underscores"
-+msgstr "用户名格式有误。只有字母，数字和下划线是允许的。"
-+
-+#: django_authopenid/forms.py:109
-+msgid ""
-+"This username does not exist                     in our database. Please "
-+"choose another."
-+msgstr "用户名不存在。请重新输入。"
-+
-+#: django_authopenid/forms.py:126 django_authopenid/forms.py:231
-+msgid ""
-+"Please enter a valid                     username and password. Note that "
-+"both fields are                     case-sensitive."
-+msgstr "请输入用户名和密码。注意区分大小写。"
-+
-+#: django_authopenid/forms.py:130 django_authopenid/forms.py:235
-+msgid "This account is inactive."
-+msgstr "用户已冻结。"
-+
-+#: django_authopenid/forms.py:184
-+msgid ""
-+"This email is already                 registered in our database. Please "
-+"choose another."
-+msgstr "电子邮件已被注册。请使用一个新的邮件地址。"
-+
-+#: django_authopenid/forms.py:214
-+msgid ""
-+"This username don't exist.                         Please choose another."
-+msgstr "用户名不存在"
-+
-+#: django_authopenid/forms.py:330
-+msgid ""
-+"Old password is incorrect.                     Please enter the correct "
-+"password."
-+msgstr "旧密码错误。"
-+
-+#: django_authopenid/forms.py:342
-+msgid "new passwords do not match"
-+msgstr "新密码不匹配"
-+
-+#: django_authopenid/forms.py:434
-+msgid "Incorrect username."
-+msgstr "用户名不正确"
-+
-+#: django_authopenid/urls.py:10
-+msgid "signout/"
-+msgstr ""
-+
-+#: django_authopenid/urls.py:11
-+msgid "complete/"
-+msgstr ""
-+
-+#: django_authopenid/urls.py:13
-+msgid "register/"
-+msgstr ""
-+
-+#: django_authopenid/urls.py:14
-+msgid "signup/"
-+msgstr ""
-+
-+#: django_authopenid/urls.py:16
-+msgid "sendpw/"
-+msgstr ""
-+
-+#: django_authopenid/urls.py:26
-+msgid "delete/"
-+msgstr ""
-+
-+#: django_authopenid/views.py:99
-+#, python-format
-+msgid "非法OpenID地址： %s"
-+msgstr ""
-+
-+#: django_authopenid/views.py:366 templates/index.html:78
-+msgid "Welcome"
-+msgstr "欢迎"
-+
-+#: django_authopenid/views.py:456
-+msgid "Password changed."
-+msgstr "密码已更新。"
-+
-+#: django_authopenid/views.py:488
-+msgid "Email changed."
-+msgstr "邮件地址已更新。"
-+
-+#: django_authopenid/views.py:519 django_authopenid/views.py:671
-+#, python-format
-+msgid "No OpenID %s found associated in our database"
-+msgstr "该OpenID %s 不在系统中。"
-+
-+#: django_authopenid/views.py:523 django_authopenid/views.py:678
-+#, python-format
-+msgid "The OpenID %s isn't associated to current user logged in"
-+msgstr "OpenID %s 没有和当前登录用户绑定。"
-+
-+#: django_authopenid/views.py:531
-+msgid "Email Changed."
-+msgstr "邮件地址已更新。"
-+
-+#: django_authopenid/views.py:606
-+msgid "This OpenID is already associated with another account."
-+msgstr "这个OpenID已经绑定到另外一个帐号。"
-+
-+#: django_authopenid/views.py:611
-+#, python-format
-+msgid "OpenID %s is now associated with your account."
-+msgstr "OpenID %s 已经绑定到您的帐号。"
-+
-+#: django_authopenid/views.py:681
-+msgid "Account deleted."
-+msgstr "帐号已删除。"
-+
-+#: django_authopenid/views.py:721
-+msgid "Request for new password"
-+msgstr "找回密码"
-+
-+#: django_authopenid/views.py:734
-+msgid "A new password has been sent to your email address."
-+msgstr "新的密码已经发送到您的邮件帐号。"
-+
-+#: django_authopenid/views.py:764
-+#, python-format
-+msgid ""
-+"Could not change password. Confirmation key '%s'                is not "
-+"registered."
-+msgstr "不能修改密码。确认信息 '%s' 有误。"
-+
-+#: django_authopenid/views.py:773
-+msgid ""
-+"Can not change password. User don't exist anymore                 in our "
-+"database."
-+msgstr "不能修改密码。用户帐号不存在。"
-+
-+#: django_authopenid/views.py:782
-+#, python-format
-+msgid "Password changed for %s. You may now sign in."
-+msgstr "帐号 %s 的密码已经修改。您现在可以用它来登录。"
-+
-+#: forum/user.py:17
-+msgid "Overview"
-+msgstr "概览"
-+
-+#: forum/user.py:18
-+msgid "User overview"
-+msgstr "用户概览"
-+
-+#: forum/user.py:19
-+msgid "Overview - User Profile"
-+msgstr "概览-用户资料"
-+
-+#: forum/user.py:25
-+msgid "Recent"
-+msgstr "最近活动"
-+
-+#: forum/user.py:26
-+msgid "Recent activities"
-+msgstr "用户最近活动情况"
-+
-+#: forum/user.py:27
-+msgid "Recent - User Profile"
-+msgstr "最近活动-用户资料"
-+
-+#: forum/user.py:34
-+msgid "Response"
-+msgstr "回应"
-+
-+#: forum/user.py:35
-+msgid "Responses from others"
-+msgstr "其他用户的回答和评论"
-+
-+#: forum/user.py:36
-+msgid "Response - User Profile"
-+msgstr "回应-用户资料"
-+
-+#: forum/user.py:43
-+msgid "Reputation"
-+msgstr "积分"
-+
-+#: forum/user.py:44
-+msgid "Community reputation"
-+msgstr "社区积分"
-+
-+#: forum/user.py:45
-+msgid "Reputation - User Profile"
-+msgstr "积分-用户资料"
-+
-+#: forum/user.py:51
-+msgid "Favorites"
-+msgstr "收藏"
-+
-+#: forum/user.py:52
-+msgid "User's favorite questions"
-+msgstr "用户收藏的问题"
-+
-+#: forum/user.py:53
-+msgid "Favorites - User Profile"
-+msgstr "收藏-用户资料"
-+
-+#: forum/user.py:60 templates/index.html:46 templates/questions.html:45
-+msgid "Votes"
-+msgstr "投票"
-+
-+#: forum/user.py:61
-+msgid "Votes history"
-+msgstr "用户投票历史"
-+
-+#: forum/user.py:62
-+msgid "Votes - User Profile"
-+msgstr "投票-用户资料"
-+
-+#: forum/user.py:69
-+msgid "Preferences"
-+msgstr "设置"
-+
-+#: forum/user.py:70
-+msgid "User preferences"
-+msgstr "用户参数设置"
-+
-+#: forum/user.py:71
-+msgid "Preferences - User Profile"
-+msgstr "设置-用户资料"
-+
-+#: templates/badges.html:5 templates/badges.html.py:16
-+#: templates/header.html:31
-+msgid "Badges"
-+msgstr "奖牌榜"
-+
-+#: templates/base.html:53 templates/base_content.html:52
-+msgid "Congratulations! You have new badges: "
-+msgstr "恭喜您被授予奖牌："
-+
-+#: templates/base.html:54 templates/base_content.html:53
-+msgid "go to see"
-+msgstr "查看"
-+
-+#: templates/base.html:55 templates/base_content.html:54
-+#: templates/header.html:35
-+msgid "Profile"
-+msgstr "我的资料"
-+
-+#: templates/footer.html:5 templates/header.html:10 templates/index.html:81
-+msgid "About us"
-+msgstr "关于我们"
-+
-+#: templates/footer.html:6 templates/header.html:11
-+msgid "faq"
-+msgstr "常见问题"
-+
-+#: templates/footer.html:8
-+msgid "Contact"
-+msgstr "联系我们"
-+
-+#: templates/footer.html:9
-+msgid "Privacy"
-+msgstr "隐私政策"
-+
-+#: templates/footer.html:10
-+msgid "Feedback"
-+msgstr "用户反馈"
-+
-+#: templates/header.html:6 templates/logout.html:5 templates/logout.html.py:16
-+msgid "Logout"
-+msgstr "退出登录"
-+
-+#: templates/header.html:8
-+msgid "Login"
-+msgstr "登录"
-+
-+#: templates/header.html:21
-+msgid "link to homepage"
-+msgstr "返回首页"
-+
-+#: templates/header.html:27 templates/header.html.py:56
-+#: templates/index.html:21
-+msgid "Questions"
-+msgstr "问题"
-+
-+#: templates/header.html:28 templates/header.html.py:57
-+msgid "Tags"
-+msgstr "标签"
-+
-+#: templates/header.html:29 templates/header.html.py:58
-+msgid "Users"
-+msgstr "用户"
-+
-+#: templates/header.html:30
-+msgid "Books"
-+msgstr "读书"
-+
-+#: templates/header.html:32
-+msgid "Unanswered"
-+msgstr "没有回答的问题"
-+
-+#: templates/header.html:38
-+msgid "Ask a question"
-+msgstr "我要提问"
-+
-+#: templates/header.html:53
-+msgid "Search"
-+msgstr "搜索"
-+
-+#: templates/index.html:6
-+msgid "Home"
-+msgstr "首页"
-+
-+#: templates/index.html:23 templates/questions.html:25
-+msgid "Newest updated questions"
-+msgstr "最新更新的问题"
-+
-+#: templates/index.html:23 templates/questions.html:24
-+msgid "Newest"
-+msgstr "最新问题"
-+
-+#: templates/index.html:24 templates/questions.html:26
-+msgid "Questions with most answers"
-+msgstr "被回复最多的问题"
-+
-+#: templates/index.html:24 templates/questions.html:26
-+msgid "Hottest"
-+msgstr "最热问题"
-+
-+#: templates/index.html:25 templates/questions.html:27
-+msgid "Questions with most votes"
-+msgstr "被投票最多的问题"
-+
-+#: templates/index.html:25 templates/questions.html:27
-+msgid "Best"
-+msgstr "最有价值问题"
-+
-+#: templates/index.html:26 templates/index.html.py:118
-+#: templates/questions.html:22
-+msgid "All questions"
-+msgstr "所有问题"
-+
-+#: templates/index.html:26
-+msgid "All"
-+msgstr "所有问题"
-+
-+#: templates/index.html:45 templates/questions.html:44
-+msgid "Answers"
-+msgstr "回答"
-+
-+#: templates/index.html:47 templates/questions.html:46
-+msgid "Visits"
-+msgstr "访问"
-+
-+#: templates/index.html:55 templates/questions.html:57
-+#: templates/questions.html.py:69
-+msgid "Community wiki"
-+msgstr "社区wiki"
-+
-+#: templates/index.html:67 templates/index.html.py:91
-+#: templates/questions.html:83
-+msgid "Browse questions with tag of "
-+msgstr "查看所有以下主题问题："
-+
-+#: templates/index.html:87
-+msgid "Recent tags"
-+msgstr "最新标签"
-+
-+#: templates/index.html:94 templates/index.html.py:118
-+msgid "Popular tags"
-+msgstr "受欢迎的标签"
-+
-+#: templates/index.html:98
-+msgid "Recent badges"
-+msgstr "最新奖牌"
-+
-+#: templates/index.html:109
-+msgid "All badges"
-+msgstr "所有奖牌"
-+
-+#: templates/index.html:113
-+msgid "RSS feed of recent 30 questions"
-+msgstr "RSS订阅最新30个问题"
-+
-+#: templates/index.html:113
-+msgid "Subscribe"
-+msgstr "订阅最新问题"
-+
-+#: templates/index.html:118
-+msgid "Are you looking for more questions? Try to browse"
-+msgstr "在寻找更多问题吗？请查阅"
-+
-+#: templates/index.html:118
-+msgid " or "
-+msgstr " 或者 "
-+
-+#: templates/index.html:118
-+msgid ". Please help us answer "
-+msgstr "。请帮助我们回答"
-+
-+#: templates/index.html:118
-+msgid "Unanswered questions"
-+msgstr "没有回答的问题"
-+
-+#: templates/pagesize.html:5
-+msgid "Size per page:"
-+msgstr "每页显示："
-+
-+#: templates/paginator.html:5
-+msgid "Previous"
-+msgstr "上一页"
-+
-+#: templates/questions.html:6
-+msgid "Question list"
-+msgstr "问题列表"
-+
-+#: templates/questions.html:22
-+msgid "Tagged questions"
-+msgstr "标签问题"
-+
-+#: templates/questions.html:22
-+msgid "Query result"
-+msgstr "查询结果"
-+
-+#: templates/questions.html:24
-+msgid "New questions"
-+msgstr "最新问题"
-+
-+#: templates/questions.html:25
-+msgid "Active"
-+msgstr "活跃问题"
-+
-+#: templates/questions.html:125
-+msgid "Related tags"
-+msgstr "相关标签"
-+
-+#: templates/authopenid/changeemail.html:10
-+msgid "Account: change email"
-+msgstr "修改电子邮件"
-+
-+#: templates/authopenid/changeemail.html:13
-+msgid ""
-+"This is where you can change the email address associated with your account. "
-+"Please keep this email address up to date so we can send you a password-"
-+"reset email if you request one."
-+msgstr ""
-+"您可以在这里修改您的电子邮件，请确保这个邮件地址有效-找回密码将发送新密码到您"
-+"的邮件地址。"
-+
-+#: templates/authopenid/changeemail.html:15
-+#: templates/authopenid/changeopenid.html:13
-+#: templates/authopenid/changepw.html:18 templates/authopenid/delete.html:14
-+#: templates/authopenid/delete.html:24
-+msgid "Please correct errors below:"
-+msgstr "请改正以下错误："
-+
-+#: templates/authopenid/changeemail.html:32
-+msgid "Email"
-+msgstr "电子邮件"
-+
-+#: templates/authopenid/changeemail.html:33
-+msgid "Password"
-+msgstr "密码"
-+
-+#: templates/authopenid/changeemail.html:35
-+msgid "Change email"
-+msgstr "修改电子邮件"
-+
-+#: templates/authopenid/changeopenid.html:7
-+msgid "Account: change OpenID URL"
-+msgstr "修改OpenID地址"
-+
-+#: templates/authopenid/changeopenid.html:11
-+msgid ""
-+"This is where you can change your OpenID URL. Make sure you remember it!"
-+msgstr "请修改您的OpenID地址，请不要忘记这个地址！"
-+
-+#: templates/authopenid/changeopenid.html:28
-+msgid "OpenID URL:"
-+msgstr "OpenID地址："
-+
-+#: templates/authopenid/changeopenid.html:29
-+msgid "Change OpenID"
-+msgstr "修改OpenID"
-+
-+#: templates/authopenid/changepw.html:13
-+msgid "Account: change password"
-+msgstr "修改密码"
-+
-+#: templates/authopenid/changepw.html:16
-+msgid "This is where you can change your password. Make sure you remember it!"
-+msgstr "请修改您的密码，切记不要忘记！"
-+
-+#: templates/authopenid/changepw.html:26
-+msgid "Current password"
-+msgstr "旧密码"
-+
-+#: templates/authopenid/changepw.html:27
-+msgid "New password"
-+msgstr "新密码"
-+
-+#: templates/authopenid/changepw.html:28
-+msgid "New password again"
-+msgstr "重复密码"
-+
-+#: templates/authopenid/changepw.html:29
-+msgid "Change password"
-+msgstr "修改密码"
-+
-+#: templates/authopenid/delete.html:8
-+msgid "Account: delete account"
-+msgstr "删除帐号"
-+
-+#: templates/authopenid/delete.html:12
-+msgid ""
-+"Note: After deleting your account, anyone will be able to register this "
-+"username."
-+msgstr "注意：删除您的帐号后，任何其他人可以再注册这个帐号。"
-+
-+#: templates/authopenid/delete.html:16
-+msgid "Check confirm box, if you want delete your account."
-+msgstr "如果确定删除，请选中多选框。"
-+
-+#: templates/authopenid/delete.html:19
-+msgid "Password:"
-+msgstr "密码："
-+
-+#: templates/authopenid/delete.html:31
-+msgid "I am sure I want to delete my account."
-+msgstr "我确认要删除这个帐号。"
-+
-+#: templates/authopenid/delete.html:32
-+msgid "Password/OpenID URL"
-+msgstr "密码/OpenID地址"
-+
-+#: templates/authopenid/delete.html:32
-+msgid "(required for your security)"
-+msgstr "（必需）"
-+
-+#: templates/authopenid/delete.html:34
-+msgid "Delete account permanently"
-+msgstr "永久删除帐号"
-+
-+#: templates/authopenid/settings.html:29
-+msgid "Give your  account a new password."
-+msgstr "修改密码"
-+
-+#: templates/authopenid/settings.html:31
-+msgid "Add or update the email address associated with your account."
-+msgstr "添加或者更新您的邮件地址。"
-+
-+#: templates/authopenid/settings.html:34
-+msgid "Change openid associated to your account"
-+msgstr "修改和你帐号绑定的OpenID地址"
-+
-+#: templates/authopenid/settings.html:38
-+msgid "Erase your username and all your data from website"
-+msgstr "删除您的帐号和所有内容"
-+
-+#, fuzzy
-+#~ msgid "Badges "
-+#~ msgstr "奖牌列表"
-+
-+#~ msgid ""
-+#~ "This username is already                 taken. Please choose another."
-+#~ msgstr "用户名已经被注册，请选用一个新的帐号。"
-+
-+#~ msgid "Your OpenID is verified! "
-+#~ msgstr "您的OpenID帐号已经验证通过"
-+
-+#~ msgid "Associate your OpenID"
-+#~ msgstr "绑定您的OpenID"
-+
-+#~ msgid ""
-+#~ "\n"
-+#~ "\t<p>If you're joining <strong>Sitename</strong>, associate your OpenID "
-+#~ "with a new account. If you're already a member, associate with your "
-+#~ "existing account.</p>\n"
-+#~ "\t"
-+#~ msgstr ""
-+#~ "\n"
-+#~ "\t<p>输入您的新帐号或者指定已经存在的帐号。</p>\n"
-+#~ "\t"
-+
-+#~ msgid "A new account"
-+#~ msgstr "新帐号"
-+
-+#~ msgid "An exisiting account"
-+#~ msgstr "已经存在的帐号"
-+
-+#~ msgid "Account: Send a new password"
-+#~ msgstr "发送一个新的密码"
-+
-+#~ msgid ""
-+#~ "Lost your password ? Here you can ask to reset your password. Enter the "
-+#~ "username you use  and you will get a confirmation email with your new "
-+#~ "password. This new password will be activated only after you have clicked "
-+#~ "on the link in the email."
-+#~ msgstr ""
-+#~ "丢失了您的密码？你可以在这里重设密码。输入用户名你会收到新的密码的邮件。密"
-+#~ "码只有您在激活邮件中的链接才会被激活。"
-+
-+#~ msgid "Send new password"
-+#~ msgstr "发送新密码"
-diff -ruN CNPROG/middleware/pagesize.py mikes/middleware/pagesize.py
---- CNPROG/middleware/pagesize.py	1969-12-31 19:00:00.000000000 -0500
-+++ mikes/middleware/pagesize.py	2009-07-25 19:09:58.108151006 -0400
-@@ -0,0 +1,29 @@
-+# used in questions
-+QUESTIONS_PAGE_SIZE = 10
-+class QuestionsPageSizeMiddleware(object):
-+    def process_request(self, request):
-+        # Set flag to False by default. If it is equal to True, then need to be saved.
-+        pagesize_changed = False
-+        # get pagesize from session, if failed then get default value
-+        user_page_size = request.session.get("pagesize", QUESTIONS_PAGE_SIZE)
-+        # set pagesize equal to logon user specified value in database
-+        if request.user.is_authenticated() and request.user.questions_per_page > 0:
-+            user_page_size = request.user.questions_per_page
-+
-+        try:
-+            # get new pagesize from UI selection
-+            pagesize = int(request.GET.get('pagesize', user_page_size))
-+            if pagesize <> user_page_size:
-+                pagesize_changed = True
-+
-+        except ValueError:
-+            pagesize  = user_page_size
-+        
-+        # save this pagesize to user database
-+        if pagesize_changed:
-+            if request.user.is_authenticated():
-+                user = request.user
-+                user.questions_per_page = pagesize
-+                user.save()
-+        # put pagesize into session
-+        request.session["pagesize"] = pagesize
-\ No newline at end of file
-diff -ruN CNPROG/settings_local.py mikes/settings_local.py
---- CNPROG/settings_local.py	2009-07-25 18:49:15.158341746 -0400
-+++ mikes/settings_local.py	1969-12-31 19:00:00.000000000 -0500
-@@ -1,21 +0,0 @@
--# encoding:utf-8
--SITE_SRC_ROOT = '/change_me/'
--
--#for logging
--import logging
--LOG_FILENAME = SITE_SRC_ROOT + 'django.lanai.log'
--logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,)
--
--DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
--DATABASE_USER = 'root'               # Not used with sqlite3.
--DATABASE_PASSWORD = ''               # Not used with sqlite3.
--
--MIDDLEWARE_CLASSES = (
--    'django.middleware.gzip.GZipMiddleware',
--    'django.contrib.sessions.middleware.SessionMiddleware',
--    'django.middleware.locale.LocaleMiddleware',
--    'django.middleware.common.CommonMiddleware',
--    'django.contrib.auth.middleware.AuthenticationMiddleware',
--    'django.middleware.transaction.TransactionMiddleware',
--    #'debug_toolbar.middleware.DebugToolbarMiddleware',
--)
-diff -ruN CNPROG/settings_local.py.dist mikes/settings_local.py.dist
---- CNPROG/settings_local.py.dist	1969-12-31 19:00:00.000000000 -0500
-+++ mikes/settings_local.py.dist	2009-07-25 19:09:58.108151006 -0400
-@@ -0,0 +1,25 @@
-+SITE_SRC_ROOT = '/Users/sailing/Development/cnprog_beta2'
-+
-+#for logging
-+import logging
-+LOG_FILENAME = '/Users/sailing/Development/cnprog_beta2/django.lanai.log'
-+logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,)
-+
-+
-+#Database configuration 
-+DATABASE_ENGINE = 'mysql'      
-+DATABASE_HOST = ''            
-+DATABASE_PORT = ''          
-+DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
-+DATABASE_USER = 'root'               # Not used with sqlite3.
-+DATABASE_PASSWORD = ''               # Not used with sqlite3.
-+
-+
-+# Absolute path to the directory that holds media.
-+# Example: "/home/media/media.lawrence.com/"
-+MEDIA_ROOT = '/Users/sailing/Development/cnprog_beta2/templates/upfiles/'
-+
-+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-+# trailing slash if there is a path component (optional in other cases).
-+# Examples: "http://media.lawrence.com", "http://example.com/media/"
-+MEDIA_URL = 'http://127.0.0.1:8000/upfiles/'
-diff -ruN CNPROG/settings.py mikes/settings.py
---- CNPROG/settings.py	2009-07-25 18:49:15.158341746 -0400
-+++ mikes/settings.py	2009-07-25 19:09:58.108151006 -0400
-@@ -1,51 +1,24 @@
-+# encoding:utf-8
- # Django settings for lanai project.
- import os.path
- 
-+#DEBUG SETTINGS
- DEBUG = True
- TEMPLATE_DEBUG = DEBUG
--
--
--#David Cramer debug toolbar
- INTERNAL_IPS = ('127.0.0.1',)
--DEBUG_TOOLBAR_PANELS = (
--    'debug_toolbar.panels.sql.SQLDebugPanel',
--    'debug_toolbar.panels.headers.HeaderDebugPanel',
--    'debug_toolbar.panels.cache.CacheDebugPanel',
--    'debug_toolbar.panels.profiler.ProfilerDebugPanel',
--    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
--    'debug_toolbar.panels.templates.TemplatesDebugPanel',
--    # If you are using the profiler panel you don't need the timer
--    # 'debug_toolbar.panels.timer.TimerDebugPanel',
--)
--
--DEBUG_TOOLBAR_CONFIG = {
--    "INTERCEPT_REDIRECTS":False
--}
- 
- #for OpenID auth
- ugettext = lambda s: s
- LOGIN_URL = '/%s%s' % (ugettext('account/'), ugettext('signin/'))
- 
--#system will send admins email about error stacktrace if DEBUG=False
-+#EMAIL AND ADMINS
- ADMINS = (
--    ('you', 'you@where.com'),
-+    ('CNProg team', 'team@cnprog.com'),
- )
--
- MANAGERS = ADMINS
- 
--DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
--#DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
--#DATABASE_USER = 'root'             # Not used with sqlite3.
--#DATABASE_PASSWORD = ''         # Not used with sqlite3.
--DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
--DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
--
--DATABASE_NAME = 'dbname'             # Or path to database file if using sqlite3.
--DATABASE_USER = 'dbuser'             # Not used with sqlite3.
--DATABASE_PASSWORD = 'dbpass'         # Not used with sqlite3.
--
--SERVER_EMAIL = 'server@where.com'
--DEFAULT_FROM_EMAIL = 'from@where.com'
-+SERVER_EMAIL = 'webmaster@cnprog.com'
-+DEFAULT_FROM_EMAIL = 'webmaster@cnprog.com'
- EMAIL_HOST_USER = ''
- EMAIL_HOST_PASSWORD = ''
- EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
-@@ -53,44 +26,21 @@
- EMAIL_PORT='587'
- EMAIL_USE_TLS=True
- 
--
--
--
--# Local time zone for this installation. Choices can be found here:
--# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
--# although not all choices may be available on all operating systems.
--# If running in a Windows environment this must be set to the same as your
--# system time zone.
--TIME_ZONE = 'America/Chicago'
--
--# Language code for this installation. All choices can be found here:
--# http://www.i18nguy.com/unicode/language-identifiers.html
--#LANGUAGE_CODE = 'en'
-+#LOCALIZATIONS
-+TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
-+# LANGUAGE_CODE = 'en-us'
- LANGUAGE_CODE = 'zh-cn'
--
- SITE_ID = 1
--
--# If you set this to False, Django will make some optimizations so as not
--# to load the internationalization machinery.
- USE_I18N = True
- 
--# Absolute path to the directory that holds media.
--# Example: "/home/media/media.lawrence.com/"
--MEDIA_ROOT = '/var/www/vhosts/cnprog/templates/upfiles/'
--
--# URL that handles the media served from MEDIA_ROOT. Make sure to use a
--# trailing slash if there is a path component (optional in other cases).
--# Examples: "http://media.lawrence.com", "http://example.com/media/"
--MEDIA_URL = 'http://where.com/upfiles/'
--
--# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
--# trailing slash.
--# Examples: "http://foo.com/media/", "/media/".
-+#OTHER SETTINS
-+APP_TITLE = u'CNProg.com 程序员问答社区'
-+APP_URL = 'http://www.cnprog.com'
-+APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
-+APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
-+APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
- ADMIN_MEDIA_PREFIX = '/admin/media/'
--
--# Make this unique, and don't share it with anybody.
--SECRET_KEY = '$oo^&_m&qwbib=ffljk_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
--
-+SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
- # List of callables that know how to import templates from various sources.
- TEMPLATE_LOADERS = (
-     'django.template.loaders.filesystem.load_template_source',
-@@ -105,12 +55,15 @@
-     'django.middleware.common.CommonMiddleware',
-     'django.contrib.auth.middleware.AuthenticationMiddleware',
-     'django.middleware.transaction.TransactionMiddleware',
--    'debug_toolbar.middleware.DebugToolbarMiddleware',
-+    #'django.middleware.sqlprint.SqlPrintingMiddleware',
-+    'middleware.pagesize.QuestionsPageSizeMiddleware',
-+    #'debug_toolbar.middleware.DebugToolbarMiddleware',
- )
- 
- TEMPLATE_CONTEXT_PROCESSORS = (
-     'django.core.context_processors.request',
-     'django.core.context_processors.auth',
-+    'context.application_settings'
- )
- 
- ROOT_URLCONF = 'urls'
-@@ -119,6 +72,7 @@
-     os.path.join(os.path.dirname(__file__), 'templates').replace('\\','/'),
- )
- 
-+#UPLOAD SETTINGS
- FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\\','/')
- FILE_UPLOAD_HANDLERS = ("django.core.files.uploadhandler.MemoryFileUploadHandler",
-  "django.core.files.uploadhandler.TemporaryFileUploadHandler",)
-@@ -139,6 +93,7 @@
-     'django_authopenid',
-     'debug_toolbar' ,
- )
--#local configs
--from settings_local import *
--
-+
-+# User settings
-+from settings_local import *
-+
-diff -ruN CNPROG/templates/allfiles mikes/templates/allfiles
---- CNPROG/templates/allfiles	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/templates/allfiles	1969-12-31 19:00:00.000000000 -0500
-@@ -1,30 +0,0 @@
--404.html
--500.html
--about.html
--ask.html
--badges.html
--base_content.html
--base.html
--book.html
--close.html
--faq.html
--footer.html
--header.html
--index.html
--logout.html
--pagesize.html
--paginator.html
--privacy.html
--question_edit_tips.html
--question.html
--questions.html
--revisions_answer.html
--tags.html
--unanswered.html
--user_edit.html
--user_info.html
--users.html
--users_questions.html
--user_stats.html
--user_tabs.html
--user_votes.html
-diff -ruN CNPROG/templates/authopenid/htmlfiles mikes/templates/authopenid/htmlfiles
---- CNPROG/templates/authopenid/htmlfiles	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/templates/authopenid/htmlfiles	1969-12-31 19:00:00.000000000 -0500
-@@ -1,8 +0,0 @@
--changeemail.html
--changeopenid.html
--changepw.html
--delete.html
--failure.html
--sendpw.html
--settings.html
--signup.html
-diff -ruN CNPROG/templates/base_content.html mikes/templates/base_content.html
---- CNPROG/templates/base_content.html	2009-06-22 21:49:26.000000000 -0400
-+++ mikes/templates/base_content.html	2009-07-25 19:09:58.118151716 -0400
-@@ -1,9 +1,8 @@
-+{% load i18n %}
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
--<!-- template base_content.html -->
--{% load i18n %}
- <html>
-     <head>
--        <title>{% block title %}{% endblock %} - {% trans "site title" %} - {% trans "site slogan" %}</title>
-+        <title>{% block title %}{% endblock %} - {{ APP_TITLE }}</title>
-         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-         <meta name="verify-v1" content="55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA=" />
-         <link rel="shortcut icon" href="/content/images/favicon.ico" >
-@@ -83,4 +74,3 @@
-         {% endblock %}
-     </body>
- </html>
--<!-- end template base_content.html -->
-diff -ruN CNPROG/templates/base.html mikes/templates/base.html
---- CNPROG/templates/base.html	2009-06-22 21:49:58.000000000 -0400
-+++ mikes/templates/base.html	2009-07-25 19:09:58.118151716 -0400
-@@ -48,6 +40,7 @@
-                 notify.show();
-             });
-         </script>
-+       
-         {% endif %}
-         {% endwith %}
-       
-@@ -88,4 +81,3 @@
-         {% endblock %}
-     </body>
- </html>
--<!-- end template base.html -->
-diff -ruN CNPROG/templates/content/js/com.cnprog.post.js mikes/templates/content/js/com.cnprog.post.js
---- CNPROG/templates/content/js/com.cnprog.post.js	2009-06-22 21:42:51.000000000 -0400
-+++ mikes/templates/content/js/com.cnprog.post.js	2009-07-25 19:09:58.138152577 -0400
-@@ -613,4 +570,4 @@
- Prettify
- http://www.apache.org/licenses/LICENSE-2.0
- */
--var PR_SHOULD_USE_CONTINUATION = true; var PR_TAB_WIDTH = 8; var PR_normalizedHtml; var PR; var prettyPrintOne; var prettyPrint; function _pr_isIE6() { var isIE6 = navigator && navigator.userAgent && /\bMSIE 6\./.test(navigator.userAgent); _pr_isIE6 = function() { return isIE6; }; return isIE6; } (function() { function wordSet(words) { words = words.split(/ /g); var set = {}; for (var i = words.length; --i >= 0; ) { var w = words[i]; if (w) { set[w] = null; } } return set; } var FLOW_CONTROL_KEYWORDS = "break continue do else for if return while "; var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " + "double enum extern float goto int long register short signed sizeof " + "static struct switch typedef union unsigned void volatile "; var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " + "new operator private protected public this throw true try "; var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " + "concept concept_map const_cast constexpr decltype " + "dynamic_cast explicit export friend inline late_check " + "mutable namespace nullptr reinterpret_cast static_assert static_cast " + "template typeid typename typeof using virtual wchar_t where "; var JAVA_KEYWORDS = COMMON_KEYWORDS + "boolean byte extends final finally implements import instanceof null " + "native package strictfp super synchronized throws transient "; var CSHARP_KEYWORDS = JAVA_KEYWORDS + "as base by checked decimal delegate descending event " + "fixed foreach from group implicit in interface internal into is lock " + "object out override orderby params readonly ref sbyte sealed " + "stackalloc string select uint ulong unchecked unsafe ushort var "; var JSCRIPT_KEYWORDS = COMMON_KEYWORDS + "debugger eval export function get null set undefined var with " + "Infinity NaN "; var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " + "goto if import last local my next no our print package redo require " + "sub undef unless until use wantarray while BEGIN END "; var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " + "elif except exec finally from global import in is lambda " + "nonlocal not or pass print raise try with yield " + "False True None "; var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" + " defined elsif end ensure false in module next nil not or redo rescue " + "retry self super then true undef unless until when yield BEGIN END "; var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " + "function in local set then until "; var ALL_KEYWORDS = (CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS + PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS); var PR_STRING = 'str'; var PR_KEYWORD = 'kwd'; var PR_COMMENT = 'com'; var PR_TYPE = 'typ'; var PR_LITERAL = 'lit'; var PR_PUNCTUATION = 'pun'; var PR_PLAIN = 'pln'; var PR_TAG = 'tag'; var PR_DECLARATION = 'dec'; var PR_SOURCE = 'src'; var PR_ATTRIB_NAME = 'atn'; var PR_ATTRIB_VALUE = 'atv'; var PR_NOCODE = 'nocode'; function isWordChar(ch) { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'); } function spliceArrayInto(inserted, container, containerPosition, countReplaced) { inserted.unshift(containerPosition, countReplaced || 0); try { container.splice.apply(container, inserted); } finally { inserted.splice(0, 2); } } var REGEXP_PRECEDER_PATTERN = function() { var preceders = ["!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=", "&=", "(", "*", "*=", "+=", ",", "-=", "->", "/", "/=", ":", "::", ";", "<", "<<", "<<=", "<=", "=", "==", "===", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "||=", "~", "break", "case", "continue", "delete", "do", "else", "finally", "instanceof", "return", "throw", "try", "typeof"]; var pattern = '(?:' + '(?:(?:^|[^0-9.])\\.{1,3})|' + '(?:(?:^|[^\\+])\\+)|' + '(?:(?:^|[^\\-])-)'; for (var i = 0; i < preceders.length; ++i) { var preceder = preceders[i]; if (isWordChar(preceder.charAt(0))) { pattern += '|\\b' + preceder; } else { pattern += '|' + preceder.replace(/([^=<>:&])/g, '\\$1'); } } pattern += '|^)\\s*$'; return new RegExp(pattern); } (); var pr_amp = /&/g; var pr_lt = /</g; var pr_gt = />/g; var pr_quot = /\"/g; function attribToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;').replace(pr_quot, '&quot;'); } function textToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;'); } var pr_ltEnt = /&lt;/g; var pr_gtEnt = /&gt;/g; var pr_aposEnt = /&apos;/g; var pr_quotEnt = /&quot;/g; var pr_ampEnt = /&amp;/g; var pr_nbspEnt = /&nbsp;/g; function htmlToText(html) { var pos = html.indexOf('&'); if (pos < 0) { return html; } for (--pos; (pos = html.indexOf('&#', pos + 1)) >= 0; ) { var end = html.indexOf(';', pos); if (end >= 0) { var num = html.substring(pos + 3, end); var radix = 10; if (num && num.charAt(0) === 'x') { num = num.substring(1); radix = 16; } var codePoint = parseInt(num, radix); if (!isNaN(codePoint)) { html = (html.substring(0, pos) + String.fromCharCode(codePoint) + html.substring(end + 1)); } } } return html.replace(pr_ltEnt, '<').replace(pr_gtEnt, '>').replace(pr_aposEnt, "'").replace(pr_quotEnt, '"').replace(pr_ampEnt, '&').replace(pr_nbspEnt, ' '); } function isRawContent(node) { return 'XMP' === node.tagName; } function normalizedHtml(node, out) { switch (node.nodeType) { case 1: var name = node.tagName.toLowerCase(); out.push('<', name); for (var i = 0; i < node.attributes.length; ++i) { var attr = node.attributes[i]; if (!attr.specified) { continue; } out.push(' '); normalizedHtml(attr, out); } out.push('>'); for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } if (node.firstChild || !/^(?:br|link|img)$/.test(name)) { out.push('<\/', name, '>'); } break; case 2: out.push(node.name.toLowerCase(), '="', attribToHtml(node.value), '"'); break; case 3: case 4: out.push(textToHtml(node.nodeValue)); break; } } var PR_innerHtmlWorks = null; function getInnerHtml(node) { if (null === PR_innerHtmlWorks) { var testNode = document.createElement('PRE'); testNode.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />')); PR_innerHtmlWorks = !/</.test(testNode.innerHTML); } if (PR_innerHtmlWorks) { var content = node.innerHTML; if (isRawContent(node)) { content = textToHtml(content); } return content; } var out = []; for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } return out.join(''); } function makeTabExpander(tabWidth) { var SPACES = '                '; var charInLine = 0; return function(plainText) { var out = null; var pos = 0; for (var i = 0, n = plainText.length; i < n; ++i) { var ch = plainText.charAt(i); switch (ch) { case '\t': if (!out) { out = []; } out.push(plainText.substring(pos, i)); var nSpaces = tabWidth - (charInLine % tabWidth); charInLine += nSpaces; for (; nSpaces >= 0; nSpaces -= SPACES.length) { out.push(SPACES.substring(0, nSpaces)); } pos = i + 1; break; case '\n': charInLine = 0; break; default: ++charInLine; } } if (!out) { return plainText; } out.push(plainText.substring(pos)); return out.join(''); }; } var pr_chunkPattern = /(?:[^<]+|<!--[\s\S]*?-->|<!\[CDATA\[([\s\S]*?)\]\]>|<\/?[a-zA-Z][^>]*>|<)/g; var pr_commentPrefix = /^<!--/; var pr_cdataPrefix = /^<\[CDATA\[/; var pr_brPrefix = /^<br\b/i; var pr_tagNameRe = /^<(\/?)([a-zA-Z]+)/; function extractTags(s) { var matches = s.match(pr_chunkPattern); var sourceBuf = []; var sourceBufLen = 0; var extractedTags = []; if (matches) { for (var i = 0, n = matches.length; i < n; ++i) { var match = matches[i]; if (match.length > 1 && match.charAt(0) === '<') { if (pr_commentPrefix.test(match)) { continue; } if (pr_cdataPrefix.test(match)) { sourceBuf.push(match.substring(9, match.length - 3)); sourceBufLen += match.length - 12; } else if (pr_brPrefix.test(match)) { sourceBuf.push('\n'); ++sourceBufLen; } else { if (match.indexOf(PR_NOCODE) >= 0 && isNoCodeTag(match)) { var name = match.match(pr_tagNameRe)[2]; var depth = 1; end_tag_loop: for (var j = i + 1; j < n; ++j) { var name2 = matches[j].match(pr_tagNameRe); if (name2 && name2[2] === name) { if (name2[1] === '/') { if (--depth === 0) { break end_tag_loop; } } else { ++depth; } } } if (j < n) { extractedTags.push(sourceBufLen, matches.slice(i, j + 1).join('')); i = j; } else { extractedTags.push(sourceBufLen, match); } } else { extractedTags.push(sourceBufLen, match); } } } else { var literalText = htmlToText(match); sourceBuf.push(literalText); sourceBufLen += literalText.length; } } } return { source: sourceBuf.join(''), tags: extractedTags }; } function isNoCodeTag(tag) { return !!tag.replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g, ' $1="$2$3$4"').match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/); } function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) { var shortcuts = {}; (function() { var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns); for (var i = allPatterns.length; --i >= 0; ) { var patternParts = allPatterns[i]; var shortcutChars = patternParts[3]; if (shortcutChars) { for (var c = shortcutChars.length; --c >= 0; ) { shortcuts[shortcutChars.charAt(c)] = patternParts; } } } })(); var nPatterns = fallthroughStylePatterns.length; var notWs = /\S/; return function(sourceCode, opt_basePos) { opt_basePos = opt_basePos || 0; var decorations = [opt_basePos, PR_PLAIN]; var lastToken = ''; var pos = 0; var tail = sourceCode; while (tail.length) { var style; var token = null; var match; var patternParts = shortcuts[tail.charAt(0)]; if (patternParts) { match = tail.match(patternParts[1]); token = match[0]; style = patternParts[0]; } else { for (var i = 0; i < nPatterns; ++i) { patternParts = fallthroughStylePatterns[i]; var contextPattern = patternParts[2]; if (contextPattern && !contextPattern.test(lastToken)) { continue; } match = tail.match(patternParts[1]); if (match) { token = match[0]; style = patternParts[0]; break; } } if (!token) { style = PR_PLAIN; token = tail.substring(0, 1); } } decorations.push(opt_basePos + pos, style); pos += token.length; tail = tail.substring(token.length); if (style !== PR_COMMENT && notWs.test(token)) { lastToken = token; } } return decorations; }; } var PR_MARKUP_LEXER = createSimpleLexer([], [[PR_PLAIN, /^[^<]+/, null], [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/, null], [PR_COMMENT, /^<!--[\s\S]*?(?:-->|$)/, null], [PR_SOURCE, /^<\?[\s\S]*?(?:\?>|$)/, null], [PR_SOURCE, /^<%[\s\S]*?(?:%>|$)/, null], [PR_SOURCE, /^<(script|style|xmp)\b[^>]*>[\s\S]*?<\/\1\b[^>]*>/i, null], [PR_TAG, /^<\/?\w[^<>]*>/, null]]); var PR_SOURCE_CHUNK_PARTS = /^(<[^>]*>)([\s\S]*)(<\/[^>]*>)$/; function tokenizeMarkup(source) { var decorations = PR_MARKUP_LEXER(source); for (var i = 0; i < decorations.length; i += 2) { if (decorations[i + 1] === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var sourceChunk = source.substring(start, end); var match = sourceChunk.match(PR_SOURCE_CHUNK_PARTS); if (match) { decorations.splice(i, 2, start, PR_TAG, start + match[1].length, PR_SOURCE, start + match[1].length + (match[2] || '').length, PR_TAG); } } } return decorations; } var PR_TAG_LEXER = createSimpleLexer([[PR_ATTRIB_VALUE, /^\'[^\']*(?:\'|$)/, null, "'"], [PR_ATTRIB_VALUE, /^\"[^\"]*(?:\"|$)/, null, '"'], [PR_PUNCTUATION, /^[<>\/=]+/, null, '<>/=']], [[PR_TAG, /^[\w:\-]+/, /^</], [PR_ATTRIB_VALUE, /^[\w\-]+/, /^=/], [PR_ATTRIB_NAME, /^[\w:\-]+/, null], [PR_PLAIN, /^\s+/, null, ' \t\r\n']]); function splitTagAttributes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_TAG) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var chunk = source.substring(start, end); var subDecorations = PR_TAG_LEXER(chunk, start); spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function sourceDecorator(options) { var shortcutStylePatterns = [], fallthroughStylePatterns = []; if (options.tripleQuotedStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/, null, '\'"']); } else if (options.multiLineStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/, null, '\'"`']); } else { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, null, '"\'']); } fallthroughStylePatterns.push([PR_PLAIN, /^(?:[^\'\"\`\/\#]+)/, null, ' \r\n']); if (options.hashComments) { shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']); } if (options.cStyleComments) { fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]); fallthroughStylePatterns.push([PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]); } if (options.regexLiterals) { var REGEX_LITERAL = ('^/(?=[^/*])' + '(?:[^/\\x5B\\x5C]' + '|\\x5C[\\s\\S]' + '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+' + '(?:/|$)'); fallthroughStylePatterns.push([PR_STRING, new RegExp(REGEX_LITERAL), REGEXP_PRECEDER_PATTERN]); } var keywords = wordSet(options.keywords); options = null; var splitStringAndCommentTokens = createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns); var styleLiteralIdentifierPuncRecognizer = createSimpleLexer([], [[PR_PLAIN, /^\s+/, null, ' \r\n'], [PR_PLAIN, /^[a-z_$@][a-z_$@0-9]*/i, null], [PR_LITERAL, /^0x[a-f0-9]+[a-z]/i, null], [PR_LITERAL, /^(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?[a-z]*/i, null, '123456789'], [PR_PUNCTUATION, /^[^\s\w\.$@]+/, null]]); function splitNonStringNonCommentTokens(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_PLAIN) { var start, end, chunk, subDecs; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; chunk = source.substring(start, end); subDecs = styleLiteralIdentifierPuncRecognizer(chunk, start); for (var j = 0, m = subDecs.length; j < m; j += 2) { var subStyle = subDecs[j + 1]; if (subStyle === PR_PLAIN) { var subStart = subDecs[j]; var subEnd = j + 2 < m ? subDecs[j + 2] : chunk.length; var token = source.substring(subStart, subEnd); if (token === '.') { subDecs[j + 1] = PR_PUNCTUATION; } else if (token in keywords) { subDecs[j + 1] = PR_KEYWORD; } else if (/^@?[A-Z][A-Z$]*[a-z][A-Za-z$]*$/.test(token)) { subDecs[j + 1] = token.charAt(0) === '@' ? PR_LITERAL : PR_TYPE; } } } spliceArrayInto(subDecs, decorations, i, 2); i += subDecs.length - 2; } } return decorations; } return function(sourceCode) { var decorations = splitStringAndCommentTokens(sourceCode); decorations = splitNonStringNonCommentTokens(sourceCode, decorations); return decorations; }; } var decorateSource = sourceDecorator({ keywords: ALL_KEYWORDS, hashComments: true, cStyleComments: true, multiLineStrings: true, regexLiterals: true }); function splitSourceNodes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var subDecorations = decorateSource(source.substring(start, end)); for (var j = 0, m = subDecorations.length; j < m; j += 2) { subDecorations[j] += start; } spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function splitSourceAttributes(source, decorations) { var nextValueIsSource = false; for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; var start, end; if (style === PR_ATTRIB_NAME) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; nextValueIsSource = /^on|^style$/i.test(source.substring(start, end)); } else if (style === PR_ATTRIB_VALUE) { if (nextValueIsSource) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var attribValue = source.substring(start, end); var attribLen = attribValue.length; var quoted = (attribLen >= 2 && /^[\"\']/.test(attribValue) && attribValue.charAt(0) === attribValue.charAt(attribLen - 1)); var attribSource; var attribSourceStart; var attribSourceEnd; if (quoted) { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue; } else { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue.substring(1, attribValue.length - 1); } var attribSourceDecorations = decorateSource(attribSource); for (var j = 0, m = attribSourceDecorations.length; j < m; j += 2) { attribSourceDecorations[j] += attribSourceStart; } if (quoted) { attribSourceDecorations.push(attribSourceEnd, PR_ATTRIB_VALUE); spliceArrayInto(attribSourceDecorations, decorations, i + 2, 0); } else { spliceArrayInto(attribSourceDecorations, decorations, i, 2); } } nextValueIsSource = false; } } return decorations; } function decorateMarkup(sourceCode) { var decorations = tokenizeMarkup(sourceCode); decorations = splitTagAttributes(sourceCode, decorations); decorations = splitSourceNodes(sourceCode, decorations); decorations = splitSourceAttributes(sourceCode, decorations); return decorations; } function recombineTagsAndDecorations(sourceText, extractedTags, decorations) { var html = []; var outputIdx = 0; var openDecoration = null; var currentDecoration = null; var tagPos = 0; var decPos = 0; var tabExpander = makeTabExpander(PR_TAB_WIDTH); var adjacentSpaceRe = /([\r\n ]) /g; var startOrSpaceRe = /(^| ) /gm; var newlineRe = /\r\n?|\n/g; var trailingSpaceRe = /[ \r\n]$/; var lastWasSpace = true; function emitTextUpTo(sourceIdx) { if (sourceIdx > outputIdx) { if (openDecoration && openDecoration !== currentDecoration) { html.push('</span>'); openDecoration = null; } if (!openDecoration && currentDecoration) { openDecoration = currentDecoration; html.push('<span class="', openDecoration, '">'); } var htmlChunk = textToHtml(tabExpander(sourceText.substring(outputIdx, sourceIdx))).replace(lastWasSpace ? startOrSpaceRe : adjacentSpaceRe, '$1&nbsp;'); lastWasSpace = trailingSpaceRe.test(htmlChunk); html.push(htmlChunk.replace(newlineRe, '<br />')); outputIdx = sourceIdx; } } while (true) { var outputTag; if (tagPos < extractedTags.length) { if (decPos < decorations.length) { outputTag = extractedTags[tagPos] <= decorations[decPos]; } else { outputTag = true; } } else { outputTag = false; } if (outputTag) { emitTextUpTo(extractedTags[tagPos]); if (openDecoration) { html.push('</span>'); openDecoration = null; } html.push(extractedTags[tagPos + 1]); tagPos += 2; } else if (decPos < decorations.length) { emitTextUpTo(decorations[decPos]); currentDecoration = decorations[decPos + 1]; decPos += 2; } else { break; } } emitTextUpTo(sourceText.length); if (openDecoration) { html.push('</span>'); } return html.join(''); } var langHandlerRegistry = {}; function registerLangHandler(handler, fileExtensions) { for (var i = fileExtensions.length; --i >= 0; ) { var ext = fileExtensions[i]; if (!langHandlerRegistry.hasOwnProperty(ext)) { langHandlerRegistry[ext] = handler; } else if ('console' in window) { console.log('cannot override language handler %s', ext); } } } registerLangHandler(decorateSource, ['default-code']); registerLangHandler(decorateMarkup, ['default-markup', 'html', 'htm', 'xhtml', 'xml', 'xsl']); registerLangHandler(sourceDecorator({ keywords: CPP_KEYWORDS, hashComments: true, cStyleComments: true }), ['c', 'cc', 'cpp', 'cs', 'cxx', 'cyc']); registerLangHandler(sourceDecorator({ keywords: JAVA_KEYWORDS, cStyleComments: true }), ['java']); registerLangHandler(sourceDecorator({ keywords: SH_KEYWORDS, hashComments: true, multiLineStrings: true }), ['bsh', 'csh', 'sh']); registerLangHandler(sourceDecorator({ keywords: PYTHON_KEYWORDS, hashComments: true, multiLineStrings: true, tripleQuotedStrings: true }), ['cv', 'py']); registerLangHandler(sourceDecorator({ keywords: PERL_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['perl', 'pl', 'pm']); registerLangHandler(sourceDecorator({ keywords: RUBY_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['rb']); registerLangHandler(sourceDecorator({ keywords: JSCRIPT_KEYWORDS, cStyleComments: true, regexLiterals: true }), ['js']); function prettyPrintOne(sourceCodeHtml, opt_langExtension) { try { var sourceAndExtractedTags = extractTags(sourceCodeHtml); var source = sourceAndExtractedTags.source; var extractedTags = sourceAndExtractedTags.tags; if (!langHandlerRegistry.hasOwnProperty(opt_langExtension)) { opt_langExtension = /^\s*</.test(source) ? 'default-markup' : 'default-code'; } var decorations = langHandlerRegistry[opt_langExtension].call({}, source); return recombineTagsAndDecorations(source, extractedTags, decorations); } catch (e) { if ('console' in window) { console.log(e); console.trace(); } return sourceCodeHtml; } } function prettyPrint(opt_whenDone) { var isIE6 = _pr_isIE6(); var codeSegments = [document.getElementsByTagName('pre'), document.getElementsByTagName('code'), document.getElementsByTagName('xmp')]; var elements = []; for (var i = 0; i < codeSegments.length; ++i) { for (var j = 0; j < codeSegments[i].length; ++j) { elements.push(codeSegments[i][j]); } } codeSegments = null; var k = 0; function doWork() { var endTime = (PR_SHOULD_USE_CONTINUATION ? new Date().getTime() + 250 : Infinity); for (; k < elements.length && new Date().getTime() < endTime; k++) { var cs = elements[k]; if (cs.className && cs.className.indexOf('prettyprint') >= 0) { var langExtension = cs.className.match(/\blang-(\w+)\b/); if (langExtension) { langExtension = langExtension[1]; } var nested = false; for (var p = cs.parentNode; p; p = p.parentNode) { if ((p.tagName === 'pre' || p.tagName === 'code' || p.tagName === 'xmp') && p.className && p.className.indexOf('prettyprint') >= 0) { nested = true; break; } } if (!nested) { var content = getInnerHtml(cs); content = content.replace(/(?:\r\n?|\n)$/, ''); var newContent = prettyPrintOne(content, langExtension); if (!isRawContent(cs)) { cs.innerHTML = newContent; } else { var pre = document.createElement('PRE'); for (var i = 0; i < cs.attributes.length; ++i) { var a = cs.attributes[i]; if (a.specified) { var aname = a.name.toLowerCase(); if (aname === 'class') { pre.className = a.value; } else { pre.setAttribute(a.name, a.value); } } } pre.innerHTML = newContent; cs.parentNode.replaceChild(pre, cs); cs = pre; } if (isIE6 && cs.tagName === 'PRE') { var lineBreaks = cs.getElementsByTagName('br'); for (var j = lineBreaks.length; --j >= 0; ) { var lineBreak = lineBreaks[j]; lineBreak.parentNode.replaceChild(document.createTextNode('\r\n'), lineBreak); } } } } } if (k < elements.length) { setTimeout(doWork, 250); } else if (opt_whenDone) { opt_whenDone(); } } doWork(); } window['PR_normalizedHtml'] = normalizedHtml; window['prettyPrintOne'] = prettyPrintOne; window['prettyPrint'] = prettyPrint; window['PR'] = { 'createSimpleLexer': createSimpleLexer, 'registerLangHandler': registerLangHandler, 'sourceDecorator': sourceDecorator, 'PR_ATTRIB_NAME': PR_ATTRIB_NAME, 'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE, 'PR_COMMENT': PR_COMMENT, 'PR_DECLARATION': PR_DECLARATION, 'PR_KEYWORD': PR_KEYWORD, 'PR_LITERAL': PR_LITERAL, 'PR_NOCODE': PR_NOCODE, 'PR_PLAIN': PR_PLAIN, 'PR_PUNCTUATION': PR_PUNCTUATION, 'PR_SOURCE': PR_SOURCE, 'PR_STRING': PR_STRING, 'PR_TAG': PR_TAG, 'PR_TYPE': PR_TYPE }; })();
-+var PR_SHOULD_USE_CONTINUATION = true; var PR_TAB_WIDTH = 8; var PR_normalizedHtml; var PR; var prettyPrintOne; var prettyPrint; function _pr_isIE6() { var isIE6 = navigator && navigator.userAgent && /\bMSIE 6\./.test(navigator.userAgent); _pr_isIE6 = function() { return isIE6; }; return isIE6; } (function() { function wordSet(words) { words = words.split(/ /g); var set = {}; for (var i = words.length; --i >= 0; ) { var w = words[i]; if (w) { set[w] = null; } } return set; } var FLOW_CONTROL_KEYWORDS = "break continue do else for if return while "; var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " + "double enum extern float goto int long register short signed sizeof " + "static struct switch typedef union unsigned void volatile "; var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " + "new operator private protected public this throw true try "; var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " + "concept concept_map const_cast constexpr decltype " + "dynamic_cast explicit export friend inline late_check " + "mutable namespace nullptr reinterpret_cast static_assert static_cast " + "template typeid typename typeof using virtual wchar_t where "; var JAVA_KEYWORDS = COMMON_KEYWORDS + "boolean byte extends final finally implements import instanceof null " + "native package strictfp super synchronized throws transient "; var CSHARP_KEYWORDS = JAVA_KEYWORDS + "as base by checked decimal delegate descending event " + "fixed foreach from group implicit in interface internal into is lock " + "object out override orderby params readonly ref sbyte sealed " + "stackalloc string select uint ulong unchecked unsafe ushort var "; var JSCRIPT_KEYWORDS = COMMON_KEYWORDS + "debugger eval export function get null set undefined var with " + "Infinity NaN "; var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " + "goto if import last local my next no our print package redo require " + "sub undef unless until use wantarray while BEGIN END "; var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " + "elif except exec finally from global import in is lambda " + "nonlocal not or pass print raise try with yield " + "False True None "; var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" + " defined elsif end ensure false in module next nil not or redo rescue " + "retry self super then true undef unless until when yield BEGIN END "; var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " + "function in local set then until "; var ALL_KEYWORDS = (CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS + PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS); var PR_STRING = 'str'; var PR_KEYWORD = 'kwd'; var PR_COMMENT = 'com'; var PR_TYPE = 'typ'; var PR_LITERAL = 'lit'; var PR_PUNCTUATION = 'pun'; var PR_PLAIN = 'pln'; var PR_TAG = 'tag'; var PR_DECLARATION = 'dec'; var PR_SOURCE = 'src'; var PR_ATTRIB_NAME = 'atn'; var PR_ATTRIB_VALUE = 'atv'; var PR_NOCODE = 'nocode'; function isWordChar(ch) { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'); } function spliceArrayInto(inserted, container, containerPosition, countReplaced) { inserted.unshift(containerPosition, countReplaced || 0); try { container.splice.apply(container, inserted); } finally { inserted.splice(0, 2); } } var REGEXP_PRECEDER_PATTERN = function() { var preceders = ["!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=", "&=", "(", "*", "*=", "+=", ",", "-=", "->", "/", "/=", ":", "::", ";", "<", "<<", "<<=", "<=", "=", "==", "===", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "||=", "~", "break", "case", "continue", "delete", "do", "else", "finally", "instanceof", "return", "throw", "try", "typeof"]; var pattern = '(?:' + '(?:(?:^|[^0-9.])\\.{1,3})|' + '(?:(?:^|[^\\+])\\+)|' + '(?:(?:^|[^\\-])-)'; for (var i = 0; i < preceders.length; ++i) { var preceder = preceders[i]; if (isWordChar(preceder.charAt(0))) { pattern += '|\\b' + preceder; } else { pattern += '|' + preceder.replace(/([^=<>:&])/g, '\\$1'); } } pattern += '|^)\\s*$'; return new RegExp(pattern); } (); var pr_amp = /&/g; var pr_lt = /</g; var pr_gt = />/g; var pr_quot = /\"/g; function attribToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;').replace(pr_quot, '&quot;'); } function textToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;'); } var pr_ltEnt = /&lt;/g; var pr_gtEnt = /&gt;/g; var pr_aposEnt = /&apos;/g; var pr_quotEnt = /&quot;/g; var pr_ampEnt = /&amp;/g; var pr_nbspEnt = /&nbsp;/g; function htmlToText(html) { var pos = html.indexOf('&'); if (pos < 0) { return html; } for (--pos; (pos = html.indexOf('&#', pos + 1)) >= 0; ) { var end = html.indexOf(';', pos); if (end >= 0) { var num = html.substring(pos + 3, end); var radix = 10; if (num && num.charAt(0) === 'x') { num = num.substring(1); radix = 16; } var codePoint = parseInt(num, radix); if (!isNaN(codePoint)) { html = (html.substring(0, pos) + String.fromCharCode(codePoint) + html.substring(end + 1)); } } } return html.replace(pr_ltEnt, '<').replace(pr_gtEnt, '>').replace(pr_aposEnt, "'").replace(pr_quotEnt, '"').replace(pr_ampEnt, '&').replace(pr_nbspEnt, ' '); } function isRawContent(node) { return 'XMP' === node.tagName; } function normalizedHtml(node, out) { switch (node.nodeType) { case 1: var name = node.tagName.toLowerCase(); out.push('<', name); for (var i = 0; i < node.attributes.length; ++i) { var attr = node.attributes[i]; if (!attr.specified) { continue; } out.push(' '); normalizedHtml(attr, out); } out.push('>'); for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } if (node.firstChild || !/^(?:br|link|img)$/.test(name)) { out.push('<\/', name, '>'); } break; case 2: out.push(node.name.toLowerCase(), '="', attribToHtml(node.value), '"'); break; case 3: case 4: out.push(textToHtml(node.nodeValue)); break; } } var PR_innerHtmlWorks = null; function getInnerHtml(node) { if (null === PR_innerHtmlWorks) { var testNode = document.createElement('PRE'); testNode.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />')); PR_innerHtmlWorks = !/</.test(testNode.innerHTML); } if (PR_innerHtmlWorks) { var content = node.innerHTML; if (isRawContent(node)) { content = textToHtml(content); } return content; } var out = []; for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } return out.join(''); } function makeTabExpander(tabWidth) { var SPACES = '                '; var charInLine = 0; return function(plainText) { var out = null; var pos = 0; for (var i = 0, n = plainText.length; i < n; ++i) { var ch = plainText.charAt(i); switch (ch) { case '\t': if (!out) { out = []; } out.push(plainText.substring(pos, i)); var nSpaces = tabWidth - (charInLine % tabWidth); charInLine += nSpaces; for (; nSpaces >= 0; nSpaces -= SPACES.length) { out.push(SPACES.substring(0, nSpaces)); } pos = i + 1; break; case '\n': charInLine = 0; break; default: ++charInLine; } } if (!out) { return plainText; } out.push(plainText.substring(pos)); return out.join(''); }; } var pr_chunkPattern = /(?:[^<]+|<!--[\s\S]*?-->|<!\[CDATA\[([\s\S]*?)\]\]>|<\/?[a-zA-Z][^>]*>|<)/g; var pr_commentPrefix = /^<!--/; var pr_cdataPrefix = /^<\[CDATA\[/; var pr_brPrefix = /^<br\b/i; var pr_tagNameRe = /^<(\/?)([a-zA-Z]+)/; function extractTags(s) { var matches = s.match(pr_chunkPattern); var sourceBuf = []; var sourceBufLen = 0; var extractedTags = []; if (matches) { for (var i = 0, n = matches.length; i < n; ++i) { var match = matches[i]; if (match.length > 1 && match.charAt(0) === '<') { if (pr_commentPrefix.test(match)) { continue; } if (pr_cdataPrefix.test(match)) { sourceBuf.push(match.substring(9, match.length - 3)); sourceBufLen += match.length - 12; } else if (pr_brPrefix.test(match)) { sourceBuf.push('\n'); ++sourceBufLen; } else { if (match.indexOf(PR_NOCODE) >= 0 && isNoCodeTag(match)) { var name = match.match(pr_tagNameRe)[2]; var depth = 1; end_tag_loop: for (var j = i + 1; j < n; ++j) { var name2 = matches[j].match(pr_tagNameRe); if (name2 && name2[2] === name) { if (name2[1] === '/') { if (--depth === 0) { break end_tag_loop; } } else { ++depth; } } } if (j < n) { extractedTags.push(sourceBufLen, matches.slice(i, j + 1).join('')); i = j; } else { extractedTags.push(sourceBufLen, match); } } else { extractedTags.push(sourceBufLen, match); } } } else { var literalText = htmlToText(match); sourceBuf.push(literalText); sourceBufLen += literalText.length; } } } return { source: sourceBuf.join(''), tags: extractedTags }; } function isNoCodeTag(tag) { return !!tag.replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g, ' $1="$2$3$4"').match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/); } function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) { var shortcuts = {}; (function() { var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns); for (var i = allPatterns.length; --i >= 0; ) { var patternParts = allPatterns[i]; var shortcutChars = patternParts[3]; if (shortcutChars) { for (var c = shortcutChars.length; --c >= 0; ) { shortcuts[shortcutChars.charAt(c)] = patternParts; } } } })(); var nPatterns = fallthroughStylePatterns.length; var notWs = /\S/; return function(sourceCode, opt_basePos) { opt_basePos = opt_basePos || 0; var decorations = [opt_basePos, PR_PLAIN]; var lastToken = ''; var pos = 0; var tail = sourceCode; while (tail.length) { var style; var token = null; var match; var patternParts = shortcuts[tail.charAt(0)]; if (patternParts) { match = tail.match(patternParts[1]); token = match[0]; style = patternParts[0]; } else { for (var i = 0; i < nPatterns; ++i) { patternParts = fallthroughStylePatterns[i]; var contextPattern = patternParts[2]; if (contextPattern && !contextPattern.test(lastToken)) { continue; } match = tail.match(patternParts[1]); if (match) { token = match[0]; style = patternParts[0]; break; } } if (!token) { style = PR_PLAIN; token = tail.substring(0, 1); } } decorations.push(opt_basePos + pos, style); pos += token.length; tail = tail.substring(token.length); if (style !== PR_COMMENT && notWs.test(token)) { lastToken = token; } } return decorations; }; } var PR_MARKUP_LEXER = createSimpleLexer([], [[PR_PLAIN, /^[^<]+/, null], [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/, null], [PR_COMMENT, /^<!--[\s\S]*?(?:-->|$)/, null], [PR_SOURCE, /^<\?[\s\S]*?(?:\?>|$)/, null], [PR_SOURCE, /^<%[\s\S]*?(?:%>|$)/, null], [PR_SOURCE, /^<(script|style|xmp)\b[^>]*>[\s\S]*?<\/\1\b[^>]*>/i, null], [PR_TAG, /^<\/?\w[^<>]*>/, null]]); var PR_SOURCE_CHUNK_PARTS = /^(<[^>]*>)([\s\S]*)(<\/[^>]*>)$/; function tokenizeMarkup(source) { var decorations = PR_MARKUP_LEXER(source); for (var i = 0; i < decorations.length; i += 2) { if (decorations[i + 1] === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var sourceChunk = source.substring(start, end); var match = sourceChunk.match(PR_SOURCE_CHUNK_PARTS); if (match) { decorations.splice(i, 2, start, PR_TAG, start + match[1].length, PR_SOURCE, start + match[1].length + (match[2] || '').length, PR_TAG); } } } return decorations; } var PR_TAG_LEXER = createSimpleLexer([[PR_ATTRIB_VALUE, /^\'[^\']*(?:\'|$)/, null, "'"], [PR_ATTRIB_VALUE, /^\"[^\"]*(?:\"|$)/, null, '"'], [PR_PUNCTUATION, /^[<>\/=]+/, null, '<>/=']], [[PR_TAG, /^[\w:\-]+/, /^</], [PR_ATTRIB_VALUE, /^[\w\-]+/, /^=/], [PR_ATTRIB_NAME, /^[\w:\-]+/, null], [PR_PLAIN, /^\s+/, null, ' \t\r\n']]); function splitTagAttributes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_TAG) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var chunk = source.substring(start, end); var subDecorations = PR_TAG_LEXER(chunk, start); spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function sourceDecorator(options) { var shortcutStylePatterns = [], fallthroughStylePatterns = []; if (options.tripleQuotedStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/, null, '\'"']); } else if (options.multiLineStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/, null, '\'"`']); } else { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, null, '"\'']); } fallthroughStylePatterns.push([PR_PLAIN, /^(?:[^\'\"\`\/\#]+)/, null, ' \r\n']); if (options.hashComments) { shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']); } if (options.cStyleComments) { fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]); fallthroughStylePatterns.push([PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]); } if (options.regexLiterals) { var REGEX_LITERAL = ('^/(?=[^/*])' + '(?:[^/\\x5B\\x5C]' + '|\\x5C[\\s\\S]' + '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+' + '(?:/|$)'); fallthroughStylePatterns.push([PR_STRING, new RegExp(REGEX_LITERAL), REGEXP_PRECEDER_PATTERN]); } var keywords = wordSet(options.keywords); options = null; var splitStringAndCommentTokens = createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns); var styleLiteralIdentifierPuncRecognizer = createSimpleLexer([], [[PR_PLAIN, /^\s+/, null, ' \r\n'], [PR_PLAIN, /^[a-z_$@][a-z_$@0-9]*/i, null], [PR_LITERAL, /^0x[a-f0-9]+[a-z]/i, null], [PR_LITERAL, /^(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?[a-z]*/i, null, '123456789'], [PR_PUNCTUATION, /^[^\s\w\.$@]+/, null]]); function splitNonStringNonCommentTokens(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_PLAIN) { var start, end, chunk, subDecs; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; chunk = source.substring(start, end); subDecs = styleLiteralIdentifierPuncRecognizer(chunk, start); for (var j = 0, m = subDecs.length; j < m; j += 2) { var subStyle = subDecs[j + 1]; if (subStyle === PR_PLAIN) { var subStart = subDecs[j]; var subEnd = j + 2 < m ? subDecs[j + 2] : chunk.length; var token = source.substring(subStart, subEnd); if (token === '.') { subDecs[j + 1] = PR_PUNCTUATION; } else if (token in keywords) { subDecs[j + 1] = PR_KEYWORD; } else if (/^@?[A-Z][A-Z$]*[a-z][A-Za-z$]*$/.test(token)) { subDecs[j + 1] = token.charAt(0) === '@' ? PR_LITERAL : PR_TYPE; } } } spliceArrayInto(subDecs, decorations, i, 2); i += subDecs.length - 2; } } return decorations; } return function(sourceCode) { var decorations = splitStringAndCommentTokens(sourceCode); decorations = splitNonStringNonCommentTokens(sourceCode, decorations); return decorations; }; } var decorateSource = sourceDecorator({ keywords: ALL_KEYWORDS, hashComments: true, cStyleComments: true, multiLineStrings: true, regexLiterals: true }); function splitSourceNodes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var subDecorations = decorateSource(source.substring(start, end)); for (var j = 0, m = subDecorations.length; j < m; j += 2) { subDecorations[j] += start; } spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function splitSourceAttributes(source, decorations) { var nextValueIsSource = false; for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; var start, end; if (style === PR_ATTRIB_NAME) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; nextValueIsSource = /^on|^style$/i.test(source.substring(start, end)); } else if (style === PR_ATTRIB_VALUE) { if (nextValueIsSource) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var attribValue = source.substring(start, end); var attribLen = attribValue.length; var quoted = (attribLen >= 2 && /^[\"\']/.test(attribValue) && attribValue.charAt(0) === attribValue.charAt(attribLen - 1)); var attribSource; var attribSourceStart; var attribSourceEnd; if (quoted) { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue; } else { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue.substring(1, attribValue.length - 1); } var attribSourceDecorations = decorateSource(attribSource); for (var j = 0, m = attribSourceDecorations.length; j < m; j += 2) { attribSourceDecorations[j] += attribSourceStart; } if (quoted) { attribSourceDecorations.push(attribSourceEnd, PR_ATTRIB_VALUE); spliceArrayInto(attribSourceDecorations, decorations, i + 2, 0); } else { spliceArrayInto(attribSourceDecorations, decorations, i, 2); } } nextValueIsSource = false; } } return decorations; } function decorateMarkup(sourceCode) { var decorations = tokenizeMarkup(sourceCode); decorations = splitTagAttributes(sourceCode, decorations); decorations = splitSourceNodes(sourceCode, decorations); decorations = splitSourceAttributes(sourceCode, decorations); return decorations; } function recombineTagsAndDecorations(sourceText, extractedTags, decorations) { var html = []; var outputIdx = 0; var openDecoration = null; var currentDecoration = null; var tagPos = 0; var decPos = 0; var tabExpander = makeTabExpander(PR_TAB_WIDTH); var adjacentSpaceRe = /([\r\n ]) /g; var startOrSpaceRe = /(^| ) /gm; var newlineRe = /\r\n?|\n/g; var trailingSpaceRe = /[ \r\n]$/; var lastWasSpace = true; function emitTextUpTo(sourceIdx) { if (sourceIdx > outputIdx) { if (openDecoration && openDecoration !== currentDecoration) { html.push('</span>'); openDecoration = null; } if (!openDecoration && currentDecoration) { openDecoration = currentDecoration; html.push('<span class="', openDecoration, '">'); } var htmlChunk = textToHtml(tabExpander(sourceText.substring(outputIdx, sourceIdx))).replace(lastWasSpace ? startOrSpaceRe : adjacentSpaceRe, '$1&nbsp;'); lastWasSpace = trailingSpaceRe.test(htmlChunk); html.push(htmlChunk.replace(newlineRe, '<br />')); outputIdx = sourceIdx; } } while (true) { var outputTag; if (tagPos < extractedTags.length) { if (decPos < decorations.length) { outputTag = extractedTags[tagPos] <= decorations[decPos]; } else { outputTag = true; } } else { outputTag = false; } if (outputTag) { emitTextUpTo(extractedTags[tagPos]); if (openDecoration) { html.push('</span>'); openDecoration = null; } html.push(extractedTags[tagPos + 1]); tagPos += 2; } else if (decPos < decorations.length) { emitTextUpTo(decorations[decPos]); currentDecoration = decorations[decPos + 1]; decPos += 2; } else { break; } } emitTextUpTo(sourceText.length); if (openDecoration) { html.push('</span>'); } return html.join(''); } var langHandlerRegistry = {}; function registerLangHandler(handler, fileExtensions) { for (var i = fileExtensions.length; --i >= 0; ) { var ext = fileExtensions[i]; if (!langHandlerRegistry.hasOwnProperty(ext)) { langHandlerRegistry[ext] = handler; } else if ('console' in window) { console.log('cannot override language handler %s', ext); } } } registerLangHandler(decorateSource, ['default-code']); registerLangHandler(decorateMarkup, ['default-markup', 'html', 'htm', 'xhtml', 'xml', 'xsl']); registerLangHandler(sourceDecorator({ keywords: CPP_KEYWORDS, hashComments: true, cStyleComments: true }), ['c', 'cc', 'cpp', 'cs', 'cxx', 'cyc']); registerLangHandler(sourceDecorator({ keywords: JAVA_KEYWORDS, cStyleComments: true }), ['java']); registerLangHandler(sourceDecorator({ keywords: SH_KEYWORDS, hashComments: true, multiLineStrings: true }), ['bsh', 'csh', 'sh']); registerLangHandler(sourceDecorator({ keywords: PYTHON_KEYWORDS, hashComments: true, multiLineStrings: true, tripleQuotedStrings: true }), ['cv', 'py']); registerLangHandler(sourceDecorator({ keywords: PERL_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['perl', 'pl', 'pm']); registerLangHandler(sourceDecorator({ keywords: RUBY_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['rb']); registerLangHandler(sourceDecorator({ keywords: JSCRIPT_KEYWORDS, cStyleComments: true, regexLiterals: true }), ['js']); function prettyPrintOne(sourceCodeHtml, opt_langExtension) { try { var sourceAndExtractedTags = extractTags(sourceCodeHtml); var source = sourceAndExtractedTags.source; var extractedTags = sourceAndExtractedTags.tags; if (!langHandlerRegistry.hasOwnProperty(opt_langExtension)) { opt_langExtension = /^\s*</.test(source) ? 'default-markup' : 'default-code'; } var decorations = langHandlerRegistry[opt_langExtension].call({}, source); return recombineTagsAndDecorations(source, extractedTags, decorations); } catch (e) { if ('console' in window) { console.log(e); console.trace(); } return sourceCodeHtml; } } function prettyPrint(opt_whenDone) { var isIE6 = _pr_isIE6(); var codeSegments = [document.getElementsByTagName('pre'), document.getElementsByTagName('code'), document.getElementsByTagName('xmp')]; var elements = []; for (var i = 0; i < codeSegments.length; ++i) { for (var j = 0; j < codeSegments[i].length; ++j) { elements.push(codeSegments[i][j]); } } codeSegments = null; var k = 0; function doWork() { var endTime = (PR_SHOULD_USE_CONTINUATION ? new Date().getTime() + 250 : Infinity); for (; k < elements.length && new Date().getTime() < endTime; k++) { var cs = elements[k]; if (cs.className && cs.className.indexOf('prettyprint') >= 0) { var langExtension = cs.className.match(/\blang-(\w+)\b/); if (langExtension) { langExtension = langExtension[1]; } var nested = false; for (var p = cs.parentNode; p; p = p.parentNode) { if ((p.tagName === 'pre' || p.tagName === 'code' || p.tagName === 'xmp') && p.className && p.className.indexOf('prettyprint') >= 0) { nested = true; break; } } if (!nested) { var content = getInnerHtml(cs); content = content.replace(/(?:\r\n?|\n)$/, ''); var newContent = prettyPrintOne(content, langExtension); if (!isRawContent(cs)) { cs.innerHTML = newContent; } else { var pre = document.createElement('PRE'); for (var i = 0; i < cs.attributes.length; ++i) { var a = cs.attributes[i]; if (a.specified) { var aname = a.name.toLowerCase(); if (aname === 'class') { pre.className = a.value; } else { pre.setAttribute(a.name, a.value); } } } pre.innerHTML = newContent; cs.parentNode.replaceChild(pre, cs); cs = pre; } if (isIE6 && cs.tagName === 'PRE') { var lineBreaks = cs.getElementsByTagName('br'); for (var j = lineBreaks.length; --j >= 0; ) { var lineBreak = lineBreaks[j]; lineBreak.parentNode.replaceChild(document.createTextNode('\r\n'), lineBreak); } } } } } if (k < elements.length) { setTimeout(doWork, 250); } else if (opt_whenDone) { opt_whenDone(); } } doWork(); } window['PR_normalizedHtml'] = normalizedHtml; window['prettyPrintOne'] = prettyPrintOne; window['prettyPrint'] = prettyPrint; window['PR'] = { 'createSimpleLexer': createSimpleLexer, 'registerLangHandler': registerLangHandler, 'sourceDecorator': sourceDecorator, 'PR_ATTRIB_NAME': PR_ATTRIB_NAME, 'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE, 'PR_COMMENT': PR_COMMENT, 'PR_DECLARATION': PR_DECLARATION, 'PR_KEYWORD': PR_KEYWORD, 'PR_LITERAL': PR_LITERAL, 'PR_NOCODE': PR_NOCODE, 'PR_PLAIN': PR_PLAIN, 'PR_PUNCTUATION': PR_PUNCTUATION, 'PR_SOURCE': PR_SOURCE, 'PR_STRING': PR_STRING, 'PR_TAG': PR_TAG, 'PR_TYPE': PR_TYPE }; })();
-\ No newline at end of file
-diff -ruN CNPROG/templates/content/js/com.cnprog.utils.js mikes/templates/content/js/com.cnprog.utils.js
---- CNPROG/templates/content/js/com.cnprog.utils.js	2009-06-22 21:42:51.000000000 -0400
-+++ mikes/templates/content/js/com.cnprog.utils.js	2009-07-25 19:09:58.138152577 -0400
-@@ -119,4 +113,4 @@
- }();
- //Search Engine Keyword Highlight with Javascript
- //http://scott.yang.id.au/code/se-hilite/
--Hilite={elementid:"content",exact:true,max_nodes:1000,onload:true,style_name:"hilite",style_name_suffix:true,debug_referrer:""};Hilite.search_engines=[["local","q"],["cnprog\\.","q"],["google\\.","q"],["search\\.yahoo\\.","p"],["search\\.msn\\.","q"],["search\\.live\\.","query"],["search\\.aol\\.","userQuery"],["ask\\.com","q"],["altavista\\.","q"],["feedster\\.","q"],["search\\.lycos\\.","q"],["alltheweb\\.","q"],["technorati\\.com/search/([^\\?/]+)",1],["dogpile\\.com/info\\.dogpl/search/web/([^\\?/]+)",1,true]];Hilite.decodeReferrer=function(d){var g=null;var e=new RegExp("");for(var c=0;c<Hilite.search_engines.length;c++){var f=Hilite.search_engines[c];e.compile("^http://(www\\.)?"+f[0],"i");var b=d.match(e);if(b){var a;if(isNaN(f[1])){a=Hilite.decodeReferrerQS(d,f[1])}else{a=b[f[1]+1]}if(a){a=decodeURIComponent(a);if(f.length>2&&f[2]){a=decodeURIComponent(a)}a=a.replace(/\'|"/g,"");a=a.split(/[\s,\+\.]+/);return a}break}}return null};Hilite.decodeReferrerQS=function(f,d){var b=f.indexOf("?");var c;if(b>=0){var a=new String(f.substring(b+1));b=0;c=0;while((b>=0)&&((c=a.indexOf("=",b))>=0)){var e,g;e=a.substring(b,c);b=a.indexOf("&",c)+1;if(e==d){if(b<=0){return a.substring(c+1)}else{return a.substring(c+1,b-1)}}else{if(b<=0){return null}}}}return null};Hilite.hiliteElement=function(f,e){if(!e||f.childNodes.length==0){return}var c=new Array();for(var b=0;b<e.length;b++){e[b]=e[b].toLowerCase();if(Hilite.exact){c.push("\\b"+e[b]+"\\b")}else{c.push(e[b])}}c=new RegExp(c.join("|"),"i");var a={};for(var b=0;b<e.length;b++){if(Hilite.style_name_suffix){a[e[b]]=Hilite.style_name+(b+1)}else{a[e[b]]=Hilite.style_name}}var d=function(m){var j=c.exec(m.data);if(j){var n=j[0];var i="";var h=m.splitText(j.index);var g=h.splitText(n.length);var l=m.ownerDocument.createElement("SPAN");m.parentNode.replaceChild(l,h);l.className=a[n.toLowerCase()];l.appendChild(h);return l}else{return m}};Hilite.walkElements(f.childNodes[0],1,d)};Hilite.hilite=function(){var a=Hilite.debug_referrer?Hilite.debug_referrer:document.referrer;var b=null;a=Hilite.decodeReferrer(a);if(a&&((Hilite.elementid&&(b=document.getElementById(Hilite.elementid)))||(b=document.body))){Hilite.hiliteElement(b,a)}};Hilite.walkElements=function(d,f,e){var a=/^(script|style|textarea)/i;var c=0;while(d&&f>0){c++;if(c>=Hilite.max_nodes){var b=function(){Hilite.walkElements(d,f,e)};setTimeout(b,50);return}if(d.nodeType==1){if(!a.test(d.tagName)&&d.childNodes.length>0){d=d.childNodes[0];f++;continue}}else{if(d.nodeType==3){d=e(d)}}if(d.nextSibling){d=d.nextSibling}else{while(f>0){d=d.parentNode;f--;if(d.nextSibling){d=d.nextSibling;break}}}}};if(Hilite.onload){if(window.attachEvent){window.attachEvent("onload",Hilite.hilite)}else{if(window.addEventListener){window.addEventListener("load",Hilite.hilite,false)}else{var __onload=window.onload;window.onload=function(){Hilite.hilite();__onload()}}}};
-+Hilite={elementid:"content",exact:true,max_nodes:1000,onload:true,style_name:"hilite",style_name_suffix:true,debug_referrer:""};Hilite.search_engines=[["local","q"],["cnprog\\.","q"],["google\\.","q"],["search\\.yahoo\\.","p"],["search\\.msn\\.","q"],["search\\.live\\.","query"],["search\\.aol\\.","userQuery"],["ask\\.com","q"],["altavista\\.","q"],["feedster\\.","q"],["search\\.lycos\\.","q"],["alltheweb\\.","q"],["technorati\\.com/search/([^\\?/]+)",1],["dogpile\\.com/info\\.dogpl/search/web/([^\\?/]+)",1,true]];Hilite.decodeReferrer=function(d){var g=null;var e=new RegExp("");for(var c=0;c<Hilite.search_engines.length;c++){var f=Hilite.search_engines[c];e.compile("^http://(www\\.)?"+f[0],"i");var b=d.match(e);if(b){var a;if(isNaN(f[1])){a=Hilite.decodeReferrerQS(d,f[1])}else{a=b[f[1]+1]}if(a){a=decodeURIComponent(a);if(f.length>2&&f[2]){a=decodeURIComponent(a)}a=a.replace(/\'|"/g,"");a=a.split(/[\s,\+\.]+/);return a}break}}return null};Hilite.decodeReferrerQS=function(f,d){var b=f.indexOf("?");var c;if(b>=0){var a=new String(f.substring(b+1));b=0;c=0;while((b>=0)&&((c=a.indexOf("=",b))>=0)){var e,g;e=a.substring(b,c);b=a.indexOf("&",c)+1;if(e==d){if(b<=0){return a.substring(c+1)}else{return a.substring(c+1,b-1)}}else{if(b<=0){return null}}}}return null};Hilite.hiliteElement=function(f,e){if(!e||f.childNodes.length==0){return}var c=new Array();for(var b=0;b<e.length;b++){e[b]=e[b].toLowerCase();if(Hilite.exact){c.push("\\b"+e[b]+"\\b")}else{c.push(e[b])}}c=new RegExp(c.join("|"),"i");var a={};for(var b=0;b<e.length;b++){if(Hilite.style_name_suffix){a[e[b]]=Hilite.style_name+(b+1)}else{a[e[b]]=Hilite.style_name}}var d=function(m){var j=c.exec(m.data);if(j){var n=j[0];var i="";var h=m.splitText(j.index);var g=h.splitText(n.length);var l=m.ownerDocument.createElement("SPAN");m.parentNode.replaceChild(l,h);l.className=a[n.toLowerCase()];l.appendChild(h);return l}else{return m}};Hilite.walkElements(f.childNodes[0],1,d)};Hilite.hilite=function(){var a=Hilite.debug_referrer?Hilite.debug_referrer:document.referrer;var b=null;a=Hilite.decodeReferrer(a);if(a&&((Hilite.elementid&&(b=document.getElementById(Hilite.elementid)))||(b=document.body))){Hilite.hiliteElement(b,a)}};Hilite.walkElements=function(d,f,e){var a=/^(script|style|textarea)/i;var c=0;while(d&&f>0){c++;if(c>=Hilite.max_nodes){var b=function(){Hilite.walkElements(d,f,e)};setTimeout(b,50);return}if(d.nodeType==1){if(!a.test(d.tagName)&&d.childNodes.length>0){d=d.childNodes[0];f++;continue}}else{if(d.nodeType==3){d=e(d)}}if(d.nextSibling){d=d.nextSibling}else{while(f>0){d=d.parentNode;f--;if(d.nextSibling){d=d.nextSibling;break}}}}};if(Hilite.onload){if(window.attachEvent){window.attachEvent("onload",Hilite.hilite)}else{if(window.addEventListener){window.addEventListener("load",Hilite.hilite,false)}else{var __onload=window.onload;window.onload=function(){Hilite.hilite();__onload()}}}};
-\ No newline at end of file
-diff -ruN CNPROG/templates/content/style/openid.css mikes/templates/content/style/openid.css
---- CNPROG/templates/content/style/openid.css	2009-06-22 21:42:51.000000000 -0400
-+++ mikes/templates/content/style/openid.css	2009-07-25 19:09:58.168153308 -0400
-@@ -42,4 +42,4 @@
- 	}
- 	.openid_selected {
- 		border: 4px solid #DDD;
--	}	
-+	}	
-\ No newline at end of file
-diff -ruN CNPROG/templates/okfiles mikes/templates/okfiles
---- CNPROG/templates/okfiles	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/templates/okfiles	1969-12-31 19:00:00.000000000 -0500
-@@ -1,30 +0,0 @@
--404.html
--500.html
--about.html
--ask.html
--badges.html
--base_content.html
--base.html
--book.html
--close.html
--faq.html
--footer.html
--header.html
--index.html
--logout.html
--pagesize.html
--paginator.html
--privacy.html
--question_edit_tips.html
--question.html
--questions.html
--revisions_answer.html
--tags.html
--unanswered.html
--user_edit.html
--user_info.html
--users.html
--users_questions.html
--user_stats.html
--user_tabs.html
--user_votes.html
-diff -ruN CNPROG/templates/pagesize.html mikes/templates/pagesize.html
---- CNPROG/templates/pagesize.html	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/templates/pagesize.html	2009-07-25 19:09:58.168153308 -0400
-@@ -1,9 +1,8 @@
--<!-- template pagesize.html -->
- {% spaceless %}
- {% load i18n %}
- {% if is_paginated %}
- <div class="paginator">
--    <span class="text">{% trans "posts per page" %}</span>
-+    <span class="text">{% trans "Size per page:" %}</span>
-     {% ifequal pagesize 10 %}
-         <span class="curr">10</span>
-     {% else %}
-@@ -24,4 +23,3 @@
- </div> 
- {% endif %}
- {% endspaceless %}
--<!-- end template pagesize.html -->
-diff -ruN CNPROG/templates/question_retag.html mikes/templates/question_retag.html
---- CNPROG/templates/question_retag.html	1969-12-31 19:00:00.000000000 -0500
-+++ mikes/templates/question_retag.html	2009-07-25 19:09:58.178152900 -0400
-@@ -0,0 +1,109 @@
-+{% extends "base.html" %}
-+{% block title %}{% spaceless %}修改问题标签{% endspaceless %}{% endblock %}
-+{% block forejs %}
-+        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-+        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-+        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
-+        <script type="text/javascript">
-+        
-+        $().ready(function(){
-+            $("#nav_questions").attr('className',"on");
-+            //Tags autocomplete action
-+            var tags = {{ tags|safe }};
-+        	$("#id_tags").autocomplete(tags, {
-+                minChars: 1,
-+        		matchContains: true,
-+                max: 20,
-+                multiple: true,
-+                multipleSeparator: " ",
-+        		formatItem: function(row, i, max) {
-+        			return row.n + " ("+ row.c +")";
-+        		},
-+                formatResult: function(row, i, max){
-+                    return row.n;
-+                }
-+                
-+            });
-+           
-+             $("#fmretag").validate({
-+                rules: {
-+        			tags: {
-+        				required: true,
-+        				maxength: 105
-+        			}
-+        		},
-+                messages: {
-+        			tags: {
-+                        required: " 标签不能为空。",
-+                        maxlength: " 最多5个标签，每个标签长度小于20个字符。"
-+                    }
-+                }
-+                
-+            });
-+            lanai.highlightSyntax();
-+
-+        });
-+        </script>
-+{% endblock %}
-+        
-+{% block content %}
-+<div id="main-bar" class="headNormal">
-+    修改标签 [<a href="{{ question.get_absolute_url }}">返回</a>]
-+</div>
-+<div id="main-body" class="ask-body">
-+    <div id="askform">
-+        <form id="fmretag" action="{% url edit_question question.id %}" method="post" >
-+            <h3>
-+                {{ question.get_question_title }}
-+            </h3>
-+            <div id="description" class="edit-content-html">
-+                {{ question.html|safe }}
-+            </div>
-+           
-+            
-+            <div class="form-item">
-+                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br>
-+                {{ form.tags }}  {{ form.tags.errors }}
-+                <div class="title-desc">
-+                    {{ form.tags.help_text }}
-+                </div>
-+            </div>
-+            <br>
-+            
-+            <div class="error" ></div>
-+            <input type="submit" value="现在修改" class="submit" />
-+            <input type="button" value="取消" class="submit" onclick="history.back(-1);" />
-+            <br>
-+            <br>
-+        </form>
-+    </div>
-+</div>
-+{% endblock %}
-+
-+{% block sidebar %}
-+<div class="boxC">
-+    <p class="subtitle">为什么我只能修改问题标签？</p>
-+    <ul class="list-item">
-+        
-+        <li>
-+            CNProg用标签来分类系统的信息
-+
-+        </li>
-+        <li>
-+            修改完整问题需要用户的积分达到一定条件（比如：积分 >= 3000分，自己发布的问题除外），而用户积分达到比较低的时候，就可以修改问题的标签（比如：积分 >= 500, 这里指所有问题的标签）。
-+
-+        </li>
-+        <li>
-+            修改标签的用户将授予特殊的社区奖牌 
-+
-+        </li>
-+    </ul>
-+    <a href="{% url faq %}" style="float:right;position:relative">faq »</a>
-+    <br>  
-+</div>
-+
-+{% endblock %}
-+
-+{% block endjs %}
-+{% endblock %}
-+
-diff -ruN CNPROG/templates/template.list mikes/templates/template.list
---- CNPROG/templates/template.list	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/templates/template.list	1969-12-31 19:00:00.000000000 -0500
-@@ -1,18 +0,0 @@
--close.html
--book.html
--base_content.html
--badges.html
--badge.html
--ask.html
--answer_edit_tips.html
--answer_edit.html
--about.html
--500.html
--404.html
--pagesize.html
--logout.html
--header.html
--footer.html
--faq.html
--base.html
--question.html
-diff -ruN CNPROG/templates/tough/faq.html mikes/templates/tough/faq.html
---- CNPROG/templates/tough/faq.html	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/templates/tough/faq.html	1969-12-31 19:00:00.000000000 -0500
-@@ -1,110 +0,0 @@
--{% extends "base_content.html" %}
--{% load extra_tags %}
--{% load humanize %}
--{% block title %}{% spaceless %}FAQ{% endspaceless %}{% endblock %}
--{% block forejs %}
--{% endblock %}
--{% block content %}
--<div class="headNormal">
--    {% trans "Frequently Asked Questions " %}(FAQ)
--</div>
--<div id="main-body" style="width:100%">
--    
--    <h3 class="subtitle">{% trans "What kinds of questions can I ask here?" %}</h3>
--    <p>{% trans "Most importanly - questions should be <strong>relevant</strong> to this community." %}<br>
--	{% trans "Before asking the question - please make sure to use search to see whether your question has alredy been answered."%}<br>
--    </p><br>
--    
--        <h3 class="subtitle">{% trans "What questions should I avoid asking?" %}</h3>
--		<p>{% trans "Please avoid asking questions that are not relevant to this community, too subjective and argumentative." %}</p>
--    </p><br>
--    
--        <h3 class="subtitle">{% trans "What should I avoid in my answers?" %}</h3>
--        <p>{% trans "site title" %} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %} 
--    </p><br>
--    
--        <h3 class="subtitle">{% trans "Who moderates this community?" %}</h3>
--		<p>{% trans "The short answer is: <strong>you</strong>." %}<br>
--		{% trans "This website is moderated by the users." %}
--		{% trans "The reputation system allows users earn the authorization to perform a variety of moderation tasks." %}
--    </p><br>
--    
--        <h3 class="subtitle">{% trans "How does reputation system work?" %}</h3>
--		<p>{% trans "Anyone can ask questions and give answers, points are not necessary for that." %}<br>
--        {% trans "As we've said before, users help running this site. Point system helps select users who can administer this community."%}
--		{% trans "Reputation points roughly measure how community trusts you. These points are given to you directly by other members of the community." %}
--		</p>
--		<p>
--		 {% trans "For example, if you ask an interesting question or give a helpful answer, your input will be upvoted and you will gain more trust in the community." %}
--         {% trans "If on the other hand someone gives a misleading answer, the answer will be voted down and he/she loses some points." %}
--		 {% trans "Each vote in favor will generate <strong>10</strong> points, each vote against will subtract <strong>2</strong> points." trans %}
--		 {% trans "Through the votes of other people you can accumulate a maximum of <strong>200</strong> points." %}
--		 {% "After accumulating certain number of points, you can do more:" %}
--        <table style="font-family:arial;" cellspacing="3" cellpadding="3">
--            <tr>
--                <th width="40px" style="text-align:right"></th>
--                <th width="300px"></th>
--            </tr>
--	        <tr>
--                <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
--                <td>{% trans "upvote" %}</td>
--	        </tr>
--	        <tr>
--                <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
--                <td>{% trans "use tags" %}</td>
--	        </tr>
--            <tr>
--                <td style="text-align:right;padding-right:5px"><strong>50</strong></td>
--                <td>{% trans "add comments" %}</td>
--	        </tr>
--            <tr>
--                <td style="text-align:right;padding-right:5px"><strong>100</strong></td>
--                <td>{% trans "downvote" %}</td>
--	        </tr><tr>
--                <td style="text-align:right;padding-right:5px"><strong>250</strong></td>
--                <td>打开关闭自己的问题</td>
--	        </tr>
--            <tr>
--                <td style="text-align:right;padding-right:5px"><strong>500</strong></td>
--                <td>{% trans "retag questions" %}</td>
--	        </tr>
--            <tr>
--                <td style="text-align:right;padding-right:5px"><strong>750</strong></td>
--                <td>{% trans "edit community wiki questions" %}</td>
--	        </tr>
--            <tr>
--                <td style="text-align:right;padding-right:5px"><strong>2000</strong></td>
--                <td>{% trans "edit any answer" %}</td>
--	        </tr>
--            <tr>
--                <td style="text-align:right;padding-right:5px"><strong>3000</strong></td>
--                <td>{% trans "open any closed question" %}</td>
--	        </tr>
--            <tr>
--                <td style="text-align:right;padding-right:5px"><strong>5000</strong></td>
--                <td>{% trans "delete any comment" %}</td>
--	        </tr>
--            <tr>
--                <td style="text-align:right;padding-right:5px"><strong>10000</strong></td>
--                <td>{% trans "delete any questions and answers and perform other moderation tasks" %}</td>
--	        </tr>
--
--        </table>
--        
--    </p><br>
--   
--        <h3 class="subtitle">{% trans "To register, do I need to create new password?"</h3>
--        <p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %}
--		<strong><a href="/account/signin">{% trans "Login now!" %}</a> »</strong>
--    </p><br>
--    
--        <h3 class="subtitle">{% trans "Why other people can edit my questions/answers?" %}</h3>
--    <p> {% trans "Goal of this site is..." %} {% trans "So questions and answers can be edited like wiki pages by experienced users of this site and this improves the overall quality of the knowledge base content." %}
--	{% trans "If this approach is not for you, we respect your choice." %}
--    </p><br>
--        <h3 class="subtitle">{% trans "Still have questions?" %}</h3>
--    <p>{% "Please ask your question, help make our community better!" %} <a href="/tags/faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
--    </p>
--    <br><br>
--</div>
--{% endblock %}
-diff -ruN CNPROG/templates/tough/question_retag.html mikes/templates/tough/question_retag.html
---- CNPROG/templates/tough/question_retag.html	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/templates/tough/question_retag.html	1969-12-31 19:00:00.000000000 -0500
-@@ -1,107 +0,0 @@
--{% extends "base.html" %}
--{% block title %}{% spaceless %}{% trans "Revise tags" %}{% endspaceless %}{% endblock %}
--{% block forejs %}
--        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
--        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
--        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
--        <script type="text/javascript">
--        
--        $().ready(function(){
--            $("#nav_questions").attr('className',"on");
--            //Tags autocomplete action
--            var tags = {{ tags|safe }};
--        	$("#id_tags").autocomplete(tags, {
--                minChars: 1,
--        		matchContains: true,
--                max: 20,
--                multiple: true,
--                multipleSeparator: " ",
--        		formatItem: function(row, i, max) {
--        			return row.n + " ("+ row.c +")";
--        		},
--                formatResult: function(row, i, max){
--                    return row.n;
--                }
--                
--            });
--           
--             $("#fmretag").validate({
--                rules: {
--        			tags: {
--        				required: true,
--        				maxength: 105
--        			}
--        		},
--                messages: {
--        			tags: {
--                        required: ' ' + {% trans "tags are requried" %},
--                        maxlength: ' ' + {% trans "up to 5 tags, less than 20 characters each" %},
--                    }
--                }
--                
--            });
--            lanai.highlightSyntax();
--
--        });
--        </script>
--{% endblock %}
--        
--{% block content %}
--<div id="main-bar" class="headNormal">
--    {% trans "Change tags" %} [<a href="{{ question.get_absolute_url }}">{% trans "back" %}</a>]
--</div>
--<div id="main-body" class="ask-body">
--    <div id="askform">
--        <form id="fmretag" action="{% url edit_question question.id %}" method="post" >
--            <h3>
--                {{ question.get_question_title }}
--            </h3>
--            <div id="description" class="edit-content-html">
--                {{ question.html|safe }}
--            </div>
--           
--            
--            <div class="form-item">
--                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br>
--                {{ form.tags }}  {{ form.tags.errors }}
--                <div class="title-desc">
--                    {{ form.tags.help_text }}
--                </div>
--            </div>
--            <br>
--            
--            <div class="error" ></div>
--            <input type="submit" value="{% trans "Change now" %}" class="submit" />
--            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);" />
--            <br>
--            <br>
--        </form>
--    </div>
--</div>
--{% endblock %}
--
--{% block sidebar %}
--<div class="boxC">
--    <p class="subtitle">{% trans "Why use and modify tags?" %}</p>
--    <ul class="list-item">
--        
--        <li>
--            {% trans "site title" %} {% trans "uses tags for the classification of questions %}
--        </li>
--        <li>
--            修改完整问题需要用户的积分达到一定条件（比如：积分 >= 3000分，自己发布的问题除外），而用户积分达到比较低的时候，就可以修改问题的标签（比如：积分 >= 500, 这里指所有问题的标签）。
--
--        </li>
--        <li>
--			{% trans "tag editors receive special awards from the community" %}
--        </li>
--    </ul>
--    <a href="{% url faq %}" style="float:right;position:relative">faq »</a>
--    <br>  
--</div>
--
--{% endblock %}
--
--{% block endjs %}
--{% endblock %}
--
-diff -ruN CNPROG/templates/tough/unanswered.html mikes/templates/tough/unanswered.html
---- CNPROG/templates/tough/unanswered.html	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/templates/tough/unanswered.html	1969-12-31 19:00:00.000000000 -0500
-@@ -1,115 +0,0 @@
--{% extends "base.html" %}
--{% load extra_tags %}
--{% load humanize %}
--{% load extra_filters %}
--{% block title %}{% spaceless %}{% trans "Unanswered questions" %}{% endspaceless %}{% endblock %}
--{% block forejs %}
--       <script type="text/javascript">
--        $().ready(function(){
--            $("#nav_unanswered").attr('className',"on");
--        });
--         
--        </script>
--{% endblock %}
--{% block content %}
--<div class="tabBar">
--    <span class="headQuestions">{% trans "Unanswered questions" %}</span>
--    <div class="tabsA">
--        <a id="latest" href="?sort=latest" class="on" title="{% trans "most recently asked questions" %}>{% trans "newest" %}</a> 
--    </div>
--</div>
--
--<div id="listA">
--    {% for question in questions.object_list %}
--    <div class="qstA">
--        <h2><a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a></h2>
--        <div class="stat">
--            <table>
--	            <tr>
--                    <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
--                    <td><span class="num">{{ question.score|intcomma }}</span> </td>
--                    <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
--	            </tr>  
--                <tr>
--                    <td><span class="unit">{% trans "answers" %}</span></td>
--                    <td><span class="unit">{% trans "votes" %}</span></td>
--                    <td><span class="unit">{% trans "views" %}</span></td>
--	            </tr> 
--            </table>
--        </div>
--        <div class="summary">
--            {{ question.summary }}...                
--        </div>
--    
--        {% ifequal tab_id 'active'%}
--        {% if question.wiki %}
--        <span class="from wiki">{% trans "community wiki" %}</span>
--        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
--        {% else %}
--        <div class="from">
--             {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
--            <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
--            <span class="score">{% get_score_badge question.last_activity_by %} </span>
--            <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
--        </div>
--        {% endif %}
--        {% else %}
--        {% if question.wiki %}
--        <span class="from wiki">{% trans "community wiki" %}</span>
--        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
--        {% else %}
--        <div class="from">
--             {% comment %}{% gravatar question.author 24 %}{% endcomment %}
--            <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
--            <span class="score">{% get_score_badge question.author %} </span>
--            <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
--        </div>
--        {% endif %}
--        {% endifequal %}
--        
--        <div class="tags">
--        {% for tag in question.tagname_list %}
--        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
--        {% endfor %}
--        </div>
--    </div>
--    {% endfor %}
--</div>
--{% endblock %}
--
--{% block tail %}
--                        <div class="pager">
--                            {% cnprog_paginator context %}
--                            
--                        </div>
--                        <div class="pagesize">
--                            {% cnprog_pagesize context %}
--                        </div>
--{% endblock %}
--
--{% block sidebar %}
--<div class="boxC">
--    <p>
--		<!--todo: move this to blocktrans -->
--		{% tans "Have a total of" %}<br><div class="questions-count">{{ questions_count|intcomma }}</div>
--        <p>{% trans "number of <strong>unanswered</strong> questions" %}</p>
--        <p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>
--
--    </p>
--</div>
--<div class="boxC">
--	<h3 class="subtitle">{% trans "Related tags" %}</h3>
--    <div class="body">
--    <div class="tags">
--        {% for tag in tags %}
--            <a rel="tag" title="{% trans "see questions tagged"%}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
--            <span class="tag-number">× {{ tag.used_count|intcomma }}</span>
--            <br>
--        {% endfor %}
--        <br>
--    </div>
--    </div>
--</div>
--
--{% endblock %}
--
-diff -ruN CNPROG/templates/user_preferences.html mikes/templates/user_preferences.html
---- CNPROG/templates/user_preferences.html	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/templates/user_preferences.html	2009-07-25 19:09:58.178152900 -0400
-@@ -1,11 +1,20 @@
--<!-- user_preferences.html -->
- {% extends "user.html" %}
- {% load extra_tags %}
- {% load humanize %}
- 
- {% block usercontent %}
-         <div style="padding:5px;">
--            <h1>Surprise will be here soon ;-)</h1>
-+        <fieldset>
-+            <legend><b>同步Twitter消息</b></legend>
-+            <form>
-+                <label for="name">账号:</label>
-+                <input id="name" /><br>
-+                <label for="password">密码:</label>
-+                <input id="password" type="password"/><br>
-+                <input id="cbMessage" type="checkbox" />发布我的提问到我的Twitter<br>
-+                <input id="cbReply" type="checkbox" />发布我的回答到我的Twitter<br>
-+                <input type="submit" value="保存" />
-+            </form>
-+        </fieldset>
-         </div>
- {% endblock %}
--<!-- end user_preferences.html -->
-diff -ruN CNPROG/urls.py mikes/urls.py
---- CNPROG/urls.py	2009-06-22 21:42:52.000000000 -0400
-+++ mikes/urls.py	2009-07-25 19:09:58.178152900 -0400
-@@ -60,4 +60,5 @@
-     url(r'^books/ask/(?P<short_name>[^/]+)/$', app.ask_book, name='ask_book'),
-     url(r'^books/(?P<short_name>[^/]+)/$', app.book, name='book'),
-     url(r'^search/$', app.search, name='search'),
-+    (r'^i18n/', include('django.conf.urls.i18n')),
- )
diff --git a/templates/allfiles b/templates/allfiles
deleted file mode 100644
index 3ca0191e..00000000
--- a/templates/allfiles
+++ /dev/null
@@ -1,30 +0,0 @@
-404.html
-500.html
-about.html
-ask.html
-badges.html
-base_content.html
-base.html
-book.html
-close.html
-faq.html
-footer.html
-header.html
-index.html
-logout.html
-pagesize.html
-paginator.html
-privacy.html
-question_edit_tips.html
-question.html
-questions.html
-revisions_answer.html
-tags.html
-unanswered.html
-user_edit.html
-user_info.html
-users.html
-users_questions.html
-user_stats.html
-user_tabs.html
-user_votes.html
diff --git a/templates/authopenid/htmlfiles b/templates/authopenid/htmlfiles
deleted file mode 100644
index 1b9dccd0..00000000
--- a/templates/authopenid/htmlfiles
+++ /dev/null
@@ -1,8 +0,0 @@
-changeemail.html
-changeopenid.html
-changepw.html
-delete.html
-failure.html
-sendpw.html
-settings.html
-signup.html
diff --git a/templates/okfiles b/templates/okfiles
deleted file mode 100644
index 3ca0191e..00000000
--- a/templates/okfiles
+++ /dev/null
@@ -1,30 +0,0 @@
-404.html
-500.html
-about.html
-ask.html
-badges.html
-base_content.html
-base.html
-book.html
-close.html
-faq.html
-footer.html
-header.html
-index.html
-logout.html
-pagesize.html
-paginator.html
-privacy.html
-question_edit_tips.html
-question.html
-questions.html
-revisions_answer.html
-tags.html
-unanswered.html
-user_edit.html
-user_info.html
-users.html
-users_questions.html
-user_stats.html
-user_tabs.html
-user_votes.html
diff --git a/templates/template.list b/templates/template.list
deleted file mode 100644
index d4d4ec2d..00000000
--- a/templates/template.list
+++ /dev/null
@@ -1,18 +0,0 @@
-close.html
-book.html
-base_content.html
-badges.html
-badge.html
-ask.html
-answer_edit_tips.html
-answer_edit.html
-about.html
-500.html
-404.html
-pagesize.html
-logout.html
-header.html
-footer.html
-faq.html
-base.html
-question.html
diff --git a/templates/tough/faq.html b/templates/tough/faq.html
deleted file mode 100644
index 9b43a9ca..00000000
--- a/templates/tough/faq.html
+++ /dev/null
@@ -1,110 +0,0 @@
-{% extends "base_content.html" %}
-{% load extra_tags %}
-{% load humanize %}
-{% block title %}{% spaceless %}FAQ{% endspaceless %}{% endblock %}
-{% block forejs %}
-{% endblock %}
-{% block content %}
-<div class="headNormal">
-    {% trans "Frequently Asked Questions " %}(FAQ)
-</div>
-<div id="main-body" style="width:100%">
-    
-    <h3 class="subtitle">{% trans "What kinds of questions can I ask here?" %}</h3>
-    <p>{% trans "Most importanly - questions should be <strong>relevant</strong> to this community." %}<br>
-	{% trans "Before asking the question - please make sure to use search to see whether your question has alredy been answered."%}<br>
-    </p><br>
-    
-        <h3 class="subtitle">{% trans "What questions should I avoid asking?" %}</h3>
-		<p>{% trans "Please avoid asking questions that are not relevant to this community, too subjective and argumentative." %}</p>
-    </p><br>
-    
-        <h3 class="subtitle">{% trans "What should I avoid in my answers?" %}</h3>
-        <p>{% trans "site title" %} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %} 
-    </p><br>
-    
-        <h3 class="subtitle">{% trans "Who moderates this community?" %}</h3>
-		<p>{% trans "The short answer is: <strong>you</strong>." %}<br>
-		{% trans "This website is moderated by the users." %}
-		{% trans "The reputation system allows users earn the authorization to perform a variety of moderation tasks." %}
-    </p><br>
-    
-        <h3 class="subtitle">{% trans "How does reputation system work?" %}</h3>
-		<p>{% trans "Anyone can ask questions and give answers, points are not necessary for that." %}<br>
-        {% trans "As we've said before, users help running this site. Point system helps select users who can administer this community."%}
-		{% trans "Reputation points roughly measure how community trusts you. These points are given to you directly by other members of the community." %}
-		</p>
-		<p>
-		 {% trans "For example, if you ask an interesting question or give a helpful answer, your input will be upvoted and you will gain more trust in the community." %}
-         {% trans "If on the other hand someone gives a misleading answer, the answer will be voted down and he/she loses some points." %}
-		 {% trans "Each vote in favor will generate <strong>10</strong> points, each vote against will subtract <strong>2</strong> points." trans %}
-		 {% trans "Through the votes of other people you can accumulate a maximum of <strong>200</strong> points." %}
-		 {% "After accumulating certain number of points, you can do more:" %}
-        <table style="font-family:arial;" cellspacing="3" cellpadding="3">
-            <tr>
-                <th width="40px" style="text-align:right"></th>
-                <th width="300px"></th>
-            </tr>
-	        <tr>
-                <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
-                <td>{% trans "upvote" %}</td>
-	        </tr>
-	        <tr>
-                <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
-                <td>{% trans "use tags" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>50</strong></td>
-                <td>{% trans "add comments" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>100</strong></td>
-                <td>{% trans "downvote" %}</td>
-	        </tr><tr>
-                <td style="text-align:right;padding-right:5px"><strong>250</strong></td>
-                <td>打开关闭自己的问题</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>500</strong></td>
-                <td>{% trans "retag questions" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>750</strong></td>
-                <td>{% trans "edit community wiki questions" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>2000</strong></td>
-                <td>{% trans "edit any answer" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>3000</strong></td>
-                <td>{% trans "open any closed question" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>5000</strong></td>
-                <td>{% trans "delete any comment" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>10000</strong></td>
-                <td>{% trans "delete any questions and answers and perform other moderation tasks" %}</td>
-	        </tr>
-
-        </table>
-        
-    </p><br>
-   
-        <h3 class="subtitle">{% trans "To register, do I need to create new password?"</h3>
-        <p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %}
-		<strong><a href="/account/signin">{% trans "Login now!" %}</a> »</strong>
-    </p><br>
-    
-        <h3 class="subtitle">{% trans "Why other people can edit my questions/answers?" %}</h3>
-    <p> {% trans "Goal of this site is..." %} {% trans "So questions and answers can be edited like wiki pages by experienced users of this site and this improves the overall quality of the knowledge base content." %}
-	{% trans "If this approach is not for you, we respect your choice." %}
-    </p><br>
-        <h3 class="subtitle">{% trans "Still have questions?" %}</h3>
-    <p>{% "Please ask your question, help make our community better!" %} <a href="/tags/faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
-    </p>
-    <br><br>
-</div>
-{% endblock %}
diff --git a/templates/tough/question_retag.html b/templates/tough/question_retag.html
deleted file mode 100644
index 105428f4..00000000
--- a/templates/tough/question_retag.html
+++ /dev/null
@@ -1,107 +0,0 @@
-{% extends "base.html" %}
-{% block title %}{% spaceless %}{% trans "Revise tags" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
-        <script type="text/javascript">
-        
-        $().ready(function(){
-            $("#nav_questions").attr('className',"on");
-            //Tags autocomplete action
-            var tags = {{ tags|safe }};
-        	$("#id_tags").autocomplete(tags, {
-                minChars: 1,
-        		matchContains: true,
-                max: 20,
-                multiple: true,
-                multipleSeparator: " ",
-        		formatItem: function(row, i, max) {
-        			return row.n + " ("+ row.c +")";
-        		},
-                formatResult: function(row, i, max){
-                    return row.n;
-                }
-                
-            });
-           
-             $("#fmretag").validate({
-                rules: {
-        			tags: {
-        				required: true,
-        				maxength: 105
-        			}
-        		},
-                messages: {
-        			tags: {
-                        required: ' ' + {% trans "tags are requried" %},
-                        maxlength: ' ' + {% trans "up to 5 tags, less than 20 characters each" %},
-                    }
-                }
-                
-            });
-            lanai.highlightSyntax();
-
-        });
-        </script>
-{% endblock %}
-        
-{% block content %}
-<div id="main-bar" class="headNormal">
-    {% trans "Change tags" %} [<a href="{{ question.get_absolute_url }}">{% trans "back" %}</a>]
-</div>
-<div id="main-body" class="ask-body">
-    <div id="askform">
-        <form id="fmretag" action="{% url edit_question question.id %}" method="post" >
-            <h3>
-                {{ question.get_question_title }}
-            </h3>
-            <div id="description" class="edit-content-html">
-                {{ question.html|safe }}
-            </div>
-           
-            
-            <div class="form-item">
-                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br>
-                {{ form.tags }}  {{ form.tags.errors }}
-                <div class="title-desc">
-                    {{ form.tags.help_text }}
-                </div>
-            </div>
-            <br>
-            
-            <div class="error" ></div>
-            <input type="submit" value="{% trans "Change now" %}" class="submit" />
-            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);" />
-            <br>
-            <br>
-        </form>
-    </div>
-</div>
-{% endblock %}
-
-{% block sidebar %}
-<div class="boxC">
-    <p class="subtitle">{% trans "Why use and modify tags?" %}</p>
-    <ul class="list-item">
-        
-        <li>
-            {% trans "site title" %} {% trans "uses tags for the classification of questions %}
-        </li>
-        <li>
-            修改完整问题需要用户的积分达到一定条件（比如：积分 >= 3000分，自己发布的问题除外），而用户积分达到比较低的时候，就可以修改问题的标签（比如：积分 >= 500, 这里指所有问题的标签）。
-
-        </li>
-        <li>
-			{% trans "tag editors receive special awards from the community" %}
-        </li>
-    </ul>
-    <a href="{% url faq %}" style="float:right;position:relative">faq »</a>
-    <br>  
-</div>
-
-{% endblock %}
-
-{% block endjs %}
-{% endblock %}
-
diff --git a/templates/tough/unanswered.html b/templates/tough/unanswered.html
deleted file mode 100644
index 94e778db..00000000
--- a/templates/tough/unanswered.html
+++ /dev/null
@@ -1,115 +0,0 @@
-{% extends "base.html" %}
-{% load extra_tags %}
-{% load humanize %}
-{% load extra_filters %}
-{% block title %}{% spaceless %}{% trans "Unanswered questions" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $("#nav_unanswered").attr('className',"on");
-        });
-         
-        </script>
-{% endblock %}
-{% block content %}
-<div class="tabBar">
-    <span class="headQuestions">{% trans "Unanswered questions" %}</span>
-    <div class="tabsA">
-        <a id="latest" href="?sort=latest" class="on" title="{% trans "most recently asked questions" %}>{% trans "newest" %}</a> 
-    </div>
-</div>
-
-<div id="listA">
-    {% for question in questions.object_list %}
-    <div class="qstA">
-        <h2><a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a></h2>
-        <div class="stat">
-            <table>
-	            <tr>
-                    <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
-                    <td><span class="num">{{ question.score|intcomma }}</span> </td>
-                    <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-	            </tr>  
-                <tr>
-                    <td><span class="unit">{% trans "answers" %}</span></td>
-                    <td><span class="unit">{% trans "votes" %}</span></td>
-                    <td><span class="unit">{% trans "views" %}</span></td>
-	            </tr> 
-            </table>
-        </div>
-        <div class="summary">
-            {{ question.summary }}...                
-        </div>
-    
-        {% ifequal tab_id 'active'%}
-        {% if question.wiki %}
-        <span class="from wiki">{% trans "community wiki" %}</span>
-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-        {% else %}
-        <div class="from">
-             {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
-            <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
-            <span class="score">{% get_score_badge question.last_activity_by %} </span>
-            <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
-        </div>
-        {% endif %}
-        {% else %}
-        {% if question.wiki %}
-        <span class="from wiki">{% trans "community wiki" %}</span>
-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-        {% else %}
-        <div class="from">
-             {% comment %}{% gravatar question.author 24 %}{% endcomment %}
-            <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
-            <span class="score">{% get_score_badge question.author %} </span>
-            <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-        </div>
-        {% endif %}
-        {% endifequal %}
-        
-        <div class="tags">
-        {% for tag in question.tagname_list %}
-        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
-        {% endfor %}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endblock %}
-
-{% block tail %}
-                        <div class="pager">
-                            {% cnprog_paginator context %}
-                            
-                        </div>
-                        <div class="pagesize">
-                            {% cnprog_pagesize context %}
-                        </div>
-{% endblock %}
-
-{% block sidebar %}
-<div class="boxC">
-    <p>
-		<!--todo: move this to blocktrans -->
-		{% tans "Have a total of" %}<br><div class="questions-count">{{ questions_count|intcomma }}</div>
-        <p>{% trans "number of <strong>unanswered</strong> questions" %}</p>
-        <p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>
-
-    </p>
-</div>
-<div class="boxC">
-	<h3 class="subtitle">{% trans "Related tags" %}</h3>
-    <div class="body">
-    <div class="tags">
-        {% for tag in tags %}
-            <a rel="tag" title="{% trans "see questions tagged"%}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
-            <span class="tag-number">× {{ tag.used_count|intcomma }}</span>
-            <br>
-        {% endfor %}
-        <br>
-    </div>
-    </div>
-</div>
-
-{% endblock %}
-
-- 
cgit v1.2.3-1-g7c22


From 20a7ce5657bf3d8683bdb4f9b860dbad044fb2f3 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 4 Aug 2009 23:25:57 -0400
Subject: included changes by Adolfo and Chaitanya and found temporary fix for
 languages

---
 INSTALL                                        |    2 +
 development.log                                |   21 +-
 forum/auth.py                                  |  886 +++++-----
 forum/feed.py                                  |   86 +-
 forum/forms.py                                 |  386 ++---
 forum/management/commands/once_award_badges.py |  696 ++++----
 forum/managers.py                              |  518 +++---
 forum/models.py                                | 1308 +++++++--------
 forum/templatetags/extra_filters.py            |  164 +-
 forum/templatetags/extra_tags.py               |  478 +++---
 forum/user.py                                  |  150 +-
 forum/views.py                                 |    2 +-
 locale/es/LC_MESSAGES/django.po                |    1 -
 locale/zh_CN/LC_MESSAGES/django.po             |   16 -
 manage.py                                      |   22 +-
 settings.py                                    |  199 +--
 templates/about.html                           |    2 +-
 templates/authopenid/signin.html               |    4 +-
 templates/authopenid/signup.html               |    1 +
 templates/content/js/com.cnprog.editor.js      |  134 +-
 templates/content/js/com.cnprog.post.js        | 1230 +++++++-------
 templates/content/js/jquery.ajaxfileupload.js  |  390 ++---
 templates/content/style/style.css              | 2088 ++++++++++++------------
 templates/faq.html                             |    2 +-
 templates/footer.html                          |   66 +-
 templates/header.html                          |  141 +-
 templates/privacy.html                         |    2 +-
 templates/tags.html                            |    2 +-
 templates/user.html                            |   66 +-
 templates/users.html                           |    2 +-
 urls.py                                        |  128 +-
 utils/cache.py                                 |  184 +--
 utils/html.py                                  |  102 +-
 utils/lists.py                                 |  172 +-
 34 files changed, 4824 insertions(+), 4827 deletions(-)

diff --git a/INSTALL b/INSTALL
index 59f2dd0b..35683147 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,6 +15,8 @@ Used for HTML sanitizer
 5. Markdown2
 http://code.google.com/p/python-markdown2/
 
+6. Django Debug Toolbar
+http://github.com/robhudson/django-debug-toolbar/tree/master
 
 INSTALL STEPS:
 -----------------------------------------------
diff --git a/development.log b/development.log
index 7ad467e0..6b96f8f5 100644
--- a/development.log
+++ b/development.log
@@ -1,27 +1,36 @@
 # development 
 
+==Aug 4 2009, Evgeny==
+===Changes===
+* commented out LocaleMiddleware - language can be now switched with settings.LANGUAGE_CODE
+* added DATABASE_ENGINE line to settings_local
+===Merges===
+* Adolfo's slugification of urls
+* Added Chaitanyas changes for traditional login/signup and INSTALL file
+
 ==July 26 2009, Evgeny==
 
 django_authopenid:
 considerably changed user interface
+[comment] - sorry - this is not done yet
 
 log/forum/forms.py:
-- added tag input validation using regex
-- fixed bug with date type mismatch near self.fields['birthday'] = 
+* added tag input validation using regex
+* fixed bug with date type mismatch near self.fields['birthday'] = 
   in EditUserForm.__init__()
 
 /forum/templatetags/extra_tags.py:
-- fixed date type mismatch in get_age()
+* fixed date type mismatch in get_age()
 
 /templates/content/js/com.cnprog.post.js:
-- fixed bug with post deletion/recovery
+* fixed bug with post deletion/recovery
 
 javascript:
-- changed to use of non-minified code - better for editing 
+* changed to use of non-minified code - better for editing 
 and debugging
 
 /templates/question.html:
-- fixed display of delete/undelete links
+* fixed display of delete/undelete links
 
 templates:
 added comments in the beginning/end of each template
diff --git a/forum/auth.py b/forum/auth.py
index 0608031a..4688a69a 100644
--- a/forum/auth.py
+++ b/forum/auth.py
@@ -1,443 +1,443 @@
-"""
-Authorisation related functions.
-
-The actions a User is authorised to perform are dependent on their reputation
-and superuser status.
-"""
-import datetime
-from django.contrib.contenttypes.models import ContentType
-from django.db import transaction
-from models import Repute
-from models import Question
-from models import Answer
-from const import TYPE_REPUTATION
-question_type = ContentType.objects.get_for_model(Question)
-answer_type = ContentType.objects.get_for_model(Answer)
-
-VOTE_UP                   = 15
-FLAG_OFFENSIVE            = 15
-POST_IMAGES               = 15
-LEAVE_COMMENTS            = 50
-UPLOAD_FILES              = 60
-VOTE_DOWN                 = 100
-CLOSE_OWN_QUESTIONS       = 250
-RETAG_OTHER_QUESTIONS     = 500
-REOPEN_OWN_QUESTIONS      = 500
-EDIT_COMMUNITY_WIKI_POSTS = 750
-EDIT_OTHER_POSTS          = 2000
-DELETE_COMMENTS           = 2000
-VIEW_OFFENSIVE_FLAGS      = 2000
-DISABLE_URL_NOFOLLOW      = 2000
-CLOSE_OTHER_QUESTIONS     = 3000
-LOCK_POSTS                = 4000
-
-VOTE_RULES = {
-    'scope_votes_per_user_per_day' : 30, # how many votes of one user has everyday
-    'scope_flags_per_user_per_day' : 5,  # how many times user can flag posts everyday
-    'scope_warn_votes_left' : 10,        # start when to warn user how many votes left
-    'scope_deny_unvote_days' : 1,        # if 1 days passed, user can't cancel votes.
-    'scope_flags_invisible_main_page' : 3, # post doesn't show on main page if has more than 3 offensive flags
-    'scope_flags_delete_post' : 5,         # post will be deleted if it has more than 5 offensive flags
-}
-
-REPUTATION_RULES = {
-    'initial_score'                       : 1,
-    'scope_per_day_by_upvotes'            : 200,
-    'gain_by_upvoted'                     : 10,
-    'gain_by_answer_accepted'             : 15,
-    'gain_by_accepting_answer'            : 2,
-    'gain_by_downvote_canceled'           : 2,
-    'gain_by_canceling_downvote'          : 1,
-    'lose_by_canceling_accepted_answer'   : -2,
-    'lose_by_accepted_answer_cancled'     : -15,
-    'lose_by_downvoted'                   : -2,
-    'lose_by_flagged'                     : -2,
-    'lose_by_downvoting'                  : -1,
-    'lose_by_flagged_lastrevision_3_times': -30,
-    'lose_by_flagged_lastrevision_5_times': -100,
-    'lose_by_upvote_canceled'             : -10,
-}
-
-def can_vote_up(user):
-    """Determines if a User can vote Questions and Answers up."""
-    return user.is_authenticated() and (
-        user.reputation >= VOTE_UP or
-        user.is_superuser)
-
-def can_flag_offensive(user):
-    """Determines if a User can flag Questions and Answers as offensive."""
-    return user.is_authenticated() and (
-        user.reputation >= FLAG_OFFENSIVE or
-        user.is_superuser)
-
-def can_add_comments(user):
-    """Determines if a User can add comments to Questions and Answers."""
-    return user.is_authenticated() and (
-        user.reputation >= LEAVE_COMMENTS or
-        user.is_superuser)
-
-def can_vote_down(user):
-    """Determines if a User can vote Questions and Answers down."""
-    return user.is_authenticated() and (
-        user.reputation >= VOTE_DOWN or
-        user.is_superuser)
-
-def can_retag_questions(user):
-    """Determines if a User can retag Questions."""
-    return user.is_authenticated() and (
-        RETAG_OTHER_QUESTIONS <= user.reputation < EDIT_OTHER_POSTS or
-        user.is_superuser)
-
-def can_edit_post(user, post):
-    """Determines if a User can edit the given Question or Answer."""
-    return user.is_authenticated() and (
-        user.id == post.author_id or
-        (post.wiki and user.reputation >= EDIT_COMMUNITY_WIKI_POSTS) or
-        user.reputation >= EDIT_OTHER_POSTS or
-        user.is_superuser)
-
-def can_delete_comment(user, comment):
-    """Determines if a User can delete the given Comment."""
-    return user.is_authenticated() and (
-        user.id == comment.user_id or
-        user.reputation >= DELETE_COMMENTS or
-        user.is_superuser)
-
-def can_view_offensive_flags(user):
-    """Determines if a User can view offensive flag counts."""
-    return user.is_authenticated() and (
-        user.reputation >= VIEW_OFFENSIVE_FLAGS or
-        user.is_superuser)
-
-def can_close_question(user, question):
-    """Determines if a User can close the given Question."""
-    return user.is_authenticated() and (
-        (user.id == question.author_id and
-         user.reputation >= CLOSE_OWN_QUESTIONS) or
-        user.reputation >= CLOSE_OTHER_QUESTIONS or
-        user.is_superuser)
-
-def can_lock_posts(user):
-    """Determines if a User can lock Questions or Answers."""
-    return user.is_authenticated() and (
-        user.reputation >= LOCK_POSTS or
-        user.is_superuser)
-
-def can_follow_url(user):
-    """Determines if the URL link can be followed by Google search engine."""
-    return user.reputation >= DISABLE_URL_NOFOLLOW
-
-def can_accept_answer(user, question, answer):
-    return (user.is_authenticated() and
-        question.author != answer.author and
-        question.author == user) or user.is_superuser
-
-# now only support to reopen own question except superuser
-def can_reopen_question(user, question):
-    return (user.is_authenticated() and
-        user.id == question.author_id and
-        user.reputation >= REOPEN_OWN_QUESTIONS) or user.is_superuser
-
-def can_delete_post(user, post):
-    return (user.is_authenticated() and
-        user.id == post.author_id) or user.is_superuser
-
-def can_view_deleted_post(user, post):
-    return user.is_superuser
-
-# user preferences view permissions
-def is_user_self(request_user, target_user):
-    return (request_user.is_authenticated() and request_user == target_user)
-    
-def can_view_user_votes(request_user, target_user):
-    return (request_user.is_authenticated() and request_user == target_user)
-
-def can_view_user_preferences(request_user, target_user):
-    return (request_user.is_authenticated() and request_user == target_user)
-
-def can_view_user_edit(request_user, target_user):
-    return (request_user.is_authenticated() and request_user == target_user)
-
-def can_upload_files(request_user):
-    return (request_user.is_authenticated() and request_user.reputation >= UPLOAD_FILES) or \
-           request_user.is_superuser
-
-###########################################
-## actions and reputation changes event
-###########################################
-def calculate_reputation(origin, offset):
-    result = int(origin) + int(offset)
-    return result if result > 0 else 1
-
-@transaction.commit_on_success
-def onFlaggedItem(item, post, user):
-
-    item.save()
-    post.offensive_flag_count = post.offensive_flag_count + 1
-    post.save()
-
-    post.author.reputation = calculate_reputation(post.author.reputation,
-                           int(REPUTATION_RULES['lose_by_flagged']))
-    post.author.save()
-
-    question = post
-    if ContentType.objects.get_for_model(post) == answer_type:
-        question = post.question
-
-    reputation = Repute(user=post.author,
-               negative=int(REPUTATION_RULES['lose_by_flagged']),
-               question=question, reputed_at=datetime.datetime.now(),
-               reputation_type=-4,
-               reputation=post.author.reputation)
-    reputation.save()
-
-    #todo: These should be updated to work on same revisions.
-    if post.offensive_flag_count ==  VOTE_RULES['scope_flags_invisible_main_page'] :
-        post.author.reputation = calculate_reputation(post.author.reputation,
-                               int(REPUTATION_RULES['lose_by_flagged_lastrevision_3_times']))
-        post.author.save()
-
-        reputation = Repute(user=post.author,
-                   negative=int(REPUTATION_RULES['lose_by_flagged_lastrevision_3_times']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=-6,
-                   reputation=post.author.reputation)
-        reputation.save()
-
-    elif post.offensive_flag_count == VOTE_RULES['scope_flags_delete_post']:
-        post.author.reputation = calculate_reputation(post.author.reputation,
-                               int(REPUTATION_RULES['lose_by_flagged_lastrevision_5_times']))
-        post.author.save()
-
-        reputation = Repute(user=post.author,
-                   negative=int(REPUTATION_RULES['lose_by_flagged_lastrevision_5_times']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=-7,
-                   reputation=post.author.reputation)
-        reputation.save()
-
-        post.deleted = True
-        #post.deleted_at = datetime.datetime.now()
-        #post.deleted_by = Admin
-        post.save()
-
-
-@transaction.commit_on_success
-def onAnswerAccept(answer, user):
-    answer.accepted = True
-    answer.accepted_at = datetime.datetime.now()
-    answer.question.answer_accepted = True
-    answer.save()
-    answer.question.save()
-
-    answer.author.reputation = calculate_reputation(answer.author.reputation,
-                             int(REPUTATION_RULES['gain_by_answer_accepted']))
-    answer.author.save()
-    reputation = Repute(user=answer.author,
-               positive=int(REPUTATION_RULES['gain_by_answer_accepted']),
-               question=answer.question,
-               reputed_at=datetime.datetime.now(),
-               reputation_type=2,
-               reputation=answer.author.reputation)
-    reputation.save()
-
-    user.reputation = calculate_reputation(user.reputation,
-                    int(REPUTATION_RULES['gain_by_accepting_answer']))
-    user.save()
-    reputation = Repute(user=user,
-               positive=int(REPUTATION_RULES['gain_by_accepting_answer']),
-               question=answer.question,
-               reputed_at=datetime.datetime.now(),
-               reputation_type=3,
-               reputation=user.reputation)
-    reputation.save()
-
-@transaction.commit_on_success
-def onAnswerAcceptCanceled(answer, user):
-    answer.accepted = False
-    answer.accepted_at = None
-    answer.question.answer_accepted = False
-    answer.save()
-    answer.question.save()
-
-    answer.author.reputation = calculate_reputation(answer.author.reputation,
-                             int(REPUTATION_RULES['lose_by_accepted_answer_cancled']))
-    answer.author.save()
-    reputation = Repute(user=answer.author,
-               negative=int(REPUTATION_RULES['lose_by_accepted_answer_cancled']),
-               question=answer.question,
-               reputed_at=datetime.datetime.now(),
-               reputation_type=-2,
-               reputation=answer.author.reputation)
-    reputation.save()
-
-    user.reputation = calculate_reputation(user.reputation,
-                    int(REPUTATION_RULES['lose_by_canceling_accepted_answer']))
-    user.save()
-    reputation = Repute(user=user,
-               negative=int(REPUTATION_RULES['lose_by_canceling_accepted_answer']),
-               question=answer.question,
-               reputed_at=datetime.datetime.now(),
-               reputation_type=-1,
-               reputation=user.reputation)
-    reputation.save()
-
-@transaction.commit_on_success
-def onUpVoted(vote, post, user):
-    vote.save()
-
-    post.vote_up_count = int(post.vote_up_count) + 1
-    post.score = int(post.score) + 1
-    post.save()
-
-    if not post.wiki:
-        author = post.author
-        if Repute.objects.get_reputation_by_upvoted_today(author) <  int(REPUTATION_RULES['scope_per_day_by_upvotes']):
-            author.reputation = calculate_reputation(author.reputation,
-                              int(REPUTATION_RULES['gain_by_upvoted']))
-            author.save()
-
-            question = post
-            if ContentType.objects.get_for_model(post) == answer_type:
-                question = post.question
-
-            reputation = Repute(user=author,
-                       positive=int(REPUTATION_RULES['gain_by_upvoted']),
-                       question=question,
-                       reputed_at=datetime.datetime.now(),
-                       reputation_type=1,
-                       reputation=author.reputation)
-            reputation.save()
-
-@transaction.commit_on_success
-def onUpVotedCanceled(vote, post, user):
-    vote.delete()
-
-    post.vote_up_count = int(post.vote_up_count) - 1
-    if post.vote_up_count < 0:
-        post.vote_up_count  = 0
-    post.score = int(post.score) - 1
-    post.save()
-
-    if not post.wiki:
-        author = post.author
-        author.reputation = calculate_reputation(author.reputation,
-                          int(REPUTATION_RULES['lose_by_upvote_canceled']))
-        author.save()
-
-        question = post
-        if ContentType.objects.get_for_model(post) == answer_type:
-            question = post.question
-
-        reputation = Repute(user=author,
-                   negative=int(REPUTATION_RULES['lose_by_upvote_canceled']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=-8,
-                   reputation=author.reputation)
-        reputation.save()
-
-@transaction.commit_on_success
-def onDownVoted(vote, post, user):
-    vote.save()
-
-    post.vote_down_count = int(post.vote_down_count) + 1
-    post.score = int(post.score) - 1
-    post.save()
-
-    if not post.wiki:
-        author = post.author
-        author.reputation = calculate_reputation(author.reputation,
-                          int(REPUTATION_RULES['lose_by_downvoted']))
-        author.save()
-
-        question = post
-        if ContentType.objects.get_for_model(post) == answer_type:
-            question = post.question
-
-        reputation = Repute(user=author,
-                   negative=int(REPUTATION_RULES['lose_by_downvoted']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=-3,
-                   reputation=author.reputation)
-        reputation.save()
-
-        user.reputation = calculate_reputation(user.reputation,
-                        int(REPUTATION_RULES['lose_by_downvoting']))
-        user.save()
-
-        reputation = Repute(user=user,
-                   negative=int(REPUTATION_RULES['lose_by_downvoting']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=-5,
-                   reputation=user.reputation)
-        reputation.save()
-
-@transaction.commit_on_success
-def onDownVotedCanceled(vote, post, user):
-    vote.delete()
-
-    post.vote_down_count = int(post.vote_down_count) - 1
-    if post.vote_down_count < 0:
-        post.vote_down_count  = 0
-    post.score = post.score + 1
-    post.save()
-
-    if not post.wiki:
-        author = post.author
-        author.reputation = calculate_reputation(author.reputation,
-                          int(REPUTATION_RULES['gain_by_downvote_canceled']))
-        author.save()
-
-        question = post
-        if ContentType.objects.get_for_model(post) == answer_type:
-            question = post.question
-
-        reputation = Repute(user=author,
-                   positive=int(REPUTATION_RULES['gain_by_downvote_canceled']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=4,
-                   reputation=author.reputation)
-        reputation.save()
-
-        user.reputation = calculate_reputation(user.reputation,
-                        int(REPUTATION_RULES['gain_by_canceling_downvote']))
-        user.save()
-
-        reputation = Repute(user=user,
-                   positive=int(REPUTATION_RULES['gain_by_canceling_downvote']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=5,
-                   reputation=user.reputation)
-        reputation.save()
-
-def onDeleteCanceled(post, user):
-    post.deleted = False
-    post.deleted_by = None
-    post.deleted_at = None
-    post.save()
-    for tag in list(post.tags.all()):
-        if tag.used_count == 1 and tag.deleted:
-            tag.deleted = False
-            tag.deleted_by = None
-            tag.deleted_at = None
-            tag.save()
-
-def onDeleted(post, user):
-    post.deleted = True
-    post.deleted_by = user
-    post.deleted_at = datetime.datetime.now()
-    post.save()
-
-    for tag in list(post.tags.all()):
-        if tag.used_count == 1:
-            tag.deleted = True
-            tag.deleted_by = user
-            tag.deleted_at = datetime.datetime.now()
-            tag.save()
+"""
+Authorisation related functions.
+
+The actions a User is authorised to perform are dependent on their reputation
+and superuser status.
+"""
+import datetime
+from django.contrib.contenttypes.models import ContentType
+from django.db import transaction
+from models import Repute
+from models import Question
+from models import Answer
+from const import TYPE_REPUTATION
+question_type = ContentType.objects.get_for_model(Question)
+answer_type = ContentType.objects.get_for_model(Answer)
+
+VOTE_UP                   = 15
+FLAG_OFFENSIVE            = 15
+POST_IMAGES               = 15
+LEAVE_COMMENTS            = 50
+UPLOAD_FILES              = 60
+VOTE_DOWN                 = 100
+CLOSE_OWN_QUESTIONS       = 250
+RETAG_OTHER_QUESTIONS     = 500
+REOPEN_OWN_QUESTIONS      = 500
+EDIT_COMMUNITY_WIKI_POSTS = 750
+EDIT_OTHER_POSTS          = 2000
+DELETE_COMMENTS           = 2000
+VIEW_OFFENSIVE_FLAGS      = 2000
+DISABLE_URL_NOFOLLOW      = 2000
+CLOSE_OTHER_QUESTIONS     = 3000
+LOCK_POSTS                = 4000
+
+VOTE_RULES = {
+    'scope_votes_per_user_per_day' : 30, # how many votes of one user has everyday
+    'scope_flags_per_user_per_day' : 5,  # how many times user can flag posts everyday
+    'scope_warn_votes_left' : 10,        # start when to warn user how many votes left
+    'scope_deny_unvote_days' : 1,        # if 1 days passed, user can't cancel votes.
+    'scope_flags_invisible_main_page' : 3, # post doesn't show on main page if has more than 3 offensive flags
+    'scope_flags_delete_post' : 5,         # post will be deleted if it has more than 5 offensive flags
+}
+
+REPUTATION_RULES = {
+    'initial_score'                       : 1,
+    'scope_per_day_by_upvotes'            : 200,
+    'gain_by_upvoted'                     : 10,
+    'gain_by_answer_accepted'             : 15,
+    'gain_by_accepting_answer'            : 2,
+    'gain_by_downvote_canceled'           : 2,
+    'gain_by_canceling_downvote'          : 1,
+    'lose_by_canceling_accepted_answer'   : -2,
+    'lose_by_accepted_answer_cancled'     : -15,
+    'lose_by_downvoted'                   : -2,
+    'lose_by_flagged'                     : -2,
+    'lose_by_downvoting'                  : -1,
+    'lose_by_flagged_lastrevision_3_times': -30,
+    'lose_by_flagged_lastrevision_5_times': -100,
+    'lose_by_upvote_canceled'             : -10,
+}
+
+def can_vote_up(user):
+    """Determines if a User can vote Questions and Answers up."""
+    return user.is_authenticated() and (
+        user.reputation >= VOTE_UP or
+        user.is_superuser)
+
+def can_flag_offensive(user):
+    """Determines if a User can flag Questions and Answers as offensive."""
+    return user.is_authenticated() and (
+        user.reputation >= FLAG_OFFENSIVE or
+        user.is_superuser)
+
+def can_add_comments(user):
+    """Determines if a User can add comments to Questions and Answers."""
+    return user.is_authenticated() and (
+        user.reputation >= LEAVE_COMMENTS or
+        user.is_superuser)
+
+def can_vote_down(user):
+    """Determines if a User can vote Questions and Answers down."""
+    return user.is_authenticated() and (
+        user.reputation >= VOTE_DOWN or
+        user.is_superuser)
+
+def can_retag_questions(user):
+    """Determines if a User can retag Questions."""
+    return user.is_authenticated() and (
+        RETAG_OTHER_QUESTIONS <= user.reputation < EDIT_OTHER_POSTS or
+        user.is_superuser)
+
+def can_edit_post(user, post):
+    """Determines if a User can edit the given Question or Answer."""
+    return user.is_authenticated() and (
+        user.id == post.author_id or
+        (post.wiki and user.reputation >= EDIT_COMMUNITY_WIKI_POSTS) or
+        user.reputation >= EDIT_OTHER_POSTS or
+        user.is_superuser)
+
+def can_delete_comment(user, comment):
+    """Determines if a User can delete the given Comment."""
+    return user.is_authenticated() and (
+        user.id == comment.user_id or
+        user.reputation >= DELETE_COMMENTS or
+        user.is_superuser)
+
+def can_view_offensive_flags(user):
+    """Determines if a User can view offensive flag counts."""
+    return user.is_authenticated() and (
+        user.reputation >= VIEW_OFFENSIVE_FLAGS or
+        user.is_superuser)
+
+def can_close_question(user, question):
+    """Determines if a User can close the given Question."""
+    return user.is_authenticated() and (
+        (user.id == question.author_id and
+         user.reputation >= CLOSE_OWN_QUESTIONS) or
+        user.reputation >= CLOSE_OTHER_QUESTIONS or
+        user.is_superuser)
+
+def can_lock_posts(user):
+    """Determines if a User can lock Questions or Answers."""
+    return user.is_authenticated() and (
+        user.reputation >= LOCK_POSTS or
+        user.is_superuser)
+
+def can_follow_url(user):
+    """Determines if the URL link can be followed by Google search engine."""
+    return user.reputation >= DISABLE_URL_NOFOLLOW
+
+def can_accept_answer(user, question, answer):
+    return (user.is_authenticated() and
+        question.author != answer.author and
+        question.author == user) or user.is_superuser
+
+# now only support to reopen own question except superuser
+def can_reopen_question(user, question):
+    return (user.is_authenticated() and
+        user.id == question.author_id and
+        user.reputation >= REOPEN_OWN_QUESTIONS) or user.is_superuser
+
+def can_delete_post(user, post):
+    return (user.is_authenticated() and
+        user.id == post.author_id) or user.is_superuser
+
+def can_view_deleted_post(user, post):
+    return user.is_superuser
+
+# user preferences view permissions
+def is_user_self(request_user, target_user):
+    return (request_user.is_authenticated() and request_user == target_user)
+    
+def can_view_user_votes(request_user, target_user):
+    return (request_user.is_authenticated() and request_user == target_user)
+
+def can_view_user_preferences(request_user, target_user):
+    return (request_user.is_authenticated() and request_user == target_user)
+
+def can_view_user_edit(request_user, target_user):
+    return (request_user.is_authenticated() and request_user == target_user)
+
+def can_upload_files(request_user):
+    return (request_user.is_authenticated() and request_user.reputation >= UPLOAD_FILES) or \
+           request_user.is_superuser
+
+###########################################
+## actions and reputation changes event
+###########################################
+def calculate_reputation(origin, offset):
+    result = int(origin) + int(offset)
+    return result if result > 0 else 1
+
+@transaction.commit_on_success
+def onFlaggedItem(item, post, user):
+
+    item.save()
+    post.offensive_flag_count = post.offensive_flag_count + 1
+    post.save()
+
+    post.author.reputation = calculate_reputation(post.author.reputation,
+                           int(REPUTATION_RULES['lose_by_flagged']))
+    post.author.save()
+
+    question = post
+    if ContentType.objects.get_for_model(post) == answer_type:
+        question = post.question
+
+    reputation = Repute(user=post.author,
+               negative=int(REPUTATION_RULES['lose_by_flagged']),
+               question=question, reputed_at=datetime.datetime.now(),
+               reputation_type=-4,
+               reputation=post.author.reputation)
+    reputation.save()
+
+    #todo: These should be updated to work on same revisions.
+    if post.offensive_flag_count ==  VOTE_RULES['scope_flags_invisible_main_page'] :
+        post.author.reputation = calculate_reputation(post.author.reputation,
+                               int(REPUTATION_RULES['lose_by_flagged_lastrevision_3_times']))
+        post.author.save()
+
+        reputation = Repute(user=post.author,
+                   negative=int(REPUTATION_RULES['lose_by_flagged_lastrevision_3_times']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=-6,
+                   reputation=post.author.reputation)
+        reputation.save()
+
+    elif post.offensive_flag_count == VOTE_RULES['scope_flags_delete_post']:
+        post.author.reputation = calculate_reputation(post.author.reputation,
+                               int(REPUTATION_RULES['lose_by_flagged_lastrevision_5_times']))
+        post.author.save()
+
+        reputation = Repute(user=post.author,
+                   negative=int(REPUTATION_RULES['lose_by_flagged_lastrevision_5_times']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=-7,
+                   reputation=post.author.reputation)
+        reputation.save()
+
+        post.deleted = True
+        #post.deleted_at = datetime.datetime.now()
+        #post.deleted_by = Admin
+        post.save()
+
+
+@transaction.commit_on_success
+def onAnswerAccept(answer, user):
+    answer.accepted = True
+    answer.accepted_at = datetime.datetime.now()
+    answer.question.answer_accepted = True
+    answer.save()
+    answer.question.save()
+
+    answer.author.reputation = calculate_reputation(answer.author.reputation,
+                             int(REPUTATION_RULES['gain_by_answer_accepted']))
+    answer.author.save()
+    reputation = Repute(user=answer.author,
+               positive=int(REPUTATION_RULES['gain_by_answer_accepted']),
+               question=answer.question,
+               reputed_at=datetime.datetime.now(),
+               reputation_type=2,
+               reputation=answer.author.reputation)
+    reputation.save()
+
+    user.reputation = calculate_reputation(user.reputation,
+                    int(REPUTATION_RULES['gain_by_accepting_answer']))
+    user.save()
+    reputation = Repute(user=user,
+               positive=int(REPUTATION_RULES['gain_by_accepting_answer']),
+               question=answer.question,
+               reputed_at=datetime.datetime.now(),
+               reputation_type=3,
+               reputation=user.reputation)
+    reputation.save()
+
+@transaction.commit_on_success
+def onAnswerAcceptCanceled(answer, user):
+    answer.accepted = False
+    answer.accepted_at = None
+    answer.question.answer_accepted = False
+    answer.save()
+    answer.question.save()
+
+    answer.author.reputation = calculate_reputation(answer.author.reputation,
+                             int(REPUTATION_RULES['lose_by_accepted_answer_cancled']))
+    answer.author.save()
+    reputation = Repute(user=answer.author,
+               negative=int(REPUTATION_RULES['lose_by_accepted_answer_cancled']),
+               question=answer.question,
+               reputed_at=datetime.datetime.now(),
+               reputation_type=-2,
+               reputation=answer.author.reputation)
+    reputation.save()
+
+    user.reputation = calculate_reputation(user.reputation,
+                    int(REPUTATION_RULES['lose_by_canceling_accepted_answer']))
+    user.save()
+    reputation = Repute(user=user,
+               negative=int(REPUTATION_RULES['lose_by_canceling_accepted_answer']),
+               question=answer.question,
+               reputed_at=datetime.datetime.now(),
+               reputation_type=-1,
+               reputation=user.reputation)
+    reputation.save()
+
+@transaction.commit_on_success
+def onUpVoted(vote, post, user):
+    vote.save()
+
+    post.vote_up_count = int(post.vote_up_count) + 1
+    post.score = int(post.score) + 1
+    post.save()
+
+    if not post.wiki:
+        author = post.author
+        if Repute.objects.get_reputation_by_upvoted_today(author) <  int(REPUTATION_RULES['scope_per_day_by_upvotes']):
+            author.reputation = calculate_reputation(author.reputation,
+                              int(REPUTATION_RULES['gain_by_upvoted']))
+            author.save()
+
+            question = post
+            if ContentType.objects.get_for_model(post) == answer_type:
+                question = post.question
+
+            reputation = Repute(user=author,
+                       positive=int(REPUTATION_RULES['gain_by_upvoted']),
+                       question=question,
+                       reputed_at=datetime.datetime.now(),
+                       reputation_type=1,
+                       reputation=author.reputation)
+            reputation.save()
+
+@transaction.commit_on_success
+def onUpVotedCanceled(vote, post, user):
+    vote.delete()
+
+    post.vote_up_count = int(post.vote_up_count) - 1
+    if post.vote_up_count < 0:
+        post.vote_up_count  = 0
+    post.score = int(post.score) - 1
+    post.save()
+
+    if not post.wiki:
+        author = post.author
+        author.reputation = calculate_reputation(author.reputation,
+                          int(REPUTATION_RULES['lose_by_upvote_canceled']))
+        author.save()
+
+        question = post
+        if ContentType.objects.get_for_model(post) == answer_type:
+            question = post.question
+
+        reputation = Repute(user=author,
+                   negative=int(REPUTATION_RULES['lose_by_upvote_canceled']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=-8,
+                   reputation=author.reputation)
+        reputation.save()
+
+@transaction.commit_on_success
+def onDownVoted(vote, post, user):
+    vote.save()
+
+    post.vote_down_count = int(post.vote_down_count) + 1
+    post.score = int(post.score) - 1
+    post.save()
+
+    if not post.wiki:
+        author = post.author
+        author.reputation = calculate_reputation(author.reputation,
+                          int(REPUTATION_RULES['lose_by_downvoted']))
+        author.save()
+
+        question = post
+        if ContentType.objects.get_for_model(post) == answer_type:
+            question = post.question
+
+        reputation = Repute(user=author,
+                   negative=int(REPUTATION_RULES['lose_by_downvoted']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=-3,
+                   reputation=author.reputation)
+        reputation.save()
+
+        user.reputation = calculate_reputation(user.reputation,
+                        int(REPUTATION_RULES['lose_by_downvoting']))
+        user.save()
+
+        reputation = Repute(user=user,
+                   negative=int(REPUTATION_RULES['lose_by_downvoting']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=-5,
+                   reputation=user.reputation)
+        reputation.save()
+
+@transaction.commit_on_success
+def onDownVotedCanceled(vote, post, user):
+    vote.delete()
+
+    post.vote_down_count = int(post.vote_down_count) - 1
+    if post.vote_down_count < 0:
+        post.vote_down_count  = 0
+    post.score = post.score + 1
+    post.save()
+
+    if not post.wiki:
+        author = post.author
+        author.reputation = calculate_reputation(author.reputation,
+                          int(REPUTATION_RULES['gain_by_downvote_canceled']))
+        author.save()
+
+        question = post
+        if ContentType.objects.get_for_model(post) == answer_type:
+            question = post.question
+
+        reputation = Repute(user=author,
+                   positive=int(REPUTATION_RULES['gain_by_downvote_canceled']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=4,
+                   reputation=author.reputation)
+        reputation.save()
+
+        user.reputation = calculate_reputation(user.reputation,
+                        int(REPUTATION_RULES['gain_by_canceling_downvote']))
+        user.save()
+
+        reputation = Repute(user=user,
+                   positive=int(REPUTATION_RULES['gain_by_canceling_downvote']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=5,
+                   reputation=user.reputation)
+        reputation.save()
+
+def onDeleteCanceled(post, user):
+    post.deleted = False
+    post.deleted_by = None
+    post.deleted_at = None
+    post.save()
+    for tag in list(post.tags.all()):
+        if tag.used_count == 1 and tag.deleted:
+            tag.deleted = False
+            tag.deleted_by = None
+            tag.deleted_at = None
+            tag.save()
+
+def onDeleted(post, user):
+    post.deleted = True
+    post.deleted_by = user
+    post.deleted_at = datetime.datetime.now()
+    post.save()
+
+    for tag in list(post.tags.all()):
+        if tag.used_count == 1:
+            tag.deleted = True
+            tag.deleted_by = user
+            tag.deleted_at = datetime.datetime.now()
+            tag.save()
diff --git a/forum/feed.py b/forum/feed.py
index a4218630..6374ba71 100644
--- a/forum/feed.py
+++ b/forum/feed.py
@@ -1,43 +1,43 @@
-#!/usr/bin/env python
-#encoding:utf-8
-#-------------------------------------------------------------------------------
-# Name:        Syndication feed class for subsribtion
-# Purpose:
-#
-# Author:      Mike
-#
-# Created:     29/01/2009
-# Copyright:   (c) CNPROG.COM 2009
-# Licence:     GPL V2
-#-------------------------------------------------------------------------------
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
-from django.utils.translation import ugettext as _
-from models import Question
-class RssLastestQuestionsFeed(Feed):
-    title = _('site title') + _(' - ') + _('site slogan') + _(' - ')+ _('latest questions')
-	#EDIT!!!
-    link = 'http://where.com/questions/'
-    description = _('meta site content')
-    #ttl = 10
-    copyright = _('copyright message')
-
-    def item_link(self, item):
-        return '/questions/%s/' % item.id
-
-    def item_author_name(self, item):
-        return item.author.username
-
-    def item_author_link(self, item):
-        return item.author.get_profile_url()
-
-    def item_pubdate(self, item):
-        return item.added_at
-
-    def items(self, item):
-       return Question.objects.filter(deleted=False).order_by('-added_at')[:30]
-
-def main():
-    pass
-
-if __name__ == '__main__':
-    main()
+#!/usr/bin/env python
+#encoding:utf-8
+#-------------------------------------------------------------------------------
+# Name:        Syndication feed class for subsribtion
+# Purpose:
+#
+# Author:      Mike
+#
+# Created:     29/01/2009
+# Copyright:   (c) CNPROG.COM 2009
+# Licence:     GPL V2
+#-------------------------------------------------------------------------------
+from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.utils.translation import ugettext as _
+from models import Question
+class RssLastestQuestionsFeed(Feed):
+    title = _('site title') + _(' - ') + _('site slogan') + _(' - ')+ _('latest questions')
+	#EDIT!!!
+    link = 'http://where.com/questions/'
+    description = _('meta site content')
+    #ttl = 10
+    copyright = _('copyright message')
+
+    def item_link(self, item):
+        return '/questions/%s/' % item.id
+
+    def item_author_name(self, item):
+        return item.author.username
+
+    def item_author_link(self, item):
+        return item.author.get_profile_url()
+
+    def item_pubdate(self, item):
+        return item.added_at
+
+    def items(self, item):
+       return Question.objects.filter(deleted=False).order_by('-added_at')[:30]
+
+def main():
+    pass
+
+if __name__ == '__main__':
+    main()
diff --git a/forum/forms.py b/forum/forms.py
index 1b811ad9..9d866720 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -1,193 +1,193 @@
-import re
-from datetime import date
-from django import forms
-from models import *
-from const import *
-from django.utils.translation import ugettext as _
-
-class TitleField(forms.CharField):
-    def __init__(self, *args, **kwargs):
-        super(TitleField, self).__init__(*args, **kwargs)
-        self.required = True
-        self.widget = forms.TextInput(attrs={'size' : 70, 'autocomplete' : 'off'})
-        self.max_length = 255
-        self.label  = _('title')
-        self.help_text = _('please enter a descriptive title for your question')
-        self.initial = ''
-
-    def clean(self, value):
-        if len(value) < 10:
-            raise forms.ValidationError(_('title must be > 10 characters'))
-
-        return value
-
-class EditorField(forms.CharField):
-    def __init__(self, *args, **kwargs):
-        super(EditorField, self).__init__(*args, **kwargs)
-        self.required = True
-        self.widget = forms.Textarea(attrs={'id':'editor'})
-        self.label  = _('content')
-        self.help_text = u''
-        self.initial = ''
-
-    def clean(self, value):
-        if len(value) < 10:
-            raise forms.ValidationError(_('question content must be > 10 characters'))
-
-        return value
-
-class TagNamesField(forms.CharField):
-    def __init__(self, *args, **kwargs):
-        super(TagNamesField, self).__init__(*args, **kwargs)
-        self.required = True
-        self.widget = forms.TextInput(attrs={'size' : 50, 'autocomplete' : 'off'})
-        self.max_length = 255
-        self.label  = _('tags')
-        self.help_text = _('please use space to separate tags (this enables autocomplete feature)')
-        self.initial = ''
-
-	def clean(self, value):
-		value = super(TagNamesField, self).clean(value)
-		data = value.strip()
-		if len(data) < 1:
-			raise forms.ValidationError(_('tags are required'))
-		list = data.split(' ')
-		list_temp = []
-		if len(list) > 5:
-			raise forms.ValidationError(_('please use 5 tags or less'))
-		for tag in list:
-			if len(tag) > 20:
-				raise forms.ValidationError(_('tags must be shorter than 20 characters'))
-			#take tag regex from settings
-			tagname_re = re.compile(r'[a-z0-9]+')
-			if not tagname_re.match(tag):
-				raise forms.ValidationError(_('please use following characters in tags: letters \'a-z\', numbers, and characters \'.-_#\''))
-			# only keep one same tag
-			if tag not in list_temp and len(tag.strip()) > 0:
-				list_temp.append(tag)
-		return u' '.join(list_temp)
-
-class WikiField(forms.BooleanField):
-    def __init__(self, *args, **kwargs):
-        super(WikiField, self).__init__(*args, **kwargs)
-        self.required = False
-        self.label  = _('community wiki')
-        self.help_text = _('if you choose community wiki option, the question and answer do not generate points and name of author will not be shown')
-
-
-class SummaryField(forms.CharField):
-    def __init__(self, *args, **kwargs):
-        super(SummaryField, self).__init__(*args, **kwargs)
-        self.required = False
-        self.widget = forms.TextInput(attrs={'size' : 50, 'autocomplete' : 'off'})
-        self.max_length = 300
-        self.label  = _('update summary:')
-        self.help_text = _('enter a brief summary of your revision (e.g. fixed spelling, grammar, improved style, this field is optional)')
-
-class AskForm(forms.Form):
-    title  = TitleField()
-    text   = EditorField()
-    tags   = TagNamesField()
-    wiki = WikiField()
-
-    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))
-    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-
-
-
-class AnswerForm(forms.Form):
-    text   = EditorField()
-    wiki   = WikiField()
-    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))
-    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    def __init__(self, question, *args, **kwargs):
-        super(AnswerForm, self).__init__(*args, **kwargs)
-        if question.wiki:
-            self.fields['wiki'].initial = True
-
-class CloseForm(forms.Form):
-    reason = forms.ChoiceField(choices=CLOSE_REASONS)
-
-class RetagQuestionForm(forms.Form):
-    tags   = TagNamesField()
-    # initialize the default values
-    def __init__(self, question, *args, **kwargs):
-        super(RetagQuestionForm, self).__init__(*args, **kwargs)
-        self.fields['tags'].initial = question.tagnames
-
-class RevisionForm(forms.Form):
-    """
-    Lists revisions of a Question or Answer
-    """
-    revision = forms.ChoiceField(widget=forms.Select(attrs={'style' : 'width:520px'}))
-
-    def __init__(self, post, latest_revision, *args, **kwargs):
-        super(RevisionForm, self).__init__(*args, **kwargs)
-        revisions = post.revisions.all().values_list(
-            'revision', 'author__username', 'revised_at', 'summary')
-        date_format = '%c'
-        self.fields['revision'].choices = [
-            (r[0], u'%s - %s (%s) %s' % (r[0], r[1], r[2].strftime(date_format), r[3]))
-            for r in revisions]
-        self.fields['revision'].initial = latest_revision.revision
-
-class EditQuestionForm(forms.Form):
-    title  = TitleField()
-    text   = EditorField()
-    tags   = TagNamesField()
-    summary = SummaryField()
-
-    def __init__(self, question, revision, *args, **kwargs):
-        super(EditQuestionForm, self).__init__(*args, **kwargs)
-        self.fields['title'].initial = revision.title
-        self.fields['text'].initial = revision.text
-        self.fields['tags'].initial = revision.tagnames
-        # Once wiki mode is enabled, it can't be disabled
-        if not question.wiki:
-            self.fields['wiki'] = WikiField()
-
-class EditAnswerForm(forms.Form):
-    text = EditorField()
-    summary = SummaryField()
-
-    def __init__(self, answer, revision, *args, **kwargs):
-        super(EditAnswerForm, self).__init__(*args, **kwargs)
-        self.fields['text'].initial = revision.text
-
-class EditUserForm(forms.Form):
-    email = forms.EmailField(label=u'Email', help_text=_('this email does not have to be linked to gravatar'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    realname = forms.CharField(label=_('Real name'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    website = forms.URLField(label=_('Website'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    city = forms.CharField(label=_('Location'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    birthday = forms.DateField(label=_('Date of birth'), help_text=_('will not be shown, used to calculate age, format: YYYY-MM-DD'), required=False, widget=forms.TextInput(attrs={'size' : 35}))
-    about = forms.CharField(label=_('Profile'), required=False, widget=forms.Textarea(attrs={'cols' : 60}))
-
-    def __init__(self, user, *args, **kwargs):
-        super(EditUserForm, self).__init__(*args, **kwargs)
-        self.fields['email'].initial = user.email
-        self.fields['realname'].initial = user.real_name
-        self.fields['website'].initial = user.website
-        self.fields['city'].initial = user.location
-
-        if user.date_of_birth is not None:
-            self.fields['birthday'].initial = user.date_of_birth
-        else:
-            self.fields['birthday'].initial = '1990-01-01'
-        self.fields['about'].initial = user.about
-        self.user = user
-
-    def clean_email(self):
-        """For security reason one unique email in database"""
-        if self.user.email != self.cleaned_data['email']:
-            if 'email' in self.cleaned_data:
-                try:
-                    user = User.objects.get(email = self.cleaned_data['email'])
-                except User.DoesNotExist:
-                    return self.cleaned_data['email']
-                except User.MultipleObjectsReturned:
-                    raise forms.ValidationError(_('this email has already been registered, please use another one'))
-                raise forms.ValidationError(_('this email has already been registered, please use another one'))
-        else:
-            return self.cleaned_data['email']
+import re
+from datetime import date
+from django import forms
+from models import *
+from const import *
+from django.utils.translation import ugettext as _
+
+class TitleField(forms.CharField):
+    def __init__(self, *args, **kwargs):
+        super(TitleField, self).__init__(*args, **kwargs)
+        self.required = True
+        self.widget = forms.TextInput(attrs={'size' : 70, 'autocomplete' : 'off'})
+        self.max_length = 255
+        self.label  = _('title')
+        self.help_text = _('please enter a descriptive title for your question')
+        self.initial = ''
+
+    def clean(self, value):
+        if len(value) < 10:
+            raise forms.ValidationError(_('title must be > 10 characters'))
+
+        return value
+
+class EditorField(forms.CharField):
+    def __init__(self, *args, **kwargs):
+        super(EditorField, self).__init__(*args, **kwargs)
+        self.required = True
+        self.widget = forms.Textarea(attrs={'id':'editor'})
+        self.label  = _('content')
+        self.help_text = u''
+        self.initial = ''
+
+    def clean(self, value):
+        if len(value) < 10:
+            raise forms.ValidationError(_('question content must be > 10 characters'))
+
+        return value
+
+class TagNamesField(forms.CharField):
+    def __init__(self, *args, **kwargs):
+        super(TagNamesField, self).__init__(*args, **kwargs)
+        self.required = True
+        self.widget = forms.TextInput(attrs={'size' : 50, 'autocomplete' : 'off'})
+        self.max_length = 255
+        self.label  = _('tags')
+        self.help_text = _('please use space to separate tags (this enables autocomplete feature)')
+        self.initial = ''
+
+	def clean(self, value):
+		value = super(TagNamesField, self).clean(value)
+		data = value.strip()
+		if len(data) < 1:
+			raise forms.ValidationError(_('tags are required'))
+		list = data.split(' ')
+		list_temp = []
+		if len(list) > 5:
+			raise forms.ValidationError(_('please use 5 tags or less'))
+		for tag in list:
+			if len(tag) > 20:
+				raise forms.ValidationError(_('tags must be shorter than 20 characters'))
+			#take tag regex from settings
+			tagname_re = re.compile(r'[a-z0-9]+')
+			if not tagname_re.match(tag):
+				raise forms.ValidationError(_('please use following characters in tags: letters \'a-z\', numbers, and characters \'.-_#\''))
+			# only keep one same tag
+			if tag not in list_temp and len(tag.strip()) > 0:
+				list_temp.append(tag)
+		return u' '.join(list_temp)
+
+class WikiField(forms.BooleanField):
+    def __init__(self, *args, **kwargs):
+        super(WikiField, self).__init__(*args, **kwargs)
+        self.required = False
+        self.label  = _('community wiki')
+        self.help_text = _('if you choose community wiki option, the question and answer do not generate points and name of author will not be shown')
+
+
+class SummaryField(forms.CharField):
+    def __init__(self, *args, **kwargs):
+        super(SummaryField, self).__init__(*args, **kwargs)
+        self.required = False
+        self.widget = forms.TextInput(attrs={'size' : 50, 'autocomplete' : 'off'})
+        self.max_length = 300
+        self.label  = _('update summary:')
+        self.help_text = _('enter a brief summary of your revision (e.g. fixed spelling, grammar, improved style, this field is optional)')
+
+class AskForm(forms.Form):
+    title  = TitleField()
+    text   = EditorField()
+    tags   = TagNamesField()
+    wiki = WikiField()
+
+    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))
+    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+
+
+
+class AnswerForm(forms.Form):
+    text   = EditorField()
+    wiki   = WikiField()
+    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))
+    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    def __init__(self, question, *args, **kwargs):
+        super(AnswerForm, self).__init__(*args, **kwargs)
+        if question.wiki:
+            self.fields['wiki'].initial = True
+
+class CloseForm(forms.Form):
+    reason = forms.ChoiceField(choices=CLOSE_REASONS)
+
+class RetagQuestionForm(forms.Form):
+    tags   = TagNamesField()
+    # initialize the default values
+    def __init__(self, question, *args, **kwargs):
+        super(RetagQuestionForm, self).__init__(*args, **kwargs)
+        self.fields['tags'].initial = question.tagnames
+
+class RevisionForm(forms.Form):
+    """
+    Lists revisions of a Question or Answer
+    """
+    revision = forms.ChoiceField(widget=forms.Select(attrs={'style' : 'width:520px'}))
+
+    def __init__(self, post, latest_revision, *args, **kwargs):
+        super(RevisionForm, self).__init__(*args, **kwargs)
+        revisions = post.revisions.all().values_list(
+            'revision', 'author__username', 'revised_at', 'summary')
+        date_format = '%c'
+        self.fields['revision'].choices = [
+            (r[0], u'%s - %s (%s) %s' % (r[0], r[1], r[2].strftime(date_format), r[3]))
+            for r in revisions]
+        self.fields['revision'].initial = latest_revision.revision
+
+class EditQuestionForm(forms.Form):
+    title  = TitleField()
+    text   = EditorField()
+    tags   = TagNamesField()
+    summary = SummaryField()
+
+    def __init__(self, question, revision, *args, **kwargs):
+        super(EditQuestionForm, self).__init__(*args, **kwargs)
+        self.fields['title'].initial = revision.title
+        self.fields['text'].initial = revision.text
+        self.fields['tags'].initial = revision.tagnames
+        # Once wiki mode is enabled, it can't be disabled
+        if not question.wiki:
+            self.fields['wiki'] = WikiField()
+
+class EditAnswerForm(forms.Form):
+    text = EditorField()
+    summary = SummaryField()
+
+    def __init__(self, answer, revision, *args, **kwargs):
+        super(EditAnswerForm, self).__init__(*args, **kwargs)
+        self.fields['text'].initial = revision.text
+
+class EditUserForm(forms.Form):
+    email = forms.EmailField(label=u'Email', help_text=_('this email does not have to be linked to gravatar'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    realname = forms.CharField(label=_('Real name'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    website = forms.URLField(label=_('Website'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    city = forms.CharField(label=_('Location'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    birthday = forms.DateField(label=_('Date of birth'), help_text=_('will not be shown, used to calculate age, format: YYYY-MM-DD'), required=False, widget=forms.TextInput(attrs={'size' : 35}))
+    about = forms.CharField(label=_('Profile'), required=False, widget=forms.Textarea(attrs={'cols' : 60}))
+
+    def __init__(self, user, *args, **kwargs):
+        super(EditUserForm, self).__init__(*args, **kwargs)
+        self.fields['email'].initial = user.email
+        self.fields['realname'].initial = user.real_name
+        self.fields['website'].initial = user.website
+        self.fields['city'].initial = user.location
+
+        if user.date_of_birth is not None:
+            self.fields['birthday'].initial = user.date_of_birth
+        else:
+            self.fields['birthday'].initial = '1990-01-01'
+        self.fields['about'].initial = user.about
+        self.user = user
+
+    def clean_email(self):
+        """For security reason one unique email in database"""
+        if self.user.email != self.cleaned_data['email']:
+            if 'email' in self.cleaned_data:
+                try:
+                    user = User.objects.get(email = self.cleaned_data['email'])
+                except User.DoesNotExist:
+                    return self.cleaned_data['email']
+                except User.MultipleObjectsReturned:
+                    raise forms.ValidationError(_('this email has already been registered, please use another one'))
+                raise forms.ValidationError(_('this email has already been registered, please use another one'))
+        else:
+            return self.cleaned_data['email']
diff --git a/forum/management/commands/once_award_badges.py b/forum/management/commands/once_award_badges.py
index 7074e3db..447e8971 100644
--- a/forum/management/commands/once_award_badges.py
+++ b/forum/management/commands/once_award_badges.py
@@ -1,348 +1,348 @@
-#!/usr/bin/env python
-#encoding:utf-8
-#-------------------------------------------------------------------------------
-# Name:        Award badges command
-# Purpose:     This is a command file croning in background process regularly to
-#              query database and award badges for user's special acitivities.
-#
-# Author:      Mike, Sailing
-#
-# Created:     18/01/2009
-# Copyright:   (c) Mike 2009
-# Licence:     GPL V2
-#-------------------------------------------------------------------------------
-
-from django.db import connection
-from django.shortcuts import get_object_or_404
-from django.contrib.contenttypes.models import ContentType
-
-from forum.models import *
-from forum.const import *
-from base_command import BaseCommand
-"""
-(1, '炼狱法师', 3, '炼狱法师', '删除自己有3个以上赞成票的帖子', 1, 0),
-(2, '压力白领', 3, '压力白领', '删除自己有3个以上反对票的帖子', 1, 0),
-(3, '优秀回答', 3, '优秀回答', '回答好评10次以上', 1, 0),
-(4, '优秀问题', 3, '优秀问题', '问题好评10次以上', 1, 0),
-(5, '评论家', 3, '评论家', '评论10次以上', 0, 0),
-(6, '流行问题', 3, '流行问题', '问题的浏览量超过1000人次', 1, 0),
-(7, '巡逻兵', 3, '巡逻兵', '第一次标记垃圾帖子', 0, 0),
-(8, '清洁工', 3, '清洁工', '第一次撤销投票', 0, 0),
-(9, '批评家', 3, '批评家', '第一次反对票', 0, 0),
-(10, '小编', 3, '小编', '第一次编辑更新', 0, 0),
-(11, '村长', 3, '村长', '第一次重新标签', 0, 0),
-(12, '学者', 3, '学者', '第一次标记答案', 0, 0),
-(13, '学生', 3, '学生', '第一次提问并且有一次以上赞成票', 0, 0),
-(14, '支持者', 3, '支持者', '第一次赞成票', 0, 0),
-(15, '教师', 3, '教师', '第一次回答问题并且得到一个以上赞成票', 0, 0),
-(16, '自传作者', 3, '自传作者', '完整填写用户资料所有选项', 0, 0),
-(17, '自学成才', 3, '自学成才', '回答自己的问题并且有3个以上赞成票', 1, 0),
-(18, '最有价值回答', 1, '最有价值回答', '回答超过100次赞成票', 1, 0),
-(19, '最有价值问题', 1, '最有价值问题', '问题超过100次赞成票', 1, 0),
-(20, '万人迷', 1, '万人迷', '问题被100人以上收藏', 1, 0),
-(21, '著名问题', 1, '著名问题', '问题的浏览量超过10000人次', 1, 0),
-(22, 'alpha用户', 2, 'alpha用户', '内测期间的活跃用户', 0, 0),
-(23, '极好回答', 2, '极好回答', '回答超过25次赞成票', 1, 0),
-(24, '极好问题', 2, '极好问题', '问题超过25次赞成票', 1, 0),
-(25, '受欢迎问题', 2, '受欢迎问题', '问题被25人以上收藏', 1, 0),
-(26, '优秀市民', 2, '优秀市民', '投票300次以上', 0, 0),
-(27, '编辑主任', 2, '编辑主任', '编辑了100个帖子', 0, 0),
-(28, '通才', 2, '通才', '在多个标签领域活跃', 0, 0),
-(29, '专家', 2, '专家', '在一个标签领域活跃出众', 0, 0),
-(30, '老鸟', 2, '老鸟', '活跃超过一年的用户', 0, 0),
-(31, '最受关注问题', 2, '最受关注问题', '问题的浏览量超过2500人次', 1, 0),
-(32, '学问家', 2, '学问家', '第一次回答被投赞成票10次以上', 0, 0),
-(33, 'beta用户', 2, 'beta用户', 'beta期间活跃参与', 0, 0),
-(34, '导师', 2, '导师', '被指定为最佳答案并且赞成票40以上', 1, 0),
-(35, '巫师', 2, '巫师', '在提问60天之后回答并且赞成票5次以上', 1, 0),
-(36, '分类专家', 2, '分类专家', '创建的标签被50个以上问题使用', 1, 0);
-
-
-TYPE_ACTIVITY_ASK_QUESTION=1
-TYPE_ACTIVITY_ANSWER=2
-TYPE_ACTIVITY_COMMENT_QUESTION=3
-TYPE_ACTIVITY_COMMENT_ANSWER=4
-TYPE_ACTIVITY_UPDATE_QUESTION=5
-TYPE_ACTIVITY_UPDATE_ANSWER=6
-TYPE_ACTIVITY_PRIZE=7
-TYPE_ACTIVITY_MARK_ANSWER=8
-TYPE_ACTIVITY_VOTE_UP=9
-TYPE_ACTIVITY_VOTE_DOWN=10
-TYPE_ACTIVITY_CANCEL_VOTE=11
-TYPE_ACTIVITY_DELETE_QUESTION=12
-TYPE_ACTIVITY_DELETE_ANSWER=13
-TYPE_ACTIVITY_MARK_OFFENSIVE=14
-TYPE_ACTIVITY_UPDATE_TAGS=15
-TYPE_ACTIVITY_FAVORITE=16
-TYPE_ACTIVITY_USER_FULL_UPDATED = 17
-"""
-
-BADGE_AWARD_TYPE_FIRST = {
-    TYPE_ACTIVITY_MARK_OFFENSIVE : 7,
-    TYPE_ACTIVITY_CANCEL_VOTE: 8,
-    TYPE_ACTIVITY_VOTE_DOWN : 9,
-    TYPE_ACTIVITY_UPDATE_QUESTION : 10,
-    TYPE_ACTIVITY_UPDATE_ANSWER : 10,
-    TYPE_ACTIVITY_UPDATE_TAGS : 11,
-    TYPE_ACTIVITY_MARK_ANSWER : 12,
-    TYPE_ACTIVITY_VOTE_UP : 14,
-    TYPE_ACTIVITY_USER_FULL_UPDATED: 16
-
-}
-
-class Command(BaseCommand):
-    def handle_noargs(self, **options):
-        try:
-            self.alpha_user()
-            self.beta_user()
-            self.first_type_award()
-            self.first_ask_be_voted()
-            self.first_answer_be_voted()
-            self.first_answer_be_voted_10()
-            self.vote_count_300()
-            self.edit_count_100()
-            self.comment_count_10()
-        except Exception, e:
-            print e
-        finally:
-            connection.close()
-
-    def alpha_user(self):
-        """
-        Before Jan 25, 2009(Chinese New Year Eve and enter into Beta for CNProg), every registered user
-        will be awarded the "Alpha" badge if he has any activities.
-        """
-        alpha_end_date = date(2009, 1, 25)
-        if date.today() < alpha_end_date:
-            badge = get_object_or_404(Badge, id=22)
-            for user in User.objects.all():
-                award = Award.objects.filter(user=user, badge=badge)
-                if award and not badge.multiple:
-                    continue
-                activities = Activity.objects.filter(user=user)
-                if len(activities) > 0:
-                    new_award = Award(user=user, badge=badge)
-                    new_award.save()
-
-    def beta_user(self):
-        """
-        Before Feb 25, 2009, every registered user
-        will be awarded the "Beta" badge if he has any activities.
-        """
-        beta_end_date = date(2009, 2, 25)
-        if date.today() < beta_end_date:
-            badge = get_object_or_404(Badge, id=33)
-            for user in User.objects.all():
-                award = Award.objects.filter(user=user, badge=badge)
-                if award and not badge.multiple:
-                    continue
-                activities = Activity.objects.filter(user=user)
-                if len(activities) > 0:
-                    new_award = Award(user=user, badge=badge)
-                    new_award.save()
-
-    def first_type_award(self):
-        """
-        This will award below badges for users first behaviors:
-
-        (7, '巡逻兵', 3, '巡逻兵', '第一次标记垃圾帖子', 0, 0),
-        (8, '清洁工', 3, '清洁工', '第一次撤销投票', 0, 0),
-        (9, '批评家', 3, '批评家', '第一次反对票', 0, 0),
-        (10, '小编', 3, '小编', '第一次编辑更新', 0, 0),
-        (11, '村长', 3, '村长', '第一次重新标签', 0, 0),
-        (12, '学者', 3, '学者', '第一次标记答案', 0, 0),
-        (14, '支持者', 3, '支持者', '第一次赞成票', 0, 0),
-        (16, '自传作者', 3, '自传作者', '完整填写用户资料所有选项', 0, 0),
-        """
-        activity_types = ','.join('%s' % item for item in BADGE_AWARD_TYPE_FIRST.keys())
-        # ORDER BY user_id, activity_type
-        query = "SELECT id, user_id, activity_type, content_type_id, object_id FROM activity WHERE is_auditted = 0 AND activity_type IN (%s) ORDER BY user_id, activity_type" % activity_types
-
-        cursor = connection.cursor()
-        try:
-            cursor.execute(query)
-            rows = cursor.fetchall()
-            # collect activity_id in current process
-            activity_ids = []
-            last_user_id = 0
-            last_activity_type = 0
-            for row in rows:
-                activity_ids.append(row[0])
-                user_id = row[1]
-                activity_type = row[2]
-                content_type_id = row[3]
-                object_id = row[4]
-
-                # if the user and activity are same as the last, continue
-                if user_id == last_user_id and activity_type == last_activity_type:
-                    continue;
-
-                user = get_object_or_404(User, id=user_id)
-                badge = get_object_or_404(Badge, id=BADGE_AWARD_TYPE_FIRST[activity_type])
-                content_type = get_object_or_404(ContentType, id=content_type_id)
-
-                count = Award.objects.filter(user=user, badge=badge).count()
-                if count and not badge.multiple:
-                    continue
-                else:
-                    # new award
-                    award = Award(user=user, badge=badge, content_type=content_type, object_id=object_id)
-                    award.save()
-
-                # set the current user_id and activity_type to last
-                last_user_id = user_id
-                last_activity_type = activity_type
-
-            # update processed rows to auditted
-            self.update_activities_auditted(cursor, activity_ids)
-        finally:
-            cursor.close()
-
-    def first_ask_be_voted(self):
-        """
-        For user asked question and got first upvote, we award him following badge:
-
-        (13, '学生', 3, '学生', '第一次提问并且有一次以上赞成票', 0, 0),
-        """
-        query = "SELECT act.user_id, q.vote_up_count, act.object_id FROM " \
-                    "activity act, question q WHERE act.activity_type = %s AND " \
-                    "act.object_id = q.id AND " \
-                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ASK_QUESTION, 13)
-        cursor = connection.cursor()
-        try:
-            cursor.execute(query)
-            rows = cursor.fetchall()
-
-            badge = get_object_or_404(Badge, id=13)
-            content_type = ContentType.objects.get_for_model(Question)
-            awarded_users = []
-            for row in rows:
-                user_id = row[0]
-                vote_up_count = row[1]
-                object_id = row[2]
-                if vote_up_count > 0 and user_id not in awarded_users:
-                    user = get_object_or_404(User, id=user_id)
-                    award = Award(user=user, badge=badge, content_type=content_type, object_id=object_id)
-                    award.save()
-                    awarded_users.append(user_id)
-        finally:
-            cursor.close()
-
-    def first_answer_be_voted(self):
-        """
-        When user answerd questions and got first upvote, we award him following badge:
-
-        (15, '教师', 3, '教师', '第一次回答问题并且得到一个以上赞成票', 0, 0),
-        """
-        query = "SELECT act.user_id, a.vote_up_count, act.object_id FROM " \
-                    "activity act, answer a WHERE act.activity_type = %s AND " \
-                    "act.object_id = a.id AND " \
-                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 15)
-        cursor = connection.cursor()
-        try:
-            cursor.execute(query)
-            rows = cursor.fetchall()
-
-            awarded_users = []
-            badge = get_object_or_404(Badge, id=15)
-            content_type = ContentType.objects.get_for_model(Answer)
-            for row in rows:
-                user_id = row[0]
-                vote_up_count = row[1]
-                object_id = row[2]
-                if vote_up_count > 0 and user_id not in awarded_users:
-                    user = get_object_or_404(User, id=user_id)
-                    award = Award(user=user, badge=badge, content_type=content_type, object_id=object_id)
-                    award.save()
-                    awarded_users.append(user_id)
-        finally:
-            cursor.close()
-
-    def first_answer_be_voted_10(self):
-        """
-        (32, '学问家', 2, '学问家', '第一次回答被投赞成票10次以上', 0, 0)
-        """
-        query = "SELECT act.user_id, act.object_id FROM " \
-                    "activity act, answer a WHERE act.object_id = a.id AND " \
-                    "act.activity_type = %s AND " \
-                    "a.vote_up_count >= 10 AND " \
-                    "act.user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 32)
-        cursor = connection.cursor()
-        try:
-            cursor.execute(query)
-            rows = cursor.fetchall()
-
-            awarded_users = []
-            badge = get_object_or_404(Badge, id=32)
-            content_type = ContentType.objects.get_for_model(Answer)
-            for row in rows:
-                user_id = row[0]
-                if user_id not in awarded_users:
-                    user = get_object_or_404(User, id=user_id)
-                    object_id = row[1]
-                    award = Award(user=user, badge=badge, content_type=content_type, object_id=object_id)
-                    award.save()
-                    awarded_users.append(user_id)
-        finally:
-            cursor.close()
-
-    def vote_count_300(self):
-        """
-        (26, '优秀市民', 2, '优秀市民', '投票300次以上', 0, 0)
-        """
-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE " \
-                    "activity_type = %s OR " \
-                    "activity_type = %s AND " \
-                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) " \
-                    "GROUP BY user_id HAVING vote_count >= 300" % (TYPE_ACTIVITY_VOTE_UP, TYPE_ACTIVITY_VOTE_DOWN, 26)
-
-        self.__award_for_count_num(query, 26)
-
-    def edit_count_100(self):
-        """
-        (27, '编辑主任', 2, '编辑主任', '编辑了100个帖子', 0, 0)
-        """
-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE " \
-                    "activity_type = %s OR " \
-                    "activity_type = %s AND " \
-                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) " \
-                    "GROUP BY user_id HAVING vote_count >= 100" % (TYPE_ACTIVITY_UPDATE_QUESTION, TYPE_ACTIVITY_UPDATE_ANSWER, 27)
-
-        self.__award_for_count_num(query, 27)
-
-    def comment_count_10(self):
-        """
-        (5, '评论家', 3, '评论家', '评论10次以上', 0, 0),
-        """
-        query = "SELECT count(*) vote_count, user_id FROM activity WHERE " \
-                    "activity_type = %s OR " \
-                    "activity_type = %s AND " \
-                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) " \
-                    "GROUP BY user_id HAVING vote_count >= 10" % (TYPE_ACTIVITY_COMMENT_QUESTION, TYPE_ACTIVITY_COMMENT_ANSWER, 5)
-        self.__award_for_count_num(query, 5)
-
-    def __award_for_count_num(self, query, badge):
-        cursor = connection.cursor()
-        try:
-            cursor.execute(query)
-            rows = cursor.fetchall()
-
-            awarded_users = []
-            badge = get_object_or_404(Badge, id=badge)
-            for row in rows:
-                vote_count = row[0]
-                user_id = row[1]
-
-                if user_id not in awarded_users:
-                    user = get_object_or_404(User, id=user_id)
-                    award = Award(user=user, badge=badge)
-                    award.save()
-                    awarded_users.append(user_id)
-        finally:
-            cursor.close()
-
-def main():
-    pass
-
-if __name__ == '__main__':
-    main()
+#!/usr/bin/env python
+#encoding:utf-8
+#-------------------------------------------------------------------------------
+# Name:        Award badges command
+# Purpose:     This is a command file croning in background process regularly to
+#              query database and award badges for user's special acitivities.
+#
+# Author:      Mike, Sailing
+#
+# Created:     18/01/2009
+# Copyright:   (c) Mike 2009
+# Licence:     GPL V2
+#-------------------------------------------------------------------------------
+
+from django.db import connection
+from django.shortcuts import get_object_or_404
+from django.contrib.contenttypes.models import ContentType
+
+from forum.models import *
+from forum.const import *
+from base_command import BaseCommand
+"""
+(1, '炼狱法师', 3, '炼狱法师', '删除自己有3个以上赞成票的帖子', 1, 0),
+(2, '压力白领', 3, '压力白领', '删除自己有3个以上反对票的帖子', 1, 0),
+(3, '优秀回答', 3, '优秀回答', '回答好评10次以上', 1, 0),
+(4, '优秀问题', 3, '优秀问题', '问题好评10次以上', 1, 0),
+(5, '评论家', 3, '评论家', '评论10次以上', 0, 0),
+(6, '流行问题', 3, '流行问题', '问题的浏览量超过1000人次', 1, 0),
+(7, '巡逻兵', 3, '巡逻兵', '第一次标记垃圾帖子', 0, 0),
+(8, '清洁工', 3, '清洁工', '第一次撤销投票', 0, 0),
+(9, '批评家', 3, '批评家', '第一次反对票', 0, 0),
+(10, '小编', 3, '小编', '第一次编辑更新', 0, 0),
+(11, '村长', 3, '村长', '第一次重新标签', 0, 0),
+(12, '学者', 3, '学者', '第一次标记答案', 0, 0),
+(13, '学生', 3, '学生', '第一次提问并且有一次以上赞成票', 0, 0),
+(14, '支持者', 3, '支持者', '第一次赞成票', 0, 0),
+(15, '教师', 3, '教师', '第一次回答问题并且得到一个以上赞成票', 0, 0),
+(16, '自传作者', 3, '自传作者', '完整填写用户资料所有选项', 0, 0),
+(17, '自学成才', 3, '自学成才', '回答自己的问题并且有3个以上赞成票', 1, 0),
+(18, '最有价值回答', 1, '最有价值回答', '回答超过100次赞成票', 1, 0),
+(19, '最有价值问题', 1, '最有价值问题', '问题超过100次赞成票', 1, 0),
+(20, '万人迷', 1, '万人迷', '问题被100人以上收藏', 1, 0),
+(21, '著名问题', 1, '著名问题', '问题的浏览量超过10000人次', 1, 0),
+(22, 'alpha用户', 2, 'alpha用户', '内测期间的活跃用户', 0, 0),
+(23, '极好回答', 2, '极好回答', '回答超过25次赞成票', 1, 0),
+(24, '极好问题', 2, '极好问题', '问题超过25次赞成票', 1, 0),
+(25, '受欢迎问题', 2, '受欢迎问题', '问题被25人以上收藏', 1, 0),
+(26, '优秀市民', 2, '优秀市民', '投票300次以上', 0, 0),
+(27, '编辑主任', 2, '编辑主任', '编辑了100个帖子', 0, 0),
+(28, '通才', 2, '通才', '在多个标签领域活跃', 0, 0),
+(29, '专家', 2, '专家', '在一个标签领域活跃出众', 0, 0),
+(30, '老鸟', 2, '老鸟', '活跃超过一年的用户', 0, 0),
+(31, '最受关注问题', 2, '最受关注问题', '问题的浏览量超过2500人次', 1, 0),
+(32, '学问家', 2, '学问家', '第一次回答被投赞成票10次以上', 0, 0),
+(33, 'beta用户', 2, 'beta用户', 'beta期间活跃参与', 0, 0),
+(34, '导师', 2, '导师', '被指定为最佳答案并且赞成票40以上', 1, 0),
+(35, '巫师', 2, '巫师', '在提问60天之后回答并且赞成票5次以上', 1, 0),
+(36, '分类专家', 2, '分类专家', '创建的标签被50个以上问题使用', 1, 0);
+
+
+TYPE_ACTIVITY_ASK_QUESTION=1
+TYPE_ACTIVITY_ANSWER=2
+TYPE_ACTIVITY_COMMENT_QUESTION=3
+TYPE_ACTIVITY_COMMENT_ANSWER=4
+TYPE_ACTIVITY_UPDATE_QUESTION=5
+TYPE_ACTIVITY_UPDATE_ANSWER=6
+TYPE_ACTIVITY_PRIZE=7
+TYPE_ACTIVITY_MARK_ANSWER=8
+TYPE_ACTIVITY_VOTE_UP=9
+TYPE_ACTIVITY_VOTE_DOWN=10
+TYPE_ACTIVITY_CANCEL_VOTE=11
+TYPE_ACTIVITY_DELETE_QUESTION=12
+TYPE_ACTIVITY_DELETE_ANSWER=13
+TYPE_ACTIVITY_MARK_OFFENSIVE=14
+TYPE_ACTIVITY_UPDATE_TAGS=15
+TYPE_ACTIVITY_FAVORITE=16
+TYPE_ACTIVITY_USER_FULL_UPDATED = 17
+"""
+
+BADGE_AWARD_TYPE_FIRST = {
+    TYPE_ACTIVITY_MARK_OFFENSIVE : 7,
+    TYPE_ACTIVITY_CANCEL_VOTE: 8,
+    TYPE_ACTIVITY_VOTE_DOWN : 9,
+    TYPE_ACTIVITY_UPDATE_QUESTION : 10,
+    TYPE_ACTIVITY_UPDATE_ANSWER : 10,
+    TYPE_ACTIVITY_UPDATE_TAGS : 11,
+    TYPE_ACTIVITY_MARK_ANSWER : 12,
+    TYPE_ACTIVITY_VOTE_UP : 14,
+    TYPE_ACTIVITY_USER_FULL_UPDATED: 16
+
+}
+
+class Command(BaseCommand):
+    def handle_noargs(self, **options):
+        try:
+            self.alpha_user()
+            self.beta_user()
+            self.first_type_award()
+            self.first_ask_be_voted()
+            self.first_answer_be_voted()
+            self.first_answer_be_voted_10()
+            self.vote_count_300()
+            self.edit_count_100()
+            self.comment_count_10()
+        except Exception, e:
+            print e
+        finally:
+            connection.close()
+
+    def alpha_user(self):
+        """
+        Before Jan 25, 2009(Chinese New Year Eve and enter into Beta for CNProg), every registered user
+        will be awarded the "Alpha" badge if he has any activities.
+        """
+        alpha_end_date = date(2009, 1, 25)
+        if date.today() < alpha_end_date:
+            badge = get_object_or_404(Badge, id=22)
+            for user in User.objects.all():
+                award = Award.objects.filter(user=user, badge=badge)
+                if award and not badge.multiple:
+                    continue
+                activities = Activity.objects.filter(user=user)
+                if len(activities) > 0:
+                    new_award = Award(user=user, badge=badge)
+                    new_award.save()
+
+    def beta_user(self):
+        """
+        Before Feb 25, 2009, every registered user
+        will be awarded the "Beta" badge if he has any activities.
+        """
+        beta_end_date = date(2009, 2, 25)
+        if date.today() < beta_end_date:
+            badge = get_object_or_404(Badge, id=33)
+            for user in User.objects.all():
+                award = Award.objects.filter(user=user, badge=badge)
+                if award and not badge.multiple:
+                    continue
+                activities = Activity.objects.filter(user=user)
+                if len(activities) > 0:
+                    new_award = Award(user=user, badge=badge)
+                    new_award.save()
+
+    def first_type_award(self):
+        """
+        This will award below badges for users first behaviors:
+
+        (7, '巡逻兵', 3, '巡逻兵', '第一次标记垃圾帖子', 0, 0),
+        (8, '清洁工', 3, '清洁工', '第一次撤销投票', 0, 0),
+        (9, '批评家', 3, '批评家', '第一次反对票', 0, 0),
+        (10, '小编', 3, '小编', '第一次编辑更新', 0, 0),
+        (11, '村长', 3, '村长', '第一次重新标签', 0, 0),
+        (12, '学者', 3, '学者', '第一次标记答案', 0, 0),
+        (14, '支持者', 3, '支持者', '第一次赞成票', 0, 0),
+        (16, '自传作者', 3, '自传作者', '完整填写用户资料所有选项', 0, 0),
+        """
+        activity_types = ','.join('%s' % item for item in BADGE_AWARD_TYPE_FIRST.keys())
+        # ORDER BY user_id, activity_type
+        query = "SELECT id, user_id, activity_type, content_type_id, object_id FROM activity WHERE is_auditted = 0 AND activity_type IN (%s) ORDER BY user_id, activity_type" % activity_types
+
+        cursor = connection.cursor()
+        try:
+            cursor.execute(query)
+            rows = cursor.fetchall()
+            # collect activity_id in current process
+            activity_ids = []
+            last_user_id = 0
+            last_activity_type = 0
+            for row in rows:
+                activity_ids.append(row[0])
+                user_id = row[1]
+                activity_type = row[2]
+                content_type_id = row[3]
+                object_id = row[4]
+
+                # if the user and activity are same as the last, continue
+                if user_id == last_user_id and activity_type == last_activity_type:
+                    continue;
+
+                user = get_object_or_404(User, id=user_id)
+                badge = get_object_or_404(Badge, id=BADGE_AWARD_TYPE_FIRST[activity_type])
+                content_type = get_object_or_404(ContentType, id=content_type_id)
+
+                count = Award.objects.filter(user=user, badge=badge).count()
+                if count and not badge.multiple:
+                    continue
+                else:
+                    # new award
+                    award = Award(user=user, badge=badge, content_type=content_type, object_id=object_id)
+                    award.save()
+
+                # set the current user_id and activity_type to last
+                last_user_id = user_id
+                last_activity_type = activity_type
+
+            # update processed rows to auditted
+            self.update_activities_auditted(cursor, activity_ids)
+        finally:
+            cursor.close()
+
+    def first_ask_be_voted(self):
+        """
+        For user asked question and got first upvote, we award him following badge:
+
+        (13, '学生', 3, '学生', '第一次提问并且有一次以上赞成票', 0, 0),
+        """
+        query = "SELECT act.user_id, q.vote_up_count, act.object_id FROM " \
+                    "activity act, question q WHERE act.activity_type = %s AND " \
+                    "act.object_id = q.id AND " \
+                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ASK_QUESTION, 13)
+        cursor = connection.cursor()
+        try:
+            cursor.execute(query)
+            rows = cursor.fetchall()
+
+            badge = get_object_or_404(Badge, id=13)
+            content_type = ContentType.objects.get_for_model(Question)
+            awarded_users = []
+            for row in rows:
+                user_id = row[0]
+                vote_up_count = row[1]
+                object_id = row[2]
+                if vote_up_count > 0 and user_id not in awarded_users:
+                    user = get_object_or_404(User, id=user_id)
+                    award = Award(user=user, badge=badge, content_type=content_type, object_id=object_id)
+                    award.save()
+                    awarded_users.append(user_id)
+        finally:
+            cursor.close()
+
+    def first_answer_be_voted(self):
+        """
+        When user answerd questions and got first upvote, we award him following badge:
+
+        (15, '教师', 3, '教师', '第一次回答问题并且得到一个以上赞成票', 0, 0),
+        """
+        query = "SELECT act.user_id, a.vote_up_count, act.object_id FROM " \
+                    "activity act, answer a WHERE act.activity_type = %s AND " \
+                    "act.object_id = a.id AND " \
+                    "act.user_id NOT IN (SELECT distinct user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 15)
+        cursor = connection.cursor()
+        try:
+            cursor.execute(query)
+            rows = cursor.fetchall()
+
+            awarded_users = []
+            badge = get_object_or_404(Badge, id=15)
+            content_type = ContentType.objects.get_for_model(Answer)
+            for row in rows:
+                user_id = row[0]
+                vote_up_count = row[1]
+                object_id = row[2]
+                if vote_up_count > 0 and user_id not in awarded_users:
+                    user = get_object_or_404(User, id=user_id)
+                    award = Award(user=user, badge=badge, content_type=content_type, object_id=object_id)
+                    award.save()
+                    awarded_users.append(user_id)
+        finally:
+            cursor.close()
+
+    def first_answer_be_voted_10(self):
+        """
+        (32, '学问家', 2, '学问家', '第一次回答被投赞成票10次以上', 0, 0)
+        """
+        query = "SELECT act.user_id, act.object_id FROM " \
+                    "activity act, answer a WHERE act.object_id = a.id AND " \
+                    "act.activity_type = %s AND " \
+                    "a.vote_up_count >= 10 AND " \
+                    "act.user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s)" % (TYPE_ACTIVITY_ANSWER, 32)
+        cursor = connection.cursor()
+        try:
+            cursor.execute(query)
+            rows = cursor.fetchall()
+
+            awarded_users = []
+            badge = get_object_or_404(Badge, id=32)
+            content_type = ContentType.objects.get_for_model(Answer)
+            for row in rows:
+                user_id = row[0]
+                if user_id not in awarded_users:
+                    user = get_object_or_404(User, id=user_id)
+                    object_id = row[1]
+                    award = Award(user=user, badge=badge, content_type=content_type, object_id=object_id)
+                    award.save()
+                    awarded_users.append(user_id)
+        finally:
+            cursor.close()
+
+    def vote_count_300(self):
+        """
+        (26, '优秀市民', 2, '优秀市民', '投票300次以上', 0, 0)
+        """
+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE " \
+                    "activity_type = %s OR " \
+                    "activity_type = %s AND " \
+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) " \
+                    "GROUP BY user_id HAVING vote_count >= 300" % (TYPE_ACTIVITY_VOTE_UP, TYPE_ACTIVITY_VOTE_DOWN, 26)
+
+        self.__award_for_count_num(query, 26)
+
+    def edit_count_100(self):
+        """
+        (27, '编辑主任', 2, '编辑主任', '编辑了100个帖子', 0, 0)
+        """
+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE " \
+                    "activity_type = %s OR " \
+                    "activity_type = %s AND " \
+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) " \
+                    "GROUP BY user_id HAVING vote_count >= 100" % (TYPE_ACTIVITY_UPDATE_QUESTION, TYPE_ACTIVITY_UPDATE_ANSWER, 27)
+
+        self.__award_for_count_num(query, 27)
+
+    def comment_count_10(self):
+        """
+        (5, '评论家', 3, '评论家', '评论10次以上', 0, 0),
+        """
+        query = "SELECT count(*) vote_count, user_id FROM activity WHERE " \
+                    "activity_type = %s OR " \
+                    "activity_type = %s AND " \
+                    "user_id NOT IN (SELECT user_id FROM award WHERE badge_id = %s) " \
+                    "GROUP BY user_id HAVING vote_count >= 10" % (TYPE_ACTIVITY_COMMENT_QUESTION, TYPE_ACTIVITY_COMMENT_ANSWER, 5)
+        self.__award_for_count_num(query, 5)
+
+    def __award_for_count_num(self, query, badge):
+        cursor = connection.cursor()
+        try:
+            cursor.execute(query)
+            rows = cursor.fetchall()
+
+            awarded_users = []
+            badge = get_object_or_404(Badge, id=badge)
+            for row in rows:
+                vote_count = row[0]
+                user_id = row[1]
+
+                if user_id not in awarded_users:
+                    user = get_object_or_404(User, id=user_id)
+                    award = Award(user=user, badge=badge)
+                    award.save()
+                    awarded_users.append(user_id)
+        finally:
+            cursor.close()
+
+def main():
+    pass
+
+if __name__ == '__main__':
+    main()
diff --git a/forum/managers.py b/forum/managers.py
index 0f22c59c..2e3e4186 100644
--- a/forum/managers.py
+++ b/forum/managers.py
@@ -1,259 +1,259 @@
-import datetime
-import logging
-from django.contrib.auth.models import User, UserManager
-from django.db import connection, models, transaction
-from django.db.models import Q
-from forum.models import *
-from urllib import quote, unquote
-
-class QuestionManager(models.Manager):
-    def get_translation_questions(self, orderby, page_size):
-        questions = self.filter(deleted=False, author__id__in=[28,29]).order_by(orderby)[:page_size]
-        return questions
-    
-    def get_questions_by_pagesize(self, orderby, page_size):
-        questions = self.filter(deleted=False).order_by(orderby)[:page_size]
-        return questions
-    
-    def get_questions_by_tag(self, tagname, orderby):
-        questions = self.filter(deleted=False, tags__name = unquote(tagname)).order_by(orderby)
-        return questions
-    
-    def get_unanswered_questions(self, orderby):
-        questions = self.filter(deleted=False, answer_count=0).order_by(orderby)
-        return questions
-    
-    def get_questions(self, orderby):
-        questions = self.filter(deleted=False).order_by(orderby)
-        return questions
-    
-    def update_tags(self, question, tagnames, user):
-        """
-        Updates Tag associations for a question to match the given
-        tagname string.
-
-        Returns ``True`` if tag usage counts were updated as a result,
-        ``False`` otherwise.
-        """
-        from forum.models import Tag
-        current_tags = list(question.tags.all())
-        current_tagnames = set(t.name for t in current_tags)
-        updated_tagnames = set(t for t in tagnames.split(' ') if t)
-        modified_tags = []
-
-        removed_tags = [t for t in current_tags
-                        if t.name not in updated_tagnames]
-        if removed_tags:
-            modified_tags.extend(removed_tags)
-            question.tags.remove(*removed_tags)
-
-        added_tagnames = updated_tagnames - current_tagnames
-        if added_tagnames:
-            added_tags = Tag.objects.get_or_create_multiple(added_tagnames,
-                                                            user)
-            modified_tags.extend(added_tags)
-            question.tags.add(*added_tags)
-
-        if modified_tags:
-            Tag.objects.update_use_counts(modified_tags)
-            return True
-
-        return False
-
-    def update_answer_count(self, question):
-        """
-        Executes an UPDATE query to update denormalised data with the
-        number of answers the given question has.
-        """
-        
-        # for some reasons, this Answer class failed to be imported,
-        # although we have imported all classes from models on top.
-        from forum.models import Answer
-        self.filter(id=question.id).update(
-            answer_count=Answer.objects.get_answers_from_question(question).count())
-    
-    def update_view_count(self, question):
-        """
-        update counter+1 when user browse question page
-        """
-        self.filter(id=question.id).update(view_count = question.view_count + 1)
-    
-    def update_favorite_count(self, question):
-        """
-        update favourite_count for given question
-        """
-        from forum.models import FavoriteQuestion
-        self.filter(id=question.id).update(favourite_count = FavoriteQuestion.objects.filter(question=question).count())
-        
-    def get_similar_questions(self, question):
-        """
-        Get 10 similar questions for given one.
-        This will search the same tag list for give question(by exactly same string) first.
-        Questions with the individual tags will be added to list if above questions are not full.
-        """
-        #print datetime.datetime.now()
-        from forum.models import Question
-        questions = list(Question.objects.filter(tagnames = question.tagnames).all())
-
-        tags_list = question.tags.all()
-        for tag in tags_list:
-            extend_questions = Question.objects.filter(tags__id = tag.id)[:50]
-            for item in extend_questions:
-                if item not in questions and len(questions) < 10:
-                    questions.append(item)
-          
-        #print datetime.datetime.now()
-        return questions    
-    
-class TagManager(models.Manager):
-    UPDATE_USED_COUNTS_QUERY = (
-        'UPDATE tag '
-        'SET used_count = ('
-            'SELECT COUNT(*) FROM question_tags '
-            'WHERE tag_id = tag.id'
-        ') '
-        'WHERE id IN (%s)')
-    
-    def get_valid_tags(self, page_size):
-      from forum.models import Tag
-      tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:page_size]
-      return tags
-    
-    def get_or_create_multiple(self, names, user):
-        """
-        Fetches a list of Tags with the given names, creating any Tags
-        which don't exist when necesssary.
-        """
-        tags = list(self.filter(name__in=names))
-        #Set all these tag visible
-        for tag in tags:
-            if tag.deleted:
-                tag.deleted = False
-                tag.deleted_by = None
-                tag.deleted_at = None
-                tag.save()
-                
-        if len(tags) < len(names):
-            existing_names = set(tag.name for tag in tags)
-            new_names = [name for name in names if name not in existing_names]
-            tags.extend([self.create(name=name, created_by=user)
-                         for name in new_names if self.filter(name=name).count() == 0 and len(name.strip()) > 0])
-             
-        return tags
-
-    def update_use_counts(self, tags):
-        """Updates the given Tags with their current use counts."""
-        if not tags:
-            return
-        cursor = connection.cursor()
-        query = self.UPDATE_USED_COUNTS_QUERY % ','.join(['%s'] * len(tags))
-        cursor.execute(query, [tag.id for tag in tags])
-        transaction.commit_unless_managed()
-    
-    def get_tags_by_questions(self, questions):
-        question_ids = []
-        for question in questions:
-            question_ids.append(question.id)
-
-        question_ids_str = ','.join([str(id) for id in question_ids])
-        related_tags = self.extra(
-                tables=['tag', 'question_tags'],
-                where=["tag.id = question_tags.tag_id AND question_tags.question_id IN (" + question_ids_str + ")"]
-        ).distinct()
-        
-        return related_tags
-
-class AnswerManager(models.Manager):
-    GET_ANSWERS_FROM_USER_QUESTIONS = u'SELECT answer.* FROM answer INNER JOIN question ON answer.question_id = question.id WHERE question.author_id =%s AND answer.author_id <> %s'
-    def get_answers_from_question(self, question, user=None):
-        """
-        Retrieves visibile answers for the given question. Delete answers
-        are only visibile to the person who deleted them.
-        """
-       
-        if user is None or not user.is_authenticated():
-            return self.filter(question=question, deleted=False)
-        else:
-            return self.filter(Q(question=question),
-                               Q(deleted=False) | Q(deleted_by=user))
-                               
-    def get_answers_from_questions(self, user_id):
-        """
-        Retrieves visibile answers for the given question. Which are not included own answers
-        """
-        cursor = connection.cursor()
-        cursor.execute(self.GET_ANSWERS_FROM_USER_QUESTIONS, [user_id, user_id])
-        return cursor.fetchall()
-
-class VoteManager(models.Manager):
-    COUNT_UP_VOTE_BY_USER = "SELECT count(*) FROM vote WHERE user_id = %s AND vote = 1"
-    COUNT_DOWN_VOTE_BY_USER = "SELECT count(*) FROM vote WHERE user_id = %s AND vote = -1"
-    COUNT_VOTES_PER_DAY_BY_USER = "SELECT COUNT(*) FROM vote WHERE user_id = %s AND DATE(voted_at) = DATE(NOW())"
-    def get_up_vote_count_from_user(self, user):
-        if user is not None:
-            cursor = connection.cursor()
-            cursor.execute(self.COUNT_UP_VOTE_BY_USER, [user.id])
-            row = cursor.fetchone()
-            return row[0]
-        else:
-            return 0
-    
-    def get_down_vote_count_from_user(self, user):
-        if user is not None:
-            cursor = connection.cursor()
-            cursor.execute(self.COUNT_DOWN_VOTE_BY_USER, [user.id])
-            row = cursor.fetchone()
-            return row[0]
-        else:
-            return 0
-            
-    def get_votes_count_today_from_user(self, user):
-        if user is not None:
-            cursor = connection.cursor()
-            cursor.execute(self.COUNT_VOTES_PER_DAY_BY_USER, [user.id])
-            row = cursor.fetchone()
-            return row[0]
-
-        else:
-            return 0
-            
-class FlaggedItemManager(models.Manager):
-    COUNT_FLAGS_PER_DAY_BY_USER = "SELECT COUNT(*) FROM flagged_item WHERE user_id = %s AND DATE(flagged_at) = DATE(NOW())"
-    def get_flagged_items_count_today(self, user):
-        if user is not None:
-            cursor = connection.cursor()
-            cursor.execute(self.COUNT_FLAGS_PER_DAY_BY_USER, [user.id])
-            row = cursor.fetchone()
-            return row[0]
-
-        else:
-            return 0
-
-class ReputeManager(models.Manager):
-    COUNT_REPUTATION_PER_DAY_BY_USER = "SELECT SUM(positive)+SUM(negative) FROM repute WHERE user_id = %s AND (reputation_type=1 OR reputation_type=-8) AND DATE(reputed_at) = DATE(NOW())"
-    def get_reputation_by_upvoted_today(self, user):
-        """
-        For one user in one day, he can only earn rep till certain score (ep. +200) 
-        by upvoted(also substracted from upvoted canceled). This is because we need
-        to prohibit gaming system by upvoting/cancel again and again.
-        """
-        if user is not None:
-            cursor = connection.cursor()
-            cursor.execute(self.COUNT_REPUTATION_PER_DAY_BY_USER, [user.id])
-            row = cursor.fetchone()
-            return row[0]
-
-        else:
-            return 0    
-class AwardManager(models.Manager):
-    def get_recent_awards(self):
-        awards = super(AwardManager, self).extra(
-            select={'badge_id': 'badge.id', 'badge_name':'badge.name',
-                          'badge_description': 'badge.description', 'badge_type': 'badge.type',
-                          'user_id': 'auth_user.id', 'user_name': 'auth_user.username'
-                          },
-            tables=['award', 'badge', 'auth_user'],
-            order_by=['-awarded_at'],
-            where=['auth_user.id=award.user_id AND badge_id=badge.id'],
-        ).values('badge_id', 'badge_name', 'badge_description', 'badge_type', 'user_id', 'user_name')
-        return awards
+import datetime
+import logging
+from django.contrib.auth.models import User, UserManager
+from django.db import connection, models, transaction
+from django.db.models import Q
+from forum.models import *
+from urllib import quote, unquote
+
+class QuestionManager(models.Manager):
+    def get_translation_questions(self, orderby, page_size):
+        questions = self.filter(deleted=False, author__id__in=[28,29]).order_by(orderby)[:page_size]
+        return questions
+    
+    def get_questions_by_pagesize(self, orderby, page_size):
+        questions = self.filter(deleted=False).order_by(orderby)[:page_size]
+        return questions
+    
+    def get_questions_by_tag(self, tagname, orderby):
+        questions = self.filter(deleted=False, tags__name = unquote(tagname)).order_by(orderby)
+        return questions
+    
+    def get_unanswered_questions(self, orderby):
+        questions = self.filter(deleted=False, answer_count=0).order_by(orderby)
+        return questions
+    
+    def get_questions(self, orderby):
+        questions = self.filter(deleted=False).order_by(orderby)
+        return questions
+    
+    def update_tags(self, question, tagnames, user):
+        """
+        Updates Tag associations for a question to match the given
+        tagname string.
+
+        Returns ``True`` if tag usage counts were updated as a result,
+        ``False`` otherwise.
+        """
+        from forum.models import Tag
+        current_tags = list(question.tags.all())
+        current_tagnames = set(t.name for t in current_tags)
+        updated_tagnames = set(t for t in tagnames.split(' ') if t)
+        modified_tags = []
+
+        removed_tags = [t for t in current_tags
+                        if t.name not in updated_tagnames]
+        if removed_tags:
+            modified_tags.extend(removed_tags)
+            question.tags.remove(*removed_tags)
+
+        added_tagnames = updated_tagnames - current_tagnames
+        if added_tagnames:
+            added_tags = Tag.objects.get_or_create_multiple(added_tagnames,
+                                                            user)
+            modified_tags.extend(added_tags)
+            question.tags.add(*added_tags)
+
+        if modified_tags:
+            Tag.objects.update_use_counts(modified_tags)
+            return True
+
+        return False
+
+    def update_answer_count(self, question):
+        """
+        Executes an UPDATE query to update denormalised data with the
+        number of answers the given question has.
+        """
+        
+        # for some reasons, this Answer class failed to be imported,
+        # although we have imported all classes from models on top.
+        from forum.models import Answer
+        self.filter(id=question.id).update(
+            answer_count=Answer.objects.get_answers_from_question(question).count())
+    
+    def update_view_count(self, question):
+        """
+        update counter+1 when user browse question page
+        """
+        self.filter(id=question.id).update(view_count = question.view_count + 1)
+    
+    def update_favorite_count(self, question):
+        """
+        update favourite_count for given question
+        """
+        from forum.models import FavoriteQuestion
+        self.filter(id=question.id).update(favourite_count = FavoriteQuestion.objects.filter(question=question).count())
+        
+    def get_similar_questions(self, question):
+        """
+        Get 10 similar questions for given one.
+        This will search the same tag list for give question(by exactly same string) first.
+        Questions with the individual tags will be added to list if above questions are not full.
+        """
+        #print datetime.datetime.now()
+        from forum.models import Question
+        questions = list(Question.objects.filter(tagnames = question.tagnames).all())
+
+        tags_list = question.tags.all()
+        for tag in tags_list:
+            extend_questions = Question.objects.filter(tags__id = tag.id)[:50]
+            for item in extend_questions:
+                if item not in questions and len(questions) < 10:
+                    questions.append(item)
+          
+        #print datetime.datetime.now()
+        return questions    
+    
+class TagManager(models.Manager):
+    UPDATE_USED_COUNTS_QUERY = (
+        'UPDATE tag '
+        'SET used_count = ('
+            'SELECT COUNT(*) FROM question_tags '
+            'WHERE tag_id = tag.id'
+        ') '
+        'WHERE id IN (%s)')
+    
+    def get_valid_tags(self, page_size):
+      from forum.models import Tag
+      tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:page_size]
+      return tags
+    
+    def get_or_create_multiple(self, names, user):
+        """
+        Fetches a list of Tags with the given names, creating any Tags
+        which don't exist when necesssary.
+        """
+        tags = list(self.filter(name__in=names))
+        #Set all these tag visible
+        for tag in tags:
+            if tag.deleted:
+                tag.deleted = False
+                tag.deleted_by = None
+                tag.deleted_at = None
+                tag.save()
+                
+        if len(tags) < len(names):
+            existing_names = set(tag.name for tag in tags)
+            new_names = [name for name in names if name not in existing_names]
+            tags.extend([self.create(name=name, created_by=user)
+                         for name in new_names if self.filter(name=name).count() == 0 and len(name.strip()) > 0])
+             
+        return tags
+
+    def update_use_counts(self, tags):
+        """Updates the given Tags with their current use counts."""
+        if not tags:
+            return
+        cursor = connection.cursor()
+        query = self.UPDATE_USED_COUNTS_QUERY % ','.join(['%s'] * len(tags))
+        cursor.execute(query, [tag.id for tag in tags])
+        transaction.commit_unless_managed()
+    
+    def get_tags_by_questions(self, questions):
+        question_ids = []
+        for question in questions:
+            question_ids.append(question.id)
+
+        question_ids_str = ','.join([str(id) for id in question_ids])
+        related_tags = self.extra(
+                tables=['tag', 'question_tags'],
+                where=["tag.id = question_tags.tag_id AND question_tags.question_id IN (" + question_ids_str + ")"]
+        ).distinct()
+        
+        return related_tags
+
+class AnswerManager(models.Manager):
+    GET_ANSWERS_FROM_USER_QUESTIONS = u'SELECT answer.* FROM answer INNER JOIN question ON answer.question_id = question.id WHERE question.author_id =%s AND answer.author_id <> %s'
+    def get_answers_from_question(self, question, user=None):
+        """
+        Retrieves visibile answers for the given question. Delete answers
+        are only visibile to the person who deleted them.
+        """
+       
+        if user is None or not user.is_authenticated():
+            return self.filter(question=question, deleted=False)
+        else:
+            return self.filter(Q(question=question),
+                               Q(deleted=False) | Q(deleted_by=user))
+                               
+    def get_answers_from_questions(self, user_id):
+        """
+        Retrieves visibile answers for the given question. Which are not included own answers
+        """
+        cursor = connection.cursor()
+        cursor.execute(self.GET_ANSWERS_FROM_USER_QUESTIONS, [user_id, user_id])
+        return cursor.fetchall()
+
+class VoteManager(models.Manager):
+    COUNT_UP_VOTE_BY_USER = "SELECT count(*) FROM vote WHERE user_id = %s AND vote = 1"
+    COUNT_DOWN_VOTE_BY_USER = "SELECT count(*) FROM vote WHERE user_id = %s AND vote = -1"
+    COUNT_VOTES_PER_DAY_BY_USER = "SELECT COUNT(*) FROM vote WHERE user_id = %s AND DATE(voted_at) = DATE(NOW())"
+    def get_up_vote_count_from_user(self, user):
+        if user is not None:
+            cursor = connection.cursor()
+            cursor.execute(self.COUNT_UP_VOTE_BY_USER, [user.id])
+            row = cursor.fetchone()
+            return row[0]
+        else:
+            return 0
+    
+    def get_down_vote_count_from_user(self, user):
+        if user is not None:
+            cursor = connection.cursor()
+            cursor.execute(self.COUNT_DOWN_VOTE_BY_USER, [user.id])
+            row = cursor.fetchone()
+            return row[0]
+        else:
+            return 0
+            
+    def get_votes_count_today_from_user(self, user):
+        if user is not None:
+            cursor = connection.cursor()
+            cursor.execute(self.COUNT_VOTES_PER_DAY_BY_USER, [user.id])
+            row = cursor.fetchone()
+            return row[0]
+
+        else:
+            return 0
+            
+class FlaggedItemManager(models.Manager):
+    COUNT_FLAGS_PER_DAY_BY_USER = "SELECT COUNT(*) FROM flagged_item WHERE user_id = %s AND DATE(flagged_at) = DATE(NOW())"
+    def get_flagged_items_count_today(self, user):
+        if user is not None:
+            cursor = connection.cursor()
+            cursor.execute(self.COUNT_FLAGS_PER_DAY_BY_USER, [user.id])
+            row = cursor.fetchone()
+            return row[0]
+
+        else:
+            return 0
+
+class ReputeManager(models.Manager):
+    COUNT_REPUTATION_PER_DAY_BY_USER = "SELECT SUM(positive)+SUM(negative) FROM repute WHERE user_id = %s AND (reputation_type=1 OR reputation_type=-8) AND DATE(reputed_at) = DATE(NOW())"
+    def get_reputation_by_upvoted_today(self, user):
+        """
+        For one user in one day, he can only earn rep till certain score (ep. +200) 
+        by upvoted(also substracted from upvoted canceled). This is because we need
+        to prohibit gaming system by upvoting/cancel again and again.
+        """
+        if user is not None:
+            cursor = connection.cursor()
+            cursor.execute(self.COUNT_REPUTATION_PER_DAY_BY_USER, [user.id])
+            row = cursor.fetchone()
+            return row[0]
+
+        else:
+            return 0    
+class AwardManager(models.Manager):
+    def get_recent_awards(self):
+        awards = super(AwardManager, self).extra(
+            select={'badge_id': 'badge.id', 'badge_name':'badge.name',
+                          'badge_description': 'badge.description', 'badge_type': 'badge.type',
+                          'user_id': 'auth_user.id', 'user_name': 'auth_user.username'
+                          },
+            tables=['award', 'badge', 'auth_user'],
+            order_by=['-awarded_at'],
+            where=['auth_user.id=award.user_id AND badge_id=badge.id'],
+        ).values('badge_id', 'badge_name', 'badge_description', 'badge_type', 'user_id', 'user_name')
+        return awards
diff --git a/forum/models.py b/forum/models.py
index 570db274..b966ccb0 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -1,654 +1,654 @@
-# encoding:utf-8
-import datetime
-import hashlib
-from urllib import quote_plus, urlencode
-from django.db import models
-from django.utils.html import strip_tags
-from django.core.urlresolvers import reverse
-from django.contrib.auth.models import User
-from django.contrib.contenttypes import generic
-from django.contrib.contenttypes.models import ContentType
-from django.template.defaultfilters import slugify
-from django.db.models.signals import post_delete, post_save, pre_save
-from django.utils.translation import ugettext as _
-import django.dispatch
-
-from forum.managers import *
-from const import *
-
-class Tag(models.Model):
-    name       = models.CharField(max_length=255, unique=True)
-    created_by = models.ForeignKey(User, related_name='created_tags')
-    deleted         = models.BooleanField(default=False)
-    deleted_at      = models.DateTimeField(null=True, blank=True)
-    deleted_by      = models.ForeignKey(User, null=True, blank=True, related_name='deleted_tags')
-    # Denormalised data
-    used_count = models.PositiveIntegerField(default=0)
-
-    objects = TagManager()
-
-    class Meta:
-        db_table = u'tag'
-        ordering = ('-used_count', 'name')
-
-    def __unicode__(self):
-        return self.name
-
-class Comment(models.Model):
-    content_type   = models.ForeignKey(ContentType)
-    object_id      = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
-    user           = models.ForeignKey(User, related_name='comments')
-    comment        = models.CharField(max_length=300)
-    added_at       = models.DateTimeField(default=datetime.datetime.now)
-
-    class Meta:
-        ordering = ('-added_at',)
-        db_table = u'comment'
-    def __unicode__(self):
-        return self.comment
-
-class Vote(models.Model):
-    VOTE_UP = +1
-    VOTE_DOWN = -1
-    VOTE_CHOICES = (
-        (VOTE_UP,   u'Up'),
-        (VOTE_DOWN, u'Down'),
-    )
-
-    content_type   = models.ForeignKey(ContentType)
-    object_id      = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
-    user           = models.ForeignKey(User, related_name='votes')
-    vote           = models.SmallIntegerField(choices=VOTE_CHOICES)
-    voted_at       = models.DateTimeField(default=datetime.datetime.now)
-
-    objects = VoteManager()
-
-    class Meta:
-        unique_together = ('content_type', 'object_id', 'user')
-        db_table = u'vote'
-    def __unicode__(self):
-        return '[%s] voted at %s: %s' %(self.user, self.voted_at, self.vote)
-
-    def is_upvote(self):
-        return self.vote == self.VOTE_UP
-
-    def is_downvote(self):
-        return self.vote == self.VOTE_DOWN
-
-class FlaggedItem(models.Model):
-    """A flag on a Question or Answer indicating offensive content."""
-    content_type   = models.ForeignKey(ContentType)
-    object_id      = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
-    user           = models.ForeignKey(User, related_name='flagged_items')
-    flagged_at     = models.DateTimeField(default=datetime.datetime.now)
-
-    objects = FlaggedItemManager()
-
-    class Meta:
-        unique_together = ('content_type', 'object_id', 'user')
-        db_table = u'flagged_item'
-    def __unicode__(self):
-        return '[%s] flagged at %s' %(self.user, self.flagged_at)
-
-class Question(models.Model):
-    title    = models.CharField(max_length=300)
-    author   = models.ForeignKey(User, related_name='questions')
-    added_at = models.DateTimeField(default=datetime.datetime.now)
-    tags     = models.ManyToManyField(Tag, related_name='questions')
-    # Status
-    wiki            = models.BooleanField(default=False)
-    wikified_at     = models.DateTimeField(null=True, blank=True)
-    answer_accepted = models.BooleanField(default=False)
-    closed          = models.BooleanField(default=False)
-    closed_by       = models.ForeignKey(User, null=True, blank=True, related_name='closed_questions')
-    closed_at       = models.DateTimeField(null=True, blank=True)
-    close_reason    = models.SmallIntegerField(choices=CLOSE_REASONS, null=True, blank=True)
-    deleted         = models.BooleanField(default=False)
-    deleted_at      = models.DateTimeField(null=True, blank=True)
-    deleted_by      = models.ForeignKey(User, null=True, blank=True, related_name='deleted_questions')
-    locked          = models.BooleanField(default=False)
-    locked_by       = models.ForeignKey(User, null=True, blank=True, related_name='locked_questions')
-    locked_at       = models.DateTimeField(null=True, blank=True)
-    # Denormalised data
-    score                = models.IntegerField(default=0)
-    vote_up_count        = models.IntegerField(default=0)
-    vote_down_count      = models.IntegerField(default=0)
-    answer_count         = models.PositiveIntegerField(default=0)
-    comment_count        = models.PositiveIntegerField(default=0)
-    view_count           = models.PositiveIntegerField(default=0)
-    offensive_flag_count = models.SmallIntegerField(default=0)
-    favourite_count      = models.PositiveIntegerField(default=0)
-    last_edited_at       = models.DateTimeField(null=True, blank=True)
-    last_edited_by       = models.ForeignKey(User, null=True, blank=True, related_name='last_edited_questions')
-    last_activity_at     = models.DateTimeField(default=datetime.datetime.now)
-    last_activity_by     = models.ForeignKey(User, related_name='last_active_in_questions')
-    tagnames             = models.CharField(max_length=125)
-    summary              = models.CharField(max_length=180)
-    html                 = models.TextField()
-    comments             = generic.GenericRelation(Comment)
-    votes                = generic.GenericRelation(Vote)
-    flagged_items        = generic.GenericRelation(FlaggedItem)
-
-    objects = QuestionManager()
-
-    def save(self, **kwargs):
-        """
-        Overridden to manually manage addition of tags when the object
-        is first saved.
-
-        This is required as we're using ``tagnames`` as the sole means of
-        adding and editing tags.
-        """
-        initial_addition = (self.id is None)
-        super(Question, self).save(**kwargs)
-        if initial_addition:
-            tags = Tag.objects.get_or_create_multiple(self.tagname_list(),
-                                                      self.author)
-            self.tags.add(*tags)
-            Tag.objects.update_use_counts(tags)
-
-    def tagname_list(self):
-        """Creates a list of Tag names from the ``tagnames`` attribute."""
-        return [name for name in self.tagnames.split(u' ')]
-
-    def get_absolute_url(self):
-        return '%s%s' % (reverse('question', args=[self.id]), self.title)
-
-    def has_favorite_by_user(self, user):
-        if not user.is_authenticated():
-            return False
-        return FavoriteQuestion.objects.filter(question=self, user=user).count() > 0
-
-    def get_answer_count_by_user(self, user_id):
-        query_set = Answer.objects.filter(author__id=user_id)
-        return query_set.filter(question=self).count()
-
-    def get_question_title(self):
-        if self.closed:
-            attr = CONST['closed'] 
-        elif self.deleted:
-            attr = CONST['deleted']
-        else:
-            attr = None
-        return u'%s %s' % (self.title, attr) if attr is not None else self.title
-
-    def get_revision_url(self):
-        return reverse('question_revisions', args=[self.id])
-
-    def get_latest_revision(self):
-        return self.revisions.all()[0]
-
-    def __unicode__(self):
-        return self.title
-
-    class Meta:
-        db_table = u'question'
-
-class QuestionRevision(models.Model):
-    """A revision of a Question."""
-    question   = models.ForeignKey(Question, related_name='revisions')
-    revision   = models.PositiveIntegerField(blank=True)
-    title      = models.CharField(max_length=300)
-    author     = models.ForeignKey(User, related_name='question_revisions')
-    revised_at = models.DateTimeField()
-    tagnames   = models.CharField(max_length=125)
-    summary    = models.CharField(max_length=300, blank=True)
-    text       = models.TextField()
-
-    class Meta:
-        db_table = u'question_revision'
-        ordering = ('-revision',)
-
-    def get_question_title(self):
-        return self.question.title
-
-    def get_absolute_url(self):
-        return '/questions/%s/revisions' % (self.question.id)
-
-    def save(self, **kwargs):
-        """Looks up the next available revision number."""
-        if not self.revision:
-            self.revision = QuestionRevision.objects.filter(
-                question=self.question).values_list('revision',
-                                                    flat=True)[0] + 1
-        super(QuestionRevision, self).save(**kwargs)
-
-    def __unicode__(self):
-        return u'revision %s of %s' % (self.revision, self.title)
-
-class Answer(models.Model):
-    question = models.ForeignKey(Question, related_name='answers')
-    author   = models.ForeignKey(User, related_name='answers')
-    added_at = models.DateTimeField(default=datetime.datetime.now)
-    # Status
-    wiki        = models.BooleanField(default=False)
-    wikified_at = models.DateTimeField(null=True, blank=True)
-    accepted    = models.BooleanField(default=False)
-    accepted_at = models.DateTimeField(null=True, blank=True)
-    deleted     = models.BooleanField(default=False)
-    deleted_by  = models.ForeignKey(User, null=True, blank=True, related_name='deleted_answers')
-    locked      = models.BooleanField(default=False)
-    locked_by   = models.ForeignKey(User, null=True, blank=True, related_name='locked_answers')
-    locked_at   = models.DateTimeField(null=True, blank=True)
-    # Denormalised data
-    score                = models.IntegerField(default=0)
-    vote_up_count        = models.IntegerField(default=0)
-    vote_down_count      = models.IntegerField(default=0)
-    comment_count        = models.PositiveIntegerField(default=0)
-    offensive_flag_count = models.SmallIntegerField(default=0)
-    last_edited_at       = models.DateTimeField(null=True, blank=True)
-    last_edited_by       = models.ForeignKey(User, null=True, blank=True, related_name='last_edited_answers')
-    html                 = models.TextField()
-    comments             = generic.GenericRelation(Comment)
-    votes                = generic.GenericRelation(Vote)
-    flagged_items        = generic.GenericRelation(FlaggedItem)
-
-    objects = AnswerManager()
-
-    def get_user_vote(self, user):
-        votes = self.votes.filter(user=user)
-        if votes.count() > 0:
-            return votes[0]
-        else:
-            return None
-
-    def get_latest_revision(self):
-        return self.revisions.all()[0]
-
-    def get_question_title(self):
-        return self.question.title
-
-    def get_absolute_url(self):
-        return '%s%s#%s' % (reverse('question', args=[self.question.id]), self.question.title, self.id)
-
-    class Meta:
-        db_table = u'answer'
-
-    def __unicode__(self):
-        return self.html
-
-class AnswerRevision(models.Model):
-    """A revision of an Answer."""
-    answer     = models.ForeignKey(Answer, related_name='revisions')
-    revision   = models.PositiveIntegerField()
-    author     = models.ForeignKey(User, related_name='answer_revisions')
-    revised_at = models.DateTimeField()
-    summary    = models.CharField(max_length=300, blank=True)
-    text       = models.TextField()
-
-    def get_absolute_url(self):
-        return '/answers/%s/revisions' % (self.answer.id)
-
-    def get_question_title(self):
-        return self.answer.question.title
-
-    class Meta:
-        db_table = u'answer_revision'
-        ordering = ('-revision',)
-
-    def save(self, **kwargs):
-        """Looks up the next available revision number if not set."""
-        if not self.revision:
-            self.revision = AnswerRevision.objects.filter(
-                answer=self.answer).values_list('revision',
-                                                flat=True)[0] + 1
-        super(AnswerRevision, self).save(**kwargs)
-
-class FavoriteQuestion(models.Model):
-    """A favorite Question of a User."""
-    question      = models.ForeignKey(Question)
-    user          = models.ForeignKey(User, related_name='user_favorite_questions')
-    added_at = models.DateTimeField(default=datetime.datetime.now)
-    class Meta:
-        db_table = u'favorite_question'
-    def __unicode__(self):
-        return '[%s] favorited at %s' %(self.user, self.added_at)
-
-class Badge(models.Model):
-    """Awarded for notable actions performed on the site by Users."""
-    GOLD = 1
-    SILVER = 2
-    BRONZE = 3
-    TYPE_CHOICES = (
-        (GOLD,   _('gold')),
-        (SILVER, _('silver')),
-        (BRONZE, _('bronze')),
-    )
-
-    name        = models.CharField(max_length=50)
-    type        = models.SmallIntegerField(choices=TYPE_CHOICES)
-    slug        = models.SlugField(max_length=50, blank=True)
-    description = models.CharField(max_length=300)
-    multiple    = models.BooleanField(default=False)
-    # Denormalised data
-    awarded_count = models.PositiveIntegerField(default=0)
-
-    class Meta:
-        db_table = u'badge'
-        ordering = ('name',)
-        unique_together = ('name', 'type')
-
-    def __unicode__(self):
-        return u'%s: %s' % (self.get_type_display(), self.name)
-
-    def save(self, **kwargs):
-        if not self.slug:
-            self.slug = self.name#slugify(self.name)
-        super(Badge, self).save(**kwargs)
-
-    def get_absolute_url(self):
-        return '%s%s/' % (reverse('badge', args=[self.id]), self.slug)
-
-class Award(models.Model):
-    """The awarding of a Badge to a User."""
-    user       = models.ForeignKey(User, related_name='award_user')
-    badge      = models.ForeignKey(Badge, related_name='award_badge')
-    content_type   = models.ForeignKey(ContentType)
-    object_id      = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
-    awarded_at = models.DateTimeField(default=datetime.datetime.now)
-    notified   = models.BooleanField(default=False)
-    objects = AwardManager()
-    
-    def __unicode__(self):
-        return u'[%s] is awarded a badge [%s] at %s' % (self.user.username, self.badge.name, self.awarded_at)
-
-    class Meta:
-        db_table = u'award'
-
-class Repute(models.Model):
-    """The reputation histories for user"""
-    user     = models.ForeignKey(User)
-    positive = models.SmallIntegerField(default=0)
-    negative = models.SmallIntegerField(default=0)
-    question = models.ForeignKey(Question)
-    reputed_at = models.DateTimeField(default=datetime.datetime.now)
-    reputation_type = models.SmallIntegerField(choices=TYPE_REPUTATION)
-    reputation = models.IntegerField(default=1)
-    objects = ReputeManager()
-
-    def __unicode__(self):
-        return u'[%s]\' reputation changed at %s' % (self.user.username, self.reputed_at)
-
-    class Meta:
-        db_table = u'repute'
-
-class Activity(models.Model):
-    """
-    We keep some history data for user activities
-    """
-    user = models.ForeignKey(User)
-    activity_type = models.SmallIntegerField(choices=TYPE_ACTIVITY)
-    active_at = models.DateTimeField(default=datetime.datetime.now)
-    content_type   = models.ForeignKey(ContentType)
-    object_id      = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
-    is_auditted    = models.BooleanField(default=False)
-
-    def __unicode__(self):
-        return u'[%s] was active at %s' % (self.user.username, self.active_at)
-
-    class Meta:
-        db_table = u'activity'
-
-class Book(models.Model):
-    """
-    Model for book info
-    """
-    user = models.ForeignKey(User)
-    title = models.CharField(max_length=255)
-    short_name = models.CharField(max_length=255)
-    author = models.CharField(max_length=255)
-    price = models.DecimalField(max_digits=6, decimal_places=2)
-    pages = models.SmallIntegerField()
-    published_at = models.DateTimeField()
-    publication = models.CharField(max_length=255)
-    cover_img = models.CharField(max_length=255)
-    tagnames = models.CharField(max_length=125)
-    added_at = models.DateTimeField()
-    last_edited_at = models.DateTimeField()
-    questions = models.ManyToManyField(Question, related_name='book', db_table='book_question')
-    
-    def get_absolute_url(self):
-        return '%s' % reverse('book', args=[self.short_name])
-        
-    def __unicode__(self):
-        return self.title
-    class Meta:
-        db_table = u'book'
-
-class BookAuthorInfo(models.Model):
-    """
-    Model for book author info
-    """
-    user = models.ForeignKey(User)
-    book = models.ForeignKey(Book)
-    blog_url = models.CharField(max_length=255)
-    added_at = models.DateTimeField()
-    last_edited_at = models.DateTimeField()
-    
-    class Meta:
-        db_table = u'book_author_info'
-    
-class BookAuthorRss(models.Model):
-    """
-    Model for book author blog rss
-    """
-    user = models.ForeignKey(User)
-    book = models.ForeignKey(Book)
-    title = models.CharField(max_length=255)
-    url = models.CharField(max_length=255)
-    rss_created_at = models.DateTimeField()
-    added_at = models.DateTimeField()
-    
-    class Meta:
-        db_table = u'book_author_rss'
-
-# User extend properties
-QUESTIONS_PER_PAGE_CHOICES = (
-   (10, u'10'),
-   (30, u'30'),
-   (50, u'50'),
-)
-
-User.add_to_class('reputation', models.PositiveIntegerField(default=1))
-User.add_to_class('gravatar', models.CharField(max_length=32))
-User.add_to_class('favorite_questions',
-                  models.ManyToManyField(Question, through=FavoriteQuestion,
-                                         related_name='favorited_by'))
-User.add_to_class('badges', models.ManyToManyField(Badge, through=Award,
-                                                   related_name='awarded_to'))
-User.add_to_class('gold', models.SmallIntegerField(default=0))
-User.add_to_class('silver', models.SmallIntegerField(default=0))
-User.add_to_class('bronze', models.SmallIntegerField(default=0))
-User.add_to_class('questions_per_page',
-                  models.SmallIntegerField(choices=QUESTIONS_PER_PAGE_CHOICES, default=10))
-User.add_to_class('last_seen',
-                  models.DateTimeField(default=datetime.datetime.now))
-User.add_to_class('real_name', models.CharField(max_length=100, blank=True))
-User.add_to_class('website', models.URLField(max_length=200, blank=True))
-User.add_to_class('location', models.CharField(max_length=100, blank=True))
-User.add_to_class('date_of_birth', models.DateField(null=True, blank=True))
-User.add_to_class('about', models.TextField(blank=True))
-
-# custom signal
-tags_updated = django.dispatch.Signal(providing_args=["question"])
-edit_question_or_answer = django.dispatch.Signal(providing_args=["instance", "modified_by"])
-delete_post_or_answer = django.dispatch.Signal(providing_args=["instance", "deleted_by"])
-mark_offensive = django.dispatch.Signal(providing_args=["instance", "mark_by"])
-user_updated = django.dispatch.Signal(providing_args=["instance", "updated_by"])
-def get_messages(self):
-        messages = []
-        for m in self.message_set.all():
-            messages.append(m.message)
-        return messages
-
-def delete_messages(self):
-    self.message_set.all().delete()
-
-def get_profile_url(self):
-    """Returns the URL for this User's profile."""
-    return '%s%s/' % (reverse('user', args=[self.id]), self.username)
-User.add_to_class('get_profile_url', get_profile_url)
-User.add_to_class('get_messages', get_messages)
-User.add_to_class('delete_messages', delete_messages)
-
-def calculate_gravatar_hash(instance, **kwargs):
-    """Calculates a User's gravatar hash from their email address."""
-    if kwargs.get('raw', False):
-        return
-    instance.gravatar = hashlib.md5(instance.email).hexdigest()
-
-def record_ask_event(instance, created, **kwargs):
-    if created:
-        activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ASK_QUESTION)
-        activity.save()
-
-def record_answer_event(instance, created, **kwargs):
-    if created:
-        activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ANSWER)
-        activity.save()
-
-def record_comment_event(instance, created, **kwargs):
-    if created:
-        from django.contrib.contenttypes.models import ContentType
-        question_type = ContentType.objects.get_for_model(Question)
-        question_type_id = question_type.id
-        type = TYPE_ACTIVITY_COMMENT_QUESTION if instance.content_type_id == question_type_id else TYPE_ACTIVITY_COMMENT_ANSWER
-        activity = Activity(user=instance.user, active_at=instance.added_at, content_object=instance, activity_type=type)
-        activity.save()
-
-def record_revision_question_event(instance, created, **kwargs):
-    if created and instance.revision <> 1:
-        activity = Activity(user=instance.author, active_at=instance.revised_at, content_object=instance, activity_type=TYPE_ACTIVITY_UPDATE_QUESTION)
-        activity.save()
-
-def record_revision_answer_event(instance, created, **kwargs):
-    if created and instance.revision <> 1:
-        activity = Activity(user=instance.author, active_at=instance.revised_at, content_object=instance, activity_type=TYPE_ACTIVITY_UPDATE_ANSWER)
-        activity.save()
-
-def record_award_event(instance, created, **kwargs):
-    """
-    After we awarded a badge to user, we need to record this activity and notify user.
-    We also recaculate awarded_count of this badge and user information.
-    """
-    if created:
-        activity = Activity(user=instance.user, active_at=instance.awarded_at, content_object=instance,
-            activity_type=TYPE_ACTIVITY_PRIZE)
-        activity.save()
-
-        instance.badge.awarded_count += 1
-        instance.badge.save()
-
-        if instance.badge.type == Badge.GOLD:
-            instance.user.gold += 1
-        if instance.badge.type == Badge.SILVER:
-            instance.user.silver += 1
-        if instance.badge.type == Badge.BRONZE:
-            instance.user.bronze += 1
-        instance.user.save()
-
-def notify_award_message(instance, created, **kwargs):
-    """
-    Notify users when they have been awarded badges by using Django message.
-    """
-    if created:
-        user = instance.user
-        user.message_set.create(message=u"%s" % instance.badge.name)
-
-def record_answer_accepted(instance, created, **kwargs):
-    """
-    when answer is accepted, we record this for question author - who accepted it.
-    """
-    if not created and instance.accepted:
-        activity = Activity(user=instance.question.author, active_at=datetime.datetime.now(), \
-            content_object=instance, activity_type=TYPE_ACTIVITY_MARK_ANSWER)
-        activity.save()
-
-def update_last_seen(instance, created, **kwargs):
-    """
-    when user has activities, we update 'last_seen' time stamp for him
-    """
-    user = instance.user
-    user.last_seen = datetime.datetime.now()
-    user.save()
-
-def record_vote(instance, created, **kwargs):
-    """
-    when user have voted
-    """
-    if created:
-        if instance.vote == 1:
-            vote_type = TYPE_ACTIVITY_VOTE_UP
-        else:
-            vote_type = TYPE_ACTIVITY_VOTE_DOWN
-
-        activity = Activity(user=instance.user, active_at=instance.voted_at, content_object=instance, activity_type=vote_type)
-        activity.save()
-
-def record_cancel_vote(instance, **kwargs):
-    """
-    when user canceled vote, the vote will be deleted.
-    """
-    activity = Activity(user=instance.user, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_CANCEL_VOTE)
-    activity.save()
-
-def record_delete_question(instance, delete_by, **kwargs):
-    """
-    when user deleted the question
-    """
-    if instance.__class__ == "Question":
-        activity_type = TYPE_ACTIVITY_DELETE_QUESTION
-    else:
-        activity_type = TYPE_ACTIVITY_DELETE_ANSWER
-
-    activity = Activity(user=delete_by, active_at=datetime.datetime.now(), content_object=instance, activity_type=activity_type)
-    activity.save()
-
-def record_mark_offensive(instance, mark_by, **kwargs):
-    activity = Activity(user=mark_by, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_MARK_OFFENSIVE)
-    activity.save()
-
-def record_update_tags(question, **kwargs):
-    """
-    when user updated tags of the question
-    """
-    activity = Activity(user=question.author, active_at=datetime.datetime.now(), content_object=question, activity_type=TYPE_ACTIVITY_UPDATE_TAGS)
-    activity.save()
-
-def record_favorite_question(instance, created, **kwargs):
-    """
-    when user add the question in him favorite questions list.
-    """
-    if created:
-        activity = Activity(user=instance.user, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_FAVORITE)
-        activity.save()
-
-def record_user_full_updated(instance, **kwargs):
-    activity = Activity(user=instance, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_USER_FULL_UPDATED)
-    activity.save()
-
-#signal for User modle save changes
-pre_save.connect(calculate_gravatar_hash, sender=User)
-post_save.connect(record_ask_event, sender=Question)
-post_save.connect(record_answer_event, sender=Answer)
-post_save.connect(record_comment_event, sender=Comment)
-post_save.connect(record_revision_question_event, sender=QuestionRevision)
-post_save.connect(record_revision_answer_event, sender=AnswerRevision)
-post_save.connect(record_award_event, sender=Award)
-post_save.connect(notify_award_message, sender=Award)
-post_save.connect(record_answer_accepted, sender=Answer)
-post_save.connect(update_last_seen, sender=Activity)
-post_save.connect(record_vote, sender=Vote)
-post_delete.connect(record_cancel_vote, sender=Vote)
-delete_post_or_answer.connect(record_delete_question, sender=Question)
-delete_post_or_answer.connect(record_delete_question, sender=Answer)
-mark_offensive.connect(record_mark_offensive, sender=Question)
-mark_offensive.connect(record_mark_offensive, sender=Answer)
-tags_updated.connect(record_update_tags, sender=Question)
-post_save.connect(record_favorite_question, sender=FavoriteQuestion)
-user_updated.connect(record_user_full_updated, sender=User)
+# encoding:utf-8
+import datetime
+import hashlib
+from urllib import quote_plus, urlencode
+from django.db import models
+from django.utils.html import strip_tags
+from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User
+from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.models import ContentType
+from django.template.defaultfilters import slugify
+from django.db.models.signals import post_delete, post_save, pre_save
+from django.utils.translation import ugettext as _
+import django.dispatch
+
+from forum.managers import *
+from const import *
+
+class Tag(models.Model):
+    name       = models.CharField(max_length=255, unique=True)
+    created_by = models.ForeignKey(User, related_name='created_tags')
+    deleted         = models.BooleanField(default=False)
+    deleted_at      = models.DateTimeField(null=True, blank=True)
+    deleted_by      = models.ForeignKey(User, null=True, blank=True, related_name='deleted_tags')
+    # Denormalised data
+    used_count = models.PositiveIntegerField(default=0)
+
+    objects = TagManager()
+
+    class Meta:
+        db_table = u'tag'
+        ordering = ('-used_count', 'name')
+
+    def __unicode__(self):
+        return self.name
+
+class Comment(models.Model):
+    content_type   = models.ForeignKey(ContentType)
+    object_id      = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    user           = models.ForeignKey(User, related_name='comments')
+    comment        = models.CharField(max_length=300)
+    added_at       = models.DateTimeField(default=datetime.datetime.now)
+
+    class Meta:
+        ordering = ('-added_at',)
+        db_table = u'comment'
+    def __unicode__(self):
+        return self.comment
+
+class Vote(models.Model):
+    VOTE_UP = +1
+    VOTE_DOWN = -1
+    VOTE_CHOICES = (
+        (VOTE_UP,   u'Up'),
+        (VOTE_DOWN, u'Down'),
+    )
+
+    content_type   = models.ForeignKey(ContentType)
+    object_id      = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    user           = models.ForeignKey(User, related_name='votes')
+    vote           = models.SmallIntegerField(choices=VOTE_CHOICES)
+    voted_at       = models.DateTimeField(default=datetime.datetime.now)
+
+    objects = VoteManager()
+
+    class Meta:
+        unique_together = ('content_type', 'object_id', 'user')
+        db_table = u'vote'
+    def __unicode__(self):
+        return '[%s] voted at %s: %s' %(self.user, self.voted_at, self.vote)
+
+    def is_upvote(self):
+        return self.vote == self.VOTE_UP
+
+    def is_downvote(self):
+        return self.vote == self.VOTE_DOWN
+
+class FlaggedItem(models.Model):
+    """A flag on a Question or Answer indicating offensive content."""
+    content_type   = models.ForeignKey(ContentType)
+    object_id      = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    user           = models.ForeignKey(User, related_name='flagged_items')
+    flagged_at     = models.DateTimeField(default=datetime.datetime.now)
+
+    objects = FlaggedItemManager()
+
+    class Meta:
+        unique_together = ('content_type', 'object_id', 'user')
+        db_table = u'flagged_item'
+    def __unicode__(self):
+        return '[%s] flagged at %s' %(self.user, self.flagged_at)
+
+class Question(models.Model):
+    title    = models.CharField(max_length=300)
+    author   = models.ForeignKey(User, related_name='questions')
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    tags     = models.ManyToManyField(Tag, related_name='questions')
+    # Status
+    wiki            = models.BooleanField(default=False)
+    wikified_at     = models.DateTimeField(null=True, blank=True)
+    answer_accepted = models.BooleanField(default=False)
+    closed          = models.BooleanField(default=False)
+    closed_by       = models.ForeignKey(User, null=True, blank=True, related_name='closed_questions')
+    closed_at       = models.DateTimeField(null=True, blank=True)
+    close_reason    = models.SmallIntegerField(choices=CLOSE_REASONS, null=True, blank=True)
+    deleted         = models.BooleanField(default=False)
+    deleted_at      = models.DateTimeField(null=True, blank=True)
+    deleted_by      = models.ForeignKey(User, null=True, blank=True, related_name='deleted_questions')
+    locked          = models.BooleanField(default=False)
+    locked_by       = models.ForeignKey(User, null=True, blank=True, related_name='locked_questions')
+    locked_at       = models.DateTimeField(null=True, blank=True)
+    # Denormalised data
+    score                = models.IntegerField(default=0)
+    vote_up_count        = models.IntegerField(default=0)
+    vote_down_count      = models.IntegerField(default=0)
+    answer_count         = models.PositiveIntegerField(default=0)
+    comment_count        = models.PositiveIntegerField(default=0)
+    view_count           = models.PositiveIntegerField(default=0)
+    offensive_flag_count = models.SmallIntegerField(default=0)
+    favourite_count      = models.PositiveIntegerField(default=0)
+    last_edited_at       = models.DateTimeField(null=True, blank=True)
+    last_edited_by       = models.ForeignKey(User, null=True, blank=True, related_name='last_edited_questions')
+    last_activity_at     = models.DateTimeField(default=datetime.datetime.now)
+    last_activity_by     = models.ForeignKey(User, related_name='last_active_in_questions')
+    tagnames             = models.CharField(max_length=125)
+    summary              = models.CharField(max_length=180)
+    html                 = models.TextField()
+    comments             = generic.GenericRelation(Comment)
+    votes                = generic.GenericRelation(Vote)
+    flagged_items        = generic.GenericRelation(FlaggedItem)
+
+    objects = QuestionManager()
+
+    def save(self, **kwargs):
+        """
+        Overridden to manually manage addition of tags when the object
+        is first saved.
+
+        This is required as we're using ``tagnames`` as the sole means of
+        adding and editing tags.
+        """
+        initial_addition = (self.id is None)
+        super(Question, self).save(**kwargs)
+        if initial_addition:
+            tags = Tag.objects.get_or_create_multiple(self.tagname_list(),
+                                                      self.author)
+            self.tags.add(*tags)
+            Tag.objects.update_use_counts(tags)
+
+    def tagname_list(self):
+        """Creates a list of Tag names from the ``tagnames`` attribute."""
+        return [name for name in self.tagnames.split(u' ')]
+
+    def get_absolute_url(self):
+        return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-'))
+
+    def has_favorite_by_user(self, user):
+        if not user.is_authenticated():
+            return False
+        return FavoriteQuestion.objects.filter(question=self, user=user).count() > 0
+
+    def get_answer_count_by_user(self, user_id):
+        query_set = Answer.objects.filter(author__id=user_id)
+        return query_set.filter(question=self).count()
+
+    def get_question_title(self):
+        if self.closed:
+            attr = CONST['closed'] 
+        elif self.deleted:
+            attr = CONST['deleted']
+        else:
+            attr = None
+        return u'%s %s' % (self.title, attr) if attr is not None else self.title
+
+    def get_revision_url(self):
+        return reverse('question_revisions', args=[self.id])
+
+    def get_latest_revision(self):
+        return self.revisions.all()[0]
+
+    def __unicode__(self):
+        return self.title
+
+    class Meta:
+        db_table = u'question'
+
+class QuestionRevision(models.Model):
+    """A revision of a Question."""
+    question   = models.ForeignKey(Question, related_name='revisions')
+    revision   = models.PositiveIntegerField(blank=True)
+    title      = models.CharField(max_length=300)
+    author     = models.ForeignKey(User, related_name='question_revisions')
+    revised_at = models.DateTimeField()
+    tagnames   = models.CharField(max_length=125)
+    summary    = models.CharField(max_length=300, blank=True)
+    text       = models.TextField()
+
+    class Meta:
+        db_table = u'question_revision'
+        ordering = ('-revision',)
+
+    def get_question_title(self):
+        return self.question.title
+
+    def get_absolute_url(self):
+        return '/questions/%s/revisions' % (self.question.id)
+
+    def save(self, **kwargs):
+        """Looks up the next available revision number."""
+        if not self.revision:
+            self.revision = QuestionRevision.objects.filter(
+                question=self.question).values_list('revision',
+                                                    flat=True)[0] + 1
+        super(QuestionRevision, self).save(**kwargs)
+
+    def __unicode__(self):
+        return u'revision %s of %s' % (self.revision, self.title)
+
+class Answer(models.Model):
+    question = models.ForeignKey(Question, related_name='answers')
+    author   = models.ForeignKey(User, related_name='answers')
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    # Status
+    wiki        = models.BooleanField(default=False)
+    wikified_at = models.DateTimeField(null=True, blank=True)
+    accepted    = models.BooleanField(default=False)
+    accepted_at = models.DateTimeField(null=True, blank=True)
+    deleted     = models.BooleanField(default=False)
+    deleted_by  = models.ForeignKey(User, null=True, blank=True, related_name='deleted_answers')
+    locked      = models.BooleanField(default=False)
+    locked_by   = models.ForeignKey(User, null=True, blank=True, related_name='locked_answers')
+    locked_at   = models.DateTimeField(null=True, blank=True)
+    # Denormalised data
+    score                = models.IntegerField(default=0)
+    vote_up_count        = models.IntegerField(default=0)
+    vote_down_count      = models.IntegerField(default=0)
+    comment_count        = models.PositiveIntegerField(default=0)
+    offensive_flag_count = models.SmallIntegerField(default=0)
+    last_edited_at       = models.DateTimeField(null=True, blank=True)
+    last_edited_by       = models.ForeignKey(User, null=True, blank=True, related_name='last_edited_answers')
+    html                 = models.TextField()
+    comments             = generic.GenericRelation(Comment)
+    votes                = generic.GenericRelation(Vote)
+    flagged_items        = generic.GenericRelation(FlaggedItem)
+
+    objects = AnswerManager()
+
+    def get_user_vote(self, user):
+        votes = self.votes.filter(user=user)
+        if votes.count() > 0:
+            return votes[0]
+        else:
+            return None
+
+    def get_latest_revision(self):
+        return self.revisions.all()[0]
+
+    def get_question_title(self):
+        return self.question.title
+
+    def get_absolute_url(self):
+        return '%s%s#%s' % (reverse('question', args=[self.question.id]), self.question.title, self.id)
+
+    class Meta:
+        db_table = u'answer'
+
+    def __unicode__(self):
+        return self.html
+
+class AnswerRevision(models.Model):
+    """A revision of an Answer."""
+    answer     = models.ForeignKey(Answer, related_name='revisions')
+    revision   = models.PositiveIntegerField()
+    author     = models.ForeignKey(User, related_name='answer_revisions')
+    revised_at = models.DateTimeField()
+    summary    = models.CharField(max_length=300, blank=True)
+    text       = models.TextField()
+
+    def get_absolute_url(self):
+        return '/answers/%s/revisions' % (self.answer.id)
+
+    def get_question_title(self):
+        return self.answer.question.title
+
+    class Meta:
+        db_table = u'answer_revision'
+        ordering = ('-revision',)
+
+    def save(self, **kwargs):
+        """Looks up the next available revision number if not set."""
+        if not self.revision:
+            self.revision = AnswerRevision.objects.filter(
+                answer=self.answer).values_list('revision',
+                                                flat=True)[0] + 1
+        super(AnswerRevision, self).save(**kwargs)
+
+class FavoriteQuestion(models.Model):
+    """A favorite Question of a User."""
+    question      = models.ForeignKey(Question)
+    user          = models.ForeignKey(User, related_name='user_favorite_questions')
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    class Meta:
+        db_table = u'favorite_question'
+    def __unicode__(self):
+        return '[%s] favorited at %s' %(self.user, self.added_at)
+
+class Badge(models.Model):
+    """Awarded for notable actions performed on the site by Users."""
+    GOLD = 1
+    SILVER = 2
+    BRONZE = 3
+    TYPE_CHOICES = (
+        (GOLD,   _('gold')),
+        (SILVER, _('silver')),
+        (BRONZE, _('bronze')),
+    )
+
+    name        = models.CharField(max_length=50)
+    type        = models.SmallIntegerField(choices=TYPE_CHOICES)
+    slug        = models.SlugField(max_length=50, blank=True)
+    description = models.CharField(max_length=300)
+    multiple    = models.BooleanField(default=False)
+    # Denormalised data
+    awarded_count = models.PositiveIntegerField(default=0)
+
+    class Meta:
+        db_table = u'badge'
+        ordering = ('name',)
+        unique_together = ('name', 'type')
+
+    def __unicode__(self):
+        return u'%s: %s' % (self.get_type_display(), self.name)
+
+    def save(self, **kwargs):
+        if not self.slug:
+            self.slug = self.name#slugify(self.name)
+        super(Badge, self).save(**kwargs)
+
+    def get_absolute_url(self):
+        return '%s%s/' % (reverse('badge', args=[self.id]), self.slug)
+
+class Award(models.Model):
+    """The awarding of a Badge to a User."""
+    user       = models.ForeignKey(User, related_name='award_user')
+    badge      = models.ForeignKey(Badge, related_name='award_badge')
+    content_type   = models.ForeignKey(ContentType)
+    object_id      = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    awarded_at = models.DateTimeField(default=datetime.datetime.now)
+    notified   = models.BooleanField(default=False)
+    objects = AwardManager()
+    
+    def __unicode__(self):
+        return u'[%s] is awarded a badge [%s] at %s' % (self.user.username, self.badge.name, self.awarded_at)
+
+    class Meta:
+        db_table = u'award'
+
+class Repute(models.Model):
+    """The reputation histories for user"""
+    user     = models.ForeignKey(User)
+    positive = models.SmallIntegerField(default=0)
+    negative = models.SmallIntegerField(default=0)
+    question = models.ForeignKey(Question)
+    reputed_at = models.DateTimeField(default=datetime.datetime.now)
+    reputation_type = models.SmallIntegerField(choices=TYPE_REPUTATION)
+    reputation = models.IntegerField(default=1)
+    objects = ReputeManager()
+
+    def __unicode__(self):
+        return u'[%s]\' reputation changed at %s' % (self.user.username, self.reputed_at)
+
+    class Meta:
+        db_table = u'repute'
+
+class Activity(models.Model):
+    """
+    We keep some history data for user activities
+    """
+    user = models.ForeignKey(User)
+    activity_type = models.SmallIntegerField(choices=TYPE_ACTIVITY)
+    active_at = models.DateTimeField(default=datetime.datetime.now)
+    content_type   = models.ForeignKey(ContentType)
+    object_id      = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    is_auditted    = models.BooleanField(default=False)
+
+    def __unicode__(self):
+        return u'[%s] was active at %s' % (self.user.username, self.active_at)
+
+    class Meta:
+        db_table = u'activity'
+
+class Book(models.Model):
+    """
+    Model for book info
+    """
+    user = models.ForeignKey(User)
+    title = models.CharField(max_length=255)
+    short_name = models.CharField(max_length=255)
+    author = models.CharField(max_length=255)
+    price = models.DecimalField(max_digits=6, decimal_places=2)
+    pages = models.SmallIntegerField()
+    published_at = models.DateTimeField()
+    publication = models.CharField(max_length=255)
+    cover_img = models.CharField(max_length=255)
+    tagnames = models.CharField(max_length=125)
+    added_at = models.DateTimeField()
+    last_edited_at = models.DateTimeField()
+    questions = models.ManyToManyField(Question, related_name='book', db_table='book_question')
+    
+    def get_absolute_url(self):
+        return '%s' % reverse('book', args=[self.short_name])
+        
+    def __unicode__(self):
+        return self.title
+    class Meta:
+        db_table = u'book'
+
+class BookAuthorInfo(models.Model):
+    """
+    Model for book author info
+    """
+    user = models.ForeignKey(User)
+    book = models.ForeignKey(Book)
+    blog_url = models.CharField(max_length=255)
+    added_at = models.DateTimeField()
+    last_edited_at = models.DateTimeField()
+    
+    class Meta:
+        db_table = u'book_author_info'
+    
+class BookAuthorRss(models.Model):
+    """
+    Model for book author blog rss
+    """
+    user = models.ForeignKey(User)
+    book = models.ForeignKey(Book)
+    title = models.CharField(max_length=255)
+    url = models.CharField(max_length=255)
+    rss_created_at = models.DateTimeField()
+    added_at = models.DateTimeField()
+    
+    class Meta:
+        db_table = u'book_author_rss'
+
+# User extend properties
+QUESTIONS_PER_PAGE_CHOICES = (
+   (10, u'10'),
+   (30, u'30'),
+   (50, u'50'),
+)
+
+User.add_to_class('reputation', models.PositiveIntegerField(default=1))
+User.add_to_class('gravatar', models.CharField(max_length=32))
+User.add_to_class('favorite_questions',
+                  models.ManyToManyField(Question, through=FavoriteQuestion,
+                                         related_name='favorited_by'))
+User.add_to_class('badges', models.ManyToManyField(Badge, through=Award,
+                                                   related_name='awarded_to'))
+User.add_to_class('gold', models.SmallIntegerField(default=0))
+User.add_to_class('silver', models.SmallIntegerField(default=0))
+User.add_to_class('bronze', models.SmallIntegerField(default=0))
+User.add_to_class('questions_per_page',
+                  models.SmallIntegerField(choices=QUESTIONS_PER_PAGE_CHOICES, default=10))
+User.add_to_class('last_seen',
+                  models.DateTimeField(default=datetime.datetime.now))
+User.add_to_class('real_name', models.CharField(max_length=100, blank=True))
+User.add_to_class('website', models.URLField(max_length=200, blank=True))
+User.add_to_class('location', models.CharField(max_length=100, blank=True))
+User.add_to_class('date_of_birth', models.DateField(null=True, blank=True))
+User.add_to_class('about', models.TextField(blank=True))
+
+# custom signal
+tags_updated = django.dispatch.Signal(providing_args=["question"])
+edit_question_or_answer = django.dispatch.Signal(providing_args=["instance", "modified_by"])
+delete_post_or_answer = django.dispatch.Signal(providing_args=["instance", "deleted_by"])
+mark_offensive = django.dispatch.Signal(providing_args=["instance", "mark_by"])
+user_updated = django.dispatch.Signal(providing_args=["instance", "updated_by"])
+def get_messages(self):
+        messages = []
+        for m in self.message_set.all():
+            messages.append(m.message)
+        return messages
+
+def delete_messages(self):
+    self.message_set.all().delete()
+
+def get_profile_url(self):
+    """Returns the URL for this User's profile."""
+    return '%s%s/' % (reverse('user', args=[self.id]), self.username)
+User.add_to_class('get_profile_url', get_profile_url)
+User.add_to_class('get_messages', get_messages)
+User.add_to_class('delete_messages', delete_messages)
+
+def calculate_gravatar_hash(instance, **kwargs):
+    """Calculates a User's gravatar hash from their email address."""
+    if kwargs.get('raw', False):
+        return
+    instance.gravatar = hashlib.md5(instance.email).hexdigest()
+
+def record_ask_event(instance, created, **kwargs):
+    if created:
+        activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ASK_QUESTION)
+        activity.save()
+
+def record_answer_event(instance, created, **kwargs):
+    if created:
+        activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ANSWER)
+        activity.save()
+
+def record_comment_event(instance, created, **kwargs):
+    if created:
+        from django.contrib.contenttypes.models import ContentType
+        question_type = ContentType.objects.get_for_model(Question)
+        question_type_id = question_type.id
+        type = TYPE_ACTIVITY_COMMENT_QUESTION if instance.content_type_id == question_type_id else TYPE_ACTIVITY_COMMENT_ANSWER
+        activity = Activity(user=instance.user, active_at=instance.added_at, content_object=instance, activity_type=type)
+        activity.save()
+
+def record_revision_question_event(instance, created, **kwargs):
+    if created and instance.revision <> 1:
+        activity = Activity(user=instance.author, active_at=instance.revised_at, content_object=instance, activity_type=TYPE_ACTIVITY_UPDATE_QUESTION)
+        activity.save()
+
+def record_revision_answer_event(instance, created, **kwargs):
+    if created and instance.revision <> 1:
+        activity = Activity(user=instance.author, active_at=instance.revised_at, content_object=instance, activity_type=TYPE_ACTIVITY_UPDATE_ANSWER)
+        activity.save()
+
+def record_award_event(instance, created, **kwargs):
+    """
+    After we awarded a badge to user, we need to record this activity and notify user.
+    We also recaculate awarded_count of this badge and user information.
+    """
+    if created:
+        activity = Activity(user=instance.user, active_at=instance.awarded_at, content_object=instance,
+            activity_type=TYPE_ACTIVITY_PRIZE)
+        activity.save()
+
+        instance.badge.awarded_count += 1
+        instance.badge.save()
+
+        if instance.badge.type == Badge.GOLD:
+            instance.user.gold += 1
+        if instance.badge.type == Badge.SILVER:
+            instance.user.silver += 1
+        if instance.badge.type == Badge.BRONZE:
+            instance.user.bronze += 1
+        instance.user.save()
+
+def notify_award_message(instance, created, **kwargs):
+    """
+    Notify users when they have been awarded badges by using Django message.
+    """
+    if created:
+        user = instance.user
+        user.message_set.create(message=u"%s" % instance.badge.name)
+
+def record_answer_accepted(instance, created, **kwargs):
+    """
+    when answer is accepted, we record this for question author - who accepted it.
+    """
+    if not created and instance.accepted:
+        activity = Activity(user=instance.question.author, active_at=datetime.datetime.now(), \
+            content_object=instance, activity_type=TYPE_ACTIVITY_MARK_ANSWER)
+        activity.save()
+
+def update_last_seen(instance, created, **kwargs):
+    """
+    when user has activities, we update 'last_seen' time stamp for him
+    """
+    user = instance.user
+    user.last_seen = datetime.datetime.now()
+    user.save()
+
+def record_vote(instance, created, **kwargs):
+    """
+    when user have voted
+    """
+    if created:
+        if instance.vote == 1:
+            vote_type = TYPE_ACTIVITY_VOTE_UP
+        else:
+            vote_type = TYPE_ACTIVITY_VOTE_DOWN
+
+        activity = Activity(user=instance.user, active_at=instance.voted_at, content_object=instance, activity_type=vote_type)
+        activity.save()
+
+def record_cancel_vote(instance, **kwargs):
+    """
+    when user canceled vote, the vote will be deleted.
+    """
+    activity = Activity(user=instance.user, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_CANCEL_VOTE)
+    activity.save()
+
+def record_delete_question(instance, delete_by, **kwargs):
+    """
+    when user deleted the question
+    """
+    if instance.__class__ == "Question":
+        activity_type = TYPE_ACTIVITY_DELETE_QUESTION
+    else:
+        activity_type = TYPE_ACTIVITY_DELETE_ANSWER
+
+    activity = Activity(user=delete_by, active_at=datetime.datetime.now(), content_object=instance, activity_type=activity_type)
+    activity.save()
+
+def record_mark_offensive(instance, mark_by, **kwargs):
+    activity = Activity(user=mark_by, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_MARK_OFFENSIVE)
+    activity.save()
+
+def record_update_tags(question, **kwargs):
+    """
+    when user updated tags of the question
+    """
+    activity = Activity(user=question.author, active_at=datetime.datetime.now(), content_object=question, activity_type=TYPE_ACTIVITY_UPDATE_TAGS)
+    activity.save()
+
+def record_favorite_question(instance, created, **kwargs):
+    """
+    when user add the question in him favorite questions list.
+    """
+    if created:
+        activity = Activity(user=instance.user, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_FAVORITE)
+        activity.save()
+
+def record_user_full_updated(instance, **kwargs):
+    activity = Activity(user=instance, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_USER_FULL_UPDATED)
+    activity.save()
+
+#signal for User modle save changes
+pre_save.connect(calculate_gravatar_hash, sender=User)
+post_save.connect(record_ask_event, sender=Question)
+post_save.connect(record_answer_event, sender=Answer)
+post_save.connect(record_comment_event, sender=Comment)
+post_save.connect(record_revision_question_event, sender=QuestionRevision)
+post_save.connect(record_revision_answer_event, sender=AnswerRevision)
+post_save.connect(record_award_event, sender=Award)
+post_save.connect(notify_award_message, sender=Award)
+post_save.connect(record_answer_accepted, sender=Answer)
+post_save.connect(update_last_seen, sender=Activity)
+post_save.connect(record_vote, sender=Vote)
+post_delete.connect(record_cancel_vote, sender=Vote)
+delete_post_or_answer.connect(record_delete_question, sender=Question)
+delete_post_or_answer.connect(record_delete_question, sender=Answer)
+mark_offensive.connect(record_mark_offensive, sender=Question)
+mark_offensive.connect(record_mark_offensive, sender=Answer)
+tags_updated.connect(record_update_tags, sender=Question)
+post_save.connect(record_favorite_question, sender=FavoriteQuestion)
+user_updated.connect(record_user_full_updated, sender=User)
diff --git a/forum/templatetags/extra_filters.py b/forum/templatetags/extra_filters.py
index 744fa762..cec97920 100644
--- a/forum/templatetags/extra_filters.py
+++ b/forum/templatetags/extra_filters.py
@@ -1,83 +1,83 @@
-from django import template
-from forum import auth
-
-register = template.Library()
-
-@register.filter
-def can_vote_up(user):
-    return auth.can_vote_up(user)
-
-@register.filter
-def can_flag_offensive(user):
-    return auth.can_flag_offensive(user)
-
-@register.filter
-def can_add_comments(user):
-    return auth.can_add_comments(user)
-
-@register.filter
-def can_vote_down(user):
-    return auth.can_vote_down(user)
-
-@register.filter
-def can_retag_questions(user):
-    return auth.can_retag_questions(user)
-
-@register.filter
-def can_edit_post(user, post):
-    return auth.can_edit_post(user, post)
-
-@register.filter
-def can_delete_comment(user, comment):
-    return auth.can_delete_comment(user, comment)
-
-@register.filter
-def can_view_offensive_flags(user):
-    return auth.can_view_offensive_flags(user)
-
-@register.filter
-def can_close_question(user, question):
-    return auth.can_close_question(user, question)
-
-@register.filter
-def can_lock_posts(user):
-    return auth.can_lock_posts(user)
-    
-@register.filter
-def can_accept_answer(user, question, answer):
-    return auth.can_accept_answer(user, question, answer)
-    
-@register.filter
-def can_reopen_question(user, question):
-    return auth.can_reopen_question(user, question)
-
-@register.filter
-def can_delete_post(user, post):
-    return auth.can_delete_post(user, post)
-    
-@register.filter
-def can_view_user_edit(request_user, target_user):
-    return auth.can_view_user_edit(request_user, target_user)
-    
-@register.filter
-def can_view_user_votes(request_user, target_user):
-    return auth.can_view_user_votes(request_user, target_user)
-    
-@register.filter
-def can_view_user_preferences(request_user, target_user):
-    return auth.can_view_user_preferences(request_user, target_user)
-    
-@register.filter
-def is_user_self(request_user, target_user):
-    return auth.is_user_self(request_user, target_user)
-    
-@register.filter
-def cnprog_intword(number):
-    try:
-        if 1000 <= number < 10000:
-            string = str(number)[0:1]
-            return "<span class=""thousand"">%sk</span>" % string
-        else:
-            return number
-    except:
+from django import template
+from forum import auth
+
+register = template.Library()
+
+@register.filter
+def can_vote_up(user):
+    return auth.can_vote_up(user)
+
+@register.filter
+def can_flag_offensive(user):
+    return auth.can_flag_offensive(user)
+
+@register.filter
+def can_add_comments(user):
+    return auth.can_add_comments(user)
+
+@register.filter
+def can_vote_down(user):
+    return auth.can_vote_down(user)
+
+@register.filter
+def can_retag_questions(user):
+    return auth.can_retag_questions(user)
+
+@register.filter
+def can_edit_post(user, post):
+    return auth.can_edit_post(user, post)
+
+@register.filter
+def can_delete_comment(user, comment):
+    return auth.can_delete_comment(user, comment)
+
+@register.filter
+def can_view_offensive_flags(user):
+    return auth.can_view_offensive_flags(user)
+
+@register.filter
+def can_close_question(user, question):
+    return auth.can_close_question(user, question)
+
+@register.filter
+def can_lock_posts(user):
+    return auth.can_lock_posts(user)
+    
+@register.filter
+def can_accept_answer(user, question, answer):
+    return auth.can_accept_answer(user, question, answer)
+    
+@register.filter
+def can_reopen_question(user, question):
+    return auth.can_reopen_question(user, question)
+
+@register.filter
+def can_delete_post(user, post):
+    return auth.can_delete_post(user, post)
+    
+@register.filter
+def can_view_user_edit(request_user, target_user):
+    return auth.can_view_user_edit(request_user, target_user)
+    
+@register.filter
+def can_view_user_votes(request_user, target_user):
+    return auth.can_view_user_votes(request_user, target_user)
+    
+@register.filter
+def can_view_user_preferences(request_user, target_user):
+    return auth.can_view_user_preferences(request_user, target_user)
+    
+@register.filter
+def is_user_self(request_user, target_user):
+    return auth.is_user_self(request_user, target_user)
+    
+@register.filter
+def cnprog_intword(number):
+    try:
+        if 1000 <= number < 10000:
+            string = str(number)[0:1]
+            return "<span class=""thousand"">%sk</span>" % string
+        else:
+            return number
+    except:
         return number
\ No newline at end of file
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index 1a4d3641..6c826771 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -1,240 +1,240 @@
-import time
-import datetime
-import math
-import re
-import logging
-from django import template
-from django.utils.encoding import smart_unicode
-from django.utils.safestring import mark_safe
-from django.utils.timesince import timesince
-from forum.const import *
-from django.utils.translation import ugettext as _
-
-register = template.Library()
-
-GRAVATAR_TEMPLATE = ('<img width="%(size)s" height="%(size)s" '
-                     'src="http://www.gravatar.com/avatar/%(gravatar_hash)s'
-                     '?s=%(size)s&d=identicon&r=PG">')
-
-@register.simple_tag
-def gravatar(user, size):
-    """
-    Creates an ``<img>`` for a user's Gravatar with a given size.
-
-    This tag can accept a User object, or a dict containing the
-    appropriate values.
-    """
-    try:
-        gravatar = user['gravatar']
-    except (TypeError, AttributeError, KeyError):
-        gravatar = user.gravatar
-    return mark_safe(GRAVATAR_TEMPLATE % {
-        'size': size,
-        'gravatar_hash': gravatar,
-    })
-
-MAX_FONTSIZE = 18
-MIN_FONTSIZE = 12
-@register.simple_tag
-def tag_font_size(max_size, min_size, current_size):
-    """
-    do a logarithmic mapping calcuation for a proper size for tagging cloud
-    Algorithm from http://blogs.dekoh.com/dev/2007/10/29/choosing-a-good-font-size-variation-algorithm-for-your-tag-cloud/
-    """
-    #avoid invalid calculation
-    if current_size == 0:
-        current_size = 1
-    try:
-        weight = (math.log10(current_size) - math.log10(min_size)) / (math.log10(max_size) - math.log10(min_size))
-    except:
-        weight = 0
-    return MIN_FONTSIZE + round((MAX_FONTSIZE - MIN_FONTSIZE) * weight)
-
-
-LEADING_PAGE_RANGE_DISPLAYED = TRAILING_PAGE_RANGE_DISPLAYED = 5
-LEADING_PAGE_RANGE = TRAILING_PAGE_RANGE = 4
-NUM_PAGES_OUTSIDE_RANGE = 1
-ADJACENT_PAGES = 2
-@register.inclusion_tag("paginator.html")
-def cnprog_paginator(context):
-    """
-    custom paginator tag
-    Inspired from http://blog.localkinegrinds.com/2007/09/06/digg-style-pagination-in-django/
-    """
-    if (context["is_paginated"]):
-        " Initialize variables "
-        in_leading_range = in_trailing_range = False
-        pages_outside_leading_range = pages_outside_trailing_range = range(0)
-
-        if (context["pages"] <= LEADING_PAGE_RANGE_DISPLAYED):
-            in_leading_range = in_trailing_range = True
-            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
-        elif (context["page"] <= LEADING_PAGE_RANGE):
-            in_leading_range = True
-            page_numbers = [n for n in range(1, LEADING_PAGE_RANGE_DISPLAYED + 1) if n > 0 and n <= context["pages"]]
-            pages_outside_leading_range = [n + context["pages"] for n in range(0, -NUM_PAGES_OUTSIDE_RANGE, -1)]
-        elif (context["page"] > context["pages"] - TRAILING_PAGE_RANGE):
-            in_trailing_range = True
-            page_numbers = [n for n in range(context["pages"] - TRAILING_PAGE_RANGE_DISPLAYED + 1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
-            pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
-        else:
-            page_numbers = [n for n in range(context["page"] - ADJACENT_PAGES, context["page"] + ADJACENT_PAGES + 1) if n > 0 and n <= context["pages"]]
-            pages_outside_leading_range = [n + context["pages"] for n in range(0, -NUM_PAGES_OUTSIDE_RANGE, -1)]
-            pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
-
-        extend_url = context.get('extend_url', '')
-        return {
-            "base_url": context["base_url"],
-            "is_paginated": context["is_paginated"],
-            "previous": context["previous"],
-            "has_previous": context["has_previous"],
-            "next": context["next"],
-            "has_next": context["has_next"],
-            "page": context["page"],
-            "pages": context["pages"],
-            "page_numbers": page_numbers,
-            "in_leading_range" : in_leading_range,
-            "in_trailing_range" : in_trailing_range,
-            "pages_outside_leading_range": pages_outside_leading_range,
-            "pages_outside_trailing_range": pages_outside_trailing_range,
-            "extend_url" : extend_url
-        }
-
-@register.inclusion_tag("pagesize.html")
-def cnprog_pagesize(context):
-    """
-    display the pagesize selection boxes for paginator
-    """
-    if (context["is_paginated"]):
-        return {
-            "base_url": context["base_url"],
-            "pagesize" : context["pagesize"],
-            "is_paginated": context["is_paginated"]
-        }
-        
-@register.simple_tag
-def get_score_badge(user):
-    BADGE_TEMPLATE = '<span class="score" title="%(reputation)s %(reputationword)s">%(reputation)s</span>'
-    if user.gold > 0 :
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(gold)s %(badgesword)s">'
-        '<span class="badge1">&#9679;</span>'
-        '<span class="badgecount">%(gold)s</span>'
-        '</span>')
-    if user.silver > 0:
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(silver)s %(badgesword)s">'
-        '<span class="silver">&#9679;</span>'
-        '<span class="badgecount">%(silver)s</span>'
-        '</span>')
-    if user.bronze > 0:
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(bronze)s %(badgesword)s">'
-        '<span class="bronze">&#9679;</span>'
-        '<span class="badgecount">%(bronze)s</span>'
-        '</span>')
-    BADGE_TEMPLATE = smart_unicode(BADGE_TEMPLATE, encoding='utf-8', strings_only=False, errors='strict')
-    return mark_safe(BADGE_TEMPLATE % {
-        'reputation' : user.reputation,
-        'gold' : user.gold,
-        'silver' : user.silver,
-        'bronze' : user.bronze,
-		'badgesword' : _('badges'),
-		'reputationword' : _('reputation points'),
-    })
-    
-@register.simple_tag
-def get_score_badge_by_details(rep, gold, silver, bronze):
-    BADGE_TEMPLATE = '<span class="reputation-score" title="%(reputation)s %(repword)s">%(reputation)s</span>'
-    if gold > 0 :
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(gold)s %(badgeword)s">'
-        '<span class="badge1">&#9679;</span>'
-        '<span class="badgecount">%(gold)s</span>'
-        '</span>')
-    if silver > 0:
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(silver)s %(badgeword)s">'
-        '<span class="badge2">&#9679;</span>'
-        '<span class="badgecount">%(silver)s</span>'
-        '</span>')
-    if bronze > 0:
-        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(bronze)s %(badgeword)s">'
-        '<span class="badge3">&#9679;</span>'
-        '<span class="badgecount">%(bronze)s</span>'
-        '</span>')
-    BADGE_TEMPLATE = smart_unicode(BADGE_TEMPLATE, encoding='utf-8', strings_only=False, errors='strict')
-    return mark_safe(BADGE_TEMPLATE % {
-        'reputation' : rep,
-        'gold' : gold,
-        'silver' : silver,
-        'bronze' : bronze,
-		'repword' : _('reputation points'),
-		'badgeword' : _('badges'),
-    })      
-    
-@register.simple_tag
-def get_user_vote_image(dic, key, arrow):
-    if dic.has_key(key):
-        if int(dic[key]) == int(arrow):
-            return '-on'
-    return ''
-        
-@register.simple_tag
-def get_age(birthday):
-    current_time = datetime.datetime(*time.localtime()[0:6])
-    year = birthday.year
-    month = birthday.month
-    day = birthday.day
-    diff = current_time - datetime.datetime(year,month,day,0,0,0)
-    return diff.days / 365
-
-@register.simple_tag
-def get_total_count(up_count, down_count):
-    return up_count + down_count
-
-@register.simple_tag
-def format_number(value):
-    strValue = str(value)
-    if len(strValue) <= 3:
-        return strValue
-    result = ''
-    first = ''
-    pattern = re.compile('(-?\d+)(\d{3})')
-    m = re.match(pattern, strValue)
-    while m != None:
-        first = m.group(1)
-        second = m.group(2)
-        result = ',' + second + result
-        strValue = first + ',' + second
-        m = re.match(pattern, strValue)
-    return first + result
-
-@register.simple_tag
-def convert2tagname_list(question):
-    question['tagnames'] = [name for name in question['tagnames'].split(u' ')]
-    return ''
-
-@register.simple_tag
-def diff_date(date, limen=2):
-    current_time = datetime.datetime(*time.localtime()[0:6])
-    diff = current_time - date
-    diff_days = diff.days
-    if diff_days > limen:
-        return date
-    else:
-        return timesince(date) + _(' ago')
-        
-@register.simple_tag
-def get_latest_changed_timestamp():
-    try:
-        from time import localtime, strftime
-        from os import path
-        from django.conf import settings
-        root = settings.SITE_SRC_ROOT
-        dir = (
-            root,
-            '%s/forum' % root,
-            '%s/templates' % root,
-        )
-        stamp = (path.getmtime(d) for d in dir)
-        latest = max(stamp)
-        timestr = strftime("%H:%M %b-%d-%Y %Z", localtime(latest))
-    except:
-        timestr = ''
+import time
+import datetime
+import math
+import re
+import logging
+from django import template
+from django.utils.encoding import smart_unicode
+from django.utils.safestring import mark_safe
+from django.utils.timesince import timesince
+from forum.const import *
+from django.utils.translation import ugettext as _
+
+register = template.Library()
+
+GRAVATAR_TEMPLATE = ('<img width="%(size)s" height="%(size)s" '
+                     'src="http://www.gravatar.com/avatar/%(gravatar_hash)s'
+                     '?s=%(size)s&d=identicon&r=PG">')
+
+@register.simple_tag
+def gravatar(user, size):
+    """
+    Creates an ``<img>`` for a user's Gravatar with a given size.
+
+    This tag can accept a User object, or a dict containing the
+    appropriate values.
+    """
+    try:
+        gravatar = user['gravatar']
+    except (TypeError, AttributeError, KeyError):
+        gravatar = user.gravatar
+    return mark_safe(GRAVATAR_TEMPLATE % {
+        'size': size,
+        'gravatar_hash': gravatar,
+    })
+
+MAX_FONTSIZE = 18
+MIN_FONTSIZE = 12
+@register.simple_tag
+def tag_font_size(max_size, min_size, current_size):
+    """
+    do a logarithmic mapping calcuation for a proper size for tagging cloud
+    Algorithm from http://blogs.dekoh.com/dev/2007/10/29/choosing-a-good-font-size-variation-algorithm-for-your-tag-cloud/
+    """
+    #avoid invalid calculation
+    if current_size == 0:
+        current_size = 1
+    try:
+        weight = (math.log10(current_size) - math.log10(min_size)) / (math.log10(max_size) - math.log10(min_size))
+    except:
+        weight = 0
+    return MIN_FONTSIZE + round((MAX_FONTSIZE - MIN_FONTSIZE) * weight)
+
+
+LEADING_PAGE_RANGE_DISPLAYED = TRAILING_PAGE_RANGE_DISPLAYED = 5
+LEADING_PAGE_RANGE = TRAILING_PAGE_RANGE = 4
+NUM_PAGES_OUTSIDE_RANGE = 1
+ADJACENT_PAGES = 2
+@register.inclusion_tag("paginator.html")
+def cnprog_paginator(context):
+    """
+    custom paginator tag
+    Inspired from http://blog.localkinegrinds.com/2007/09/06/digg-style-pagination-in-django/
+    """
+    if (context["is_paginated"]):
+        " Initialize variables "
+        in_leading_range = in_trailing_range = False
+        pages_outside_leading_range = pages_outside_trailing_range = range(0)
+
+        if (context["pages"] <= LEADING_PAGE_RANGE_DISPLAYED):
+            in_leading_range = in_trailing_range = True
+            page_numbers = [n for n in range(1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
+        elif (context["page"] <= LEADING_PAGE_RANGE):
+            in_leading_range = True
+            page_numbers = [n for n in range(1, LEADING_PAGE_RANGE_DISPLAYED + 1) if n > 0 and n <= context["pages"]]
+            pages_outside_leading_range = [n + context["pages"] for n in range(0, -NUM_PAGES_OUTSIDE_RANGE, -1)]
+        elif (context["page"] > context["pages"] - TRAILING_PAGE_RANGE):
+            in_trailing_range = True
+            page_numbers = [n for n in range(context["pages"] - TRAILING_PAGE_RANGE_DISPLAYED + 1, context["pages"] + 1) if n > 0 and n <= context["pages"]]
+            pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
+        else:
+            page_numbers = [n for n in range(context["page"] - ADJACENT_PAGES, context["page"] + ADJACENT_PAGES + 1) if n > 0 and n <= context["pages"]]
+            pages_outside_leading_range = [n + context["pages"] for n in range(0, -NUM_PAGES_OUTSIDE_RANGE, -1)]
+            pages_outside_trailing_range = [n + 1 for n in range(0, NUM_PAGES_OUTSIDE_RANGE)]
+
+        extend_url = context.get('extend_url', '')
+        return {
+            "base_url": context["base_url"],
+            "is_paginated": context["is_paginated"],
+            "previous": context["previous"],
+            "has_previous": context["has_previous"],
+            "next": context["next"],
+            "has_next": context["has_next"],
+            "page": context["page"],
+            "pages": context["pages"],
+            "page_numbers": page_numbers,
+            "in_leading_range" : in_leading_range,
+            "in_trailing_range" : in_trailing_range,
+            "pages_outside_leading_range": pages_outside_leading_range,
+            "pages_outside_trailing_range": pages_outside_trailing_range,
+            "extend_url" : extend_url
+        }
+
+@register.inclusion_tag("pagesize.html")
+def cnprog_pagesize(context):
+    """
+    display the pagesize selection boxes for paginator
+    """
+    if (context["is_paginated"]):
+        return {
+            "base_url": context["base_url"],
+            "pagesize" : context["pagesize"],
+            "is_paginated": context["is_paginated"]
+        }
+        
+@register.simple_tag
+def get_score_badge(user):
+    BADGE_TEMPLATE = '<span class="score" title="%(reputation)s %(reputationword)s">%(reputation)s</span>'
+    if user.gold > 0 :
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(gold)s %(badgesword)s">'
+        '<span class="badge1">&#9679;</span>'
+        '<span class="badgecount">%(gold)s</span>'
+        '</span>')
+    if user.silver > 0:
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(silver)s %(badgesword)s">'
+        '<span class="silver">&#9679;</span>'
+        '<span class="badgecount">%(silver)s</span>'
+        '</span>')
+    if user.bronze > 0:
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(bronze)s %(badgesword)s">'
+        '<span class="bronze">&#9679;</span>'
+        '<span class="badgecount">%(bronze)s</span>'
+        '</span>')
+    BADGE_TEMPLATE = smart_unicode(BADGE_TEMPLATE, encoding='utf-8', strings_only=False, errors='strict')
+    return mark_safe(BADGE_TEMPLATE % {
+        'reputation' : user.reputation,
+        'gold' : user.gold,
+        'silver' : user.silver,
+        'bronze' : user.bronze,
+		'badgesword' : _('badges'),
+		'reputationword' : _('reputation points'),
+    })
+    
+@register.simple_tag
+def get_score_badge_by_details(rep, gold, silver, bronze):
+    BADGE_TEMPLATE = '<span class="reputation-score" title="%(reputation)s %(repword)s">%(reputation)s</span>'
+    if gold > 0 :
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(gold)s %(badgeword)s">'
+        '<span class="badge1">&#9679;</span>'
+        '<span class="badgecount">%(gold)s</span>'
+        '</span>')
+    if silver > 0:
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(silver)s %(badgeword)s">'
+        '<span class="badge2">&#9679;</span>'
+        '<span class="badgecount">%(silver)s</span>'
+        '</span>')
+    if bronze > 0:
+        BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(bronze)s %(badgeword)s">'
+        '<span class="badge3">&#9679;</span>'
+        '<span class="badgecount">%(bronze)s</span>'
+        '</span>')
+    BADGE_TEMPLATE = smart_unicode(BADGE_TEMPLATE, encoding='utf-8', strings_only=False, errors='strict')
+    return mark_safe(BADGE_TEMPLATE % {
+        'reputation' : rep,
+        'gold' : gold,
+        'silver' : silver,
+        'bronze' : bronze,
+		'repword' : _('reputation points'),
+		'badgeword' : _('badges'),
+    })      
+    
+@register.simple_tag
+def get_user_vote_image(dic, key, arrow):
+    if dic.has_key(key):
+        if int(dic[key]) == int(arrow):
+            return '-on'
+    return ''
+        
+@register.simple_tag
+def get_age(birthday):
+    current_time = datetime.datetime(*time.localtime()[0:6])
+    year = birthday.year
+    month = birthday.month
+    day = birthday.day
+    diff = current_time - datetime.datetime(year,month,day,0,0,0)
+    return diff.days / 365
+
+@register.simple_tag
+def get_total_count(up_count, down_count):
+    return up_count + down_count
+
+@register.simple_tag
+def format_number(value):
+    strValue = str(value)
+    if len(strValue) <= 3:
+        return strValue
+    result = ''
+    first = ''
+    pattern = re.compile('(-?\d+)(\d{3})')
+    m = re.match(pattern, strValue)
+    while m != None:
+        first = m.group(1)
+        second = m.group(2)
+        result = ',' + second + result
+        strValue = first + ',' + second
+        m = re.match(pattern, strValue)
+    return first + result
+
+@register.simple_tag
+def convert2tagname_list(question):
+    question['tagnames'] = [name for name in question['tagnames'].split(u' ')]
+    return ''
+
+@register.simple_tag
+def diff_date(date, limen=2):
+    current_time = datetime.datetime(*time.localtime()[0:6])
+    diff = current_time - date
+    diff_days = diff.days
+    if diff_days > limen:
+        return date
+    else:
+        return timesince(date) + _(' ago')
+        
+@register.simple_tag
+def get_latest_changed_timestamp():
+    try:
+        from time import localtime, strftime
+        from os import path
+        from django.conf import settings
+        root = settings.SITE_SRC_ROOT
+        dir = (
+            root,
+            '%s/forum' % root,
+            '%s/templates' % root,
+        )
+        stamp = (path.getmtime(d) for d in dir)
+        latest = max(stamp)
+        timestr = strftime("%H:%M %b-%d-%Y %Z", localtime(latest))
+    except:
+        timestr = ''
     return timestr
\ No newline at end of file
diff --git a/forum/user.py b/forum/user.py
index 233baf0c..ed4494d6 100644
--- a/forum/user.py
+++ b/forum/user.py
@@ -1,75 +1,75 @@
-# coding=utf-8
-from django.utils.translation import ugettext as _
-class UserView:
-    def __init__(self, id, tab_title, tab_description, page_title, view_name, template_file, data_size=0):
-        self.id = id
-        self.tab_title = tab_title
-        self.tab_description = tab_description
-        self.page_title = page_title
-        self.view_name = view_name
-        self.template_file = template_file
-        self.data_size = data_size
-        
-        
-USER_TEMPLATE_VIEWS = (
-    UserView(
-        id = 'stats',
-        tab_title = _('overview'),
-        tab_description = _('user profile'),
-        page_title = _('user profile overview'),
-        view_name = 'user_stats',
-        template_file = 'user_stats.html'
-    ),
-    UserView(
-        id = 'recent',
-        tab_title = _('recent activity'),
-        tab_description = _('recent user activity'),
-        page_title = _('profile - recent activity'),
-        view_name = 'user_recent',
-        template_file = 'user_recent.html',
-        data_size = 50
-    ),
-    UserView(
-        id = 'responses',
-        tab_title = _('responses'),
-        tab_description = _('comments and answers to others questions'),
-        page_title = _('profile - responses'),
-        view_name = 'user_responses',
-        template_file = 'user_responses.html',
-        data_size = 50
-    ),
-    UserView(
-        id = 'reputation',
-        tab_title = _('reputation'),
-        tab_description = _('user reputation in the community'),
-        page_title = _('profile - user reputation'),
-        view_name = 'user_reputation',
-        template_file = 'user_reputation.html'
-    ),
-    UserView(
-        id = 'favorites',
-        tab_title = _('favorite questions'),
-        tab_description = _('users favorite questions'),
-        page_title = _('profile - favorite questions'),
-        view_name = 'user_favorites',
-        template_file = 'user_favorites.html',
-        data_size = 50
-    ),
-    UserView(
-        id = 'votes',
-        tab_title = _('casted votes'),
-        tab_description = _('user vote record'),
-        page_title = _('profile - votes'),
-        view_name = 'user_votes',
-        template_file = 'user_votes.html',
-        data_size = 50
-    ),
-    UserView(
-        id = 'preferences',
-        tab_title = _('preferences'),
-        tab_description = _('user preference settings'),
-        page_title = _('profile - user preferences'),
-        view_name = 'user_preferences',
-        template_file = 'user_preferences.html'
-    )
-)
+# coding=utf-8
+from django.utils.translation import ugettext as _
+class UserView:
+    def __init__(self, id, tab_title, tab_description, page_title, view_name, template_file, data_size=0):
+        self.id = id
+        self.tab_title = tab_title
+        self.tab_description = tab_description
+        self.page_title = page_title
+        self.view_name = view_name
+        self.template_file = template_file
+        self.data_size = data_size
+        
+        
+USER_TEMPLATE_VIEWS = (
+    UserView(
+        id = 'stats',
+        tab_title = _('overview'),
+        tab_description = _('user profile'),
+        page_title = _('user profile overview'),
+        view_name = 'user_stats',
+        template_file = 'user_stats.html'
+    ),
+    UserView(
+        id = 'recent',
+        tab_title = _('recent activity'),
+        tab_description = _('recent user activity'),
+        page_title = _('profile - recent activity'),
+        view_name = 'user_recent',
+        template_file = 'user_recent.html',
+        data_size = 50
+    ),
+    UserView(
+        id = 'responses',
+        tab_title = _('responses'),
+        tab_description = _('comments and answers to others questions'),
+        page_title = _('profile - responses'),
+        view_name = 'user_responses',
+        template_file = 'user_responses.html',
+        data_size = 50
+    ),
+    UserView(
+        id = 'reputation',
+        tab_title = _('reputation'),
+        tab_description = _('user reputation in the community'),
+        page_title = _('profile - user reputation'),
+        view_name = 'user_reputation',
+        template_file = 'user_reputation.html'
+    ),
+    UserView(
+        id = 'favorites',
+        tab_title = _('favorite questions'),
+        tab_description = _('users favorite questions'),
+        page_title = _('profile - favorite questions'),
+        view_name = 'user_favorites',
+        template_file = 'user_favorites.html',
+        data_size = 50
+    ),
+    UserView(
+        id = 'votes',
+        tab_title = _('casted votes'),
+        tab_description = _('user vote record'),
+        page_title = _('profile - votes'),
+        view_name = 'user_votes',
+        template_file = 'user_votes.html',
+        data_size = 50
+    ),
+    UserView(
+        id = 'preferences',
+        tab_title = _('preferences'),
+        tab_description = _('user preference settings'),
+        page_title = _('profile - user preferences'),
+        view_name = 'user_preferences',
+        template_file = 'user_preferences.html'
+    )
+)
diff --git a/forum/views.py b/forum/views.py
index 6ac172df..2c61d41e 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -115,7 +115,7 @@ def questions(request, tagname=None, unanswered=False):
     # Set flag to False by default. If it is equal to True, then need to be saved.
     pagesize_changed = False
     # get pagesize from session, if failed then get default value
-    pagesize = request.session.get("pagesize")
+    pagesize = request.session.get("pagesize",10)
     try:
         page = int(request.GET.get('page', '1'))
     except ValueError:
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index fe0aab7c..6801907c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 206f4b6f..a34a35f2 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -1103,10 +1103,6 @@ msgstr "标签问题"
 msgid "Active"
 msgstr "活跃问题"
 
-#: templates/questions.html:125
-msgid "Related tags"
-msgstr "相关标签"
-
 #: templates/authopenid/changeemail.html:10
 msgid "Account: change email"
 msgstr "修改电子邮件"
@@ -1449,11 +1445,6 @@ msgstr "有关Markdown详细说明"
 msgid "All questions"
 msgstr "所有问题"
 
-#: templates/questions.html:25
-#, fuzzy
-msgid "Active"
-msgstr "活跃问题"
-
 #: templates/questions.html:26
 #, fuzzy
 msgid "Questions with most answers"
@@ -1465,7 +1456,6 @@ msgstr ""
 
 # index.html
 #: templates/questions.html:57 templates/questions.html.py:69
-#, fuzzy
 msgid "Community wiki"
 msgstr "社区Wiki"
 
@@ -1739,11 +1729,6 @@ msgstr "这个问题被"
 msgid "this answer has been accepted to be correct"
 msgstr "有答案已被接受为正确答案"
 
-#: templates/authopenid/changeemail.html:6
-#, fuzzy
-msgid "Account: change email"
-msgstr "更换电子邮件"
-
 #: templates/authopenid/changeemail.html:9
 msgid ""
 "This is where you can change the email address associated with your account. "
@@ -1947,7 +1932,6 @@ msgid "Give your  account a new password."
 msgstr ""
 
 #: templates/authopenid/settings.html:30
-#, fuzzy
 msgid "Change email "
 msgstr "更换电子邮件"
 
diff --git a/manage.py b/manage.py
index b8c4be8e..5e78ea97 100644
--- a/manage.py
+++ b/manage.py
@@ -1,11 +1,11 @@
-#!/usr/bin/env python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
-
-if __name__ == "__main__":
-    execute_manager(settings)
+#!/usr/bin/env python
+from django.core.management import execute_manager
+try:
+    import settings # Assumed to be in the same directory.
+except ImportError:
+    import sys
+    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+    sys.exit(1)
+
+if __name__ == "__main__":
+    execute_manager(settings)
diff --git a/settings.py b/settings.py
index 985de51a..e2d384c1 100644
--- a/settings.py
+++ b/settings.py
@@ -1,99 +1,100 @@
-# encoding:utf-8
-# Django settings for lanai project.
-import os.path
-
-#DEBUG SETTINGS
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-INTERNAL_IPS = ('127.0.0.1',)
-
-#for OpenID auth
-ugettext = lambda s: s
-LOGIN_URL = '/%s%s' % (ugettext('account/'), ugettext('signin/'))
-
-#EMAIL AND ADMINS
-ADMINS = (
-    ('CNProg team', 'team@cnprog.com'),
-)
-MANAGERS = ADMINS
-
-SERVER_EMAIL = 'webmaster@cnprog.com'
-DEFAULT_FROM_EMAIL = 'webmaster@cnprog.com'
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
-EMAIL_HOST='smtp.gmail.com'
-EMAIL_PORT='587'
-EMAIL_USE_TLS=True
-
-#LOCALIZATIONS
-TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
-# LANGUAGE_CODE = 'en-us'
-LANGUAGE_CODE = 'zh-cn'
-SITE_ID = 1
-USE_I18N = True
-
-#OTHER SETTINS
-APP_TITLE = u'CNProg.com 程序员问答社区'
-APP_URL = 'http://www.cnprog.com'
-APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
-APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
-APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
-ADMIN_MEDIA_PREFIX = '/admin/media/'
-SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.gzip.GZipMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.transaction.TransactionMiddleware',
-    #'django.middleware.sqlprint.SqlPrintingMiddleware',
-    'middleware.pagesize.QuestionsPageSizeMiddleware',
-    #'debug_toolbar.middleware.DebugToolbarMiddleware',
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.core.context_processors.request',
-    'django.core.context_processors.auth',
-    'context.application_settings'
-)
-
-ROOT_URLCONF = 'urls'
-
-TEMPLATE_DIRS = (
-    os.path.join(os.path.dirname(__file__), 'templates').replace('\\','/'),
-)
-
-#UPLOAD SETTINGS
-FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\\','/')
-FILE_UPLOAD_HANDLERS = ("django.core.files.uploadhandler.MemoryFileUploadHandler",
- "django.core.files.uploadhandler.TemporaryFileUploadHandler",)
-DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
-# for user upload
-ALLOW_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
-# unit byte
-ALLOW_MAX_FILE_SIZE = 1024 * 1024
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.admin',
-    'django.contrib.humanize',
-    'forum',
-    'django_authopenid',
-    'debug_toolbar' ,
-)
-
-# User settings
-from settings_local import *
-
+# encoding:utf-8
+# Django settings for lanai project.
+import os.path
+
+#DEBUG SETTINGS
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+INTERNAL_IPS = ('127.0.0.1',)
+
+#for OpenID auth
+ugettext = lambda s: s
+LOGIN_URL = '/%s%s' % (ugettext('account/'), ugettext('signin/'))
+
+#EMAIL AND ADMINS
+ADMINS = (
+    ('CNProg team', 'team@cnprog.com'),
+)
+MANAGERS = ADMINS
+
+SERVER_EMAIL = ''
+DEFAULT_FROM_EMAIL = ''
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
+EMAIL_HOST='smtp.gmail.com'
+EMAIL_PORT='587'
+EMAIL_USE_TLS=True
+
+#LOCALIZATIONS
+TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
+# LANGUAGE_CODE = 'en-us'
+SITE_ID = 1
+
+#OTHER SETTINS
+APP_TITLE = u'CNProg.com 程序员问答社区'
+APP_URL = 'http://www.cnprog.com'
+APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
+APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
+APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
+ADMIN_MEDIA_PREFIX = '/admin/media/'
+SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.load_template_source',
+    'django.template.loaders.app_directories.load_template_source',
+#     'django.template.loaders.eggs.load_template_source',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.gzip.GZipMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    #'django.middleware.locale.LocaleMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.middleware.transaction.TransactionMiddleware',
+    #'django.middleware.sqlprint.SqlPrintingMiddleware',
+    #'middleware.pagesize.QuestionsPageSizeMiddleware',
+    #'debug_toolbar.middleware.DebugToolbarMiddleware',
+)
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    'django.core.context_processors.request',
+    'django.core.context_processors.auth',
+    'context.application_settings',
+    #'django.core.context_processors.i18n',
+)
+
+ROOT_URLCONF = 'urls'
+
+TEMPLATE_DIRS = (
+    os.path.join(os.path.dirname(__file__), 'templates').replace('\\','/'),
+)
+
+#UPLOAD SETTINGS
+FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\\','/')
+FILE_UPLOAD_HANDLERS = ("django.core.files.uploadhandler.MemoryFileUploadHandler",
+ "django.core.files.uploadhandler.TemporaryFileUploadHandler",)
+DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
+# for user upload
+ALLOW_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
+# unit byte
+ALLOW_MAX_FILE_SIZE = 1024 * 1024
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.admin',
+    'django.contrib.humanize',
+    'forum',
+    'django_authopenid',
+    'debug_toolbar' ,
+)
+
+# User settings
+from settings_local import *
+
+USE_I18N = True
+LANGUAGE_CODE = 'en'
diff --git a/templates/about.html b/templates/about.html
index 4655a641..eaf0d591 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -1,5 +1,5 @@
-<!-- template about.html -->
 {% extends "base_content.html" %}
+<!-- template about.html -->
 {% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index aff2f06f..d8a98329 100644
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -18,7 +18,7 @@
 <div class="login">
     <form name="openid_form" action="{% url user_signin %}" method="post">
         {{ form2.next }}
-        <p style="display:none">{% trans "we support two login modes" %}</p>
+        <p>{% trans "we support two login modes" %}</p>
         {% if msg %}
             <p class="warning">{{ msg }}</p>
         {% endif %}
@@ -36,7 +36,7 @@
         	</p>
         </fieldset>	
     </form>
-    <div style="display:none">
+    <div>
         <br>
         {% if form1.errors %}
         <p class="errors">
diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html
index a4460aa3..9ac0aab3 100644
--- a/templates/authopenid/signup.html
+++ b/templates/authopenid/signup.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load i18n %}
 {% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %}
 
 {% block content %}
diff --git a/templates/content/js/com.cnprog.editor.js b/templates/content/js/com.cnprog.editor.js
index 289d9866..6cfa2c74 100644
--- a/templates/content/js/com.cnprog.editor.js
+++ b/templates/content/js/com.cnprog.editor.js
@@ -1,68 +1,68 @@
-/* 
-	jQuery TextAreaResizer plugin
-	Created on 17th January 2008 by Ryan O'Dell 
-	Version 1.0.4
-*/(function($){var textarea,staticOffset;var iLastMousePos=0;var iMin=32;var grip;$.fn.TextAreaResizer=function(){return this.each(function(){textarea=$(this).addClass('processed'),staticOffset=null;$(this).wrap('<div class="resizable-textarea"><span></span></div>').parent().append($('<div class="grippie"></div>').bind("mousedown",{el:this},startDrag));var grippie=$('div.grippie',$(this).parent())[0];grippie.style.marginRight=(grippie.offsetWidth-$(this)[0].offsetWidth)+'px'})};function startDrag(e){textarea=$(e.data.el);textarea.blur();iLastMousePos=mousePosition(e).y;staticOffset=textarea.height()-iLastMousePos;textarea.css('opacity',0.25);$(document).mousemove(performDrag).mouseup(endDrag);return false}function performDrag(e){var iThisMousePos=mousePosition(e).y;var iMousePos=staticOffset+iThisMousePos;if(iLastMousePos>=(iThisMousePos)){iMousePos-=5}iLastMousePos=iThisMousePos;iMousePos=Math.max(iMin,iMousePos);textarea.height(iMousePos+'px');if(iMousePos<iMin){endDrag(e)}return false}function endDrag(e){$(document).unbind('mousemove',performDrag).unbind('mouseup',endDrag);textarea.css('opacity',1);textarea.focus();textarea=null;staticOffset=null;iLastMousePos=0}function mousePosition(e){return{x:e.clientX+document.documentElement.scrollLeft,y:e.clientY+document.documentElement.scrollTop}}})(jQuery);
-/*
- * Autocomplete - jQuery plugin 1.0.2
- * Copyright (c) 2007 Dylan Verheul, Dan G. Switzer, Anjesh Tuladhar, Jörn Zaefferer
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- */;(function($){$.fn.extend({autocomplete:function(urlOrData,options){var isUrl=typeof urlOrData=="string";options=$.extend({},$.Autocompleter.defaults,{url:isUrl?urlOrData:null,data:isUrl?null:urlOrData,delay:isUrl?$.Autocompleter.defaults.delay:10,max:options&&!options.scroll?10:150},options);options.highlight=options.highlight||function(value){return value;};options.formatMatch=options.formatMatch||options.formatItem;return this.each(function(){new $.Autocompleter(this,options);});},result:function(handler){return this.bind("result",handler);},search:function(handler){return this.trigger("search",[handler]);},flushCache:function(){return this.trigger("flushCache");},setOptions:function(options){return this.trigger("setOptions",[options]);},unautocomplete:function(){return this.trigger("unautocomplete");}});$.Autocompleter=function(input,options){var KEY={UP:38,DOWN:40,DEL:46,TAB:9,RETURN:13,ESC:27,COMMA:188,PAGEUP:33,PAGEDOWN:34,BACKSPACE:8};var $input=$(input).attr("autocomplete","off").addClass(options.inputClass);var timeout;var previousValue="";var cache=$.Autocompleter.Cache(options);var hasFocus=0;var lastKeyPressCode;var config={mouseDownOnSelect:false};var select=$.Autocompleter.Select(options,input,selectCurrent,config);var blockSubmit;$.browser.opera&&$(input.form).bind("submit.autocomplete",function(){if(blockSubmit){blockSubmit=false;return false;}});$input.bind(($.browser.opera?"keypress":"keydown")+".autocomplete",function(event){lastKeyPressCode=event.keyCode;switch(event.keyCode){case KEY.UP:event.preventDefault();if(select.visible()){select.prev();}else{onChange(0,true);}break;case KEY.DOWN:event.preventDefault();if(select.visible()){select.next();}else{onChange(0,true);}break;case KEY.PAGEUP:event.preventDefault();if(select.visible()){select.pageUp();}else{onChange(0,true);}break;case KEY.PAGEDOWN:event.preventDefault();if(select.visible()){select.pageDown();}else{onChange(0,true);}break;case options.multiple&&$.trim(options.multipleSeparator)==","&&KEY.COMMA:case KEY.TAB:case KEY.RETURN:if(selectCurrent()){event.preventDefault();blockSubmit=true;return false;}break;case KEY.ESC:select.hide();break;default:clearTimeout(timeout);timeout=setTimeout(onChange,options.delay);break;}}).focus(function(){hasFocus++;}).blur(function(){hasFocus=0;if(!config.mouseDownOnSelect){hideResults();}}).click(function(){if(hasFocus++>1&&!select.visible()){onChange(0,true);}}).bind("search",function(){var fn=(arguments.length>1)?arguments[1]:null;function findValueCallback(q,data){var result;if(data&&data.length){for(var i=0;i<data.length;i++){if(data[i].result.toLowerCase()==q.toLowerCase()){result=data[i];break;}}}if(typeof fn=="function")fn(result);else $input.trigger("result",result&&[result.data,result.value]);}$.each(trimWords($input.val()),function(i,value){request(value,findValueCallback,findValueCallback);});}).bind("flushCache",function(){cache.flush();}).bind("setOptions",function(){$.extend(options,arguments[1]);if("data"in arguments[1])cache.populate();}).bind("unautocomplete",function(){select.unbind();$input.unbind();$(input.form).unbind(".autocomplete");});function selectCurrent(){var selected=select.selected();if(!selected)return false;var v=selected.result;previousValue=v;if(options.multiple){var words=trimWords($input.val());if(words.length>1){v=words.slice(0,words.length-1).join(options.multipleSeparator)+options.multipleSeparator+v;}v+=options.multipleSeparator;}$input.val(v);hideResultsNow();$input.trigger("result",[selected.data,selected.value]);return true;}function onChange(crap,skipPrevCheck){if(lastKeyPressCode==KEY.DEL){select.hide();return;}var currentValue=$input.val();if(!skipPrevCheck&&currentValue==previousValue)return;previousValue=currentValue;currentValue=lastWord(currentValue);if(currentValue.length>=options.minChars){$input.addClass(options.loadingClass);if(!options.matchCase)currentValue=currentValue.toLowerCase();request(currentValue,receiveData,hideResultsNow);}else{stopLoading();select.hide();}};function trimWords(value){if(!value){return[""];}var words=value.split(options.multipleSeparator);var result=[];$.each(words,function(i,value){if($.trim(value))result[i]=$.trim(value);});return result;}function lastWord(value){if(!options.multiple)return value;var words=trimWords(value);return words[words.length-1];}function autoFill(q,sValue){if(options.autoFill&&(lastWord($input.val()).toLowerCase()==q.toLowerCase())&&lastKeyPressCode!=KEY.BACKSPACE){$input.val($input.val()+sValue.substring(lastWord(previousValue).length));$.Autocompleter.Selection(input,previousValue.length,previousValue.length+sValue.length);}};function hideResults(){clearTimeout(timeout);timeout=setTimeout(hideResultsNow,200);};function hideResultsNow(){var wasVisible=select.visible();select.hide();clearTimeout(timeout);stopLoading();if(options.mustMatch){$input.search(function(result){if(!result){if(options.multiple){var words=trimWords($input.val()).slice(0,-1);$input.val(words.join(options.multipleSeparator)+(words.length?options.multipleSeparator:""));}else
-$input.val("");}});}if(wasVisible)$.Autocompleter.Selection(input,input.value.length,input.value.length);};function receiveData(q,data){if(data&&data.length&&hasFocus){stopLoading();select.display(data,q);autoFill(q,data[0].value);select.show();}else{hideResultsNow();}};function request(term,success,failure){if(!options.matchCase)term=term.toLowerCase();var data=cache.load(term);if(data&&data.length){success(term,data);}else if((typeof options.url=="string")&&(options.url.length>0)){var extraParams={timestamp:+new Date()};$.each(options.extraParams,function(key,param){extraParams[key]=typeof param=="function"?param():param;});$.ajax({mode:"abort",port:"autocomplete"+input.name,dataType:options.dataType,url:options.url,data:$.extend({q:lastWord(term),limit:options.max},extraParams),success:function(data){var parsed=options.parse&&options.parse(data)||parse(data);cache.add(term,parsed);success(term,parsed);}});}else{select.emptyList();failure(term);}};function parse(data){var parsed=[];var rows=data.split("\n");for(var i=0;i<rows.length;i++){var row=$.trim(rows[i]);if(row){row=row.split("|");parsed[parsed.length]={data:row,value:row[0],result:options.formatResult&&options.formatResult(row,row[0])||row[0]};}}return parsed;};function stopLoading(){$input.removeClass(options.loadingClass);};};$.Autocompleter.defaults={inputClass:"ac_input",resultsClass:"ac_results",loadingClass:"ac_loading",minChars:1,delay:400,matchCase:false,matchSubset:true,matchContains:false,cacheLength:10,max:100,mustMatch:false,extraParams:{},selectFirst:true,formatItem:function(row){return row[0];},formatMatch:null,autoFill:false,width:0,multiple:false,multipleSeparator:", ",highlight:function(value,term){return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi,"\\$1")+")(?![^<>]*>)(?![^&;]+;)","gi"),"<strong>$1</strong>");},scroll:true,scrollHeight:180};$.Autocompleter.Cache=function(options){var data={};var length=0;function matchSubset(s,sub){if(!options.matchCase)s=s.toLowerCase();var i=s.indexOf(sub);if(i==-1)return false;return i==0||options.matchContains;};function add(q,value){if(length>options.cacheLength){flush();}if(!data[q]){length++;}data[q]=value;}function populate(){if(!options.data)return false;var stMatchSets={},nullData=0;if(!options.url)options.cacheLength=1;stMatchSets[""]=[];for(var i=0,ol=options.data.length;i<ol;i++){var rawValue=options.data[i];rawValue=(typeof rawValue=="string")?[rawValue]:rawValue;var value=options.formatMatch(rawValue,i+1,options.data.length);if(value===false)continue;var firstChar=value.charAt(0).toLowerCase();if(!stMatchSets[firstChar])stMatchSets[firstChar]=[];var row={value:value,data:rawValue,result:options.formatResult&&options.formatResult(rawValue)||value};stMatchSets[firstChar].push(row);if(nullData++<options.max){stMatchSets[""].push(row);}};$.each(stMatchSets,function(i,value){options.cacheLength++;add(i,value);});}setTimeout(populate,25);function flush(){data={};length=0;}return{flush:flush,add:add,populate:populate,load:function(q){if(!options.cacheLength||!length)return null;if(!options.url&&options.matchContains){var csub=[];for(var k in data){if(k.length>0){var c=data[k];$.each(c,function(i,x){if(matchSubset(x.value,q)){csub.push(x);}});}}return csub;}else
-if(data[q]){return data[q];}else
-if(options.matchSubset){for(var i=q.length-1;i>=options.minChars;i--){var c=data[q.substr(0,i)];if(c){var csub=[];$.each(c,function(i,x){if(matchSubset(x.value,q)){csub[csub.length]=x;}});return csub;}}}return null;}};};$.Autocompleter.Select=function(options,input,select,config){var CLASSES={ACTIVE:"ac_over"};var listItems,active=-1,data,term="",needsInit=true,element,list;function init(){if(!needsInit)return;element=$("<div/>").hide().addClass(options.resultsClass).css("position","absolute").appendTo(document.body);list=$("<ul/>").appendTo(element).mouseover(function(event){if(target(event).nodeName&&target(event).nodeName.toUpperCase()=='LI'){active=$("li",list).removeClass(CLASSES.ACTIVE).index(target(event));$(target(event)).addClass(CLASSES.ACTIVE);}}).click(function(event){$(target(event)).addClass(CLASSES.ACTIVE);select();input.focus();return false;}).mousedown(function(){config.mouseDownOnSelect=true;}).mouseup(function(){config.mouseDownOnSelect=false;});if(options.width>0)element.css("width",options.width);needsInit=false;}function target(event){var element=event.target;while(element&&element.tagName!="LI")element=element.parentNode;if(!element)return[];return element;}function moveSelect(step){listItems.slice(active,active+1).removeClass(CLASSES.ACTIVE);movePosition(step);var activeItem=listItems.slice(active,active+1).addClass(CLASSES.ACTIVE);if(options.scroll){var offset=0;listItems.slice(0,active).each(function(){offset+=this.offsetHeight;});if((offset+activeItem[0].offsetHeight-list.scrollTop())>list[0].clientHeight){list.scrollTop(offset+activeItem[0].offsetHeight-list.innerHeight());}else if(offset<list.scrollTop()){list.scrollTop(offset);}}};function movePosition(step){active+=step;if(active<0){active=listItems.size()-1;}else if(active>=listItems.size()){active=0;}}function limitNumberOfItems(available){return options.max&&options.max<available?options.max:available;}function fillList(){list.empty();var max=limitNumberOfItems(data.length);for(var i=0;i<max;i++){if(!data[i])continue;var formatted=options.formatItem(data[i].data,i+1,max,data[i].value,term);if(formatted===false)continue;var li=$("<li/>").html(options.highlight(formatted,term)).addClass(i%2==0?"ac_even":"ac_odd").appendTo(list)[0];$.data(li,"ac_data",data[i]);}listItems=list.find("li");if(options.selectFirst){listItems.slice(0,1).addClass(CLASSES.ACTIVE);active=0;}if($.fn.bgiframe)list.bgiframe();}return{display:function(d,q){init();data=d;term=q;fillList();},next:function(){moveSelect(1);},prev:function(){moveSelect(-1);},pageUp:function(){if(active!=0&&active-8<0){moveSelect(-active);}else{moveSelect(-8);}},pageDown:function(){if(active!=listItems.size()-1&&active+8>listItems.size()){moveSelect(listItems.size()-1-active);}else{moveSelect(8);}},hide:function(){element&&element.hide();listItems&&listItems.removeClass(CLASSES.ACTIVE);active=-1;},visible:function(){return element&&element.is(":visible");},current:function(){return this.visible()&&(listItems.filter("."+CLASSES.ACTIVE)[0]||options.selectFirst&&listItems[0]);},show:function(){var offset=$(input).offset();element.css({width:typeof options.width=="string"||options.width>0?options.width:$(input).width(),top:offset.top+input.offsetHeight,left:offset.left}).show();if(options.scroll){list.scrollTop(0);list.css({maxHeight:options.scrollHeight,overflow:'auto'});if($.browser.msie&&typeof document.body.style.maxHeight==="undefined"){var listHeight=0;listItems.each(function(){listHeight+=this.offsetHeight;});var scrollbarsVisible=listHeight>options.scrollHeight;list.css('height',scrollbarsVisible?options.scrollHeight:listHeight);if(!scrollbarsVisible){listItems.width(list.width()-parseInt(listItems.css("padding-left"))-parseInt(listItems.css("padding-right")));}}}},selected:function(){var selected=listItems&&listItems.filter("."+CLASSES.ACTIVE).removeClass(CLASSES.ACTIVE);return selected&&selected.length&&$.data(selected[0],"ac_data");},emptyList:function(){list&&list.empty();},unbind:function(){element&&element.remove();}};};$.Autocompleter.Selection=function(field,start,end){if(field.createTextRange){var selRange=field.createTextRange();selRange.collapse(true);selRange.moveStart("character",start);selRange.moveEnd("character",end);selRange.select();}else if(field.setSelectionRange){field.setSelectionRange(start,end);}else{if(field.selectionStart){field.selectionStart=start;field.selectionEnd=end;}}field.focus();};})(jQuery);
-/*
- *	TypeWatch 2.0 - Original by Denny Ferrassoli / Refactored by Charles Christolini
- *  Copyright(c) 2007 Denny Ferrassoli - DennyDotNet.com
- *  Coprright(c) 2008 Charles Christolini - BinaryPie.com
- *  Dual licensed under the MIT and GPL licenses:
- *  http://www.opensource.org/licenses/mit-license.php
- *  http://www.gnu.org/licenses/gpl.html
-*/(function(jQuery){jQuery.fn.typeWatch=function(o){var options=jQuery.extend({wait:750,callback:function(){},highlight:true,captureLength:2},o);function checkElement(timer,override){var elTxt=jQuery(timer.el).val();if((elTxt.length>options.captureLength&&elTxt.toUpperCase()!=timer.text)||(override&&elTxt.length>options.captureLength)){timer.text=elTxt.toUpperCase();timer.cb(elTxt)}};function watchElement(elem){if(elem.type.toUpperCase()=="TEXT"||elem.nodeName.toUpperCase()=="TEXTAREA"){var timer={timer:null,text:jQuery(elem).val().toUpperCase(),cb:options.callback,el:elem,wait:options.wait};if(options.highlight){jQuery(elem).focus(function(){this.select()})}var startWatch=function(evt){var timerWait=timer.wait;var overrideBool=false;if(evt.keyCode==13&&this.type.toUpperCase()=="TEXT"){timerWait=1;overrideBool=true}var timerCallbackFx=function(){checkElement(timer,overrideBool)};clearTimeout(timer.timer);timer.timer=setTimeout(timerCallbackFx,timerWait)};jQuery(elem).keydown(startWatch)}};return this.each(function(index){watchElement(this)})}})(jQuery);
-/*
-Ajax upload
-*/jQuery.extend({createUploadIframe:function(d,b){var a="jUploadFrame"+d;if(window.ActiveXObject){var c=document.createElement('<iframe id="'+a+'" name="'+a+'" />');if(typeof b=="boolean"){c.src="javascript:false"}else{if(typeof b=="string"){c.src=b}}}else{var c=document.createElement("iframe");c.id=a;c.name=a}c.style.position="absolute";c.style.top="-1000px";c.style.left="-1000px";document.body.appendChild(c);return c},createUploadForm:function(g,b){var e="jUploadForm"+g;var a="jUploadFile"+g;var d=$('<form  action="" method="POST" name="'+e+'" id="'+e+'" enctype="multipart/form-data"></form>');var c=$("#"+b);var f=$(c).clone();$(c).attr("id",a);$(c).before(f);$(c).appendTo(d);$(d).css("position","absolute");$(d).css("top","-1200px");$(d).css("left","-1200px");$(d).appendTo("body");return d},ajaxFileUpload:function(k){k=jQuery.extend({},jQuery.ajaxSettings,k);var a=new Date().getTime();var b=jQuery.createUploadForm(a,k.fileElementId);var i=jQuery.createUploadIframe(a,k.secureuri);var h="jUploadFrame"+a;var j="jUploadForm"+a;if(k.global&&!jQuery.active++){jQuery.event.trigger("ajaxStart")}var c=false;var f={};if(k.global){jQuery.event.trigger("ajaxSend",[f,k])}var d=function(l){var p=document.getElementById(h);try{if(p.contentWindow){f.responseText=p.contentWindow.document.body?p.contentWindow.document.body.innerText:null;f.responseXML=p.contentWindow.document.XMLDocument?p.contentWindow.document.XMLDocument:p.contentWindow.document}else{if(p.contentDocument){f.responseText=p.contentDocument.document.body?p.contentDocument.document.body.textContent||document.body.innerText:null;f.responseXML=p.contentDocument.document.XMLDocument?p.contentDocument.document.XMLDocument:p.contentDocument.document}}}catch(o){jQuery.handleError(k,f,null,o)}if(f||l=="timeout"){c=true;var m;try{m=l!="timeout"?"success":"error";if(m!="error"){var n=jQuery.uploadHttpData(f,k.dataType);if(k.success){k.success(n,m)}if(k.global){jQuery.event.trigger("ajaxSuccess",[f,k])}}else{jQuery.handleError(k,f,m)}}catch(o){m="error";jQuery.handleError(k,f,m,o)}if(k.global){jQuery.event.trigger("ajaxComplete",[f,k])}if(k.global&&!--jQuery.active){jQuery.event.trigger("ajaxStop")}if(k.complete){k.complete(f,m)}jQuery(p).unbind();setTimeout(function(){try{$(p).remove();$(b).remove()}catch(q){jQuery.handleError(k,f,null,q)}},100);f=null}};if(k.timeout>0){setTimeout(function(){if(!c){d("timeout")}},k.timeout)}try{var b=$("#"+j);$(b).attr("action",k.url);$(b).attr("method","POST");$(b).attr("target",h);if(b.encoding){b.encoding="multipart/form-data"}else{b.enctype="multipart/form-data"}$(b).submit()}catch(g){jQuery.handleError(k,f,null,g)}if(window.attachEvent){document.getElementById(h).attachEvent("onload",d)}else{document.getElementById(h).addEventListener("load",d,false)}return{abort:function(){}}},uploadHttpData:function(r,type){var data=!type;data=type=="xml"||data?r.responseXML:r.responseText;if(type=="script"){jQuery.globalEval(data)}if(type=="json"){eval("data = "+data)}if(type=="html"){jQuery("<div>").html(data).evalScripts()}return data}});
-/*Upload call*/
-function ajaxFileUpload(imageUrl)
-{
-  $("#loading").ajaxStart(function(){
-      $(this).show();
-  }).ajaxComplete(function(){
-      $(this).hide();
-  });
-
-  $("#upload").ajaxStart(function(){
-          $(this).hide();
-      }).ajaxComplete(function(){
-          $(this).show();
-      });
-
-      $.ajaxFileUpload
-      (
-        {
-            url:'/upload/',
-              secureuri:false,
-              fileElementId:'file-upload',
-              dataType: 'xml',
-              success: function (data, status)
-              {
-                  var fileURL = $(data).find('file_url').text();
-                  var error = $(data).find('error').text();
-                  if(error != ''){
-                    alert(error);
-                  }else{
-                    imageUrl.attr('value', fileURL);
-                  }
-
-              },
-              error: function (data, status, e)
-              {
-                  alert(e);
-              }
-          }
-      )
-
-    return false;
+/* 
+	jQuery TextAreaResizer plugin
+	Created on 17th January 2008 by Ryan O'Dell 
+	Version 1.0.4
+*/(function($){var textarea,staticOffset;var iLastMousePos=0;var iMin=32;var grip;$.fn.TextAreaResizer=function(){return this.each(function(){textarea=$(this).addClass('processed'),staticOffset=null;$(this).wrap('<div class="resizable-textarea"><span></span></div>').parent().append($('<div class="grippie"></div>').bind("mousedown",{el:this},startDrag));var grippie=$('div.grippie',$(this).parent())[0];grippie.style.marginRight=(grippie.offsetWidth-$(this)[0].offsetWidth)+'px'})};function startDrag(e){textarea=$(e.data.el);textarea.blur();iLastMousePos=mousePosition(e).y;staticOffset=textarea.height()-iLastMousePos;textarea.css('opacity',0.25);$(document).mousemove(performDrag).mouseup(endDrag);return false}function performDrag(e){var iThisMousePos=mousePosition(e).y;var iMousePos=staticOffset+iThisMousePos;if(iLastMousePos>=(iThisMousePos)){iMousePos-=5}iLastMousePos=iThisMousePos;iMousePos=Math.max(iMin,iMousePos);textarea.height(iMousePos+'px');if(iMousePos<iMin){endDrag(e)}return false}function endDrag(e){$(document).unbind('mousemove',performDrag).unbind('mouseup',endDrag);textarea.css('opacity',1);textarea.focus();textarea=null;staticOffset=null;iLastMousePos=0}function mousePosition(e){return{x:e.clientX+document.documentElement.scrollLeft,y:e.clientY+document.documentElement.scrollTop}}})(jQuery);
+/*
+ * Autocomplete - jQuery plugin 1.0.2
+ * Copyright (c) 2007 Dylan Verheul, Dan G. Switzer, Anjesh Tuladhar, Jörn Zaefferer
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */;(function($){$.fn.extend({autocomplete:function(urlOrData,options){var isUrl=typeof urlOrData=="string";options=$.extend({},$.Autocompleter.defaults,{url:isUrl?urlOrData:null,data:isUrl?null:urlOrData,delay:isUrl?$.Autocompleter.defaults.delay:10,max:options&&!options.scroll?10:150},options);options.highlight=options.highlight||function(value){return value;};options.formatMatch=options.formatMatch||options.formatItem;return this.each(function(){new $.Autocompleter(this,options);});},result:function(handler){return this.bind("result",handler);},search:function(handler){return this.trigger("search",[handler]);},flushCache:function(){return this.trigger("flushCache");},setOptions:function(options){return this.trigger("setOptions",[options]);},unautocomplete:function(){return this.trigger("unautocomplete");}});$.Autocompleter=function(input,options){var KEY={UP:38,DOWN:40,DEL:46,TAB:9,RETURN:13,ESC:27,COMMA:188,PAGEUP:33,PAGEDOWN:34,BACKSPACE:8};var $input=$(input).attr("autocomplete","off").addClass(options.inputClass);var timeout;var previousValue="";var cache=$.Autocompleter.Cache(options);var hasFocus=0;var lastKeyPressCode;var config={mouseDownOnSelect:false};var select=$.Autocompleter.Select(options,input,selectCurrent,config);var blockSubmit;$.browser.opera&&$(input.form).bind("submit.autocomplete",function(){if(blockSubmit){blockSubmit=false;return false;}});$input.bind(($.browser.opera?"keypress":"keydown")+".autocomplete",function(event){lastKeyPressCode=event.keyCode;switch(event.keyCode){case KEY.UP:event.preventDefault();if(select.visible()){select.prev();}else{onChange(0,true);}break;case KEY.DOWN:event.preventDefault();if(select.visible()){select.next();}else{onChange(0,true);}break;case KEY.PAGEUP:event.preventDefault();if(select.visible()){select.pageUp();}else{onChange(0,true);}break;case KEY.PAGEDOWN:event.preventDefault();if(select.visible()){select.pageDown();}else{onChange(0,true);}break;case options.multiple&&$.trim(options.multipleSeparator)==","&&KEY.COMMA:case KEY.TAB:case KEY.RETURN:if(selectCurrent()){event.preventDefault();blockSubmit=true;return false;}break;case KEY.ESC:select.hide();break;default:clearTimeout(timeout);timeout=setTimeout(onChange,options.delay);break;}}).focus(function(){hasFocus++;}).blur(function(){hasFocus=0;if(!config.mouseDownOnSelect){hideResults();}}).click(function(){if(hasFocus++>1&&!select.visible()){onChange(0,true);}}).bind("search",function(){var fn=(arguments.length>1)?arguments[1]:null;function findValueCallback(q,data){var result;if(data&&data.length){for(var i=0;i<data.length;i++){if(data[i].result.toLowerCase()==q.toLowerCase()){result=data[i];break;}}}if(typeof fn=="function")fn(result);else $input.trigger("result",result&&[result.data,result.value]);}$.each(trimWords($input.val()),function(i,value){request(value,findValueCallback,findValueCallback);});}).bind("flushCache",function(){cache.flush();}).bind("setOptions",function(){$.extend(options,arguments[1]);if("data"in arguments[1])cache.populate();}).bind("unautocomplete",function(){select.unbind();$input.unbind();$(input.form).unbind(".autocomplete");});function selectCurrent(){var selected=select.selected();if(!selected)return false;var v=selected.result;previousValue=v;if(options.multiple){var words=trimWords($input.val());if(words.length>1){v=words.slice(0,words.length-1).join(options.multipleSeparator)+options.multipleSeparator+v;}v+=options.multipleSeparator;}$input.val(v);hideResultsNow();$input.trigger("result",[selected.data,selected.value]);return true;}function onChange(crap,skipPrevCheck){if(lastKeyPressCode==KEY.DEL){select.hide();return;}var currentValue=$input.val();if(!skipPrevCheck&&currentValue==previousValue)return;previousValue=currentValue;currentValue=lastWord(currentValue);if(currentValue.length>=options.minChars){$input.addClass(options.loadingClass);if(!options.matchCase)currentValue=currentValue.toLowerCase();request(currentValue,receiveData,hideResultsNow);}else{stopLoading();select.hide();}};function trimWords(value){if(!value){return[""];}var words=value.split(options.multipleSeparator);var result=[];$.each(words,function(i,value){if($.trim(value))result[i]=$.trim(value);});return result;}function lastWord(value){if(!options.multiple)return value;var words=trimWords(value);return words[words.length-1];}function autoFill(q,sValue){if(options.autoFill&&(lastWord($input.val()).toLowerCase()==q.toLowerCase())&&lastKeyPressCode!=KEY.BACKSPACE){$input.val($input.val()+sValue.substring(lastWord(previousValue).length));$.Autocompleter.Selection(input,previousValue.length,previousValue.length+sValue.length);}};function hideResults(){clearTimeout(timeout);timeout=setTimeout(hideResultsNow,200);};function hideResultsNow(){var wasVisible=select.visible();select.hide();clearTimeout(timeout);stopLoading();if(options.mustMatch){$input.search(function(result){if(!result){if(options.multiple){var words=trimWords($input.val()).slice(0,-1);$input.val(words.join(options.multipleSeparator)+(words.length?options.multipleSeparator:""));}else
+$input.val("");}});}if(wasVisible)$.Autocompleter.Selection(input,input.value.length,input.value.length);};function receiveData(q,data){if(data&&data.length&&hasFocus){stopLoading();select.display(data,q);autoFill(q,data[0].value);select.show();}else{hideResultsNow();}};function request(term,success,failure){if(!options.matchCase)term=term.toLowerCase();var data=cache.load(term);if(data&&data.length){success(term,data);}else if((typeof options.url=="string")&&(options.url.length>0)){var extraParams={timestamp:+new Date()};$.each(options.extraParams,function(key,param){extraParams[key]=typeof param=="function"?param():param;});$.ajax({mode:"abort",port:"autocomplete"+input.name,dataType:options.dataType,url:options.url,data:$.extend({q:lastWord(term),limit:options.max},extraParams),success:function(data){var parsed=options.parse&&options.parse(data)||parse(data);cache.add(term,parsed);success(term,parsed);}});}else{select.emptyList();failure(term);}};function parse(data){var parsed=[];var rows=data.split("\n");for(var i=0;i<rows.length;i++){var row=$.trim(rows[i]);if(row){row=row.split("|");parsed[parsed.length]={data:row,value:row[0],result:options.formatResult&&options.formatResult(row,row[0])||row[0]};}}return parsed;};function stopLoading(){$input.removeClass(options.loadingClass);};};$.Autocompleter.defaults={inputClass:"ac_input",resultsClass:"ac_results",loadingClass:"ac_loading",minChars:1,delay:400,matchCase:false,matchSubset:true,matchContains:false,cacheLength:10,max:100,mustMatch:false,extraParams:{},selectFirst:true,formatItem:function(row){return row[0];},formatMatch:null,autoFill:false,width:0,multiple:false,multipleSeparator:", ",highlight:function(value,term){return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi,"\\$1")+")(?![^<>]*>)(?![^&;]+;)","gi"),"<strong>$1</strong>");},scroll:true,scrollHeight:180};$.Autocompleter.Cache=function(options){var data={};var length=0;function matchSubset(s,sub){if(!options.matchCase)s=s.toLowerCase();var i=s.indexOf(sub);if(i==-1)return false;return i==0||options.matchContains;};function add(q,value){if(length>options.cacheLength){flush();}if(!data[q]){length++;}data[q]=value;}function populate(){if(!options.data)return false;var stMatchSets={},nullData=0;if(!options.url)options.cacheLength=1;stMatchSets[""]=[];for(var i=0,ol=options.data.length;i<ol;i++){var rawValue=options.data[i];rawValue=(typeof rawValue=="string")?[rawValue]:rawValue;var value=options.formatMatch(rawValue,i+1,options.data.length);if(value===false)continue;var firstChar=value.charAt(0).toLowerCase();if(!stMatchSets[firstChar])stMatchSets[firstChar]=[];var row={value:value,data:rawValue,result:options.formatResult&&options.formatResult(rawValue)||value};stMatchSets[firstChar].push(row);if(nullData++<options.max){stMatchSets[""].push(row);}};$.each(stMatchSets,function(i,value){options.cacheLength++;add(i,value);});}setTimeout(populate,25);function flush(){data={};length=0;}return{flush:flush,add:add,populate:populate,load:function(q){if(!options.cacheLength||!length)return null;if(!options.url&&options.matchContains){var csub=[];for(var k in data){if(k.length>0){var c=data[k];$.each(c,function(i,x){if(matchSubset(x.value,q)){csub.push(x);}});}}return csub;}else
+if(data[q]){return data[q];}else
+if(options.matchSubset){for(var i=q.length-1;i>=options.minChars;i--){var c=data[q.substr(0,i)];if(c){var csub=[];$.each(c,function(i,x){if(matchSubset(x.value,q)){csub[csub.length]=x;}});return csub;}}}return null;}};};$.Autocompleter.Select=function(options,input,select,config){var CLASSES={ACTIVE:"ac_over"};var listItems,active=-1,data,term="",needsInit=true,element,list;function init(){if(!needsInit)return;element=$("<div/>").hide().addClass(options.resultsClass).css("position","absolute").appendTo(document.body);list=$("<ul/>").appendTo(element).mouseover(function(event){if(target(event).nodeName&&target(event).nodeName.toUpperCase()=='LI'){active=$("li",list).removeClass(CLASSES.ACTIVE).index(target(event));$(target(event)).addClass(CLASSES.ACTIVE);}}).click(function(event){$(target(event)).addClass(CLASSES.ACTIVE);select();input.focus();return false;}).mousedown(function(){config.mouseDownOnSelect=true;}).mouseup(function(){config.mouseDownOnSelect=false;});if(options.width>0)element.css("width",options.width);needsInit=false;}function target(event){var element=event.target;while(element&&element.tagName!="LI")element=element.parentNode;if(!element)return[];return element;}function moveSelect(step){listItems.slice(active,active+1).removeClass(CLASSES.ACTIVE);movePosition(step);var activeItem=listItems.slice(active,active+1).addClass(CLASSES.ACTIVE);if(options.scroll){var offset=0;listItems.slice(0,active).each(function(){offset+=this.offsetHeight;});if((offset+activeItem[0].offsetHeight-list.scrollTop())>list[0].clientHeight){list.scrollTop(offset+activeItem[0].offsetHeight-list.innerHeight());}else if(offset<list.scrollTop()){list.scrollTop(offset);}}};function movePosition(step){active+=step;if(active<0){active=listItems.size()-1;}else if(active>=listItems.size()){active=0;}}function limitNumberOfItems(available){return options.max&&options.max<available?options.max:available;}function fillList(){list.empty();var max=limitNumberOfItems(data.length);for(var i=0;i<max;i++){if(!data[i])continue;var formatted=options.formatItem(data[i].data,i+1,max,data[i].value,term);if(formatted===false)continue;var li=$("<li/>").html(options.highlight(formatted,term)).addClass(i%2==0?"ac_even":"ac_odd").appendTo(list)[0];$.data(li,"ac_data",data[i]);}listItems=list.find("li");if(options.selectFirst){listItems.slice(0,1).addClass(CLASSES.ACTIVE);active=0;}if($.fn.bgiframe)list.bgiframe();}return{display:function(d,q){init();data=d;term=q;fillList();},next:function(){moveSelect(1);},prev:function(){moveSelect(-1);},pageUp:function(){if(active!=0&&active-8<0){moveSelect(-active);}else{moveSelect(-8);}},pageDown:function(){if(active!=listItems.size()-1&&active+8>listItems.size()){moveSelect(listItems.size()-1-active);}else{moveSelect(8);}},hide:function(){element&&element.hide();listItems&&listItems.removeClass(CLASSES.ACTIVE);active=-1;},visible:function(){return element&&element.is(":visible");},current:function(){return this.visible()&&(listItems.filter("."+CLASSES.ACTIVE)[0]||options.selectFirst&&listItems[0]);},show:function(){var offset=$(input).offset();element.css({width:typeof options.width=="string"||options.width>0?options.width:$(input).width(),top:offset.top+input.offsetHeight,left:offset.left}).show();if(options.scroll){list.scrollTop(0);list.css({maxHeight:options.scrollHeight,overflow:'auto'});if($.browser.msie&&typeof document.body.style.maxHeight==="undefined"){var listHeight=0;listItems.each(function(){listHeight+=this.offsetHeight;});var scrollbarsVisible=listHeight>options.scrollHeight;list.css('height',scrollbarsVisible?options.scrollHeight:listHeight);if(!scrollbarsVisible){listItems.width(list.width()-parseInt(listItems.css("padding-left"))-parseInt(listItems.css("padding-right")));}}}},selected:function(){var selected=listItems&&listItems.filter("."+CLASSES.ACTIVE).removeClass(CLASSES.ACTIVE);return selected&&selected.length&&$.data(selected[0],"ac_data");},emptyList:function(){list&&list.empty();},unbind:function(){element&&element.remove();}};};$.Autocompleter.Selection=function(field,start,end){if(field.createTextRange){var selRange=field.createTextRange();selRange.collapse(true);selRange.moveStart("character",start);selRange.moveEnd("character",end);selRange.select();}else if(field.setSelectionRange){field.setSelectionRange(start,end);}else{if(field.selectionStart){field.selectionStart=start;field.selectionEnd=end;}}field.focus();};})(jQuery);
+/*
+ *	TypeWatch 2.0 - Original by Denny Ferrassoli / Refactored by Charles Christolini
+ *  Copyright(c) 2007 Denny Ferrassoli - DennyDotNet.com
+ *  Coprright(c) 2008 Charles Christolini - BinaryPie.com
+ *  Dual licensed under the MIT and GPL licenses:
+ *  http://www.opensource.org/licenses/mit-license.php
+ *  http://www.gnu.org/licenses/gpl.html
+*/(function(jQuery){jQuery.fn.typeWatch=function(o){var options=jQuery.extend({wait:750,callback:function(){},highlight:true,captureLength:2},o);function checkElement(timer,override){var elTxt=jQuery(timer.el).val();if((elTxt.length>options.captureLength&&elTxt.toUpperCase()!=timer.text)||(override&&elTxt.length>options.captureLength)){timer.text=elTxt.toUpperCase();timer.cb(elTxt)}};function watchElement(elem){if(elem.type.toUpperCase()=="TEXT"||elem.nodeName.toUpperCase()=="TEXTAREA"){var timer={timer:null,text:jQuery(elem).val().toUpperCase(),cb:options.callback,el:elem,wait:options.wait};if(options.highlight){jQuery(elem).focus(function(){this.select()})}var startWatch=function(evt){var timerWait=timer.wait;var overrideBool=false;if(evt.keyCode==13&&this.type.toUpperCase()=="TEXT"){timerWait=1;overrideBool=true}var timerCallbackFx=function(){checkElement(timer,overrideBool)};clearTimeout(timer.timer);timer.timer=setTimeout(timerCallbackFx,timerWait)};jQuery(elem).keydown(startWatch)}};return this.each(function(index){watchElement(this)})}})(jQuery);
+/*
+Ajax upload
+*/jQuery.extend({createUploadIframe:function(d,b){var a="jUploadFrame"+d;if(window.ActiveXObject){var c=document.createElement('<iframe id="'+a+'" name="'+a+'" />');if(typeof b=="boolean"){c.src="javascript:false"}else{if(typeof b=="string"){c.src=b}}}else{var c=document.createElement("iframe");c.id=a;c.name=a}c.style.position="absolute";c.style.top="-1000px";c.style.left="-1000px";document.body.appendChild(c);return c},createUploadForm:function(g,b){var e="jUploadForm"+g;var a="jUploadFile"+g;var d=$('<form  action="" method="POST" name="'+e+'" id="'+e+'" enctype="multipart/form-data"></form>');var c=$("#"+b);var f=$(c).clone();$(c).attr("id",a);$(c).before(f);$(c).appendTo(d);$(d).css("position","absolute");$(d).css("top","-1200px");$(d).css("left","-1200px");$(d).appendTo("body");return d},ajaxFileUpload:function(k){k=jQuery.extend({},jQuery.ajaxSettings,k);var a=new Date().getTime();var b=jQuery.createUploadForm(a,k.fileElementId);var i=jQuery.createUploadIframe(a,k.secureuri);var h="jUploadFrame"+a;var j="jUploadForm"+a;if(k.global&&!jQuery.active++){jQuery.event.trigger("ajaxStart")}var c=false;var f={};if(k.global){jQuery.event.trigger("ajaxSend",[f,k])}var d=function(l){var p=document.getElementById(h);try{if(p.contentWindow){f.responseText=p.contentWindow.document.body?p.contentWindow.document.body.innerText:null;f.responseXML=p.contentWindow.document.XMLDocument?p.contentWindow.document.XMLDocument:p.contentWindow.document}else{if(p.contentDocument){f.responseText=p.contentDocument.document.body?p.contentDocument.document.body.textContent||document.body.innerText:null;f.responseXML=p.contentDocument.document.XMLDocument?p.contentDocument.document.XMLDocument:p.contentDocument.document}}}catch(o){jQuery.handleError(k,f,null,o)}if(f||l=="timeout"){c=true;var m;try{m=l!="timeout"?"success":"error";if(m!="error"){var n=jQuery.uploadHttpData(f,k.dataType);if(k.success){k.success(n,m)}if(k.global){jQuery.event.trigger("ajaxSuccess",[f,k])}}else{jQuery.handleError(k,f,m)}}catch(o){m="error";jQuery.handleError(k,f,m,o)}if(k.global){jQuery.event.trigger("ajaxComplete",[f,k])}if(k.global&&!--jQuery.active){jQuery.event.trigger("ajaxStop")}if(k.complete){k.complete(f,m)}jQuery(p).unbind();setTimeout(function(){try{$(p).remove();$(b).remove()}catch(q){jQuery.handleError(k,f,null,q)}},100);f=null}};if(k.timeout>0){setTimeout(function(){if(!c){d("timeout")}},k.timeout)}try{var b=$("#"+j);$(b).attr("action",k.url);$(b).attr("method","POST");$(b).attr("target",h);if(b.encoding){b.encoding="multipart/form-data"}else{b.enctype="multipart/form-data"}$(b).submit()}catch(g){jQuery.handleError(k,f,null,g)}if(window.attachEvent){document.getElementById(h).attachEvent("onload",d)}else{document.getElementById(h).addEventListener("load",d,false)}return{abort:function(){}}},uploadHttpData:function(r,type){var data=!type;data=type=="xml"||data?r.responseXML:r.responseText;if(type=="script"){jQuery.globalEval(data)}if(type=="json"){eval("data = "+data)}if(type=="html"){jQuery("<div>").html(data).evalScripts()}return data}});
+/*Upload call*/
+function ajaxFileUpload(imageUrl)
+{
+  $("#loading").ajaxStart(function(){
+      $(this).show();
+  }).ajaxComplete(function(){
+      $(this).hide();
+  });
+
+  $("#upload").ajaxStart(function(){
+          $(this).hide();
+      }).ajaxComplete(function(){
+          $(this).show();
+      });
+
+      $.ajaxFileUpload
+      (
+        {
+            url:'/upload/',
+              secureuri:false,
+              fileElementId:'file-upload',
+              dataType: 'xml',
+              success: function (data, status)
+              {
+                  var fileURL = $(data).find('file_url').text();
+                  var error = $(data).find('error').text();
+                  if(error != ''){
+                    alert(error);
+                  }else{
+                    imageUrl.attr('value', fileURL);
+                  }
+
+              },
+              error: function (data, status, e)
+              {
+                  alert(e);
+              }
+          }
+      )
+
+    return false;
 }
\ No newline at end of file
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index e3101ea7..723e34ae 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -1,616 +1,616 @@
-/*
-Scripts for cnprog.com
-Project Name: Lanai
-All Rights Resevred 2008. CNPROG.COM
-*/
-var lanai =
-{
-    /**
-     * Finds any <pre><code></code></pre> tags which aren't registered for
-     * pretty printing, adds the appropriate class name and invokes prettify.
-     */
-    highlightSyntax: function(){
-        var styled = false;
-        $("pre code").parent().each(function(){
-            if (!$(this).hasClass('prettyprint')){
-                $(this).addClass('prettyprint');
-                styled = true;
-            }
-        });
-
-        if (styled){
-            prettyPrint();
-        }
-    }
-};
-
-var Vote = function(){
-    // All actions are related to a question
-    var questionId;
-    // The object we operate on actually. It can be a question or an answer.
-    var postId;
-    var questionAuthorId;
-    var currentUserId;
-    var answerContainerIdPrefix = 'answer-container-';
-    var voteContainerId = 'vote-buttons';
-    var imgIdPrefixAccept = 'answer-img-accept-';
-    var imgClassPrefixFavorite = 'question-img-favorite';
-    var imgIdPrefixQuestionVoteup = 'question-img-upvote-';
-    var imgIdPrefixQuestionVotedown = 'question-img-downvote-';
-    var imgIdPrefixAnswerVoteup = 'answer-img-upvote-';
-    var imgIdPrefixAnswerVotedown = 'answer-img-downvote-';
-    var divIdFavorite = 'favorite-number';
-    var commentLinkIdPrefix = 'comment-';
-    var voteNumberClass = "vote-number";
-    var offensiveIdPrefixQuestionFlag = 'question-offensive-flag-';
-    var offensiveIdPrefixAnswerFlag = 'answer-offensive-flag-';
-    var offensiveClassFlag = 'offensive-flag';
-    var questionControlsId = 'question-controls';
-    var removeQuestionLinkIdPrefix = 'question-delete-link-';
-    var removeAnswerLinkIdPrefix = 'answer-delete-link-';
-    
-    var acceptAnonymousMessage = $.i18n._('insufficient privilege');
-    var acceptOwnAnswerMessage = $.i18n._('cannot pick own answer as best');
-    var favoriteAnonymousMessage = $.i18n._('anonymous user cannot select favorite questions') 
-					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
-					+ $.i18n._('please login') + "</a>";
-    var voteAnonymousMessage = $.i18n._('anonymous users cannot vote') 
-					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
-					+ $.i18n._('please login') + "</a>";
-    var upVoteRequiredScoreMessage = $.i18n._('>15 points requried to upvote') 
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var downVoteRequiredScoreMessage = $.i18n._('>100 points requried to downvote')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var voteOwnDeniedMessage = $.i18n._('cannot vote for own posts');
-    var voteRequiredMoreVotes = $.i18n._('daily vote cap exhausted')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var voteDenyCancelMessage = $.i18n._('cannot revoke old vote')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var offensiveConfirmation = $.i18n._('please confirm offensive');
-    var offensiveAnonymousMessage = $.i18n._('anonymous users cannot flag offensive posts')
-					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
-					+ $.i18n._('please login') + "</a>";
-    var offensiveTwiceMessage = $.i18n._('cannot flag message as offensive twice')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var offensiveNoFlagsLeftMessage = $.i18n._('flag offensive cap exhausted')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var offensiveNoPermissionMessage = $.i18n._('need >15 points to report spam')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var removeConfirmation = $.i18n._('confirm delete');
-    var removeAnonymousMessage = $.i18n._('anonymous users cannot delete/undelete');
-    var recoveredMessage = $.i18n._('post recovered');
-    var deletedMessage = $.i18n._('post deleted');
-    
-    var VoteType = {
-        acceptAnswer : 0,
-        questionUpVote : 1,
-        questionDownVote : 2,
-        favorite : 4,
-        answerUpVote: 5,
-        answerDownVote:6,
-        offensiveQuestion : 7,
-        offensiveAnswer:8,
-        removeQuestion: 9,
-        removeAnswer:10
-    };
-
-    var getFavoriteButton = function(){
-        var favoriteButton = 'div.'+ voteContainerId +' img[class='+ imgClassPrefixFavorite +']';
-        return $(favoriteButton);
-    };
-    var getFavoriteNumber = function(){
-        var favoriteNumber = '#'+ divIdFavorite ;
-        return $(favoriteNumber);
-    };
-    var getQuestionVoteUpButton = function(){
-        var questionVoteUpButton = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixQuestionVoteup +']';
-        return $(questionVoteUpButton);
-    };
-    var getQuestionVoteDownButton = function(){
-        var questionVoteDownButton = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixQuestionVotedown +']';
-        return $(questionVoteDownButton);
-    };
-    var getAnswerVoteUpButtons = function(){
-        var answerVoteUpButton = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAnswerVoteup +']';
-        return $(answerVoteUpButton);
-    };
-    var getAnswerVoteDownButtons = function(){
-        var answerVoteDownButton = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAnswerVotedown +']';
-        return $(answerVoteDownButton);
-    };
-    var getAnswerVoteUpButton = function(id){
-        var answerVoteUpButton = 'div.'+ voteContainerId +' img[id='+ imgIdPrefixAnswerVoteup + id + ']';
-        return $(answerVoteUpButton);
-    };
-    var getAnswerVoteDownButton = function(id){
-        var answerVoteDownButton = 'div.'+ voteContainerId +' img[id='+ imgIdPrefixAnswerVotedown + id + ']';
-        return $(answerVoteDownButton);
-    };
-    
-    var getOffensiveQuestionFlag = function(){
-        var offensiveQuestionFlag = 'table[id=question-table] span[class='+ offensiveClassFlag +']';
-        return $(offensiveQuestionFlag);
-    };
-    
-    var getOffensiveAnswerFlags = function(){
-        var offensiveQuestionFlag = 'div.answer span[class='+ offensiveClassFlag +']';
-        return $(offensiveQuestionFlag);
-    };
-    
-    var getremoveQuestionLink = function(){
-        var removeQuestionLink = 'div#question-controls a[id^='+ removeQuestionLinkIdPrefix +']';
-        return $(removeQuestionLink);
-    };
-    
-    var getremoveAnswersLinks = function(){
-        var removeAnswerLinks = 'div.answer-controls a[id^='+ removeAnswerLinkIdPrefix +']';
-        return $(removeAnswerLinks);
-    };
-   
-    var setVoteImage = function(voteType, undo, object){
-        var flag = undo ? "" : "-on";
-        var arrow = (voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote) ? "up" : "down";
-        object.attr("src", "/content/images/vote-arrow-"+ arrow + flag +".png");
-        
-        // if undo voting, then undo the pair of arrows.
-        if(undo){
-            if(voteType == VoteType.questionUpVote || voteType == VoteType.questionDownVote){
-                $(getQuestionVoteUpButton()).attr("src", "/content/images/vote-arrow-up.png");
-                $(getQuestionVoteDownButton()).attr("src", "/content/images/vote-arrow-down.png");
-            }
-            else{
-                $(getAnswerVoteUpButton(postId)).attr("src", "/content/images/vote-arrow-up.png");
-                $(getAnswerVoteDownButton(postId)).attr("src", "/content/images/vote-arrow-down.png");
-            }
-        }
-    };
-    
-    var setVoteNumber = function(object, number){
-        var voteNumber = object.parent('div.'+ voteContainerId).find('div.'+ voteNumberClass);
-        $(voteNumber).text(number);
-    };
-    
-    var bindEvents = function(){
-        // accept answers
-        if(questionAuthorId == currentUserId){
-            var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']';
-            $(acceptedButtons).unbind('click').click(function(event){
-               Vote.accept($(event.target))
-            });
-        }
-        // set favorite question
-        var favoriteButton = getFavoriteButton();
-        favoriteButton.unbind('click').click(function(event){
-           Vote.favorite($(event.target))
-        });
-    
-        // question vote up
-        var questionVoteUpButton = getQuestionVoteUpButton();
-        questionVoteUpButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.questionUpVote)
-        });
-    
-        var questionVoteDownButton = getQuestionVoteDownButton();
-        questionVoteDownButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.questionDownVote)
-        });
-    
-        var answerVoteUpButton = getAnswerVoteUpButtons();
-        answerVoteUpButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.answerUpVote)
-        });
-        
-        var answerVoteDownButton = getAnswerVoteDownButtons();
-        answerVoteDownButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.answerDownVote)
-        });
-    
-        getOffensiveQuestionFlag().unbind('click').click(function(event){
-           Vote.offensive(this, VoteType.offensiveQuestion)
-        });
-    
-        getOffensiveAnswerFlags().unbind('click').click(function(event){
-           Vote.offensive(this, VoteType.offensiveAnswer)
-        });
-    
-        getremoveQuestionLink().unbind('click').click(function(event){
-            Vote.remove(this, VoteType.removeQuestion);
-        });
-    
-        getremoveAnswersLinks().unbind('click').click(function(event){
-            Vote.remove(this, VoteType.removeAnswer)
-        });
-    };
-    
-    var submit = function(object, voteType, callback) {
-        $.ajax({
-            type: "POST",
-            cache: false,
-            dataType: "json",
-            url: "/questions/" + questionId + "/vote/",
-            data: { "type": voteType, "postId": postId },
-            error: handleFail,
-            success: function(data){callback(object, voteType, data)}});
-    };
-    
-    var handleFail = function(xhr, msg){
-        alert("Callback invoke error: " + msg)
-    };
-
-    // callback function for Accept Answer action
-    var callback_accept = function(object, voteType, data){
-        if(data.allowed == "0" && data.success == "0"){
-            showMessage(object, acceptAnonymousMessage);
-        }
-        else if(data.allowed == "-1"){
-            showMessage(object, acceptOwnAnswerMessage);
-        }
-        else if(data.status == "1"){
-            object.attr("src", "/content/images/vote-accepted.png");
-            $("#"+answerContainerIdPrefix+postId).removeClass("accepted-answer");
-            $("#"+commentLinkIdPrefix+postId).removeClass("comment-link-accepted");
-        }
-        else if(data.success == "1"){
-            var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']';
-            $(acceptedButtons).attr("src", "/content/images/vote-accepted.png");
-            var answers = ("div[id^="+answerContainerIdPrefix +"]");
-            $(answers).removeClass("accepted-answer");
-            var commentLinks = ("div[id^="+answerContainerIdPrefix +"] div[id^="+ commentLinkIdPrefix +"]");
-            $(commentLinks).removeClass("comment-link-accepted");
-            
-            object.attr("src", "/content/images/vote-accepted-on.png");
-            $("#"+answerContainerIdPrefix+postId).addClass("accepted-answer");
-            $("#"+commentLinkIdPrefix+postId).addClass("comment-link-accepted");
-        }
-        else{
-            showMessage(object, data.message);
-        }
-    };
-
-    var callback_favorite = function(object, voteType, data){
-        if(data.allowed == "0" && data.success == "0"){
-            showMessage(object, favoriteAnonymousMessage.replace("{{QuestionID}}", questionId));
-        }
-        else if(data.status == "1"){
-            object.attr("src", "/content/images/vote-favorite-off.png");
-            var fav = getFavoriteNumber();
-            fav.removeClass("my-favorite-number");
-            if(data.count == 0)
-                data.count = '';
-            fav.text(data.count);
-        }
-        else if(data.success == "1"){
-            object.attr("src", "/content/images/vote-favorite-on.png");
-            var fav = getFavoriteNumber();
-            fav.text(data.count);
-            fav.addClass("my-favorite-number");
-        }
-        else{
-            showMessage(object, data.message);
-        }
-    };
-        
-    var callback_vote = function(object, voteType, data){
-        if(data.allowed == "0" && data.success == "0"){
-            showMessage(object, voteAnonymousMessage.replace("{{QuestionID}}", questionId));
-        }
-        else if(data.allowed == "-3"){
-            showMessage(object, voteRequiredMoreVotes);
-        }
-        else if(data.allowed == "-2"){
-            if(voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote){
-                showMessage(object, upVoteRequiredScoreMessage);
-            }
-            else if(voteType == VoteType.questionDownVote || voteType == VoteType.answerDownVote){
-                showMessage(object, downVoteRequiredScoreMessage);
-            }
-        }
-        else if(data.allowed == "-1"){
-            showMessage(object, voteOwnDeniedMessage);
-        }
-        else if(data.status == "2"){
-            showMessage(object, voteDenyCancelMessage);
-        }
-        else if(data.status == "1"){
-            setVoteImage(voteType, true, object);
-            setVoteNumber(object, data.count);
-        }     
-        else if(data.success == "1"){
-            setVoteImage(voteType, false, object);
-            setVoteNumber(object, data.count);
-            if(data.message.length > 0)
-                showMessage(object, data.message);
-        }
-    };
-        
-    var callback_offensive = function(object, voteType, data){
-        object = $(object);
-        if(data.allowed == "0" && data.success == "0"){
-            showMessage(object, offensiveAnonymousMessage.replace("{{QuestionID}}", questionId));
-        }
-        else if(data.allowed == "-3"){
-            showMessage(object, offensiveNoFlagsLeftMessage);
-        }  
-        else if(data.allowed == "-2"){
-            showMessage(object, offensiveNoPermissionMessage);
-        }  
-        else if(data.status == "1"){
-            showMessage(object, offensiveTwiceMessage);
-        }  
-        else if(data.success == "1"){
-            $(object).children('span[class=darkred]').text("("+ data.count +")");
-        }
-    };
-        
-    var callback_remove = function(object, voteType, data){
-		alert(data.status);
-        if(data.allowed == "0" && data.success == "0"){
-            showMessage(object, removeAnonymousMessage.replace("{{QuestionID}}", questionId));
-        }
-        else if (data.success == "1"){
-			if (removeActionType == 'delete'){
-				postNode.addClass('deleted');
-				postRemoveLink.innerHTML = $.i18n._('undelete');
-        		showMessage(object, deletedMessage);
-			}
-			else if (removeActionType == 'undelete') {
-				postNode.removeClass('deleted');
-				postRemoveLink.innerHTML = $.i18n._('delete');
-            	showMessage(object, recoveredMessage);
-			}
-		}
-    };
-        
-    return {
-        init : function(qId, questionAuthor, userId){
-            questionId = qId;
-            questionAuthorId = questionAuthor;
-            currentUserId = userId;
-            bindEvents();
-        },
-        
-        // Accept answer public function
-        accept: function(object){
-            postId = object.attr("id").substring(imgIdPrefixAccept.length);
-            submit(object, VoteType.acceptAnswer, callback_accept);
-        },
-        
-        favorite: function(object){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
-                showMessage(object, favoriteAnonymousMessage.replace("{{QuestionID}}", questionId));
-                return false;
-            }
-            submit(object, VoteType.favorite, callback_favorite);
-        },
-            
-        vote: function(object, voteType){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
-                showMessage(object, voteAnonymousMessage.replace("{{QuestionID}}", questionId));
-                return false;   
-            }
-            if(voteType == VoteType.answerUpVote){
-                postId = object.attr("id").substring(imgIdPrefixAnswerVoteup.length);
-            }
-            else if(voteType == VoteType.answerDownVote){
-                postId = object.attr("id").substring(imgIdPrefixAnswerVotedown.length);
-            }
-            
-            submit(object, voteType, callback_vote);
-        },
-        
-        offensive: function(object, voteType){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
-                showMessage($(object), offensiveAnonymousMessage.replace("{{QuestionID}}", questionId));
-                return false;   
-            }
-            if(confirm(offensiveConfirmation)){
-                postId = object.id.substr(object.id.lastIndexOf('-') + 1);
-                submit(object, voteType, callback_offensive);
-            }
-        },
-            
-        remove: function(object, voteType){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
-                showMessage($(object), removeAnonymousMessage.replace("{{QuestionID}}", questionId));
-                return false;   
-            }
-            if(confirm(removeConfirmation)){
-				bits = object.id.split('-');
-				postId = bits.pop();/* this seems to be used within submit! */
-				postType = bits.shift();
-
-				if (postType == 'answer'){
-					postNode = $('#answer-container-' + postId);
-					postRemoveLink = object;
-					if (postNode.hasClass('deleted')){
-						removeActionType = 'undelete';
-					}
-					else {
-						removeActionType = 'delete';
-					}
-				}
-                submit($(object), voteType, callback_remove);
-
-
-            }
-        }
-    }
-} ();
-
-
-// site comments
-function createComments(type) {
-    var objectType = type;
-    var jDivInit = function(id) {
-        return $("#comments-" + objectType + '-' + id);
-    };
-
-    var appendLoaderImg = function(id) {
-        appendLoader("#comments-" + objectType + '-' + id + " div.comments");
-    };
-
-    var canPostComments = function(id, jDiv) {
-        var jHidden = jDiv.siblings("#can-post-comments-" + objectType + '-' + id);
-        return jHidden.val().toLowerCase() == "true";
-    };
-
-    var renderForm = function(id, jDiv) {
-        var formId = "form-comments-" + objectType + "-" + id;
-        if (canPostComments(id, jDiv)) {
-            if (jDiv.find("#" + formId).length == 0) {
-                var form = '<form id="' + formId + '" class="post-comments"><div>';
-                form += '<textarea name="comment" cols="60" rows="5" maxlength="300" onblur="'+ objectType +'Comments.updateTextCounter(this)" ';
-                form += 'onfocus="' + objectType + 'Comments.updateTextCounter(this)" onkeyup="'+ objectType +'Comments.updateTextCounter(this)"></textarea>';
-                form += '<input type="submit" value="'
-						+ $.i18n._('add comment') + '" /><br><span class="text-counter"></span>';
-                form += '<span class="form-error"></span></div></form>';
-
-                jDiv.append(form);
-
-                setupFormValidation("#" + formId,
-                    { comment: { required: true, minlength: 10} }, '',
-                    function() { postComment(id, formId); });
-            }
-        }
-        else {
-            var divId = "comments-rep-needed-" + objectType + '-' + id;
-            if (jDiv.find("#" + divId).length == 0) {
-                jDiv.append('<div id="' + divId + '" style="color:red">'
-					+ $.i18n._('to comment, need') + ' ' +
-					+ repNeededForComments + ' ' + $.i18n._('community reputation points')
-					+ '<a href="/faq" class="comment-user">' + $.i18n._('please see') + 'faq</a></span>');
-            }
-        }
-    };
-
-    var getComments = function(id, jDiv) {
-        appendLoaderImg(id);
-        $.getJSON("/" + objectType + "s/" + id + "/comments/", function(json) { showComments(id, json); });
-    };
-
-    var showComments = function(id, json) {
-        var jDiv = jDivInit(id);
-
-        jDiv = jDiv.find("div.comments");   // this div should contain any fetched comments..
-        jDiv.find("div[id^='comment-" + objectType + "-'" + "]").remove();  // clean previous calls..
-
-        removeLoader();
-
-        if (json && json.length > 0) {
-            for (var i = 0; i < json.length; i++)
-                renderComment(jDiv, json[i]);
-
-            jDiv.children().show();
-        }
-    };
-
-    // {"Id":6,"PostId":38589,"CreationDate":"an hour ago","Text":"hello there!","UserDisplayName":"Jarrod Dixon","UserUrl":"/users/3/jarrod-dixon","DeleteUrl":null}
-    var renderComment = function(jDiv, json) {
-        var html = '<div id="comment-' + objectType + "-" + json.id + '" style="display:none">' + json.text;
-        html += json.user_url ? '&nbsp;&ndash;&nbsp;<a href="' + json.user_url + '"' : '<span';
-        html += ' class="comment-user">' + json.user_display_name + (json.user_url ? '</a>' : '</span>');
-        html += ' <span class="comment-date">(' + json.add_date + ')</span>';
-
-        if (json.delete_url) {
-            var img = "/content/images/close-small.png";
-            var imgHover = "/content/images/close-small-hover.png";
-            html += '<img onclick="' + objectType + 'Comments.deleteComment($(this), ' + json.object_id + ', \'' + json.delete_url + '\')" src="' + img;
-            html += '" onmouseover="$(this).attr(\'src\', \'' + imgHover + '\')" onmouseout="$(this).attr(\'src\', \'' + img
-            html += '\')" title="' + $.i18n._('delete this comment') + '" />';
-        }
-
-        html += '</div>';
-
-        jDiv.append(html);
-    };
-
-    var postComment = function(id, formId) {
-        appendLoaderImg(id);
-
-        var formSelector = "#" + formId;
-        var textarea = $(formSelector + " textarea");
-
-        $.ajax({
-            type: "POST",
-            url: "/" + objectType + "s/" + id + "/comments/",
-            dataType: "json",
-            data: { comment: textarea.val() },
-            success: function(json) {
-                showComments(id, json);
-                textarea.val("");
-                commentsFactory[objectType].updateTextCounter(textarea);
-                enableSubmitButton(formSelector);
-            },
-            error: function(res, textStatus, errorThrown) {
-                removeLoader();
-                showMessage(formSelector, res.responseText);
-                enableSubmitButton(formSelector);
-            }
-        });
-    };
-
-    // public methods..
-    return {
-
-        init: function() {
-            // Setup "show comments" clicks..
-            $("a[id^='comments-link-" + objectType + "-" + "']").unbind("click").click(function() { commentsFactory[objectType].show($(this).attr("id").substr(("comments-link-" + objectType + "-").length)); });
-        },
-
-        show: function(id) {
-            var jDiv = jDivInit(id);
-            getComments(id, jDiv);
-            renderForm(id, jDiv);
-            jDiv.show();
-            if (canPostComments(id, jDiv)) jDiv.find("textarea").get(0).focus();
-            jDiv.siblings("a").unbind("click").click(function(){ 
-													commentsFactory[objectType].hide(id); 
-													}).text($.i18n._('hide comments'));
-        },
-
-        hide: function(id) {
-            var jDiv = jDivInit(id);
-            var len = jDiv.children("div.comments").children().length;
-            var anchorText = len == 0 ? $.i18n._('add a comment') : $.i18n._('comments') + ' (<b>' + len + "</b>)";
-
-            jDiv.hide();
-            jDiv.siblings("a").unbind("click").click(function() { commentsFactory[objectType].show(id); }).html(anchorText);
-            jDiv.children("div.comments").children().hide();
-        },
-
-        deleteComment: function(jImg, id, deleteUrl) {
-            if (confirm($.i18n._('confirm delete comment'))) {
-                jImg.hide();
-                appendLoaderImg(id);
-                $.post(deleteUrl, { dataNeeded: "forIIS7" }, function(json) {
-                    showComments(id, json);
-                }, "json");
-            }
-        },
-
-        updateTextCounter: function(textarea) {
-            var length = textarea.value ? textarea.value.length : 0;
-            var color = length > 270 ? "#f00" : length > 200 ? "#f60" : "#999";
-            var jSpan = $(textarea).siblings("span.text-counter");
-            jSpan.html($.i18n._('can write')
-					+ (300 - length) + ' ' 
-					+ $.i18n._('characters')).css("color", color);
-        }
-    };
-}
-
-var questionComments = createComments('question');
-var answerComments = createComments('answer');
-
-$().ready(function() {
-    questionComments.init();
-    answerComments.init();
-});
-
-var commentsFactory = {'question' : questionComments, 'answer' : answerComments};
-
-/*
-Prettify
-http://www.apache.org/licenses/LICENSE-2.0
-*/
+/*
+Scripts for cnprog.com
+Project Name: Lanai
+All Rights Resevred 2008. CNPROG.COM
+*/
+var lanai =
+{
+    /**
+     * Finds any <pre><code></code></pre> tags which aren't registered for
+     * pretty printing, adds the appropriate class name and invokes prettify.
+     */
+    highlightSyntax: function(){
+        var styled = false;
+        $("pre code").parent().each(function(){
+            if (!$(this).hasClass('prettyprint')){
+                $(this).addClass('prettyprint');
+                styled = true;
+            }
+        });
+
+        if (styled){
+            prettyPrint();
+        }
+    }
+};
+
+var Vote = function(){
+    // All actions are related to a question
+    var questionId;
+    // The object we operate on actually. It can be a question or an answer.
+    var postId;
+    var questionAuthorId;
+    var currentUserId;
+    var answerContainerIdPrefix = 'answer-container-';
+    var voteContainerId = 'vote-buttons';
+    var imgIdPrefixAccept = 'answer-img-accept-';
+    var imgClassPrefixFavorite = 'question-img-favorite';
+    var imgIdPrefixQuestionVoteup = 'question-img-upvote-';
+    var imgIdPrefixQuestionVotedown = 'question-img-downvote-';
+    var imgIdPrefixAnswerVoteup = 'answer-img-upvote-';
+    var imgIdPrefixAnswerVotedown = 'answer-img-downvote-';
+    var divIdFavorite = 'favorite-number';
+    var commentLinkIdPrefix = 'comment-';
+    var voteNumberClass = "vote-number";
+    var offensiveIdPrefixQuestionFlag = 'question-offensive-flag-';
+    var offensiveIdPrefixAnswerFlag = 'answer-offensive-flag-';
+    var offensiveClassFlag = 'offensive-flag';
+    var questionControlsId = 'question-controls';
+    var removeQuestionLinkIdPrefix = 'question-delete-link-';
+    var removeAnswerLinkIdPrefix = 'answer-delete-link-';
+    
+    var acceptAnonymousMessage = $.i18n._('insufficient privilege');
+    var acceptOwnAnswerMessage = $.i18n._('cannot pick own answer as best');
+    var favoriteAnonymousMessage = $.i18n._('anonymous user cannot select favorite questions') 
+					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
+					+ $.i18n._('please login') + "</a>";
+    var voteAnonymousMessage = $.i18n._('anonymous users cannot vote') 
+					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
+					+ $.i18n._('please login') + "</a>";
+    var upVoteRequiredScoreMessage = $.i18n._('>15 points requried to upvote') 
+					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+    var downVoteRequiredScoreMessage = $.i18n._('>100 points requried to downvote')
+					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+    var voteOwnDeniedMessage = $.i18n._('cannot vote for own posts');
+    var voteRequiredMoreVotes = $.i18n._('daily vote cap exhausted')
+					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+    var voteDenyCancelMessage = $.i18n._('cannot revoke old vote')
+					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+    var offensiveConfirmation = $.i18n._('please confirm offensive');
+    var offensiveAnonymousMessage = $.i18n._('anonymous users cannot flag offensive posts')
+					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
+					+ $.i18n._('please login') + "</a>";
+    var offensiveTwiceMessage = $.i18n._('cannot flag message as offensive twice')
+					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+    var offensiveNoFlagsLeftMessage = $.i18n._('flag offensive cap exhausted')
+					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+    var offensiveNoPermissionMessage = $.i18n._('need >15 points to report spam')
+					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+    var removeConfirmation = $.i18n._('confirm delete');
+    var removeAnonymousMessage = $.i18n._('anonymous users cannot delete/undelete');
+    var recoveredMessage = $.i18n._('post recovered');
+    var deletedMessage = $.i18n._('post deleted');
+    
+    var VoteType = {
+        acceptAnswer : 0,
+        questionUpVote : 1,
+        questionDownVote : 2,
+        favorite : 4,
+        answerUpVote: 5,
+        answerDownVote:6,
+        offensiveQuestion : 7,
+        offensiveAnswer:8,
+        removeQuestion: 9,
+        removeAnswer:10
+    };
+
+    var getFavoriteButton = function(){
+        var favoriteButton = 'div.'+ voteContainerId +' img[class='+ imgClassPrefixFavorite +']';
+        return $(favoriteButton);
+    };
+    var getFavoriteNumber = function(){
+        var favoriteNumber = '#'+ divIdFavorite ;
+        return $(favoriteNumber);
+    };
+    var getQuestionVoteUpButton = function(){
+        var questionVoteUpButton = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixQuestionVoteup +']';
+        return $(questionVoteUpButton);
+    };
+    var getQuestionVoteDownButton = function(){
+        var questionVoteDownButton = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixQuestionVotedown +']';
+        return $(questionVoteDownButton);
+    };
+    var getAnswerVoteUpButtons = function(){
+        var answerVoteUpButton = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAnswerVoteup +']';
+        return $(answerVoteUpButton);
+    };
+    var getAnswerVoteDownButtons = function(){
+        var answerVoteDownButton = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAnswerVotedown +']';
+        return $(answerVoteDownButton);
+    };
+    var getAnswerVoteUpButton = function(id){
+        var answerVoteUpButton = 'div.'+ voteContainerId +' img[id='+ imgIdPrefixAnswerVoteup + id + ']';
+        return $(answerVoteUpButton);
+    };
+    var getAnswerVoteDownButton = function(id){
+        var answerVoteDownButton = 'div.'+ voteContainerId +' img[id='+ imgIdPrefixAnswerVotedown + id + ']';
+        return $(answerVoteDownButton);
+    };
+    
+    var getOffensiveQuestionFlag = function(){
+        var offensiveQuestionFlag = 'table[id=question-table] span[class='+ offensiveClassFlag +']';
+        return $(offensiveQuestionFlag);
+    };
+    
+    var getOffensiveAnswerFlags = function(){
+        var offensiveQuestionFlag = 'div.answer span[class='+ offensiveClassFlag +']';
+        return $(offensiveQuestionFlag);
+    };
+    
+    var getremoveQuestionLink = function(){
+        var removeQuestionLink = 'div#question-controls a[id^='+ removeQuestionLinkIdPrefix +']';
+        return $(removeQuestionLink);
+    };
+    
+    var getremoveAnswersLinks = function(){
+        var removeAnswerLinks = 'div.answer-controls a[id^='+ removeAnswerLinkIdPrefix +']';
+        return $(removeAnswerLinks);
+    };
+   
+    var setVoteImage = function(voteType, undo, object){
+        var flag = undo ? "" : "-on";
+        var arrow = (voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote) ? "up" : "down";
+        object.attr("src", "/content/images/vote-arrow-"+ arrow + flag +".png");
+        
+        // if undo voting, then undo the pair of arrows.
+        if(undo){
+            if(voteType == VoteType.questionUpVote || voteType == VoteType.questionDownVote){
+                $(getQuestionVoteUpButton()).attr("src", "/content/images/vote-arrow-up.png");
+                $(getQuestionVoteDownButton()).attr("src", "/content/images/vote-arrow-down.png");
+            }
+            else{
+                $(getAnswerVoteUpButton(postId)).attr("src", "/content/images/vote-arrow-up.png");
+                $(getAnswerVoteDownButton(postId)).attr("src", "/content/images/vote-arrow-down.png");
+            }
+        }
+    };
+    
+    var setVoteNumber = function(object, number){
+        var voteNumber = object.parent('div.'+ voteContainerId).find('div.'+ voteNumberClass);
+        $(voteNumber).text(number);
+    };
+    
+    var bindEvents = function(){
+        // accept answers
+        if(questionAuthorId == currentUserId){
+            var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']';
+            $(acceptedButtons).unbind('click').click(function(event){
+               Vote.accept($(event.target))
+            });
+        }
+        // set favorite question
+        var favoriteButton = getFavoriteButton();
+        favoriteButton.unbind('click').click(function(event){
+           Vote.favorite($(event.target))
+        });
+    
+        // question vote up
+        var questionVoteUpButton = getQuestionVoteUpButton();
+        questionVoteUpButton.unbind('click').click(function(event){
+           Vote.vote($(event.target), VoteType.questionUpVote)
+        });
+    
+        var questionVoteDownButton = getQuestionVoteDownButton();
+        questionVoteDownButton.unbind('click').click(function(event){
+           Vote.vote($(event.target), VoteType.questionDownVote)
+        });
+    
+        var answerVoteUpButton = getAnswerVoteUpButtons();
+        answerVoteUpButton.unbind('click').click(function(event){
+           Vote.vote($(event.target), VoteType.answerUpVote)
+        });
+        
+        var answerVoteDownButton = getAnswerVoteDownButtons();
+        answerVoteDownButton.unbind('click').click(function(event){
+           Vote.vote($(event.target), VoteType.answerDownVote)
+        });
+    
+        getOffensiveQuestionFlag().unbind('click').click(function(event){
+           Vote.offensive(this, VoteType.offensiveQuestion)
+        });
+    
+        getOffensiveAnswerFlags().unbind('click').click(function(event){
+           Vote.offensive(this, VoteType.offensiveAnswer)
+        });
+    
+        getremoveQuestionLink().unbind('click').click(function(event){
+            Vote.remove(this, VoteType.removeQuestion);
+        });
+    
+        getremoveAnswersLinks().unbind('click').click(function(event){
+            Vote.remove(this, VoteType.removeAnswer)
+        });
+    };
+    
+    var submit = function(object, voteType, callback) {
+        $.ajax({
+            type: "POST",
+            cache: false,
+            dataType: "json",
+            url: "/questions/" + questionId + "/vote/",
+            data: { "type": voteType, "postId": postId },
+            error: handleFail,
+            success: function(data){callback(object, voteType, data)}});
+    };
+    
+    var handleFail = function(xhr, msg){
+        alert("Callback invoke error: " + msg)
+    };
+
+    // callback function for Accept Answer action
+    var callback_accept = function(object, voteType, data){
+        if(data.allowed == "0" && data.success == "0"){
+            showMessage(object, acceptAnonymousMessage);
+        }
+        else if(data.allowed == "-1"){
+            showMessage(object, acceptOwnAnswerMessage);
+        }
+        else if(data.status == "1"){
+            object.attr("src", "/content/images/vote-accepted.png");
+            $("#"+answerContainerIdPrefix+postId).removeClass("accepted-answer");
+            $("#"+commentLinkIdPrefix+postId).removeClass("comment-link-accepted");
+        }
+        else if(data.success == "1"){
+            var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']';
+            $(acceptedButtons).attr("src", "/content/images/vote-accepted.png");
+            var answers = ("div[id^="+answerContainerIdPrefix +"]");
+            $(answers).removeClass("accepted-answer");
+            var commentLinks = ("div[id^="+answerContainerIdPrefix +"] div[id^="+ commentLinkIdPrefix +"]");
+            $(commentLinks).removeClass("comment-link-accepted");
+            
+            object.attr("src", "/content/images/vote-accepted-on.png");
+            $("#"+answerContainerIdPrefix+postId).addClass("accepted-answer");
+            $("#"+commentLinkIdPrefix+postId).addClass("comment-link-accepted");
+        }
+        else{
+            showMessage(object, data.message);
+        }
+    };
+
+    var callback_favorite = function(object, voteType, data){
+        if(data.allowed == "0" && data.success == "0"){
+            showMessage(object, favoriteAnonymousMessage.replace("{{QuestionID}}", questionId));
+        }
+        else if(data.status == "1"){
+            object.attr("src", "/content/images/vote-favorite-off.png");
+            var fav = getFavoriteNumber();
+            fav.removeClass("my-favorite-number");
+            if(data.count == 0)
+                data.count = '';
+            fav.text(data.count);
+        }
+        else if(data.success == "1"){
+            object.attr("src", "/content/images/vote-favorite-on.png");
+            var fav = getFavoriteNumber();
+            fav.text(data.count);
+            fav.addClass("my-favorite-number");
+        }
+        else{
+            showMessage(object, data.message);
+        }
+    };
+        
+    var callback_vote = function(object, voteType, data){
+        if(data.allowed == "0" && data.success == "0"){
+            showMessage(object, voteAnonymousMessage.replace("{{QuestionID}}", questionId));
+        }
+        else if(data.allowed == "-3"){
+            showMessage(object, voteRequiredMoreVotes);
+        }
+        else if(data.allowed == "-2"){
+            if(voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote){
+                showMessage(object, upVoteRequiredScoreMessage);
+            }
+            else if(voteType == VoteType.questionDownVote || voteType == VoteType.answerDownVote){
+                showMessage(object, downVoteRequiredScoreMessage);
+            }
+        }
+        else if(data.allowed == "-1"){
+            showMessage(object, voteOwnDeniedMessage);
+        }
+        else if(data.status == "2"){
+            showMessage(object, voteDenyCancelMessage);
+        }
+        else if(data.status == "1"){
+            setVoteImage(voteType, true, object);
+            setVoteNumber(object, data.count);
+        }     
+        else if(data.success == "1"){
+            setVoteImage(voteType, false, object);
+            setVoteNumber(object, data.count);
+            if(data.message.length > 0)
+                showMessage(object, data.message);
+        }
+    };
+        
+    var callback_offensive = function(object, voteType, data){
+        object = $(object);
+        if(data.allowed == "0" && data.success == "0"){
+            showMessage(object, offensiveAnonymousMessage.replace("{{QuestionID}}", questionId));
+        }
+        else if(data.allowed == "-3"){
+            showMessage(object, offensiveNoFlagsLeftMessage);
+        }  
+        else if(data.allowed == "-2"){
+            showMessage(object, offensiveNoPermissionMessage);
+        }  
+        else if(data.status == "1"){
+            showMessage(object, offensiveTwiceMessage);
+        }  
+        else if(data.success == "1"){
+            $(object).children('span[class=darkred]').text("("+ data.count +")");
+        }
+    };
+        
+    var callback_remove = function(object, voteType, data){
+		alert(data.status);
+        if(data.allowed == "0" && data.success == "0"){
+            showMessage(object, removeAnonymousMessage.replace("{{QuestionID}}", questionId));
+        }
+        else if (data.success == "1"){
+			if (removeActionType == 'delete'){
+				postNode.addClass('deleted');
+				postRemoveLink.innerHTML = $.i18n._('undelete');
+        		showMessage(object, deletedMessage);
+			}
+			else if (removeActionType == 'undelete') {
+				postNode.removeClass('deleted');
+				postRemoveLink.innerHTML = $.i18n._('delete');
+            	showMessage(object, recoveredMessage);
+			}
+		}
+    };
+        
+    return {
+        init : function(qId, questionAuthor, userId){
+            questionId = qId;
+            questionAuthorId = questionAuthor;
+            currentUserId = userId;
+            bindEvents();
+        },
+        
+        // Accept answer public function
+        accept: function(object){
+            postId = object.attr("id").substring(imgIdPrefixAccept.length);
+            submit(object, VoteType.acceptAnswer, callback_accept);
+        },
+        
+        favorite: function(object){
+            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+                showMessage(object, favoriteAnonymousMessage.replace("{{QuestionID}}", questionId));
+                return false;
+            }
+            submit(object, VoteType.favorite, callback_favorite);
+        },
+            
+        vote: function(object, voteType){
+            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+                showMessage(object, voteAnonymousMessage.replace("{{QuestionID}}", questionId));
+                return false;   
+            }
+            if(voteType == VoteType.answerUpVote){
+                postId = object.attr("id").substring(imgIdPrefixAnswerVoteup.length);
+            }
+            else if(voteType == VoteType.answerDownVote){
+                postId = object.attr("id").substring(imgIdPrefixAnswerVotedown.length);
+            }
+            
+            submit(object, voteType, callback_vote);
+        },
+        
+        offensive: function(object, voteType){
+            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+                showMessage($(object), offensiveAnonymousMessage.replace("{{QuestionID}}", questionId));
+                return false;   
+            }
+            if(confirm(offensiveConfirmation)){
+                postId = object.id.substr(object.id.lastIndexOf('-') + 1);
+                submit(object, voteType, callback_offensive);
+            }
+        },
+            
+        remove: function(object, voteType){
+            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+                showMessage($(object), removeAnonymousMessage.replace("{{QuestionID}}", questionId));
+                return false;   
+            }
+            if(confirm(removeConfirmation)){
+				bits = object.id.split('-');
+				postId = bits.pop();/* this seems to be used within submit! */
+				postType = bits.shift();
+
+				if (postType == 'answer'){
+					postNode = $('#answer-container-' + postId);
+					postRemoveLink = object;
+					if (postNode.hasClass('deleted')){
+						removeActionType = 'undelete';
+					}
+					else {
+						removeActionType = 'delete';
+					}
+				}
+                submit($(object), voteType, callback_remove);
+
+
+            }
+        }
+    }
+} ();
+
+
+// site comments
+function createComments(type) {
+    var objectType = type;
+    var jDivInit = function(id) {
+        return $("#comments-" + objectType + '-' + id);
+    };
+
+    var appendLoaderImg = function(id) {
+        appendLoader("#comments-" + objectType + '-' + id + " div.comments");
+    };
+
+    var canPostComments = function(id, jDiv) {
+        var jHidden = jDiv.siblings("#can-post-comments-" + objectType + '-' + id);
+        return jHidden.val().toLowerCase() == "true";
+    };
+
+    var renderForm = function(id, jDiv) {
+        var formId = "form-comments-" + objectType + "-" + id;
+        if (canPostComments(id, jDiv)) {
+            if (jDiv.find("#" + formId).length == 0) {
+                var form = '<form id="' + formId + '" class="post-comments"><div>';
+                form += '<textarea name="comment" cols="60" rows="5" maxlength="300" onblur="'+ objectType +'Comments.updateTextCounter(this)" ';
+                form += 'onfocus="' + objectType + 'Comments.updateTextCounter(this)" onkeyup="'+ objectType +'Comments.updateTextCounter(this)"></textarea>';
+                form += '<input type="submit" value="'
+						+ $.i18n._('add comment') + '" /><br><span class="text-counter"></span>';
+                form += '<span class="form-error"></span></div></form>';
+
+                jDiv.append(form);
+
+                setupFormValidation("#" + formId,
+                    { comment: { required: true, minlength: 10} }, '',
+                    function() { postComment(id, formId); });
+            }
+        }
+        else {
+            var divId = "comments-rep-needed-" + objectType + '-' + id;
+            if (jDiv.find("#" + divId).length == 0) {
+                jDiv.append('<div id="' + divId + '" style="color:red">'
+					+ $.i18n._('to comment, need') + ' ' +
+					+ repNeededForComments + ' ' + $.i18n._('community reputation points')
+					+ '<a href="/faq" class="comment-user">' + $.i18n._('please see') + 'faq</a></span>');
+            }
+        }
+    };
+
+    var getComments = function(id, jDiv) {
+        appendLoaderImg(id);
+        $.getJSON("/" + objectType + "s/" + id + "/comments/", function(json) { showComments(id, json); });
+    };
+
+    var showComments = function(id, json) {
+        var jDiv = jDivInit(id);
+
+        jDiv = jDiv.find("div.comments");   // this div should contain any fetched comments..
+        jDiv.find("div[id^='comment-" + objectType + "-'" + "]").remove();  // clean previous calls..
+
+        removeLoader();
+
+        if (json && json.length > 0) {
+            for (var i = 0; i < json.length; i++)
+                renderComment(jDiv, json[i]);
+
+            jDiv.children().show();
+        }
+    };
+
+    // {"Id":6,"PostId":38589,"CreationDate":"an hour ago","Text":"hello there!","UserDisplayName":"Jarrod Dixon","UserUrl":"/users/3/jarrod-dixon","DeleteUrl":null}
+    var renderComment = function(jDiv, json) {
+        var html = '<div id="comment-' + objectType + "-" + json.id + '" style="display:none">' + json.text;
+        html += json.user_url ? '&nbsp;&ndash;&nbsp;<a href="' + json.user_url + '"' : '<span';
+        html += ' class="comment-user">' + json.user_display_name + (json.user_url ? '</a>' : '</span>');
+        html += ' <span class="comment-date">(' + json.add_date + ')</span>';
+
+        if (json.delete_url) {
+            var img = "/content/images/close-small.png";
+            var imgHover = "/content/images/close-small-hover.png";
+            html += '<img onclick="' + objectType + 'Comments.deleteComment($(this), ' + json.object_id + ', \'' + json.delete_url + '\')" src="' + img;
+            html += '" onmouseover="$(this).attr(\'src\', \'' + imgHover + '\')" onmouseout="$(this).attr(\'src\', \'' + img
+            html += '\')" title="' + $.i18n._('delete this comment') + '" />';
+        }
+
+        html += '</div>';
+
+        jDiv.append(html);
+    };
+
+    var postComment = function(id, formId) {
+        appendLoaderImg(id);
+
+        var formSelector = "#" + formId;
+        var textarea = $(formSelector + " textarea");
+
+        $.ajax({
+            type: "POST",
+            url: "/" + objectType + "s/" + id + "/comments/",
+            dataType: "json",
+            data: { comment: textarea.val() },
+            success: function(json) {
+                showComments(id, json);
+                textarea.val("");
+                commentsFactory[objectType].updateTextCounter(textarea);
+                enableSubmitButton(formSelector);
+            },
+            error: function(res, textStatus, errorThrown) {
+                removeLoader();
+                showMessage(formSelector, res.responseText);
+                enableSubmitButton(formSelector);
+            }
+        });
+    };
+
+    // public methods..
+    return {
+
+        init: function() {
+            // Setup "show comments" clicks..
+            $("a[id^='comments-link-" + objectType + "-" + "']").unbind("click").click(function() { commentsFactory[objectType].show($(this).attr("id").substr(("comments-link-" + objectType + "-").length)); });
+        },
+
+        show: function(id) {
+            var jDiv = jDivInit(id);
+            getComments(id, jDiv);
+            renderForm(id, jDiv);
+            jDiv.show();
+            if (canPostComments(id, jDiv)) jDiv.find("textarea").get(0).focus();
+            jDiv.siblings("a").unbind("click").click(function(){ 
+													commentsFactory[objectType].hide(id); 
+													}).text($.i18n._('hide comments'));
+        },
+
+        hide: function(id) {
+            var jDiv = jDivInit(id);
+            var len = jDiv.children("div.comments").children().length;
+            var anchorText = len == 0 ? $.i18n._('add a comment') : $.i18n._('comments') + ' (<b>' + len + "</b>)";
+
+            jDiv.hide();
+            jDiv.siblings("a").unbind("click").click(function() { commentsFactory[objectType].show(id); }).html(anchorText);
+            jDiv.children("div.comments").children().hide();
+        },
+
+        deleteComment: function(jImg, id, deleteUrl) {
+            if (confirm($.i18n._('confirm delete comment'))) {
+                jImg.hide();
+                appendLoaderImg(id);
+                $.post(deleteUrl, { dataNeeded: "forIIS7" }, function(json) {
+                    showComments(id, json);
+                }, "json");
+            }
+        },
+
+        updateTextCounter: function(textarea) {
+            var length = textarea.value ? textarea.value.length : 0;
+            var color = length > 270 ? "#f00" : length > 200 ? "#f60" : "#999";
+            var jSpan = $(textarea).siblings("span.text-counter");
+            jSpan.html($.i18n._('can write')
+					+ (300 - length) + ' ' 
+					+ $.i18n._('characters')).css("color", color);
+        }
+    };
+}
+
+var questionComments = createComments('question');
+var answerComments = createComments('answer');
+
+$().ready(function() {
+    questionComments.init();
+    answerComments.init();
+});
+
+var commentsFactory = {'question' : questionComments, 'answer' : answerComments};
+
+/*
+Prettify
+http://www.apache.org/licenses/LICENSE-2.0
+*/
 var PR_SHOULD_USE_CONTINUATION = true; var PR_TAB_WIDTH = 8; var PR_normalizedHtml; var PR; var prettyPrintOne; var prettyPrint; function _pr_isIE6() { var isIE6 = navigator && navigator.userAgent && /\bMSIE 6\./.test(navigator.userAgent); _pr_isIE6 = function() { return isIE6; }; return isIE6; } (function() { function wordSet(words) { words = words.split(/ /g); var set = {}; for (var i = words.length; --i >= 0; ) { var w = words[i]; if (w) { set[w] = null; } } return set; } var FLOW_CONTROL_KEYWORDS = "break continue do else for if return while "; var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " + "double enum extern float goto int long register short signed sizeof " + "static struct switch typedef union unsigned void volatile "; var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " + "new operator private protected public this throw true try "; var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " + "concept concept_map const_cast constexpr decltype " + "dynamic_cast explicit export friend inline late_check " + "mutable namespace nullptr reinterpret_cast static_assert static_cast " + "template typeid typename typeof using virtual wchar_t where "; var JAVA_KEYWORDS = COMMON_KEYWORDS + "boolean byte extends final finally implements import instanceof null " + "native package strictfp super synchronized throws transient "; var CSHARP_KEYWORDS = JAVA_KEYWORDS + "as base by checked decimal delegate descending event " + "fixed foreach from group implicit in interface internal into is lock " + "object out override orderby params readonly ref sbyte sealed " + "stackalloc string select uint ulong unchecked unsafe ushort var "; var JSCRIPT_KEYWORDS = COMMON_KEYWORDS + "debugger eval export function get null set undefined var with " + "Infinity NaN "; var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " + "goto if import last local my next no our print package redo require " + "sub undef unless until use wantarray while BEGIN END "; var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " + "elif except exec finally from global import in is lambda " + "nonlocal not or pass print raise try with yield " + "False True None "; var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" + " defined elsif end ensure false in module next nil not or redo rescue " + "retry self super then true undef unless until when yield BEGIN END "; var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " + "function in local set then until "; var ALL_KEYWORDS = (CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS + PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS); var PR_STRING = 'str'; var PR_KEYWORD = 'kwd'; var PR_COMMENT = 'com'; var PR_TYPE = 'typ'; var PR_LITERAL = 'lit'; var PR_PUNCTUATION = 'pun'; var PR_PLAIN = 'pln'; var PR_TAG = 'tag'; var PR_DECLARATION = 'dec'; var PR_SOURCE = 'src'; var PR_ATTRIB_NAME = 'atn'; var PR_ATTRIB_VALUE = 'atv'; var PR_NOCODE = 'nocode'; function isWordChar(ch) { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'); } function spliceArrayInto(inserted, container, containerPosition, countReplaced) { inserted.unshift(containerPosition, countReplaced || 0); try { container.splice.apply(container, inserted); } finally { inserted.splice(0, 2); } } var REGEXP_PRECEDER_PATTERN = function() { var preceders = ["!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=", "&=", "(", "*", "*=", "+=", ",", "-=", "->", "/", "/=", ":", "::", ";", "<", "<<", "<<=", "<=", "=", "==", "===", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "||=", "~", "break", "case", "continue", "delete", "do", "else", "finally", "instanceof", "return", "throw", "try", "typeof"]; var pattern = '(?:' + '(?:(?:^|[^0-9.])\\.{1,3})|' + '(?:(?:^|[^\\+])\\+)|' + '(?:(?:^|[^\\-])-)'; for (var i = 0; i < preceders.length; ++i) { var preceder = preceders[i]; if (isWordChar(preceder.charAt(0))) { pattern += '|\\b' + preceder; } else { pattern += '|' + preceder.replace(/([^=<>:&])/g, '\\$1'); } } pattern += '|^)\\s*$'; return new RegExp(pattern); } (); var pr_amp = /&/g; var pr_lt = /</g; var pr_gt = />/g; var pr_quot = /\"/g; function attribToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;').replace(pr_quot, '&quot;'); } function textToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;'); } var pr_ltEnt = /&lt;/g; var pr_gtEnt = /&gt;/g; var pr_aposEnt = /&apos;/g; var pr_quotEnt = /&quot;/g; var pr_ampEnt = /&amp;/g; var pr_nbspEnt = /&nbsp;/g; function htmlToText(html) { var pos = html.indexOf('&'); if (pos < 0) { return html; } for (--pos; (pos = html.indexOf('&#', pos + 1)) >= 0; ) { var end = html.indexOf(';', pos); if (end >= 0) { var num = html.substring(pos + 3, end); var radix = 10; if (num && num.charAt(0) === 'x') { num = num.substring(1); radix = 16; } var codePoint = parseInt(num, radix); if (!isNaN(codePoint)) { html = (html.substring(0, pos) + String.fromCharCode(codePoint) + html.substring(end + 1)); } } } return html.replace(pr_ltEnt, '<').replace(pr_gtEnt, '>').replace(pr_aposEnt, "'").replace(pr_quotEnt, '"').replace(pr_ampEnt, '&').replace(pr_nbspEnt, ' '); } function isRawContent(node) { return 'XMP' === node.tagName; } function normalizedHtml(node, out) { switch (node.nodeType) { case 1: var name = node.tagName.toLowerCase(); out.push('<', name); for (var i = 0; i < node.attributes.length; ++i) { var attr = node.attributes[i]; if (!attr.specified) { continue; } out.push(' '); normalizedHtml(attr, out); } out.push('>'); for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } if (node.firstChild || !/^(?:br|link|img)$/.test(name)) { out.push('<\/', name, '>'); } break; case 2: out.push(node.name.toLowerCase(), '="', attribToHtml(node.value), '"'); break; case 3: case 4: out.push(textToHtml(node.nodeValue)); break; } } var PR_innerHtmlWorks = null; function getInnerHtml(node) { if (null === PR_innerHtmlWorks) { var testNode = document.createElement('PRE'); testNode.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />')); PR_innerHtmlWorks = !/</.test(testNode.innerHTML); } if (PR_innerHtmlWorks) { var content = node.innerHTML; if (isRawContent(node)) { content = textToHtml(content); } return content; } var out = []; for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } return out.join(''); } function makeTabExpander(tabWidth) { var SPACES = '                '; var charInLine = 0; return function(plainText) { var out = null; var pos = 0; for (var i = 0, n = plainText.length; i < n; ++i) { var ch = plainText.charAt(i); switch (ch) { case '\t': if (!out) { out = []; } out.push(plainText.substring(pos, i)); var nSpaces = tabWidth - (charInLine % tabWidth); charInLine += nSpaces; for (; nSpaces >= 0; nSpaces -= SPACES.length) { out.push(SPACES.substring(0, nSpaces)); } pos = i + 1; break; case '\n': charInLine = 0; break; default: ++charInLine; } } if (!out) { return plainText; } out.push(plainText.substring(pos)); return out.join(''); }; } var pr_chunkPattern = /(?:[^<]+|<!--[\s\S]*?-->|<!\[CDATA\[([\s\S]*?)\]\]>|<\/?[a-zA-Z][^>]*>|<)/g; var pr_commentPrefix = /^<!--/; var pr_cdataPrefix = /^<\[CDATA\[/; var pr_brPrefix = /^<br\b/i; var pr_tagNameRe = /^<(\/?)([a-zA-Z]+)/; function extractTags(s) { var matches = s.match(pr_chunkPattern); var sourceBuf = []; var sourceBufLen = 0; var extractedTags = []; if (matches) { for (var i = 0, n = matches.length; i < n; ++i) { var match = matches[i]; if (match.length > 1 && match.charAt(0) === '<') { if (pr_commentPrefix.test(match)) { continue; } if (pr_cdataPrefix.test(match)) { sourceBuf.push(match.substring(9, match.length - 3)); sourceBufLen += match.length - 12; } else if (pr_brPrefix.test(match)) { sourceBuf.push('\n'); ++sourceBufLen; } else { if (match.indexOf(PR_NOCODE) >= 0 && isNoCodeTag(match)) { var name = match.match(pr_tagNameRe)[2]; var depth = 1; end_tag_loop: for (var j = i + 1; j < n; ++j) { var name2 = matches[j].match(pr_tagNameRe); if (name2 && name2[2] === name) { if (name2[1] === '/') { if (--depth === 0) { break end_tag_loop; } } else { ++depth; } } } if (j < n) { extractedTags.push(sourceBufLen, matches.slice(i, j + 1).join('')); i = j; } else { extractedTags.push(sourceBufLen, match); } } else { extractedTags.push(sourceBufLen, match); } } } else { var literalText = htmlToText(match); sourceBuf.push(literalText); sourceBufLen += literalText.length; } } } return { source: sourceBuf.join(''), tags: extractedTags }; } function isNoCodeTag(tag) { return !!tag.replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g, ' $1="$2$3$4"').match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/); } function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) { var shortcuts = {}; (function() { var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns); for (var i = allPatterns.length; --i >= 0; ) { var patternParts = allPatterns[i]; var shortcutChars = patternParts[3]; if (shortcutChars) { for (var c = shortcutChars.length; --c >= 0; ) { shortcuts[shortcutChars.charAt(c)] = patternParts; } } } })(); var nPatterns = fallthroughStylePatterns.length; var notWs = /\S/; return function(sourceCode, opt_basePos) { opt_basePos = opt_basePos || 0; var decorations = [opt_basePos, PR_PLAIN]; var lastToken = ''; var pos = 0; var tail = sourceCode; while (tail.length) { var style; var token = null; var match; var patternParts = shortcuts[tail.charAt(0)]; if (patternParts) { match = tail.match(patternParts[1]); token = match[0]; style = patternParts[0]; } else { for (var i = 0; i < nPatterns; ++i) { patternParts = fallthroughStylePatterns[i]; var contextPattern = patternParts[2]; if (contextPattern && !contextPattern.test(lastToken)) { continue; } match = tail.match(patternParts[1]); if (match) { token = match[0]; style = patternParts[0]; break; } } if (!token) { style = PR_PLAIN; token = tail.substring(0, 1); } } decorations.push(opt_basePos + pos, style); pos += token.length; tail = tail.substring(token.length); if (style !== PR_COMMENT && notWs.test(token)) { lastToken = token; } } return decorations; }; } var PR_MARKUP_LEXER = createSimpleLexer([], [[PR_PLAIN, /^[^<]+/, null], [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/, null], [PR_COMMENT, /^<!--[\s\S]*?(?:-->|$)/, null], [PR_SOURCE, /^<\?[\s\S]*?(?:\?>|$)/, null], [PR_SOURCE, /^<%[\s\S]*?(?:%>|$)/, null], [PR_SOURCE, /^<(script|style|xmp)\b[^>]*>[\s\S]*?<\/\1\b[^>]*>/i, null], [PR_TAG, /^<\/?\w[^<>]*>/, null]]); var PR_SOURCE_CHUNK_PARTS = /^(<[^>]*>)([\s\S]*)(<\/[^>]*>)$/; function tokenizeMarkup(source) { var decorations = PR_MARKUP_LEXER(source); for (var i = 0; i < decorations.length; i += 2) { if (decorations[i + 1] === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var sourceChunk = source.substring(start, end); var match = sourceChunk.match(PR_SOURCE_CHUNK_PARTS); if (match) { decorations.splice(i, 2, start, PR_TAG, start + match[1].length, PR_SOURCE, start + match[1].length + (match[2] || '').length, PR_TAG); } } } return decorations; } var PR_TAG_LEXER = createSimpleLexer([[PR_ATTRIB_VALUE, /^\'[^\']*(?:\'|$)/, null, "'"], [PR_ATTRIB_VALUE, /^\"[^\"]*(?:\"|$)/, null, '"'], [PR_PUNCTUATION, /^[<>\/=]+/, null, '<>/=']], [[PR_TAG, /^[\w:\-]+/, /^</], [PR_ATTRIB_VALUE, /^[\w\-]+/, /^=/], [PR_ATTRIB_NAME, /^[\w:\-]+/, null], [PR_PLAIN, /^\s+/, null, ' \t\r\n']]); function splitTagAttributes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_TAG) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var chunk = source.substring(start, end); var subDecorations = PR_TAG_LEXER(chunk, start); spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function sourceDecorator(options) { var shortcutStylePatterns = [], fallthroughStylePatterns = []; if (options.tripleQuotedStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/, null, '\'"']); } else if (options.multiLineStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/, null, '\'"`']); } else { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, null, '"\'']); } fallthroughStylePatterns.push([PR_PLAIN, /^(?:[^\'\"\`\/\#]+)/, null, ' \r\n']); if (options.hashComments) { shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']); } if (options.cStyleComments) { fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]); fallthroughStylePatterns.push([PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]); } if (options.regexLiterals) { var REGEX_LITERAL = ('^/(?=[^/*])' + '(?:[^/\\x5B\\x5C]' + '|\\x5C[\\s\\S]' + '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+' + '(?:/|$)'); fallthroughStylePatterns.push([PR_STRING, new RegExp(REGEX_LITERAL), REGEXP_PRECEDER_PATTERN]); } var keywords = wordSet(options.keywords); options = null; var splitStringAndCommentTokens = createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns); var styleLiteralIdentifierPuncRecognizer = createSimpleLexer([], [[PR_PLAIN, /^\s+/, null, ' \r\n'], [PR_PLAIN, /^[a-z_$@][a-z_$@0-9]*/i, null], [PR_LITERAL, /^0x[a-f0-9]+[a-z]/i, null], [PR_LITERAL, /^(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?[a-z]*/i, null, '123456789'], [PR_PUNCTUATION, /^[^\s\w\.$@]+/, null]]); function splitNonStringNonCommentTokens(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_PLAIN) { var start, end, chunk, subDecs; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; chunk = source.substring(start, end); subDecs = styleLiteralIdentifierPuncRecognizer(chunk, start); for (var j = 0, m = subDecs.length; j < m; j += 2) { var subStyle = subDecs[j + 1]; if (subStyle === PR_PLAIN) { var subStart = subDecs[j]; var subEnd = j + 2 < m ? subDecs[j + 2] : chunk.length; var token = source.substring(subStart, subEnd); if (token === '.') { subDecs[j + 1] = PR_PUNCTUATION; } else if (token in keywords) { subDecs[j + 1] = PR_KEYWORD; } else if (/^@?[A-Z][A-Z$]*[a-z][A-Za-z$]*$/.test(token)) { subDecs[j + 1] = token.charAt(0) === '@' ? PR_LITERAL : PR_TYPE; } } } spliceArrayInto(subDecs, decorations, i, 2); i += subDecs.length - 2; } } return decorations; } return function(sourceCode) { var decorations = splitStringAndCommentTokens(sourceCode); decorations = splitNonStringNonCommentTokens(sourceCode, decorations); return decorations; }; } var decorateSource = sourceDecorator({ keywords: ALL_KEYWORDS, hashComments: true, cStyleComments: true, multiLineStrings: true, regexLiterals: true }); function splitSourceNodes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var subDecorations = decorateSource(source.substring(start, end)); for (var j = 0, m = subDecorations.length; j < m; j += 2) { subDecorations[j] += start; } spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function splitSourceAttributes(source, decorations) { var nextValueIsSource = false; for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; var start, end; if (style === PR_ATTRIB_NAME) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; nextValueIsSource = /^on|^style$/i.test(source.substring(start, end)); } else if (style === PR_ATTRIB_VALUE) { if (nextValueIsSource) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var attribValue = source.substring(start, end); var attribLen = attribValue.length; var quoted = (attribLen >= 2 && /^[\"\']/.test(attribValue) && attribValue.charAt(0) === attribValue.charAt(attribLen - 1)); var attribSource; var attribSourceStart; var attribSourceEnd; if (quoted) { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue; } else { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue.substring(1, attribValue.length - 1); } var attribSourceDecorations = decorateSource(attribSource); for (var j = 0, m = attribSourceDecorations.length; j < m; j += 2) { attribSourceDecorations[j] += attribSourceStart; } if (quoted) { attribSourceDecorations.push(attribSourceEnd, PR_ATTRIB_VALUE); spliceArrayInto(attribSourceDecorations, decorations, i + 2, 0); } else { spliceArrayInto(attribSourceDecorations, decorations, i, 2); } } nextValueIsSource = false; } } return decorations; } function decorateMarkup(sourceCode) { var decorations = tokenizeMarkup(sourceCode); decorations = splitTagAttributes(sourceCode, decorations); decorations = splitSourceNodes(sourceCode, decorations); decorations = splitSourceAttributes(sourceCode, decorations); return decorations; } function recombineTagsAndDecorations(sourceText, extractedTags, decorations) { var html = []; var outputIdx = 0; var openDecoration = null; var currentDecoration = null; var tagPos = 0; var decPos = 0; var tabExpander = makeTabExpander(PR_TAB_WIDTH); var adjacentSpaceRe = /([\r\n ]) /g; var startOrSpaceRe = /(^| ) /gm; var newlineRe = /\r\n?|\n/g; var trailingSpaceRe = /[ \r\n]$/; var lastWasSpace = true; function emitTextUpTo(sourceIdx) { if (sourceIdx > outputIdx) { if (openDecoration && openDecoration !== currentDecoration) { html.push('</span>'); openDecoration = null; } if (!openDecoration && currentDecoration) { openDecoration = currentDecoration; html.push('<span class="', openDecoration, '">'); } var htmlChunk = textToHtml(tabExpander(sourceText.substring(outputIdx, sourceIdx))).replace(lastWasSpace ? startOrSpaceRe : adjacentSpaceRe, '$1&nbsp;'); lastWasSpace = trailingSpaceRe.test(htmlChunk); html.push(htmlChunk.replace(newlineRe, '<br />')); outputIdx = sourceIdx; } } while (true) { var outputTag; if (tagPos < extractedTags.length) { if (decPos < decorations.length) { outputTag = extractedTags[tagPos] <= decorations[decPos]; } else { outputTag = true; } } else { outputTag = false; } if (outputTag) { emitTextUpTo(extractedTags[tagPos]); if (openDecoration) { html.push('</span>'); openDecoration = null; } html.push(extractedTags[tagPos + 1]); tagPos += 2; } else if (decPos < decorations.length) { emitTextUpTo(decorations[decPos]); currentDecoration = decorations[decPos + 1]; decPos += 2; } else { break; } } emitTextUpTo(sourceText.length); if (openDecoration) { html.push('</span>'); } return html.join(''); } var langHandlerRegistry = {}; function registerLangHandler(handler, fileExtensions) { for (var i = fileExtensions.length; --i >= 0; ) { var ext = fileExtensions[i]; if (!langHandlerRegistry.hasOwnProperty(ext)) { langHandlerRegistry[ext] = handler; } else if ('console' in window) { console.log('cannot override language handler %s', ext); } } } registerLangHandler(decorateSource, ['default-code']); registerLangHandler(decorateMarkup, ['default-markup', 'html', 'htm', 'xhtml', 'xml', 'xsl']); registerLangHandler(sourceDecorator({ keywords: CPP_KEYWORDS, hashComments: true, cStyleComments: true }), ['c', 'cc', 'cpp', 'cs', 'cxx', 'cyc']); registerLangHandler(sourceDecorator({ keywords: JAVA_KEYWORDS, cStyleComments: true }), ['java']); registerLangHandler(sourceDecorator({ keywords: SH_KEYWORDS, hashComments: true, multiLineStrings: true }), ['bsh', 'csh', 'sh']); registerLangHandler(sourceDecorator({ keywords: PYTHON_KEYWORDS, hashComments: true, multiLineStrings: true, tripleQuotedStrings: true }), ['cv', 'py']); registerLangHandler(sourceDecorator({ keywords: PERL_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['perl', 'pl', 'pm']); registerLangHandler(sourceDecorator({ keywords: RUBY_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['rb']); registerLangHandler(sourceDecorator({ keywords: JSCRIPT_KEYWORDS, cStyleComments: true, regexLiterals: true }), ['js']); function prettyPrintOne(sourceCodeHtml, opt_langExtension) { try { var sourceAndExtractedTags = extractTags(sourceCodeHtml); var source = sourceAndExtractedTags.source; var extractedTags = sourceAndExtractedTags.tags; if (!langHandlerRegistry.hasOwnProperty(opt_langExtension)) { opt_langExtension = /^\s*</.test(source) ? 'default-markup' : 'default-code'; } var decorations = langHandlerRegistry[opt_langExtension].call({}, source); return recombineTagsAndDecorations(source, extractedTags, decorations); } catch (e) { if ('console' in window) { console.log(e); console.trace(); } return sourceCodeHtml; } } function prettyPrint(opt_whenDone) { var isIE6 = _pr_isIE6(); var codeSegments = [document.getElementsByTagName('pre'), document.getElementsByTagName('code'), document.getElementsByTagName('xmp')]; var elements = []; for (var i = 0; i < codeSegments.length; ++i) { for (var j = 0; j < codeSegments[i].length; ++j) { elements.push(codeSegments[i][j]); } } codeSegments = null; var k = 0; function doWork() { var endTime = (PR_SHOULD_USE_CONTINUATION ? new Date().getTime() + 250 : Infinity); for (; k < elements.length && new Date().getTime() < endTime; k++) { var cs = elements[k]; if (cs.className && cs.className.indexOf('prettyprint') >= 0) { var langExtension = cs.className.match(/\blang-(\w+)\b/); if (langExtension) { langExtension = langExtension[1]; } var nested = false; for (var p = cs.parentNode; p; p = p.parentNode) { if ((p.tagName === 'pre' || p.tagName === 'code' || p.tagName === 'xmp') && p.className && p.className.indexOf('prettyprint') >= 0) { nested = true; break; } } if (!nested) { var content = getInnerHtml(cs); content = content.replace(/(?:\r\n?|\n)$/, ''); var newContent = prettyPrintOne(content, langExtension); if (!isRawContent(cs)) { cs.innerHTML = newContent; } else { var pre = document.createElement('PRE'); for (var i = 0; i < cs.attributes.length; ++i) { var a = cs.attributes[i]; if (a.specified) { var aname = a.name.toLowerCase(); if (aname === 'class') { pre.className = a.value; } else { pre.setAttribute(a.name, a.value); } } } pre.innerHTML = newContent; cs.parentNode.replaceChild(pre, cs); cs = pre; } if (isIE6 && cs.tagName === 'PRE') { var lineBreaks = cs.getElementsByTagName('br'); for (var j = lineBreaks.length; --j >= 0; ) { var lineBreak = lineBreaks[j]; lineBreak.parentNode.replaceChild(document.createTextNode('\r\n'), lineBreak); } } } } } if (k < elements.length) { setTimeout(doWork, 250); } else if (opt_whenDone) { opt_whenDone(); } } doWork(); } window['PR_normalizedHtml'] = normalizedHtml; window['prettyPrintOne'] = prettyPrintOne; window['prettyPrint'] = prettyPrint; window['PR'] = { 'createSimpleLexer': createSimpleLexer, 'registerLangHandler': registerLangHandler, 'sourceDecorator': sourceDecorator, 'PR_ATTRIB_NAME': PR_ATTRIB_NAME, 'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE, 'PR_COMMENT': PR_COMMENT, 'PR_DECLARATION': PR_DECLARATION, 'PR_KEYWORD': PR_KEYWORD, 'PR_LITERAL': PR_LITERAL, 'PR_NOCODE': PR_NOCODE, 'PR_PLAIN': PR_PLAIN, 'PR_PUNCTUATION': PR_PUNCTUATION, 'PR_SOURCE': PR_SOURCE, 'PR_STRING': PR_STRING, 'PR_TAG': PR_TAG, 'PR_TYPE': PR_TYPE }; })();
\ No newline at end of file
diff --git a/templates/content/js/jquery.ajaxfileupload.js b/templates/content/js/jquery.ajaxfileupload.js
index 106de906..75292776 100644
--- a/templates/content/js/jquery.ajaxfileupload.js
+++ b/templates/content/js/jquery.ajaxfileupload.js
@@ -1,195 +1,195 @@
-jQuery.extend({
-    createUploadIframe: function(id, uri){
-        //create frame
-        var frameId = 'jUploadFrame' + id;           
-        if(window.ActiveXObject) {
-            var io = document.createElement('<iframe id="' + frameId + '" name="' + frameId + '" />');
-            if(typeof uri== 'boolean'){
-                io.src = 'javascript:false';
-            }
-            else if(typeof uri== 'string'){
-                io.src = uri;
-            }
-        }
-        else {
-            var io = document.createElement('iframe');
-            io.id = frameId;
-            io.name = frameId;
-        }
-        io.style.position = 'absolute';
-        io.style.top = '-1000px';
-        io.style.left = '-1000px';
-
-        document.body.appendChild(io);
-        return io;
-    },
-    createUploadForm: function(id, fileElementId)
-	{
-		//create form	
-		var formId = 'jUploadForm' + id;
-		var fileId = 'jUploadFile' + id;
-		var form = $('<form  action="" method="POST" name="' + formId + '" id="' + formId 
-            + '" enctype="multipart/form-data"></form>');	
-		var oldElement = $('#' + fileElementId);
-		var newElement = $(oldElement).clone();
-		$(oldElement).attr('id', fileId);
-		$(oldElement).before(newElement);
-		$(oldElement).appendTo(form);
-		//set attributes
-		$(form).css('position', 'absolute');
-		$(form).css('top', '-1200px');
-		$(form).css('left', '-1200px');
-		$(form).appendTo('body');		
-		return form;
-    },
-
-    ajaxFileUpload: function(s) {
-        // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout		
-        s = jQuery.extend({}, jQuery.ajaxSettings, s);
-        var id = new Date().getTime()        
-		var form = jQuery.createUploadForm(id, s.fileElementId);
-		var io = jQuery.createUploadIframe(id, s.secureuri);
-		var frameId = 'jUploadFrame' + id;
-		var formId = 'jUploadForm' + id;		
-        // Watch for a new set of requests
-        if ( s.global && ! jQuery.active++ )
-		{
-			jQuery.event.trigger( "ajaxStart" );
-		}            
-        var requestDone = false;
-        // Create the request object
-        var xml = {}   
-        if ( s.global )
-            jQuery.event.trigger("ajaxSend", [xml, s]);
-        // Wait for a response to come back
-        var uploadCallback = function(isTimeout)
-		{			
-			var io = document.getElementById(frameId);
-            try {				
-				if(io.contentWindow){
-					 xml.responseText = io.contentWindow.document.body ? 
-                        io.contentWindow.document.body.innerText : null;
-                	 xml.responseXML = io.contentWindow.document.XMLDocument ? 
-                        io.contentWindow.document.XMLDocument : io.contentWindow.document;
-					 
-				}
-                else if(io.contentDocument)
-				{
-					xml.responseText = io.contentDocument.document.body ? 
-                        io.contentDocument.document.body.textContent || document.body.innerText : null;
-                	xml.responseXML = io.contentDocument.document.XMLDocument ? 
-                        io.contentDocument.document.XMLDocument : io.contentDocument.document;
-				}						
-            }
-            catch(e)
-			{
-				jQuery.handleError(s, xml, null, e);
-			}
-            if ( xml || isTimeout == "timeout") 
-			{				
-                requestDone = true;
-                var status;
-                try {
-                    status = isTimeout != "timeout" ? "success" : "error";
-                    // Make sure that the request was successful or notmodified
-                    if ( status != "error" )
-					{
-                        // process the data (runs the xml through httpData regardless of callback)
-                        var data = jQuery.uploadHttpData( xml, s.dataType );    
-                        // If a local callback was specified, fire it and pass it the data
-                        if ( s.success )
-                            s.success( data, status );
-    
-                        // Fire the global callback
-                        if( s.global )
-                            jQuery.event.trigger( "ajaxSuccess", [xml, s] );
-                    } else
-                        jQuery.handleError(s, xml, status);
-                } catch(e) 
-				{
-                    status = "error";
-                    jQuery.handleError(s, xml, status, e);
-                }
-
-                // The request was completed
-                if( s.global )
-                    jQuery.event.trigger( "ajaxComplete", [xml, s] );
-
-                // Handle the global AJAX counter
-                if ( s.global && ! --jQuery.active )
-                    jQuery.event.trigger( "ajaxStop" );
-
-                // Process result
-                if ( s.complete )
-                    s.complete(xml, status);
-
-                jQuery(io).unbind();
-
-                setTimeout(function()
-                    {	try 
-                        {
-                            $(io).remove();
-                            $(form).remove();	
-                            
-                        } catch(e) {
-                            jQuery.handleError(s, xml, null, e);
-                        }									
-                    }, 100)
-                xml = null;
-            }
-        }
-        // Timeout checker
-        if ( s.timeout > 0 ) {
-            setTimeout(function(){
-                // Check to see if the request is still happening
-                if( !requestDone ) uploadCallback( "timeout" );
-            }, s.timeout);
-        }
-        try 
-		{
-           // var io = $('#' + frameId);
-			var form = $('#' + formId);
-			$(form).attr('action', s.url);
-			$(form).attr('method', 'POST');
-			$(form).attr('target', frameId);
-            if(form.encoding)
-			{
-                form.encoding = 'multipart/form-data';				
-            }
-            else
-			{				
-                form.enctype = 'multipart/form-data';
-            }			
-            $(form).submit();
-
-        } catch(e) 
-		{			
-            jQuery.handleError(s, xml, null, e);
-        }
-        if(window.attachEvent){
-            document.getElementById(frameId).attachEvent('onload', uploadCallback);
-        }
-        else{
-            document.getElementById(frameId).addEventListener('load', uploadCallback, false);
-        } 		
-        return {abort: function () {}};	
-
-    },
-
-    uploadHttpData: function( r, type ) {
-        var data = !type;
-        data = type == "xml" || data ? r.responseXML : r.responseText;
-        // If the type is "script", eval it in global context
-        if ( type == "script" )
-            jQuery.globalEval( data );
-        // Get the JavaScript object, if JSON is used.
-        if ( type == "json" )
-            eval( "data = " + data );
-        // evaluate scripts within html
-        if ( type == "html" )
-            jQuery("<div>").html(data).evalScripts();
-			//alert($('param', data).each(function(){alert($(this).attr('value'));}));
-        return data;
-    }
-})
-
+jQuery.extend({
+    createUploadIframe: function(id, uri){
+        //create frame
+        var frameId = 'jUploadFrame' + id;           
+        if(window.ActiveXObject) {
+            var io = document.createElement('<iframe id="' + frameId + '" name="' + frameId + '" />');
+            if(typeof uri== 'boolean'){
+                io.src = 'javascript:false';
+            }
+            else if(typeof uri== 'string'){
+                io.src = uri;
+            }
+        }
+        else {
+            var io = document.createElement('iframe');
+            io.id = frameId;
+            io.name = frameId;
+        }
+        io.style.position = 'absolute';
+        io.style.top = '-1000px';
+        io.style.left = '-1000px';
+
+        document.body.appendChild(io);
+        return io;
+    },
+    createUploadForm: function(id, fileElementId)
+	{
+		//create form	
+		var formId = 'jUploadForm' + id;
+		var fileId = 'jUploadFile' + id;
+		var form = $('<form  action="" method="POST" name="' + formId + '" id="' + formId 
+            + '" enctype="multipart/form-data"></form>');	
+		var oldElement = $('#' + fileElementId);
+		var newElement = $(oldElement).clone();
+		$(oldElement).attr('id', fileId);
+		$(oldElement).before(newElement);
+		$(oldElement).appendTo(form);
+		//set attributes
+		$(form).css('position', 'absolute');
+		$(form).css('top', '-1200px');
+		$(form).css('left', '-1200px');
+		$(form).appendTo('body');		
+		return form;
+    },
+
+    ajaxFileUpload: function(s) {
+        // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout		
+        s = jQuery.extend({}, jQuery.ajaxSettings, s);
+        var id = new Date().getTime()        
+		var form = jQuery.createUploadForm(id, s.fileElementId);
+		var io = jQuery.createUploadIframe(id, s.secureuri);
+		var frameId = 'jUploadFrame' + id;
+		var formId = 'jUploadForm' + id;		
+        // Watch for a new set of requests
+        if ( s.global && ! jQuery.active++ )
+		{
+			jQuery.event.trigger( "ajaxStart" );
+		}            
+        var requestDone = false;
+        // Create the request object
+        var xml = {}   
+        if ( s.global )
+            jQuery.event.trigger("ajaxSend", [xml, s]);
+        // Wait for a response to come back
+        var uploadCallback = function(isTimeout)
+		{			
+			var io = document.getElementById(frameId);
+            try {				
+				if(io.contentWindow){
+					 xml.responseText = io.contentWindow.document.body ? 
+                        io.contentWindow.document.body.innerText : null;
+                	 xml.responseXML = io.contentWindow.document.XMLDocument ? 
+                        io.contentWindow.document.XMLDocument : io.contentWindow.document;
+					 
+				}
+                else if(io.contentDocument)
+				{
+					xml.responseText = io.contentDocument.document.body ? 
+                        io.contentDocument.document.body.textContent || document.body.innerText : null;
+                	xml.responseXML = io.contentDocument.document.XMLDocument ? 
+                        io.contentDocument.document.XMLDocument : io.contentDocument.document;
+				}						
+            }
+            catch(e)
+			{
+				jQuery.handleError(s, xml, null, e);
+			}
+            if ( xml || isTimeout == "timeout") 
+			{				
+                requestDone = true;
+                var status;
+                try {
+                    status = isTimeout != "timeout" ? "success" : "error";
+                    // Make sure that the request was successful or notmodified
+                    if ( status != "error" )
+					{
+                        // process the data (runs the xml through httpData regardless of callback)
+                        var data = jQuery.uploadHttpData( xml, s.dataType );    
+                        // If a local callback was specified, fire it and pass it the data
+                        if ( s.success )
+                            s.success( data, status );
+    
+                        // Fire the global callback
+                        if( s.global )
+                            jQuery.event.trigger( "ajaxSuccess", [xml, s] );
+                    } else
+                        jQuery.handleError(s, xml, status);
+                } catch(e) 
+				{
+                    status = "error";
+                    jQuery.handleError(s, xml, status, e);
+                }
+
+                // The request was completed
+                if( s.global )
+                    jQuery.event.trigger( "ajaxComplete", [xml, s] );
+
+                // Handle the global AJAX counter
+                if ( s.global && ! --jQuery.active )
+                    jQuery.event.trigger( "ajaxStop" );
+
+                // Process result
+                if ( s.complete )
+                    s.complete(xml, status);
+
+                jQuery(io).unbind();
+
+                setTimeout(function()
+                    {	try 
+                        {
+                            $(io).remove();
+                            $(form).remove();	
+                            
+                        } catch(e) {
+                            jQuery.handleError(s, xml, null, e);
+                        }									
+                    }, 100)
+                xml = null;
+            }
+        }
+        // Timeout checker
+        if ( s.timeout > 0 ) {
+            setTimeout(function(){
+                // Check to see if the request is still happening
+                if( !requestDone ) uploadCallback( "timeout" );
+            }, s.timeout);
+        }
+        try 
+		{
+           // var io = $('#' + frameId);
+			var form = $('#' + formId);
+			$(form).attr('action', s.url);
+			$(form).attr('method', 'POST');
+			$(form).attr('target', frameId);
+            if(form.encoding)
+			{
+                form.encoding = 'multipart/form-data';				
+            }
+            else
+			{				
+                form.enctype = 'multipart/form-data';
+            }			
+            $(form).submit();
+
+        } catch(e) 
+		{			
+            jQuery.handleError(s, xml, null, e);
+        }
+        if(window.attachEvent){
+            document.getElementById(frameId).attachEvent('onload', uploadCallback);
+        }
+        else{
+            document.getElementById(frameId).addEventListener('load', uploadCallback, false);
+        } 		
+        return {abort: function () {}};	
+
+    },
+
+    uploadHttpData: function( r, type ) {
+        var data = !type;
+        data = type == "xml" || data ? r.responseXML : r.responseText;
+        // If the type is "script", eval it in global context
+        if ( type == "script" )
+            jQuery.globalEval( data );
+        // Get the JavaScript object, if JSON is used.
+        if ( type == "json" )
+            eval( "data = " + data );
+        // evaluate scripts within html
+        if ( type == "html" )
+            jQuery("<div>").html(data).evalScripts();
+			//alert($('param', data).each(function(){alert($(this).attr('value'));}));
+        return data;
+    }
+})
+
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 165903ba..1cd5d438 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -1,1044 +1,1044 @@
-@import url(/content/style/jquery.autocomplete.css);
-@import url(/content/style/openid.css);
-@import url(/content/style/prettify.css);
-/* 公用 */
-body{background:#FFF; font-size:12px; line-height:150%; margin:0; padding:0; color:#000; font-family: "segoe ui",Helvetica,微软雅黑,宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif; 
-}
-div{margin:0 auto; padding:0;}
-h1,h2,h3,h4,h5,h6,ul,li,dl,dt,dd,form,img,p{margin:0; padding:0; border:none; }
-input, select {font-family:Trebuchet MS,"segoe ui",Helvetica,"Microsoft YaHei",宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif;}
-p{margin-bottom:4px; font-size:13px; line-height:160%;}
-a {color:#333333; text-decoration:none;}
-a:hover {text-decoration:underline;}
-.block{width:960px; height:auto;}
-.fleft{float:left;}
-.fright{float:right;}
-.tleft{text-align:left;}
-.tcenter{text-align:center;}
-.tright{text-align:right;}
-.dis{display:block;}
-.inline{display:inline;}
-.none{display:none;}
-.red{color:#CC0000;}
-.b{font-weight:bold;}
-.f10{font-size:10px;}
-.f11{font-size:11px;}
-.f12{font-size:12px;}
-.f13{font-size:13px;}
-.f14{font-size:14px;}
-.white{color:#FFFFFF;}
-.u{text-decoration:underline;}
-.spacer1{height:6px; line-height:6px; clear:both; visibility:hidden;}
-.spacer3{height:30px; line-height:30px; clear:both; visibility:hidden;}
-h1{font-size:160%;padding:5px 0 5px 0;}
-h2{font-size:140%;padding:3px 0 3px 0;}
-h3{font-size:120%;padding:3px 0 3px 0;}
-ul
-{
-	list-style: disc;
-	margin-left: 20px;
-    padding-left:0px;
-	margin-bottom: 1em;
-}
-ol
-{
-	list-style: decimal;
-	margin-left: 30px;
-	margin-bottom: 1em;
-    padding-left:0px;
-}
-pre
-{
-	font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace;
-    font-size:100%;
-	margin-bottom: 10px;
-	overflow: auto;
-	width: 580px;
-	background-color: #F5F5F5;
-    padding-left:5px;
-    padding-top:5px;
-	padding-bottom: 20px !ie7;
-}
-
-code{
-    font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace;
-    font-size:100%;
-
-}
-
-blockquote
-{
-	margin-bottom: 10px;
-	margin-right: 15px;
-	padding: 10px 0px 1px 10px;
-	background-color: #F5F5F5;
-}
-
-/*页面布局*/
-#wrapper {width:960px;margin:auto;padding:0;}
-#roof {margin-top:0px;background:#FFF;}
-#room {padding-top:10px;background-color:#FFF;border-bottom:1px solid #777;}
-#CALeft{width:700px; float:left; position:relative;padding-left:5px}
-#CARight{width:240px; float:right; padding-right:5px}
-#CAFull{float:left;padding:0 5px 0 5px;width:950px;}
-#ground {width:100%;border-top:1px solid #000; padding-top:6px; padding-bottom:10px; text-align:center;background:#777;}
-/*#licenseLogo {top:10px;right:10px;}*/
-
-/*顶部及导航栏*/
-#top {height:20px; text-align:right; padding:3px;background-color:#ffffff;}
-#header {width:960px;}
-#top a {height:35px; text-align:right;
-	/*letter-spacing:1px; */
-		margin-left:20px;text-decoration:underline; font-size:12px; color:#333333;}
-#logo {padding:5px;}
-#navBar {float:clear;position:relative;display:block;width:960px;}
-#navBar .nav {margin:20px 0px 0px 16px;
-	/*letter-spacing:1px; */
-	}
-#navBar .nav a {color:#333; background-color:#F9F7ED; 
-				border-bottom: none;
-				border-left: 1px solid #aaaaaa;
-				border-right: 1px solid #aaaaaa;
-				border-top: 1px solid #aaaaaa;
-				padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:15px; font-weight:400; text-decoration:none;display: block;float: left;}
-#navBar .nav a:hover {text-decoration:underline}
-#navBar .nav a.on {height:24px;line-height:28px;
-	border-top:1px solid #e66222; 
-	border-bottom: 1px solid #d64000;
-	border-right:1px solid #e66222; 
-	border-left:1px solid #e66222; 
-	/*background:#A31E39; */
-	background:#d64000;
-	color:#FFF; font-weight:600; text-decoration:none}
-#navBar .nav a.special {font-size:15px; color:#B02B2C; font-weight:bold; text-decoration:none; }
-#navBar .nav a.special:hover {text-decoration:underline;}
-#navBar .nav div.focus {float:right; padding-right:0px;}
-/*搜索栏*/
-#searchBar {background-color:#9db2b1;padding:5px;} /* #B02B2C */
-#searchBar .content { }
-#searchBar .searchInput {font-size:13px; height:18px; width:400px;}
-#searchBar .searchBtn {font-size:14px; height:26px; width:80px;}
-#searchBar .options {padding-top:5px; font-size:100%;color:#EEE;
-	/*letter-spacing:1px;*/
-	}
-#searchBar .options INPUT {margin-left:15px;}
-#searchBar .options INPUT:hover {cursor:pointer}
-
-/*问题列表*/
-#listA {float:left; background-color:#FFF;padding:0 0px 0 0px; width:100%;}
-#listA .qstA {padding:3px 5px 0 5px; margin:0 0px 10px 0px; background:url(/content/images/quest-bg.gif) repeat-x top;}
-#listA .qstA thumb {float:left; }
-#listA .qstA H2 {font-size:15px; font-weight:800; margin:8px auto;padding:0px;}
-#listA .qstA H2 a {color:#663333; }
-#listA .qstA .stat {font-size:13px;
-	/*letter-spacing:1px;*/
-	float:right;}
-#listA .qstA .stat span {margin-right:5px;}
-#listA .qstA .stat td {min-width:40px;text-align:center;}
-#listA .qstA .stat .num {font-family:arial;color:#905213; font-size:20px; font-weight:800;}
-#listA .qstA .stat .unit {color:#777;}
-#listA .qstA .from {margin-top:5px; font-size:13px;}
-#listA .qstA .from .score {font-family:arial;}
-#listA .qstA .date {margin-left:20px; color:#777;}
-#listA .qstA .wiki {color:#663333;font-size:12px;}
-#listA .qstA .from a {}
-#listA .qstA .from IMG {vertical-align:middle;}
-#listA .qstA .author {font-weight:400; }
-#listA .qstA .author a{ }
-#listA .qstA .summary{margin-right:5px;}
-.evenMore {font-size:14px; font-weight:800;}
-.questions-count{font-size:32px;font-family:arial;font-weight:600;padding:5px;color:#777;}
-
-/*内容块*/
-.boxA {background:#777; padding:6px; margin-bottom:8px;}
-.boxA H3 {font-size:13px; font-weight:800; color:#FFF; margin:0; padding:0; margin-bottom:4px;}
-.boxA .body {border:1px solid #999; padding:8px; background:#FFF; font-size:13px;}
-.boxA .more {padding:2px; text-align:right; font-weight:800;}
-.boxB {background:#F9F7CD; padding:6px; margin-bottom:8px;}
-.boxB H3 {font-size:13px; font-weight:800; color:#000; margin:0; padding:0 0 0 15px; margin-bottom:4px; background:url(/content/images/dot-g.gif) no-repeat left center;}
-.boxB .body {border:1px solid #FFFF88; padding:8px; background:#FFF; font-size:13px; line-height:160%;}
-.boxB .more {padding:1px; text-align:right; font-weight:800;}
-.boxC {background:#F5F5F5; padding:6px; margin-bottom:8px;}
-/*分页*/
-.pager {margin-top:10px; margin-bottom:16px; float:left;}
-.pagesize {margin-top:10px; margin-bottom:16px; float:right;}
-
-/** PAGINATOR **/
-.paginator {
-    padding:5px 0 10px 0;
-    font:normal 12px arial;
-}
-
-.paginator .prev-na,
-.paginator .next-na {
-	padding:.3em;
-	font:bold .875em arial;
-}
-
-.paginator .prev-na,
-.paginator .next-na {
-	border:1px solid #ccc;
-	background-color:#f9f9f9;
-	color:#aaa;
-	font-weight:normal;
-}
-
-.paginator .prev a, .paginator .prev a:visited,
-.paginator .next a, .paginator .next a:visited {
-	border:1px solid #fff;
-	background-color:#fff;
-	color:#777;
-	padding:.3em;
-	font:bold 100% arial;
-}
-
-.paginator .prev, .paginator .prev-na { margin-right:.5em; }
-.paginator .next, .paginator .next-na { margin-left:.5em; }
-
-.paginator .page a, .paginator .page a:visited, .paginator .curr {
-	padding:.25em;
-	font:normal .875em verdana;
-	border:1px solid #ccc;
-	background-color:#fff;
-	margin:0em .25em;
-	color:#777;
-}
-
-.paginator .curr {
-	background-color:#777;
-	color:#fff;
-	border:1px solid #777;
-	font-weight:bold;
-}
-
-.paginator .page a:hover,
-.paginator .curr a:hover,
-.paginator .prev a:hover,
-.paginator .next a:hover {
-	color:#fff;
-	background-color:#777;
-	border:1px solid #777;
-    text-decoration:none;
-}
-
-.paginator .text{
-    color:#777;
-	padding:.3em;
-	font:bold 100% arial;
-}
-
-.paginator-container{
-    float:right;
-    padding:10px 0 10px 0;
-}
-
-.paginator-container-left{
-    padding:5px 0 10px 0;
-}
-
-/*标签*/
-.tag {font-size:100%; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
-.tags {font-family:arial; line-height:200%; display:block; margin-top:5px;}
-.tags a {font-size:100%; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
-.tags a:hover {background-color:#fFF;color:#333;}
-.tag-number {font-weight:700;font-family:arial;}
-
-/*奖牌*/
-a.medal  { font-size:14px; line-height:250%; font-weight:800; color:#333; text-decoration:none; background:url(/content/images/medala.gif) no-repeat; border-left:1px solid #EEE; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:4px 12px 4px 6px;}
-a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images/medala_on.gif) no-repeat; border-left:1px solid #E7E296; border-top:1px solid #E7E296; border-bottom:1px solid #D1CA3D; border-right:1px solid #D1CA3D;}
-
-/*Tab栏*/
-.tabBar{background-color:#FFF;border-bottom: 1px solid #666;height: 30px; width: 100%;clear:both; margin-bottom:3px;}
-.tabsA {background-color:#FFF;float:right;position:relative;display:block;font-weight:bold;height:20px;}
-.tabsB {background-color:#FFF;float:left;position:relative;display:block;font-weight:bold;height:20px;}
-.tabsA a.on, .tabsA a.on:hover,.tabsB a.on, .tabsB a.on:hover {background: #fff;
-    color:#333;
-	border: 1px solid #777;
-    border-bottom:2px solid #FFF;
-	height: 25px;
-	line-height: 26px;
-	margin-top: 3px;
-	padding: 0px 11px 0px 11px;}
-
-.tabsA a {background: #eee;
-	border: 1px solid #eee;
-	color: #777;
-	display: block;
-	float: left;
-	height: 22px;
-	line-height: 28px;
-	margin: 5px 4px 0 0;
-	padding: 0 11px 0 11px;
-	text-decoration: none;
-}
-.tabsB a {background: #eee;
-	border: 1px solid #eee;
-	color: #777;
-	display: block;
-	float: left;
-	height: 22px;
-	line-height: 28px;
-	margin: 5px 0px 0 4px;
-	padding: 0 11px 0 11px;
-	text-decoration: none;
-}
-.tabsA a:hover, .tabsB a:hover {background: #fff;border: 1px solid #777;border-bottom:3px solid #FFF;}
-.headlineA {font-size:13px; border-bottom:1px solid #777; padding-bottom:2px; font-weight:800; margin-bottom:12px; text-align:right; height:30px;}
-.headQuestions {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
-.headAnswers {float:left; padding:3px; font-size:18px; font-weight:800; background:url(/content/images/ico_answers.gif) left 2px no-repeat; padding-left:24px;}
-.headTags {float:left; padding:3px; font-size:18px; font-weight:800; background:url(/content/images/ico_tags.gif) no-repeat; padding-left:24px;}
-.headUsers {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
-.headMedals {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
-.headLogin {float:left; padding:3px; font-size:15px; font-weight:800; background:url(/content/images/ico_login.gif) no-repeat; padding-left:24px;}
-.headNormal {text-align:left;padding:3px; font-size:15px; margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
-.headUser {text-align:left;padding:5px; font-size:20px; 
-	/*letter-spacing:1px;*/
-		margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
-/*RSS订阅*/
-#feeds {margin:10px 0; }
-#feeds a {background:url(/content/images/feed-icon-small.png) no-repeat 0; padding-left:18px; font-weight:700; font-size:13px; }
-
-/*问题*/
-#question {margin-bottom:30px;}
-#question h1{font-size:15px;background:#CCC; padding:6px 8px;;}
-#question .body{background:#F7F7F7; padding:20px 10px;}
-.starter {padding:10px; background:#E0EAF1;}
-.vote {font-size:20px; color:#666; font-weight:800;}
-.questions-related{font-weight:700;word-wrap:break-word;}
-.questions-related p{line-height:20px; margin-bottom:10px;font-size:100%;}
-.question-status{
-    margin-top:10px;
-    padding: 20px;
-    background-color:#F5F5F5;
-    text-align:center;
-}
-.question-status h3{font-size:125%;}
-.question-body{
-    min-height:100px;
-    font-size:13px;
-    line-height:20px;
-}
-.question-body IMG{
-    max-width:600px;
-}
-.question-mark{
-    background-color:#E9E9FF;
-    text-align:left;
-    padding:5px;
-    overflow:hidden;
-}
-.question-edit{
-    text-align:left;
-    overflow:hidden;
-}
-.vote-buttons {float:left;text-align:center;}
-.vote-buttons IMG{cursor:pointer;}
-.vote-number{
-    font-family:Arial;
-    padding:0px 0 3px 0;
-    font-size:140%;
-    font-weight:bold;
-    color:#777;
-}
-.question-img-upvote:hover{background:url(/content/images/vote-arrow-up-on.png)}
-.question-img-downvote:hover{background:url(/content/images/vote-arrow-down-on.png)}
-.question-img-favorite:hover{background:url(/content/images/vote-favorite-on.png)}
-.favorite-number{padding:0px;font-size:100%; font-family:Arial;font-weight:bold;color:#777;}
-.vote-notification
-{
-	z-index: 1;
-	cursor: pointer;
-	display: none;
-	position: absolute;
-	padding: 15px;
-    color: White;
-	background-color: darkred;
-	text-align: center;
-}
-.vote-notification a
-{
-    color: White;
-	text-decoration:underline;
-}
-.offensive-flag a{
-    color:#777;
-    padding:3px;
-    cursor:pointer;
-}
-
-.offensive-flag a:hover{
-    background-color:#777;
-    text-decoration:none;
-    color:#fff;
-}
-
-.linksopt a{
-    color:#777;
-    padding:3px;
-    cursor:pointer;
-}
-
-.linksopt a:hover{
-    background-color:#777;
-    text-decoration:none;
-    color:#fff;
-}
-
-.action-link a{
-    color:#777;
-    padding:3px;
-    cursor:pointer;
-}
-
-.action-link a:hover{
-    background-color:#777;
-    text-decoration:none;
-    color:#fff;
-}
-.action-link-separator{
-    color:#ccc;
-}
-.wiki-category{
-    margin-left:5px;
-    color:#999;
-    font-size:90%;
-}
-
-div.comments {
-    line-height:150%;
-    padding:10px 0;
-}
-
-div.post-comments{
-    width:100%;
-}
-
-form.post-comments textarea {
-    height:6em;
-    margin-bottom:4px;
-}
-
-form.post-comments input {
-    margin-left:10px;
-    margin-top:1px;
-    vertical-align:top;
-    width:100px;
-}
-span.text-counter {
-    margin-right:20px;
-}
-
-span.form-error {
-    color:#990000;
-    font-weight:normal;
-    margin-left:5px;
-}
-
-div.comments-container, div.comments-container-accepted, div.comments-container-owner, div.comments-container-deleted {
-    display:none;
-    margin-top:-1px;
-    padding:0 5px 5px;
-}
-
-div.comments-container, a.comments-link {
-    background-color:#EEEEEE;
-}
-
-.post-comments a {
-    color:#888888;
-    padding:0 3px 2px;
-}
-
-a.comments-link, a.comments-link-accepted, a.comments-link-owner, a.comments-link-deleted {
-    color:black;
-    padding:2px;
-    cursor:pointer;
-}
-
-.post-comments a:hover {
-    background-color:#777777;
-    color:white;
-    text-decoration:none;
-}
-
-a.comment-user, a.comment-user:hover {
-    background-color:inherit;
-    color:#0077CC;
-    padding:0;
-}
-
-a.comment-user:hover {
-    text-decoration:underline;
-}
-/*回答*/
-#answers {}
-.answer{
-    border-bottom:1px dotted #666666;
-    padding-bottom:20px;
-    padding-top:20px;
-    width: 100%;
-    margin-bottom:10px;
-}
-.answer-body{
-    min-height:80px;
-    font-size:13px;
-    line-height:20px;
-}
-
-.answer-body IMG{
-    max-width:600px;
-}
-
-.accepted-answer{
-    background-color:#EBFFE6;
-    border-bottom-color:#9BD59B;
-}
-
-.accepted-answer .comments-link{
-    background-color:#CCFFBF;
-}
-
-.accepted-answer .comments-container{
-    background-color:#CCFFBF;
-}
-
-.answered
-{
-	background: #CCC;
-	color: #999;
-}
-
-.answered-accepted
-{
-	background: #CCC;
-	color: #663333;
-}
-
-.unanswered
-{
-	background: #777;
-	color: white;
-}
-
-.answered-by-owner
-{
-	background: #E9E9FF;
-}
-
-.answered-by-owner .comments-link
-{
-    background-color:#E6ECFF;
-}
-
-.answered-by-owner .comments-container
-{
-    background-color:#E6ECFF;
-}
-
-.answered-accepted strong
-{
-	color: #E1E818;
-}
-
-.answer-img-accept:hover{background:url(/content/images/vote-accepted-on.png)}
-
-.deleted{
-    background:#F4E7E7 none repeat scroll 0 0;
-}
-
-/*标签列表*/
-.tagsbox {}
-.tagsbox a {color:#000;line-height:30px;margin-right:10px;font-size:100%;background-color:#F9F7ED;padding:3px;}
-.tagsbox a:hover {text-decoration:none;background-color:#F9F7CD;color:#B02B2C;}
-.tagsList {margin:0; list-style-type:none;padding:0px;min-height:360px;}
-.tagsList li {width:235px; float:left;}
-.badge-list{margin:0; list-style-type:none;}
-/*登录*/
-.list-item{margin-left:15px;}
-.list-item LI{list-style-type:disc; font-size:13px; line-height:20px; margin-bottom:10px;}
-/* openid styles */
-.form-row{line-height:25px;}
-.submit-row{line-height:30px;padding-top:10px;}
-.errors{line-height:20px;color:red;}
-.error{color:red;}
-.error-list li{padding:5px;}
-.login{margin-bottom:10px;}
-.fieldset{border:solid 1px #777;margin-top:10px;padding:10px;}
-.openid-input{background:url(/content/images/openid.gif) no-repeat;padding-left:15px;cursor:pointer;}
-.openid-login-input{
-    background-position:center left;
-    background:url(/content/images/openid.gif) no-repeat 0% 50%;
-    padding:5px 5px 5px 15px;
-    cursor:pointer;
-    font-family:Trebuchet MS;
-    font-weight:300;
-    font-size:150%;
-    width:500px;
-}
-
-.openid-login-submit{
-    height:40px;
-    width:80px;
-    line-height:40px;
-    cursor:pointer;
-    border:1px solid #777;
-    font-weight:bold;
-    font-size:120%;
-}
-
-.openid-samples{
-
-}
-
-.openid-samples .list, .list li{
-    font-family:Trebuchet MS,"segoe ui",Helvetica,"Microsoft YaHei",宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif;
-    list-style:none !important;
-    margin-left:-30px !important;
-    line-height:20px !important;
-}
-
-/*表单相关*/
-span.form-error {
-    color:#990000;
-    font-size:90%;
-    font-weight:normal;
-    margin-left:5px;
-}
-.title-desc{
-    color:#999;
-    font-size:90%;
-}
-
-/*adjustment for editor preview*/
-#editor{
-    font-size:100%;
-    min-height:200px;
-    line-height: 18px;
-    width:100%;
-}
-
-.wmd-preview{
-    margin-top:10px;
-    padding:6px;
-    width:100%;
-    background-color:#F5F5F5;
-    min-height:20px;
-}
-.wmd-preview pre{
-    background-color:#E7F1F8;
-
-}
-
-.wmd-preview blockquote
-{
-	background-color: #eee;
-}
-
-.wmd-preview IMG{
-    max-width:600px;
-}
-.preview-toggle{
-    font-weight:600;
-    width:100%;
-    color:#aaa;
-    /*letter-spacing:1px;*/
-    text-align:left;
-}
-
-.preview-toggle span:hover{
-    cursor:pointer;
-}
-
-.edit-content-html{
-    border-top:1px dotted #D8D2A9;
-    border-bottom:1px dotted #D8D2A9;
-    margin:5px 0 5px 0;
-}
-
-/*修订记录*/
-
-#revisions{
-    width:950px;
-}
-
-.revision{
-    margin:10px 0 10px 0;
-    width:100%;
-    font-size:13px;
-}
-
-.revision .header{
-    background-color:#eee;
-    padding:5px;
-    cursor:pointer;
-}
-
-.revision .author{
-    background-color:#E9E9FF;
-}
-
-.revision .summary{
-    padding: 5px 0 10px 0;
-}
-
-.revision .summary span{
-    background-color:yellow;
-    display:inline;
-}
-.revision h1{
-    font-size:130%;
-    font-weight:600;
-    padding:15px 0 15px 0;
-}
-
-.revision-mark{
-    width:200px;
-    text-align:left;
-    font-size:90%;
-    overflow:hidden;
-}
-
-.revision-number{
-    font-size:300%;
-    font-weight:bold;
-    font-family:arial;
-}
-
-.revision .body{
-    padding-left:10px;
-    margin-bottom:50px;
-}
-.revision .answerbody{
-    padding:10px 0 5px 10px;
-}
-
-/* Revision pages */
-del { color: #FF5F5F; }
-del .post-tag{
-color: #FF5F5F;
-}
-ins { background-color: #97ff97;}
-ins .post-tag{
-background-color: #97ff97;
-}
-
-/*用户资料页面*/
-.count {font-family:Arial;font-size:200%;font-weight:700;color:#777}
-.scoreNumber{font-family:Arial;font-size:35px;font-weight:800;color:#777;line-height:40px;
-	/*letter-spacing:0px*/
-	}
-.user-details{font-size:13px;}
-.user-about{background-color:#EEEEEE;height:200px;line-height:20px; overflow:auto;padding:10px;width:90%;}
-.user-edit-link {background:url(/content/images/edit.png) no-repeat; padding-left:20px; font-weight:600;}
-.favorites-count-off {
-    color:#919191;
-    float:left;
-    padding:3px;
-    margin:10px 0 0 0 ;
-    text-align:center;
-}
-
-.favorites-count {
-    color:#D4A849;
-    float:left;
-    padding:3px;
-    margin:10px 0 0 0 ;
-    text-align:center;
-}
-.favorites-empty{
-    width: 32px; height: 45px; float: left;
-}
-.question-summary {
-    border-bottom:1px dotted #999999;
-    float:left;
-    overflow:hidden;
-    padding:11px 0;
-    width:670px;
-}
-
-.user-info-table{
-width:950;margin-bottom:10px;
-}
-
-.user-stats-table .question-summary {
-    width:800px;
-}
-
-.narrow .stats {
-    background:transparent none repeat scroll 0 0;
-    float:left;
-    height:48px;
-    margin:0 0 0 7px;
-    padding:0;
-    width:auto;
-    font-family:Arial;
-}
-
-.stats div {
-	font-size:11px;
-	text-align:center;
-}
-
-.narrow .votes {
-    background:#EEEEEE none repeat scroll 0 0;
-    float:left;
-    height:42px;
-    margin:0 3px 0 0;
-    padding:5px;
-    width:46px;
-    text-align:center;
-    -moz-border-radius: 5px;
-    -khtml-border-radius: 5px;
-    -webkit-border-radius: 5px;
-}
-
-.narrow .summary {
-    width:620px;
-}
-
-.narrow .summary h3 {
-    padding:0px;
-    margin:0px;
-}
-
-.narrow .views {
-    float:left;
-    height:42px;
-    margin:0 7px 0 0;
-    /*padding:5px 0 5px 4px;*/
-	padding: 5px;
-    width:46px;
-    text-align:center;
-    -moz-border-radius: 5px;
-    -khtml-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    color:#777;
-}
-
-.narrow .status {
-    float:left;
-    height:42px;
-    margin:0 3px 0 0;
-    padding:5px;
-    width:46px;
-    text-align:center;
-    -moz-border-radius: 5px;
-    -khtml-border-radius: 5px;
-    -webkit-border-radius: 5px;
-}
-
-.narrow .vote-count-post {
-    font-weight:800;
-    margin:0;
-    font-size: 190%; color:#555; line-height:20px;
-}
-.narrow .answer-count-post{font-weight:800;margin:0; font-size: 190%; }
-.narrow .views-count-post{font-weight:800;margin:0; font-size: 190%;}
-div.started {
-    color:#999999;
-    float:right;
-    line-height:18px;
-     
-}
-
-.narrow div.started {
-    line-height:inherit;
-    padding-top:4px;
-    white-space:nowrap;
-    width:auto;
-}
-
-.relativetime {
-    font-weight:bold;
-    text-decoration:none;
-}
-
-div.started a {
-    font-weight:bold;
-}
-
-div.started .reputation-score {
-    margin-left:1px;
-}
-
-.narrow  .tags{float:left;}
-
-.answer-summary {
-    clear:both;
-    padding:3px;
-}
-
-.answer-votes {
-    background-color:#EEEEEE;
-    color:#555555;
-    float:left;
-    font-family:Arial;
-    font-size:110%;
-    font-weight:bold;
-    height:15px;
-    padding:4px 4px 5px;
-    text-align:center;
-    text-decoration:none;
-    width:20px;
-    margin-right:10px;
-}
-.vote-count{font-family:Arial; font-size:160%; font-weight:700; color:#777;}
-.user-action{
-
-}
-.user-action-1{
-    font-weight:bold;
-    color:#333;
-}
-.user-action-2{
-    font-weight:bold;
-    color:#CCC;
-}
-.user-action-3{
-    color:#333;
-}
-.user-action-4{
-    color:#333;
-}
-.user-action-5{
-    color:darkred;
-}
-.user-action-6{
-    color:darkred;
-}
-.user-action-7{
-    color:#333;
-}
-.user-action-8{
-    padding:3px;
-    font-weight:bold;
-    background-color:#CCC;
-    color:#663333;
-}
-
-.revision-summary{
-    background-color:#FFFE9B;
-    padding:2px;
-}
-.question-title-link a{
-    font-weight:bold;
-    color:#0077CC;
-}
-.answer-title-link a{
-    color:#333;
-}
-
-.post-type-1 a {
-    font-weight:bold;
-    
-}
-.post-type-3 a {
-    font-weight:bold;
-     
-}
-.post-type-5 a {
-    font-weight:bold;
- }
-.post-type-2 a{
-    color:#333;
-}
-.post-type-4 a{
-    color:#333;
-}
-.post-type-6 a{
-    color:#333;
-}
-.post-type-8 a{
-    color:#333;
-}
-
-
-/*读书频道*/
-.bookInfo {float:left; width:940px;padding:5px;}
-.bookCover {float:left; width:200px;}
-.bookCover img{border:1px solid #ccc;max-width:200px;}
-.bookSummary {float:left; font-size:13px;}
-.blogRss {float:right;margin:0 10px 0 0;width:460px;height:240px;background-color:#EEE; padding:5px;}
-.bookQuestions {margin-bottom:10px;}
-.bookFeed {float:right;}
-.bookAsk{
-	/*letter-spacing:1px; */
-	float:right;margin:-30px 10px 0 0; padding:3px 5px 3px 5px;}
-.bookAsk a {font-size:15px; color:#FFF; font-weight:bold; text-decoration:none;background-color:#EC7000;padding:3px 6px 3px 6px; }
-.bookAsk a:hover {text-decoration:underline;}
-
-
-/*其他全局样式*/
-.hilite { background-color: #ff0; }
-.hilite1 { background-color: #ff0; }
-.hilite2 { background-color: #f0f; }
-.hilite3 { background-color: #0ff; }
-.userStatus {margin-left:12px; color:#FFF; float:right;}
-.userStatus a {color:#FFF;}
-.gold, .badge1 {color:#FFCC00;}
-.silver, .badge2 {color:#CCCCCC;}
-.bronze, .badge3 {color:#CC9933;}
-.score {font-weight:800; color:#333;}
-.footerLinks {color:#EEE; font-size:13px; 
-	/* letter-spacing:1px;*/
-	}
-.footerLinks a {color:#FFF; font-size:13px;}
-.subSearch {margin-bottom:12px; padding:4px;}
-a.comment {background:#EEE; color:#993300; padding:4px;}
-a.permLink {padding:2px;}
-a.offensive {color:#999;}
-ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2px; padding-left:16px; margin-bottom:4px;}
-.user {padding:5px; line-height:140%; width:170px;}
-.user ul {margin:0; list-style-type:none;}
-.user .thumb{clear:both;float:left; margin-right:4px; display:inline;}
-.yellowbg{background:yellow;}
-.subtitle{line-height:30px;font-size:15px; font-weight:700;}
-.message{padding:5px;font-weight:bold;background-color:#eee;margin:10px 0 10px 0;}
-.warning{color:red;}
-.darkred{color:darkred;}
-.submit{
-	cursor:pointer;
-	/*letter-spacing:1px;*/
-	background-color:#D4D0C8;
-	height:40px;
-	border:1px solid #777;
-/*	width:100px; */
-	font-weight:bold;
-	font-size:120%;}
-.submit:hover{text-decoration:underline;}
-.ask-body{padding-right:10px;}
-.thousand{color:orange;}
-.notify
-{
-	position: fixed;
-	top: 0px;
-	left: 0px;
-	width: 100%;
-	z-index: 100;
-	padding: 7px 0 5px 0;
-	text-align: center;
-	font-size: 130%;
-	font-weight: Bold;
-	color: #444;
-	background-color: #F4A83D;
-}
-
-.notify span
-{
-	float: left;
-	width: 95%;
-	text-align: center;
-}
-
-.close-notify
-{
-	float: right;
-	margin-right: 20px;
-	color: #735005;
-	text-decoration: none;
-	background-color: #FAD163;
-	border: 2px #735005 solid;
-	padding-left: 3px;
-	padding-right: 3px;
-    cursor:pointer;
-}
+@import url(/content/style/jquery.autocomplete.css);
+@import url(/content/style/openid.css);
+@import url(/content/style/prettify.css);
+/* 公用 */
+body{background:#FFF; font-size:12px; line-height:150%; margin:0; padding:0; color:#000; font-family: "segoe ui",Helvetica,微软雅黑,宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif; 
+}
+div{margin:0 auto; padding:0;}
+h1,h2,h3,h4,h5,h6,ul,li,dl,dt,dd,form,img,p{margin:0; padding:0; border:none; }
+input, select {font-family:Trebuchet MS,"segoe ui",Helvetica,"Microsoft YaHei",宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif;}
+p{margin-bottom:4px; font-size:13px; line-height:160%;}
+a {color:#333333; text-decoration:none;}
+a:hover {text-decoration:underline;}
+.block{width:960px; height:auto;}
+.fleft{float:left;}
+.fright{float:right;}
+.tleft{text-align:left;}
+.tcenter{text-align:center;}
+.tright{text-align:right;}
+.dis{display:block;}
+.inline{display:inline;}
+.none{display:none;}
+.red{color:#CC0000;}
+.b{font-weight:bold;}
+.f10{font-size:10px;}
+.f11{font-size:11px;}
+.f12{font-size:12px;}
+.f13{font-size:13px;}
+.f14{font-size:14px;}
+.white{color:#FFFFFF;}
+.u{text-decoration:underline;}
+.spacer1{height:6px; line-height:6px; clear:both; visibility:hidden;}
+.spacer3{height:30px; line-height:30px; clear:both; visibility:hidden;}
+h1{font-size:160%;padding:5px 0 5px 0;}
+h2{font-size:140%;padding:3px 0 3px 0;}
+h3{font-size:120%;padding:3px 0 3px 0;}
+ul
+{
+	list-style: disc;
+	margin-left: 20px;
+    padding-left:0px;
+	margin-bottom: 1em;
+}
+ol
+{
+	list-style: decimal;
+	margin-left: 30px;
+	margin-bottom: 1em;
+    padding-left:0px;
+}
+pre
+{
+	font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace;
+    font-size:100%;
+	margin-bottom: 10px;
+	overflow: auto;
+	width: 580px;
+	background-color: #F5F5F5;
+    padding-left:5px;
+    padding-top:5px;
+	padding-bottom: 20px !ie7;
+}
+
+code{
+    font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace;
+    font-size:100%;
+
+}
+
+blockquote
+{
+	margin-bottom: 10px;
+	margin-right: 15px;
+	padding: 10px 0px 1px 10px;
+	background-color: #F5F5F5;
+}
+
+/*页面布局*/
+#wrapper {width:960px;margin:auto;padding:0;}
+#roof {margin-top:0px;background:#FFF;}
+#room {padding-top:10px;background-color:#FFF;border-bottom:1px solid #777;}
+#CALeft{width:700px; float:left; position:relative;padding-left:5px}
+#CARight{width:240px; float:right; padding-right:5px}
+#CAFull{float:left;padding:0 5px 0 5px;width:950px;}
+#ground {width:100%;border-top:1px solid #000; padding-top:6px; padding-bottom:10px; text-align:center;background:#777;}
+/*#licenseLogo {top:10px;right:10px;}*/
+
+/*顶部及导航栏*/
+#top {height:20px; text-align:right; padding:3px;background-color:#ffffff;}
+#header {width:960px;}
+#top a {height:35px; text-align:right;
+	/*letter-spacing:1px; */
+		margin-left:20px;text-decoration:underline; font-size:12px; color:#333333;}
+#logo {padding:5px;}
+#navBar {float:clear;position:relative;display:block;width:960px;}
+#navBar .nav {margin:20px 0px 0px 16px;
+	/*letter-spacing:1px; */
+	}
+#navBar .nav a {color:#333; background-color:#F9F7ED; 
+				border-bottom: none;
+				border-left: 1px solid #aaaaaa;
+				border-right: 1px solid #aaaaaa;
+				border-top: 1px solid #aaaaaa;
+				padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:15px; font-weight:400; text-decoration:none;display: block;float: left;}
+#navBar .nav a:hover {text-decoration:underline}
+#navBar .nav a.on {height:24px;line-height:28px;
+	border-top:1px solid #e66222; 
+	border-bottom: 1px solid #d64000;
+	border-right:1px solid #e66222; 
+	border-left:1px solid #e66222; 
+	/*background:#A31E39; */
+	background:#d64000;
+	color:#FFF; font-weight:600; text-decoration:none}
+#navBar .nav a.special {font-size:15px; color:#B02B2C; font-weight:bold; text-decoration:none; }
+#navBar .nav a.special:hover {text-decoration:underline;}
+#navBar .nav div.focus {float:right; padding-right:0px;}
+/*搜索栏*/
+#searchBar {background-color:#9db2b1;padding:5px;} /* #B02B2C */
+#searchBar .content { }
+#searchBar .searchInput {font-size:13px; height:18px; width:400px;}
+#searchBar .searchBtn {font-size:14px; height:26px; width:80px;}
+#searchBar .options {padding-top:5px; font-size:100%;color:#EEE;
+	/*letter-spacing:1px;*/
+	}
+#searchBar .options INPUT {margin-left:15px;}
+#searchBar .options INPUT:hover {cursor:pointer}
+
+/*问题列表*/
+#listA {float:left; background-color:#FFF;padding:0 0px 0 0px; width:100%;}
+#listA .qstA {padding:3px 5px 0 5px; margin:0 0px 10px 0px; background:url(/content/images/quest-bg.gif) repeat-x top;}
+#listA .qstA thumb {float:left; }
+#listA .qstA H2 {font-size:15px; font-weight:800; margin:8px auto;padding:0px;}
+#listA .qstA H2 a {color:#663333; }
+#listA .qstA .stat {font-size:13px;
+	/*letter-spacing:1px;*/
+	float:right;}
+#listA .qstA .stat span {margin-right:5px;}
+#listA .qstA .stat td {min-width:40px;text-align:center;}
+#listA .qstA .stat .num {font-family:arial;color:#905213; font-size:20px; font-weight:800;}
+#listA .qstA .stat .unit {color:#777;}
+#listA .qstA .from {margin-top:5px; font-size:13px;}
+#listA .qstA .from .score {font-family:arial;}
+#listA .qstA .date {margin-left:20px; color:#777;}
+#listA .qstA .wiki {color:#663333;font-size:12px;}
+#listA .qstA .from a {}
+#listA .qstA .from IMG {vertical-align:middle;}
+#listA .qstA .author {font-weight:400; }
+#listA .qstA .author a{ }
+#listA .qstA .summary{margin-right:5px;}
+.evenMore {font-size:14px; font-weight:800;}
+.questions-count{font-size:32px;font-family:arial;font-weight:600;padding:5px;color:#777;}
+
+/*内容块*/
+.boxA {background:#777; padding:6px; margin-bottom:8px;}
+.boxA H3 {font-size:13px; font-weight:800; color:#FFF; margin:0; padding:0; margin-bottom:4px;}
+.boxA .body {border:1px solid #999; padding:8px; background:#FFF; font-size:13px;}
+.boxA .more {padding:2px; text-align:right; font-weight:800;}
+.boxB {background:#F9F7CD; padding:6px; margin-bottom:8px;}
+.boxB H3 {font-size:13px; font-weight:800; color:#000; margin:0; padding:0 0 0 15px; margin-bottom:4px; background:url(/content/images/dot-g.gif) no-repeat left center;}
+.boxB .body {border:1px solid #FFFF88; padding:8px; background:#FFF; font-size:13px; line-height:160%;}
+.boxB .more {padding:1px; text-align:right; font-weight:800;}
+.boxC {background:#F5F5F5; padding:6px; margin-bottom:8px;}
+/*分页*/
+.pager {margin-top:10px; margin-bottom:16px; float:left;}
+.pagesize {margin-top:10px; margin-bottom:16px; float:right;}
+
+/** PAGINATOR **/
+.paginator {
+    padding:5px 0 10px 0;
+    font:normal 12px arial;
+}
+
+.paginator .prev-na,
+.paginator .next-na {
+	padding:.3em;
+	font:bold .875em arial;
+}
+
+.paginator .prev-na,
+.paginator .next-na {
+	border:1px solid #ccc;
+	background-color:#f9f9f9;
+	color:#aaa;
+	font-weight:normal;
+}
+
+.paginator .prev a, .paginator .prev a:visited,
+.paginator .next a, .paginator .next a:visited {
+	border:1px solid #fff;
+	background-color:#fff;
+	color:#777;
+	padding:.3em;
+	font:bold 100% arial;
+}
+
+.paginator .prev, .paginator .prev-na { margin-right:.5em; }
+.paginator .next, .paginator .next-na { margin-left:.5em; }
+
+.paginator .page a, .paginator .page a:visited, .paginator .curr {
+	padding:.25em;
+	font:normal .875em verdana;
+	border:1px solid #ccc;
+	background-color:#fff;
+	margin:0em .25em;
+	color:#777;
+}
+
+.paginator .curr {
+	background-color:#777;
+	color:#fff;
+	border:1px solid #777;
+	font-weight:bold;
+}
+
+.paginator .page a:hover,
+.paginator .curr a:hover,
+.paginator .prev a:hover,
+.paginator .next a:hover {
+	color:#fff;
+	background-color:#777;
+	border:1px solid #777;
+    text-decoration:none;
+}
+
+.paginator .text{
+    color:#777;
+	padding:.3em;
+	font:bold 100% arial;
+}
+
+.paginator-container{
+    float:right;
+    padding:10px 0 10px 0;
+}
+
+.paginator-container-left{
+    padding:5px 0 10px 0;
+}
+
+/*标签*/
+.tag {font-size:100%; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
+.tags {font-family:arial; line-height:200%; display:block; margin-top:5px;}
+.tags a {font-size:100%; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
+.tags a:hover {background-color:#fFF;color:#333;}
+.tag-number {font-weight:700;font-family:arial;}
+
+/*奖牌*/
+a.medal  { font-size:14px; line-height:250%; font-weight:800; color:#333; text-decoration:none; background:url(/content/images/medala.gif) no-repeat; border-left:1px solid #EEE; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:4px 12px 4px 6px;}
+a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images/medala_on.gif) no-repeat; border-left:1px solid #E7E296; border-top:1px solid #E7E296; border-bottom:1px solid #D1CA3D; border-right:1px solid #D1CA3D;}
+
+/*Tab栏*/
+.tabBar{background-color:#FFF;border-bottom: 1px solid #666;height: 30px; width: 100%;clear:both; margin-bottom:3px;}
+.tabsA {background-color:#FFF;float:right;position:relative;display:block;font-weight:bold;height:20px;}
+.tabsB {background-color:#FFF;float:left;position:relative;display:block;font-weight:bold;height:20px;}
+.tabsA a.on, .tabsA a.on:hover,.tabsB a.on, .tabsB a.on:hover {background: #fff;
+    color:#333;
+	border: 1px solid #777;
+    border-bottom:2px solid #FFF;
+	height: 25px;
+	line-height: 26px;
+	margin-top: 3px;
+	padding: 0px 11px 0px 11px;}
+
+.tabsA a {background: #eee;
+	border: 1px solid #eee;
+	color: #777;
+	display: block;
+	float: left;
+	height: 22px;
+	line-height: 28px;
+	margin: 5px 4px 0 0;
+	padding: 0 11px 0 11px;
+	text-decoration: none;
+}
+.tabsB a {background: #eee;
+	border: 1px solid #eee;
+	color: #777;
+	display: block;
+	float: left;
+	height: 22px;
+	line-height: 28px;
+	margin: 5px 0px 0 4px;
+	padding: 0 11px 0 11px;
+	text-decoration: none;
+}
+.tabsA a:hover, .tabsB a:hover {background: #fff;border: 1px solid #777;border-bottom:3px solid #FFF;}
+.headlineA {font-size:13px; border-bottom:1px solid #777; padding-bottom:2px; font-weight:800; margin-bottom:12px; text-align:right; height:30px;}
+.headQuestions {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
+.headAnswers {float:left; padding:3px; font-size:18px; font-weight:800; background:url(/content/images/ico_answers.gif) left 2px no-repeat; padding-left:24px;}
+.headTags {float:left; padding:3px; font-size:18px; font-weight:800; background:url(/content/images/ico_tags.gif) no-repeat; padding-left:24px;}
+.headUsers {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
+.headMedals {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
+.headLogin {float:left; padding:3px; font-size:15px; font-weight:800; background:url(/content/images/ico_login.gif) no-repeat; padding-left:24px;}
+.headNormal {text-align:left;padding:3px; font-size:15px; margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
+.headUser {text-align:left;padding:5px; font-size:20px; 
+	/*letter-spacing:1px;*/
+		margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
+/*RSS订阅*/
+#feeds {margin:10px 0; }
+#feeds a {background:url(/content/images/feed-icon-small.png) no-repeat 0; padding-left:18px; font-weight:700; font-size:13px; }
+
+/*问题*/
+#question {margin-bottom:30px;}
+#question h1{font-size:15px;background:#CCC; padding:6px 8px;;}
+#question .body{background:#F7F7F7; padding:20px 10px;}
+.starter {padding:10px; background:#E0EAF1;}
+.vote {font-size:20px; color:#666; font-weight:800;}
+.questions-related{font-weight:700;word-wrap:break-word;}
+.questions-related p{line-height:20px; margin-bottom:10px;font-size:100%;}
+.question-status{
+    margin-top:10px;
+    padding: 20px;
+    background-color:#F5F5F5;
+    text-align:center;
+}
+.question-status h3{font-size:125%;}
+.question-body{
+    min-height:100px;
+    font-size:13px;
+    line-height:20px;
+}
+.question-body IMG{
+    max-width:600px;
+}
+.question-mark{
+    background-color:#E9E9FF;
+    text-align:left;
+    padding:5px;
+    overflow:hidden;
+}
+.question-edit{
+    text-align:left;
+    overflow:hidden;
+}
+.vote-buttons {float:left;text-align:center;}
+.vote-buttons IMG{cursor:pointer;}
+.vote-number{
+    font-family:Arial;
+    padding:0px 0 3px 0;
+    font-size:140%;
+    font-weight:bold;
+    color:#777;
+}
+.question-img-upvote:hover{background:url(/content/images/vote-arrow-up-on.png)}
+.question-img-downvote:hover{background:url(/content/images/vote-arrow-down-on.png)}
+.question-img-favorite:hover{background:url(/content/images/vote-favorite-on.png)}
+.favorite-number{padding:0px;font-size:100%; font-family:Arial;font-weight:bold;color:#777;}
+.vote-notification
+{
+	z-index: 1;
+	cursor: pointer;
+	display: none;
+	position: absolute;
+	padding: 15px;
+    color: White;
+	background-color: darkred;
+	text-align: center;
+}
+.vote-notification a
+{
+    color: White;
+	text-decoration:underline;
+}
+.offensive-flag a{
+    color:#777;
+    padding:3px;
+    cursor:pointer;
+}
+
+.offensive-flag a:hover{
+    background-color:#777;
+    text-decoration:none;
+    color:#fff;
+}
+
+.linksopt a{
+    color:#777;
+    padding:3px;
+    cursor:pointer;
+}
+
+.linksopt a:hover{
+    background-color:#777;
+    text-decoration:none;
+    color:#fff;
+}
+
+.action-link a{
+    color:#777;
+    padding:3px;
+    cursor:pointer;
+}
+
+.action-link a:hover{
+    background-color:#777;
+    text-decoration:none;
+    color:#fff;
+}
+.action-link-separator{
+    color:#ccc;
+}
+.wiki-category{
+    margin-left:5px;
+    color:#999;
+    font-size:90%;
+}
+
+div.comments {
+    line-height:150%;
+    padding:10px 0;
+}
+
+div.post-comments{
+    width:100%;
+}
+
+form.post-comments textarea {
+    height:6em;
+    margin-bottom:4px;
+}
+
+form.post-comments input {
+    margin-left:10px;
+    margin-top:1px;
+    vertical-align:top;
+    width:100px;
+}
+span.text-counter {
+    margin-right:20px;
+}
+
+span.form-error {
+    color:#990000;
+    font-weight:normal;
+    margin-left:5px;
+}
+
+div.comments-container, div.comments-container-accepted, div.comments-container-owner, div.comments-container-deleted {
+    display:none;
+    margin-top:-1px;
+    padding:0 5px 5px;
+}
+
+div.comments-container, a.comments-link {
+    background-color:#EEEEEE;
+}
+
+.post-comments a {
+    color:#888888;
+    padding:0 3px 2px;
+}
+
+a.comments-link, a.comments-link-accepted, a.comments-link-owner, a.comments-link-deleted {
+    color:black;
+    padding:2px;
+    cursor:pointer;
+}
+
+.post-comments a:hover {
+    background-color:#777777;
+    color:white;
+    text-decoration:none;
+}
+
+a.comment-user, a.comment-user:hover {
+    background-color:inherit;
+    color:#0077CC;
+    padding:0;
+}
+
+a.comment-user:hover {
+    text-decoration:underline;
+}
+/*回答*/
+#answers {}
+.answer{
+    border-bottom:1px dotted #666666;
+    padding-bottom:20px;
+    padding-top:20px;
+    width: 100%;
+    margin-bottom:10px;
+}
+.answer-body{
+    min-height:80px;
+    font-size:13px;
+    line-height:20px;
+}
+
+.answer-body IMG{
+    max-width:600px;
+}
+
+.accepted-answer{
+    background-color:#EBFFE6;
+    border-bottom-color:#9BD59B;
+}
+
+.accepted-answer .comments-link{
+    background-color:#CCFFBF;
+}
+
+.accepted-answer .comments-container{
+    background-color:#CCFFBF;
+}
+
+.answered
+{
+	background: #CCC;
+	color: #999;
+}
+
+.answered-accepted
+{
+	background: #CCC;
+	color: #663333;
+}
+
+.unanswered
+{
+	background: #777;
+	color: white;
+}
+
+.answered-by-owner
+{
+	background: #E9E9FF;
+}
+
+.answered-by-owner .comments-link
+{
+    background-color:#E6ECFF;
+}
+
+.answered-by-owner .comments-container
+{
+    background-color:#E6ECFF;
+}
+
+.answered-accepted strong
+{
+	color: #E1E818;
+}
+
+.answer-img-accept:hover{background:url(/content/images/vote-accepted-on.png)}
+
+.deleted{
+    background:#F4E7E7 none repeat scroll 0 0;
+}
+
+/*标签列表*/
+.tagsbox {}
+.tagsbox a {color:#000;line-height:30px;margin-right:10px;font-size:100%;background-color:#F9F7ED;padding:3px;}
+.tagsbox a:hover {text-decoration:none;background-color:#F9F7CD;color:#B02B2C;}
+.tagsList {margin:0; list-style-type:none;padding:0px;min-height:360px;}
+.tagsList li {width:235px; float:left;}
+.badge-list{margin:0; list-style-type:none;}
+/*登录*/
+.list-item{margin-left:15px;}
+.list-item LI{list-style-type:disc; font-size:13px; line-height:20px; margin-bottom:10px;}
+/* openid styles */
+.form-row{line-height:25px;}
+.submit-row{line-height:30px;padding-top:10px;}
+.errors{line-height:20px;color:red;}
+.error{color:red;}
+.error-list li{padding:5px;}
+.login{margin-bottom:10px;}
+.fieldset{border:solid 1px #777;margin-top:10px;padding:10px;}
+.openid-input{background:url(/content/images/openid.gif) no-repeat;padding-left:15px;cursor:pointer;}
+.openid-login-input{
+    background-position:center left;
+    background:url(/content/images/openid.gif) no-repeat 0% 50%;
+    padding:5px 5px 5px 15px;
+    cursor:pointer;
+    font-family:Trebuchet MS;
+    font-weight:300;
+    font-size:150%;
+    width:500px;
+}
+
+.openid-login-submit{
+    height:40px;
+    width:80px;
+    line-height:40px;
+    cursor:pointer;
+    border:1px solid #777;
+    font-weight:bold;
+    font-size:120%;
+}
+
+.openid-samples{
+
+}
+
+.openid-samples .list, .list li{
+    font-family:Trebuchet MS,"segoe ui",Helvetica,"Microsoft YaHei",宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif;
+    list-style:none !important;
+    margin-left:-30px !important;
+    line-height:20px !important;
+}
+
+/*表单相关*/
+span.form-error {
+    color:#990000;
+    font-size:90%;
+    font-weight:normal;
+    margin-left:5px;
+}
+.title-desc{
+    color:#999;
+    font-size:90%;
+}
+
+/*adjustment for editor preview*/
+#editor{
+    font-size:100%;
+    min-height:200px;
+    line-height: 18px;
+    width:100%;
+}
+
+.wmd-preview{
+    margin-top:10px;
+    padding:6px;
+    width:100%;
+    background-color:#F5F5F5;
+    min-height:20px;
+}
+.wmd-preview pre{
+    background-color:#E7F1F8;
+
+}
+
+.wmd-preview blockquote
+{
+	background-color: #eee;
+}
+
+.wmd-preview IMG{
+    max-width:600px;
+}
+.preview-toggle{
+    font-weight:600;
+    width:100%;
+    color:#aaa;
+    /*letter-spacing:1px;*/
+    text-align:left;
+}
+
+.preview-toggle span:hover{
+    cursor:pointer;
+}
+
+.edit-content-html{
+    border-top:1px dotted #D8D2A9;
+    border-bottom:1px dotted #D8D2A9;
+    margin:5px 0 5px 0;
+}
+
+/*修订记录*/
+
+#revisions{
+    width:950px;
+}
+
+.revision{
+    margin:10px 0 10px 0;
+    width:100%;
+    font-size:13px;
+}
+
+.revision .header{
+    background-color:#eee;
+    padding:5px;
+    cursor:pointer;
+}
+
+.revision .author{
+    background-color:#E9E9FF;
+}
+
+.revision .summary{
+    padding: 5px 0 10px 0;
+}
+
+.revision .summary span{
+    background-color:yellow;
+    display:inline;
+}
+.revision h1{
+    font-size:130%;
+    font-weight:600;
+    padding:15px 0 15px 0;
+}
+
+.revision-mark{
+    width:200px;
+    text-align:left;
+    font-size:90%;
+    overflow:hidden;
+}
+
+.revision-number{
+    font-size:300%;
+    font-weight:bold;
+    font-family:arial;
+}
+
+.revision .body{
+    padding-left:10px;
+    margin-bottom:50px;
+}
+.revision .answerbody{
+    padding:10px 0 5px 10px;
+}
+
+/* Revision pages */
+del { color: #FF5F5F; }
+del .post-tag{
+color: #FF5F5F;
+}
+ins { background-color: #97ff97;}
+ins .post-tag{
+background-color: #97ff97;
+}
+
+/*用户资料页面*/
+.count {font-family:Arial;font-size:200%;font-weight:700;color:#777}
+.scoreNumber{font-family:Arial;font-size:35px;font-weight:800;color:#777;line-height:40px;
+	/*letter-spacing:0px*/
+	}
+.user-details{font-size:13px;}
+.user-about{background-color:#EEEEEE;height:200px;line-height:20px; overflow:auto;padding:10px;width:90%;}
+.user-edit-link {background:url(/content/images/edit.png) no-repeat; padding-left:20px; font-weight:600;}
+.favorites-count-off {
+    color:#919191;
+    float:left;
+    padding:3px;
+    margin:10px 0 0 0 ;
+    text-align:center;
+}
+
+.favorites-count {
+    color:#D4A849;
+    float:left;
+    padding:3px;
+    margin:10px 0 0 0 ;
+    text-align:center;
+}
+.favorites-empty{
+    width: 32px; height: 45px; float: left;
+}
+.question-summary {
+    border-bottom:1px dotted #999999;
+    float:left;
+    overflow:hidden;
+    padding:11px 0;
+    width:670px;
+}
+
+.user-info-table{
+width:950;margin-bottom:10px;
+}
+
+.user-stats-table .question-summary {
+    width:800px;
+}
+
+.narrow .stats {
+    background:transparent none repeat scroll 0 0;
+    float:left;
+    height:48px;
+    margin:0 0 0 7px;
+    padding:0;
+    width:auto;
+    font-family:Arial;
+}
+
+.stats div {
+	font-size:11px;
+	text-align:center;
+}
+
+.narrow .votes {
+    background:#EEEEEE none repeat scroll 0 0;
+    float:left;
+    height:42px;
+    margin:0 3px 0 0;
+    padding:5px;
+    width:46px;
+    text-align:center;
+    -moz-border-radius: 5px;
+    -khtml-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+
+.narrow .summary {
+    width:620px;
+}
+
+.narrow .summary h3 {
+    padding:0px;
+    margin:0px;
+}
+
+.narrow .views {
+    float:left;
+    height:42px;
+    margin:0 7px 0 0;
+    /*padding:5px 0 5px 4px;*/
+	padding: 5px;
+    width:46px;
+    text-align:center;
+    -moz-border-radius: 5px;
+    -khtml-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    color:#777;
+}
+
+.narrow .status {
+    float:left;
+    height:42px;
+    margin:0 3px 0 0;
+    padding:5px;
+    width:46px;
+    text-align:center;
+    -moz-border-radius: 5px;
+    -khtml-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+
+.narrow .vote-count-post {
+    font-weight:800;
+    margin:0;
+    font-size: 190%; color:#555; line-height:20px;
+}
+.narrow .answer-count-post{font-weight:800;margin:0; font-size: 190%; }
+.narrow .views-count-post{font-weight:800;margin:0; font-size: 190%;}
+div.started {
+    color:#999999;
+    float:right;
+    line-height:18px;
+     
+}
+
+.narrow div.started {
+    line-height:inherit;
+    padding-top:4px;
+    white-space:nowrap;
+    width:auto;
+}
+
+.relativetime {
+    font-weight:bold;
+    text-decoration:none;
+}
+
+div.started a {
+    font-weight:bold;
+}
+
+div.started .reputation-score {
+    margin-left:1px;
+}
+
+.narrow  .tags{float:left;}
+
+.answer-summary {
+    clear:both;
+    padding:3px;
+}
+
+.answer-votes {
+    background-color:#EEEEEE;
+    color:#555555;
+    float:left;
+    font-family:Arial;
+    font-size:110%;
+    font-weight:bold;
+    height:15px;
+    padding:4px 4px 5px;
+    text-align:center;
+    text-decoration:none;
+    width:20px;
+    margin-right:10px;
+}
+.vote-count{font-family:Arial; font-size:160%; font-weight:700; color:#777;}
+.user-action{
+
+}
+.user-action-1{
+    font-weight:bold;
+    color:#333;
+}
+.user-action-2{
+    font-weight:bold;
+    color:#CCC;
+}
+.user-action-3{
+    color:#333;
+}
+.user-action-4{
+    color:#333;
+}
+.user-action-5{
+    color:darkred;
+}
+.user-action-6{
+    color:darkred;
+}
+.user-action-7{
+    color:#333;
+}
+.user-action-8{
+    padding:3px;
+    font-weight:bold;
+    background-color:#CCC;
+    color:#663333;
+}
+
+.revision-summary{
+    background-color:#FFFE9B;
+    padding:2px;
+}
+.question-title-link a{
+    font-weight:bold;
+    color:#0077CC;
+}
+.answer-title-link a{
+    color:#333;
+}
+
+.post-type-1 a {
+    font-weight:bold;
+    
+}
+.post-type-3 a {
+    font-weight:bold;
+     
+}
+.post-type-5 a {
+    font-weight:bold;
+ }
+.post-type-2 a{
+    color:#333;
+}
+.post-type-4 a{
+    color:#333;
+}
+.post-type-6 a{
+    color:#333;
+}
+.post-type-8 a{
+    color:#333;
+}
+
+
+/*读书频道*/
+.bookInfo {float:left; width:940px;padding:5px;}
+.bookCover {float:left; width:200px;}
+.bookCover img{border:1px solid #ccc;max-width:200px;}
+.bookSummary {float:left; font-size:13px;}
+.blogRss {float:right;margin:0 10px 0 0;width:460px;height:240px;background-color:#EEE; padding:5px;}
+.bookQuestions {margin-bottom:10px;}
+.bookFeed {float:right;}
+.bookAsk{
+	/*letter-spacing:1px; */
+	float:right;margin:-30px 10px 0 0; padding:3px 5px 3px 5px;}
+.bookAsk a {font-size:15px; color:#FFF; font-weight:bold; text-decoration:none;background-color:#EC7000;padding:3px 6px 3px 6px; }
+.bookAsk a:hover {text-decoration:underline;}
+
+
+/*其他全局样式*/
+.hilite { background-color: #ff0; }
+.hilite1 { background-color: #ff0; }
+.hilite2 { background-color: #f0f; }
+.hilite3 { background-color: #0ff; }
+.userStatus {margin-left:12px; color:#FFF; float:right;}
+.userStatus a {color:#FFF;}
+.gold, .badge1 {color:#FFCC00;}
+.silver, .badge2 {color:#CCCCCC;}
+.bronze, .badge3 {color:#CC9933;}
+.score {font-weight:800; color:#333;}
+.footerLinks {color:#EEE; font-size:13px; 
+	/* letter-spacing:1px;*/
+	}
+.footerLinks a {color:#FFF; font-size:13px;}
+.subSearch {margin-bottom:12px; padding:4px;}
+a.comment {background:#EEE; color:#993300; padding:4px;}
+a.permLink {padding:2px;}
+a.offensive {color:#999;}
+ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2px; padding-left:16px; margin-bottom:4px;}
+.user {padding:5px; line-height:140%; width:170px;}
+.user ul {margin:0; list-style-type:none;}
+.user .thumb{clear:both;float:left; margin-right:4px; display:inline;}
+.yellowbg{background:yellow;}
+.subtitle{line-height:30px;font-size:15px; font-weight:700;}
+.message{padding:5px;font-weight:bold;background-color:#eee;margin:10px 0 10px 0;}
+.warning{color:red;}
+.darkred{color:darkred;}
+.submit{
+	cursor:pointer;
+	/*letter-spacing:1px;*/
+	background-color:#D4D0C8;
+	height:40px;
+	border:1px solid #777;
+/*	width:100px; */
+	font-weight:bold;
+	font-size:120%;}
+.submit:hover{text-decoration:underline;}
+.ask-body{padding-right:10px;}
+.thousand{color:orange;}
+.notify
+{
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	width: 100%;
+	z-index: 100;
+	padding: 7px 0 5px 0;
+	text-align: center;
+	font-size: 130%;
+	font-weight: Bold;
+	color: #444;
+	background-color: #F4A83D;
+}
+
+.notify span
+{
+	float: left;
+	width: 95%;
+	text-align: center;
+}
+
+.close-notify
+{
+	float: right;
+	margin-right: 20px;
+	color: #735005;
+	text-decoration: none;
+	background-color: #FAD163;
+	border: 2px #735005 solid;
+	padding-left: 3px;
+	padding-right: 3px;
+    cursor:pointer;
+}
diff --git a/templates/faq.html b/templates/faq.html
index 31ee444a..253d3590 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -1,5 +1,5 @@
-<!-- template faq.html -->
 {% extends "base_content.html" %}
+<!-- template faq.html -->
 {% load extra_tags %}
 {% load humanize %}
 {% load i18n %}
diff --git a/templates/footer.html b/templates/footer.html
index 61e6e6bb..207104ce 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -1,33 +1,33 @@
-<!-- template footer.html -->
-{% load extra_tags %}
-{% load i18n %}
-<!-- 页面底部开始： -->
-    <div id="ground">
-        <div class="footerLinks" >
-            <a href="/about">{% trans "about" %}</a><span class="link-separator"> |</span>
-            <a href="/faq">{% trans "faq" %}</a><span class="link-separator"> |</span>
-            <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
-            <a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>
-            <a href="/privacy">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
-            <a href="{{ feedback_url }}" target="_blank">{% trans "give feedback" %}</a>
-        </div>
-	  <p style="margin-top:10px;">
-         <a href="http://code.google.com/p/cnprog/" target="_blank">
-            <img src="/content/images/djangomade124x25_grey.gif" border="0" alt="Made with Django." title="Made with Django." >
-         </a>
-         <!--<div style="font-size:90%;color:#333">{% trans "current revision" %}: R-0120-20090406</div>-->
-      </p>
-	  <p id="licenseLogo"><img src="/content/images/cc-wiki.png" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" /></p>
-	</div>
-	<!-- 页面底部结束： -->
-        <script type="text/javascript">
-            var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-            document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-            </script>
-            <script type="text/javascript">
-            try {
-            var pageTracker = _gat._getTracker({{ google_analytics_key }});
-            pageTracker._trackPageview();
-            } catch(err) {}
-        </script>
-<!-- end template footer.html -->
+<!-- template footer.html -->
+{% load extra_tags %}
+{% load i18n %}
+<!-- 页面底部开始： -->
+    <div id="ground">
+        <div class="footerLinks" >
+            <a href="/about">{% trans "about" %}</a><span class="link-separator"> |</span>
+            <a href="/faq">{% trans "faq" %}</a><span class="link-separator"> |</span>
+            <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
+            <a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>
+            <a href="/privacy">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
+            <a href="{{ feedback_url }}" target="_blank">{% trans "give feedback" %}</a>
+        </div>
+	  <p style="margin-top:10px;">
+         <a href="http://code.google.com/p/cnprog/" target="_blank">
+            <img src="/content/images/djangomade124x25_grey.gif" border="0" alt="Made with Django." title="Made with Django." >
+         </a>
+         <!--<div style="font-size:90%;color:#333">{% trans "current revision" %}: R-0120-20090406</div>-->
+      </p>
+	  <p id="licenseLogo"><img src="/content/images/cc-wiki.png" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" /></p>
+	</div>
+	<!-- 页面底部结束： -->
+        <script type="text/javascript">
+            var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+            document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+            </script>
+            <script type="text/javascript">
+            try {
+            var pageTracker = _gat._getTracker({{ google_analytics_key }});
+            pageTracker._trackPageview();
+            } catch(err) {}
+        </script>
+<!-- end template footer.html -->
diff --git a/templates/header.html b/templates/header.html
index fb07a4c0..64cf2bf0 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -1,70 +1,71 @@
-<!-- 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="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>
+                <a href="{% url user_signup %}">{% trans "signup" %}</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 -->
diff --git a/templates/privacy.html b/templates/privacy.html
index 335aba92..d5d7dd43 100644
--- a/templates/privacy.html
+++ b/templates/privacy.html
@@ -1,5 +1,5 @@
-<!-- privacy.html -->
 {% extends "base_content.html" %}
+<!-- privacy.html -->
 {% load extra_tags %}
 {% load i18n %}
 {% load humanize %}
diff --git a/templates/tags.html b/templates/tags.html
index cb499eed..6f9b3aed 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -1,5 +1,5 @@
-<!-- tags.html -->
 {% extends "base_content.html" %}
+<!-- tags.html -->
 {% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
diff --git a/templates/user.html b/templates/user.html
index 53a30dc0..8db15902 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -1,35 +1,35 @@
 <!-- user.html -->
-{% extends "base_content.html" %}
-{% load extra_tags %}
-{% load humanize %}
-{% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
-{% block forestyle%}
-    <style type="text/css">
- 		.history-table td { padding: 5px; }
- 		.user-stats-table { margin-left:50px; }
-	</style>
-{% endblock %}
-{% block forejs %}
-        <script type="text/javascript">
-            $().ready(function(){
-                {% ifequal view_user request.user%}
-                    $("#nav_profile").attr('className',"on");
-                {% else %}
-                    $("#nav_users").attr('className',"on");
-               
-                {% endifequal %}
-            });     
-        </script>
-        {% block userjs %}
-        {% endblock %}
-{% endblock %}
-
-{% block content %}
-    <div id="mainbar-full">
-        {% include "user_info.html" %}
-        {% include "user_tabs.html" %}
-        {% block usercontent %}
-        {% endblock %}
-        {% include "user_footer.html" %}
-	</div>
+{% extends "base_content.html" %}
+{% load extra_tags %}
+{% load humanize %}
+{% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
+{% block forestyle%}
+    <style type="text/css">
+ 		.history-table td { padding: 5px; }
+ 		.user-stats-table { margin-left:50px; }
+	</style>
+{% endblock %}
+{% block forejs %}
+        <script type="text/javascript">
+            $().ready(function(){
+                {% ifequal view_user request.user%}
+                    $("#nav_profile").attr('className',"on");
+                {% else %}
+                    $("#nav_users").attr('className',"on");
+               
+                {% endifequal %}
+            });     
+        </script>
+        {% block userjs %}
+        {% endblock %}
+{% endblock %}
+
+{% block content %}
+    <div id="mainbar-full">
+        {% include "user_info.html" %}
+        {% include "user_tabs.html" %}
+        {% block usercontent %}
+        {% endblock %}
+        {% include "user_footer.html" %}
+	</div>
 {% endblock %}<!-- end user.html -->
diff --git a/templates/users.html b/templates/users.html
index 701dbaa2..966596fc 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -1,5 +1,5 @@
-<!-- users.html -->
 {% extends "base_content.html" %}
+<!-- users.html -->
 {% load extra_tags %}
 {% load humanize %}
 {% load i18n %}
diff --git a/urls.py b/urls.py
index a219fd44..802d401c 100644
--- a/urls.py
+++ b/urls.py
@@ -1,64 +1,64 @@
-import os.path
-from django.conf.urls.defaults import *
-from django.contrib import admin
-from forum.views import index
-from forum import views as app
-from forum.feed import RssLastestQuestionsFeed
-
-admin.autodiscover()
-feeds = {
-    'rss': RssLastestQuestionsFeed
-}
-
-APP_PATH = os.path.dirname(__file__)
-urlpatterns = patterns('',
-    (r'^$', index),
-    (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.ico'}),
-    (r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.gif'}),
-    (r'^content/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': os.path.join(APP_PATH, 'templates/content').replace('\\','/')}
-    ),
-    (r'^upfiles/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': os.path.join(APP_PATH, 'templates/upfiles').replace('\\','/')}
-    ),
-    (r'^account/', include('django_authopenid.urls')),
-    (r'^signin/$', 'django_authopenid.views.signin'),
-    url(r'^about/$', app.about, name='about'),
-    url(r'^faq/$', app.faq, name='faq'),
-    url(r'^privacy/$', app.privacy, name='privacy'),
-    url(r'^logout/$', app.logout, name='logout'),
-    url(r'^answers/(?P<id>\d+)/comments/$', app.answer_comments, name='answer_comments'),
-    url(r'^answers/(?P<id>\d+)/edit/$', app.edit_answer, name='edit_answer'),
-    url(r'^answers/(?P<id>\d+)/revisions/$', app.answer_revisions, name='answer_revisions'),
-    url(r'^questions/$', app.questions, name='questions'),
-    url(r'^questions/ask/$', app.ask, name='ask'),
-    url(r'^questions/unanswered/$', app.unanswered, name='unanswered'),
-    url(r'^questions/(?P<id>\d+)/edit/$', app.edit_question, name='edit_question'),
-    url(r'^questions/(?P<id>\d+)/close/$', app.close, name='close'),
-    url(r'^questions/(?P<id>\d+)/reopen/$', app.reopen, name='reopen'),
-    url(r'^questions/(?P<id>\d+)/answer/$', app.answer, name='answer'),
-    url(r'^questions/(?P<id>\d+)/vote/$', app.vote, name='vote'),
-    url(r'^questions/(?P<id>\d+)/revisions/$', app.question_revisions, name='question_revisions'),
-    url(r'^questions/(?P<id>\d+)/comments/$', app.question_comments, name='question_comments'),
-    url(r'^questions/(?P<question_id>\d+)/comments/(?P<comment_id>\d+)/delete/$', app.delete_question_comment, name='delete_question_comment'),
-    url(r'^answers/(?P<answer_id>\d+)/comments/(?P<comment_id>\d+)/delete/$', app.delete_answer_comment, name='delete_answer_comment'),
-    #place general question item in the end of other operations
-    url(r'^questions/(?P<id>\d+)//*', app.question, name='question'),
-    (r'^tags/$', app.tags),
-    (r'^tags/(?P<tag>[^/]+)/$', app.tag),
-    (r'^users/$',app.users),
-    url(r'^users/(?P<id>\d+)/edit/$', app.edit_user, name='edit_user'),
-    url(r'^users/(?P<id>\d+)//*', app.user, name='user'),
-    url(r'^badges/$',app.badges, name='badges'),
-    url(r'^badges/(?P<id>\d+)//*', app.badge, name='badge'),
-    url(r'^messages/markread/$',app.read_message, name='read_message'),
-    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    (r'^nimda/(.*)', admin.site.root),
-    (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
-    (r'^upload/$', app.upload),
-    url(r'^books/$', app.books, name='books'),
-    url(r'^books/ask/(?P<short_name>[^/]+)/$', app.ask_book, name='ask_book'),
-    url(r'^books/(?P<short_name>[^/]+)/$', app.book, name='book'),
-    url(r'^search/$', app.search, name='search'),
-    (r'^i18n/', include('django.conf.urls.i18n')),
-)
+import os.path
+from django.conf.urls.defaults import *
+from django.contrib import admin
+from forum.views import index
+from forum import views as app
+from forum.feed import RssLastestQuestionsFeed
+
+admin.autodiscover()
+feeds = {
+    'rss': RssLastestQuestionsFeed
+}
+
+APP_PATH = os.path.dirname(__file__)
+urlpatterns = patterns('',
+    (r'^$', index),
+    (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.ico'}),
+    (r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.gif'}),
+    (r'^content/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': os.path.join(APP_PATH, 'templates/content').replace('\\','/')}
+    ),
+    (r'^upfiles/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': os.path.join(APP_PATH, 'templates/upfiles').replace('\\','/')}
+    ),
+    (r'^account/', include('django_authopenid.urls')),
+    (r'^signin/$', 'django_authopenid.views.signin'),
+    url(r'^about/$', app.about, name='about'),
+    url(r'^faq/$', app.faq, name='faq'),
+    url(r'^privacy/$', app.privacy, name='privacy'),
+    url(r'^logout/$', app.logout, name='logout'),
+    url(r'^answers/(?P<id>\d+)/comments/$', app.answer_comments, name='answer_comments'),
+    url(r'^answers/(?P<id>\d+)/edit/$', app.edit_answer, name='edit_answer'),
+    url(r'^answers/(?P<id>\d+)/revisions/$', app.answer_revisions, name='answer_revisions'),
+    url(r'^questions/$', app.questions, name='questions'),
+    url(r'^questions/ask/$', app.ask, name='ask'),
+    url(r'^questions/unanswered/$', app.unanswered, name='unanswered'),
+    url(r'^questions/(?P<id>\d+)/edit/$', app.edit_question, name='edit_question'),
+    url(r'^questions/(?P<id>\d+)/close/$', app.close, name='close'),
+    url(r'^questions/(?P<id>\d+)/reopen/$', app.reopen, name='reopen'),
+    url(r'^questions/(?P<id>\d+)/answer/$', app.answer, name='answer'),
+    url(r'^questions/(?P<id>\d+)/vote/$', app.vote, name='vote'),
+    url(r'^questions/(?P<id>\d+)/revisions/$', app.question_revisions, name='question_revisions'),
+    url(r'^questions/(?P<id>\d+)/comments/$', app.question_comments, name='question_comments'),
+    url(r'^questions/(?P<question_id>\d+)/comments/(?P<comment_id>\d+)/delete/$', app.delete_question_comment, name='delete_question_comment'),
+    url(r'^answers/(?P<answer_id>\d+)/comments/(?P<comment_id>\d+)/delete/$', app.delete_answer_comment, name='delete_answer_comment'),
+    #place general question item in the end of other operations
+    url(r'^questions/(?P<id>\d+)//*', app.question, name='question'),
+    (r'^tags/$', app.tags),
+    (r'^tags/(?P<tag>[^/]+)/$', app.tag),
+    (r'^users/$',app.users),
+    url(r'^users/(?P<id>\d+)/edit/$', app.edit_user, name='edit_user'),
+    url(r'^users/(?P<id>\d+)//*', app.user, name='user'),
+    url(r'^badges/$',app.badges, name='badges'),
+    url(r'^badges/(?P<id>\d+)//*', app.badge, name='badge'),
+    url(r'^messages/markread/$',app.read_message, name='read_message'),
+    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    (r'^nimda/(.*)', admin.site.root),
+    (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
+    (r'^upload/$', app.upload),
+    url(r'^books/$', app.books, name='books'),
+    url(r'^books/ask/(?P<short_name>[^/]+)/$', app.ask_book, name='ask_book'),
+    url(r'^books/(?P<short_name>[^/]+)/$', app.book, name='book'),
+    url(r'^search/$', app.search, name='search'),
+    (r'^i18n/', include('django.conf.urls.i18n')),
+)
diff --git a/utils/cache.py b/utils/cache.py
index bc1cb1af..410c0662 100644
--- a/utils/cache.py
+++ b/utils/cache.py
@@ -1,92 +1,92 @@
-"""Utilities for working with Django Models."""
-import itertools
-
-from django.contrib.contenttypes.models import ContentType
-
-from lanai.utils.lists import flatten
-
-def fetch_model_dict(model, ids, fields=None):
-    """
-    Fetches a dict of model details for model instances with the given
-    ids, keyed by their id.
-
-    If a fields list is given, a dict of details will be retrieved for
-    each model, otherwise complete model instances will be retrieved.
-
-    Any fields list given shouldn't contain the primary key attribute for
-    the model, as this can be determined from its Options.
-    """
-    if fields is None:
-        return model._default_manager.in_bulk(ids)
-    else:
-        id_attr = model._meta.pk.attname
-        return dict((obj[id_attr], obj) for obj
-            in model._default_manager.filter(id__in=ids).values(
-                *itertools.chain((id_attr,), fields)))
-
-def populate_foreign_key_caches(model, objects_to_populate, fields=None):
-    """
-    Populates caches for the given related Model in instances of objects
-    which have a ForeignKey relationship to it, specified as a list of
-    (object list, related attribute name list) two-tuples.
-
-    If a list of field names is given, only the given fields will be
-    looked up and related object caches will be populated with a dict of
-    the specified fields. Otherwise, complete model instances will be
-    retrieved.
-    """
-    # Get all related object ids for the appropriate fields
-    related_object_ids = []
-    for objects, attrs in objects_to_populate:
-        related_object_ids.append(tuple(tuple(getattr(obj, '%s_id' % attr)
-                                              for attr in attrs)
-                                  for obj in objects))
-    unique_ids = tuple(set(pk for pk in flatten(related_object_ids) if pk))
-    related_objects = fetch_model_dict(model, unique_ids, fields)
-
-    # Fill related object caches
-    for (objects, attrs), related_ids in itertools.izip(objects_to_populate,
-                                                        related_object_ids):
-        for obj, related_ids_for_obj in itertools.izip(objects,
-                                                       related_ids):
-            for attr, related_object in itertools.izip(attrs, (related_objects.get(pk, None)
-                                                               for pk in related_ids_for_obj)):
-                setattr(obj, '_%s_cache' % attr, related_object)
-
-def populate_content_object_caches(generic_related_objects, model_fields=None):
-    """
-    Retrieves ``ContentType`` and content objects for the given list of
-    items which use a generic relation, grouping the retrieval of content
-    objects by model to reduce the number of queries executed.
-
-    This results in ``number_of_content_types + 1`` queries rather than
-    the ``number_of_generic_reL_objects * 2`` queries you'd get by
-    iterating over the list and accessing each item's object attribute.
-
-    If a dict mapping model classes to field names is given, only the
-    given fields will be looked up for each model specified and the
-    object cache will be populated with a dict of the specified fields.
-    Otherwise, complete model instances will be retrieved.
-    """
-    if model_fields is None:
-        model_fields = {}
-
-    # Group content object ids by their content type ids
-    ids_by_content_type = {}
-    for obj in generic_related_objects:
-        ids_by_content_type.setdefault(obj.content_type_id,
-                                       []).append(obj.object_id)
-
-    # Retrieve content types and content objects in bulk
-    content_types = ContentType.objects.in_bulk(ids_by_content_type.keys())
-    for content_type_id, ids in ids_by_content_type.iteritems():
-        model = content_types[content_type_id].model_class()
-        objects[content_type_id] = fetch_model_dict(
-            model, tuple(set(ids)), model_fields.get(model, None))
-
-    # Set content types and content objects in the appropriate cache
-    # attributes, so accessing the 'content_type' and 'object' attributes
-    # on each object won't result in further database hits.
-    for obj in generic_related_objects:
-        obj._object_cache = objects[obj.content_type_id][obj.object_id]
-        obj._content_type_cache = content_types[obj.content_type_id]
+"""Utilities for working with Django Models."""
+import itertools
+
+from django.contrib.contenttypes.models import ContentType
+
+from lanai.utils.lists import flatten
+
+def fetch_model_dict(model, ids, fields=None):
+    """
+    Fetches a dict of model details for model instances with the given
+    ids, keyed by their id.
+
+    If a fields list is given, a dict of details will be retrieved for
+    each model, otherwise complete model instances will be retrieved.
+
+    Any fields list given shouldn't contain the primary key attribute for
+    the model, as this can be determined from its Options.
+    """
+    if fields is None:
+        return model._default_manager.in_bulk(ids)
+    else:
+        id_attr = model._meta.pk.attname
+        return dict((obj[id_attr], obj) for obj
+            in model._default_manager.filter(id__in=ids).values(
+                *itertools.chain((id_attr,), fields)))
+
+def populate_foreign_key_caches(model, objects_to_populate, fields=None):
+    """
+    Populates caches for the given related Model in instances of objects
+    which have a ForeignKey relationship to it, specified as a list of
+    (object list, related attribute name list) two-tuples.
+
+    If a list of field names is given, only the given fields will be
+    looked up and related object caches will be populated with a dict of
+    the specified fields. Otherwise, complete model instances will be
+    retrieved.
+    """
+    # Get all related object ids for the appropriate fields
+    related_object_ids = []
+    for objects, attrs in objects_to_populate:
+        related_object_ids.append(tuple(tuple(getattr(obj, '%s_id' % attr)
+                                              for attr in attrs)
+                                  for obj in objects))
+    unique_ids = tuple(set(pk for pk in flatten(related_object_ids) if pk))
+    related_objects = fetch_model_dict(model, unique_ids, fields)
+
+    # Fill related object caches
+    for (objects, attrs), related_ids in itertools.izip(objects_to_populate,
+                                                        related_object_ids):
+        for obj, related_ids_for_obj in itertools.izip(objects,
+                                                       related_ids):
+            for attr, related_object in itertools.izip(attrs, (related_objects.get(pk, None)
+                                                               for pk in related_ids_for_obj)):
+                setattr(obj, '_%s_cache' % attr, related_object)
+
+def populate_content_object_caches(generic_related_objects, model_fields=None):
+    """
+    Retrieves ``ContentType`` and content objects for the given list of
+    items which use a generic relation, grouping the retrieval of content
+    objects by model to reduce the number of queries executed.
+
+    This results in ``number_of_content_types + 1`` queries rather than
+    the ``number_of_generic_reL_objects * 2`` queries you'd get by
+    iterating over the list and accessing each item's object attribute.
+
+    If a dict mapping model classes to field names is given, only the
+    given fields will be looked up for each model specified and the
+    object cache will be populated with a dict of the specified fields.
+    Otherwise, complete model instances will be retrieved.
+    """
+    if model_fields is None:
+        model_fields = {}
+
+    # Group content object ids by their content type ids
+    ids_by_content_type = {}
+    for obj in generic_related_objects:
+        ids_by_content_type.setdefault(obj.content_type_id,
+                                       []).append(obj.object_id)
+
+    # Retrieve content types and content objects in bulk
+    content_types = ContentType.objects.in_bulk(ids_by_content_type.keys())
+    for content_type_id, ids in ids_by_content_type.iteritems():
+        model = content_types[content_type_id].model_class()
+        objects[content_type_id] = fetch_model_dict(
+            model, tuple(set(ids)), model_fields.get(model, None))
+
+    # Set content types and content objects in the appropriate cache
+    # attributes, so accessing the 'content_type' and 'object' attributes
+    # on each object won't result in further database hits.
+    for obj in generic_related_objects:
+        obj._object_cache = objects[obj.content_type_id][obj.object_id]
+        obj._content_type_cache = content_types[obj.content_type_id]
diff --git a/utils/html.py b/utils/html.py
index 602e1a76..25a74a4a 100644
--- a/utils/html.py
+++ b/utils/html.py
@@ -1,51 +1,51 @@
-"""Utilities for working with HTML."""
-import html5lib
-from html5lib import sanitizer, serializer, tokenizer, treebuilders, treewalkers
-
-class HTMLSanitizerMixin(sanitizer.HTMLSanitizerMixin):
-    acceptable_elements = ('a', 'abbr', 'acronym', 'address', 'b', 'big',
-        'blockquote', 'br', 'caption', 'center', 'cite', 'code', 'col',
-        'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt', 'em', 'font',
-        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'ins', 'kbd',
-        'li', 'ol', 'p', 'pre', 'q', 's', 'samp', 'small', 'span', 'strike',
-        'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead',
-        'tr', 'tt', 'u', 'ul', 'var')
-
-    acceptable_attributes = ('abbr', 'align', 'alt', 'axis', 'border',
-        'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'cite',
-        'cols', 'colspan', 'datetime', 'dir', 'frame', 'headers', 'height',
-        'href', 'hreflang', 'hspace', 'lang', 'longdesc', 'name', 'nohref',
-        'noshade', 'nowrap', 'rel', 'rev', 'rows', 'rowspan', 'rules', 'scope',
-        'span', 'src', 'start', 'summary', 'title', 'type', 'valign', 'vspace',
-        'width')
-
-    allowed_elements = acceptable_elements
-    allowed_attributes = acceptable_attributes
-    allowed_css_properties = ()
-    allowed_css_keywords = ()
-    allowed_svg_properties = ()
-
-class HTMLSanitizer(tokenizer.HTMLTokenizer, HTMLSanitizerMixin):
-    def __init__(self, stream, encoding=None, parseMeta=True, useChardet=True,
-                 lowercaseElementName=True, lowercaseAttrName=True):
-        tokenizer.HTMLTokenizer.__init__(self, stream, encoding, parseMeta,
-                                         useChardet, lowercaseElementName,
-                                         lowercaseAttrName)
-
-    def __iter__(self):
-        for token in tokenizer.HTMLTokenizer.__iter__(self):
-            token = self.sanitize_token(token)
-            if token:
-                yield token
-
-def sanitize_html(html):
-    """Sanitizes an HTML fragment."""
-    p = html5lib.HTMLParser(tokenizer=HTMLSanitizer,
-                            tree=treebuilders.getTreeBuilder("dom"))
-    dom_tree = p.parseFragment(html)
-    walker = treewalkers.getTreeWalker("dom")
-    stream = walker(dom_tree)
-    s = serializer.HTMLSerializer(omit_optional_tags=False,
-                                  quote_attr_values=True)
-    output_generator = s.serialize(stream)
-    return u''.join(output_generator)
+"""Utilities for working with HTML."""
+import html5lib
+from html5lib import sanitizer, serializer, tokenizer, treebuilders, treewalkers
+
+class HTMLSanitizerMixin(sanitizer.HTMLSanitizerMixin):
+    acceptable_elements = ('a', 'abbr', 'acronym', 'address', 'b', 'big',
+        'blockquote', 'br', 'caption', 'center', 'cite', 'code', 'col',
+        'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt', 'em', 'font',
+        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'ins', 'kbd',
+        'li', 'ol', 'p', 'pre', 'q', 's', 'samp', 'small', 'span', 'strike',
+        'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead',
+        'tr', 'tt', 'u', 'ul', 'var')
+
+    acceptable_attributes = ('abbr', 'align', 'alt', 'axis', 'border',
+        'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'cite',
+        'cols', 'colspan', 'datetime', 'dir', 'frame', 'headers', 'height',
+        'href', 'hreflang', 'hspace', 'lang', 'longdesc', 'name', 'nohref',
+        'noshade', 'nowrap', 'rel', 'rev', 'rows', 'rowspan', 'rules', 'scope',
+        'span', 'src', 'start', 'summary', 'title', 'type', 'valign', 'vspace',
+        'width')
+
+    allowed_elements = acceptable_elements
+    allowed_attributes = acceptable_attributes
+    allowed_css_properties = ()
+    allowed_css_keywords = ()
+    allowed_svg_properties = ()
+
+class HTMLSanitizer(tokenizer.HTMLTokenizer, HTMLSanitizerMixin):
+    def __init__(self, stream, encoding=None, parseMeta=True, useChardet=True,
+                 lowercaseElementName=True, lowercaseAttrName=True):
+        tokenizer.HTMLTokenizer.__init__(self, stream, encoding, parseMeta,
+                                         useChardet, lowercaseElementName,
+                                         lowercaseAttrName)
+
+    def __iter__(self):
+        for token in tokenizer.HTMLTokenizer.__iter__(self):
+            token = self.sanitize_token(token)
+            if token:
+                yield token
+
+def sanitize_html(html):
+    """Sanitizes an HTML fragment."""
+    p = html5lib.HTMLParser(tokenizer=HTMLSanitizer,
+                            tree=treebuilders.getTreeBuilder("dom"))
+    dom_tree = p.parseFragment(html)
+    walker = treewalkers.getTreeWalker("dom")
+    stream = walker(dom_tree)
+    s = serializer.HTMLSerializer(omit_optional_tags=False,
+                                  quote_attr_values=True)
+    output_generator = s.serialize(stream)
+    return u''.join(output_generator)
diff --git a/utils/lists.py b/utils/lists.py
index 426d9cd3..bbcfae98 100644
--- a/utils/lists.py
+++ b/utils/lists.py
@@ -1,86 +1,86 @@
-"""Utilities for working with lists and sequences."""
-
-def flatten(x):
-    """
-    Returns a single, flat list which contains all elements retrieved
-    from the sequence and all recursively contained sub-sequences
-    (iterables).
-
-    Examples:
-    >>> [1, 2, [3, 4], (5, 6)]
-    [1, 2, [3, 4], (5, 6)]
-
-    From http://kogs-www.informatik.uni-hamburg.de/~meine/python_tricks
-    """
-    result = []
-    for el in x:
-        if hasattr(el, '__iter__') and not isinstance(el, basestring):
-            result.extend(flatten(el))
-        else:
-            result.append(el)
-    return result
-
-def batch_size(items, size):
-    """
-    Retrieves items in batches of the given size.
-
-    >>> l = range(1, 11)
-    >>> batch_size(l, 3)
-    [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10]]
-    >>> batch_size(l, 5)
-    [[1, 2, 3, 4, 5], [6, 7, 8, 9, 10]]
-    """
-    return [items[i:i+size] for i in xrange(0, len(items), size)]
-
-def batches(items, number):
-    """
-    Retrieves items in the given number of batches.
-
-    >>> l = range(1, 11)
-    >>> batches(l, 1)
-    [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
-    >>> batches(l, 2)
-    [[1, 2, 3, 4, 5], [6, 7, 8, 9, 10]]
-    >>> batches(l, 3)
-    [[1, 2, 3, 4], [5, 6, 7, 8], [9, 10]]
-    >>> batches(l, 4)
-    [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10]]
-    >>> batches(l, 5)
-    [[1, 2], [3, 4], [5, 6], [7, 8], [9, 10]]
-
-    Initial batches will contain as many items as possible in cases where
-    there are not enough items to be distributed evenly.
-
-    >>> batches(l, 6)
-    [[1, 2], [3, 4], [5, 6], [7, 8], [9], [10]]
-    >>> batches(l, 7)
-    [[1, 2], [3, 4], [5, 6], [7], [8], [9], [10]]
-    >>> batches(l, 8)
-    [[1, 2], [3, 4], [5], [6], [7], [8], [9], [10]]
-    >>> batches(l, 9)
-    [[1, 2], [3], [4], [5], [6], [7], [8], [9], [10]]
-    >>> batches(l, 10)
-    [[1], [2], [3], [4], [5], [6], [7], [8], [9], [10]]
-
-    If there are more batches than items, empty batches will be appended
-    to the batch list.
-
-    >>> batches(l, 11)
-    [[1], [2], [3], [4], [5], [6], [7], [8], [9], [10], []]
-    >>> batches(l, 12)
-    [[1], [2], [3], [4], [5], [6], [7], [8], [9], [10], [], []]
-    """
-    div, mod= divmod(len(items), number)
-    if div > 1:
-        if mod:
-            div += 1
-        return batch_size(items, div)
-    else:
-        if not div:
-            return [[item] for item in items] + [[]] * (number - mod)
-        elif div == 1 and not mod:
-            return [[item] for item in items]
-        else:
-            # mod now tells you how many lists of 2 you can fit in
-            return ([items[i*2:(i*2)+2] for i in xrange(0, mod)] +
-                    [[item] for item in items[mod*2:]])
+"""Utilities for working with lists and sequences."""
+
+def flatten(x):
+    """
+    Returns a single, flat list which contains all elements retrieved
+    from the sequence and all recursively contained sub-sequences
+    (iterables).
+
+    Examples:
+    >>> [1, 2, [3, 4], (5, 6)]
+    [1, 2, [3, 4], (5, 6)]
+
+    From http://kogs-www.informatik.uni-hamburg.de/~meine/python_tricks
+    """
+    result = []
+    for el in x:
+        if hasattr(el, '__iter__') and not isinstance(el, basestring):
+            result.extend(flatten(el))
+        else:
+            result.append(el)
+    return result
+
+def batch_size(items, size):
+    """
+    Retrieves items in batches of the given size.
+
+    >>> l = range(1, 11)
+    >>> batch_size(l, 3)
+    [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10]]
+    >>> batch_size(l, 5)
+    [[1, 2, 3, 4, 5], [6, 7, 8, 9, 10]]
+    """
+    return [items[i:i+size] for i in xrange(0, len(items), size)]
+
+def batches(items, number):
+    """
+    Retrieves items in the given number of batches.
+
+    >>> l = range(1, 11)
+    >>> batches(l, 1)
+    [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
+    >>> batches(l, 2)
+    [[1, 2, 3, 4, 5], [6, 7, 8, 9, 10]]
+    >>> batches(l, 3)
+    [[1, 2, 3, 4], [5, 6, 7, 8], [9, 10]]
+    >>> batches(l, 4)
+    [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10]]
+    >>> batches(l, 5)
+    [[1, 2], [3, 4], [5, 6], [7, 8], [9, 10]]
+
+    Initial batches will contain as many items as possible in cases where
+    there are not enough items to be distributed evenly.
+
+    >>> batches(l, 6)
+    [[1, 2], [3, 4], [5, 6], [7, 8], [9], [10]]
+    >>> batches(l, 7)
+    [[1, 2], [3, 4], [5, 6], [7], [8], [9], [10]]
+    >>> batches(l, 8)
+    [[1, 2], [3, 4], [5], [6], [7], [8], [9], [10]]
+    >>> batches(l, 9)
+    [[1, 2], [3], [4], [5], [6], [7], [8], [9], [10]]
+    >>> batches(l, 10)
+    [[1], [2], [3], [4], [5], [6], [7], [8], [9], [10]]
+
+    If there are more batches than items, empty batches will be appended
+    to the batch list.
+
+    >>> batches(l, 11)
+    [[1], [2], [3], [4], [5], [6], [7], [8], [9], [10], []]
+    >>> batches(l, 12)
+    [[1], [2], [3], [4], [5], [6], [7], [8], [9], [10], [], []]
+    """
+    div, mod= divmod(len(items), number)
+    if div > 1:
+        if mod:
+            div += 1
+        return batch_size(items, div)
+    else:
+        if not div:
+            return [[item] for item in items] + [[]] * (number - mod)
+        elif div == 1 and not mod:
+            return [[item] for item in items]
+        else:
+            # mod now tells you how many lists of 2 you can fit in
+            return ([items[i*2:(i*2)+2] for i in xrange(0, mod)] +
+                    [[item] for item in items[mod*2:]])
-- 
cgit v1.2.3-1-g7c22


From 8ddd362a54981c4fa6434792723cdf04a77c6f32 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 4 Aug 2009 23:28:18 -0400
Subject: included changes by Adolfo and Chaitanya and found temporary fix for
 languages, switched files to Unix mode

---
 drop-all-tables.sh                 |   4 ++++
 locale/en/LC_MESSAGES/django.mo    | Bin 0 -> 3214 bytes
 locale/es/LC_MESSAGES/django.mo    | Bin 0 -> 44804 bytes
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 0 -> 36796 bytes
 rmpyc                              |   1 +
 5 files changed, 5 insertions(+)
 create mode 100644 drop-all-tables.sh
 create mode 100644 locale/en/LC_MESSAGES/django.mo
 create mode 100644 locale/es/LC_MESSAGES/django.mo
 create mode 100644 locale/zh_CN/LC_MESSAGES/django.mo
 create mode 100644 rmpyc

diff --git a/drop-all-tables.sh b/drop-all-tables.sh
new file mode 100644
index 00000000..87783b77
--- /dev/null
+++ b/drop-all-tables.sh
@@ -0,0 +1,4 @@
+mysql_username='cnprog'
+mysql_database='cnprog'
+mysqldump -u $mysql_username -p --add-drop-table --no-data $mysql_database | grep ^DROP 
+#| mysql -u[USERNAME] -p[PASSWORD] [DATABASE]
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..a4dd5554
Binary files /dev/null and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..7e934ecf
Binary files /dev/null and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..cfcea03d
Binary files /dev/null and b/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/rmpyc b/rmpyc
new file mode 100644
index 00000000..014575f6
--- /dev/null
+++ b/rmpyc
@@ -0,0 +1 @@
+rm `find . -name '*.pyc'`
-- 
cgit v1.2.3-1-g7c22


From ef8f66ba6c7a22c277c6315df8040365b5684e6c Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 5 Aug 2009 22:50:08 -0400
Subject: added anonymous posting, per-question subscription and fixes by
 Pothers and some more, see development.log

---
 context.py                                     |   35 +-
 development.log                                |   35 +-
 django_authopenid/forms.py                     |   82 +-
 django_authopenid/middleware.py                |    2 +-
 django_authopenid/urls.py                      |    5 +-
 django_authopenid/views.py                     |  208 ++-
 forum/admin.py                                 |    5 +-
 forum/feed.py                                  |   14 +-
 forum/forms.py                                 |   42 +-
 forum/management/commands/once_award_badges.py |    1 +
 forum/models.py                                |  159 ++-
 forum/templatetags/extra_tags.py               |    4 +-
 forum/user.py                                  |    1 -
 forum/views.py                                 |  261 +++-
 locale/en/LC_MESSAGES/django.mo                |  Bin 3214 -> 0 bytes
 locale/en/LC_MESSAGES/django.po                | 1775 ++++++++++++------------
 locale/es/LC_MESSAGES/django.mo                |  Bin 44804 -> 0 bytes
 locale/es/LC_MESSAGES/django.po                | 1329 +++++++++++-------
 locale/zh_CN/LC_MESSAGES/django.mo             |  Bin 36796 -> 0 bytes
 locale/zh_CN/LC_MESSAGES/django.po             |   33 +-
 settings.py                                    |   15 +-
 templates/404.html                             |    2 +-
 templates/500.html                             |    4 +-
 templates/answer_edit.html                     |    2 +-
 templates/answer_edit_tips.html                |    2 +-
 templates/ask.html                             |   52 +-
 templates/authopenid/changeemail.html          |  100 +-
 templates/authopenid/changeopenid.html         |    2 +
 templates/authopenid/changepw.html             |    2 +
 templates/authopenid/complete.html             |   17 +-
 templates/authopenid/confirm_email.txt         |   17 +-
 templates/authopenid/delete.html               |    2 +
 templates/authopenid/failure.html              |    3 +-
 templates/authopenid/sendpw.html               |    2 +
 templates/authopenid/sendpw_email.txt          |   18 +-
 templates/authopenid/settings.html             |    2 +
 templates/authopenid/signin.html               |  124 +-
 templates/authopenid/signup.html               |    2 +
 templates/badge.html                           |    2 +-
 templates/badges.html                          |   15 +-
 templates/base.html                            |   29 +-
 templates/base_content.html                    |   27 +-
 templates/book.html                            |    2 +-
 templates/close.html                           |    2 +-
 templates/content/js/com.cnprog.i18n.js        |    8 +-
 templates/content/js/com.cnprog.post.js        |   23 +-
 templates/content/js/com.cnprog.utils.js       |    2 +-
 templates/content/style/openid.css             |    2 +-
 templates/content/style/style.css              |  212 ++-
 templates/faq.html                             |  223 +--
 templates/footer.html                          |    2 +-
 templates/header.html                          |   37 +-
 templates/index.html                           |   10 +-
 templates/logout.html                          |    4 +-
 templates/pagesize.html                        |    2 +
 templates/question.html                        |   21 +-
 templates/question_edit.html                   |    2 +-
 templates/question_retag.html                  |   25 +-
 templates/questions.html                       |   28 +-
 templates/revisions_answer.html                |    2 +-
 templates/revisions_question.html              |    3 +-
 templates/unanswered.html                      |    2 +-
 templates/user.html                            |    6 +-
 templates/user_edit.html                       |    2 +-
 templates/user_favorites.html                  |    2 +-
 templates/user_info.html                       |    2 +
 templates/user_preferences.html                |   15 +-
 templates/user_recent.html                     |    2 +-
 templates/user_reputation.html                 |    2 +-
 templates/user_responses.html                  |    2 +-
 templates/user_stats.html                      |    2 +-
 templates/user_tabs.html                       |    2 -
 templates/user_votes.html                      |    2 +-
 urls.py                                        |    3 +
 74 files changed, 3131 insertions(+), 1955 deletions(-)
 delete mode 100644 locale/en/LC_MESSAGES/django.mo
 delete mode 100644 locale/es/LC_MESSAGES/django.mo
 delete mode 100644 locale/zh_CN/LC_MESSAGES/django.mo

diff --git a/context.py b/context.py
index f420b154..c068332c 100644
--- a/context.py
+++ b/context.py
@@ -1,9 +1,40 @@
 from django.conf import settings
 def application_settings(context):
-    return {
+    my_settings = {
         'APP_TITLE' : settings.APP_TITLE,
         'APP_URL'   : settings.APP_URL,
         'APP_KEYWORDS' : settings.APP_KEYWORDS,
         'APP_DESCRIPTION' : settings.APP_DESCRIPTION,
-        'APP_INTRO' : settings.APP_INTRO
+        'APP_INTRO' : settings.APP_INTRO,
+        'EMAIL_VALIDATION': settings.EMAIL_VALIDATION,
+        'LANGUAGE_CODE': settings.LANGUAGE_CODE,
+        'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE,
+        'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY,
         }
+    return {'settings':my_settings}
+
+def auth_processor(request):
+    """
+    Returns context variables required by apps that use Django's authentication
+    system.
+
+    If there is no 'user' attribute in the request, uses AnonymousUser (from
+    django.contrib.auth).
+    """
+    if hasattr(request, 'user'):
+        user = request.user
+        if user.is_authenticated():
+            messages = user.message_set.all()
+        else:
+            messages = None
+    else:
+        from django.contrib.auth.models import AnonymousUser
+        user = AnonymousUser()
+        messages = None
+
+    from django.core.context_processors import PermWrapper
+    return {
+        'user': user,
+        'messages': messages,
+        'perms': PermWrapper(user),
+    }
diff --git a/development.log b/development.log
index 6b96f8f5..5310f70b 100644
--- a/development.log
+++ b/development.log
@@ -1,4 +1,37 @@
-# development 
+==Aug 5, 2009 Evgeny==
+===Interface changes===
+Merged in my code that:
+* allows anonymous posting of Q&A and then login
+* per-question email notifications via 'send_email_alerts' command
+* allows space character in username
+* improves openid login
+* makes notification messages sticky - have to click "x" to dismiss
+* unanswered questions are now those with no accepted answer
+* added following setting parameters:
+
+settings.MIN_USERNAME_LENGTH = 1 
+settings.EMAIL_UNIQUE = True|False
+settings.EMAIL_VALIDATION = 'on'|'off' #thought of maybe adding other options so type is string
+settings.GOOGLE_SITEMAP_CODE = <string>
+settings.GOOGLE_ANALYTICS_KEY = <string>
+
+===Fixes===
+* fixed incorrect answer count issue in question.html
+* translated Twittwer stuff in user_preferences.html
+* translated question_retag.html, except one phrase
+* added Adolfo's python2.4 fix
+* fixed template debugging comments so that they don't break page layout
+* reorganized header template so that it takes less vertical space
+
+===Code changes===
+* wrapped template context settings into a single settings dictionary
+* on login anonymous session is recorded so that anonymously posted questions (if any) could be found later
+* added models: AnonymousQuestion, AnonymousAnswer, EmailFeed (for notifications)
+* User model has two new fields email_key - 32 byte hex hash and email_isvalid - boolean
+  file sql_scripts/update_2009_07_05_EF.sql will make upgrade to the live database
+* added auth_processor to context.py which loads notification messages without deleting them
+  NOTE: default django auth processor must be removed!
+* added ajax actions questionSubscribeUpdates/questionUnsubscribeUpdates
 
 ==Aug 4 2009, Evgeny==
 ===Changes===
diff --git a/django_authopenid/forms.py b/django_authopenid/forms.py
index 09fa76b1..690a781f 100644
--- a/django_authopenid/forms.py
+++ b/django_authopenid/forms.py
@@ -158,7 +158,7 @@ class OpenidRegisterForm(forms.Form):
                 raise forms.ValidationError(_('invalid user name'))
             if self.cleaned_data['username'] in RESERVED_NAMES:
                 raise forms.ValidationError(_('sorry, this name can not be used, please try another'))
-            if len(self.cleaned_data['username']) < 3:
+            if len(self.cleaned_data['username']) < settings.MIN_USERNAME_LENGTH:
                 raise forms.ValidationError(_('username too short'))
             try:
                 user = User.objects.get(
@@ -171,19 +171,22 @@ class OpenidRegisterForm(forms.Form):
             raise forms.ValidationError(_('this name is already in use - please try anoter'))
             
     def clean_email(self):
-        """For security reason one unique email in database"""
+        """Optionally, for security reason one unique email in database"""
         if 'email' in self.cleaned_data:
-            try:
-                user = User.objects.get(email = self.cleaned_data['email'])
-            except User.DoesNotExist:
+            if settings.EMAIL_UNIQUE == True:
+                    try:
+                        user = User.objects.get(email = self.cleaned_data['email'])
+                    except User.DoesNotExist:
+                        return self.cleaned_data['email']
+                    except User.MultipleObjectsReturned:
+                        raise forms.ValidationError(u'There is already more than one \
+                            account registered with that e-mail address. Please try \
+                            another.')
+                    raise forms.ValidationError(_("This email is already \
+                        registered in our database. Please choose another."))
+            else:
                 return self.cleaned_data['email']
-            except User.MultipleObjectsReturned:
-                raise forms.ValidationError(u'There is already more than one \
-                    account registered with that e-mail address. Please try \
-                    another.')
-            raise forms.ValidationError(_("This email is already \
-                registered in our database. Please choose another."))
- 
+        #what if not???
     
 class OpenidVerifyForm(forms.Form):
     """ openid verify form (associate an openid with an account) """
@@ -204,8 +207,7 @@ class OpenidVerifyForm(forms.Form):
         """ validate username """
         if 'username' in self.cleaned_data:
             if not username_re.search(self.cleaned_data['username']):
-                raise forms.ValidationError(_("Usernames can only contain \
-                    letters, numbers and underscores"))
+                raise forms.ValidationError(_('invalid user name'))
             try:
                 user = User.objects.get(
                         username__exact = self.cleaned_data['username']
@@ -241,7 +243,7 @@ class OpenidVerifyForm(forms.Form):
 
 
 attrs_dict = { 'class': 'required' }
-username_re = re.compile(r'^\w+$')
+username_re = re.compile(r'^[\w ]+$')
 
 class RegistrationForm(forms.Form):
     """ legacy registration form """
@@ -286,17 +288,20 @@ class RegistrationForm(forms.Form):
         """ validate if email exist in database
         :return: raise error if it exist """
         if 'email' in self.cleaned_data:
-            try:
-                user = User.objects.get(email = self.cleaned_data['email'])
-            except User.DoesNotExist:
+            if settings.EMAIL_UNIQUE == True:
+                try:
+                    user = User.objects.get(email = self.cleaned_data['email'])
+                except User.DoesNotExist:
+                    return self.cleaned_data['email']
+                except User.MultipleObjectsReturned:
+                    raise forms.ValidationError(u'There is already more than one \
+                        account registered with that e-mail address. Please try \
+                        another.')
+                raise forms.ValidationError(u'This email is already registered \
+                        in our database. Please choose another.')
+            else:
                 return self.cleaned_data['email']
-            except User.MultipleObjectsReturned:
-                raise forms.ValidationError(u'There is already more than one \
-                    account registered with that e-mail address. Please try \
-                    another.')
-            raise forms.ValidationError(u'This email is already registered \
-                    in our database. Please choose another.')
-        return self.cleaned_data['email']
+        #what if not?
     
     def clean_password2(self):
         """
@@ -361,18 +366,21 @@ class ChangeemailForm(forms.Form):
     def clean_email(self):
         """ check if email don't exist """
         if 'email' in self.cleaned_data:
-            if self.user.email != self.cleaned_data['email']:
-                try:
-                    user = User.objects.get(email = self.cleaned_data['email'])
-                except User.DoesNotExist:
-                    return self.cleaned_data['email']
-                except User.MultipleObjectsReturned:
-                    raise forms.ValidationError(u'There is already more than one \
-                        account registered with that e-mail address. Please try \
-                        another.')
-                raise forms.ValidationError(u'This email is already registered \
-                    in our database. Please choose another.')
-        return self.cleaned_data['email']
+            if settings.EMAIL_UNIQUE == True:
+                if self.user.email != self.cleaned_data['email']:
+                    try:
+                        user = User.objects.get(email = self.cleaned_data['email'])
+                    except User.DoesNotExist:
+                        return self.cleaned_data['email']
+                    except User.MultipleObjectsReturned:
+                        raise forms.ValidationError(u'There is already more than one \
+                            account registered with that e-mail address. Please try \
+                            another.')
+                    raise forms.ValidationError(u'This email is already registered \
+                        in our database. Please choose another.')
+            else:
+                return self.cleaned_data['email']
+        #what if not?
         
 
     def clean_password(self):
diff --git a/django_authopenid/middleware.py b/django_authopenid/middleware.py
index c0572c6e..2900d54c 100644
--- a/django_authopenid/middleware.py
+++ b/django_authopenid/middleware.py
@@ -21,4 +21,4 @@ class OpenIDMiddleware(object):
                 mimeparse.best_match(['text/html', 'application/xrds+xml'], 
                     request.META['HTTP_ACCEPT']) == 'application/xrds+xml':
             return HttpResponseRedirect(reverse('yadis_xrdf'))
-        return response
\ No newline at end of file
+        return response
diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py
index 1ab65941..6843e5c0 100644
--- a/django_authopenid/urls.py
+++ b/django_authopenid/urls.py
@@ -7,6 +7,8 @@ urlpatterns = patterns('django_authopenid.views',
     url(r'^yadis.xrdf$', 'xrdf', name='yadis_xrdf'),
      # manage account registration
     url(r'^%s$' % _('signin/'), 'signin', name='user_signin'),
+    url(r'^%s%s$' % (_('signin/'),_('newquestion/')), 'signin', kwargs = {'newquestion':True}),
+    url(r'^%s%s$' % (_('signin/'),_('newanswer/')), 'signin', kwargs = {'newanswer':True}),
     url(r'^%s$' % _('signout/'), 'signout', name='user_signout'),
     url(r'^%s%s$' % (_('signin/'), _('complete/')), 'complete_signin', 
         name='user_complete_signin'),
@@ -21,7 +23,8 @@ urlpatterns = patterns('django_authopenid.views',
     # manage account settings
     #url(r'^$', 'account_settings', name='user_account_settings'),
     #url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'),
-    #url(r'^%s$' % _('email/'), 'changeemail', name='user_changeemail'),
+    url(r'^%s$' % 'email/', 'changeemail', name='user_changeemail',kwargs = {'action':'change'}),
+    url(r'^%s%s$' % ('email/','validate/'), 'changeemail', name='user_changeemail',kwargs = {'action':'validate'}),
     #url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'),
     url(r'^%s$' % _('delete/'), 'delete', name='user_delete'),
 )
diff --git a/django_authopenid/views.py b/django_authopenid/views.py
index a9072c12..1cb8928b 100644
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -30,12 +30,12 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from django.http import HttpResponseRedirect, get_host
+from django.http import HttpResponseRedirect, get_host, Http404
 from django.shortcuts import render_to_response as render
 from django.template import RequestContext, loader, Context
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.contrib.auth import login, logout
+from django.contrib.auth import logout #for login I've added wrapper below - called login
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
 from django.utils.encoding import smart_unicode
@@ -44,6 +44,7 @@ from django.utils.translation import ugettext as _
 from django.contrib.sites.models import Site
 from django.utils.http import urlquote_plus
 from django.core.mail import send_mail
+from django.views.defaults import server_error
 
 from openid.consumer.consumer import Consumer, \
     SUCCESS, CANCEL, FAILURE, SETUP_NEEDED
@@ -65,6 +66,16 @@ from django_authopenid.forms import OpenidSigninForm, OpenidAuthForm, OpenidRegi
         OpenidVerifyForm, RegistrationForm, ChangepwForm, ChangeemailForm, \
         ChangeopenidForm, DeleteForm, EmailPasswordForm
 
+def login(request,user):
+    from django.contrib.auth import login as _login
+    from forum.models import user_logged_in #custom signal
+    #1) get old session key
+    session_key = request.session.session_key
+    #2) login and get new session key
+    _login(request,user)
+    #3) send signal with old session key as argument
+    user_logged_in.send(user=user,session_key=session_key,sender=None)
+
 def get_url_host(request):
     if request.is_secure():
         protocol = 'https'
@@ -76,8 +87,6 @@ def get_url_host(request):
 def get_full_url(request):
     return get_url_host(request) + request.get_full_path()
 
-
-
 def ask_openid(request, openid_url, redirect_to, on_failure=None,
         sreg_request=None):
     """ basic function to ask openid and return response """
@@ -96,7 +105,7 @@ def ask_openid(request, openid_url, redirect_to, on_failure=None,
     try:
         auth_request = consumer.begin(openid_url)
     except DiscoveryFailure:
-        msg = _(u"非法OpenID地址： %s" % openid_url)
+        msg = _(u"OpenID %(openid_url)s is invalid" % {'openid_url':openid_url})
         return on_failure(request, msg)
 
     if sreg_request:
@@ -113,7 +122,6 @@ def complete(request, on_success=None, on_failure=None, return_to=None):
     # make sure params are encoded in utf8
     params = dict((k,smart_unicode(v)) for k, v in request.GET.items())
     openid_response = consumer.complete(params, return_to)
-            
     
     if openid_response.status == SUCCESS:
         return on_success(request, openid_response.identity_url,
@@ -150,7 +158,7 @@ def not_authenticated(func):
     return decorated
 
 @not_authenticated
-def signin(request):
+def signin(request,newquestion=False,newanswer=False):
     """
     signin page. It manage the legacy authentification (user/password) 
     and authentification with openid.
@@ -168,7 +176,7 @@ def signin(request):
     
     if request.POST:   
         
-        if 'bsignin' in request.POST.keys():
+        if 'bsignin' in request.POST.keys() or 'openid_username' in request.POST.keys():
 
             form_signin = OpenidSigninForm(request.POST)
             if form_signin.is_valid():
@@ -179,7 +187,6 @@ def signin(request):
                         reverse('user_complete_signin'), 
                         urllib.urlencode({'next':next})
                 )
-
                 return ask_openid(request, 
                         form_signin.cleaned_data['openid_url'], 
                         redirect_to, 
@@ -195,8 +202,24 @@ def signin(request):
                 next = clean_next(form_auth.cleaned_data.get('next'))
                 return HttpResponseRedirect(next)
 
+    question = None
+    if newquestion == True:
+        from forum.models import AnonymousQuestion as AQ
+        session_key = request.session.session_key
+        qlist = AQ.objects.filter(session_key=session_key).order_by('-added_at')
+        if len(qlist) > 0:
+            question = qlist[0]
+    answer = None
+    if newanswer == True:
+        from forum.models import AnonymousAnswer as AA
+        session_key = request.session.session_key
+        alist = AA.objects.filter(session_key=session_key).order_by('-added_at')
+        if len(alist) > 0:
+            answer = alist[0]
 
     return render('authopenid/signin.html', {
+        'question':question,
+        'answer':answer,
         'form1': form_auth,
         'form2': form_signin,
         'msg':  request.GET.get('msg',''),
@@ -220,7 +243,7 @@ def signin_success(request, identity_url, openid_response):
     if openid isn't registered user is redirected to register page.
     """
 
-    openid_ = from_openid_response(openid_response)
+    openid_ = from_openid_response(openid_response) #create janrain OpenID object
     request.session['openid'] = openid_
     try:
         rel = UserAssociation.objects.get(openid_url__exact = str(openid_))
@@ -278,7 +301,8 @@ def register(request):
         'next': next,
         'username': nickname,
     })
-    
+
+    user_ = None
     if request.POST:
         just_completed = False
         if 'bnewaccount' in request.POST.keys():
@@ -309,14 +333,41 @@ def register(request):
                         user_id=user_.id)
                 uassoc.save()
                 login(request, user_)
+
+        #check if we need to post a question that was added anonymously
+        #this needs to be a function call becase this is also done
+        #if user just logged in and did not need to create the new account
         
-        # redirect, can redirect only if forms are valid.
-        if is_redirect:
-            return HttpResponseRedirect(next) 
+        if user_ != None and settings.EMAIL_VALIDATION == 'on':
+            send_new_email_key(user_,nomessage=True)
+            output = validation_email_sent(request)
+            set_email_validation_message(user_) #message set after generating view
+            return output
+        elif user_.is_authenticated():
+            return HttpResponseRedirect('/')
+        else:
+            raise server_error('')
     
+    openid_str = str(openid_)
+    bits = openid_str.split('/')
+    base_url = bits[2] #assume this is base url
+    url_bits = base_url.split('.')
+    provider_name = url_bits[-2].lower()
+
+    providers = {'yahoo':'<font color="purple">Yahoo!</font>',
+                'flickr':'<font color="#0063dc">flick</font><font color="#ff0084">r</font>&trade;',
+                'google':'Google&trade;',
+                'aol':'<font color="#31658e">AOL</font>',
+                }
+    if provider_name not in providers:
+        provider_logo = provider_name
+    else:
+        provider_logo = providers[provider_name]
+
     return render('authopenid/complete.html', {
         'form1': form1,
         'form2': form2,
+        'provider':providers[provider_name],
         'nickname': nickname,
         'email': email
     }, context_instance=RequestContext(request))
@@ -464,47 +515,158 @@ def changepw(request):
     return render('authopenid/changepw.html', {'form': form },
                                 context_instance=RequestContext(request))
 
+def find_email_validation_messages(user):
+    msg_text = _('your email needs to be validated')
+    return user.message_set.filter(message__exact=msg_text)
+
+def set_email_validation_message(user):
+    messages = find_email_validation_messages(user)
+    msg_text = _('your email needs to be validated')
+    if len(messages) == 0:
+        user.message_set.create(message=msg_text)
+
+def clear_email_validation_message(user):
+    messages = find_email_validation_messages(user)
+    messages.delete()
+
+def set_new_email(user, new_email, nomessage=False):
+    if new_email != user.email:
+        user.email = new_email
+        user.email_isvalid = False
+        user.save()
+        if settings.EMAIL_VALIDATION == 'on':
+            send_new_email_key(user,nomessage=nomessage)
+
+def _send_email_key(user):
+    """private function. sends email containing validation key
+    to user's email address
+    """
+    subject = _("Welcome")
+    message_template = loader.get_template('authopenid/email_validation.txt')
+    import settings
+    message_context = Context({
+    'validation_link': '%s/email/verify/%d/%s/' % (settings.APP_URL ,user.id,user.email_key)
+    })
+    message = message_template.render(message_context)
+    send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user.email])
+
+def send_new_email_key(user,nomessage=False):
+    import random
+    random.seed()
+    user.email_key = '%032x' % random.getrandbits(128) 
+    user.save()
+    _send_email_key(user)
+    if nomessage==False:
+        set_email_validation_message(user)
+
+@login_required
+def send_email_key(request):
+    """
+    url = /email/sendkey/
+
+    view that is shown right after sending email key
+    email sending is called internally
+
+    raises 404 if email validation is off
+    if current email is valid shows 'key_not_sent' view of 
+    authopenid/changeemail.html template
+    """
+
+    if settings.EMAIL_VALIDATION != 'off':
+        if request.user.email_isvalid:
+            return render('authopenid/changeemail.html',
+                            { 'email': request.user.email, 
+                              'action_type': 'key_not_sent', 
+                              'change_link': reverse('user_changeemail')},
+                              context_instance=RequestContext(request)
+                              )
+        else:
+            _send_email_key(request.user)
+            return validation_email_sent(request)
+    else:
+        raise Http404
+   
+
+#internal server view used as return value by other views
+def validation_email_sent(request):
+    return render('authopenid/changeemail.html',
+                    { 'email': request.user.email, 'action_type': 'validate', }, 
+                     context_instance=RequestContext(request))
+
+
+def verifyemail(request,id=None,key=None):
+    """
+    view that is shown when user clicks email validation link
+    url = /email/verify/{{user.id}}/{{user.email_key}}/
+    """
+    if settings.EMAIL_VALIDATION != 'off':
+        user = User.objects.get(id=id)
+        if user:
+            if user.email_key == key:
+                user.email_isvalid = True
+                clear_email_validation_message(user)
+                user.save()
+                return render('authopenid/changeemail.html', {
+                    'action_type': 'validation_complete',
+                    }, context_instance=RequestContext(request))
+    raise Http404
+
 @login_required
 def changeemail(request):
     """ 
     changeemail view. It require password or openid to allow change.
 
-    url: /changeemail/
+    url: /email/*
 
     template : authopenid/changeemail.html
     """
     msg = request.GET.get('msg', '')
     extension_args = {}
     user_ = request.user
-    
+
     redirect_to = get_url_host(request) + reverse('user_changeemail')
+    action = 'change'
 
     if request.POST:
         form = ChangeemailForm(request.POST, user=user_)
         if form.is_valid():
             if not form.test_openid:
-                user_.email = form.cleaned_data['email']
-                user_.save()
-                msg = _("Email changed.") 
-                redirect = "%s?msg=%s" % (reverse('user_account_settings'),
-                        urlquote_plus(msg))
-                return HttpResponseRedirect(redirect)
+                new_email = form.cleaned_data['email']
+                if new_email != user_.email:
+                    if settings.EMAIL_VALIDATION == 'on':
+                        action = 'validate'
+                    else:
+                        action = 'done_novalidate'
+                    set_new_email(user_, new_email,nomessage=True)
+                else:
+                    action = 'keep'
             else:
+                #what does this branch do?
+                return server_error('')
                 request.session['new_email'] = form.cleaned_data['email']
                 return ask_openid(request, form.cleaned_data['password'], 
                         redirect_to, on_failure=emailopenid_failure)    
+
     elif not request.POST and 'openid.mode' in request.GET:
         return complete(request, emailopenid_success, 
                 emailopenid_failure, redirect_to) 
     else:
         form = ChangeemailForm(initial={'email': user_.email},
                 user=user_)
+
     
-    return render('authopenid/changeemail.html', {
+    output = render('authopenid/changeemail.html', {
         'form': form,
+        'email': user_.email,
+        'action_type': action,
         'msg': msg 
         }, context_instance=RequestContext(request))
 
+    if action == 'validate':
+        set_email_validation_message(user_)
+
+    return output
+
 
 def emailopenid_success(request, identity_url, openid_response):
     openid_ = from_openid_response(openid_response)
diff --git a/forum/admin.py b/forum/admin.py
index 438a99e7..482da048 100644
--- a/forum/admin.py
+++ b/forum/admin.py
@@ -4,6 +4,9 @@ from django.contrib import admin
 from models import *
 
 
+class AnonymousQuestionAdmin(admin.ModelAdmin):
+    """AnonymousQuestion admin class"""
+
 class QuestionAdmin(admin.ModelAdmin):
     """Question admin class"""
 
@@ -68,4 +71,4 @@ admin.site.register(Repute, ReputeAdmin)
 admin.site.register(Activity, ActivityAdmin)
 admin.site.register(Book, BookAdmin)
 admin.site.register(BookAuthorInfo, BookAuthorInfoAdmin)
-admin.site.register(BookAuthorRss, BookAuthorRssAdmin)
\ No newline at end of file
+admin.site.register(BookAuthorRss, BookAuthorRssAdmin)
diff --git a/forum/feed.py b/forum/feed.py
index 6374ba71..373f8a87 100644
--- a/forum/feed.py
+++ b/forum/feed.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python
 #encoding:utf-8
 #-------------------------------------------------------------------------------
 # Name:        Syndication feed class for subsribtion
@@ -13,16 +13,16 @@
 from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
 from django.utils.translation import ugettext as _
 from models import Question
+import settings
 class RssLastestQuestionsFeed(Feed):
-    title = _('site title') + _(' - ') + _('site slogan') + _(' - ')+ _('latest questions')
-	#EDIT!!!
-    link = 'http://where.com/questions/'
-    description = _('meta site content')
+    title = settings.APP_TITLE + _(' - ')+ _('latest questions')
+    link = settings.APP_URL + '/' + _('questions/')
+    description = settings.APP_DESCRIPTION
     #ttl = 10
-    copyright = _('copyright message')
+    copyright = settings.APP_COPYRIGHT
 
     def item_link(self, item):
-        return '/questions/%s/' % item.id
+        return self.link + '%s/' % item.id
 
     def item_author_name(self, item):
         return item.author.username
diff --git a/forum/forms.py b/forum/forms.py
index 9d866720..59d0d620 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -43,7 +43,8 @@ class TagNamesField(forms.CharField):
         self.widget = forms.TextInput(attrs={'size' : 50, 'autocomplete' : 'off'})
         self.max_length = 255
         self.label  = _('tags')
-        self.help_text = _('please use space to separate tags (this enables autocomplete feature)')
+        #self.help_text = _('please use space to separate tags (this enables autocomplete feature)')
+        self.help_text = _('Tags are short keywords, with no spaces within. Up to five tags can be used.')
         self.initial = ''
 
 	def clean(self, value):
@@ -74,6 +75,10 @@ class WikiField(forms.BooleanField):
         self.label  = _('community wiki')
         self.help_text = _('if you choose community wiki option, the question and answer do not generate points and name of author will not be shown')
 
+class EmailNotifyField(forms.BooleanField):
+    def __init__(self, *args, **kwargs):
+        super(EmailNotifyField, self).__init__(*args, **kwargs)
+        self.required = False
 
 class SummaryField(forms.CharField):
     def __init__(self, *args, **kwargs):
@@ -94,18 +99,28 @@ class AskForm(forms.Form):
     user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
     email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
 
-
-
 class AnswerForm(forms.Form):
     text   = EditorField()
     wiki   = WikiField()
     openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))
     user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
     email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    def __init__(self, question, *args, **kwargs):
+    email_notify = EmailNotifyField()
+    def __init__(self, question, user, *args, **kwargs):
         super(AnswerForm, self).__init__(*args, **kwargs)
+        self.fields['email_notify'].widget.attrs['id'] = 'question-subscribe-updates';
         if question.wiki:
             self.fields['wiki'].initial = True
+        if user.is_authenticated():
+            try:
+                feed = EmailFeed.objects.get(feed_id=question.id, subscriber_id=user.id)
+                if feed.subscriber == user and feed.content == question:
+                    self.fields['email_notify'].initial = True
+                    return
+            except EmailFeed.DoesNotExist:
+                pass
+        self.fields['email_notify'].initial = False
+
 
 class CloseForm(forms.Form):
     reason = forms.ChoiceField(choices=CLOSE_REASONS)
@@ -181,13 +196,14 @@ class EditUserForm(forms.Form):
     def clean_email(self):
         """For security reason one unique email in database"""
         if self.user.email != self.cleaned_data['email']:
-            if 'email' in self.cleaned_data:
-                try:
-                    user = User.objects.get(email = self.cleaned_data['email'])
-                except User.DoesNotExist:
-                    return self.cleaned_data['email']
-                except User.MultipleObjectsReturned:
+            #todo dry it, there is a similar thing in openidauth
+            if settings.EMAIL_UNIQUE == True:
+                if 'email' in self.cleaned_data:
+                    try:
+                        user = User.objects.get(email = self.cleaned_data['email'])
+                    except User.DoesNotExist:
+                        return self.cleaned_data['email']
+                    except User.MultipleObjectsReturned:
+                        raise forms.ValidationError(_('this email has already been registered, please use another one'))
                     raise forms.ValidationError(_('this email has already been registered, please use another one'))
-                raise forms.ValidationError(_('this email has already been registered, please use another one'))
-        else:
-            return self.cleaned_data['email']
+        return self.cleaned_data['email']
diff --git a/forum/management/commands/once_award_badges.py b/forum/management/commands/once_award_badges.py
index 447e8971..03982c79 100644
--- a/forum/management/commands/once_award_badges.py
+++ b/forum/management/commands/once_award_badges.py
@@ -12,6 +12,7 @@
 # Licence:     GPL V2
 #-------------------------------------------------------------------------------
 
+from datetime import datetime, date
 from django.db import connection
 from django.shortcuts import get_object_or_404
 from django.contrib.contenttypes.models import ContentType
diff --git a/forum/models.py b/forum/models.py
index b966ccb0..a6cb1697 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -12,16 +12,40 @@ from django.template.defaultfilters import slugify
 from django.db.models.signals import post_delete, post_save, pre_save
 from django.utils.translation import ugettext as _
 import django.dispatch
+import settings
 
 from forum.managers import *
 from const import *
 
+class EmailFeed(models.Model):
+    #subscription key for unsubscribe by visiting emailed link
+    key = models.CharField(max_length=32)
+    #generic relation with feed content (i.e. question or tags)
+    feed_content_type = models.ForeignKey(ContentType,related_name='content_emailfeed')
+    feed_id = models.PositiveIntegerField()
+    content = generic.GenericForeignKey('feed_content_type','feed_id')
+    #generic relation with owner - either nameless email or User
+    subscriber_content_type = models.ForeignKey(ContentType,related_name='subscriber_emailfeed')
+    subscriber_id = models.PositiveIntegerField()
+    subscriber = generic.GenericForeignKey('subscriber_content_type','subscriber_id')
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    reported_at = models.DateTimeField(default=datetime.datetime.now)
+
+    #getter functions rely on implementations of similar functions in content
+    #of subscriber objects
+    def get_update_summary(self):
+        return self.content.get_update_summary(last_reported_at = self.reported_at,recipient_email = self.get_email())
+
+    def get_email(self):
+        return self.subscriber.email
+
 class Tag(models.Model):
     name       = models.CharField(max_length=255, unique=True)
     created_by = models.ForeignKey(User, related_name='created_tags')
     deleted         = models.BooleanField(default=False)
     deleted_at      = models.DateTimeField(null=True, blank=True)
     deleted_by      = models.ForeignKey(User, null=True, blank=True, related_name='deleted_tags')
+    email_feeds     = generic.GenericRelation(EmailFeed)
     # Denormalised data
     used_count = models.PositiveIntegerField(default=0)
 
@@ -131,6 +155,7 @@ class Question(models.Model):
     comments             = generic.GenericRelation(Comment)
     votes                = generic.GenericRelation(Vote)
     flagged_items        = generic.GenericRelation(FlaggedItem)
+    email_feeds          = generic.GenericRelation(EmailFeed)
 
     objects = QuestionManager()
 
@@ -173,7 +198,10 @@ class Question(models.Model):
             attr = CONST['deleted']
         else:
             attr = None
-        return u'%s %s' % (self.title, attr) if attr is not None else self.title
+        if attr is not None:
+            return u'%s %s' % (self.title, attr)
+        else:
+            return self.title
 
     def get_revision_url(self):
         return reverse('question_revisions', args=[self.id])
@@ -181,6 +209,57 @@ class Question(models.Model):
     def get_latest_revision(self):
         return self.revisions.all()[0]
 
+    def get_update_summary(self,last_reported_at=None,recipient_email=''):
+        edited = False 
+        if self.last_edited_at and self.last_edited_at > last_reported_at:
+            if self.last_edited_by.email != recipient_email:
+                edited = True 
+        comments = []
+        for comment in self.comments.all():
+            if comment.added_at > last_reported_at and comment.user.email != recipient_email:
+                comments.append(comment)
+        new_answers = []
+        answer_comments = []
+        modified_answers = []
+        for answer in self.answers.all():
+            if (answer.added_at > last_reported_at):
+                new_answers.append(answer)
+            if (answer.last_edited_at 
+                and answer.last_edited_at > last_reported_at 
+                and answer.last_edited_by.email != recipient_email):
+                modified_answers.append(answer)
+            for comment in answer.comments.all():
+                if comment.added_at > last_reported_at and comment.user.email != recipient_email:
+                    answer_comments.append(comment)
+        if edited or comments or new_answers or modified_answers or answer_comments:
+            import sets
+            out = [] 
+            if edited:
+                out.append(_('%(author)s modified the question') % {'author':self.last_edited_by.username})
+            if new_answers:
+                names = sets.Set(map(lambda x: x.author.username,new_answers))
+                people = ', '.join(names)
+                out.append(_('%(people)s posted %(new_answer_count)s new answers') \
+                                % {'new_answer_count':len(new_answers),'people':people})
+            if comments:
+                names = sets.Set(map(lambda x: x.user.username,comments))
+                people = ', '.join(names)
+                out.append(_('%(people)s commented the question') % {'people':people})
+            if answer_comments:
+                names = sets.Set(map(lambda x: x.user.username,answer_comments))
+                people = ', '.join(names)
+                if len(answer_comments) > 1:
+                    out.append(_('%(people)s commented answers') % {'people':people})
+                else:
+                    out.append(_('%(people)s commented the answer') % {'people':people})
+            url = settings.APP_URL + self.get_absolute_url()
+            retval = '<a href="%s">%s</a>:<br>\n' % (url,self.title)
+            out = map(lambda x: '<li>' + x + '</li>',out)
+            retval += '<ul>' + '\n'.join(out) + '</ul><br>\n'
+            return retval
+        else:
+            return None
+
     def __unicode__(self):
         return self.title
 
@@ -219,6 +298,44 @@ class QuestionRevision(models.Model):
     def __unicode__(self):
         return u'revision %s of %s' % (self.revision, self.title)
 
+class AnonymousAnswer(models.Model):
+    question = models.ForeignKey(Question, related_name='anonymous_answers')
+    session_key = models.CharField(max_length=40)  #session id for anonymous questions
+    wiki = models.BooleanField(default=False)
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    ip_addr = models.IPAddressField(max_length=21) #allow high port numbers
+    author = models.ForeignKey(User,null=True)
+    text = models.TextField()
+    summary = models.CharField(max_length=180)
+
+    def publish(self,user):
+        from forum.views import create_new_answer
+        added_at = datetime.datetime.now()
+        print user.id
+        create_new_answer(question=self.question,wiki=self.wiki,
+                            added_at=added_at,text=self.text,
+                            author=user)
+        self.delete()
+
+class AnonymousQuestion(models.Model):
+    title = models.CharField(max_length=300)
+    session_key = models.CharField(max_length=40)  #session id for anonymous questions
+    text = models.TextField()
+    summary = models.CharField(max_length=180)
+    tagnames = models.CharField(max_length=125)
+    wiki = models.BooleanField(default=False)
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    ip_addr = models.IPAddressField(max_length=21) #allow high port numbers
+    author = models.ForeignKey(User,null=True)
+
+    def publish(self,user):
+        from forum.views import create_new_question
+        added_at = datetime.datetime.now()
+        create_new_question(title=self.title, author=user, added_at=added_at,
+                                wiki=self.wiki, tagnames=self.tagnames,
+                                summary=self.summary, text=self.text)
+        self.delete()
+
 class Answer(models.Model):
     question = models.ForeignKey(Question, related_name='answers')
     author   = models.ForeignKey(User, related_name='answers')
@@ -447,6 +564,13 @@ class BookAuthorRss(models.Model):
     class Meta:
         db_table = u'book_author_rss'
 
+class AnonymousEmail(models.Model):
+    #validation key, if used
+    key = models.CharField(max_length=32)
+    email = models.EmailField(null=False,unique=True)
+    isvalid = models.BooleanField(default=False)
+    feeds = generic.GenericRelation(EmailFeed)
+
 # User extend properties
 QUESTIONS_PER_PAGE_CHOICES = (
    (10, u'10'),
@@ -454,8 +578,11 @@ QUESTIONS_PER_PAGE_CHOICES = (
    (50, u'50'),
 )
 
+User.add_to_class('email_isvalid', models.BooleanField(default=False))
+User.add_to_class('email_key', models.CharField(max_length=16, null=True))
 User.add_to_class('reputation', models.PositiveIntegerField(default=1))
 User.add_to_class('gravatar', models.CharField(max_length=32))
+User.add_to_class('email_feeds', generic.GenericRelation(EmailFeed))
 User.add_to_class('favorite_questions',
                   models.ManyToManyField(Question, through=FavoriteQuestion,
                                          related_name='favorited_by'))
@@ -480,11 +607,14 @@ edit_question_or_answer = django.dispatch.Signal(providing_args=["instance", "mo
 delete_post_or_answer = django.dispatch.Signal(providing_args=["instance", "deleted_by"])
 mark_offensive = django.dispatch.Signal(providing_args=["instance", "mark_by"])
 user_updated = django.dispatch.Signal(providing_args=["instance", "updated_by"])
+user_logged_in = django.dispatch.Signal(providing_args=["session"])
+
+
 def get_messages(self):
-        messages = []
-        for m in self.message_set.all():
-            messages.append(m.message)
-        return messages
+    messages = []
+    for m in self.message_set.all():
+        messages.append(m.message)
+    return messages
 
 def delete_messages(self):
     self.message_set.all().delete()
@@ -632,6 +762,24 @@ def record_user_full_updated(instance, **kwargs):
     activity = Activity(user=instance, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_USER_FULL_UPDATED)
     activity.save()
 
+def post_stored_anonymous_content(sender,user,session_key,signal,*args,**kwargs):
+    aq_list = AnonymousQuestion.objects.filter(session_key = session_key)
+    aa_list = AnonymousAnswer.objects.filter(session_key = session_key)
+    import settings
+    if settings.EMAIL_VALIDATION == 'on':#add user to the record
+        for aq in aq_list:
+            aq.author = user
+            aq.save()
+        for aa in aa_list:
+            aa.author = user
+            aa.save()
+        #maybe add pending posts message?
+    else: #just publish the questions
+        for aq in aq_list:
+            aq.publish(user)
+        for aa in aa_list:
+            aa.publish(user)
+
 #signal for User modle save changes
 pre_save.connect(calculate_gravatar_hash, sender=User)
 post_save.connect(record_ask_event, sender=Question)
@@ -652,3 +800,4 @@ mark_offensive.connect(record_mark_offensive, sender=Answer)
 tags_updated.connect(record_update_tags, sender=Question)
 post_save.connect(record_favorite_question, sender=FavoriteQuestion)
 user_updated.connect(record_user_full_updated, sender=User)
+user_logged_in.connect(post_stored_anonymous_content)
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index 6c826771..ac4e6ca3 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -1,4 +1,4 @@
-import time
+import time
 import datetime
 import math
 import re
@@ -237,4 +237,4 @@ def get_latest_changed_timestamp():
         timestr = strftime("%H:%M %b-%d-%Y %Z", localtime(latest))
     except:
         timestr = ''
-    return timestr
\ No newline at end of file
+    return timestr
diff --git a/forum/user.py b/forum/user.py
index ed4494d6..41811db9 100644
--- a/forum/user.py
+++ b/forum/user.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from django.utils.translation import ugettext as _
 class UserView:
     def __init__(self, id, tab_title, tab_description, page_title, view_name, template_file, data_size=0):
diff --git a/forum/views.py b/forum/views.py
index 2c61d41e..98ecda11 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -168,46 +168,140 @@ def questions(request, tagname=None, unanswered=False):
             'pagesize' : pagesize
         }}, context_instance=RequestContext(request))
 
+def create_new_answer( question=None, author=None,\
+            added_at=None, wiki=False,\
+            text='', email_notify=False):
+
+    html = sanitize_html(markdowner.convert(text))
+
+    #create answer
+    answer = Answer(
+        question = question,
+        author = author,
+        added_at = added_at,
+        wiki = wiki,
+        html = html
+    )
+    if answer.wiki:
+        answer.last_edited_by = answer.author
+        answer.last_edited_at = added_at 
+        answer.wikified_at = added_at 
+
+    answer.save()
+
+    #update question data
+    question.last_activity_at = added_at 
+    question.last_activity_by = author 
+    question.save()
+    Question.objects.update_answer_count(question)
+
+    #update revision
+    AnswerRevision.objects.create(
+        answer     = answer,
+        revision   = 1,
+        author     = author,
+        revised_at = added_at,
+        summary    = CONST['default_version'],
+        text       = text
+    )
+
+    #set notification/delete
+    if email_notify:
+        try:
+            EmailFeed.objects.get(feed_id = question.id, subscriber_id = author.id, feed_content_type=question_type)
+        except EmailFeed.DoesNotExist:
+            feed = EmailFeed(content = question, subscriber = author)
+            feed.save()
+    else:
+        #not sure if this is necessary. ajax should take care of this...
+        try:
+            feed = Email.objects.get(feed_id = question.id, subscriber_id = author.id, feed_content_type=question_type)
+            feed.delete()
+        except:
+            pass
+
+def create_new_question(title=None,author=None,added_at=None,
+                        wiki=False,tagnames=None,summary=None,
+                        text=None):
+    """this is not a view
+    and maybe should become one of the methods on Question object?
+    """
+    html = sanitize_html(markdowner.convert(text))
+    question = Question(
+        title            = title,
+        author           = author, 
+        added_at         = added_at,
+        last_activity_at = added_at,
+        last_activity_by = author,
+        wiki             = wiki,
+        tagnames         = tagnames,
+        html             = html,
+        summary          = summary 
+    )
+    if question.wiki:
+        question.last_edited_by = question.author
+        question.last_edited_at = added_at
+        question.wikified_at = added_at
+
+    question.save()
+
+    # create the first revision
+    QuestionRevision.objects.create(
+        question   = question,
+        revision   = 1,
+        title      = question.title,
+        author     = author,
+        revised_at = added_at,
+        tagnames   = question.tagnames,
+        summary    = CONST['default_version'],
+        text       = text
+    )
+    return question
+
 #TODO: allow anynomus user to ask question by providing email and username.
-@login_required
+#@login_required
 def ask(request):
     if request.method == "POST":
         form = AskForm(request.POST)
         if form.is_valid():
-            added_at = datetime.datetime.now()
-            html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
-            question = Question(
-                title            = strip_tags(form.cleaned_data['title']),
-                author           = request.user,
-                added_at         = added_at,
-                last_activity_at = added_at,
-                last_activity_by = request.user,
-                wiki             = form.cleaned_data['wiki'],
-                tagnames         = form.cleaned_data['tags'].strip(),
-                html             = html,
-                summary          = strip_tags(html)[:120]
-            )
-            if question.wiki:
-                question.last_edited_by = question.author
-                question.last_edited_at = added_at
-                question.wikified_at = added_at
-
-            question.save()
 
-            # create the first revision
-            QuestionRevision.objects.create(
-                question   = question,
-                revision   = 1,
-                title      = question.title,
-                author     = request.user,
-                revised_at = added_at,
-                tagnames   = question.tagnames,
-                summary    = CONST['default_version'],
-                text       = form.cleaned_data['text']
-            )
+            added_at = datetime.datetime.now()
+            title = strip_tags(form.cleaned_data['title'])
+            wiki = form.cleaned_data['wiki']
+            tagnames = form.cleaned_data['tags'].strip()
+            text = form.cleaned_data['text']
+            html = sanitize_html(markdowner.convert(text))
+            summary = strip_tags(html)[:120]
 
-            return HttpResponseRedirect(question.get_absolute_url())
+            if request.user.is_authenticated():
+                author = request.user 
+
+                question = create_new_question(
+                    title            = title,
+                    author           = author, 
+                    added_at         = added_at,
+                    wiki             = wiki,
+                    tagnames         = tagnames,
+                    summary          = summary,
+                    text = text
+                )
 
+                return HttpResponseRedirect(question.get_absolute_url())
+            else:
+                request.session.flush()
+                session_key = request.session.session_key
+                question = AnonymousQuestion(
+                    session_key = session_key,
+                    title       = title,
+                    tagnames = tagnames,
+                    wiki = wiki,
+                    text = text,
+                    summary = summary,
+                    added_at = added_at,
+					ip_addr = request.META['REMOTE_ADDR'],
+                )
+                question.save()
+                return HttpResponseRedirect('%s%s%s' % ( _('/account/'),_('signin/'),('newquestion/')))
     else:
         form = AskForm()
 
@@ -233,7 +327,7 @@ def question(request, id):
     question = get_object_or_404(Question, id=id)
     if question.deleted and not can_view_deleted_post(request.user, question):
         raise Http404
-    answer_form = AnswerForm(question)
+    answer_form = AnswerForm(question,request.user)
     answers = Answer.objects.get_answers_from_question(question, request.user)
     answers = answers.select_related(depth=1)
 
@@ -254,7 +348,16 @@ def question(request, id):
 
     if answers is not None:
         answers = answers.order_by("-accepted", orderby)
-    objects_list = Paginator(answers, ANSWERS_PAGE_SIZE)
+
+    filtered_answers = []
+    for answer in answers:
+        if answer.deleted == True:
+            if answer.author_id == request.user.id:
+                filtered_answers.append(answer)
+        else:
+            filtered_answers.append(answer)
+
+    objects_list = Paginator(filtered_answers, ANSWERS_PAGE_SIZE)
     page_objects = objects_list.page(page)
     # update view count
     Question.objects.update_view_count(question)
@@ -558,42 +661,38 @@ def answer_revisions(request, id):
         'revisions': revisions,
     }, context_instance=RequestContext(request))
 
-#TODO: allow anynomus
-@login_required
 def answer(request, id):
     question = get_object_or_404(Question, id=id)
     if request.method == "POST":
-        form = AnswerForm(question, request.POST)
+        form = AnswerForm(question, request.user, request.POST)
         if form.is_valid():
+            wiki = form.cleaned_data['wiki']
+            text = form.cleaned_data['text']
             update_time = datetime.datetime.now()
-            answer = Answer(
-                question = question,
-                author = request.user,
-                added_at = update_time,
-                wiki = form.cleaned_data['wiki'],
-                html = sanitize_html(markdowner.convert(form.cleaned_data['text'])),
-            )
-            if answer.wiki:
-                answer.last_edited_by = answer.author
-                answer.last_edited_at = update_time
-                answer.wikified_at = update_time
 
-            answer.save()
-            Question.objects.update_answer_count(question)
-
-            question = get_object_or_404(Question, id=id)
-            question.last_activity_at = update_time
-            question.last_activity_by = request.user
-            question.save()
-
-            AnswerRevision.objects.create(
-                answer     = answer,
-                revision   = 1,
-                author     = request.user,
-                revised_at = update_time,
-                summary    = CONST['default_version'],
-                text       = form.cleaned_data['text']
-            )
+            if request.user.is_authenticated():
+                create_new_answer(
+                        question=question,
+                        author=request.user,
+                        added_at=update_time,
+                        wiki=wiki,
+                        text=text,
+                        email_notify=form.cleaned_data['email_notify']
+                    )
+            else:
+                request.session.flush()
+                html = sanitize_html(markdowner.convert(text))
+                summary = strip_tags(html)[:120]
+                anon = AnonymousAnswer(
+                    question = question,
+                    wiki = wiki,
+                    text = text,
+                    summary = summary,
+                    session_key = request.session.session_key,
+                    ip_addr = request.META['REMOTE_ADDR'],
+                    )
+                anon.save()
+                return HttpResponseRedirect('/account/signin/newanswer')
 
     return HttpResponseRedirect(question.get_absolute_url())
 
@@ -655,6 +754,7 @@ def vote(request, id):
         offensiveAnswer:8,
         removeQuestion: 9,
         removeAnswer:10
+        questionSubscribeUpdates:11
 
     accept answer code:
         response_data['allowed'] = -1, Accept his own answer   0, no allowed - Anonymous    1, Allowed - by default
@@ -831,6 +931,31 @@ def vote(request, id):
                 else:
                     onDeleted(post, request.user)
                     delete_post_or_answer.send(sender=post.__class__, instance=post, delete_by=request.user)
+            elif vote_type == '11':#subscribe q updates
+                user = request.user
+                if user.is_authenticated():
+                    try:
+                        EmailFeed.objects.get(feed_id=question.id,subscriber_id=user.id,feed_content_type=question_type)
+                    except EmailFeed.DoesNotExist:
+                        feed = EmailFeed(subscriber=user,content=question)
+                        feed.save()
+                        if settings.EMAIL_VALIDATION == 'on' and user.email_isvalid == False:
+                            response_data['message'] = _('subscription saved, %(email)s needs validation') % {'email':user.email}
+                    #response_data['status'] = 1
+                    #responst_data['allowed'] = 1
+                else:
+                    pass
+                    #response_data['status'] = 0
+                    #response_data['allowed'] = 0
+            elif vote_type == '12':#unsubscribe q updates
+                user = request.user
+                if user.is_authenticated():
+                    try:
+                        feed = EmailFeed.objects.get(feed_id=question.id,subscriber_id=user.id)
+                        feed.delete()
+                    except EmailFeed.DoesNotExist:
+                        pass
+                    
         else:
             response_data['success'] = 0
             response_data['message'] = u'Request mode is not supported. Please try again.'
@@ -905,7 +1030,11 @@ def edit_user(request, id):
     if request.method == "POST":
         form = EditUserForm(user, request.POST)
         if form.is_valid():
-            user.email = sanitize_html(form.cleaned_data['email'])
+            new_email = sanitize_html(form.cleaned_data['email'])
+
+            from django_authopenid.views import set_new_email
+            set_new_email(user, new_email)
+
             user.real_name = sanitize_html(form.cleaned_data['realname'])
             user.website = sanitize_html(form.cleaned_data['website'])
             user.location = sanitize_html(form.cleaned_data['city'])
@@ -1498,7 +1627,6 @@ def user_reputation(request, user_id, user_view):
 
     reputation.query.group_by = ['question_id']
 
-
     rep_list = []
     for rep in Repute.objects.filter(user=user).order_by('reputed_at'):
         dic = '[%s,%s]' % (calendar.timegm(rep.reputed_at.timetuple()) * 1000, rep.reputation)
@@ -1683,7 +1811,6 @@ def read_message(request):
     if request.method == "POST":
         if request.POST['formdata'] == 'required':
             request.session['message_silent'] = 1
-
             if request.user.is_authenticated():
                 request.user.delete_messages()
     return HttpResponse('')
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
deleted file mode 100644
index a4dd5554..00000000
Binary files a/locale/en/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index c4c1e674..cc42454c 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-22 20:40-0400\n"
+"POT-Creation-Date: 2009-08-05 22:26-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,19 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:32
+#: settings.py:12
 msgid "account/"
 msgstr ""
 
-#: settings.py:32 django_authopenid/urls.py:9 django_authopenid/urls.py:11
+#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:10
+#: django_authopenid/urls.py:11 django_authopenid/urls.py:13
+#: forum/views.py:304 templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr ""
 
-#: django_authopenid/forms.py:67 django_authopenid/views.py:93
+#: django_authopenid/forms.py:67 django_authopenid/views.py:102
 msgid "i-names are not supported"
 msgstr ""
 
-#: django_authopenid/forms.py:102 django_authopenid/forms.py:207
+#: django_authopenid/forms.py:102
 msgid ""
 "Usernames can only contain                     letters, numbers and "
 "underscores"
@@ -40,19 +42,19 @@ msgid ""
 "choose another."
 msgstr ""
 
-#: django_authopenid/forms.py:126 django_authopenid/forms.py:231
+#: django_authopenid/forms.py:126 django_authopenid/forms.py:233
 msgid ""
 "Please enter a valid                     username and password. Note that "
 "both fields are                     case-sensitive."
 msgstr ""
 
-#: django_authopenid/forms.py:130 django_authopenid/forms.py:235
+#: django_authopenid/forms.py:130 django_authopenid/forms.py:237
 msgid "This account is inactive."
 msgstr ""
 
-#: django_authopenid/forms.py:158
+#: django_authopenid/forms.py:158 django_authopenid/forms.py:210
 msgid "invalid user name"
-msgstr ""
+msgstr "User names can contain letters, underscore and empty space."
 
 #: django_authopenid/forms.py:160
 msgid "sorry, this name can not be used, please try another"
@@ -66,137 +68,147 @@ msgstr ""
 msgid "this name is already in use - please try anoter"
 msgstr ""
 
-#: django_authopenid/forms.py:184
+#: django_authopenid/forms.py:185
 msgid ""
-"This email is already                 registered in our database. Please "
-"choose another."
+"This email is already                         registered in our database. "
+"Please choose another."
 msgstr ""
 
-#: django_authopenid/forms.py:214
+#: django_authopenid/forms.py:216
 msgid ""
 "This username don't exist.                         Please choose another."
 msgstr ""
 
-#: django_authopenid/forms.py:253
+#: django_authopenid/forms.py:255
 msgid "choose a username"
 msgstr ""
 
-#: django_authopenid/forms.py:255 templates/authopenid/signup.html:36
+#: django_authopenid/forms.py:257 templates/authopenid/signup.html:38
 msgid "your email address"
 msgstr ""
 
-#: django_authopenid/forms.py:257 templates/authopenid/signup.html:37
+#: django_authopenid/forms.py:259 templates/authopenid/signup.html:39
 msgid "choose password"
 msgstr ""
 
-#: django_authopenid/forms.py:259 templates/authopenid/signup.html:38
+#: django_authopenid/forms.py:261 templates/authopenid/signup.html:40
 msgid "retype password"
 msgstr ""
 
-#: django_authopenid/forms.py:330
+#: django_authopenid/forms.py:335
 msgid ""
 "Old password is incorrect.                     Please enter the correct "
 "password."
 msgstr ""
 
-#: django_authopenid/forms.py:342
+#: django_authopenid/forms.py:347
 msgid "new passwords do not match"
 msgstr ""
 
-#: django_authopenid/forms.py:434
+#: django_authopenid/forms.py:442
 msgid "Incorrect username."
 msgstr ""
 
 #: django_authopenid/urls.py:10
-msgid "signout/"
+msgid "newquestion/"
 msgstr ""
 
 #: django_authopenid/urls.py:11
-msgid "complete/"
+msgid "newanswer/"
+msgstr ""
+
+#: django_authopenid/urls.py:12
+msgid "signout/"
 msgstr ""
 
 #: django_authopenid/urls.py:13
+msgid "complete/"
+msgstr ""
+
+#: django_authopenid/urls.py:15
 msgid "register/"
 msgstr ""
 
-#: django_authopenid/urls.py:14
+#: django_authopenid/urls.py:16
 msgid "signup/"
 msgstr ""
 
-#: django_authopenid/urls.py:16
+#: django_authopenid/urls.py:18
 msgid "sendpw/"
 msgstr ""
 
-#: django_authopenid/urls.py:26
+#: django_authopenid/urls.py:29
 msgid "delete/"
 msgstr ""
 
-#: django_authopenid/views.py:99
+#: django_authopenid/views.py:108
 #, python-format
-msgid "非法OpenID地址： %s"
+msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:366
+#: django_authopenid/views.py:417 django_authopenid/views.py:544
 msgid "Welcome"
-msgstr ""
+msgstr "Verification Email from NMR Wiki Q&A"
 
-#: django_authopenid/views.py:456
+#: django_authopenid/views.py:507
 msgid "Password changed."
 msgstr ""
 
-#: django_authopenid/views.py:488
-msgid "Email changed."
+#: django_authopenid/views.py:519 django_authopenid/views.py:524
+msgid "your email needs to be validated"
 msgstr ""
+"Your email needs to be validated. Please see details <a "
+"id='validate_email_alert' href=\"/faq#validate\">here</a>."
 
-#: django_authopenid/views.py:519 django_authopenid/views.py:671
+#: django_authopenid/views.py:681 django_authopenid/views.py:833
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr ""
 
-#: django_authopenid/views.py:523 django_authopenid/views.py:678
+#: django_authopenid/views.py:685 django_authopenid/views.py:840
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr ""
 
-#: django_authopenid/views.py:531
+#: django_authopenid/views.py:693
 msgid "Email Changed."
 msgstr ""
 
-#: django_authopenid/views.py:606
+#: django_authopenid/views.py:768
 msgid "This OpenID is already associated with another account."
 msgstr ""
 
-#: django_authopenid/views.py:611
+#: django_authopenid/views.py:773
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr ""
 
-#: django_authopenid/views.py:681
+#: django_authopenid/views.py:843
 msgid "Account deleted."
 msgstr ""
 
-#: django_authopenid/views.py:721
+#: django_authopenid/views.py:883
 msgid "Request for new password"
 msgstr ""
 
-#: django_authopenid/views.py:734
+#: django_authopenid/views.py:896
 msgid "A new password has been sent to your email address."
 msgstr ""
 
-#: django_authopenid/views.py:764
+#: django_authopenid/views.py:926
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
 "registered."
 msgstr ""
 
-#: django_authopenid/views.py:773
+#: django_authopenid/views.py:935
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
 msgstr ""
 
-#: django_authopenid/views.py:782
+#: django_authopenid/views.py:944
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr ""
@@ -237,7 +249,7 @@ msgstr ""
 msgid "question"
 msgstr ""
 
-#: forum/const.py:57 templates/book.html:110 templates/backup/book.html:110
+#: forum/const.py:57 templates/book.html:110
 msgid "answer"
 msgstr ""
 
@@ -259,7 +271,7 @@ msgstr ""
 
 #: forum/const.py:62
 msgid "received award"
-msgstr ""
+msgstr "received badge"
 
 #: forum/const.py:63
 msgid "marked best answer"
@@ -317,43 +329,21 @@ msgstr ""
 msgid "retagged"
 msgstr ""
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-#: templates/faq.html:25 templates/faq.html.py:108
-#: templates/backup/base.html:7 templates/backup/base_content.html:6
-#: templates/backup/faq.html:25 templates/backup/faq.html.py:108
-#: templates/tough/faq.html:23 templates/tough/faq.html.py:106
-#: templates/tough/question_retag.html:89
-msgid "site title"
-msgstr ""
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid " - "
 msgstr ""
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-#: templates/backup/base.html:7 templates/backup/base_content.html:6
-msgid "site slogan"
-msgstr ""
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid "latest questions"
 msgstr ""
 
-#: forum/feed.py:19 templates/index.html:8 templates/backup/index.html:8
-msgid "meta site content"
-msgstr ""
-
-#: forum/feed.py:21
-msgid "copyright message"
+#: forum/feed.py:19
+msgid "questions/"
 msgstr ""
 
 #: forum/forms.py:14 templates/answer_edit_tips.html:34
-#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31
 #: templates/question_edit_tips.html:36
-#: templates/backup/answer_edit_tips.html:33
-#: templates/backup/answer_edit_tips.html:38
-#: templates/backup/question_edit_tips.html:29
-#: templates/backup/question_edit_tips.html:34
 msgid "title"
 msgstr ""
 
@@ -374,108 +364,125 @@ msgid "question content must be > 10 characters"
 msgstr ""
 
 #: forum/forms.py:45 templates/header.html:30 templates/header.html.py:61
-#: templates/backup/header.html:30 templates/backup/header.html.py:59
 msgid "tags"
 msgstr ""
 
-#: forum/forms.py:46
-msgid "please use space to separate tags (this enables autocomplete feature)"
+#: forum/forms.py:47
+msgid ""
+"Tags are short keywords, with no spaces within. Up to five tags can be used."
 msgstr ""
 
-#: forum/forms.py:53
+#: forum/forms.py:54 templates/question_retag.html:38
 msgid "tags are required"
 msgstr ""
 
-#: forum/forms.py:57
+#: forum/forms.py:58
 msgid "please use 5 tags or less"
 msgstr ""
 
-#: forum/forms.py:60
+#: forum/forms.py:61
 msgid "tags must be shorter than 20 characters"
 msgstr ""
 
-#: forum/forms.py:64
+#: forum/forms.py:65
 msgid ""
 "please use following characters in tags: letters 'a-z', numbers, and "
 "characters '.-_#'"
 msgstr ""
 
-#: forum/forms.py:74 templates/index.html:56 templates/question.html:196
-#: templates/question.html.py:377 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:199
+#: templates/question.html.py:380 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
-#: templates/unanswered.html.py:60 templates/backup/index.html:56
-#: templates/backup/question.html:195 templates/backup/question.html.py:367
-#: templates/backup/questions.html:57 templates/backup/questions.html.py:69
-#: templates/backup/unanswered.html:47 templates/backup/unanswered.html:59
-#: templates/tough/unanswered.html:46 templates/tough/unanswered.html.py:58
+#: templates/unanswered.html.py:60
 msgid "community wiki"
 msgstr ""
 
-#: forum/forms.py:75
+#: forum/forms.py:76
 msgid ""
 "if you choose community wiki option, the question and answer do not generate "
 "points and name of author will not be shown"
 msgstr ""
 
-#: forum/forms.py:84
+#: forum/forms.py:89
 msgid "update summary:"
 msgstr ""
 
-#: forum/forms.py:85
+#: forum/forms.py:90
 msgid ""
 "enter a brief summary of your revision (e.g. fixed spelling, grammar, "
 "improved style, this field is optional)"
 msgstr ""
 
-#: forum/forms.py:160
+#: forum/forms.py:175
 msgid "this email does not have to be linked to gravatar"
 msgstr ""
 
-#: forum/forms.py:161
+#: forum/forms.py:176
 msgid "Real name"
 msgstr ""
 
-#: forum/forms.py:162
+#: forum/forms.py:177
 msgid "Website"
 msgstr ""
 
-#: forum/forms.py:163
+#: forum/forms.py:178
 msgid "Location"
 msgstr ""
 
-#: forum/forms.py:164
+#: forum/forms.py:179
 msgid "Date of birth"
 msgstr ""
 
-#: forum/forms.py:164
+#: forum/forms.py:179
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr ""
 
-#: forum/forms.py:165 templates/authopenid/settings.html:20
+#: forum/forms.py:180 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr ""
 
-#: forum/forms.py:190 forum/forms.py:191
+#: forum/forms.py:207 forum/forms.py:208
 msgid "this email has already been registered, please use another one"
 msgstr ""
 
-#: forum/models.py:316 templates/badges.html:52
-#: templates/backup/badges.html:52
+#: forum/models.py:238
+#, python-format
+msgid "%(author)s modified the question"
+msgstr ""
+
+#: forum/models.py:242
+#, python-format
+msgid "%(people)s posted %(new_answer_count)s new answers"
+msgstr ""
+
+#: forum/models.py:247
+#, python-format
+msgid "%(people)s commented the question"
+msgstr ""
+
+#: forum/models.py:252
+#, python-format
+msgid "%(people)s commented answers"
+msgstr ""
+
+#: forum/models.py:254
+#, python-format
+msgid "%(people)s commented the answer"
+msgstr ""
+
+#: forum/models.py:433 templates/badges.html:52
 msgid "gold"
 msgstr ""
 
-#: forum/models.py:317 templates/badges.html:62
-#: templates/backup/badges.html:62
+#: forum/models.py:434 templates/badges.html:60
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:318 templates/badges.html:70
-#: templates/backup/badges.html:70
+#: forum/models.py:435 templates/badges.html:67
 msgid "bronze"
 msgstr ""
 
 #: forum/user.py:16 templates/user_tabs.html:7
-#: templates/backup/user_tabs.html:6
 msgid "overview"
 msgstr ""
 
@@ -488,7 +495,6 @@ msgid "user profile overview"
 msgstr ""
 
 #: forum/user.py:24 templates/user_tabs.html:9
-#: templates/backup/user_tabs.html:8
 msgid "recent activity"
 msgstr ""
 
@@ -501,12 +507,10 @@ msgid "profile - recent activity"
 msgstr ""
 
 #: forum/user.py:33 templates/user_tabs.html:13
-#: templates/backup/user_tabs.html:12
 msgid "responses"
 msgstr ""
 
 #: forum/user.py:34 templates/user_tabs.html:12
-#: templates/backup/user_tabs.html:11
 msgid "comments and answers to others questions"
 msgstr ""
 
@@ -515,7 +519,6 @@ msgid "profile - responses"
 msgstr ""
 
 #: forum/user.py:42 templates/user_info.html:23 templates/users.html:26
-#: templates/backup/user_info.html:22 templates/backup/users.html:25
 msgid "reputation"
 msgstr ""
 
@@ -540,12 +543,10 @@ msgid "profile - favorite questions"
 msgstr ""
 
 #: forum/user.py:59 templates/user_tabs.html:20
-#: templates/backup/user_tabs.html:19
 msgid "casted votes"
 msgstr "votes"
 
 #: forum/user.py:60 templates/user_tabs.html:20
-#: templates/backup/user_tabs.html:19
 msgid "user vote record"
 msgstr ""
 
@@ -557,8 +558,7 @@ msgstr ""
 msgid "preferences"
 msgstr ""
 
-#: forum/user.py:69 templates/user_tabs.html:28
-#: templates/backup/user_tabs.html:27
+#: forum/user.py:69 templates/user_tabs.html:27
 msgid "user preference settings"
 msgstr ""
 
@@ -566,27 +566,42 @@ msgstr ""
 msgid "profile - user preferences"
 msgstr ""
 
-#: forum/views.py:1730
+#: forum/views.py:304
+msgid "/account/"
+msgstr ""
+
+#: forum/views.py:943
+#, python-format
+msgid "subscription saved, %(email)s needs validation"
+msgstr ""
+"Your subscription is saved, but email address %(email)s needs to be "
+"validated, please see <a href='/faq#validate'>more details here</a>"
+
+#: forum/views.py:1853
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr ""
 
-#: forum/views.py:1732
+#: forum/views.py:1855
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1734
+#: forum/views.py:1857
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1736
+#: forum/views.py:1859
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
 msgstr ""
 
+#: forum/management/commands/send_email_alerts.py:35
+msgid "updates from website"
+msgstr ""
+
 #: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168
-#: templates/header.html:33 templates/backup/header.html:33
+#: templates/header.html:33
 msgid "badges"
 msgstr ""
 
@@ -598,140 +613,121 @@ msgstr ""
 msgid " ago"
 msgstr ""
 
-#: templates/404.html:24 templates/backup/404.html:24
+#: templates/404.html:24
 msgid "Sorry, could not find the page you requested."
 msgstr ""
 
-#: templates/404.html:26 templates/backup/404.html:26
+#: templates/404.html:26
 msgid "This might have happened for the following reasons:"
 msgstr ""
 
-#: templates/404.html:28 templates/backup/404.html:28
+#: templates/404.html:28
 msgid "this question or answer has been deleted;"
 msgstr ""
 
-#: templates/404.html:29 templates/backup/404.html:29
+#: templates/404.html:29
 msgid "url has error - please check it;"
 msgstr ""
 
-#: templates/404.html:30 templates/backup/404.html:30
+#: templates/404.html:30
 msgid ""
 "the page you tried to visit is protected or you don't have sufficient "
 "points, see"
 msgstr ""
 
-#: templates/404.html:31 templates/backup/404.html:31
+#: templates/404.html:31
 msgid "if you believe this error 404 should not have occured, please"
 msgstr ""
 
-#: templates/404.html:32 templates/backup/404.html:32
+#: templates/404.html:32
 msgid "report this problem"
 msgstr ""
 
-#: templates/404.html:41 templates/500.html:27 templates/backup/404.html:41
-#: templates/backup/500.html:27
+#: templates/404.html:41 templates/500.html:27
 msgid "back to previous page"
 msgstr ""
 
-#: templates/404.html:42 templates/backup/404.html:42
+#: templates/404.html:42
 msgid "see all questions"
 msgstr ""
 
-#: templates/404.html:43 templates/backup/404.html:43
+#: templates/404.html:43
 msgid "see all tags"
 msgstr ""
 
-#: templates/500.html:24 templates/backup/500.html:24
+#: templates/500.html:22
+msgid "sorry, system error"
+msgstr ""
+
+#: templates/500.html:24
 msgid "system error log is recorded, error will be fixed as soon as possible"
 msgstr ""
 
-#: templates/500.html:25 templates/backup/500.html:25
+#: templates/500.html:25
 msgid "please report the error to the site administrators if you wish"
 msgstr ""
 
-#: templates/500.html:28 templates/backup/500.html:28
+#: templates/500.html:28
 msgid "see latest questions"
 msgstr ""
 
-#: templates/500.html:29 templates/backup/500.html:29
+#: templates/500.html:29
 msgid "see tags"
 msgstr ""
 
 #: templates/about.html:6 templates/about.html.py:11
-#: templates/backup/about.html:6 templates/backup/about.html.py:11
 msgid "About"
 msgstr ""
 
 #: templates/answer_edit.html:4 templates/answer_edit.html.py:47
-#: templates/backup/answer_edit.html:3 templates/backup/answer_edit.html:46
 msgid "Edit answer"
 msgstr ""
 
 #: templates/answer_edit.html:24 templates/answer_edit.html.py:27
-#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:37
-#: templates/question.html.py:40 templates/question_edit.html:27
-#: templates/backup/answer_edit.html:23 templates/backup/answer_edit.html:26
-#: templates/backup/ask.html:24 templates/backup/ask.html.py:27
-#: templates/backup/question.html:36 templates/backup/question.html.py:39
-#: templates/backup/question_edit.html:25
+#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40
+#: templates/question.html.py:43 templates/question_edit.html:27
 msgid "hide preview"
 msgstr ""
 
 #: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:40 templates/question_edit.html:27
-#: templates/backup/answer_edit.html:26 templates/backup/ask.html:27
-#: templates/backup/question.html:39 templates/backup/question_edit.html:25
+#: templates/question.html:43 templates/question_edit.html:27
 msgid "show preview"
 msgstr ""
 
 #: templates/answer_edit.html:47 templates/question_edit.html:65
-#: templates/revisions_answer.html:36 templates/revisions_question.html:36
-#: templates/backup/answer_edit.html:46 templates/backup/question_edit.html:63
-#: templates/backup/revisions_answer.html:35
-#: templates/backup/revisions_question.html:34
-#: templates/tough/question_retag.html:51
+#: templates/question_retag.html:52 templates/revisions_answer.html:36
+#: templates/revisions_question.html:36
 msgid "back"
 msgstr ""
 
 #: templates/answer_edit.html:52 templates/question_edit.html:70
 #: templates/revisions_answer.html:47 templates/revisions_question.html:47
-#: templates/backup/answer_edit.html:51 templates/backup/question_edit.html:68
-#: templates/backup/revisions_answer.html:46
-#: templates/backup/revisions_question.html:45
 msgid "revision"
 msgstr ""
 
 #: templates/answer_edit.html:55 templates/question_edit.html:74
-#: templates/backup/answer_edit.html:54 templates/backup/question_edit.html:72
 msgid "select revision"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:81
-#: templates/question.html:447 templates/question_edit.html:91
-#: templates/backup/answer_edit.html:61 templates/backup/ask.html:80
-#: templates/backup/question.html:437 templates/backup/question_edit.html:89
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 templates/question_edit.html:91
 msgid "Toggle the real time Markdown editor preview"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:81
-#: templates/question.html:447 templates/question_edit.html:91
-#: templates/backup/answer_edit.html:61 templates/backup/ask.html:80
-#: templates/backup/question.html:437 templates/backup/question_edit.html:89
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr ""
 
 #: templates/answer_edit.html:73 templates/question_edit.html:119
-#: templates/backup/answer_edit.html:72
-#: templates/backup/question_edit.html:117
+#: templates/question_retag.html:75
 msgid "Save edit"
 msgstr ""
 
 #: templates/answer_edit.html:74 templates/close.html:29
-#: templates/question_edit.html:120 templates/reopen.html:30
-#: templates/user_edit.html:83 templates/backup/answer_edit.html:73
-#: templates/backup/close.html:29 templates/backup/question_edit.html:118
-#: templates/backup/reopen.html:28 templates/backup/user_edit.html:81
-#: templates/tough/question_retag.html:75
+#: templates/question_edit.html:120 templates/question_retag.html:76
+#: templates/reopen.html:30 templates/user_edit.html:83
+#: templates/authopenid/changeemail.html:34
 msgid "Cancel"
 msgstr ""
 
@@ -739,726 +735,613 @@ msgstr ""
 msgid "answer tips"
 msgstr "Tips"
 
-#: templates/answer_edit_tips.html:7 templates/backup/answer_edit_tips.html:6
+#: templates/answer_edit_tips.html:7
 msgid "please make your answer relevant to this community"
 msgstr ""
 
-#: templates/answer_edit_tips.html:10 templates/backup/answer_edit_tips.html:9
+#: templates/answer_edit_tips.html:10
 msgid "try to give an answer, rather than engage into a discussion"
 msgstr ""
 
 #: templates/answer_edit_tips.html:13
-#: templates/backup/answer_edit_tips.html:12
 msgid "please try to provide details"
 msgstr ""
 
 #: templates/answer_edit_tips.html:16 templates/question_edit_tips.html:13
-#: templates/backup/answer_edit_tips.html:15
-#: templates/backup/question_edit_tips.html:11
 msgid "be clear and concise"
 msgstr ""
 
 #: templates/answer_edit_tips.html:19 templates/question_edit_tips.html:16
-#: templates/backup/answer_edit_tips.html:18
-#: templates/backup/question_edit_tips.html:14
 msgid "see frequently asked questions"
 msgstr ""
 
 #: templates/answer_edit_tips.html:25 templates/question_edit_tips.html:22
-#: templates/backup/answer_edit_tips.html:24
-#: templates/backup/question_edit_tips.html:20
 msgid "Markdown tips"
 msgstr "Markdown basics"
 
 #: templates/answer_edit_tips.html:28 templates/question_edit_tips.html:25
-#: templates/backup/answer_edit_tips.html:27
-#: templates/backup/question_edit_tips.html:23
 msgid "*italic* or __italic__"
 msgstr ""
 
 #: templates/answer_edit_tips.html:31 templates/question_edit_tips.html:28
-#: templates/backup/answer_edit_tips.html:30
-#: templates/backup/question_edit_tips.html:26
 msgid "**bold** or __bold__"
 msgstr ""
 
 #: templates/answer_edit_tips.html:34 templates/question_edit_tips.html:31
-#: templates/backup/answer_edit_tips.html:33
-#: templates/backup/question_edit_tips.html:29
 msgid "link"
 msgstr ""
 
-#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:39
+#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:38
 #: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36
-#: templates/backup/answer_edit_tips.html:33
-#: templates/backup/answer_edit_tips.html:38
-#: templates/backup/question_edit_tips.html:29
-#: templates/backup/question_edit_tips.html:34
 msgid "text"
 msgstr ""
 
-#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:36
-#: templates/backup/answer_edit_tips.html:38
-#: templates/backup/question_edit_tips.html:34
+#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36
 msgid "image"
 msgstr ""
 
-#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:40
-#: templates/backup/answer_edit_tips.html:42
-#: templates/backup/question_edit_tips.html:38
+#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40
 msgid "numbered list:"
 msgstr ""
 
-#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:45
-#: templates/backup/answer_edit_tips.html:47
-#: templates/backup/question_edit_tips.html:43
+#: templates/answer_edit_tips.html:47 templates/question_edit_tips.html:45
 msgid "basic HTML tags are also supported"
 msgstr ""
 
-#: templates/answer_edit_tips.html:51 templates/question_edit_tips.html:48
-#: templates/backup/answer_edit_tips.html:50
-#: templates/backup/question_edit_tips.html:46
+#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48
 msgid "learn more about Markdown"
 msgstr ""
 
-#: templates/ask.html:4 templates/ask.html.py:60 templates/backup/ask.html:3
-#: templates/backup/ask.html.py:59
+#: templates/ask.html:4 templates/ask.html.py:60
 msgid "Ask a question"
 msgstr ""
 
-#: templates/ask.html:106 templates/backup/ask.html:105
-msgid "Use"
-msgstr ""
-
-#: templates/ask.html:106 templates/backup/ask.html:105
-msgid "learn more about OpenID"
+#: templates/ask.html:67
+msgid "login to post question info"
 msgstr ""
+"<span class=\"strong big\">You are welcome to start submitting your question "
+"anonymously</span>  - you are currently not logged in. When you post your "
+"question, you will be redirected to the login/signup page. Your question "
+"will be saved meanwhile  and will be posted when you log in. Login/signup "
+"process is very simple. Login takes about 30 seconds, initial signup takes a "
+"minute or less."
 
-#: templates/ask.html:106 templates/authopenid/signin.html:34
-#: templates/authopenid/signin.html:60 templates/backup/ask.html:105
-msgid "Login"
-msgstr ""
-
-#: templates/ask.html:109 templates/backup/ask.html:108
-msgid "Get your own "
+#: templates/ask.html:73
+#, python-format
+msgid "must have valid %(email)s to post"
 msgstr ""
+"<span class='strong big'>Looks like your email address, %(email)s has not "
+"yet been validated.</span> To post messages you must verify your email, "
+"please see <a href='/faq#validate'>more details here</a>.<br>You can submit "
+"your question now and validate email after that. Your question will saved as "
+"pending meanwhile. "
 
-#: templates/ask.html:117 templates/authopenid/sendpw.html:27
-#: templates/backup/ask.html:116
-msgid "User name"
+#: templates/ask.html:108
+msgid "(required)"
 msgstr ""
 
-#: templates/ask.html:120 templates/backup/ask.html:119
-msgid "Email: (won't be shown to anyone)"
-msgstr ""
+#: templates/ask.html:115
+msgid "Login/signup to post your question"
+msgstr "Login/Signup to Post"
 
-#: templates/ask.html:127 templates/backup/ask.html:126
+#: templates/ask.html:117
 msgid "Ask your question"
-msgstr ""
+msgstr "Ask Your Question"
 
 #: templates/badge.html:6 templates/badge.html.py:17
-#: templates/backup/badge.html:5 templates/backup/badge.html.py:16
 msgid "Badge"
 msgstr ""
 
-#: templates/badge.html:26 templates/backup/badge.html:25
+#: templates/badge.html:26
 msgid "The users have been awarded with badges:"
 msgstr ""
 
-#: templates/badges.html:6 templates/backup/badges.html:6
+#: templates/badges.html:6
 msgid "Badges summary"
 msgstr ""
 
 #: templates/badges.html:17 templates/user_stats.html:113
-#: templates/backup/badges.html:17 templates/backup/user_stats.html:112
 msgid "Badges"
 msgstr ""
 
-#: templates/badges.html:21 templates/backup/badges.html:21
+#: templates/badges.html:21
 msgid "Community gives you awards for your questions, answers and votes."
 msgstr ""
+"If your questions and answers are highly voted, your contribution to this "
+"Q&amp;A community will be recognized with the variety of badges."
 
-#: templates/badges.html:22 templates/backup/badges.html:22
+#: templates/badges.html:22
 msgid ""
 "Below is the list of available badges and number of times each type of badge "
 "has been awarded."
 msgstr ""
+"Currently badges differ only by their level: <strong>gold</strong>, "
+"<strong>silver</strong> and <strong>bronze</strong> (their meanings are "
+"described on the right). In the future there will be many types of badges at "
+"each level. <strong>Please give us your <a href=\"/faq#feedback\">feedback</"
+"a></strong> - what kinds of badges would you like to see and suggest the "
+"activity for which those badges might be awarded."
 
-#: templates/badges.html:49 templates/backup/badges.html:49
+#: templates/badges.html:49
 msgid "Community badges"
-msgstr ""
+msgstr "Badge levels"
 
-#: templates/badges.html:55 templates/backup/badges.html:55
-msgid "Gold badge is very rare."
+#: templates/badges.html:55
+msgid "gold badge description"
 msgstr ""
+"Gold badge is the highest award in this community. To obtain it have to show "
+"profound knowledge and ability in addition to your active participation."
 
-#: templates/badges.html:56 templates/backup/badges.html:56
-msgid ""
-"To obtain it you have to show profound knowledge and ability in addition to "
-"actively participating in the community."
+#: templates/badges.html:63
+msgid "silver badge description"
 msgstr ""
+"Obtaining silver badge requires significant patience. If you have received "
+"one, that means you have greatly contributed to this community."
 
-#: templates/badges.html:57 templates/backup/badges.html:57
-msgid "Gold badge is the highest award in this community."
-msgstr ""
-
-#: templates/badges.html:65 templates/backup/badges.html:65
-msgid "Obtaining silver badge requires significant patience."
-msgstr ""
-
-#: templates/badges.html:66 templates/backup/badges.html:66
-msgid "If you got one, you've very significantly contributed to this community"
-msgstr ""
-
-#: templates/badges.html:69 templates/backup/badges.html:69
+#: templates/badges.html:66
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: templates/badges.html:73 templates/backup/badges.html:73
-msgid ""
-"If you are active in this community, you will will get this medal - still it "
-"is a special honor."
+#: templates/badges.html:70
+msgid "bronze badge description"
 msgstr ""
+"If you are an active participant in this community, you will be recognized "
+"with this badge."
 
-#: templates/base.html:59 templates/base_content.html:60
-#: templates/backup/base.html:59 templates/backup/base_content.html:57
-msgid "congratulations, community gave you a badge"
-msgstr ""
-
-#: templates/base.html:61 templates/base_content.html:62
-#: templates/backup/base.html:61 templates/backup/base_content.html:59
-msgid "profile"
-msgstr ""
-
-#: templates/base_content.html:61 templates/backup/base_content.html:58
-msgid "see"
-msgstr ""
-
-#: templates/book.html:7 templates/backup/book.html:7
+#: templates/book.html:7
 msgid "reading channel"
 msgstr ""
 
-#: templates/book.html:26 templates/backup/book.html:26
+#: templates/book.html:26
 msgid "[author]"
 msgstr ""
 
-#: templates/book.html:30 templates/backup/book.html:30
+#: templates/book.html:30
 msgid "[publisher]"
 msgstr ""
 
-#: templates/book.html:34 templates/backup/book.html:34
+#: templates/book.html:34
 msgid "[publication date]"
 msgstr ""
 
-#: templates/book.html:38 templates/backup/book.html:38
+#: templates/book.html:38
 msgid "[price]"
 msgstr ""
 
-#: templates/book.html:39 templates/backup/book.html:39
+#: templates/book.html:39
 msgid "currency unit"
 msgstr ""
 
-#: templates/book.html:42 templates/backup/book.html:42
+#: templates/book.html:42
 msgid "[pages]"
 msgstr ""
 
-#: templates/book.html:43 templates/backup/book.html:43
+#: templates/book.html:43
 msgid "pages abbreviation"
 msgstr ""
 
-#: templates/book.html:46 templates/backup/book.html:46
+#: templates/book.html:46
 msgid "[tags]"
 msgstr ""
 
-#: templates/book.html:56 templates/backup/book.html:56
+#: templates/book.html:56
 msgid "author blog"
 msgstr ""
 
-#: templates/book.html:62 templates/backup/book.html:62
+#: templates/book.html:62
 msgid "book directory"
 msgstr ""
 
-#: templates/book.html:66 templates/backup/book.html:66
+#: templates/book.html:66
 msgid "buy online"
 msgstr ""
 
-#: templates/book.html:79 templates/backup/book.html:79
+#: templates/book.html:79
 msgid "reader questions"
 msgstr ""
 
-#: templates/book.html:82 templates/backup/book.html:82
+#: templates/book.html:82
 msgid "ask the author"
 msgstr ""
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:17 templates/backup/book.html:88
-#: templates/backup/book.html.py:93 templates/backup/users_questions.html:16
+#: templates/users_questions.html:17
 msgid "this question was selected as favorite"
 msgstr ""
 
 #: templates/book.html:88 templates/book.html.py:93
 #: templates/users_questions.html:11 templates/users_questions.html.py:17
-#: templates/backup/book.html:88 templates/backup/book.html.py:93
-#: templates/backup/users_questions.html:10
-#: templates/backup/users_questions.html:16
 msgid "number of times"
 msgstr ""
 
-#: templates/book.html:105 templates/index.html:47 templates/questions.html:46
+#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
 #: templates/unanswered.html:37 templates/users_questions.html:30
-#: templates/backup/book.html:105 templates/backup/index.html:47
-#: templates/backup/questions.html:45 templates/backup/unanswered.html:36
-#: templates/backup/users_questions.html:29 templates/tough/unanswered.html:35
 msgid "votes"
 msgstr ""
 
-#: templates/book.html:108 templates/backup/book.html:108
+#: templates/book.html:108
 msgid "the answer has been accepted to be correct"
 msgstr ""
 
-#: templates/book.html:115 templates/index.html:48 templates/questions.html:47
+#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
 #: templates/unanswered.html:38 templates/users_questions.html:40
-#: templates/backup/book.html:115 templates/backup/index.html:48
-#: templates/backup/questions.html:46 templates/backup/unanswered.html:37
-#: templates/backup/users_questions.html:39 templates/tough/unanswered.html:36
 msgid "views"
 msgstr ""
 
-#: templates/book.html:125 templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: templates/book.html:125 templates/index.html:69 templates/question.html:115
+#: templates/question.html.py:486 templates/questions.html:84
+#: templates/questions.html.py:156 templates/tags.html:47
 #: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52 templates/backup/book.html:125
-#: templates/backup/index.html:68 templates/backup/index.html.py:93
-#: templates/backup/question.html:111 templates/backup/question.html.py:469
-#: templates/backup/questions.html:83 templates/backup/questions.html:148
-#: templates/backup/tags.html:46 templates/backup/unanswered.html:74
-#: templates/backup/unanswered.html:108
-#: templates/backup/users_questions.html:51 templates/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "using tags"
 msgstr ""
 
-#: templates/book.html:147 templates/backup/book.html:147
+#: templates/book.html:147
 msgid "subscribe to book RSS feed"
 msgstr ""
 
 #: templates/book.html:147 templates/index.html:116
-#: templates/backup/book.html:147 templates/backup/index.html:115
 msgid "subscribe to the questions feed"
 msgstr ""
 
 #: templates/close.html:6 templates/close.html.py:16
-#: templates/backup/close.html:6 templates/backup/close.html.py:16
 msgid "Close question"
 msgstr ""
 
-#: templates/close.html:19 templates/backup/close.html:19
+#: templates/close.html:19
 msgid "Close the question"
 msgstr ""
 
-#: templates/close.html:25 templates/backup/close.html:25
+#: templates/close.html:25
 msgid "Reasons"
 msgstr ""
 
-#: templates/close.html:28 templates/backup/close.html:28
+#: templates/close.html:28
 msgid "OK to close"
 msgstr ""
 
-#: templates/faq.html:11 templates/backup/faq.html:11
-#: templates/tough/faq.html:9
+#: templates/faq.html:11
 msgid "Frequently Asked Questions "
 msgstr ""
 
-#: templates/faq.html:15 templates/backup/faq.html:15
-#: templates/tough/faq.html:13
+#: templates/faq.html:16
 msgid "What kinds of questions can I ask here?"
 msgstr ""
 
-#: templates/faq.html:16 templates/backup/faq.html:16
-#: templates/tough/faq.html:14
+#: templates/faq.html:17
 msgid ""
 "Most importanly - questions should be <strong>relevant</strong> to this "
 "community."
 msgstr ""
+"Please ask questions about all aspects of <strong>Magnetic Resonance</"
+"strong> - <strong>NMR</strong>, <strong>EPR</strong>, <strong>MRI</strong>. "
+"Questions about both theory and practice in these fields are welcome, "
+"including questions about the physical foundations, scientific applications, "
+"instrumentation, interpretation of data, software, preparation and handling "
+"of samples etc. "
 
-#: templates/faq.html:17 templates/backup/faq.html:17
-#: templates/tough/faq.html:15
+#: templates/faq.html:18
 msgid ""
 "Before asking the question - please make sure to use search to see whether "
 "your question has alredy been answered."
 msgstr ""
+"Before you ask - please make sure to search for a similar question. You can "
+"search questions by their title or tags."
 
-#: templates/faq.html:20 templates/backup/faq.html:20
-#: templates/tough/faq.html:18
+#: templates/faq.html:21
 msgid "What questions should I avoid asking?"
-msgstr ""
+msgstr "What kinds of questions should be avoided?"
 
-#: templates/faq.html:21 templates/backup/faq.html:21
-#: templates/tough/faq.html:19
+#: templates/faq.html:22
 msgid ""
 "Please avoid asking questions that are not relevant to this community, too "
 "subjective and argumentative."
 msgstr ""
+"Please avoid asking questions that are not relevant to the subjects of NMR, "
+"EPR or MRI, also please avoid asking questions that are too argumentative or "
+"subjective."
 
-#: templates/faq.html:24 templates/backup/faq.html:24
-#: templates/tough/faq.html:22
+#: templates/faq.html:27
 msgid "What should I avoid in my answers?"
 msgstr ""
 
-#: templates/faq.html:25 templates/backup/faq.html:25
-#: templates/tough/faq.html:23
+#: templates/faq.html:28 templates/faq.html.py:132
+msgid "site title"
+msgstr "NMR Wiki Q&A"
+
+#: templates/faq.html:28
 msgid ""
 "is a Q&A site, not a discussion group. Therefore - please avoid having "
 "discussions in your answers, comment facility allows some space for brief "
 "discussions."
 msgstr ""
+"is a <strong>question and answer</strong> site - <strong>it is not a "
+"discussion group</strong>. Please avoid holding debates in your answers as "
+"they tend to dilute the essense of questions and answers. For the brief "
+"discussions please use commenting facility."
 
-#: templates/faq.html:28 templates/backup/faq.html:28
-#: templates/tough/faq.html:26
+#: templates/faq.html:32
 msgid "Who moderates this community?"
 msgstr ""
 
-#: templates/faq.html:29 templates/backup/faq.html:29
-#: templates/tough/faq.html:27
+#: templates/faq.html:33
 msgid "The short answer is: <strong>you</strong>."
 msgstr ""
 
-#: templates/faq.html:30 templates/backup/faq.html:30
-#: templates/tough/faq.html:28
+#: templates/faq.html:34
 msgid "This website is moderated by the users."
 msgstr ""
 
-#: templates/faq.html:31 templates/backup/faq.html:31
-#: templates/tough/faq.html:29
+#: templates/faq.html:35
 msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
 msgstr ""
 
-#: templates/faq.html:34 templates/backup/faq.html:34
-#: templates/tough/faq.html:32
+#: templates/faq.html:40
 msgid "How does reputation system work?"
 msgstr ""
 
-#: templates/faq.html:35 templates/backup/faq.html:35
-#: templates/tough/faq.html:33
-msgid ""
-"Anyone can ask questions and give answers, points are not necessary for that."
+#: templates/faq.html:41
+msgid "Rep system summary"
 msgstr ""
+"When a question or answer is upvoted, the user who posted them will gain "
+"some points, which are called \"reputation points\". These points serve as a "
+"rough measure of the community trust to him/her. Various moderation tasks "
+"are gradually assigned to the users based on those points."
 
-#: templates/faq.html:36 templates/backup/faq.html:36
-#: templates/tough/faq.html:34
-msgid ""
-"As we've said before, users help running this site. Point system helps "
-"select users who can administer this community."
-msgstr ""
-
-#: templates/faq.html:37 templates/backup/faq.html:37
-#: templates/tough/faq.html:35
-msgid ""
-"Reputation points roughly measure how community trusts you. These points are "
-"given to you directly by other members of the community."
-msgstr ""
-
-#: templates/faq.html:40 templates/backup/faq.html:40
-#: templates/tough/faq.html:38
-msgid ""
-"For example, if you ask an interesting question or give a helpful answer, "
-"your input will be upvoted and you will gain more trust in the community."
-msgstr ""
-
-#: templates/faq.html:41 templates/backup/faq.html:41
-#: templates/tough/faq.html:39
-msgid ""
-"If on the other hand someone gives a misleading answer, the answer will be "
-"voted down and he/she loses some points."
-msgstr ""
-
-#: templates/faq.html:42 templates/backup/faq.html:42
-#: templates/tough/faq.html:40
-msgid ""
-"Each vote in favor will generate <strong>10</strong> points, each vote "
-"against will subtract <strong>2</strong> points."
-msgstr ""
-
-#: templates/faq.html:43 templates/backup/faq.html:43
-#: templates/tough/faq.html:41
-msgid ""
-"Through the votes of other people you can accumulate a maximum of "
-"<strong>200</strong> points."
-msgstr ""
-
-#: templates/faq.html:44 templates/backup/faq.html:44
-msgid "After accumulating certain number of points, you can do more:"
-msgstr ""
-
-#: templates/faq.html:52 templates/user_votes.html:14
-#: templates/backup/faq.html:52 templates/backup/user_votes.html:13
-#: templates/tough/faq.html:50
+#: templates/faq.html:59 templates/user_votes.html:14
 msgid "upvote"
 msgstr ""
 
-#: templates/faq.html:56 templates/backup/faq.html:56
-#: templates/tough/faq.html:54
+#: templates/faq.html:63
 msgid "use tags"
 msgstr ""
 
-#: templates/faq.html:60 templates/backup/faq.html:60
-#: templates/tough/faq.html:58
+#: templates/faq.html:68
 msgid "add comments"
 msgstr ""
 
-#: templates/faq.html:64 templates/user_votes.html:16
-#: templates/backup/faq.html:64 templates/backup/user_votes.html:15
-#: templates/tough/faq.html:62
+#: templates/faq.html:72 templates/user_votes.html:16
 msgid "downvote"
 msgstr ""
 
-#: templates/faq.html:71 templates/backup/faq.html:71
-#: templates/tough/faq.html:69
+#: templates/faq.html:75
+msgid "open and close own questions"
+msgstr ""
+
+#: templates/faq.html:79
 msgid "retag questions"
 msgstr ""
 
-#: templates/faq.html:75 templates/backup/faq.html:75
-#: templates/tough/faq.html:73
+#: templates/faq.html:83
 msgid "edit community wiki questions"
 msgstr ""
 
-#: templates/faq.html:79 templates/backup/faq.html:79
-#: templates/tough/faq.html:77
+#: templates/faq.html:87
 msgid "edit any answer"
 msgstr ""
 
-#: templates/faq.html:83 templates/backup/faq.html:83
-#: templates/tough/faq.html:81
+#: templates/faq.html:91
 msgid "open any closed question"
 msgstr ""
 
-#: templates/faq.html:87 templates/backup/faq.html:87
-#: templates/tough/faq.html:85
+#: templates/faq.html:95
 msgid "delete any comment"
 msgstr ""
 
-#: templates/faq.html:91 templates/backup/faq.html:91
-#: templates/tough/faq.html:89
+#: templates/faq.html:99
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 
-#: templates/faq.html:98 templates/backup/faq.html:98
+#: templates/faq.html:106
+msgid "how to validate email title"
+msgstr "How to validate email and why?"
+
+#: templates/faq.html:108
+msgid "how to validate email info"
+msgstr ""
+"<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
+"\"bigger strong\">How?</span> If you have just set or changed your email "
+"address - <strong>check your email and click the included link</strong>."
+"<br>The link contains a key generated specifically for you. You can also "
+"<button style='display:inline' type='submit'><strong>get a new key</strong></"
+"button> and check your email again.</p></form><span class=\"bigger strong"
+"\">Why?</span> Email validation is required to make sure that <strong>only "
+"you can post messages</strong> on your behalf and to <strong>minimize spam</"
+"strong> posts.<br>With email you can <strong>subscribe for updates</strong> "
+"on the most interesting questions. Also, when you sign up for the first time "
+"- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
+"personal image.</p>"
+
+#: templates/faq.html:112
+msgid "what is gravatar"
+msgstr "What is gravatar?"
+
+#: templates/faq.html:113
+msgid "gravatar faq info"
+msgstr ""
+"<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</"
+"strong>ecognized <strong>avatar</strong> - your unique avatar image "
+"associated with your email address. It's simply a picture that shows next to "
+"your posts on the websites that support gravatar protocol. By default gravar "
+"appears as a square filled with a snowflake-like figure. You can <strong>set "
+"your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</"
+"strong></a>"
+
+#: templates/faq.html:116
 msgid "To register, do I need to create new password?"
 msgstr ""
 
-#: templates/faq.html:99 templates/backup/faq.html:99
-#: templates/tough/faq.html:97
+#: templates/faq.html:117
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
 msgstr ""
 
-#: templates/faq.html:100 templates/backup/faq.html:100
-#: templates/tough/faq.html:98
+#: templates/faq.html:118
 msgid "Login now!"
 msgstr ""
 
-#: templates/faq.html:103 templates/backup/faq.html:103
-#: templates/tough/faq.html:101
+#: templates/faq.html:123
 msgid "Why other people can edit my questions/answers?"
 msgstr ""
 
-#: templates/faq.html:104 templates/backup/faq.html:104
-#: templates/tough/faq.html:102
+#: templates/faq.html:124
 msgid "Goal of this site is..."
 msgstr ""
+"<span class='orange'>NMR Wiki Q&A</span> aims for offering a place for "
+"efficient exchange of ideas among users of <strong>Magnetic Resonance</"
+"strong>and specialists working in this field."
 
-#: templates/faq.html:104 templates/backup/faq.html:104
-#: templates/tough/faq.html:102
+#: templates/faq.html:124
 msgid ""
 "So questions and answers can be edited like wiki pages by experienced users "
 "of this site and this improves the overall quality of the knowledge base "
 "content."
 msgstr ""
 
-#: templates/faq.html:105 templates/backup/faq.html:105
-#: templates/tough/faq.html:103
+#: templates/faq.html:125
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 
-#: templates/faq.html:107 templates/backup/faq.html:107
-#: templates/tough/faq.html:105
+#: templates/faq.html:129
 msgid "Still have questions?"
 msgstr ""
 
-#: templates/faq.html:108 templates/backup/faq.html:108
+#: templates/faq.html:130
 msgid "Please ask your question, help make our community better!"
 msgstr ""
+"Please <a href=\"/questions/ask\">ask</a> your question, help make our "
+"community better!"
 
-#: templates/faq.html:108 templates/header.html:29 templates/header.html.py:60
-#: templates/backup/faq.html:108 templates/backup/header.html:29
-#: templates/backup/header.html.py:58 templates/tough/faq.html:106
+#: templates/faq.html:132 templates/header.html:29 templates/header.html.py:60
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:108 templates/index.html:121
-#: templates/backup/faq.html:108 templates/backup/index.html:120
-#: templates/tough/faq.html:106
+#: templates/faq.html:132 templates/index.html:121
 msgid "."
 msgstr ""
 
-#: templates/footer.html:7 templates/header.html:12 templates/index.html:83
-#: templates/backup/footer.html:7 templates/backup/header.html:12
-#: templates/backup/index.html:83
+#: templates/footer.html:7 templates/header.html:14 templates/index.html:83
 msgid "about"
 msgstr ""
 
-#: templates/footer.html:8 templates/header.html:13 templates/index.html:84
-#: templates/backup/footer.html:8 templates/backup/header.html:13
-#: templates/backup/index.html:84
+#: templates/footer.html:8 templates/header.html:15 templates/index.html:84
 msgid "faq"
 msgstr ""
 
-#: templates/footer.html:9 templates/backup/footer.html:9
+#: templates/footer.html:9
 msgid "blog"
 msgstr ""
 
-#: templates/footer.html:10 templates/backup/footer.html:10
+#: templates/footer.html:10
 msgid "contact us"
 msgstr ""
 
-#: templates/footer.html:11 templates/backup/footer.html:11
+#: templates/footer.html:11
 msgid "privacy policy"
 msgstr ""
 
-#: templates/footer.html:12 templates/backup/footer.html:12
+#: templates/footer.html:12
 msgid "give feedback"
 msgstr ""
 
-#: templates/footer.html:18 templates/backup/footer.html:18
+#: templates/footer.html:18
 msgid "current revision"
 msgstr ""
 
-#: templates/header.html:8 templates/backup/header.html:8
+#: templates/header.html:10
 msgid "logout"
 msgstr ""
 
-#: templates/header.html:10 templates/authopenid/signup.html:39
-#: templates/backup/header.html:10
+#: templates/header.html:12 templates/authopenid/signup.html:41
 msgid "login"
 msgstr ""
 
-#: templates/header.html:23 templates/backup/header.html:23
+#: templates/header.html:23
 msgid "back to home page"
 msgstr ""
 
 #: templates/header.html:31 templates/header.html.py:62
-#: templates/backup/header.html:31 templates/backup/header.html.py:60
 msgid "users"
 msgstr ""
 
-#: templates/header.html:32 templates/backup/header.html:32
+#: templates/header.html:32
 msgid "books"
 msgstr ""
 
-#: templates/header.html:34 templates/index.html:121
-#: templates/backup/header.html:34 templates/backup/index.html:120
+#: templates/header.html:34
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:38 templates/backup/header.html:37
+#: templates/header.html:38
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:42 templates/backup/header.html:40
+#: templates/header.html:42
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:57 templates/backup/header.html:55
+#: templates/header.html:57
 msgid "search"
 msgstr ""
 
-#: templates/index.html:6 templates/backup/index.html:6
+#: templates/index.html:7
 msgid "Home"
 msgstr ""
 
-#: templates/index.html:7 templates/backup/index.html:7
-msgid "meta site keywords, comma separated"
-msgstr ""
-
-#: templates/index.html:21 templates/questions.html:7
-#: templates/backup/index.html:21 templates/backup/questions.html:6
+#: templates/index.html:22 templates/questions.html:7
 msgid "Questions"
 msgstr ""
 
-#: templates/index.html:23 templates/backup/index.html:23
+#: templates/index.html:24
 msgid "last updated questions"
 msgstr ""
 
-#: templates/index.html:23 templates/questions.html:25
-#: templates/unanswered.html:20 templates/backup/index.html:23
-#: templates/backup/questions.html:24 templates/backup/unanswered.html:19
-#: templates/tough/unanswered.html:18
+#: templates/index.html:24 templates/questions.html:25
+#: templates/unanswered.html:20
 msgid "newest"
 msgstr ""
 
-#: templates/index.html:24 templates/questions.html:27
-#: templates/backup/index.html:24 templates/backup/questions.html:26
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest questions"
 msgstr ""
 
-#: templates/index.html:24 templates/questions.html:27
-#: templates/backup/index.html:24 templates/backup/questions.html:26
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:28
-#: templates/backup/index.html:25 templates/backup/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted questions"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:28
-#: templates/backup/index.html:25 templates/backup/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted"
 msgstr ""
 
-#: templates/index.html:26 templates/backup/index.html:26
+#: templates/index.html:27
 msgid "all questions"
 msgstr ""
 
-#: templates/index.html:46 templates/questions.html:45
+#: templates/index.html:47 templates/questions.html:45
 #: templates/unanswered.html:36 templates/users_questions.html:35
-#: templates/backup/index.html:46 templates/backup/questions.html:44
-#: templates/backup/unanswered.html:35
-#: templates/backup/users_questions.html:34 templates/tough/unanswered.html:34
 msgid "answers"
 msgstr ""
 
-#: templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: templates/index.html:69 templates/question.html:115
+#: templates/question.html.py:486 templates/questions.html:84
+#: templates/questions.html.py:156 templates/tags.html:47
 #: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52 templates/backup/index.html:68
-#: templates/backup/index.html.py:93 templates/backup/question.html:111
-#: templates/backup/question.html.py:469 templates/backup/questions.html:83
-#: templates/backup/questions.html:148 templates/backup/tags.html:46
-#: templates/backup/unanswered.html:74 templates/backup/unanswered.html:108
-#: templates/backup/users_questions.html:51 templates/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr ""
 
-#: templates/index.html:79 templates/backup/index.html:79
+#: templates/index.html:80
 msgid "welcome to website"
-msgstr ""
-
-#: templates/index.html:81 templates/backup/index.html:81
-msgid "what is this website"
-msgstr ""
+msgstr "Welcome to NMR Wiki Q&A"
 
-#: templates/index.html:82 templates/backup/index.html:82
-msgid "what can one do on this website"
-msgstr ""
-
-#: templates/index.html:89 templates/backup/index.html:89
+#: templates/index.html:89
 msgid "Recent tags"
 msgstr ""
 
@@ -1468,325 +1351,315 @@ msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
 #: templates/index.html:97 templates/index.html.py:121
-#: templates/backup/index.html:96 templates/backup/index.html.py:120
 msgid "popular tags"
-msgstr ""
+msgstr "tags"
 
-#: templates/index.html:101 templates/backup/index.html:100
+#: templates/index.html:101
 msgid "Recent awards"
-msgstr ""
+msgstr "Recent badges"
 
-#: templates/index.html:107 templates/backup/index.html:106
+#: templates/index.html:107
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:112 templates/backup/index.html:111
+#: templates/index.html:112
 msgid "all awards"
-msgstr ""
+msgstr "all badges"
 
-#: templates/index.html:116 templates/backup/index.html:115
+#: templates/index.html:116
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:121 templates/backup/index.html:120
+#: templates/index.html:121
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:121 templates/backup/index.html:120
-msgid "complete list of quesionts"
-msgstr ""
+#: templates/index.html:121
+msgid "complete list of questions"
+msgstr "list of all questions"
 
-#: templates/index.html:121 templates/backup/index.html:120
+#: templates/index.html:121
 msgid "or"
 msgstr ""
 
-#: templates/index.html:121 templates/backup/index.html:120
+#: templates/index.html:121
 msgid "Please help us answer"
 msgstr ""
 
+#: templates/index.html:121
+msgid "list of unanswered questions"
+msgstr "unanswered questions"
+
 #: templates/logout.html:6 templates/logout.html.py:17
-#: templates/backup/logout.html:6 templates/backup/logout.html.py:17
 msgid "Logout"
 msgstr ""
 
-#: templates/logout.html:20 templates/backup/logout.html:20
+#: templates/logout.html:20
 msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
+"Clicking <strong>Logout</strong> will log you out from NMR Wiki Q&A.</"
+"p><p>If you wish to sign off completely - please make sure to log out from "
+"your OpenID provider."
 
-#: templates/logout.html:21 templates/backup/logout.html:21
+#: templates/logout.html:21
 msgid "Logout now"
-msgstr ""
+msgstr "Logout Now"
 
-#: templates/pagesize.html:6 templates/backup/pagesize.html:6
+#: templates/pagesize.html:6
 msgid "posts per page"
 msgstr ""
 
 #: templates/paginator.html:6 templates/paginator.html.py:7
-#: templates/backup/paginator.html:5 templates/backup/paginator.html.py:6
 msgid "previous"
 msgstr ""
 
-#: templates/paginator.html:20 templates/backup/paginator.html:19
+#: templates/paginator.html:19
 msgid "current page"
 msgstr ""
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
-#: templates/backup/paginator.html:22 templates/backup/paginator.html.py:29
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "page number "
 msgstr ""
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
-#: templates/backup/paginator.html:22 templates/backup/paginator.html.py:29
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "number - make blank in english"
 msgstr ""
 
-#: templates/paginator.html:34 templates/backup/paginator.html:33
+#: templates/paginator.html:33
 msgid "next page"
 msgstr ""
 
 #: templates/privacy.html:6 templates/privacy.html.py:11
-#: templates/backup/privacy.html:5 templates/backup/privacy.html.py:10
 msgid "Privacy policy"
 msgstr ""
 
-#: templates/privacy.html:15 templates/backup/privacy.html:14
+#: templates/privacy.html:15
 msgid "general message about privacy"
 msgstr ""
 
-#: templates/privacy.html:18 templates/backup/privacy.html:17
+#: templates/privacy.html:18
 msgid "Site Visitors"
 msgstr ""
 
-#: templates/privacy.html:20 templates/backup/privacy.html:19
+#: templates/privacy.html:20
 msgid "what technical information is collected about visitors"
 msgstr ""
 
-#: templates/privacy.html:23 templates/backup/privacy.html:22
+#: templates/privacy.html:23
 msgid "Personal Information"
 msgstr ""
 
-#: templates/privacy.html:25 templates/backup/privacy.html:24
+#: templates/privacy.html:25
 msgid "details on personal information policies"
 msgstr ""
 
-#: templates/privacy.html:28 templates/backup/privacy.html:27
+#: templates/privacy.html:28
 msgid "Other Services"
 msgstr ""
 
-#: templates/privacy.html:30 templates/backup/privacy.html:29
+#: templates/privacy.html:30
 msgid "details on sharing data with third parties"
 msgstr ""
 
-#: templates/privacy.html:35 templates/backup/privacy.html:34
+#: templates/privacy.html:35
 msgid "cookie policy details"
 msgstr ""
 
-#: templates/privacy.html:37 templates/backup/privacy.html:36
+#: templates/privacy.html:37
 msgid "Policy Changes"
 msgstr ""
 
-#: templates/privacy.html:38 templates/backup/privacy.html:37
+#: templates/privacy.html:38
 msgid "how privacy policies can be changed"
 msgstr ""
 
-#: templates/question.html:66 templates/question.html.py:78
-#: templates/backup/question.html:65 templates/backup/question.html.py:77
+#: templates/question.html:69 templates/question.html.py:81
 msgid "i like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:68 templates/question.html.py:80
-#: templates/question.html:273 templates/backup/question.html:67
-#: templates/backup/question.html.py:79 templates/backup/question.html:272
+#: templates/question.html:71 templates/question.html.py:83
+#: templates/question.html:276
 msgid "current number of votes"
 msgstr ""
 
-#: templates/question.html:73 templates/question.html.py:84
-#: templates/backup/question.html:72 templates/backup/question.html.py:83
+#: templates/question.html:76 templates/question.html.py:87
 msgid "i dont like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:90 templates/backup/question.html:89
+#: templates/question.html:93
 msgid "mark this question as favorite (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:96 templates/backup/question.html:95
+#: templates/question.html:99
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 
-#: templates/question.html:121 templates/question.html.py:304
+#: templates/question.html:124 templates/question.html.py:307
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
-#: templates/backup/question.html:120 templates/backup/question.html.py:303
-#: templates/backup/revisions_answer.html:52
-#: templates/backup/revisions_question.html:51
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:125 templates/question.html.py:314
-#: templates/backup/question.html:124 templates/backup/question.html.py:307
+#: templates/question.html:128 templates/question.html.py:317
 msgid "delete"
 msgstr ""
 
-#: templates/question.html:130 templates/backup/question.html:129
+#: templates/question.html:133
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:135 templates/backup/question.html:134
+#: templates/question.html:138
 msgid "close"
 msgstr ""
 
-#: templates/question.html:141 templates/question.html.py:327
-#: templates/backup/question.html:140 templates/backup/question.html.py:317
+#: templates/question.html:144 templates/question.html.py:330
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 
-#: templates/question.html:142 templates/question.html.py:328
-#: templates/backup/question.html:141 templates/backup/question.html.py:318
+#: templates/question.html:145 templates/question.html.py:331
 msgid "flag offensive"
 msgstr ""
 
-#: templates/question.html:154 templates/question.html.py:337
+#: templates/question.html:157 templates/question.html.py:340
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
-#: templates/backup/question.html:153 templates/backup/question.html.py:327
-#: templates/backup/revisions_answer.html:64
-#: templates/backup/revisions_question.html:63
 msgid "updated"
 msgstr ""
 
-#: templates/question.html:203 templates/question.html.py:384
+#: templates/question.html:206 templates/question.html.py:387
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
-#: templates/backup/question.html:202 templates/backup/question.html.py:374
-#: templates/backup/revisions_answer.html:62
-#: templates/backup/revisions_question.html:61
 msgid "asked"
 msgstr ""
 
-#: templates/question.html:233 templates/question.html.py:411
-#: templates/backup/question.html:232 templates/backup/question.html.py:401
+#: templates/question.html:236 templates/question.html.py:414
 msgid "comments"
 msgstr ""
 
-#: templates/question.html:234 templates/question.html.py:412
-#: templates/backup/question.html:233 templates/backup/question.html.py:402
+#: templates/question.html:237 templates/question.html.py:415
 msgid "add comment"
 msgstr ""
 
-#: templates/question.html:247 templates/backup/question.html:246
+#: templates/question.html:250
 #, python-format
 msgid ""
 "The question has been closed for the following reason \"%(question."
 "get_close_reason_display)s\" by"
 msgstr ""
 
-#: templates/question.html:249 templates/backup/question.html:248
+#: templates/question.html:252
 #, python-format
 msgid "close date %(question.closed_at)s"
 msgstr ""
 
-#: templates/question.html:256 templates/user_stats.html:28
-#: templates/backup/question.html:255 templates/backup/user_stats.html:27
+#: templates/question.html:259 templates/user_stats.html:28
 msgid "Answers"
 msgstr " Answers"
 
-#: templates/question.html:258 templates/backup/question.html:257
+#: templates/question.html:261
 msgid "oldest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:258 templates/backup/question.html:257
+#: templates/question.html:261
 msgid "oldest answers"
 msgstr "oldest"
 
-#: templates/question.html:259 templates/backup/question.html:258
+#: templates/question.html:262
 msgid "newest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:259 templates/backup/question.html:258
+#: templates/question.html:262
 msgid "newest answers"
 msgstr "newest"
 
-#: templates/question.html:260 templates/backup/question.html:259
+#: templates/question.html:263
 msgid "most voted answers will be shown first"
 msgstr ""
 
-#: templates/question.html:260 templates/backup/question.html:259
+#: templates/question.html:263
 msgid "popular answers"
 msgstr "most voted"
 
-#: templates/question.html:272 templates/backup/question.html:271
+#: templates/question.html:275
 msgid "i like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:278 templates/backup/question.html:277
+#: templates/question.html:281
 msgid "i dont like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:284 templates/backup/question.html:283
+#: templates/question.html:287
 msgid "mark this answer as favorite (click again to undo)"
 msgstr ""
 
-#: templates/question.html:289 templates/backup/question.html:288
+#: templates/question.html:292
 msgid "the author of the question has selected this answer as correct"
 msgstr ""
 
-#: templates/question.html:311
+#: templates/question.html:314
 msgid "undelete"
 msgstr ""
 
-#: templates/question.html:321 templates/backup/question.html:311
+#: templates/question.html:324
 msgid "answer permanent link"
 msgstr ""
 
-#: templates/question.html:322 templates/backup/question.html:312
+#: templates/question.html:325
 msgid "permanent link"
 msgstr ""
 
-#: templates/question.html:436 templates/backup/question.html:426
+#: templates/question.html:438
 msgid "Your answer"
 msgstr ""
 
-#: templates/question.html:460 templates/backup/question.html:450
+#: templates/question.html:441
+msgid "you can answer anonymously and then login"
+msgstr ""
+"<span class='strong big'>You are now not logged in</span> but you can answer "
+"first and then login"
+
+#: templates/question.html:465
 msgid "Answer the question"
 msgstr ""
 
-#: templates/question.html:462 templates/backup/question.html:452
-msgid "Login to answer"
+#: templates/question.html:467
+msgid "Notify me daily if there are any new answers."
 msgstr ""
 
-#: templates/question.html:474 templates/backup/question.html:464
+#: templates/question.html:469
+msgid "once you sign in you will be able to subscribe for any updates here"
+msgstr "Here logged in users can sign up for the question updates."
+
+#: templates/question.html:481
 msgid "Question tags"
 msgstr "Tags"
 
-#: templates/question.html:484 templates/backup/question.html:474
+#: templates/question.html:491
 msgid "question asked"
 msgstr "Asked"
 
-#: templates/question.html:484 templates/question.html.py:490
-#: templates/user_info.html:51 templates/backup/question.html:474
-#: templates/backup/question.html.py:480 templates/backup/user_info.html:50
+#: templates/question.html:491 templates/question.html.py:497
+#: templates/user_info.html:51
 msgid "ago"
 msgstr ""
 
-#: templates/question.html:487 templates/backup/question.html:477
+#: templates/question.html:494
 msgid "question was seen"
 msgstr "Seen"
 
-#: templates/question.html:487 templates/backup/question.html:477
+#: templates/question.html:494
 msgid "times"
 msgstr ""
 
-#: templates/question.html:490 templates/backup/question.html:480
+#: templates/question.html:497
 msgid "last updated"
 msgstr "Last updated"
 
-#: templates/question.html:495 templates/backup/question.html:485
+#: templates/question.html:502
 msgid "Related questions"
 msgstr ""
 
 #: templates/question_edit.html:4 templates/question_edit.html.py:65
-#: templates/backup/question_edit.html:2
-#: templates/backup/question_edit.html:63
 msgid "Edit question"
 msgstr ""
 
@@ -1795,38 +1668,54 @@ msgid "question tips"
 msgstr "Tips"
 
 #: templates/question_edit_tips.html:7
-#: templates/backup/question_edit_tips.html:5
 msgid "please ask a relevant question"
 msgstr ""
 
 #: templates/question_edit_tips.html:10
-#: templates/backup/question_edit_tips.html:8
 msgid "please try provide enough details"
 msgstr "provide enough details"
 
-#: templates/questions.html:23 templates/backup/questions.html:22
+#: templates/question_retag.html:3 templates/question_retag.html.py:52
+msgid "Change tags"
+msgstr ""
+
+#: templates/question_retag.html:39
+msgid "up to 5 tags, less than 20 characters each"
+msgstr ""
+
+#: templates/question_retag.html:86
+msgid "Why use and modify tags?"
+msgstr ""
+
+#: templates/question_retag.html:89
+msgid "tags help us keep Questions organized"
+msgstr ""
+
+#: templates/question_retag.html:95
+msgid "tag editors receive special awards from the community"
+msgstr ""
+
+#: templates/questions.html:23
 msgid "Found by tags"
 msgstr "Tagged questions"
 
-#: templates/questions.html:23 templates/backup/questions.html:22
+#: templates/questions.html:23
 msgid "Found by title"
 msgstr ""
 
-#: templates/questions.html:23 templates/backup/questions.html:22
+#: templates/questions.html:23
 msgid "All questions"
 msgstr ""
 
 #: templates/questions.html:25 templates/unanswered.html:20
-#: templates/backup/questions.html:24 templates/backup/unanswered.html:19
-#: templates/tough/unanswered.html:18
 msgid "most recently asked questions"
 msgstr ""
 
-#: templates/questions.html:26 templates/backup/questions.html:25
+#: templates/questions.html:26
 msgid "most recently updated questions"
 msgstr ""
 
-#: templates/questions.html:26 templates/backup/questions.html:25
+#: templates/questions.html:26
 msgid "active"
 msgstr ""
 
@@ -1846,19 +1735,19 @@ msgstr[0] ""
 "class=\"tag\">%(tagname)s</span></p>"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</"
-"p><p><span class=\"tag\">%(tagname)s</span></p>"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
+"class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
 
 #: templates/questions.html:116
 #, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgid_plural ""
 "\n"
-"\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgstr[0] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>question with title "
@@ -1870,114 +1759,121 @@ msgstr[1] ""
 "containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
 "p>"
 
-#: templates/questions.html:124
+#: templates/questions.html:122
+#, python-format
+msgid ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgid_plural ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgstr[0] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>question</p>"
+msgstr[1] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
+
+#: templates/questions.html:131
 msgid "latest questions info"
 msgstr "<strong>Newest</strong> questions are shown first."
 
-#: templates/questions.html:128 templates/backup/questions.html:127
+#: templates/questions.html:135
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 
-#: templates/questions.html:129 templates/backup/questions.html:128
+#: templates/questions.html:136
 msgid "Most recently answered ones are shown first."
-msgstr ""
+msgstr "<strong>Most recently answered</strong> questions are shown first."
 
-#: templates/questions.html:133 templates/backup/questions.html:132
+#: templates/questions.html:140
 msgid "Questions sorted by <strong>number of responses</strong>."
-msgstr ""
+msgstr "Questions sorted by the <strong>number of answers</strong>."
 
-#: templates/questions.html:134 templates/backup/questions.html:133
+#: templates/questions.html:141
 msgid "Most answered questions are shown first."
-msgstr ""
+msgstr " "
 
-#: templates/questions.html:138 templates/backup/questions.html:137
+#: templates/questions.html:145
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr ""
 
-#: templates/questions.html:139 templates/backup/questions.html:138
+#: templates/questions.html:146
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:146 templates/unanswered.html:105
-#: templates/backup/questions.html:145 templates/backup/unanswered.html:104
-#: templates/tough/unanswered.html:101
+#: templates/questions.html:153 templates/unanswered.html:105
 msgid "Related tags"
 msgstr "Tags"
 
 #: templates/reopen.html:6 templates/reopen.html.py:16
-#: templates/backup/reopen.html:4 templates/backup/reopen.html.py:14
 msgid "Reopen question"
 msgstr ""
 
-#: templates/reopen.html:19 templates/backup/reopen.html:17
+#: templates/reopen.html:19
 msgid "Open the previously closed question"
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "The question was closed for the following reason "
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "reason - leave blank in english"
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "on "
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "date closed"
 msgstr ""
 
-#: templates/reopen.html:29 templates/backup/reopen.html:27
+#: templates/reopen.html:29
 msgid "Reopen this question"
 msgstr ""
 
 #: templates/revisions_answer.html:7 templates/revisions_answer.html.py:36
 #: templates/revisions_question.html:8 templates/revisions_question.html:36
-#: templates/backup/revisions_answer.html:6
-#: templates/backup/revisions_answer.html:35
-#: templates/backup/revisions_question.html:6
-#: templates/backup/revisions_question.html:34
 msgid "Revision history"
 msgstr ""
 
 #: templates/tags.html:6 templates/tags.html.py:29
-#: templates/backup/tags.html:5 templates/backup/tags.html.py:28
 msgid "Tag list"
 msgstr ""
 
-#: templates/tags.html:31 templates/backup/tags.html:30
+#: templates/tags.html:31
 msgid "sorted alphabetically"
 msgstr ""
 
-#: templates/tags.html:31 templates/backup/tags.html:30
+#: templates/tags.html:31
 msgid "by name"
 msgstr ""
 
-#: templates/tags.html:32 templates/backup/tags.html:31
+#: templates/tags.html:32
 msgid "sorted by frequency of tag use"
 msgstr ""
 
-#: templates/tags.html:32 templates/backup/tags.html:31
+#: templates/tags.html:32
 msgid "by popularity"
 msgstr ""
 
-#: templates/tags.html:38 templates/backup/tags.html:37
+#: templates/tags.html:38
 msgid "All tags matching query"
 msgstr ""
 
-#: templates/tags.html:38 templates/backup/tags.html:37
+#: templates/tags.html:38
 msgid "all tags - make this empty in english"
 msgstr ""
 
-#: templates/tags.html:41 templates/backup/tags.html:40
+#: templates/tags.html:41
 msgid "Nothing found"
 msgstr ""
 
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
-#: templates/backup/unanswered.html:6 templates/backup/unanswered.html:17
-#: templates/tough/unanswered.html:5 templates/tough/unanswered.html.py:16
 msgid "Unanswered questions"
 msgstr ""
 
@@ -1988,41 +1884,39 @@ msgstr ""
 "<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
 "questions"
 
-#: templates/unanswered.html:99 templates/backup/questions.html:107
-#: templates/backup/unanswered.html:97
+#: templates/unanswered.html:99
 msgid "Have a total of"
 msgstr ""
 
-#: templates/user_edit.html:6 templates/backup/user_edit.html:4
+#: templates/user_edit.html:6
 msgid "Edit user profile"
 msgstr ""
 
-#: templates/user_edit.html:19 templates/backup/user_edit.html:17
+#: templates/user_edit.html:19
 msgid "edit profile"
 msgstr ""
 
-#: templates/user_edit.html:31 templates/backup/user_edit.html:29
+#: templates/user_edit.html:31
 msgid "image associated with your email address"
 msgstr ""
 
-#: templates/user_edit.html:31 templates/backup/user_edit.html:29
+#: templates/user_edit.html:31
 msgid "avatar"
-msgstr ""
+msgstr "<a href='/faq#gravatar'>gravatar</a>"
 
 #: templates/user_edit.html:36 templates/user_info.html:31
-#: templates/backup/user_edit.html:34 templates/backup/user_info.html:30
 msgid "Registered user"
 msgstr ""
 
-#: templates/user_edit.html:82 templates/backup/user_edit.html:80
+#: templates/user_edit.html:82
 msgid "Update"
 msgstr ""
 
-#: templates/user_info.html:34 templates/backup/user_info.html:33
+#: templates/user_info.html:34
 msgid "update profile"
 msgstr ""
 
-#: templates/user_info.html:40 templates/backup/user_info.html:39
+#: templates/user_info.html:40
 msgid "real name"
 msgstr ""
 
@@ -2030,35 +1924,59 @@ msgstr ""
 msgid "member for"
 msgstr ""
 
-#: templates/user_info.html:50 templates/backup/user_info.html:49
+#: templates/user_info.html:50
 msgid "last seen"
 msgstr ""
 
-#: templates/user_info.html:56 templates/backup/user_info.html:55
+#: templates/user_info.html:56
 msgid "user website"
 msgstr ""
 
-#: templates/user_info.html:62 templates/backup/user_info.html:61
+#: templates/user_info.html:62
 msgid "location"
 msgstr ""
 
-#: templates/user_info.html:69 templates/backup/user_info.html:68
+#: templates/user_info.html:69
 msgid "age"
 msgstr ""
 
-#: templates/user_info.html:70 templates/backup/user_info.html:69
+#: templates/user_info.html:70
 msgid "age unit"
-msgstr ""
+msgstr "years old"
 
-#: templates/user_info.html:75 templates/backup/user_info.html:74
+#: templates/user_info.html:76
 msgid "todays unused votes"
 msgstr ""
 
-#: templates/user_info.html:76 templates/backup/user_info.html:75
+#: templates/user_info.html:77
 msgid "votes left"
 msgstr ""
 
-#: templates/user_stats.html:15 templates/backup/user_stats.html:14
+#: templates/user_preferences.html:10
+msgid "Connect with Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:12
+msgid "Twitter account name:"
+msgstr ""
+
+#: templates/user_preferences.html:14
+msgid "Twitter password:"
+msgstr ""
+
+#: templates/user_preferences.html:16
+msgid "Send my Questions to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:17
+msgid "Send my Answers to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:18
+msgid "Save"
+msgstr ""
+
+#: templates/user_stats.html:15
 msgid "User questions"
 msgstr ""
 
@@ -2067,198 +1985,268 @@ msgstr ""
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:37 templates/backup/user_stats.html:36
+#: templates/user_stats.html:37
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:43 templates/backup/user_stats.html:42
+#: templates/user_stats.html:43
 #, python-format
 msgid "the answer has been commented %(answered_question.comment_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:56 templates/backup/user_stats.html:55
+#: templates/user_stats.html:56
 msgid "votes total"
 msgstr "Votes"
 
-#: templates/user_stats.html:65 templates/backup/user_stats.html:64
+#: templates/user_stats.html:65
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:70 templates/backup/user_stats.html:69
+#: templates/user_stats.html:70
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:84 templates/backup/user_stats.html:83
+#: templates/user_stats.html:84
 msgid "Tags"
 msgstr ""
 
-#: templates/user_stats.html:94 templates/backup/user_stats.html:93
+#: templates/user_stats.html:94
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
 
-#: templates/user_tabs.html:7 templates/backup/user_tabs.html:6
+#: templates/user_tabs.html:7
 msgid "User profile"
 msgstr ""
 
-#: templates/user_tabs.html:16 templates/backup/user_tabs.html:15
+#: templates/user_tabs.html:16
 msgid "graph of user reputation"
 msgstr ""
 
-#: templates/user_tabs.html:17 templates/backup/user_tabs.html:16
+#: templates/user_tabs.html:17
 msgid "reputation history"
 msgstr ""
 
-#: templates/user_tabs.html:24 templates/backup/user_tabs.html:23
+#: templates/user_tabs.html:24
 msgid "favorites"
 msgstr ""
 
-#: templates/user_tabs.html:29 templates/backup/user_tabs.html:28
+#: templates/user_tabs.html:28
 msgid "settings"
 msgstr ""
 
 #: templates/users.html:6 templates/users.html.py:24
-#: templates/backup/users.html:5 templates/backup/users.html.py:23
 msgid "Users"
 msgstr ""
 
-#: templates/users.html:27 templates/backup/users.html:26
+#: templates/users.html:27
 msgid "recent"
 msgstr ""
 
-#: templates/users.html:28 templates/backup/users.html:27
+#: templates/users.html:28
 msgid "oldest"
 msgstr ""
 
-#: templates/users.html:29 templates/backup/users.html:28
+#: templates/users.html:29
 msgid "by username"
 msgstr ""
 
-#: templates/users.html:35 templates/backup/users.html:34
+#: templates/users.html:35
 #, python-format
 msgid "users matching query %(suser)s:"
 msgstr ""
 
-#: templates/users.html:39 templates/backup/users.html:38
+#: templates/users.html:39
 msgid "Nothing found."
 msgstr ""
 
-#: templates/users_questions.html:11 templates/backup/users_questions.html:10
+#: templates/users_questions.html:11
 msgid "this questions was selected as favorite"
 msgstr ""
 
-#: templates/users_questions.html:33 templates/backup/users_questions.html:32
+#: templates/users_questions.html:33
 msgid "this answer has been accepted to be correct"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:6
-msgid "Account: change email"
-msgstr ""
+#: templates/authopenid/changeemail.html:7
+#: templates/authopenid/changeemail.html:33
+msgid "Change email"
+msgstr "Change Email"
 
-#: templates/authopenid/changeemail.html:9
-msgid ""
-"This is where you can change the email address associated with your account. "
-"Please keep this email address up to date so we can send you a password-"
-"reset email if you request one."
+#: templates/authopenid/changeemail.html:10
+#, python-format
+msgid "change %(email)s info"
 msgstr ""
+"<span class=\"strong big\">Enter your new email into the box below</span> if "
+"you'd like to use another email for <strong>update subscriptions</strong>."
+"<br>Currently you are using <strong>%(email)s</strong>"
 
-#: templates/authopenid/changeemail.html:11
-#: templates/authopenid/changeopenid.html:13
-#: templates/authopenid/changepw.html:18 templates/authopenid/delete.html:14
-#: templates/authopenid/delete.html:24
+#: templates/authopenid/changeemail.html:13
+#: templates/authopenid/changeopenid.html:14
+#: templates/authopenid/changepw.html:19 templates/authopenid/delete.html:15
+#: templates/authopenid/delete.html:25
 msgid "Please correct errors below:"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:28
-msgid "Email"
+#: templates/authopenid/changeemail.html:30
+msgid "Your new Email"
 msgstr ""
+"<strong>Your new Email:</strong> (will <strong>not</strong> be shown to "
+"anyone, must be valid)"
 
-#: templates/authopenid/changeemail.html:29
-#: templates/authopenid/signin.html:59
+#: templates/authopenid/changeemail.html:31
+#: templates/authopenid/signin.html:138
 msgid "Password"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:31
-msgid "Change email"
+#: templates/authopenid/changeemail.html:42
+msgid "Validate email"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:45
+#, python-format
+msgid "validate %(email)s info"
+msgstr ""
+"<span class=\"strong big\">An email with a validation link has been sent to %"
+"(email)s.</span> Please <strong>follow the emailed link</strong> with your "
+"web browser. Email validation is necessary to help insure the proper use of "
+"email on <span class=\"orange\">NMR Wiki Q&A</span>. If you would like to "
+"use <strong>another email</strong>, please <a href=\"/email/change/"
+"\"><strong>change it again</strong></a>."
+
+#: templates/authopenid/changeemail.html:50
+msgid "Email not changed"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:53
+#, python-format
+msgid "old %(email)s kept"
+msgstr ""
+"<span class=\"strong big\">Your email address %(email)s has not been changed."
+"</span> If you decide to change it later - you can always do it by editing "
+"it in your user profile or by using the <a href=\"/email/change/"
+"\"><strong>previous form</strong></a> again."
+
+#: templates/authopenid/changeemail.html:58
+msgid "Email changed"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:7
+#: templates/authopenid/changeemail.html:61
+#, python-format
+msgid "your current %(email)s can be used for this"
+msgstr ""
+"<span class='big strong'>Your email address is now set to %(email)s.</span> "
+"Updates on the questions that you like most will be sent to this address. "
+"Email notifications are sent once a day or less frequently - only when there "
+"are any news."
+
+#: templates/authopenid/changeemail.html:66
+msgid "Email verified"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:69
+msgid "thanks for verifying email"
+msgstr ""
+"<span class=\"big strong\">Thank you for verifying your email!</span> Now "
+"you can <strong>ask</strong> and <strong>answer</strong> questions. Also if "
+"you find a very interesting question you can <strong>subscribe for the "
+"updates</strong> - then will be notified about changes <strong>once a day</"
+"strong> or less frequently."
+
+#: templates/authopenid/changeemail.html:74
+msgid "email key not sent"
+msgstr "Validation email not sent"
+
+#: templates/authopenid/changeemail.html:77
+#, python-format
+msgid "email key not sent %(email)s change email here %(change_link)s"
+msgstr ""
+"<span class='big strong'>Your current email address %(email)s has been "
+"validated before</span> so the new key was not sent. You can <a href='%"
+"(change_link)s'>change</a> email used for update subscriptions if necessary."
+
+#: templates/authopenid/changeopenid.html:8
 msgid "Account: change OpenID URL"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:11
+#: templates/authopenid/changeopenid.html:12
 msgid ""
 "This is where you can change your OpenID URL. Make sure you remember it!"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:28
+#: templates/authopenid/changeopenid.html:29
 msgid "OpenID URL:"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:29
+#: templates/authopenid/changeopenid.html:30
 msgid "Change OpenID"
 msgstr ""
 
-#: templates/authopenid/changepw.html:13
+#: templates/authopenid/changepw.html:14
 msgid "Account: change password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:16
+#: templates/authopenid/changepw.html:17
 msgid "This is where you can change your password. Make sure you remember it!"
 msgstr ""
 
-#: templates/authopenid/changepw.html:26
+#: templates/authopenid/changepw.html:27
 msgid "Current password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:27
+#: templates/authopenid/changepw.html:28
 msgid "New password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:28
+#: templates/authopenid/changepw.html:29
 msgid "New password again"
 msgstr ""
 
-#: templates/authopenid/changepw.html:29 templates/authopenid/settings.html:28
+#: templates/authopenid/changepw.html:30 templates/authopenid/settings.html:29
 msgid "Change password"
 msgstr ""
 
-#: templates/authopenid/complete.html:4
+#: templates/authopenid/complete.html:5
 msgid "Connect your OpenID with this site"
-msgstr ""
+msgstr "New user signup"
 
-#: templates/authopenid/complete.html:7
+#: templates/authopenid/complete.html:8
 msgid "Connect your OpenID with your account on this site"
-msgstr ""
+msgstr "New user signup"
 
-#: templates/authopenid/complete.html:10
-msgid "Your OpenID is accepted. Please complete this to finish registration."
+#: templates/authopenid/complete.html:12
+#, python-format
+msgid "register new %(provider)s account info"
 msgstr ""
+"<p><span class=\"big strong\">You are here for the first time with your %"
+"(provider)s login.</span> Please create your <strong>screen name</strong> "
+"and save your <strong>email</strong> address. Saved email address will let "
+"you <strong>subscribe for the updates</strong> on the most interesting "
+"questions and will be used to create and retrieve your unique avatar image - "
+"<a href='/faq#gravatar'><strong>gravatar</strong></a>."
 
-#: templates/authopenid/complete.html:11
+#: templates/authopenid/complete.html:14
 msgid "This account already exists, please use another."
 msgstr ""
 
-#: templates/authopenid/complete.html:16 templates/authopenid/complete.html:29
-#: templates/authopenid/signin.html:42
+#: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
+#: templates/authopenid/signin.html:121
 msgid "Sorry, looks like we have some errors:"
 msgstr ""
 
-#: templates/authopenid/complete.html:45
-msgid "New account"
-msgstr ""
-
-#: templates/authopenid/complete.html:46
-msgid "User name (<i>will be shown to others, cannot be modified</i>)"
-msgstr ""
-
 #: templates/authopenid/complete.html:47
-msgid "Email (<i>not shared with anyone</i>)"
-msgstr ""
+msgid "Screen name label"
+msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)"
 
 #: templates/authopenid/complete.html:48
-msgid "create account"
+msgid "Email address label"
 msgstr ""
+"<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with "
+"anyone, must be valid</i>)"
+
+#: templates/authopenid/complete.html:49
+msgid "create account"
+msgstr "Signup"
 
 #: templates/authopenid/complete.html:56
 msgid "Existing account"
@@ -2276,265 +2264,328 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:61
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr ""
 
-#: templates/authopenid/delete.html:8
+#: templates/authopenid/confirm_email.txt:2
+msgid "Thank you for registering at our Q&A forum!"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:4
+msgid "Your account details are:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:6
+#: templates/authopenid/sendpw_email.txt:7
+msgid "Username:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:7
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:9
+msgid "Please sign in here:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:12
+#: templates/authopenid/email_validation.txt:14
+#: templates/authopenid/sendpw_email.txt:13
+msgid ""
+"Sincerely,\n"
+"Forum Administrator"
+msgstr ""
+
+#: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr ""
 
-#: templates/authopenid/delete.html:12
+#: templates/authopenid/delete.html:13
 msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
 msgstr ""
 
-#: templates/authopenid/delete.html:16
+#: templates/authopenid/delete.html:17
 msgid "Check confirm box, if you want delete your account."
 msgstr ""
 
-#: templates/authopenid/delete.html:19
-msgid "Password:"
-msgstr ""
-
-#: templates/authopenid/delete.html:31
+#: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr ""
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "Password/OpenID URL"
 msgstr ""
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "(required for your security)"
 msgstr ""
 
-#: templates/authopenid/delete.html:34
+#: templates/authopenid/delete.html:35
 msgid "Delete account permanently"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:3 templates/authopenid/sendpw.html.py:7
+#: templates/authopenid/email_validation.txt:2
+msgid "Greetings from the Q&A forum"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:4
+msgid "To make use of the Forum, please follow the link below:"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:8
+msgid "Following the link above will help us verify your email address."
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:10
+msgid ""
+"If you beleive that this message was sent in mistake - \n"
+"no further action is needed. Just ingore this email, we apologize\n"
+"for any inconvenience"
+msgstr ""
+
+#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:11
+#: templates/authopenid/sendpw.html:12
 msgid "Lost your password? No problem - here you can reset it."
 msgstr ""
 
-#: templates/authopenid/sendpw.html:12
+#: templates/authopenid/sendpw.html:13
 msgid ""
 "Please enter your username below and new password will be sent to your "
 "registered e-mail"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:29
+#: templates/authopenid/sendpw.html:28
+msgid "User name"
+msgstr ""
+
+#: templates/authopenid/sendpw.html:30
 msgid "Reset password"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:29
+#: templates/authopenid/sendpw.html:30
 msgid "return to login"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:32
+#: templates/authopenid/sendpw.html:33
 msgid ""
 "Note: your new password will be activated only after you click the "
 "activation link in the email message"
 msgstr ""
 
-#: templates/authopenid/settings.html:29
-msgid "Give your  account a new password."
+#: templates/authopenid/sendpw_email.txt:2
+#, python-format
+msgid ""
+"Someone has requested to reset your password on %(site_url)s.\n"
+"If it were not you, it is safe to ignore this email."
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:5
+msgid "Your new account details are:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:8
+msgid "New password:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:10
+msgid "To confirm that you wanted to reset your password please visit:"
 msgstr ""
 
 #: templates/authopenid/settings.html:30
-msgid "Change email "
+msgid "Give your  account a new password."
 msgstr ""
 
 #: templates/authopenid/settings.html:31
+msgid "Change email "
+msgstr ""
+
+#: templates/authopenid/settings.html:32
 msgid "Add or update the email address associated with your account."
 msgstr ""
 
-#: templates/authopenid/settings.html:34
+#: templates/authopenid/settings.html:35
 msgid "Change openid associated to your account"
 msgstr ""
 
-#: templates/authopenid/settings.html:37
+#: templates/authopenid/settings.html:38
 msgid "Delete account"
 msgstr ""
 
-#: templates/authopenid/settings.html:38
+#: templates/authopenid/settings.html:39
 msgid "Erase your username and all your data from website"
 msgstr ""
 
-#: templates/authopenid/signin.html:3 templates/authopenid/signin.html:16
+#: templates/authopenid/signin.html:4 templates/authopenid/signin.html:21
 msgid "User login"
+msgstr "User login"
+
+#: templates/authopenid/signin.html:28
+#, python-format
+msgid ""
+"\n"
+"                Your answer to %(title)s %(summary)s will be posted once you "
+"log in\n"
+"                "
 msgstr ""
+"\n"
+"<span class=\"strong big\">Your answer to </span> <i>\"<strong>%(title)s</"
+"strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
+"posted once you log in.</span>"
 
-#: templates/authopenid/signin.html:21
-msgid "we support two login modes"
+#: templates/authopenid/signin.html:35
+#, python-format
+msgid ""
+"Your question \n"
+"                %(title)s %(summary)s will be posted once you log in\n"
+"                "
 msgstr ""
-"You can log in either through one of these services or traditionally - using "
-"local username/password."
+"<span class=\"strong big\">Your question</span> <i>\"<strong>%(title)s</"
+"strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
+"posted once you log in.</span>"
 
-#: templates/authopenid/signin.html:26 templates/authopenid/signup.html:49
-msgid "Login with your OpenID"
+#: templates/authopenid/signin.html:40
+msgid "Click to sign in through any of these services."
 msgstr ""
+"<p><span class=\"big strong\">We accept <a href=\"http://openid.net"
+"\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new "
+"password - log in through any of the services below.<p><span class=\"big "
+"strong\">1. Select the login service by clicking one of the icons</span></p>"
 
-#: templates/authopenid/signin.html:28
-msgid "select openid provider"
-msgstr "1) Please select your id service provider."
+#: templates/authopenid/signin.html:103
+msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
+msgstr ""
+"<span class=\"big strong\">2. Enter your <span id=\"enter_your_what"
+"\">Provider user name</span></span><br>(or select another OpenID provider "
+"above)"
 
-#: templates/authopenid/signin.html:32
-msgid "verify openid link and login"
+#: templates/authopenid/signin.html:110
+msgid ""
+"Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
+"web address"
 msgstr ""
-"2) Please verify the OpenID URL (type your login name over {username}, if present)"
-" and then log in."
+"<span class=\"big strong\">2. Enter your <a class=\"openid_logo\" href="
+"\"http://openid.net\">OpenID</a> web address</span><br>(or choose specific "
+"provider by clicking on one of the icons above)"
 
-#: templates/authopenid/signin.html:57
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
+msgid "Login"
+msgstr ""
+
+#: templates/authopenid/signin.html:116
+msgid "we support two login modes"
+msgstr ""
+"You can log in either through one of these services or traditionally - using "
+"local username/password."
+
+#: templates/authopenid/signin.html:136
 msgid "Use login name and password"
 msgstr ""
 
-#: templates/authopenid/signin.html:58
+#: templates/authopenid/signin.html:137
 msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:62
-msgid "Create new acccount"
+#: templates/authopenid/signin.html:141
+msgid "Create new account"
 msgstr ""
 
-#: templates/authopenid/signin.html:71
+#: templates/authopenid/signin.html:150
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:75
+#: templates/authopenid/signin.html:154
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:78
+#: templates/authopenid/signin.html:157
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:81
+#: templates/authopenid/signin.html:160
 msgid "openid is widely adopted"
 msgstr ""
 "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
 "enabled."
 
-#: templates/authopenid/signin.html:84
+#: templates/authopenid/signin.html:163
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:88
+#: templates/authopenid/signin.html:167
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:89
+#: templates/authopenid/signin.html:168
 msgid "Get OpenID"
 msgstr ""
 
-#: templates/authopenid/signup.html:2 templates/authopenid/signup.html.py:6
+#: templates/authopenid/signup.html:4 templates/authopenid/signup.html.py:8
 msgid "Signup"
 msgstr ""
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid ""
 "We support two types of user registration: conventional username/password, "
 "and"
 msgstr ""
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid "the OpenID method"
 msgstr ""
 
-#: templates/authopenid/signup.html:15
+#: templates/authopenid/signup.html:17
 msgid "Sorry, looks like we have some errors"
 msgstr ""
 
-#: templates/authopenid/signup.html:33
+#: templates/authopenid/signup.html:35
 msgid "Conventional registration"
 msgstr ""
 
-#: templates/authopenid/signup.html:34
+#: templates/authopenid/signup.html:36
 msgid "choose a user name"
 msgstr ""
 
-#: templates/authopenid/signup.html:40
+#: templates/authopenid/signup.html:42
 msgid "back to login"
 msgstr ""
 
-#: templates/authopenid/signup.html:46
+#: templates/authopenid/signup.html:48
 msgid "Register with your OpenID"
 msgstr ""
 
-#
-#: templates/backup/answer_edit_tips.html:3
-#: templates/backup/question_edit_tips.html:2
-msgid "editing tips"
-msgstr "Tips"
-
-#: templates/backup/questions.html:108
-msgid "number of questions"
-msgstr ""
-
-#: templates/backup/questions.html:110
-msgid "tagged with"
-msgstr ""
-
-#: templates/backup/questions.html:116
-msgid "whose title contains"
-msgstr ""
-
-#: templates/backup/questions.html:121
-msgid "number of questions end of sentence."
-msgstr ""
-
-#: templates/backup/questions.html:123
-msgid "Questions are sorted by <strong>entry date</strong>."
-msgstr ""
-
-#: templates/backup/questions.html:123
-msgid "Newest questions shown first."
-msgstr ""
-"Questions are sorted by <strong>entry date</strong>.Newest questions shown "
-"first."
-
-#: templates/backup/unanswered.html:98 templates/tough/unanswered.html:95
-msgid "number of <strong>unanswered</strong> questions"
-msgstr ""
-
-#: templates/backup/user_info.html:44
-msgid "member since"
-msgstr ""
-
-#: templates/backup/user_stats.html:36
-#, python-format
-msgid "the answer has been voted for %(answered_question.vote_count)s times"
+#: templates/authopenid/signup.html:51
+msgid "Login with your OpenID"
 msgstr ""
 
-#: templates/tough/question_retag.html:2
-msgid "Revise tags"
-msgstr ""
+#~ msgid "what is this website"
+#~ msgstr ""
+#~ "This is a collaboratively edited question and answer site for the "
+#~ "Magnetic Resonance specialists."
 
-#: templates/tough/question_retag.html:37
-msgid "tags are requried"
-msgstr ""
-
-#: templates/tough/question_retag.html:38
-msgid "up to 5 tags, less than 20 characters each"
-msgstr ""
+#
+#~ msgid "editing tips"
+#~ msgstr "Tips"
 
-#: templates/tough/question_retag.html:51
-msgid "Change tags"
-msgstr ""
+#~ msgid "Newest questions shown first."
+#~ msgstr ""
+#~ "Questions are sorted by <strong>entry date</strong>.Newest questions "
+#~ "shown first."
 
-#: templates/tough/question_retag.html:74
-msgid "Change now"
-msgstr ""
+#~ msgid ""
+#~ "please use space to separate tags (this enables autocomplete feature)"
+#~ msgstr "please use space to separate tags (uses autocomplete utility)"
 
-#: templates/tough/question_retag.html:85
-msgid "Why use and modify tags?"
-msgstr ""
+#~ msgid "select openid provider"
+#~ msgstr "1) Please select your id service provider."
 
-#: templates/tough/question_retag.html:96
-msgid "tag editors receive special awards from the community"
-msgstr ""
+#~ msgid "verify openid link and login"
+#~ msgstr ""
+#~ "2) Please verify the OpenID URL (type your login name over {username}, if "
+#~ "present) and then log in."
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
deleted file mode 100644
index 7e934ecf..00000000
Binary files a/locale/es/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 6801907c..a8ac642a 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-23 01:11-0300\n"
+"POT-Creation-Date: 2009-08-05 22:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,19 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:27
+#: settings.py:12
 msgid "account/"
 msgstr "cuenta/"
 
-#: settings.py:27 django_authopenid/urls.py:9 django_authopenid/urls.py:11
+#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:10
+#: django_authopenid/urls.py:11 django_authopenid/urls.py:13
+#: forum/views.py:304 templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr "ingresar/"
 
-#: django_authopenid/forms.py:67 django_authopenid/views.py:93
+#: django_authopenid/forms.py:67 django_authopenid/views.py:102
 msgid "i-names are not supported"
 msgstr "i-names no son soportados"
 
-#: django_authopenid/forms.py:102 django_authopenid/forms.py:207
+#: django_authopenid/forms.py:102
 msgid ""
 "Usernames can only contain                     letters, numbers and "
 "underscores"
@@ -42,7 +44,7 @@ msgstr ""
 "Este nombre de usuario no existe en nuestra base de datos. Por favor elija "
 "otro."
 
-#: django_authopenid/forms.py:126 django_authopenid/forms.py:231
+#: django_authopenid/forms.py:126 django_authopenid/forms.py:233
 msgid ""
 "Please enter a valid                     username and password. Note that "
 "both fields are                     case-sensitive."
@@ -50,11 +52,11 @@ msgstr ""
 "Por favor ingrese un usuario y contraseña validos. Ambos campos son "
 "sensibles a mayúsculas y minúsculas."
 
-#: django_authopenid/forms.py:130 django_authopenid/forms.py:235
+#: django_authopenid/forms.py:130 django_authopenid/forms.py:237
 msgid "This account is inactive."
 msgstr "Esta cuenta esta inactiva."
 
-#: django_authopenid/forms.py:158
+#: django_authopenid/forms.py:158 django_authopenid/forms.py:210
 msgid "invalid user name"
 msgstr "nombre de usuario no valido"
 
@@ -71,126 +73,136 @@ msgstr "nombre de usuario muy corto"
 msgid "this name is already in use - please try anoter"
 msgstr "este nombre ya está tomado - por favor intente con otro"
 
-#: django_authopenid/forms.py:184
+#: django_authopenid/forms.py:185
 msgid ""
-"This email is already                 registered in our database. Please "
-"choose another."
+"This email is already                         registered in our database. "
+"Please choose another."
 msgstr ""
 "Este email ya está registrado en nuestra base de datos. Por favor, intente "
 "con otro."
 
-#: django_authopenid/forms.py:214
+#: django_authopenid/forms.py:216
 msgid ""
 "This username don't exist.                         Please choose another."
 msgstr "Este nombre de usuario no existe, por favor ingrese otro."
 
-#: django_authopenid/forms.py:253
+#: django_authopenid/forms.py:255
 msgid "choose a username"
 msgstr "elija un nombre de usuario"
 
-#: django_authopenid/forms.py:255 templates/authopenid/signup.html:36
+#: django_authopenid/forms.py:257 templates/authopenid/signup.html:38
 msgid "your email address"
 msgstr "su email (correo electrónico)"
 
-#: django_authopenid/forms.py:257 templates/authopenid/signup.html:37
+#: django_authopenid/forms.py:259 templates/authopenid/signup.html:39
 msgid "choose password"
 msgstr "elija una contraseña"
 
-#: django_authopenid/forms.py:259 templates/authopenid/signup.html:38
+#: django_authopenid/forms.py:261 templates/authopenid/signup.html:40
 msgid "retype password"
 msgstr "re-ingrese la contraseña"
 
-#: django_authopenid/forms.py:330
+#: django_authopenid/forms.py:335
 msgid ""
 "Old password is incorrect.                     Please enter the correct "
 "password."
 msgstr "La antigua contraseña es incorrecta. Por favor ingrese la correcta"
 
-#: django_authopenid/forms.py:342
+#: django_authopenid/forms.py:347
 msgid "new passwords do not match"
 msgstr "la nueva contraseña no coincide"
 
-#: django_authopenid/forms.py:434
+#: django_authopenid/forms.py:442
 msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
 #: django_authopenid/urls.py:10
+#, fuzzy
+msgid "newquestion/"
+msgstr "pregunta"
+
+#: django_authopenid/urls.py:11
+#, fuzzy
+msgid "newanswer/"
+msgstr "resputa"
+
+#: django_authopenid/urls.py:12
 msgid "signout/"
 msgstr "salir/"
 
-#: django_authopenid/urls.py:11
+#: django_authopenid/urls.py:13
 msgid "complete/"
 msgstr "completado/"
 
-#: django_authopenid/urls.py:13
+#: django_authopenid/urls.py:15
 msgid "register/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:14
+#: django_authopenid/urls.py:16
 msgid "signup/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:16
+#: django_authopenid/urls.py:18
 msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
-#: django_authopenid/urls.py:26
+#: django_authopenid/urls.py:29
 msgid "delete/"
 msgstr "borrar/"
 
-#: django_authopenid/views.py:99
+#: django_authopenid/views.py:108
 #, python-format
-msgid "非法OpenID地址： %s"
+msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:366
+#: django_authopenid/views.py:417 django_authopenid/views.py:544
 msgid "Welcome"
 msgstr "Bienvenido"
 
-#: django_authopenid/views.py:456
+#: django_authopenid/views.py:507
 msgid "Password changed."
 msgstr "Contraseña modificada"
 
-#: django_authopenid/views.py:488
-msgid "Email changed."
-msgstr "Email modificado."
+#: django_authopenid/views.py:519 django_authopenid/views.py:524
+msgid "your email needs to be validated"
+msgstr ""
 
-#: django_authopenid/views.py:519 django_authopenid/views.py:671
+#: django_authopenid/views.py:681 django_authopenid/views.py:833
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr "La OpenID %s no esta asociada en nuestra base de datos"
 
-#: django_authopenid/views.py:523 django_authopenid/views.py:678
+#: django_authopenid/views.py:685 django_authopenid/views.py:840
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr "La OpenID %s no esta asociada al usuario actualmente autenticado"
 
-#: django_authopenid/views.py:531
+#: django_authopenid/views.py:693
 msgid "Email Changed."
 msgstr "Email modificado"
 
-#: django_authopenid/views.py:606
+#: django_authopenid/views.py:768
 msgid "This OpenID is already associated with another account."
 msgstr "Esta OpenID ya está asociada a otra cuenta."
 
-#: django_authopenid/views.py:611
+#: django_authopenid/views.py:773
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr "La OpenID %s está ahora asociada con tu cuenta."
 
-#: django_authopenid/views.py:681
+#: django_authopenid/views.py:843
 msgid "Account deleted."
 msgstr "Cuenta borrada."
 
-#: django_authopenid/views.py:721
+#: django_authopenid/views.py:883
 msgid "Request for new password"
 msgstr "Pedir nueva contraseña"
 
-#: django_authopenid/views.py:734
+#: django_authopenid/views.py:896
 msgid "A new password has been sent to your email address."
 msgstr "Una nueva contraseña ha sido enviada a tu cuenta de Email."
 
-#: django_authopenid/views.py:764
+#: django_authopenid/views.py:926
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
@@ -199,7 +211,7 @@ msgstr ""
 "No se ha podido modificar la contraseña. La clave de confirmación '%s' no "
 "está registrada"
 
-#: django_authopenid/views.py:773
+#: django_authopenid/views.py:935
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
@@ -207,7 +219,7 @@ msgstr ""
 "No se puede cambiar la contraseña. El usuario no existe más en nuestra base "
 "de datos."
 
-#: django_authopenid/views.py:782
+#: django_authopenid/views.py:944
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr "Contraseña cambiada por %s. Ahora puedes ingresar."
@@ -328,34 +340,21 @@ msgstr "versión inicial"
 msgid "retagged"
 msgstr "re-etiquetada"
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-#: templates/faq.html:25 templates/faq.html.py:108 templates/tough/faq.html:23
-#: templates/tough/faq.html.py:106 templates/tough/question_retag.html:89
-msgid "site title"
-msgstr "titulo del sitio"
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid " - "
 msgstr " - "
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-msgid "site slogan"
-msgstr " slogan del sitio"
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid "latest questions"
 msgstr "últimas preguntas"
 
-#: forum/feed.py:20 templates/index.html:8
-msgid "meta site content"
-msgstr "meta descripción"
-
-#: forum/feed.py:22
-msgid "copyright message"
-msgstr "mensaje de copyright"
+#: forum/feed.py:19
+#, fuzzy
+msgid "questions/"
+msgstr "preguntas"
 
 #: forum/forms.py:14 templates/answer_edit_tips.html:34
-#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31
 #: templates/question_edit_tips.html:36
 msgid "title"
 msgstr "titulo"
@@ -380,25 +379,24 @@ msgstr "el contenido de la pregunta debe ser al menos de 10 caracteres"
 msgid "tags"
 msgstr "etiquetas"
 
-#: forum/forms.py:46
-msgid "please use space to separate tags (this enables autocomplete feature)"
+#: forum/forms.py:47
+msgid ""
+"Tags are short keywords, with no spaces within. Up to five tags can be used."
 msgstr ""
-"por favor utilice espacio para separar las etiquetas (esto habilitael auto-"
-"completado)"
 
-#: forum/forms.py:53
+#: forum/forms.py:54 templates/question_retag.html:38
 msgid "tags are required"
 msgstr "las etiquetas son requeridas"
 
-#: forum/forms.py:57
+#: forum/forms.py:58
 msgid "please use 5 tags or less"
 msgstr "por favor use 5 o menos etiquetas"
 
-#: forum/forms.py:60
+#: forum/forms.py:61
 msgid "tags must be shorter than 20 characters"
 msgstr "las etiquetas deben ser menores a 20 caracteres"
 
-#: forum/forms.py:64
+#: forum/forms.py:65
 msgid ""
 "please use following characters in tags: letters 'a-z', numbers, and "
 "characters '.-_#'"
@@ -406,15 +404,14 @@ msgstr ""
 "por favor use solo los siguientes caracteres en los nombres de etiquetas: "
 "letras 'a-z', números y caracteres '.-_#'"
 
-#: forum/forms.py:74 templates/index.html:56 templates/question.html:196
-#: templates/question.html.py:377 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:199
+#: templates/question.html.py:380 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
-#: templates/unanswered.html.py:60 templates/tough/unanswered.html:46
-#: templates/tough/unanswered.html.py:58
+#: templates/unanswered.html.py:60
 msgid "community wiki"
 msgstr "wiki de comunidad"
 
-#: forum/forms.py:75
+#: forum/forms.py:76
 msgid ""
 "if you choose community wiki option, the question and answer do not generate "
 "points and name of author will not be shown"
@@ -422,11 +419,11 @@ msgstr ""
 "si marca la opción 'wiki de comunidad', la pregunta y respuestas no generan "
 "puntos y el nombre del autor no será mostrado"
 
-#: forum/forms.py:84
+#: forum/forms.py:89
 msgid "update summary:"
 msgstr "resumen de modificación"
 
-#: forum/forms.py:85
+#: forum/forms.py:90
 msgid ""
 "enter a brief summary of your revision (e.g. fixed spelling, grammar, "
 "improved style, this field is optional)"
@@ -434,48 +431,72 @@ msgstr ""
 "ingresa un breve resumen de tu revisión (ej. error ortográfico, gramática, "
 "mejoras de estilo. Este campo es opcional."
 
-#: forum/forms.py:160
+#: forum/forms.py:175
 msgid "this email does not have to be linked to gravatar"
 msgstr "este email no tiene porque estar asociado a un Gravatar"
 
-#: forum/forms.py:161
+#: forum/forms.py:176
 msgid "Real name"
 msgstr "Nombre real"
 
-#: forum/forms.py:162
+#: forum/forms.py:177
 msgid "Website"
 msgstr "Sitio Web"
 
-#: forum/forms.py:163
+#: forum/forms.py:178
 msgid "Location"
 msgstr "Ubicación"
 
-#: forum/forms.py:164
+#: forum/forms.py:179
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: forum/forms.py:164
+#: forum/forms.py:179
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD"
 
-#: forum/forms.py:165 templates/base.html:64
-#: templates/authopenid/settings.html:20
+#: forum/forms.py:180 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr "Perfil"
 
-#: forum/forms.py:190 forum/forms.py:191
+#: forum/forms.py:207 forum/forms.py:208
 msgid "this email has already been registered, please use another one"
 msgstr "este email ya ha sido registrado, por favor use otro"
 
-#: forum/models.py:316 templates/badges.html:51
+#: forum/models.py:238
+#, fuzzy, python-format
+msgid "%(author)s modified the question"
+msgstr "Cerrar la pregunta"
+
+#: forum/models.py:242
+#, python-format
+msgid "%(people)s posted %(new_answer_count)s new answers"
+msgstr ""
+
+#: forum/models.py:247
+#, fuzzy, python-format
+msgid "%(people)s commented the question"
+msgstr "pregunta comentada"
+
+#: forum/models.py:252
+#, fuzzy, python-format
+msgid "%(people)s commented answers"
+msgstr "respuesta comentada"
+
+#: forum/models.py:254
+#, fuzzy, python-format
+msgid "%(people)s commented the answer"
+msgstr "respuesta comentada"
+
+#: forum/models.py:433 templates/badges.html:52
 msgid "gold"
 msgstr "oro"
 
-#: forum/models.py:317 templates/badges.html:59
+#: forum/models.py:434 templates/badges.html:60
 msgid "silver"
 msgstr "plata"
 
-#: forum/models.py:318 templates/badges.html:66
+#: forum/models.py:435 templates/badges.html:67
 msgid "bronze"
 msgstr "bronze"
 
@@ -555,7 +576,7 @@ msgstr "perfil - votos"
 msgid "preferences"
 msgstr "preferencias"
 
-#: forum/user.py:69 templates/user_tabs.html:28
+#: forum/user.py:69 templates/user_tabs.html:27
 msgid "user preference settings"
 msgstr "preferencias del usuario"
 
@@ -563,28 +584,43 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:1730
+#: forum/views.py:304
+#, fuzzy
+msgid "/account/"
+msgstr "cuenta/"
+
+#: forum/views.py:943
+#, python-format
+msgid "subscription saved, %(email)s needs validation"
+msgstr ""
+
+#: forum/views.py:1853
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr "para subir imagenes debes tener más de 60 puntos de reputación"
 
-#: forum/views.py:1732
+#: forum/views.py:1855
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', "
 "'tiff'"
 
-#: forum/views.py:1734
+#: forum/views.py:1857
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1736
+#: forum/views.py:1859
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
 msgstr ""
 "Error al subir el archivo. Por favor, contacte al administrador. Gracias. %s"
 
+#: forum/management/commands/send_email_alerts.py:35
+#, fuzzy
+msgid "updates from website"
+msgstr "sitio web del usuario"
+
 #: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168
 #: templates/header.html:33
 msgid "badges"
@@ -642,6 +678,10 @@ msgstr "ver todas las preguntas"
 msgid "see all tags"
 msgstr "ver todas las tags"
 
+#: templates/500.html:22
+msgid "sorry, system error"
+msgstr ""
+
 #: templates/500.html:24
 msgid "system error log is recorded, error will be fixed as soon as possible"
 msgstr ""
@@ -668,19 +708,19 @@ msgid "Edit answer"
 msgstr "Editar respuesta"
 
 #: templates/answer_edit.html:24 templates/answer_edit.html.py:27
-#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:37
-#: templates/question.html.py:40 templates/question_edit.html:27
+#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40
+#: templates/question.html.py:43 templates/question_edit.html:27
 msgid "hide preview"
 msgstr "ocultar previsualización"
 
 #: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:40 templates/question_edit.html:27
+#: templates/question.html:43 templates/question_edit.html:27
 msgid "show preview"
 msgstr "ver previsualización"
 
 #: templates/answer_edit.html:47 templates/question_edit.html:65
-#: templates/revisions_answer.html:36 templates/revisions_question.html:36
-#: templates/tough/question_retag.html:51
+#: templates/question_retag.html:52 templates/revisions_answer.html:36
+#: templates/revisions_question.html:36
 msgid "back"
 msgstr "volver"
 
@@ -693,23 +733,25 @@ msgstr "revisión"
 msgid "select revision"
 msgstr "seleccionar revisión"
 
-#: templates/answer_edit.html:62 templates/ask.html:81
-#: templates/question.html:447 templates/question_edit.html:91
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 templates/question_edit.html:91
 msgid "Toggle the real time Markdown editor preview"
 msgstr "Activar la visualización en tiempo real de Markdown"
 
-#: templates/answer_edit.html:62 templates/ask.html:81
-#: templates/question.html:447 templates/question_edit.html:91
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr "Activar previsualización"
 
 #: templates/answer_edit.html:73 templates/question_edit.html:119
+#: templates/question_retag.html:75
 msgid "Save edit"
 msgstr "Guardar la edición"
 
 #: templates/answer_edit.html:74 templates/close.html:29
-#: templates/question_edit.html:120 templates/reopen.html:30
-#: templates/user_edit.html:83 templates/tough/question_retag.html:75
+#: templates/question_edit.html:120 templates/question_retag.html:76
+#: templates/reopen.html:30 templates/user_edit.html:83
+#: templates/authopenid/changeemail.html:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -753,24 +795,24 @@ msgstr "**negrita** o __negrita__"
 msgid "link"
 msgstr "enlace"
 
-#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:39
+#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:38
 #: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36
 msgid "text"
 msgstr "texto"
 
-#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36
 msgid "image"
 msgstr "imagen"
 
-#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:40
+#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40
 msgid "numbered list:"
 msgstr "lista numerada"
 
-#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:45
+#: templates/answer_edit_tips.html:47 templates/question_edit_tips.html:45
 msgid "basic HTML tags are also supported"
 msgstr "etiquetas básicas de HTML permitidas"
 
-#: templates/answer_edit_tips.html:51 templates/question_edit_tips.html:48
+#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48
 msgid "learn more about Markdown"
 msgstr "aprender mas sobre Markdown"
 
@@ -778,32 +820,25 @@ msgstr "aprender mas sobre Markdown"
 msgid "Ask a question"
 msgstr "Hacer una pregunta"
 
-#: templates/ask.html:106
-msgid "Use"
-msgstr "Usar"
-
-#: templates/ask.html:106
-msgid "learn more about OpenID"
-msgstr "aprender mas sobre OpenID"
-
-#: templates/ask.html:106 templates/authopenid/signin.html:35
-#: templates/authopenid/signin.html:61
-msgid "Login"
-msgstr "Ingresar"
+#: templates/ask.html:67
+#, fuzzy
+msgid "login to post question info"
+msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/ask.html:109
-msgid "Get your own "
-msgstr "Obtiene tu propio "
+#: templates/ask.html:73
+#, python-format
+msgid "must have valid %(email)s to post"
+msgstr ""
 
-#: templates/ask.html:117 templates/authopenid/sendpw.html:27
-msgid "User name"
-msgstr "Nombre de usuario"
+#: templates/ask.html:108
+msgid "(required)"
+msgstr ""
 
-#: templates/ask.html:120
-msgid "Email: (won't be shown to anyone)"
-msgstr "Email: (no será mostrado a nadie)"
+#: templates/ask.html:115
+msgid "Login/signup to post your question"
+msgstr ""
 
-#: templates/ask.html:127
+#: templates/ask.html:117
 msgid "Ask your question"
 msgstr "Haz tu pregunta"
 
@@ -824,72 +859,47 @@ msgid "Badges"
 msgstr "Distinciones"
 
 #: templates/badges.html:21
+msgid "Community gives you awards for your questions, answers and votes."
+msgstr "La comunidad te da distinciones por tus preguntas, respuestas y votos."
+
+#: templates/badges.html:22
+#, fuzzy
 msgid ""
-"Community gives you awards for your questions, answers and votes. Below is "
-"the list of available badges and number of times each type of badge has been "
-"awarded."
+"Below is the list of available badges and number of times each type of badge "
+"has been awarded."
 msgstr ""
 "La comunidad te condecora con distinciones por tus preguntas, respuestas y "
 "votos. Debajo esta la lista de las distinciones disponibles y la cantidad de "
 "veces que han sido asignadas."
 
-#: templates/badges.html:48
+#: templates/badges.html:49
 msgid "Community badges"
 msgstr "Distinciones de la comunidad"
 
-#: templates/badges.html:54
-msgid ""
-"Gold badge is very rare. To obtain it you have to show profound knowledge "
-"and ability in addition to actively participating in the community. Gold "
-"badge is the highest award in this community."
+#: templates/badges.html:55
+msgid "gold badge description"
 msgstr ""
 "Las distinciones de Oro son excepcionales. Para obtenerla debes demostrar un "
 "profundo conocimiento y habilidad además de participar activamente en la "
 "comunidad. La distinción de Oro es la condecoración máxima en esta comunidad"
 
-#: templates/badges.html:62
-msgid ""
-"Obtaining silver badge requires significant patience. If you got one, you've "
-"very significantly contributed to this community"
+#: templates/badges.html:63
+msgid "silver badge description"
 msgstr ""
 "Obtener una distinción de Plata requiere de paciencia. Si has logrado una, "
 "quiere decir que haz significativamente aportado a esta comunidad."
 
-#: templates/badges.html:65
+#: templates/badges.html:66
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 "distinción de bronce: con frecuencia entregada como reconocimiento especial."
 
-#: templates/badges.html:69
-msgid ""
-"If you are active in this community, you will get this medal - still it is a "
-"special honor."
+#: templates/badges.html:70
+msgid "bronze badge description"
 msgstr ""
 "Si eres un usuario activo de esta comunidad, recibirás esta distinción - de "
 "todas maneras es un honor especial."
 
-#: templates/base.html:62
-#, fuzzy
-msgid "Congratulations! You have new badges: "
-msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
-
-#: templates/base.html:63
-#, fuzzy
-msgid "go to see"
-msgstr "OK para cerrar"
-
-#: templates/base_content.html:61
-msgid "congratulations, community gave you a badge"
-msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
-
-#: templates/base_content.html:62
-msgid "see"
-msgstr "ver"
-
-#: templates/base_content.html:63
-msgid "profile"
-msgstr "perfil"
-
 #: templates/book.html:7
 msgid "reading channel"
 msgstr "canal de lectura"
@@ -956,9 +966,8 @@ msgstr "esta pregunta ha sido seleccionada como favorita"
 msgid "number of times"
 msgstr "numero de veces"
 
-#: templates/book.html:105 templates/index.html:47 templates/questions.html:46
+#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
 #: templates/unanswered.html:37 templates/users_questions.html:30
-#: templates/tough/unanswered.html:35
 msgid "votes"
 msgstr "votos"
 
@@ -966,18 +975,16 @@ msgstr "votos"
 msgid "the answer has been accepted to be correct"
 msgstr "la respuesta ha sido aceptada como correcta"
 
-#: templates/book.html:115 templates/index.html:48 templates/questions.html:47
+#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
 #: templates/unanswered.html:38 templates/users_questions.html:40
-#: templates/tough/unanswered.html:36
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: templates/book.html:125 templates/index.html:69 templates/question.html:115
+#: templates/question.html.py:486 templates/questions.html:84
+#: templates/questions.html.py:156 templates/tags.html:47
 #: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52 templates/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "using tags"
 msgstr "usando etiquetas"
 
@@ -1005,15 +1012,15 @@ msgstr "Razón"
 msgid "OK to close"
 msgstr "OK para cerrar"
 
-#: templates/faq.html:11 templates/tough/faq.html:9
+#: templates/faq.html:11
 msgid "Frequently Asked Questions "
 msgstr "Preguntas Frecuentes"
 
-#: templates/faq.html:15 templates/tough/faq.html:13
+#: templates/faq.html:16
 msgid "What kinds of questions can I ask here?"
 msgstr "¿Qué clase de preguntas puedo hacer aquí?"
 
-#: templates/faq.html:16 templates/tough/faq.html:14
+#: templates/faq.html:17
 msgid ""
 "Most importanly - questions should be <strong>relevant</strong> to this "
 "community."
@@ -1021,7 +1028,7 @@ msgstr ""
 "Por encima de todo - las preguntas deben ser <strong>relevantes</strong>a "
 "esta comunidad."
 
-#: templates/faq.html:17 templates/tough/faq.html:15
+#: templates/faq.html:18
 msgid ""
 "Before asking the question - please make sure to use search to see whether "
 "your question has alredy been answered."
@@ -1029,11 +1036,11 @@ msgstr ""
 "Antes de hacer tu pregunta - por favor usa el buscador para asegurarte que "
 "la pregunta no este ya hecha."
 
-#: templates/faq.html:20 templates/tough/faq.html:18
+#: templates/faq.html:21
 msgid "What questions should I avoid asking?"
 msgstr "¿Qué preguntas debería evitar preguntar?"
 
-#: templates/faq.html:21 templates/tough/faq.html:19
+#: templates/faq.html:22
 msgid ""
 "Please avoid asking questions that are not relevant to this community, too "
 "subjective and argumentative."
@@ -1041,11 +1048,15 @@ msgstr ""
 "Evita hacer preguntas que no son relevantes a la comunidad, demasiado "
 "subjetivas o argumentativas."
 
-#: templates/faq.html:24 templates/tough/faq.html:22
+#: templates/faq.html:27
 msgid "What should I avoid in my answers?"
 msgstr "¿Que debo evitar en mis respuestas?"
 
-#: templates/faq.html:25 templates/tough/faq.html:23
+#: templates/faq.html:28 templates/faq.html.py:132
+msgid "site title"
+msgstr "titulo del sitio"
+
+#: templates/faq.html:28
 msgid ""
 "is a Q&A site, not a discussion group. Therefore - please avoid having "
 "discussions in your answers, comment facility allows some space for brief "
@@ -1055,19 +1066,19 @@ msgstr ""
 "intenta evitar discusiones en tus respuestas. Los comentarios permiten "
 "realizar pequeñas discusiones."
 
-#: templates/faq.html:28 templates/tough/faq.html:26
+#: templates/faq.html:32
 msgid "Who moderates this community?"
 msgstr "¿Quién modera esta comunidad?"
 
-#: templates/faq.html:29 templates/tough/faq.html:27
+#: templates/faq.html:33
 msgid "The short answer is: <strong>you</strong>."
 msgstr "La respuesta corta es: <strong>tú</strong>"
 
-#: templates/faq.html:30 templates/tough/faq.html:28
+#: templates/faq.html:34
 msgid "This website is moderated by the users."
 msgstr "Este sitio es moderado por los usuarios."
 
-#: templates/faq.html:31 templates/tough/faq.html:29
+#: templates/faq.html:35
 msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
@@ -1075,120 +1086,83 @@ msgstr ""
 "El sistema de reputación permite a los usuarios adquirir autorización para "
 "realizar diversas tareas de moderación."
 
-#: templates/faq.html:34 templates/tough/faq.html:32
+#: templates/faq.html:40
 msgid "How does reputation system work?"
 msgstr "¿Cómo funciona el sistema de reputación?"
 
-#: templates/faq.html:35 templates/tough/faq.html:33
-msgid ""
-"Anyone can ask questions and give answers, points are not necessary for that."
-msgstr ""
-"Cualquier usuario puede hacer preguntas y dar respuestas, no es necesario "
-"tener reputación para ello."
-
-#: templates/faq.html:36 templates/tough/faq.html:34
-msgid ""
-"As we've said before, users help running this site. Point system helps "
-"select users who can administer this community."
-msgstr ""
-"Como dijimos antes, los usuarios ayudan a crear este sitio. El sistema de "
-"reputación permite seleccionar usuarios que pueden moderar esta comunidad."
-
-#: templates/faq.html:37 templates/tough/faq.html:35
-msgid ""
-"Reputation points roughly measure how community trusts you. These points are "
-"given to you directly by other members of the community."
-msgstr ""
-"Los puntos de reputación miden a groso modo que tan respetado eres en la "
-"comunidad. Los puntos son dados a ti directamente por otros miembros de la "
-"comunidad"
-
-#: templates/faq.html:40 templates/tough/faq.html:38
-msgid ""
-"For example, if you ask an interesting question or give a helpful answer, "
-"your input will be upvoted and you will gain more trust in the community."
-msgstr ""
-"Por ejemplo, si haces una pregunta interesante, o das una respuesta valiosa, "
-"tu entrada va a ser votada positivamente y tu ganarás confianza en la "
-"comunidad."
-
-#: templates/faq.html:41 templates/tough/faq.html:39
-msgid ""
-"If on the other hand someone gives a misleading answer, the answer will be "
-"voted down and he/she loses some points."
-msgstr ""
-"Si por el contrario, alguien da una respuesta que no corresponde, la "
-"respuesta será votada negativamente y el usuario perderá puntos."
-
-#: templates/faq.html:42 templates/tough/faq.html:40
-msgid ""
-"Each vote in favor will generate <strong>10</strong> points, each vote "
-"against will subtract <strong>2</strong> points."
-msgstr ""
-"Cada voto a favor generará <strong>10</strong> puntos, cada voto negativo "
-"restará <strong>2</strong> puntos."
-
-#: templates/faq.html:43 templates/tough/faq.html:41
-msgid ""
-"Through the votes of other people you can accumulate a maximum of "
-"<strong>200</strong> points."
-msgstr ""
-"A través del voto de otras personas puedes acumular un máximo de "
-"<strong>200</strong> puntos."
-
-#: templates/faq.html:44
-msgid "After accumulating certain number of points, you can do more:"
-msgstr "Luego de haber acumulado cierta cantidad de puntos, puedes hacer más:"
+#: templates/faq.html:41
+#, fuzzy
+msgid "Rep system summary"
+msgstr "resumen de modificación"
 
-#: templates/faq.html:52 templates/user_votes.html:14
-#: templates/tough/faq.html:50
+#: templates/faq.html:59 templates/user_votes.html:14
 msgid "upvote"
 msgstr "votar positivo"
 
-#: templates/faq.html:56 templates/tough/faq.html:54
+#: templates/faq.html:63
 msgid "use tags"
 msgstr "etiquetas usadas"
 
-#: templates/faq.html:60 templates/tough/faq.html:58
+#: templates/faq.html:68
 msgid "add comments"
 msgstr "agregar comentarios"
 
-#: templates/faq.html:64 templates/user_votes.html:16
-#: templates/tough/faq.html:62
+#: templates/faq.html:72 templates/user_votes.html:16
 msgid "downvote"
 msgstr "votar negativo"
 
-#: templates/faq.html:71 templates/tough/faq.html:69
+#: templates/faq.html:75
+#, fuzzy
+msgid "open and close own questions"
+msgstr "abrir cualquier pregunta cerrada"
+
+#: templates/faq.html:79
 msgid "retag questions"
 msgstr "re-etiquetar preguntas"
 
-#: templates/faq.html:75 templates/tough/faq.html:73
+#: templates/faq.html:83
 msgid "edit community wiki questions"
 msgstr "editar preguntas de la wiki comunitaria"
 
-#: templates/faq.html:79 templates/tough/faq.html:77
+#: templates/faq.html:87
 msgid "edit any answer"
 msgstr "editar cualquier pregunta"
 
-#: templates/faq.html:83 templates/tough/faq.html:81
+#: templates/faq.html:91
 msgid "open any closed question"
 msgstr "abrir cualquier pregunta cerrada"
 
-#: templates/faq.html:87 templates/tough/faq.html:85
+#: templates/faq.html:95
 msgid "delete any comment"
 msgstr "borrar cualquier comentario"
 
-#: templates/faq.html:91 templates/tough/faq.html:89
+#: templates/faq.html:99
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 "borrar cualquier pregunta o respuesta y realizar otras tareas de "
 "administración."
 
-#: templates/faq.html:98
+#: templates/faq.html:106
+msgid "how to validate email title"
+msgstr ""
+
+#: templates/faq.html:108
+msgid "how to validate email info"
+msgstr ""
+
+#: templates/faq.html:112
+msgid "what is gravatar"
+msgstr ""
+
+#: templates/faq.html:113
+msgid "gravatar faq info"
+msgstr ""
+
+#: templates/faq.html:116
 msgid "To register, do I need to create new password?"
 msgstr "¿Para registrarme, debo crearme una cuenta?"
 
-#: templates/faq.html:99 templates/tough/faq.html:97
+#: templates/faq.html:117
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
@@ -1196,19 +1170,19 @@ msgstr ""
 "No tienes porqué. Puedes ingresar usando cualquiera de los servicios que "
 "soportan OpenID, ej. Google, Yahoo, AOL, MyOpenID, etc."
 
-#: templates/faq.html:100 templates/tough/faq.html:98
+#: templates/faq.html:118
 msgid "Login now!"
 msgstr "Ingresa ahora!"
 
-#: templates/faq.html:103 templates/tough/faq.html:101
+#: templates/faq.html:123
 msgid "Why other people can edit my questions/answers?"
 msgstr "¿Porqué otras personas pueden editar mis preguntas y respuestas?"
 
-#: templates/faq.html:104 templates/tough/faq.html:102
+#: templates/faq.html:124
 msgid "Goal of this site is..."
 msgstr "El objetivo de este sitio es..."
 
-#: templates/faq.html:104 templates/tough/faq.html:102
+#: templates/faq.html:124
 msgid ""
 "So questions and answers can be edited like wiki pages by experienced users "
 "of this site and this improves the overall quality of the knowledge base "
@@ -1218,34 +1192,32 @@ msgstr ""
 "usuarios con experiencia, y esto mejora la calidad general del conocimiento "
 "guardado."
 
-#: templates/faq.html:105 templates/tough/faq.html:103
+#: templates/faq.html:125
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 "Si esta forma de funcionamiento no es de tu agrado, respetamos tu elección."
 
-#: templates/faq.html:107 templates/tough/faq.html:105
+#: templates/faq.html:129
 msgid "Still have questions?"
 msgstr "¿Aún tienes preguntas?"
 
-#: templates/faq.html:108
+#: templates/faq.html:130
 msgid "Please ask your question, help make our community better!"
 msgstr "Por favor haz tu pregunta, ¡ayudanos a mejorar nuestra comunidad!"
 
-#: templates/faq.html:108 templates/header.html:29 templates/header.html.py:60
-#: templates/tough/faq.html:106
+#: templates/faq.html:132 templates/header.html:29 templates/header.html.py:60
 msgid "questions"
 msgstr "preguntas"
 
-#: templates/faq.html:108 templates/index.html:121
-#: templates/tough/faq.html:106
+#: templates/faq.html:132 templates/index.html:121
 msgid "."
 msgstr ""
 
-#: templates/footer.html:7 templates/header.html:12 templates/index.html:83
+#: templates/footer.html:7 templates/header.html:14 templates/index.html:83
 msgid "about"
 msgstr "acerca de"
 
-#: templates/footer.html:8 templates/header.html:13 templates/index.html:84
+#: templates/footer.html:8 templates/header.html:15 templates/index.html:84
 msgid "faq"
 msgstr "preguntas frecuentes"
 
@@ -1269,11 +1241,11 @@ msgstr "envía comentarios"
 msgid "current revision"
 msgstr "revisión actual"
 
-#: templates/header.html:8
+#: templates/header.html:10
 msgid "logout"
 msgstr "salir"
 
-#: templates/header.html:10 templates/authopenid/signup.html:39
+#: templates/header.html:12 templates/authopenid/signup.html:41
 msgid "login"
 msgstr "entrar"
 
@@ -1289,7 +1261,7 @@ msgstr "usuarios"
 msgid "books"
 msgstr "libros"
 
-#: templates/header.html:34 templates/index.html:121
+#: templates/header.html:34
 msgid "unanswered questions"
 msgstr "sin respuesta"
 
@@ -1305,74 +1277,60 @@ msgstr "hacer una pregunta"
 msgid "search"
 msgstr "buscar"
 
-#: templates/index.html:6
+#: templates/index.html:7
 msgid "Home"
 msgstr "Inicio"
 
-#: templates/index.html:7
-msgid "meta site keywords, comma separated"
-msgstr "palabras claves"
-
-#: templates/index.html:21 templates/questions.html:7
+#: templates/index.html:22 templates/questions.html:7
 msgid "Questions"
 msgstr "Preguntas"
 
-#: templates/index.html:23
+#: templates/index.html:24
 msgid "last updated questions"
 msgstr "ultimas preguntas actualizadas"
 
-#: templates/index.html:23 templates/questions.html:25
-#: templates/unanswered.html:20 templates/tough/unanswered.html:18
+#: templates/index.html:24 templates/questions.html:25
+#: templates/unanswered.html:20
 msgid "newest"
 msgstr "más nuevas"
 
-#: templates/index.html:24 templates/questions.html:27
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest questions"
 msgstr "preguntas más calientes"
 
-#: templates/index.html:24 templates/questions.html:27
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest"
 msgstr "más calientes"
 
-#: templates/index.html:25 templates/questions.html:28
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted questions"
 msgstr "preguntas más votadas"
 
-#: templates/index.html:25 templates/questions.html:28
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted"
 msgstr "más votadas"
 
-#: templates/index.html:26
+#: templates/index.html:27
 msgid "all questions"
 msgstr "todas las preguntas"
 
-#: templates/index.html:46 templates/questions.html:45
+#: templates/index.html:47 templates/questions.html:45
 #: templates/unanswered.html:36 templates/users_questions.html:35
-#: templates/tough/unanswered.html:34
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: templates/index.html:69 templates/question.html:115
+#: templates/question.html.py:486 templates/questions.html:84
+#: templates/questions.html.py:156 templates/tags.html:47
 #: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52 templates/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
-#: templates/index.html:79
+#: templates/index.html:80
 msgid "welcome to website"
 msgstr "bienvenido a sitio"
 
-#: templates/index.html:81
-msgid "what is this website"
-msgstr "que es este sitio"
-
-#: templates/index.html:82
-msgid "what can one do on this website"
-msgstr "que puede uno hacer en este sitio"
-
 #: templates/index.html:89
 msgid "Recent tags"
 msgstr "Etiquetas recientes"
@@ -1407,7 +1365,8 @@ msgid "Still looking for more? See"
 msgstr "¿Aún sigues buscando más? Ver"
 
 #: templates/index.html:121
-msgid "complete list of quesionts"
+#, fuzzy
+msgid "complete list of questions"
 msgstr "lista completa de preguntas"
 
 #: templates/index.html:121
@@ -1418,6 +1377,11 @@ msgstr "ó"
 msgid "Please help us answer"
 msgstr "Ayudanos a responder"
 
+#: templates/index.html:121
+#, fuzzy
+msgid "list of unanswered questions"
+msgstr "sin respuesta"
+
 #: templates/logout.html:6 templates/logout.html.py:17
 msgid "Logout"
 msgstr "Salir"
@@ -1442,19 +1406,19 @@ msgstr "entradas por página"
 msgid "previous"
 msgstr "previo"
 
-#: templates/paginator.html:20
+#: templates/paginator.html:19
 msgid "current page"
 msgstr "página actúal"
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "page number "
 msgstr "número de página"
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "number - make blank in english"
 msgstr " "
 
-#: templates/paginator.html:34
+#: templates/paginator.html:33
 msgid "next page"
 msgstr "próxima página"
 
@@ -1502,75 +1466,75 @@ msgstr "Cambios de Códigos"
 msgid "how privacy policies can be changed"
 msgstr "como pueden ser cambiados los códigos de privacidad"
 
-#: templates/question.html:66 templates/question.html.py:78
+#: templates/question.html:69 templates/question.html.py:81
 msgid "i like this post (click again to cancel)"
 msgstr "Me gusta esta entrada (clickear devuelta para cancelar)"
 
-#: templates/question.html:68 templates/question.html.py:80
-#: templates/question.html:273
+#: templates/question.html:71 templates/question.html.py:83
+#: templates/question.html:276
 msgid "current number of votes"
 msgstr "número actual de votos"
 
-#: templates/question.html:73 templates/question.html.py:84
+#: templates/question.html:76 templates/question.html.py:87
 msgid "i dont like this post (click again to cancel)"
 msgstr "No me gusta esta entrada (clickear devuelta para cancelar)"
 
-#: templates/question.html:90
+#: templates/question.html:93
 msgid "mark this question as favorite (click again to cancel)"
 msgstr "marcar esta pregunta como favorita (clickear devuelta para cancelar)"
 
-#: templates/question.html:96
+#: templates/question.html:99
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 "remover marca de favorito a esta pregunta (clickear devuelta para volver a "
 "marcar)"
 
-#: templates/question.html:121 templates/question.html.py:304
+#: templates/question.html:124 templates/question.html.py:307
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
 msgstr "editar"
 
-#: templates/question.html:125 templates/question.html.py:314
+#: templates/question.html:128 templates/question.html.py:317
 msgid "delete"
 msgstr "borrar"
 
-#: templates/question.html:130
+#: templates/question.html:133
 msgid "reopen"
 msgstr "re-abrir"
 
-#: templates/question.html:135
+#: templates/question.html:138
 msgid "close"
 msgstr "cerrar"
 
-#: templates/question.html:141 templates/question.html.py:327
+#: templates/question.html:144 templates/question.html.py:330
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 "reportar como ofensivo (ej. contiene spam, publicidad, texto malicioso, etc.)"
 
-#: templates/question.html:142 templates/question.html.py:328
+#: templates/question.html:145 templates/question.html.py:331
 msgid "flag offensive"
 msgstr "marcar como ofensivo"
 
-#: templates/question.html:154 templates/question.html.py:337
+#: templates/question.html:157 templates/question.html.py:340
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
 msgstr "actualizado"
 
-#: templates/question.html:203 templates/question.html.py:384
+#: templates/question.html:206 templates/question.html.py:387
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
 msgstr "preguntado"
 
-#: templates/question.html:233 templates/question.html.py:411
+#: templates/question.html:236 templates/question.html.py:414
 msgid "comments"
 msgstr "comentarios"
 
-#: templates/question.html:234 templates/question.html.py:412
+#: templates/question.html:237 templates/question.html.py:415
 msgid "add comment"
 msgstr "agregar comentario"
 
-#: templates/question.html:247
+#: templates/question.html:250
 #, python-format
 msgid ""
 "The question has been closed for the following reason \"%(question."
@@ -1579,105 +1543,113 @@ msgstr ""
 "La pregunta ha sido cerrada por el siguiente motivo \"%(question."
 "get_close_reason_display)s\" por"
 
-#: templates/question.html:249
+#: templates/question.html:252
 #, python-format
 msgid "close date %(question.closed_at)s"
 msgstr "fecha de cerrada %(question.closed_at)s"
 
-#: templates/question.html:256 templates/user_stats.html:28
+#: templates/question.html:259 templates/user_stats.html:28
 msgid "Answers"
 msgstr "Respuestas"
 
-#: templates/question.html:258
+#: templates/question.html:261
 msgid "oldest answers will be shown first"
 msgstr "la respuesta mas vieja será mostrada primero"
 
-#: templates/question.html:258
+#: templates/question.html:261
 msgid "oldest answers"
 msgstr "pregunta más vieja"
 
-#: templates/question.html:259
+#: templates/question.html:262
 msgid "newest answers will be shown first"
 msgstr "preguntas más nuevas serán mostradas primero"
 
-#: templates/question.html:259
+#: templates/question.html:262
 msgid "newest answers"
 msgstr "más nuevas"
 
-#: templates/question.html:260
+#: templates/question.html:263
 msgid "most voted answers will be shown first"
 msgstr "las preguntas más votadas serán mostradas primero"
 
-#: templates/question.html:260
+#: templates/question.html:263
 msgid "popular answers"
 msgstr "respuestas populares serán mostradas primero"
 
-#: templates/question.html:272
+#: templates/question.html:275
 msgid "i like this answer (click again to cancel)"
 msgstr "me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:278
+#: templates/question.html:281
 msgid "i dont like this answer (click again to cancel)"
 msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:284
+#: templates/question.html:287
 msgid "mark this answer as favorite (click again to undo)"
 msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)"
 
-#: templates/question.html:289
+#: templates/question.html:292
 msgid "the author of the question has selected this answer as correct"
 msgstr "el autor de esta pregunta ha seleccionado esta respuesta como correcta"
 
-#: templates/question.html:311
+#: templates/question.html:314
 msgid "undelete"
 msgstr "deshacer eliminar"
 
-#: templates/question.html:321
+#: templates/question.html:324
 msgid "answer permanent link"
 msgstr "enlace permanente a respuesta"
 
-#: templates/question.html:322
+#: templates/question.html:325
 msgid "permanent link"
 msgstr "enlace permanente"
 
-#: templates/question.html:436
+#: templates/question.html:438
 msgid "Your answer"
 msgstr "Tu respuesta"
 
-#: templates/question.html:460
+#: templates/question.html:441
+msgid "you can answer anonymously and then login"
+msgstr ""
+
+#: templates/question.html:465
 msgid "Answer the question"
 msgstr "Responde la pregunta"
 
-#: templates/question.html:462
-msgid "Login to answer"
-msgstr "Ingresa para responder"
+#: templates/question.html:467
+msgid "Notify me daily if there are any new answers."
+msgstr ""
+
+#: templates/question.html:469
+msgid "once you sign in you will be able to subscribe for any updates here"
+msgstr ""
 
-#: templates/question.html:474
+#: templates/question.html:481
 msgid "Question tags"
 msgstr "Etiquetas de la pregunta"
 
-#: templates/question.html:484
+#: templates/question.html:491
 msgid "question asked"
 msgstr "pregunta preguntada"
 
-#: templates/question.html:484 templates/question.html.py:490
+#: templates/question.html:491 templates/question.html.py:497
 #: templates/user_info.html:51
 msgid "ago"
 msgstr "atrás"
 
-#: templates/question.html:487
+#: templates/question.html:494
 msgid "question was seen"
 msgstr "la pregunta fue vista"
 
-#: templates/question.html:487
+#: templates/question.html:494
 msgid "times"
 msgstr "veces"
 
-#: templates/question.html:490
+#: templates/question.html:497
 msgid "last updated"
 msgstr "última vez actualizada"
 
-#: templates/question.html:495
+#: templates/question.html:502
 msgid "Related questions"
 msgstr "Preguntas relacionadas"
 
@@ -1697,6 +1669,27 @@ msgstr "por favor hacer preguntas relevantes"
 msgid "please try provide enough details"
 msgstr "intente proveer suficientes detalles"
 
+#: templates/question_retag.html:3 templates/question_retag.html.py:52
+msgid "Change tags"
+msgstr "Cambiar etiquetas"
+
+#: templates/question_retag.html:39
+msgid "up to 5 tags, less than 20 characters each"
+msgstr "hasta 5 etiquetas, menos de 20 caracteres cada una"
+
+#: templates/question_retag.html:86
+msgid "Why use and modify tags?"
+msgstr "¿Porqué usar y modificar etiquetas?"
+
+#: templates/question_retag.html:89
+msgid "tags help us keep Questions organized"
+msgstr ""
+
+#: templates/question_retag.html:95
+msgid "tag editors receive special awards from the community"
+msgstr ""
+"los editores de etiquetas reciben distinciones especiales de la comunidad"
+
 #: templates/questions.html:23
 msgid "Found by tags"
 msgstr "Encontradas por etiqueta"
@@ -1710,7 +1703,6 @@ msgid "All questions"
 msgstr "Todas las preguntas"
 
 #: templates/questions.html:25 templates/unanswered.html:20
-#: templates/tough/unanswered.html:18
 msgid "most recently asked questions"
 msgstr "preguntas hechas más recientemente"
 
@@ -1726,7 +1718,7 @@ msgstr "actividad"
 #, fuzzy, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s question tagged %(tagname)s\n"
+"\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
 "\t\t\t"
 msgid_plural ""
 "\n"
@@ -1736,15 +1728,15 @@ msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
 msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
 
 #: templates/questions.html:116
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s question containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgid_plural ""
 "\n"
-"\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgstr[0] ""
 "\n"
 "\t\t\thay un total de %(q_num)s preguntas que contienen %(searchtitle)s\n"
@@ -1754,37 +1746,49 @@ msgstr[1] ""
 "\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n"
 "\t\t\t"
 
-#: templates/questions.html:124
+#: templates/questions.html:122
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgid_plural ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
+msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
+
+#: templates/questions.html:131
 msgid "latest questions info"
 msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/questions.html:128
+#: templates/questions.html:135
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 "Las preguntas estan ordenadas por <strong>fecha de último update</strong>."
 
-#: templates/questions.html:129
+#: templates/questions.html:136
 msgid "Most recently answered ones are shown first."
 msgstr "Las más recientemente respondidas son mostradas primero."
 
-#: templates/questions.html:133
+#: templates/questions.html:140
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Preguntas ordenadas por <strong>número de respuestas</strong>."
 
-#: templates/questions.html:134
+#: templates/questions.html:141
 msgid "Most answered questions are shown first."
 msgstr "Preguntas más respondidas aparecen primero."
 
-#: templates/questions.html:138
+#: templates/questions.html:145
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>."
 
-#: templates/questions.html:139
+#: templates/questions.html:146
 msgid "Most voted questions are shown first."
 msgstr "Las preguntas más votadas son mostradas primero."
 
-#: templates/questions.html:146 templates/unanswered.html:105
-#: templates/tough/unanswered.html:101
+#: templates/questions.html:153 templates/unanswered.html:105
 msgid "Related tags"
 msgstr "Etiquetas relacionadas"
 
@@ -1854,7 +1858,6 @@ msgid "Nothing found"
 msgstr "Nada encontrado"
 
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
-#: templates/tough/unanswered.html:5 templates/tough/unanswered.html.py:16
 msgid "Unanswered questions"
 msgstr "Preguntas sin respuesta"
 
@@ -1925,14 +1928,41 @@ msgstr "edad"
 msgid "age unit"
 msgstr "unidad de edad"
 
-#: templates/user_info.html:75
+#: templates/user_info.html:76
 msgid "todays unused votes"
 msgstr "votos de hoy no usados"
 
-#: templates/user_info.html:76
+#: templates/user_info.html:77
 msgid "votes left"
 msgstr "votos restantes"
 
+#: templates/user_preferences.html:10
+msgid "Connect with Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:12
+#, fuzzy
+msgid "Twitter account name:"
+msgstr "Esta cuenta esta inactiva."
+
+#: templates/user_preferences.html:14
+#, fuzzy
+msgid "Twitter password:"
+msgstr "Nueva contraseña"
+
+#: templates/user_preferences.html:16
+msgid "Send my Questions to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:17
+msgid "Send my Answers to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:18
+#, fuzzy
+msgid "Save"
+msgstr "Guardar la edición"
+
 #: templates/user_stats.html:15
 msgid "User questions"
 msgstr "Preguntas del usuario"
@@ -1989,7 +2019,7 @@ msgstr "historial de reputación"
 msgid "favorites"
 msgstr "favoritos"
 
-#: templates/user_tabs.html:29
+#: templates/user_tabs.html:28
 msgid "settings"
 msgstr "preferencias"
 
@@ -2026,118 +2056,152 @@ msgstr "esta pregunta ha sido seleccionada como favorita"
 msgid "this answer has been accepted to be correct"
 msgstr "esta respuesta ha sido aceptada como correcta"
 
-#: templates/authopenid/changeemail.html:6
-msgid "Account: change email"
-msgstr "Cuenta: cambiar el email"
+#: templates/authopenid/changeemail.html:7
+#: templates/authopenid/changeemail.html:33
+msgid "Change email"
+msgstr "Cambiar dirección email"
 
-#: templates/authopenid/changeemail.html:9
-msgid ""
-"This is where you can change the email address associated with your account. "
-"Please keep this email address up to date so we can send you a password-"
-"reset email if you request one."
-msgstr ""
-"Aquí es donde puedes cambiar el email asociado a tu cuenta de usuario.Por "
-"favor manten esta dirección de correo al día de forma que podamos mandarte "
-"un cambio de contraseña si tu así lo requieres."
-
-#: templates/authopenid/changeemail.html:11
-#: templates/authopenid/changeopenid.html:13
-#: templates/authopenid/changepw.html:18 templates/authopenid/delete.html:14
-#: templates/authopenid/delete.html:24
+#: templates/authopenid/changeemail.html:10
+#, fuzzy, python-format
+msgid "change %(email)s info"
+msgstr "Cambiar email "
+
+#: templates/authopenid/changeemail.html:13
+#: templates/authopenid/changeopenid.html:14
+#: templates/authopenid/changepw.html:19 templates/authopenid/delete.html:15
+#: templates/authopenid/delete.html:25
 msgid "Please correct errors below:"
 msgstr "Por favor corrija los errores debajo: "
 
-#: templates/authopenid/changeemail.html:28
-msgid "Email"
-msgstr "Email"
+#: templates/authopenid/changeemail.html:30
+msgid "Your new Email"
+msgstr ""
 
-#: templates/authopenid/changeemail.html:29
-#: templates/authopenid/signin.html:60
+#: templates/authopenid/changeemail.html:31
+#: templates/authopenid/signin.html:138
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/authopenid/changeemail.html:31
-msgid "Change email"
+#: templates/authopenid/changeemail.html:42
+#, fuzzy
+msgid "Validate email"
 msgstr "Cambiar dirección email"
 
-#: templates/authopenid/changeopenid.html:7
+#: templates/authopenid/changeemail.html:45
+#, python-format
+msgid "validate %(email)s info"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:50
+#, fuzzy
+msgid "Email not changed"
+msgstr "Email modificado."
+
+#: templates/authopenid/changeemail.html:53
+#, python-format
+msgid "old %(email)s kept"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:58
+#, fuzzy
+msgid "Email changed"
+msgstr "Email modificado."
+
+#: templates/authopenid/changeemail.html:61
+#, python-format
+msgid "your current %(email)s can be used for this"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:66
+msgid "Email verified"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:69
+msgid "thanks for verifying email"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:74
+msgid "email key not sent"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:77
+#, python-format
+msgid "email key not sent %(email)s change email here %(change_link)s"
+msgstr ""
+
+#: templates/authopenid/changeopenid.html:8
 msgid "Account: change OpenID URL"
 msgstr "Cuenta: cambiar la URL de OpenID"
 
-#: templates/authopenid/changeopenid.html:11
+#: templates/authopenid/changeopenid.html:12
 msgid ""
 "This is where you can change your OpenID URL. Make sure you remember it!"
 msgstr "Aquí es donde puedes cambiar tu OpenID URL. Asegurate de recordarla!"
 
-#: templates/authopenid/changeopenid.html:28
+#: templates/authopenid/changeopenid.html:29
 msgid "OpenID URL:"
 msgstr "URL de OpenID:"
 
-#: templates/authopenid/changeopenid.html:29
+#: templates/authopenid/changeopenid.html:30
 msgid "Change OpenID"
 msgstr "Cambiar OpenID"
 
-#: templates/authopenid/changepw.html:13
+#: templates/authopenid/changepw.html:14
 msgid "Account: change password"
 msgstr "Cuenta: cambiar contraseña"
 
-#: templates/authopenid/changepw.html:16
+#: templates/authopenid/changepw.html:17
 msgid "This is where you can change your password. Make sure you remember it!"
 msgstr "Aquí es donde puedes cambiar tu contraseña. Asegurate de recordarlo!"
 
-#: templates/authopenid/changepw.html:26
+#: templates/authopenid/changepw.html:27
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/authopenid/changepw.html:27
+#: templates/authopenid/changepw.html:28
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: templates/authopenid/changepw.html:28
+#: templates/authopenid/changepw.html:29
 msgid "New password again"
 msgstr "Nueva contraseña nuevamente"
 
-#: templates/authopenid/changepw.html:29 templates/authopenid/settings.html:28
+#: templates/authopenid/changepw.html:30 templates/authopenid/settings.html:29
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/authopenid/complete.html:4
+#: templates/authopenid/complete.html:5
 msgid "Connect your OpenID with this site"
 msgstr "Vincular tu OpenID con este sitio"
 
-#: templates/authopenid/complete.html:7
+#: templates/authopenid/complete.html:8
 msgid "Connect your OpenID with your account on this site"
 msgstr "Vincular tu OpenID con tu cuenta en este sitio"
 
-#: templates/authopenid/complete.html:10
-msgid "Your OpenID is accepted. Please complete this to finish registration."
+#: templates/authopenid/complete.html:12
+#, python-format
+msgid "register new %(provider)s account info"
 msgstr ""
-"Tu OpenID es aceptada. Por favor completa lo siguiente para finalizar el "
-"registro."
 
-#: templates/authopenid/complete.html:11
+#: templates/authopenid/complete.html:14
 msgid "This account already exists, please use another."
 msgstr "Esta cuenta ya existe, por favor usar otra."
 
-#: templates/authopenid/complete.html:16 templates/authopenid/complete.html:29
-#: templates/authopenid/signin.html:43
+#: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
+#: templates/authopenid/signin.html:121
 msgid "Sorry, looks like we have some errors:"
 msgstr "Ups, parece que hay errores:"
 
-#: templates/authopenid/complete.html:45
-msgid "New account"
-msgstr "Nueva cuenta"
-
-#: templates/authopenid/complete.html:46
-msgid "User name (<i>will be shown to others, cannot be modified</i>)"
-msgstr ""
-"Nombre de usuario (<i>será mostrado a otros, no puede ser modificado</i>)"
-
 #: templates/authopenid/complete.html:47
-msgid "Email (<i>not shared with anyone</i>)"
-msgstr "Email (<i>no será compartido con nadie</i>)"
+msgid "Screen name label"
+msgstr ""
 
 #: templates/authopenid/complete.html:48
+#, fuzzy
+msgid "Email address label"
+msgstr "su email (correo electrónico)"
+
+#: templates/authopenid/complete.html:49
 msgid "create account"
 msgstr "crear cuenta"
 
@@ -2157,15 +2221,46 @@ msgstr "contraseña"
 msgid "Register"
 msgstr "Registrarse"
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:62
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: templates/authopenid/delete.html:8
+#: templates/authopenid/confirm_email.txt:2
+msgid "Thank you for registering at our Q&A forum!"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:4
+msgid "Your account details are:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:6
+#: templates/authopenid/sendpw_email.txt:7
+#, fuzzy
+msgid "Username:"
+msgstr "Nombre de usuario"
+
+#: templates/authopenid/confirm_email.txt:7
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr "Contraseña"
+
+#: templates/authopenid/confirm_email.txt:9
+msgid "Please sign in here:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:12
+#: templates/authopenid/email_validation.txt:14
+#: templates/authopenid/sendpw_email.txt:13
+msgid ""
+"Sincerely,\n"
+"Forum Administrator"
+msgstr ""
+
+#: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr "Cuenta: borrar cuenta"
 
-#: templates/authopenid/delete.html:12
+#: templates/authopenid/delete.html:13
 msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
@@ -2173,39 +2268,54 @@ msgstr ""
 "Nota: Luego de borrar tu cuenta, cualquiera podrá registrarse con este "
 "nombre de usuario."
 
-#: templates/authopenid/delete.html:16
+#: templates/authopenid/delete.html:17
 msgid "Check confirm box, if you want delete your account."
 msgstr "Marca caja de confirmación, si deseas borrar tu cuenta."
 
-#: templates/authopenid/delete.html:19
-msgid "Password:"
-msgstr "Contraseña"
-
-#: templates/authopenid/delete.html:31
+#: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr "Estoy seguro que quiero borrar mi cuenta."
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "Password/OpenID URL"
 msgstr "Contraseña/OpenID URL"
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "(required for your security)"
 msgstr "(requerido por tu seguridad)"
 
-#: templates/authopenid/delete.html:34
+#: templates/authopenid/delete.html:35
 msgid "Delete account permanently"
 msgstr "Borrar la cuenta de forma permanente"
 
-#: templates/authopenid/sendpw.html:3 templates/authopenid/sendpw.html.py:7
+#: templates/authopenid/email_validation.txt:2
+msgid "Greetings from the Q&A forum"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:4
+msgid "To make use of the Forum, please follow the link below:"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:8
+msgid "Following the link above will help us verify your email address."
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:10
+msgid ""
+"If you beleive that this message was sent in mistake - \n"
+"no further action is needed. Just ingore this email, we apologize\n"
+"for any inconvenience"
+msgstr ""
+
+#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr "Enviar nueva contraseña"
 
-#: templates/authopenid/sendpw.html:11
+#: templates/authopenid/sendpw.html:12
 msgid "Lost your password? No problem - here you can reset it."
 msgstr "¿Haz perdido tu contraseña? No hay problema - aquí puedes re-crearla."
 
-#: templates/authopenid/sendpw.html:12
+#: templates/authopenid/sendpw.html:13
 msgid ""
 "Please enter your username below and new password will be sent to your "
 "registered e-mail"
@@ -2213,15 +2323,19 @@ msgstr ""
 "Por favor, ingresa tu nombre de usuario y una nueva contraseña será enviada "
 "a la dirección de email registrada."
 
-#: templates/authopenid/sendpw.html:29
+#: templates/authopenid/sendpw.html:28
+msgid "User name"
+msgstr "Nombre de usuario"
+
+#: templates/authopenid/sendpw.html:30
 msgid "Reset password"
 msgstr "Re-crear contraseña"
 
-#: templates/authopenid/sendpw.html:29
+#: templates/authopenid/sendpw.html:30
 msgid "return to login"
 msgstr "volver a 'Ingresar'"
 
-#: templates/authopenid/sendpw.html:32
+#: templates/authopenid/sendpw.html:33
 msgid ""
 "Note: your new password will be activated only after you click the "
 "activation link in the email message"
@@ -2229,104 +2343,146 @@ msgstr ""
 "Nota: tu nueva contraseña solo será activada luego de que hagas click en el "
 "link de activación en el email enviado."
 
-#: templates/authopenid/settings.html:29
+#: templates/authopenid/sendpw_email.txt:2
+#, python-format
+msgid ""
+"Someone has requested to reset your password on %(site_url)s.\n"
+"If it were not you, it is safe to ignore this email."
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:5
+msgid "Your new account details are:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:8
+#, fuzzy
+msgid "New password:"
+msgstr "Nueva contraseña"
+
+#: templates/authopenid/sendpw_email.txt:10
+msgid "To confirm that you wanted to reset your password please visit:"
+msgstr ""
+
+#: templates/authopenid/settings.html:30
 msgid "Give your  account a new password."
 msgstr "Crea una nueva contraseña para tu cuenta."
 
-#: templates/authopenid/settings.html:30
+#: templates/authopenid/settings.html:31
 msgid "Change email "
 msgstr "Cambiar email "
 
-#: templates/authopenid/settings.html:31
+#: templates/authopenid/settings.html:32
 msgid "Add or update the email address associated with your account."
 msgstr "Agrega o actualiza el email asociado a tu cuenta."
 
-#: templates/authopenid/settings.html:34
+#: templates/authopenid/settings.html:35
 msgid "Change openid associated to your account"
 msgstr "Cambia el OpenID asociado a tu cuenta"
 
-#: templates/authopenid/settings.html:37
+#: templates/authopenid/settings.html:38
 msgid "Delete account"
 msgstr "Eliminar cuenta"
 
-#: templates/authopenid/settings.html:38
+#: templates/authopenid/settings.html:39
 msgid "Erase your username and all your data from website"
 msgstr "Eliminar tu nombre de usuario y toda tu información del sitio"
 
-#: templates/authopenid/signin.html:3 templates/authopenid/signin.html:16
+#: templates/authopenid/signin.html:4 templates/authopenid/signin.html:21
 msgid "User login"
 msgstr "Ingreso de usuario"
 
-#: templates/authopenid/signin.html:21
-msgid "we support two login modes"
+#: templates/authopenid/signin.html:28
+#, python-format
+msgid ""
+"\n"
+"                Your answer to %(title)s %(summary)s will be posted once you "
+"log in\n"
+"                "
 msgstr ""
-"Puedes ingresar por cualquiera de los siguientes servicios, o "
-"tradicionalmente- usando nombre de usuario y contraseña locales"
 
-#: templates/authopenid/signin.html:26 templates/authopenid/signup.html:49
-msgid "Login with your OpenID"
-msgstr "Ingresar con tu OpenID"
+#: templates/authopenid/signin.html:35
+#, python-format
+msgid ""
+"Your question \n"
+"                %(title)s %(summary)s will be posted once you log in\n"
+"                "
+msgstr ""
 
-#: templates/authopenid/signin.html:28
-msgid "select openid provider"
-msgstr "1) Selecciona tu proveedor de OpenID"
+#: templates/authopenid/signin.html:40
+msgid "Click to sign in through any of these services."
+msgstr ""
 
-#: templates/authopenid/signin.html:32
-msgid "verify openid link and login"
+#: templates/authopenid/signin.html:103
+msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
 msgstr ""
-"2) Varifica la URL de tu OpenID (escribe tu nombre de usuario donde dice "
-"{nombre de usuario} si lo ves) y luego clickea 'ingresar'"
 
-#: templates/authopenid/signin.html:58
+#: templates/authopenid/signin.html:110
+msgid ""
+"Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
+"web address"
+msgstr ""
+
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
+msgid "Login"
+msgstr "Ingresar"
+
+#: templates/authopenid/signin.html:116
+msgid "we support two login modes"
+msgstr ""
+"Puedes ingresar por cualquiera de los siguientes servicios, o "
+"tradicionalmente- usando nombre de usuario y contraseña locales"
+
+#: templates/authopenid/signin.html:136
 msgid "Use login name and password"
 msgstr "Nombre de usuario y contraseña"
 
-#: templates/authopenid/signin.html:59
+#: templates/authopenid/signin.html:137
 msgid "Login name"
 msgstr "Nombre de usuario"
 
-#: templates/authopenid/signin.html:63
-msgid "Create new acccount"
+#: templates/authopenid/signin.html:141
+#, fuzzy
+msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-#: templates/authopenid/signin.html:72
+#: templates/authopenid/signin.html:150
 msgid "Why use OpenID?"
 msgstr "¿Porqué usar OpenID?"
 
-#: templates/authopenid/signin.html:76
+#: templates/authopenid/signin.html:154
 msgid "with openid it is easier"
 msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña."
 
-#: templates/authopenid/signin.html:79
+#: templates/authopenid/signin.html:157
 msgid "reuse openid"
 msgstr ""
 "Puedes de forma segura re-usar el mismo nombre de usuario para todos los "
 "sitios que acepten OpenID."
 
-#: templates/authopenid/signin.html:82
+#: templates/authopenid/signin.html:160
 msgid "openid is widely adopted"
 msgstr ""
 "OpenID es extensamente usado. Hay más de 160,000,000 cuentas de OpenID en "
 "uso en el mundo. Mas de 10,000 sitios aceptan OpenID."
 
-#: templates/authopenid/signin.html:85
+#: templates/authopenid/signin.html:163
 msgid "openid is supported open standard"
 msgstr ""
 "OpenID es basado en un standard abierto, apoyado por muchas organizaciones."
 
-#: templates/authopenid/signin.html:89
+#: templates/authopenid/signin.html:167
 msgid "Find out more"
 msgstr "Averigua más"
 
-#: templates/authopenid/signin.html:90
+#: templates/authopenid/signin.html:168
 msgid "Get OpenID"
 msgstr "Adquiere una OpenID"
 
-#: templates/authopenid/signup.html:2 templates/authopenid/signup.html.py:6
+#: templates/authopenid/signup.html:4 templates/authopenid/signup.html.py:8
 msgid "Signup"
 msgstr "Registrate"
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid ""
 "We support two types of user registration: conventional username/password, "
 "and"
@@ -2334,66 +2490,195 @@ msgstr ""
 "Soportamos dos formas de registro de usuario: convencional usuario/"
 "contraseña, y"
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid "the OpenID method"
 msgstr "OpenID"
 
-#: templates/authopenid/signup.html:15
+#: templates/authopenid/signup.html:17
 msgid "Sorry, looks like we have some errors"
 msgstr "Ups, parece que hay errores."
 
-#: templates/authopenid/signup.html:33
+#: templates/authopenid/signup.html:35
 msgid "Conventional registration"
 msgstr "Registro clásico"
 
-#: templates/authopenid/signup.html:34
+#: templates/authopenid/signup.html:36
 msgid "choose a user name"
 msgstr "elije un nombre de usuario"
 
-#: templates/authopenid/signup.html:40
+#: templates/authopenid/signup.html:42
 msgid "back to login"
 msgstr "volver al ingreso de usuario"
 
-#: templates/authopenid/signup.html:46
+#: templates/authopenid/signup.html:48
 msgid "Register with your OpenID"
 msgstr "Registrate con tu OpenID"
 
-#: templates/tough/question_retag.html:2
-msgid "Revise tags"
-msgstr "Revisar etiquetas"
+#: templates/authopenid/signup.html:51
+msgid "Login with your OpenID"
+msgstr "Ingresar con tu OpenID"
 
-#: templates/tough/question_retag.html:37
-msgid "tags are requried"
-msgstr "las etiquetas son requeridas"
+#~ msgid "site slogan"
+#~ msgstr " slogan del sitio"
 
-#: templates/tough/question_retag.html:38
-msgid "up to 5 tags, less than 20 characters each"
-msgstr "hasta 5 etiquetas, menos de 20 caracteres cada una"
+#~ msgid "meta site content"
+#~ msgstr "meta descripción"
 
-#: templates/tough/question_retag.html:51
-msgid "Change tags"
-msgstr "Cambiar etiquetas"
+#~ msgid "copyright message"
+#~ msgstr "mensaje de copyright"
 
-#: templates/tough/question_retag.html:74
-msgid "Change now"
-msgstr "Cambiar ahora"
+#~ msgid ""
+#~ "please use space to separate tags (this enables autocomplete feature)"
+#~ msgstr ""
+#~ "por favor utilice espacio para separar las etiquetas (esto habilitael "
+#~ "auto-completado)"
 
-#: templates/tough/question_retag.html:85
-msgid "Why use and modify tags?"
-msgstr "¿Porqué usar y modificar etiquetas?"
+#~ msgid "Use"
+#~ msgstr "Usar"
 
-#: templates/tough/question_retag.html:96
-msgid "tag editors receive special awards from the community"
-msgstr ""
-"los editores de etiquetas reciben distinciones especiales de la comunidad"
+#~ msgid "learn more about OpenID"
+#~ msgstr "aprender mas sobre OpenID"
+
+#~ msgid "Get your own "
+#~ msgstr "Obtiene tu propio "
+
+#~ msgid "Email: (won't be shown to anyone)"
+#~ msgstr "Email: (no será mostrado a nadie)"
+
+#, fuzzy
+#~ msgid "Congratulations! You have new badges: "
+#~ msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
+
+#, fuzzy
+#~ msgid "go to see"
+#~ msgstr "OK para cerrar"
+
+#~ msgid "congratulations, community gave you a badge"
+#~ msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
+
+#~ msgid "see"
+#~ msgstr "ver"
+
+#~ msgid "profile"
+#~ msgstr "perfil"
+
+#~ msgid ""
+#~ "Anyone can ask questions and give answers, points are not necessary for "
+#~ "that."
+#~ msgstr ""
+#~ "Cualquier usuario puede hacer preguntas y dar respuestas, no es necesario "
+#~ "tener reputación para ello."
+
+#~ msgid ""
+#~ "As we've said before, users help running this site. Point system helps "
+#~ "select users who can administer this community."
+#~ msgstr ""
+#~ "Como dijimos antes, los usuarios ayudan a crear este sitio. El sistema de "
+#~ "reputación permite seleccionar usuarios que pueden moderar esta comunidad."
+
+#~ msgid ""
+#~ "Reputation points roughly measure how community trusts you. These points "
+#~ "are given to you directly by other members of the community."
+#~ msgstr ""
+#~ "Los puntos de reputación miden a groso modo que tan respetado eres en la "
+#~ "comunidad. Los puntos son dados a ti directamente por otros miembros de "
+#~ "la comunidad"
+
+#~ msgid ""
+#~ "For example, if you ask an interesting question or give a helpful answer, "
+#~ "your input will be upvoted and you will gain more trust in the community."
+#~ msgstr ""
+#~ "Por ejemplo, si haces una pregunta interesante, o das una respuesta "
+#~ "valiosa, tu entrada va a ser votada positivamente y tu ganarás confianza "
+#~ "en la comunidad."
+
+#~ msgid ""
+#~ "If on the other hand someone gives a misleading answer, the answer will "
+#~ "be voted down and he/she loses some points."
+#~ msgstr ""
+#~ "Si por el contrario, alguien da una respuesta que no corresponde, la "
+#~ "respuesta será votada negativamente y el usuario perderá puntos."
+
+#~ msgid ""
+#~ "Each vote in favor will generate <strong>10</strong> points, each vote "
+#~ "against will subtract <strong>2</strong> points."
+#~ msgstr ""
+#~ "Cada voto a favor generará <strong>10</strong> puntos, cada voto negativo "
+#~ "restará <strong>2</strong> puntos."
 
-#: templates/tough/unanswered.html:95
-msgid "number of <strong>unanswered</strong> questions"
-msgstr "número de respuestas <strong>sin responder</strong>"
+#~ msgid ""
+#~ "Through the votes of other people you can accumulate a maximum of "
+#~ "<strong>200</strong> points."
+#~ msgstr ""
+#~ "A través del voto de otras personas puedes acumular un máximo de "
+#~ "<strong>200</strong> puntos."
+
+#~ msgid "After accumulating certain number of points, you can do more:"
+#~ msgstr ""
+#~ "Luego de haber acumulado cierta cantidad de puntos, puedes hacer más:"
+
+#~ msgid "meta site keywords, comma separated"
+#~ msgstr "palabras claves"
+
+#~ msgid "what is this website"
+#~ msgstr "que es este sitio"
+
+#~ msgid "what can one do on this website"
+#~ msgstr "que puede uno hacer en este sitio"
+
+#~ msgid "Login to answer"
+#~ msgstr "Ingresa para responder"
+
+#~ msgid "Account: change email"
+#~ msgstr "Cuenta: cambiar el email"
+
+#~ msgid ""
+#~ "This is where you can change the email address associated with your "
+#~ "account. Please keep this email address up to date so we can send you a "
+#~ "password-reset email if you request one."
+#~ msgstr ""
+#~ "Aquí es donde puedes cambiar el email asociado a tu cuenta de usuario.Por "
+#~ "favor manten esta dirección de correo al día de forma que podamos "
+#~ "mandarte un cambio de contraseña si tu así lo requieres."
+
+#~ msgid "Email"
+#~ msgstr "Email"
 
-#~ msgid "Community gives you awards for your questions, answers and votes."
+#~ msgid ""
+#~ "Your OpenID is accepted. Please complete this to finish registration."
 #~ msgstr ""
-#~ "La comunidad te da distinciones por tus preguntas, respuestas y votos."
+#~ "Tu OpenID es aceptada. Por favor completa lo siguiente para finalizar el "
+#~ "registro."
+
+#~ msgid "New account"
+#~ msgstr "Nueva cuenta"
+
+#~ msgid "User name (<i>will be shown to others, cannot be modified</i>)"
+#~ msgstr ""
+#~ "Nombre de usuario (<i>será mostrado a otros, no puede ser modificado</i>)"
+
+#~ msgid "Email (<i>not shared with anyone</i>)"
+#~ msgstr "Email (<i>no será compartido con nadie</i>)"
+
+#~ msgid "select openid provider"
+#~ msgstr "1) Selecciona tu proveedor de OpenID"
+
+#~ msgid "verify openid link and login"
+#~ msgstr ""
+#~ "2) Varifica la URL de tu OpenID (escribe tu nombre de usuario donde dice "
+#~ "{nombre de usuario} si lo ves) y luego clickea 'ingresar'"
+
+#~ msgid "Revise tags"
+#~ msgstr "Revisar etiquetas"
+
+#~ msgid "tags are requried"
+#~ msgstr "las etiquetas son requeridas"
+
+#~ msgid "Change now"
+#~ msgstr "Cambiar ahora"
+
+#~ msgid "number of <strong>unanswered</strong> questions"
+#~ msgstr "número de respuestas <strong>sin responder</strong>"
 
 #
 #~ msgid "editing tips"
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
deleted file mode 100644
index cfcea03d..00000000
Binary files a/locale/zh_CN/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index a34a35f2..4d8524b6 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -379,7 +379,7 @@ msgstr "多个标签请用空格间隔-最多5个标签。（优先使用自动
 
 #: forum/forms.py:53
 msgid "tags are required"
-msgstr "标签不能为空。"
+msgstr " 标签不能为空。"
 
 #: forum/forms.py:57
 msgid "please use 5 tags or less"
@@ -692,6 +692,9 @@ msgstr "预览开关"
 msgid "Save edit"
 msgstr "现在修改"
 
+msgid "Save"
+msgstr "保存"
+
 #: templates/answer_edit.html:74 templates/close.html:29
 #: templates/question_edit.html:120 templates/reopen.html:30
 #: templates/user_edit.html:83
@@ -762,18 +765,16 @@ msgid "Community badges"
 msgstr "社区奖牌"
 
 #: templates/badges.html:53
-#, fuzzy
-msgid ""
+msgid "gold badge description"
 "Gold badge is very rare. To obtain it you have to show profound knowledge "
 "and ability in addition to actively participating in the community. Gold "
 "badge is the highest award in this community."
 msgstr ""
-"你不仅要参与社区的提问、回答、投票等活动，而且需要有高深的知识和能力才能获"
+"金牌是十分罕见的。你不仅要参与社区的提问、回答、投票等活动，而且需要有高深的知识和能力才能获"
 "得。"
 
 #: templates/badges.html:61
-#, fuzzy
-msgid ""
+msgid "silver badge description"
 "Obtaining silver badge requires significant patience. If you got one, you've "
 "very significantly contributed to this community"
 msgstr "它是不同寻常的荣誉，只要你付出足够的努力就会得到。"
@@ -782,9 +783,24 @@ msgstr "它是不同寻常的荣誉，只要你付出足够的努力就会得到
 msgid "bronze badge: often given as a special honor"
 msgstr "铜牌:时常授予之特殊荣誉"
 
+msgid "Connect with Twitter"
+msgstr "同步Twitter消息"
+
+msgid "Twitter account name:"
+msgstr "账号:"
+
+msgid "Twitter password:"
+msgstr "密码:"
+
+msgid "Send my Questions to Twitter"
+msgstr "发布我的提问到我的Twitter"
+
+msgid "Send my Answers to Twitter"
+msgstr "发布我的回答到我的Twitter"
+
 #: templates/badges.html:68
 #, fuzzy
-msgid ""
+msgid "bronze badge description"
 "If you are active in this community, you will get this medal - still it is a "
 "special honor."
 msgstr "铜牌会在你活跃于社区时产生，它相对容易获得，但也是一种特殊的荣誉。"
@@ -1660,6 +1676,9 @@ msgstr "用户投的反对票总数"
 msgid "Tags"
 msgstr "个标签"
 
+msgid "Tags help us keep Questions organized"
+msgstr "CNProg用标签来分类系统的信息"
+
 #: templates/user_stats.html:94
 #, fuzzy, python-format
 msgid "see other questions tagged '%(tag)s' "
diff --git a/settings.py b/settings.py
index e2d384c1..fac3c0d5 100644
--- a/settings.py
+++ b/settings.py
@@ -17,8 +17,9 @@ ADMINS = (
 )
 MANAGERS = ADMINS
 
+#email server settings
 SERVER_EMAIL = ''
-DEFAULT_FROM_EMAIL = ''
+DEFAULT_FROM_EMAIL = 'team@cnprog.com'
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
 EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
@@ -31,12 +32,12 @@ TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
 # LANGUAGE_CODE = 'en-us'
 SITE_ID = 1
 
-#OTHER SETTINS
+#OTHER SETTINGS
 APP_TITLE = u'CNProg.com 程序员问答社区'
-APP_URL = 'http://www.cnprog.com'
 APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
 APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
 APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
+APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
 ADMIN_MEDIA_PREFIX = '/admin/media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 # List of callables that know how to import templates from various sources.
@@ -60,7 +61,7 @@ MIDDLEWARE_CLASSES = (
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
-    'django.core.context_processors.auth',
+    'context.auth_processor',
     'context.application_settings',
     #'django.core.context_processors.i18n',
 )
@@ -98,3 +99,9 @@ from settings_local import *
 
 USE_I18N = True
 LANGUAGE_CODE = 'en'
+EMAIL_VALIDATION = 'off'
+MIN_USERNAME_LENGTH = 1
+EMAIL_UNIQUE = False
+APP_URL = 'http://server.com' #used by email notif system and RSS
+GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
+GOOGLE_ANALYTICS_KEY = ''
diff --git a/templates/404.html b/templates/404.html
index d24edaf0..cd23a36b 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -1,5 +1,5 @@
-<!-- template 404.html -->
 {% extends "base_content.html" %}
+<!-- template 404.html -->
 {% load i18n %}
 {% block title %}{% spaceless %}404 Error{% endspaceless %}{% endblock %}
 {% block forestyle%}
diff --git a/templates/500.html b/templates/500.html
index c99774b3..52dcafae 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -1,5 +1,5 @@
-<!-- template 500.html -->
 {% extends "base_content.html" %}
+<!-- template 500.html -->
 {% load i18n %}
 {% block title %}{% spaceless %}500 Error{% endspaceless %}{% endblock %}
 {% block forejs %}
@@ -19,7 +19,7 @@
 </div>
 <div id="main-body" class="headNormal">
     <div style="padding:5px 0px 10px 0;line-height:25px">
-        <h3>{% trans "sorry, system error"</h3>
+        <h3>{% trans "sorry, system error" %}</h3>
         <br>
         {% trans "system error log is recorded, error will be fixed as soon as possible" %}<br>
 		{% trans "please report the error to the site administrators if you wish" %}
diff --git a/templates/answer_edit.html b/templates/answer_edit.html
index 008d9f78..9f0f1bec 100644
--- a/templates/answer_edit.html
+++ b/templates/answer_edit.html
@@ -1,5 +1,5 @@
-<!-- template answer_edit.html -->
 {% extends "base.html" %}
+<!-- template answer_edit.html -->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Edit answer" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
diff --git a/templates/answer_edit_tips.html b/templates/answer_edit_tips.html
index 565c5298..31f71e34 100644
--- a/templates/answer_edit_tips.html
+++ b/templates/answer_edit_tips.html
@@ -35,7 +35,7 @@
 
         </li>
         <li>
-            <b>{% trans "image" %}</b>：![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")
+            <b>{% trans "image" %}</b>:![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")
 
         </li>
         <li>
diff --git a/templates/ask.html b/templates/ask.html
index 1b00a701..4aa18dd5 100644
--- a/templates/ask.html
+++ b/templates/ask.html
@@ -1,5 +1,5 @@
-<!-- template ask.html -->
 {% extends "base.html" %}
+<!-- template ask.html -->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Ask a question" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
@@ -62,6 +62,19 @@
 <div id="main-body" class="ask-body">
     <div id="askform">
         <form id="fmask" action="" method="post" >
+			{% if not request.user.is_authenticated %}
+            <div class="message">
+			    <p>{% trans "login to post question info" %}</p>
+            </div>
+            {% else %}
+                {% ifequal settings.EMAIL_VALIDATION 'on' %}
+                    {% if not request.user.email_isvalid %}
+                        <div class="message">
+                            {% blocktrans with request.user.email as email %}must have valid {{email}} to post{% endblocktrans %}
+                        </div>
+                    {% endif %}
+                {% endifequal %}
+			{% endif %}
             <p class="form-item">
                 <label for="id_title" ><strong>{{ form.title.label_tag }}:</strong></label> <span class="form-error"></span><br>
                 {{ form.title }} {{ form.title.errors }}
@@ -92,40 +105,17 @@
                 <br>
             </p>
             <p class="form-item">
-                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br>
+                <strong>{{ form.tags.label_tag }}:</strong> {% trans "(required)" %} <span class="form-error"></span><br>
                 {{ form.tags }}  {{ form.tags.errors }}
-                <div class="title-desc">
-                    {{ form.tags.help_text }}
-                </div>
             </p>
-            <br>
+			<p class="title-desc">
+				{{ form.tags.help_text }}
+			</p>
             {% if not request.user.is_authenticated %}
-            <table id="login-box">
-                <tr>
-                    <td style="vertical-align:middle;">
-                    <strong>{% trans "Use" %} <a href="http://openid.net/" title="{% trans "learn more about OpenID" %}">OpenID</a> {% trans "Login" %}:</strong><br>
-                        {{ form.openid }}
-                        <div class="title-desc">
-                            {% trans "Get your own "%} <a href="https://www.myopenid.com/" target=="_blank">OpenID</a>。
-                        </div>
-                    </td>
-                    <td style="vertical-align:middle; padding: 0px 40px 0px 40px">
-                        <div style="position: absolute; margin-top:40px; background-color:white; margin-left:-10px; padding:5px;">或</div>
-                        <div style="width:1px; border-left:solid 1px #999; height:8em; margin:auto;"></div>
-                    </td>
-                    <td style="vertical-align:middle;">
-                        <strong>{% trans "User name" %}:</strong><br>
-                        {{ form.user }}
-                        <p>
-                        <strong>{% trans "Email: (won't be shown to anyone)" %}:</strong><br>
-                        {{ form.email }}
-                        </p>
-                    </td>
-                </tr>
-            </table>
-            {% endif %}
+            <input type="submit" value="{% trans "Login/signup to post your question" %}" class="submit" />
+			{% else %}
             <input type="submit" value="{% trans "Ask your question" %}" class="submit" />
-            <br><br>
+            {% endif %}
         </form>
     </div>
 </div>
diff --git a/templates/authopenid/changeemail.html b/templates/authopenid/changeemail.html
index 99984b3f..d5acb6c9 100644
--- a/templates/authopenid/changeemail.html
+++ b/templates/authopenid/changeemail.html
@@ -1,35 +1,81 @@
 {% extends "base_content.html" %}
 {% load i18n %}
 {% block content %}
-<div id="main-bar" class="">
-    <h3>
-        {% trans "Account: change email" %}
-    </h3>
-</div>
-<p class="settings-descr">{% blocktrans %}This is where you can change the email address associated with your account. Please keep this email address up to date so we can send you a password-reset email if you request one.{% endblocktrans %}</p>
-{% if form.errors %}
-<p class="errors">{% trans "Please correct errors below:" %}<br />
-	{% if form.email.errors %} 
-		<span class="error">{{ form.email.errors|join:", " }}</span>
-	{% endif %}
-	{% if form.password.errors %} 
-		<span class="error">{{ form.password.errors|join:", " }}</span>
-	{% endif %}
-</p>
-{% endif %}
+<!-- changeemail.html action_type={{action_type}}-->
+{% ifequal action_type "change" %}
+    <div id="main-bar" class="headNormal">
+        {% trans "Change email" %}
+    </div>
+    <p class="message">
+    {% blocktrans %}change {{email}} info{% endblocktrans %}
+    </p>
+    {% if form.errors %}
+    <p class="errors">{% trans "Please correct errors below:" %}<br />
+        {% if form.email.errors %} 
+            <span class="error">{{ form.email.errors|join:", " }}</span>
+        {% endif %}
+        {% if form.password.errors %} 
+            <span class="error">{{ form.password.errors|join:", " }}</span>
+        {% endif %}
+    </p>
+    {% endif %}
 
-{% if msg %}
-<p class="errors">{{ msg }}</p>
-{% endif %}
+    {% if msg %}
+    <p class="errors">{{ msg }}</p>
+    {% endif %}
 
-<div class="aligned">
-	<form action="." method="post" accept-charset="utf-8">
+    <div class="aligned">
+        <form action="." method="post" accept-charset="utf-8">
 
-		<div id="form-row"><label for="id_email">{% trans "Email" %}</label>{{ form.email }}</div>
-		<div id="form-row"><label for="id_password">{% trans "Password" %}</label>{{ form.password }}</div>
+            <div class="form-row"><label for="id_email">{% trans "Your new Email" %}</label><br>{{ form.email }}</div>
+            <!--<div class="form-row"><label for="id_password">{% trans "Password" %}</label>{{ form.password }}</div>-->
+            <div class="submit-row">
+                <input class="submit" type="submit" name="change_email" value="{% trans "Change email" %}">
+                <input class="submit" type="submit" name="cancel" value="{% trans "Cancel" %}">
+            </div>
 
-        <p><input type="submit" value="{% trans "Change email" %}"></p>
-
-	</form>
-	</div>
+        </form>
+    </div>
+{% endifequal %}
+{% ifequal action_type "validate" %}
+    <div id="main-bar" class="headNormal">
+        {% trans "Validate email" %}
+    </div>
+    <p class="message">
+        {% blocktrans %}validate {{email}} info{% endblocktrans %}
+    </p>
+{% endifequal %}
+{% ifequal action_type "keep" %}
+    <div id="main-bar" class="headNormal">
+        {% trans "Email not changed" %}
+    </div>
+    <p class="message">
+        {% blocktrans %}old {{email}} kept{% endblocktrans %}
+    </p>
+{% endifequal %}
+{% ifequal action_type "done_novalidate" %}
+    <div id="main-bar" class="headNormal">
+        {% trans "Email changed" %}
+    </div>
+    <p class="message">
+        {% blocktrans %}your current {{email}} can be used for this{% endblocktrans %}
+    </p>
+{% endifequal %}
+{% ifequal action_type "validation_complete" %}
+    <div id="main-bar" class="headNormal">
+        {% trans "Email verified" %}
+    </div>
+    <p class="message">
+        {% trans "thanks for verifying email" %}
+    </p>
+{% endifequal %}
+{% ifequal action_type "key_not_sent" %}
+    <div id="main-bar" class="headNormal">
+        {% trans "email key not sent" %}
+    </div>
+    <p class="message">
+        {% blocktrans %}email key not sent {{email}} change email here {{change_link}}{% endblocktrans %}
+    </p>
+{% endifequal %}
 {% endblock %}
+<!-- end changeemail.html -->
diff --git a/templates/authopenid/changeopenid.html b/templates/authopenid/changeopenid.html
index c1f3d180..9b5a196a 100644
--- a/templates/authopenid/changeopenid.html
+++ b/templates/authopenid/changeopenid.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+<!-- changeopenid.html -->
 {% load i18n %}
 
 {% block content %}
@@ -31,3 +32,4 @@
 	</form>
 	</div>
 {% endblock %}
+<!-- end changeopenid.html -->
diff --git a/templates/authopenid/changepw.html b/templates/authopenid/changepw.html
index f3cf4be0..0e90b172 100644
--- a/templates/authopenid/changepw.html
+++ b/templates/authopenid/changepw.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+<!-- changepw.html -->
 {% load i18n %}
 
 {% block head %}
@@ -31,3 +32,4 @@
 	</form>
 	</div>
 {% endblock %}
+<!-- end changepw.html -->
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index 28c38a04..b9a14e16 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -1,4 +1,5 @@
-{% extends "base.html" %}
+{% extends "base_content.html" %}
+<!-- complete.html -->
 {% load i18n %}
 {% block head %}{% endblock %}
 {% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %}
@@ -7,7 +8,9 @@
 		{% trans "Connect your OpenID with your account on this site" %}
     </div>      
 	<p id="completetxt" >
-    	<h3>{% trans "Your OpenID is accepted. Please complete this to finish registration." %}</h3>
+        <div class="message">
+            {% blocktrans %}register new {{provider}} account info{% endblocktrans %}
+        </div>
     	<p style="display:none">{% trans "This account already exists, please use another." %}</p>
 	</p>
 
@@ -41,12 +44,9 @@
 	<div class="login">
         <form name="fregister" action="{% url user_register %}" method="POST">
             {{ form.next }}
-            <fieldset style="padding:10px">
-            <legend class="big">{% trans "New account" %}</legend>
-				<div class="form-row"><label for="id_username">{% trans "User name (<i>will be shown to others, cannot be modified</i>)" %}</label><br />{{ form1.username }}</div>
-				<div class="form-row"><label for="id_email">{% trans "Email (<i>not shared with anyone</i>)" %}</label><br />{{ form1.email }}</div>
-				<div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"></div>
-            </fieldset>
+            <div class="form-row"><label for="id_username">{% trans "Screen name label" %}</label><br />{{ form1.username }}</div>
+            <div class="form-row"><label for="id_email">{% trans "Email address label" %}</label><br />{{ form1.email }}</div>
+            <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"></div>
 		</form>
 	</div>
 	<div class="login" style="display:none">
@@ -65,3 +65,4 @@
 		</form>
 	</div>
 {% endblock %}
+<!-- end complete.html -->
diff --git a/templates/authopenid/confirm_email.txt b/templates/authopenid/confirm_email.txt
index 9af177ed..202db0fc 100644
--- a/templates/authopenid/confirm_email.txt
+++ b/templates/authopenid/confirm_email.txt
@@ -1,12 +1,13 @@
-Thank you for registering. 
+{% load i18n %}
+{% trans "Thank you for registering at our Q&A forum!" %}
 
-Your account details are:
+{% trans "Your account details are:" %}
 
-Username: {{ username }}
-Password: {{ password }}
-
-
-You may sign in here:
-{{ site_url }}signin/
+{% trans "Username:" %} {{ username }}
+{% trans "Password:" %} {{ password }}
 
+{% trans "Please sign in here:" %}
+{{ site_url }}{% trans "signin/" %}
 
+{% blocktrans %}Sincerely,
+Forum Administrator{% endblocktrans %}
diff --git a/templates/authopenid/delete.html b/templates/authopenid/delete.html
index 19e0884a..d39bc962 100644
--- a/templates/authopenid/delete.html
+++ b/templates/authopenid/delete.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+<!-- delete.html -->
 {% load i18n %}
 
 
@@ -36,3 +37,4 @@
 	</form>
 	</div>
 {% endblock %}
+<!-- end delete.html -->
diff --git a/templates/authopenid/failure.html b/templates/authopenid/failure.html
index 87839ab2..d075d6b0 100644
--- a/templates/authopenid/failure.html
+++ b/templates/authopenid/failure.html
@@ -1,5 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
   "http://www.w3.org/TR/html4/strict.dtd">
+<!-- failure.html -->
 <html>
 <head>
   <title>OpenID failed</title>
@@ -10,4 +11,4 @@
 <p>{{ message|escape }}</p>
 
 </body>
-</html>
\ No newline at end of file
+</html><!-- end failure.html -->
diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
index a9488c4c..ba81dba4 100644
--- a/templates/authopenid/sendpw.html
+++ b/templates/authopenid/sendpw.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+<!-- sendpw.html -->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %}
 
@@ -32,3 +33,4 @@
     <span class="darkred">{% trans "Note: your new password will be activated only after you click the activation link in the email message" %}</span>
 </div>
 {% endblock %}
+<!-- end sendpw.html -->
diff --git a/templates/authopenid/sendpw_email.txt b/templates/authopenid/sendpw_email.txt
index dec062a8..2024061c 100644
--- a/templates/authopenid/sendpw_email.txt
+++ b/templates/authopenid/sendpw_email.txt
@@ -1,14 +1,14 @@
-Someone has requested to reset your password on {{ site_url }}.
-If this is not you, it is safe to ignore this email.
+{% load i18n %}
+{% blocktrans %}Someone has requested to reset your password on {{ site_url }}.
+If it were not you, it is safe to ignore this email.{% endblocktrans %}
 
-Your new account details are:
+{% trans "Your new account details are:" %}
 
-Username: {{ username }}
-New password: {{ password }}
+{% trans "Username:" %} {{ username }}
+{% trans "New password:" %} {{ password }}
 
-To confirm reset of your password go to this address:
+{% trans "To confirm that you wanted to reset your password please visit:" %}
 {{ site_url }}{{ url_confirm }}?key={{ confirm_key }}
 
-Regards,
-
-
+{% blocktrans %}Sincerely,
+Forum Administrator{% endblocktrans %}
diff --git a/templates/authopenid/settings.html b/templates/authopenid/settings.html
index ffd5dd8f..a373324e 100644
--- a/templates/authopenid/settings.html
+++ b/templates/authopenid/settings.html
@@ -1,4 +1,5 @@
 {% extends "base_content.html" %}
+<!-- settings.html -->
 {% load i18n %}
 
 {% block head %}
@@ -39,3 +40,4 @@
 	</dl>
 </div>
 {% endblock %}
+<!-- end settings.html -->
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index d8a98329..9a1a6780 100644
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -1,42 +1,120 @@
 {% extends "base.html" %}
+<!-- signin.html -->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-	<script type="text/javascript" src="/content/js/jquery.openid.js?"></script>
+	<!--<script type="text/javascript" src="/content/js/jquery.openid.js?"></script>-->
     <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
-	<script type="text/javascript">
+
+	<link rel="stylesheet" type="text/css" media="screen" href="/content/jquery-openid/openid.css"/>
+	<script type="text/javascript" src="/content/jquery-openid/jquery.openid.js"></script>
+	<script type="text/javascript">  $().ready( function() { $("form.openid:eq(0)").openid(); })</script>
+	<!--<script type="text/javascript">
 	$().ready(function(){
 	    openid.init('id_openid_url');
         setupFormValidation("#openid_form", {bsignin:{required: true}});
 	});
-	</script>
+	</script>-->
 {% endblock %}
 {% block content %}
 <div class="headNormal">
 	{% trans "User login" %}
 </div>
-<div class="login">
-    <form name="openid_form" action="{% url user_signin %}" method="post">
-        {{ form2.next }}
-        <p>{% trans "we support two login modes" %}</p>
         {% if msg %}
             <p class="warning">{{ msg }}</p>
         {% endif %}
-        <fieldset class="fieldset">
-    		<legend ><strong>{% trans "Login with your OpenID" %}</strong></legend>
-            <div id="openid_choice">
-                <p>{% trans "select openid provider" %}</p>
-                <div id="openid_btns">
-                </div>
-				<br><br><br>
-				<p>{% trans "verify openid link and login" %}</p>
+        {% if answer %}
+            <div class="message">
+                {% blocktrans with answer.question.title as title and answer.summary as summary %}
+                Your answer to {{title}} {{summary}} will be posted once you log in
+                {% endblocktrans %}
+            </div>
+        {% endif %}
+        {% if question %}
+            <div class="message">
+                {% blocktrans with question.title as title and question.summary as summary %}Your question 
+                {{title}} {{summary}} will be posted once you log in
+                {% endblocktrans %}
             </div>
-        	<p>
-                {{ form2.openid_url }} <input id="bsignin" name="bsignin" type="submit" value="{% trans "Login" %}" class="openid-login-submit" />
-        	</p>
-        </fieldset>	
-    </form>
-    <div>
+        {% endif %}
+		<div style="width:600px;float:left;margin-bottom:5px;">{% trans "Click to sign in through any of these services." %}</div>
+			<form id="openid_form" name="openid_form" class="openid" method="post" action="{% url user_signin %}"> 
+			  <ul class="providers"> 
+			  <li class="openid" title="OpenID">
+				  <div class="logo_box openid_box">
+						<img src="/content/jquery-openid/images/openid.gif" alt="icon" /> 
+				  </div>
+			  <span><strong>http://{your-openid-url}</strong></span>
+			  </li> 
+			  <li class="direct" title="Google"> 
+			  	<div class="logo_box google_box">
+					<img src="/content/jquery-openid/images/google.gif" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
+				</div>
+		 	  </li>
+			  <li class="direct" title="Yahoo"> 
+			  	<div class="logo_box yahoo_box">
+					<img src="/content/jquery-openid/images/yahoo.gif" alt="icon" /><span>http://yahoo.com/</span>
+				</div>
+			  </li>
+			  <li class="username" title="AOL screen name"> 
+			  	<div class="logo_box aol_box">
+					<img src="/content/jquery-openid/images/aol.gif" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
+				</div>
+			  </li>
+			  <li class="username first_tiny_li" title="MyOpenID user name"> 
+					<img src="/content/jquery-openid/images/myopenid.ico" alt="icon" />
+					<span>http://<strong>username</strong>.myopenid.com/</span>
+		      </li> 
+			  <li class="username" title="Flickr user name"> 
+					<img src="/content/jquery-openid/images/flickr.ico" alt="icon" />
+					<span>http://flickr.com/<strong>username</strong>/</span>
+			  </li> 
+			  <li class="username" title="Technorati user name"> 
+					<img src="/content/jquery-openid/images/technorati.ico" alt="icon" />
+					<span>http://technorati.com/people/technorati/<strong>username</strong>/</span>
+			  </li> 
+			  <li class="username" title="Wordpress blog name"> 
+					<img src="/content/jquery-openid/images/wordpress.ico" alt="icon" />
+					<span>http://<strong>username</strong>.wordpress.com</span>
+              </li> 
+			  <li class="username" title="Blogger blog name"> 
+					<img src="/content/jquery-openid/images/blogger.ico" alt="icon" />
+					<span>http://<strong>username</strong>.blogspot.com/</span>
+			  </li> 
+			  <li class="username" title="LiveJournal blog name"> 
+					<img src="/content/jquery-openid/images/livejournal.ico" alt="icon" />
+					<span>http://<strong>username</strong>.livejournal.com</span>
+			  </li> 
+			  <li class="username" title="ClaimID user name"> 
+					<img src="/content/jquery-openid/images/claimid.ico" alt="icon" />
+					<span>http://claimid.com/<strong>username</strong></span>
+			  </li> 
+			  <li class="username" title="Vidoop user name"> 
+					<img src="/content/jquery-openid/images/vidoop.ico" alt="icon" />
+					<span>http://<strong>username</strong>.myvidoop.com/</span>
+			  </li> 
+			  <li class="username" title="Verisign user name"> 
+					<img src="/content/jquery-openid/images/verisign.ico" alt="icon" />
+					<span>http://<strong>username</strong>.pip.verisignlabs.com/</span>
+			  </li> 
+			  </ul>
+			  {{ form2.next }}
+			  <fieldset> 
+				  <p id="provider_name_slot">{% trans 'Enter your <span id="enter_your_what">Provider user name</span>' %}</p> 
+				  <div><p><span></span>
+				  		<input id="openid_username" type="text" name="openid_username" /><span></span> 
+			  			<input type="submit" value="Login" />
+				  </p></div>
+			  </fieldset> 
+			  <fieldset> 
+				  <p>{% trans 'Enter your <a class="openid_logo" href="http://openid.net">OpenID</a> web address' %}</p> 
+				  <div><p><input id="openid_url" type="text" value="http://" name="openid_url" /> 
+				  <input id="bsignin" name="bsignin" type="submit" value="{% trans "Login" %}" /></p></div> 
+			  </fieldset> 
+			</form>
+<div class="login">
+        <p style="display:none">{% trans "we support two login modes" %}</p>
+    <div style="display:none">
         <br>
         {% if form1.errors %}
         <p class="errors">
@@ -60,7 +138,7 @@
         		<div class="form-row"><label for="id_password">{% trans "Password" %}:</label><br />{{ form1.password }}</div>
                <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"> 
 			   <a href="">{% trans "Forgot your password?" %}</a> 
-			   <a href="">{% trans "Create new acccount" %}</a></div>
+			   <a href="">{% trans "Create new account" %}</a></div>
         	</fieldset>	
         </form>
     </div>
@@ -93,3 +171,5 @@
 </div>
 {% endblock%}
 
+		<script type="text/javascript">  $( function() { $("form.openid:eq(0)").openid(); })</script>
+<!-- end signin.html -->
diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html
index 9ac0aab3..a65dafdc 100644
--- a/templates/authopenid/signup.html
+++ b/templates/authopenid/signup.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+<!--signup.html-->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %}
 
@@ -51,3 +52,4 @@
     </form>
     </div>
 {% endblock %}
+<!--end signup.html-->
diff --git a/templates/badge.html b/templates/badge.html
index d0906918..029ba0d9 100644
--- a/templates/badge.html
+++ b/templates/badge.html
@@ -1,5 +1,5 @@
-<!-- template badge.html -->
 {% extends "base_content.html" %}
+<!-- template badge.html -->
 {% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
diff --git a/templates/badges.html b/templates/badges.html
index 7fd1402a..69ddc39f 100644
--- a/templates/badges.html
+++ b/templates/badges.html
@@ -1,5 +1,5 @@
-<!-- template badges.html -->
 {% extends "base.html" %}
+<!-- template badges.html -->
 {% load extra_tags %}
 {% load humanize %}
 {% load i18n %}
@@ -16,9 +16,10 @@
 <div class="headlineA">
         <span class="headMedals">{% trans "Badges" %}</span>
 </div>
-<div id="main-body" style="width:100%">
+<div class="badges" id="main-body" style="width:100%">
     <p>
-	{% trans "Community gives you awards for your questions, answers and votes. Below is the list of available badges and number of times each type of badge has been awarded." %}
+	{% trans "Community gives you awards for your questions, answers and votes." %}<br>
+	{% trans "Below is the list of available badges and number of times each type of badge has been awarded." %}
     </p>
     <br>
     <div id="medalList">
@@ -44,14 +45,14 @@
 {% endblock %}
 {% block sidebar %}
 
-<div class="boxB">
+<div class="boxC">
     <h3>{% trans "Community badges" %}</h3>
     <div class="body">
     <p>
         <a style="cursor:default;" title="gold badge: the highest honor and is very rare" class="medal"><span class="badge1">&#9679;</span>&nbsp;{% trans "gold" %}</a>
     </p>
     <p>
-    {% trans "Gold badge is very rare. To obtain it you have to show profound knowledge and ability in addition to actively participating in the community. Gold badge is the highest award in this community." %}
+	{% trans "gold badge description" %}
     </p>
     <p>
         <a style="cursor:default;" 
@@ -59,14 +60,14 @@
 			class="medal"><span class="badge2">&#9679;</span>&nbsp;{% trans "silver" %}</a>
     </p>
     <p>
-	{% trans "Obtaining silver badge requires significant patience. If you got one, you've very significantly contributed to this community" %}
+	{% trans "silver badge description" %}
     </p>
     <p>
         <a style="cursor:default;" title="{% trans "bronze badge: often given as a special honor" %}" class="medal">
 		<span class="badge3">&#9679;</span>&nbsp;{% trans "bronze" %}</a>
     </p>
     <p>
-	{% trans "If you are active in this community, you will get this medal - still it is a special honor." %}
+	{% trans "bronze badge description" %}
     </p>
     </div>
 </div>
diff --git a/templates/base.html b/templates/base.html
index bf24c840..ae389255 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -4,18 +4,18 @@
 {% load i18n %}
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
-        <title>{% block title %}{% endblock %} - {{ APP_TITLE }}</title>
+        <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
         {% spaceless %}
         {% block meta %}{% endblock %}
         {% endspaceless %}
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <meta name="verify-v1" content="{{verify_v1_code}}" />
+        <meta name="verify-v1" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
         <link rel="shortcut icon" href="/content/images/favicon.ico" >
         <link href="/content/style/style.css" rel="stylesheet" type="text/css" />
         <script src="http://www.google.com/jsapi"></script>
         <script>google.load("jquery", "1.2.6");</script>
 		<script type="text/javascript">
-			var i18nLang = 'en';
+			var i18nLang = '{{settings.LANGUAGE_CODE}}';
 		</script>
         <script type='text/javascript' src='/content/js/com.cnprog.i18n.js'></script>
 		<script type='text/javascript' src='/content/js/jquery.i18n.js'></script>
@@ -26,9 +26,8 @@
         </script>
         <script type="text/javascript">
         UserVoice.Tab.show({ 
-			//EDIT!!!
-            key: 'key',
-            host: 'where.uservoice.com', 
+            key: 'cnprog',
+            host: 'cnprog.uservoice.com', 
             forum: 'general', 
             alignment: 'left', /* 'left', 'right' */
             background_color:'#777', 
@@ -38,30 +37,31 @@
         })
         </script>-->
 		<!-- todo move this to settings -->
-        {% with request.user.get_messages as messages%}
         {% if messages %}
         <style type="text/css">
             body { margin-top:2.4em; }
         </style>
         <script type="text/javascript">
             $().ready(function() {
+                $('#validate_email_alert').click(function(){notify.close(true)})
                 notify.show();
             });
         </script>
-       
         {% endif %}
-        {% endwith %}
       
         {% block forejs %}
         {% endblock %}
     </head>
     <body>
         <div class="notify" style="display:none">
-            <span>{% if request.user.get_messages %}
-            {% trans "congratulations, community gave you a badge" %}: {% for message in request.user.get_messages %}
-            <font class="darkred">{{ message }}</font>, {% endfor %}查看
-            <a href="{{ request.user.get_profile_url }}">{% trans "profile" %}</a>{% endif %}</span>
-            <a class="close-notify" onclick="notify.close(true)">&times;</a>
+            {% autoescape off %}
+                {% if messages %}
+                    {% for message in messages %}
+                          <p class="darkred">{{ message }}<p>
+                    {% endfor %}
+                {% endif %}
+            {% endautoescape %}
+            <a id="close-notify" onclick="notify.close(true)">&times;</a>
         </div>
         {% include "header.html" %}
         <div id="wrapper">
@@ -89,3 +89,4 @@
         {% endblock %}
     </body>
 </html>
+<!-- end template base.html -->
diff --git a/templates/base_content.html b/templates/base_content.html
index 39627a0e..4ee9675f 100644
--- a/templates/base_content.html
+++ b/templates/base_content.html
@@ -1,10 +1,11 @@
-{% load i18n %}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!-- base_content.html -->
+{% load i18n %}
 <html>
     <head>
-        <title>{% block title %}{% endblock %} - {{ APP_TITLE }}</title>
+        <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <meta name="verify-v1" content="55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA=" />
+        <meta name="verify-v1" content="{{ settings.GOOGLE_SITEMAP_CODE }}" />
         <link rel="shortcut icon" href="/content/images/favicon.ico" >
         <link href="/content/style/style.css" rel="stylesheet" type="text/css" />
 		 {% spaceless %}
@@ -13,7 +14,7 @@
         <script src="http://www.google.com/jsapi"></script>
         <script>google.load("jquery", "1.2.6");</script>
 		<script type="text/javascript">
-			var i18nLang = 'en';
+			var i18nLang = '{{ settings.LANGUAGE_CODE }}';
 		</script>
         <script type='text/javascript' src='/content/js/com.cnprog.i18n.js'></script>
 	    <script type='text/javascript' src='/content/js/jquery.i18n.js'></script>
@@ -38,29 +39,32 @@
         </script>-->
 		<!-- todo move this to settings-->
 
-        {% with request.user.get_messages as messages%}
         {% if messages %}
         <style type="text/css">
             body { margin-top:2.4em; }
         </style>
         <script type="text/javascript">
             $().ready(function() {
+                var element = $('#validate_email_alert')
+                element.click(function(){notify.close(true);setTimeout(function(){},1000)})
                 notify.show();
             });
         </script>
         {% endif %}
-        {% endwith %}
       
         {% block forejs %}
         {% endblock %}
     </head>
     <body>
         <div class="notify" style="display:none">
-            <span>{% if request.user.get_messages %}
-            {% trans "congratulations, community gave you a badge" %}:{% for message in request.user.get_messages %}
-            <font class="darkred">{{ message }}</font>, {% endfor %}{% trans "see" %}
-            <a href="{{ request.user.get_profile_url }}">{% trans "profile" %}</a>{% endif %}</span>
-            <a class="close-notify" onclick="notify.close(true)">&times;</a>
+            {% autoescape off %}
+                {% if messages %}
+                    {% for message in messages %}
+                          <p class="darkred">{{ message }}<p>
+                    {% endfor %}
+                {% endif %}
+            {% endautoescape %}
+            <a id="close-notify" onclick="notify.close(true)">&times;</a>
         </div>
         {% include "header.html" %}
         <div id="wrapper">
@@ -82,3 +86,4 @@
         {% endblock %}
     </body>
 </html>
+<!-- end template base_content.html -->
diff --git a/templates/book.html b/templates/book.html
index a58a09f2..dddd13e6 100644
--- a/templates/book.html
+++ b/templates/book.html
@@ -1,5 +1,5 @@
-<!-- template book.html -->
 {% extends "base_content.html" %}
+<!-- template book.html -->
 {% load i18n %}
 {% load extra_tags %}
 {% load extra_filters %}
diff --git a/templates/close.html b/templates/close.html
index 32df3e82..d9e73507 100644
--- a/templates/close.html
+++ b/templates/close.html
@@ -1,5 +1,5 @@
-<!-- template close.html -->
 {% extends "base_content.html" %}
+<!-- template close.html -->
 {% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index 2d8c90a6..90166eec 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -1,5 +1,3 @@
-// Evgeny Fadeev evgeny.fadeev@gmail.com localized for english and chinese
-// i18nLang variable must be set in html header to extract correct language
 var i18nZh = {
 	'insufficient privilege':'用户权限不在操作范围',
 	'cannot pick own answer as best':'不能设置自己的回答为最佳答案',
@@ -59,6 +57,10 @@ var i18nZh = {
 };
 
 var i18nEn = {
+    '>15 points requried to upvote':'>15 points requried to upvote ',
+	'tags cannot be empty':'please enter at least one tag',
+	'anonymous users cannot vote':'anonymous users cannot vote ',
+	'anonymous users cannot select favorite questions':'anonymous users cannot select favorite questions ',
 	'to comment, need': 'to comment, need reputation ',
 	'please see':'please see ',
 	'community reputation points':' ',
@@ -84,7 +86,7 @@ var i18nEn = {
 
 var i18n = {
 	'en':i18nEn,
-	'zh':i18nZh
+	'zh_CN':i18nZh
 };
 
 var i18n_dict = i18n[i18nLang];
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index 723e34ae..546cf101 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -48,10 +48,11 @@ var Vote = function(){
     var questionControlsId = 'question-controls';
     var removeQuestionLinkIdPrefix = 'question-delete-link-';
     var removeAnswerLinkIdPrefix = 'answer-delete-link-';
+    var questionSubscribeUpdates = 'question-subscribe-updates';
     
     var acceptAnonymousMessage = $.i18n._('insufficient privilege');
     var acceptOwnAnswerMessage = $.i18n._('cannot pick own answer as best');
-    var favoriteAnonymousMessage = $.i18n._('anonymous user cannot select favorite questions') 
+    var favoriteAnonymousMessage = $.i18n._('anonymous users cannot select favorite questions') 
 					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
 					+ $.i18n._('please login') + "</a>";
     var voteAnonymousMessage = $.i18n._('anonymous users cannot vote') 
@@ -91,7 +92,9 @@ var Vote = function(){
         offensiveQuestion : 7,
         offensiveAnswer:8,
         removeQuestion: 9,
-        removeAnswer:10
+        removeAnswer:10,
+        questionSubscribeUpdates:11,
+        questionUnsubscribeUpdates:12,
     };
 
     var getFavoriteButton = function(){
@@ -141,6 +144,10 @@ var Vote = function(){
         var removeQuestionLink = 'div#question-controls a[id^='+ removeQuestionLinkIdPrefix +']';
         return $(removeQuestionLink);
     };
+
+    var getquestionSubscribeUpdatesCheckbox = function(){
+        return $('#' + questionSubscribeUpdates);
+    };
     
     var getremoveAnswersLinks = function(){
         var removeAnswerLinks = 'div.answer-controls a[id^='+ removeAnswerLinkIdPrefix +']';
@@ -216,6 +223,15 @@ var Vote = function(){
         getremoveQuestionLink().unbind('click').click(function(event){
             Vote.remove(this, VoteType.removeQuestion);
         });
+
+        getquestionSubscribeUpdatesCheckbox().unbind('click').click(function(event){
+            if (this.checked){
+                Vote.vote($(event.target), VoteType.questionSubscribeUpdates);
+            }
+            else {
+                Vote.vote($(event.target), VoteType.questionUnsubscribeUpdates);
+            }
+        });
     
         getremoveAnswersLinks().unbind('click').click(function(event){
             Vote.remove(this, VoteType.removeAnswer)
@@ -343,7 +359,6 @@ var Vote = function(){
     };
         
     var callback_remove = function(object, voteType, data){
-		alert(data.status);
         if(data.allowed == "0" && data.success == "0"){
             showMessage(object, removeAnonymousMessage.replace("{{QuestionID}}", questionId));
         }
@@ -613,4 +628,4 @@ var commentsFactory = {'question' : questionComments, 'answer' : answerComments}
 Prettify
 http://www.apache.org/licenses/LICENSE-2.0
 */
-var PR_SHOULD_USE_CONTINUATION = true; var PR_TAB_WIDTH = 8; var PR_normalizedHtml; var PR; var prettyPrintOne; var prettyPrint; function _pr_isIE6() { var isIE6 = navigator && navigator.userAgent && /\bMSIE 6\./.test(navigator.userAgent); _pr_isIE6 = function() { return isIE6; }; return isIE6; } (function() { function wordSet(words) { words = words.split(/ /g); var set = {}; for (var i = words.length; --i >= 0; ) { var w = words[i]; if (w) { set[w] = null; } } return set; } var FLOW_CONTROL_KEYWORDS = "break continue do else for if return while "; var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " + "double enum extern float goto int long register short signed sizeof " + "static struct switch typedef union unsigned void volatile "; var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " + "new operator private protected public this throw true try "; var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " + "concept concept_map const_cast constexpr decltype " + "dynamic_cast explicit export friend inline late_check " + "mutable namespace nullptr reinterpret_cast static_assert static_cast " + "template typeid typename typeof using virtual wchar_t where "; var JAVA_KEYWORDS = COMMON_KEYWORDS + "boolean byte extends final finally implements import instanceof null " + "native package strictfp super synchronized throws transient "; var CSHARP_KEYWORDS = JAVA_KEYWORDS + "as base by checked decimal delegate descending event " + "fixed foreach from group implicit in interface internal into is lock " + "object out override orderby params readonly ref sbyte sealed " + "stackalloc string select uint ulong unchecked unsafe ushort var "; var JSCRIPT_KEYWORDS = COMMON_KEYWORDS + "debugger eval export function get null set undefined var with " + "Infinity NaN "; var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " + "goto if import last local my next no our print package redo require " + "sub undef unless until use wantarray while BEGIN END "; var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " + "elif except exec finally from global import in is lambda " + "nonlocal not or pass print raise try with yield " + "False True None "; var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" + " defined elsif end ensure false in module next nil not or redo rescue " + "retry self super then true undef unless until when yield BEGIN END "; var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " + "function in local set then until "; var ALL_KEYWORDS = (CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS + PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS); var PR_STRING = 'str'; var PR_KEYWORD = 'kwd'; var PR_COMMENT = 'com'; var PR_TYPE = 'typ'; var PR_LITERAL = 'lit'; var PR_PUNCTUATION = 'pun'; var PR_PLAIN = 'pln'; var PR_TAG = 'tag'; var PR_DECLARATION = 'dec'; var PR_SOURCE = 'src'; var PR_ATTRIB_NAME = 'atn'; var PR_ATTRIB_VALUE = 'atv'; var PR_NOCODE = 'nocode'; function isWordChar(ch) { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'); } function spliceArrayInto(inserted, container, containerPosition, countReplaced) { inserted.unshift(containerPosition, countReplaced || 0); try { container.splice.apply(container, inserted); } finally { inserted.splice(0, 2); } } var REGEXP_PRECEDER_PATTERN = function() { var preceders = ["!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=", "&=", "(", "*", "*=", "+=", ",", "-=", "->", "/", "/=", ":", "::", ";", "<", "<<", "<<=", "<=", "=", "==", "===", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "||=", "~", "break", "case", "continue", "delete", "do", "else", "finally", "instanceof", "return", "throw", "try", "typeof"]; var pattern = '(?:' + '(?:(?:^|[^0-9.])\\.{1,3})|' + '(?:(?:^|[^\\+])\\+)|' + '(?:(?:^|[^\\-])-)'; for (var i = 0; i < preceders.length; ++i) { var preceder = preceders[i]; if (isWordChar(preceder.charAt(0))) { pattern += '|\\b' + preceder; } else { pattern += '|' + preceder.replace(/([^=<>:&])/g, '\\$1'); } } pattern += '|^)\\s*$'; return new RegExp(pattern); } (); var pr_amp = /&/g; var pr_lt = /</g; var pr_gt = />/g; var pr_quot = /\"/g; function attribToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;').replace(pr_quot, '&quot;'); } function textToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;'); } var pr_ltEnt = /&lt;/g; var pr_gtEnt = /&gt;/g; var pr_aposEnt = /&apos;/g; var pr_quotEnt = /&quot;/g; var pr_ampEnt = /&amp;/g; var pr_nbspEnt = /&nbsp;/g; function htmlToText(html) { var pos = html.indexOf('&'); if (pos < 0) { return html; } for (--pos; (pos = html.indexOf('&#', pos + 1)) >= 0; ) { var end = html.indexOf(';', pos); if (end >= 0) { var num = html.substring(pos + 3, end); var radix = 10; if (num && num.charAt(0) === 'x') { num = num.substring(1); radix = 16; } var codePoint = parseInt(num, radix); if (!isNaN(codePoint)) { html = (html.substring(0, pos) + String.fromCharCode(codePoint) + html.substring(end + 1)); } } } return html.replace(pr_ltEnt, '<').replace(pr_gtEnt, '>').replace(pr_aposEnt, "'").replace(pr_quotEnt, '"').replace(pr_ampEnt, '&').replace(pr_nbspEnt, ' '); } function isRawContent(node) { return 'XMP' === node.tagName; } function normalizedHtml(node, out) { switch (node.nodeType) { case 1: var name = node.tagName.toLowerCase(); out.push('<', name); for (var i = 0; i < node.attributes.length; ++i) { var attr = node.attributes[i]; if (!attr.specified) { continue; } out.push(' '); normalizedHtml(attr, out); } out.push('>'); for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } if (node.firstChild || !/^(?:br|link|img)$/.test(name)) { out.push('<\/', name, '>'); } break; case 2: out.push(node.name.toLowerCase(), '="', attribToHtml(node.value), '"'); break; case 3: case 4: out.push(textToHtml(node.nodeValue)); break; } } var PR_innerHtmlWorks = null; function getInnerHtml(node) { if (null === PR_innerHtmlWorks) { var testNode = document.createElement('PRE'); testNode.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />')); PR_innerHtmlWorks = !/</.test(testNode.innerHTML); } if (PR_innerHtmlWorks) { var content = node.innerHTML; if (isRawContent(node)) { content = textToHtml(content); } return content; } var out = []; for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } return out.join(''); } function makeTabExpander(tabWidth) { var SPACES = '                '; var charInLine = 0; return function(plainText) { var out = null; var pos = 0; for (var i = 0, n = plainText.length; i < n; ++i) { var ch = plainText.charAt(i); switch (ch) { case '\t': if (!out) { out = []; } out.push(plainText.substring(pos, i)); var nSpaces = tabWidth - (charInLine % tabWidth); charInLine += nSpaces; for (; nSpaces >= 0; nSpaces -= SPACES.length) { out.push(SPACES.substring(0, nSpaces)); } pos = i + 1; break; case '\n': charInLine = 0; break; default: ++charInLine; } } if (!out) { return plainText; } out.push(plainText.substring(pos)); return out.join(''); }; } var pr_chunkPattern = /(?:[^<]+|<!--[\s\S]*?-->|<!\[CDATA\[([\s\S]*?)\]\]>|<\/?[a-zA-Z][^>]*>|<)/g; var pr_commentPrefix = /^<!--/; var pr_cdataPrefix = /^<\[CDATA\[/; var pr_brPrefix = /^<br\b/i; var pr_tagNameRe = /^<(\/?)([a-zA-Z]+)/; function extractTags(s) { var matches = s.match(pr_chunkPattern); var sourceBuf = []; var sourceBufLen = 0; var extractedTags = []; if (matches) { for (var i = 0, n = matches.length; i < n; ++i) { var match = matches[i]; if (match.length > 1 && match.charAt(0) === '<') { if (pr_commentPrefix.test(match)) { continue; } if (pr_cdataPrefix.test(match)) { sourceBuf.push(match.substring(9, match.length - 3)); sourceBufLen += match.length - 12; } else if (pr_brPrefix.test(match)) { sourceBuf.push('\n'); ++sourceBufLen; } else { if (match.indexOf(PR_NOCODE) >= 0 && isNoCodeTag(match)) { var name = match.match(pr_tagNameRe)[2]; var depth = 1; end_tag_loop: for (var j = i + 1; j < n; ++j) { var name2 = matches[j].match(pr_tagNameRe); if (name2 && name2[2] === name) { if (name2[1] === '/') { if (--depth === 0) { break end_tag_loop; } } else { ++depth; } } } if (j < n) { extractedTags.push(sourceBufLen, matches.slice(i, j + 1).join('')); i = j; } else { extractedTags.push(sourceBufLen, match); } } else { extractedTags.push(sourceBufLen, match); } } } else { var literalText = htmlToText(match); sourceBuf.push(literalText); sourceBufLen += literalText.length; } } } return { source: sourceBuf.join(''), tags: extractedTags }; } function isNoCodeTag(tag) { return !!tag.replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g, ' $1="$2$3$4"').match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/); } function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) { var shortcuts = {}; (function() { var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns); for (var i = allPatterns.length; --i >= 0; ) { var patternParts = allPatterns[i]; var shortcutChars = patternParts[3]; if (shortcutChars) { for (var c = shortcutChars.length; --c >= 0; ) { shortcuts[shortcutChars.charAt(c)] = patternParts; } } } })(); var nPatterns = fallthroughStylePatterns.length; var notWs = /\S/; return function(sourceCode, opt_basePos) { opt_basePos = opt_basePos || 0; var decorations = [opt_basePos, PR_PLAIN]; var lastToken = ''; var pos = 0; var tail = sourceCode; while (tail.length) { var style; var token = null; var match; var patternParts = shortcuts[tail.charAt(0)]; if (patternParts) { match = tail.match(patternParts[1]); token = match[0]; style = patternParts[0]; } else { for (var i = 0; i < nPatterns; ++i) { patternParts = fallthroughStylePatterns[i]; var contextPattern = patternParts[2]; if (contextPattern && !contextPattern.test(lastToken)) { continue; } match = tail.match(patternParts[1]); if (match) { token = match[0]; style = patternParts[0]; break; } } if (!token) { style = PR_PLAIN; token = tail.substring(0, 1); } } decorations.push(opt_basePos + pos, style); pos += token.length; tail = tail.substring(token.length); if (style !== PR_COMMENT && notWs.test(token)) { lastToken = token; } } return decorations; }; } var PR_MARKUP_LEXER = createSimpleLexer([], [[PR_PLAIN, /^[^<]+/, null], [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/, null], [PR_COMMENT, /^<!--[\s\S]*?(?:-->|$)/, null], [PR_SOURCE, /^<\?[\s\S]*?(?:\?>|$)/, null], [PR_SOURCE, /^<%[\s\S]*?(?:%>|$)/, null], [PR_SOURCE, /^<(script|style|xmp)\b[^>]*>[\s\S]*?<\/\1\b[^>]*>/i, null], [PR_TAG, /^<\/?\w[^<>]*>/, null]]); var PR_SOURCE_CHUNK_PARTS = /^(<[^>]*>)([\s\S]*)(<\/[^>]*>)$/; function tokenizeMarkup(source) { var decorations = PR_MARKUP_LEXER(source); for (var i = 0; i < decorations.length; i += 2) { if (decorations[i + 1] === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var sourceChunk = source.substring(start, end); var match = sourceChunk.match(PR_SOURCE_CHUNK_PARTS); if (match) { decorations.splice(i, 2, start, PR_TAG, start + match[1].length, PR_SOURCE, start + match[1].length + (match[2] || '').length, PR_TAG); } } } return decorations; } var PR_TAG_LEXER = createSimpleLexer([[PR_ATTRIB_VALUE, /^\'[^\']*(?:\'|$)/, null, "'"], [PR_ATTRIB_VALUE, /^\"[^\"]*(?:\"|$)/, null, '"'], [PR_PUNCTUATION, /^[<>\/=]+/, null, '<>/=']], [[PR_TAG, /^[\w:\-]+/, /^</], [PR_ATTRIB_VALUE, /^[\w\-]+/, /^=/], [PR_ATTRIB_NAME, /^[\w:\-]+/, null], [PR_PLAIN, /^\s+/, null, ' \t\r\n']]); function splitTagAttributes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_TAG) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var chunk = source.substring(start, end); var subDecorations = PR_TAG_LEXER(chunk, start); spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function sourceDecorator(options) { var shortcutStylePatterns = [], fallthroughStylePatterns = []; if (options.tripleQuotedStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/, null, '\'"']); } else if (options.multiLineStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/, null, '\'"`']); } else { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, null, '"\'']); } fallthroughStylePatterns.push([PR_PLAIN, /^(?:[^\'\"\`\/\#]+)/, null, ' \r\n']); if (options.hashComments) { shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']); } if (options.cStyleComments) { fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]); fallthroughStylePatterns.push([PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]); } if (options.regexLiterals) { var REGEX_LITERAL = ('^/(?=[^/*])' + '(?:[^/\\x5B\\x5C]' + '|\\x5C[\\s\\S]' + '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+' + '(?:/|$)'); fallthroughStylePatterns.push([PR_STRING, new RegExp(REGEX_LITERAL), REGEXP_PRECEDER_PATTERN]); } var keywords = wordSet(options.keywords); options = null; var splitStringAndCommentTokens = createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns); var styleLiteralIdentifierPuncRecognizer = createSimpleLexer([], [[PR_PLAIN, /^\s+/, null, ' \r\n'], [PR_PLAIN, /^[a-z_$@][a-z_$@0-9]*/i, null], [PR_LITERAL, /^0x[a-f0-9]+[a-z]/i, null], [PR_LITERAL, /^(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?[a-z]*/i, null, '123456789'], [PR_PUNCTUATION, /^[^\s\w\.$@]+/, null]]); function splitNonStringNonCommentTokens(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_PLAIN) { var start, end, chunk, subDecs; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; chunk = source.substring(start, end); subDecs = styleLiteralIdentifierPuncRecognizer(chunk, start); for (var j = 0, m = subDecs.length; j < m; j += 2) { var subStyle = subDecs[j + 1]; if (subStyle === PR_PLAIN) { var subStart = subDecs[j]; var subEnd = j + 2 < m ? subDecs[j + 2] : chunk.length; var token = source.substring(subStart, subEnd); if (token === '.') { subDecs[j + 1] = PR_PUNCTUATION; } else if (token in keywords) { subDecs[j + 1] = PR_KEYWORD; } else if (/^@?[A-Z][A-Z$]*[a-z][A-Za-z$]*$/.test(token)) { subDecs[j + 1] = token.charAt(0) === '@' ? PR_LITERAL : PR_TYPE; } } } spliceArrayInto(subDecs, decorations, i, 2); i += subDecs.length - 2; } } return decorations; } return function(sourceCode) { var decorations = splitStringAndCommentTokens(sourceCode); decorations = splitNonStringNonCommentTokens(sourceCode, decorations); return decorations; }; } var decorateSource = sourceDecorator({ keywords: ALL_KEYWORDS, hashComments: true, cStyleComments: true, multiLineStrings: true, regexLiterals: true }); function splitSourceNodes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var subDecorations = decorateSource(source.substring(start, end)); for (var j = 0, m = subDecorations.length; j < m; j += 2) { subDecorations[j] += start; } spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function splitSourceAttributes(source, decorations) { var nextValueIsSource = false; for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; var start, end; if (style === PR_ATTRIB_NAME) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; nextValueIsSource = /^on|^style$/i.test(source.substring(start, end)); } else if (style === PR_ATTRIB_VALUE) { if (nextValueIsSource) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var attribValue = source.substring(start, end); var attribLen = attribValue.length; var quoted = (attribLen >= 2 && /^[\"\']/.test(attribValue) && attribValue.charAt(0) === attribValue.charAt(attribLen - 1)); var attribSource; var attribSourceStart; var attribSourceEnd; if (quoted) { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue; } else { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue.substring(1, attribValue.length - 1); } var attribSourceDecorations = decorateSource(attribSource); for (var j = 0, m = attribSourceDecorations.length; j < m; j += 2) { attribSourceDecorations[j] += attribSourceStart; } if (quoted) { attribSourceDecorations.push(attribSourceEnd, PR_ATTRIB_VALUE); spliceArrayInto(attribSourceDecorations, decorations, i + 2, 0); } else { spliceArrayInto(attribSourceDecorations, decorations, i, 2); } } nextValueIsSource = false; } } return decorations; } function decorateMarkup(sourceCode) { var decorations = tokenizeMarkup(sourceCode); decorations = splitTagAttributes(sourceCode, decorations); decorations = splitSourceNodes(sourceCode, decorations); decorations = splitSourceAttributes(sourceCode, decorations); return decorations; } function recombineTagsAndDecorations(sourceText, extractedTags, decorations) { var html = []; var outputIdx = 0; var openDecoration = null; var currentDecoration = null; var tagPos = 0; var decPos = 0; var tabExpander = makeTabExpander(PR_TAB_WIDTH); var adjacentSpaceRe = /([\r\n ]) /g; var startOrSpaceRe = /(^| ) /gm; var newlineRe = /\r\n?|\n/g; var trailingSpaceRe = /[ \r\n]$/; var lastWasSpace = true; function emitTextUpTo(sourceIdx) { if (sourceIdx > outputIdx) { if (openDecoration && openDecoration !== currentDecoration) { html.push('</span>'); openDecoration = null; } if (!openDecoration && currentDecoration) { openDecoration = currentDecoration; html.push('<span class="', openDecoration, '">'); } var htmlChunk = textToHtml(tabExpander(sourceText.substring(outputIdx, sourceIdx))).replace(lastWasSpace ? startOrSpaceRe : adjacentSpaceRe, '$1&nbsp;'); lastWasSpace = trailingSpaceRe.test(htmlChunk); html.push(htmlChunk.replace(newlineRe, '<br />')); outputIdx = sourceIdx; } } while (true) { var outputTag; if (tagPos < extractedTags.length) { if (decPos < decorations.length) { outputTag = extractedTags[tagPos] <= decorations[decPos]; } else { outputTag = true; } } else { outputTag = false; } if (outputTag) { emitTextUpTo(extractedTags[tagPos]); if (openDecoration) { html.push('</span>'); openDecoration = null; } html.push(extractedTags[tagPos + 1]); tagPos += 2; } else if (decPos < decorations.length) { emitTextUpTo(decorations[decPos]); currentDecoration = decorations[decPos + 1]; decPos += 2; } else { break; } } emitTextUpTo(sourceText.length); if (openDecoration) { html.push('</span>'); } return html.join(''); } var langHandlerRegistry = {}; function registerLangHandler(handler, fileExtensions) { for (var i = fileExtensions.length; --i >= 0; ) { var ext = fileExtensions[i]; if (!langHandlerRegistry.hasOwnProperty(ext)) { langHandlerRegistry[ext] = handler; } else if ('console' in window) { console.log('cannot override language handler %s', ext); } } } registerLangHandler(decorateSource, ['default-code']); registerLangHandler(decorateMarkup, ['default-markup', 'html', 'htm', 'xhtml', 'xml', 'xsl']); registerLangHandler(sourceDecorator({ keywords: CPP_KEYWORDS, hashComments: true, cStyleComments: true }), ['c', 'cc', 'cpp', 'cs', 'cxx', 'cyc']); registerLangHandler(sourceDecorator({ keywords: JAVA_KEYWORDS, cStyleComments: true }), ['java']); registerLangHandler(sourceDecorator({ keywords: SH_KEYWORDS, hashComments: true, multiLineStrings: true }), ['bsh', 'csh', 'sh']); registerLangHandler(sourceDecorator({ keywords: PYTHON_KEYWORDS, hashComments: true, multiLineStrings: true, tripleQuotedStrings: true }), ['cv', 'py']); registerLangHandler(sourceDecorator({ keywords: PERL_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['perl', 'pl', 'pm']); registerLangHandler(sourceDecorator({ keywords: RUBY_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['rb']); registerLangHandler(sourceDecorator({ keywords: JSCRIPT_KEYWORDS, cStyleComments: true, regexLiterals: true }), ['js']); function prettyPrintOne(sourceCodeHtml, opt_langExtension) { try { var sourceAndExtractedTags = extractTags(sourceCodeHtml); var source = sourceAndExtractedTags.source; var extractedTags = sourceAndExtractedTags.tags; if (!langHandlerRegistry.hasOwnProperty(opt_langExtension)) { opt_langExtension = /^\s*</.test(source) ? 'default-markup' : 'default-code'; } var decorations = langHandlerRegistry[opt_langExtension].call({}, source); return recombineTagsAndDecorations(source, extractedTags, decorations); } catch (e) { if ('console' in window) { console.log(e); console.trace(); } return sourceCodeHtml; } } function prettyPrint(opt_whenDone) { var isIE6 = _pr_isIE6(); var codeSegments = [document.getElementsByTagName('pre'), document.getElementsByTagName('code'), document.getElementsByTagName('xmp')]; var elements = []; for (var i = 0; i < codeSegments.length; ++i) { for (var j = 0; j < codeSegments[i].length; ++j) { elements.push(codeSegments[i][j]); } } codeSegments = null; var k = 0; function doWork() { var endTime = (PR_SHOULD_USE_CONTINUATION ? new Date().getTime() + 250 : Infinity); for (; k < elements.length && new Date().getTime() < endTime; k++) { var cs = elements[k]; if (cs.className && cs.className.indexOf('prettyprint') >= 0) { var langExtension = cs.className.match(/\blang-(\w+)\b/); if (langExtension) { langExtension = langExtension[1]; } var nested = false; for (var p = cs.parentNode; p; p = p.parentNode) { if ((p.tagName === 'pre' || p.tagName === 'code' || p.tagName === 'xmp') && p.className && p.className.indexOf('prettyprint') >= 0) { nested = true; break; } } if (!nested) { var content = getInnerHtml(cs); content = content.replace(/(?:\r\n?|\n)$/, ''); var newContent = prettyPrintOne(content, langExtension); if (!isRawContent(cs)) { cs.innerHTML = newContent; } else { var pre = document.createElement('PRE'); for (var i = 0; i < cs.attributes.length; ++i) { var a = cs.attributes[i]; if (a.specified) { var aname = a.name.toLowerCase(); if (aname === 'class') { pre.className = a.value; } else { pre.setAttribute(a.name, a.value); } } } pre.innerHTML = newContent; cs.parentNode.replaceChild(pre, cs); cs = pre; } if (isIE6 && cs.tagName === 'PRE') { var lineBreaks = cs.getElementsByTagName('br'); for (var j = lineBreaks.length; --j >= 0; ) { var lineBreak = lineBreaks[j]; lineBreak.parentNode.replaceChild(document.createTextNode('\r\n'), lineBreak); } } } } } if (k < elements.length) { setTimeout(doWork, 250); } else if (opt_whenDone) { opt_whenDone(); } } doWork(); } window['PR_normalizedHtml'] = normalizedHtml; window['prettyPrintOne'] = prettyPrintOne; window['prettyPrint'] = prettyPrint; window['PR'] = { 'createSimpleLexer': createSimpleLexer, 'registerLangHandler': registerLangHandler, 'sourceDecorator': sourceDecorator, 'PR_ATTRIB_NAME': PR_ATTRIB_NAME, 'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE, 'PR_COMMENT': PR_COMMENT, 'PR_DECLARATION': PR_DECLARATION, 'PR_KEYWORD': PR_KEYWORD, 'PR_LITERAL': PR_LITERAL, 'PR_NOCODE': PR_NOCODE, 'PR_PLAIN': PR_PLAIN, 'PR_PUNCTUATION': PR_PUNCTUATION, 'PR_SOURCE': PR_SOURCE, 'PR_STRING': PR_STRING, 'PR_TAG': PR_TAG, 'PR_TYPE': PR_TYPE }; })();
\ No newline at end of file
+var PR_SHOULD_USE_CONTINUATION = true; var PR_TAB_WIDTH = 8; var PR_normalizedHtml; var PR; var prettyPrintOne; var prettyPrint; function _pr_isIE6() { var isIE6 = navigator && navigator.userAgent && /\bMSIE 6\./.test(navigator.userAgent); _pr_isIE6 = function() { return isIE6; }; return isIE6; } (function() { function wordSet(words) { words = words.split(/ /g); var set = {}; for (var i = words.length; --i >= 0; ) { var w = words[i]; if (w) { set[w] = null; } } return set; } var FLOW_CONTROL_KEYWORDS = "break continue do else for if return while "; var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " + "double enum extern float goto int long register short signed sizeof " + "static struct switch typedef union unsigned void volatile "; var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " + "new operator private protected public this throw true try "; var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " + "concept concept_map const_cast constexpr decltype " + "dynamic_cast explicit export friend inline late_check " + "mutable namespace nullptr reinterpret_cast static_assert static_cast " + "template typeid typename typeof using virtual wchar_t where "; var JAVA_KEYWORDS = COMMON_KEYWORDS + "boolean byte extends final finally implements import instanceof null " + "native package strictfp super synchronized throws transient "; var CSHARP_KEYWORDS = JAVA_KEYWORDS + "as base by checked decimal delegate descending event " + "fixed foreach from group implicit in interface internal into is lock " + "object out override orderby params readonly ref sbyte sealed " + "stackalloc string select uint ulong unchecked unsafe ushort var "; var JSCRIPT_KEYWORDS = COMMON_KEYWORDS + "debugger eval export function get null set undefined var with " + "Infinity NaN "; var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " + "goto if import last local my next no our print package redo require " + "sub undef unless until use wantarray while BEGIN END "; var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " + "elif except exec finally from global import in is lambda " + "nonlocal not or pass print raise try with yield " + "False True None "; var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" + " defined elsif end ensure false in module next nil not or redo rescue " + "retry self super then true undef unless until when yield BEGIN END "; var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " + "function in local set then until "; var ALL_KEYWORDS = (CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS + PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS); var PR_STRING = 'str'; var PR_KEYWORD = 'kwd'; var PR_COMMENT = 'com'; var PR_TYPE = 'typ'; var PR_LITERAL = 'lit'; var PR_PUNCTUATION = 'pun'; var PR_PLAIN = 'pln'; var PR_TAG = 'tag'; var PR_DECLARATION = 'dec'; var PR_SOURCE = 'src'; var PR_ATTRIB_NAME = 'atn'; var PR_ATTRIB_VALUE = 'atv'; var PR_NOCODE = 'nocode'; function isWordChar(ch) { return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'); } function spliceArrayInto(inserted, container, containerPosition, countReplaced) { inserted.unshift(containerPosition, countReplaced || 0); try { container.splice.apply(container, inserted); } finally { inserted.splice(0, 2); } } var REGEXP_PRECEDER_PATTERN = function() { var preceders = ["!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=", "&=", "(", "*", "*=", "+=", ",", "-=", "->", "/", "/=", ":", "::", ";", "<", "<<", "<<=", "<=", "=", "==", "===", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "||=", "~", "break", "case", "continue", "delete", "do", "else", "finally", "instanceof", "return", "throw", "try", "typeof"]; var pattern = '(?:' + '(?:(?:^|[^0-9.])\\.{1,3})|' + '(?:(?:^|[^\\+])\\+)|' + '(?:(?:^|[^\\-])-)'; for (var i = 0; i < preceders.length; ++i) { var preceder = preceders[i]; if (isWordChar(preceder.charAt(0))) { pattern += '|\\b' + preceder; } else { pattern += '|' + preceder.replace(/([^=<>:&])/g, '\\$1'); } } pattern += '|^)\\s*$'; return new RegExp(pattern); } (); var pr_amp = /&/g; var pr_lt = /</g; var pr_gt = />/g; var pr_quot = /\"/g; function attribToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;').replace(pr_quot, '&quot;'); } function textToHtml(str) { return str.replace(pr_amp, '&amp;').replace(pr_lt, '&lt;').replace(pr_gt, '&gt;'); } var pr_ltEnt = /&lt;/g; var pr_gtEnt = /&gt;/g; var pr_aposEnt = /&apos;/g; var pr_quotEnt = /&quot;/g; var pr_ampEnt = /&amp;/g; var pr_nbspEnt = /&nbsp;/g; function htmlToText(html) { var pos = html.indexOf('&'); if (pos < 0) { return html; } for (--pos; (pos = html.indexOf('&#', pos + 1)) >= 0; ) { var end = html.indexOf(';', pos); if (end >= 0) { var num = html.substring(pos + 3, end); var radix = 10; if (num && num.charAt(0) === 'x') { num = num.substring(1); radix = 16; } var codePoint = parseInt(num, radix); if (!isNaN(codePoint)) { html = (html.substring(0, pos) + String.fromCharCode(codePoint) + html.substring(end + 1)); } } } return html.replace(pr_ltEnt, '<').replace(pr_gtEnt, '>').replace(pr_aposEnt, "'").replace(pr_quotEnt, '"').replace(pr_ampEnt, '&').replace(pr_nbspEnt, ' '); } function isRawContent(node) { return 'XMP' === node.tagName; } function normalizedHtml(node, out) { switch (node.nodeType) { case 1: var name = node.tagName.toLowerCase(); out.push('<', name); for (var i = 0; i < node.attributes.length; ++i) { var attr = node.attributes[i]; if (!attr.specified) { continue; } out.push(' '); normalizedHtml(attr, out); } out.push('>'); for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } if (node.firstChild || !/^(?:br|link|img)$/.test(name)) { out.push('<\/', name, '>'); } break; case 2: out.push(node.name.toLowerCase(), '="', attribToHtml(node.value), '"'); break; case 3: case 4: out.push(textToHtml(node.nodeValue)); break; } } var PR_innerHtmlWorks = null; function getInnerHtml(node) { if (null === PR_innerHtmlWorks) { var testNode = document.createElement('PRE'); testNode.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />')); PR_innerHtmlWorks = !/</.test(testNode.innerHTML); } if (PR_innerHtmlWorks) { var content = node.innerHTML; if (isRawContent(node)) { content = textToHtml(content); } return content; } var out = []; for (var child = node.firstChild; child; child = child.nextSibling) { normalizedHtml(child, out); } return out.join(''); } function makeTabExpander(tabWidth) { var SPACES = '                '; var charInLine = 0; return function(plainText) { var out = null; var pos = 0; for (var i = 0, n = plainText.length; i < n; ++i) { var ch = plainText.charAt(i); switch (ch) { case '\t': if (!out) { out = []; } out.push(plainText.substring(pos, i)); var nSpaces = tabWidth - (charInLine % tabWidth); charInLine += nSpaces; for (; nSpaces >= 0; nSpaces -= SPACES.length) { out.push(SPACES.substring(0, nSpaces)); } pos = i + 1; break; case '\n': charInLine = 0; break; default: ++charInLine; } } if (!out) { return plainText; } out.push(plainText.substring(pos)); return out.join(''); }; } var pr_chunkPattern = /(?:[^<]+|<!--[\s\S]*?-->|<!\[CDATA\[([\s\S]*?)\]\]>|<\/?[a-zA-Z][^>]*>|<)/g; var pr_commentPrefix = /^<!--/; var pr_cdataPrefix = /^<\[CDATA\[/; var pr_brPrefix = /^<br\b/i; var pr_tagNameRe = /^<(\/?)([a-zA-Z]+)/; function extractTags(s) { var matches = s.match(pr_chunkPattern); var sourceBuf = []; var sourceBufLen = 0; var extractedTags = []; if (matches) { for (var i = 0, n = matches.length; i < n; ++i) { var match = matches[i]; if (match.length > 1 && match.charAt(0) === '<') { if (pr_commentPrefix.test(match)) { continue; } if (pr_cdataPrefix.test(match)) { sourceBuf.push(match.substring(9, match.length - 3)); sourceBufLen += match.length - 12; } else if (pr_brPrefix.test(match)) { sourceBuf.push('\n'); ++sourceBufLen; } else { if (match.indexOf(PR_NOCODE) >= 0 && isNoCodeTag(match)) { var name = match.match(pr_tagNameRe)[2]; var depth = 1; end_tag_loop: for (var j = i + 1; j < n; ++j) { var name2 = matches[j].match(pr_tagNameRe); if (name2 && name2[2] === name) { if (name2[1] === '/') { if (--depth === 0) { break end_tag_loop; } } else { ++depth; } } } if (j < n) { extractedTags.push(sourceBufLen, matches.slice(i, j + 1).join('')); i = j; } else { extractedTags.push(sourceBufLen, match); } } else { extractedTags.push(sourceBufLen, match); } } } else { var literalText = htmlToText(match); sourceBuf.push(literalText); sourceBufLen += literalText.length; } } } return { source: sourceBuf.join(''), tags: extractedTags }; } function isNoCodeTag(tag) { return !!tag.replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g, ' $1="$2$3$4"').match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/); } function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) { var shortcuts = {}; (function() { var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns); for (var i = allPatterns.length; --i >= 0; ) { var patternParts = allPatterns[i]; var shortcutChars = patternParts[3]; if (shortcutChars) { for (var c = shortcutChars.length; --c >= 0; ) { shortcuts[shortcutChars.charAt(c)] = patternParts; } } } })(); var nPatterns = fallthroughStylePatterns.length; var notWs = /\S/; return function(sourceCode, opt_basePos) { opt_basePos = opt_basePos || 0; var decorations = [opt_basePos, PR_PLAIN]; var lastToken = ''; var pos = 0; var tail = sourceCode; while (tail.length) { var style; var token = null; var match; var patternParts = shortcuts[tail.charAt(0)]; if (patternParts) { match = tail.match(patternParts[1]); token = match[0]; style = patternParts[0]; } else { for (var i = 0; i < nPatterns; ++i) { patternParts = fallthroughStylePatterns[i]; var contextPattern = patternParts[2]; if (contextPattern && !contextPattern.test(lastToken)) { continue; } match = tail.match(patternParts[1]); if (match) { token = match[0]; style = patternParts[0]; break; } } if (!token) { style = PR_PLAIN; token = tail.substring(0, 1); } } decorations.push(opt_basePos + pos, style); pos += token.length; tail = tail.substring(token.length); if (style !== PR_COMMENT && notWs.test(token)) { lastToken = token; } } return decorations; }; } var PR_MARKUP_LEXER = createSimpleLexer([], [[PR_PLAIN, /^[^<]+/, null], [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/, null], [PR_COMMENT, /^<!--[\s\S]*?(?:-->|$)/, null], [PR_SOURCE, /^<\?[\s\S]*?(?:\?>|$)/, null], [PR_SOURCE, /^<%[\s\S]*?(?:%>|$)/, null], [PR_SOURCE, /^<(script|style|xmp)\b[^>]*>[\s\S]*?<\/\1\b[^>]*>/i, null], [PR_TAG, /^<\/?\w[^<>]*>/, null]]); var PR_SOURCE_CHUNK_PARTS = /^(<[^>]*>)([\s\S]*)(<\/[^>]*>)$/; function tokenizeMarkup(source) { var decorations = PR_MARKUP_LEXER(source); for (var i = 0; i < decorations.length; i += 2) { if (decorations[i + 1] === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var sourceChunk = source.substring(start, end); var match = sourceChunk.match(PR_SOURCE_CHUNK_PARTS); if (match) { decorations.splice(i, 2, start, PR_TAG, start + match[1].length, PR_SOURCE, start + match[1].length + (match[2] || '').length, PR_TAG); } } } return decorations; } var PR_TAG_LEXER = createSimpleLexer([[PR_ATTRIB_VALUE, /^\'[^\']*(?:\'|$)/, null, "'"], [PR_ATTRIB_VALUE, /^\"[^\"]*(?:\"|$)/, null, '"'], [PR_PUNCTUATION, /^[<>\/=]+/, null, '<>/=']], [[PR_TAG, /^[\w:\-]+/, /^</], [PR_ATTRIB_VALUE, /^[\w\-]+/, /^=/], [PR_ATTRIB_NAME, /^[\w:\-]+/, null], [PR_PLAIN, /^\s+/, null, ' \t\r\n']]); function splitTagAttributes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_TAG) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var chunk = source.substring(start, end); var subDecorations = PR_TAG_LEXER(chunk, start); spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function sourceDecorator(options) { var shortcutStylePatterns = [], fallthroughStylePatterns = []; if (options.tripleQuotedStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/, null, '\'"']); } else if (options.multiLineStrings) { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/, null, '\'"`']); } else { shortcutStylePatterns.push([PR_STRING, /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, null, '"\'']); } fallthroughStylePatterns.push([PR_PLAIN, /^(?:[^\'\"\`\/\#]+)/, null, ' \r\n']); if (options.hashComments) { shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']); } if (options.cStyleComments) { fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]); fallthroughStylePatterns.push([PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]); } if (options.regexLiterals) { var REGEX_LITERAL = ('^/(?=[^/*])' + '(?:[^/\\x5B\\x5C]' + '|\\x5C[\\s\\S]' + '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+' + '(?:/|$)'); fallthroughStylePatterns.push([PR_STRING, new RegExp(REGEX_LITERAL), REGEXP_PRECEDER_PATTERN]); } var keywords = wordSet(options.keywords); options = null; var splitStringAndCommentTokens = createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns); var styleLiteralIdentifierPuncRecognizer = createSimpleLexer([], [[PR_PLAIN, /^\s+/, null, ' \r\n'], [PR_PLAIN, /^[a-z_$@][a-z_$@0-9]*/i, null], [PR_LITERAL, /^0x[a-f0-9]+[a-z]/i, null], [PR_LITERAL, /^(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?[a-z]*/i, null, '123456789'], [PR_PUNCTUATION, /^[^\s\w\.$@]+/, null]]); function splitNonStringNonCommentTokens(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_PLAIN) { var start, end, chunk, subDecs; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; chunk = source.substring(start, end); subDecs = styleLiteralIdentifierPuncRecognizer(chunk, start); for (var j = 0, m = subDecs.length; j < m; j += 2) { var subStyle = subDecs[j + 1]; if (subStyle === PR_PLAIN) { var subStart = subDecs[j]; var subEnd = j + 2 < m ? subDecs[j + 2] : chunk.length; var token = source.substring(subStart, subEnd); if (token === '.') { subDecs[j + 1] = PR_PUNCTUATION; } else if (token in keywords) { subDecs[j + 1] = PR_KEYWORD; } else if (/^@?[A-Z][A-Z$]*[a-z][A-Za-z$]*$/.test(token)) { subDecs[j + 1] = token.charAt(0) === '@' ? PR_LITERAL : PR_TYPE; } } } spliceArrayInto(subDecs, decorations, i, 2); i += subDecs.length - 2; } } return decorations; } return function(sourceCode) { var decorations = splitStringAndCommentTokens(sourceCode); decorations = splitNonStringNonCommentTokens(sourceCode, decorations); return decorations; }; } var decorateSource = sourceDecorator({ keywords: ALL_KEYWORDS, hashComments: true, cStyleComments: true, multiLineStrings: true, regexLiterals: true }); function splitSourceNodes(source, decorations) { for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; if (style === PR_SOURCE) { var start, end; start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var subDecorations = decorateSource(source.substring(start, end)); for (var j = 0, m = subDecorations.length; j < m; j += 2) { subDecorations[j] += start; } spliceArrayInto(subDecorations, decorations, i, 2); i += subDecorations.length - 2; } } return decorations; } function splitSourceAttributes(source, decorations) { var nextValueIsSource = false; for (var i = 0; i < decorations.length; i += 2) { var style = decorations[i + 1]; var start, end; if (style === PR_ATTRIB_NAME) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; nextValueIsSource = /^on|^style$/i.test(source.substring(start, end)); } else if (style === PR_ATTRIB_VALUE) { if (nextValueIsSource) { start = decorations[i]; end = i + 2 < decorations.length ? decorations[i + 2] : source.length; var attribValue = source.substring(start, end); var attribLen = attribValue.length; var quoted = (attribLen >= 2 && /^[\"\']/.test(attribValue) && attribValue.charAt(0) === attribValue.charAt(attribLen - 1)); var attribSource; var attribSourceStart; var attribSourceEnd; if (quoted) { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue; } else { attribSourceStart = start + 1; attribSourceEnd = end - 1; attribSource = attribValue.substring(1, attribValue.length - 1); } var attribSourceDecorations = decorateSource(attribSource); for (var j = 0, m = attribSourceDecorations.length; j < m; j += 2) { attribSourceDecorations[j] += attribSourceStart; } if (quoted) { attribSourceDecorations.push(attribSourceEnd, PR_ATTRIB_VALUE); spliceArrayInto(attribSourceDecorations, decorations, i + 2, 0); } else { spliceArrayInto(attribSourceDecorations, decorations, i, 2); } } nextValueIsSource = false; } } return decorations; } function decorateMarkup(sourceCode) { var decorations = tokenizeMarkup(sourceCode); decorations = splitTagAttributes(sourceCode, decorations); decorations = splitSourceNodes(sourceCode, decorations); decorations = splitSourceAttributes(sourceCode, decorations); return decorations; } function recombineTagsAndDecorations(sourceText, extractedTags, decorations) { var html = []; var outputIdx = 0; var openDecoration = null; var currentDecoration = null; var tagPos = 0; var decPos = 0; var tabExpander = makeTabExpander(PR_TAB_WIDTH); var adjacentSpaceRe = /([\r\n ]) /g; var startOrSpaceRe = /(^| ) /gm; var newlineRe = /\r\n?|\n/g; var trailingSpaceRe = /[ \r\n]$/; var lastWasSpace = true; function emitTextUpTo(sourceIdx) { if (sourceIdx > outputIdx) { if (openDecoration && openDecoration !== currentDecoration) { html.push('</span>'); openDecoration = null; } if (!openDecoration && currentDecoration) { openDecoration = currentDecoration; html.push('<span class="', openDecoration, '">'); } var htmlChunk = textToHtml(tabExpander(sourceText.substring(outputIdx, sourceIdx))).replace(lastWasSpace ? startOrSpaceRe : adjacentSpaceRe, '$1&nbsp;'); lastWasSpace = trailingSpaceRe.test(htmlChunk); html.push(htmlChunk.replace(newlineRe, '<br />')); outputIdx = sourceIdx; } } while (true) { var outputTag; if (tagPos < extractedTags.length) { if (decPos < decorations.length) { outputTag = extractedTags[tagPos] <= decorations[decPos]; } else { outputTag = true; } } else { outputTag = false; } if (outputTag) { emitTextUpTo(extractedTags[tagPos]); if (openDecoration) { html.push('</span>'); openDecoration = null; } html.push(extractedTags[tagPos + 1]); tagPos += 2; } else if (decPos < decorations.length) { emitTextUpTo(decorations[decPos]); currentDecoration = decorations[decPos + 1]; decPos += 2; } else { break; } } emitTextUpTo(sourceText.length); if (openDecoration) { html.push('</span>'); } return html.join(''); } var langHandlerRegistry = {}; function registerLangHandler(handler, fileExtensions) { for (var i = fileExtensions.length; --i >= 0; ) { var ext = fileExtensions[i]; if (!langHandlerRegistry.hasOwnProperty(ext)) { langHandlerRegistry[ext] = handler; } else if ('console' in window) { console.log('cannot override language handler %s', ext); } } } registerLangHandler(decorateSource, ['default-code']); registerLangHandler(decorateMarkup, ['default-markup', 'html', 'htm', 'xhtml', 'xml', 'xsl']); registerLangHandler(sourceDecorator({ keywords: CPP_KEYWORDS, hashComments: true, cStyleComments: true }), ['c', 'cc', 'cpp', 'cs', 'cxx', 'cyc']); registerLangHandler(sourceDecorator({ keywords: JAVA_KEYWORDS, cStyleComments: true }), ['java']); registerLangHandler(sourceDecorator({ keywords: SH_KEYWORDS, hashComments: true, multiLineStrings: true }), ['bsh', 'csh', 'sh']); registerLangHandler(sourceDecorator({ keywords: PYTHON_KEYWORDS, hashComments: true, multiLineStrings: true, tripleQuotedStrings: true }), ['cv', 'py']); registerLangHandler(sourceDecorator({ keywords: PERL_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['perl', 'pl', 'pm']); registerLangHandler(sourceDecorator({ keywords: RUBY_KEYWORDS, hashComments: true, multiLineStrings: true, regexLiterals: true }), ['rb']); registerLangHandler(sourceDecorator({ keywords: JSCRIPT_KEYWORDS, cStyleComments: true, regexLiterals: true }), ['js']); function prettyPrintOne(sourceCodeHtml, opt_langExtension) { try { var sourceAndExtractedTags = extractTags(sourceCodeHtml); var source = sourceAndExtractedTags.source; var extractedTags = sourceAndExtractedTags.tags; if (!langHandlerRegistry.hasOwnProperty(opt_langExtension)) { opt_langExtension = /^\s*</.test(source) ? 'default-markup' : 'default-code'; } var decorations = langHandlerRegistry[opt_langExtension].call({}, source); return recombineTagsAndDecorations(source, extractedTags, decorations); } catch (e) { if ('console' in window) { console.log(e); console.trace(); } return sourceCodeHtml; } } function prettyPrint(opt_whenDone) { var isIE6 = _pr_isIE6(); var codeSegments = [document.getElementsByTagName('pre'), document.getElementsByTagName('code'), document.getElementsByTagName('xmp')]; var elements = []; for (var i = 0; i < codeSegments.length; ++i) { for (var j = 0; j < codeSegments[i].length; ++j) { elements.push(codeSegments[i][j]); } } codeSegments = null; var k = 0; function doWork() { var endTime = (PR_SHOULD_USE_CONTINUATION ? new Date().getTime() + 250 : Infinity); for (; k < elements.length && new Date().getTime() < endTime; k++) { var cs = elements[k]; if (cs.className && cs.className.indexOf('prettyprint') >= 0) { var langExtension = cs.className.match(/\blang-(\w+)\b/); if (langExtension) { langExtension = langExtension[1]; } var nested = false; for (var p = cs.parentNode; p; p = p.parentNode) { if ((p.tagName === 'pre' || p.tagName === 'code' || p.tagName === 'xmp') && p.className && p.className.indexOf('prettyprint') >= 0) { nested = true; break; } } if (!nested) { var content = getInnerHtml(cs); content = content.replace(/(?:\r\n?|\n)$/, ''); var newContent = prettyPrintOne(content, langExtension); if (!isRawContent(cs)) { cs.innerHTML = newContent; } else { var pre = document.createElement('PRE'); for (var i = 0; i < cs.attributes.length; ++i) { var a = cs.attributes[i]; if (a.specified) { var aname = a.name.toLowerCase(); if (aname === 'class') { pre.className = a.value; } else { pre.setAttribute(a.name, a.value); } } } pre.innerHTML = newContent; cs.parentNode.replaceChild(pre, cs); cs = pre; } if (isIE6 && cs.tagName === 'PRE') { var lineBreaks = cs.getElementsByTagName('br'); for (var j = lineBreaks.length; --j >= 0; ) { var lineBreak = lineBreaks[j]; lineBreak.parentNode.replaceChild(document.createTextNode('\r\n'), lineBreak); } } } } } if (k < elements.length) { setTimeout(doWork, 250); } else if (opt_whenDone) { opt_whenDone(); } } doWork(); } window['PR_normalizedHtml'] = normalizedHtml; window['prettyPrintOne'] = prettyPrintOne; window['prettyPrint'] = prettyPrint; window['PR'] = { 'createSimpleLexer': createSimpleLexer, 'registerLangHandler': registerLangHandler, 'sourceDecorator': sourceDecorator, 'PR_ATTRIB_NAME': PR_ATTRIB_NAME, 'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE, 'PR_COMMENT': PR_COMMENT, 'PR_DECLARATION': PR_DECLARATION, 'PR_KEYWORD': PR_KEYWORD, 'PR_LITERAL': PR_LITERAL, 'PR_NOCODE': PR_NOCODE, 'PR_PLAIN': PR_PLAIN, 'PR_PUNCTUATION': PR_PUNCTUATION, 'PR_SOURCE': PR_SOURCE, 'PR_STRING': PR_STRING, 'PR_TAG': PR_TAG, 'PR_TYPE': PR_TYPE }; })();
diff --git a/templates/content/js/com.cnprog.utils.js b/templates/content/js/com.cnprog.utils.js
index 683b7a3f..e271ed78 100644
--- a/templates/content/js/com.cnprog.utils.js
+++ b/templates/content/js/com.cnprog.utils.js
@@ -119,4 +119,4 @@ var CPValidator = function(){
 }();
 //Search Engine Keyword Highlight with Javascript
 //http://scott.yang.id.au/code/se-hilite/
-Hilite={elementid:"content",exact:true,max_nodes:1000,onload:true,style_name:"hilite",style_name_suffix:true,debug_referrer:""};Hilite.search_engines=[["local","q"],["cnprog\\.","q"],["google\\.","q"],["search\\.yahoo\\.","p"],["search\\.msn\\.","q"],["search\\.live\\.","query"],["search\\.aol\\.","userQuery"],["ask\\.com","q"],["altavista\\.","q"],["feedster\\.","q"],["search\\.lycos\\.","q"],["alltheweb\\.","q"],["technorati\\.com/search/([^\\?/]+)",1],["dogpile\\.com/info\\.dogpl/search/web/([^\\?/]+)",1,true]];Hilite.decodeReferrer=function(d){var g=null;var e=new RegExp("");for(var c=0;c<Hilite.search_engines.length;c++){var f=Hilite.search_engines[c];e.compile("^http://(www\\.)?"+f[0],"i");var b=d.match(e);if(b){var a;if(isNaN(f[1])){a=Hilite.decodeReferrerQS(d,f[1])}else{a=b[f[1]+1]}if(a){a=decodeURIComponent(a);if(f.length>2&&f[2]){a=decodeURIComponent(a)}a=a.replace(/\'|"/g,"");a=a.split(/[\s,\+\.]+/);return a}break}}return null};Hilite.decodeReferrerQS=function(f,d){var b=f.indexOf("?");var c;if(b>=0){var a=new String(f.substring(b+1));b=0;c=0;while((b>=0)&&((c=a.indexOf("=",b))>=0)){var e,g;e=a.substring(b,c);b=a.indexOf("&",c)+1;if(e==d){if(b<=0){return a.substring(c+1)}else{return a.substring(c+1,b-1)}}else{if(b<=0){return null}}}}return null};Hilite.hiliteElement=function(f,e){if(!e||f.childNodes.length==0){return}var c=new Array();for(var b=0;b<e.length;b++){e[b]=e[b].toLowerCase();if(Hilite.exact){c.push("\\b"+e[b]+"\\b")}else{c.push(e[b])}}c=new RegExp(c.join("|"),"i");var a={};for(var b=0;b<e.length;b++){if(Hilite.style_name_suffix){a[e[b]]=Hilite.style_name+(b+1)}else{a[e[b]]=Hilite.style_name}}var d=function(m){var j=c.exec(m.data);if(j){var n=j[0];var i="";var h=m.splitText(j.index);var g=h.splitText(n.length);var l=m.ownerDocument.createElement("SPAN");m.parentNode.replaceChild(l,h);l.className=a[n.toLowerCase()];l.appendChild(h);return l}else{return m}};Hilite.walkElements(f.childNodes[0],1,d)};Hilite.hilite=function(){var a=Hilite.debug_referrer?Hilite.debug_referrer:document.referrer;var b=null;a=Hilite.decodeReferrer(a);if(a&&((Hilite.elementid&&(b=document.getElementById(Hilite.elementid)))||(b=document.body))){Hilite.hiliteElement(b,a)}};Hilite.walkElements=function(d,f,e){var a=/^(script|style|textarea)/i;var c=0;while(d&&f>0){c++;if(c>=Hilite.max_nodes){var b=function(){Hilite.walkElements(d,f,e)};setTimeout(b,50);return}if(d.nodeType==1){if(!a.test(d.tagName)&&d.childNodes.length>0){d=d.childNodes[0];f++;continue}}else{if(d.nodeType==3){d=e(d)}}if(d.nextSibling){d=d.nextSibling}else{while(f>0){d=d.parentNode;f--;if(d.nextSibling){d=d.nextSibling;break}}}}};if(Hilite.onload){if(window.attachEvent){window.attachEvent("onload",Hilite.hilite)}else{if(window.addEventListener){window.addEventListener("load",Hilite.hilite,false)}else{var __onload=window.onload;window.onload=function(){Hilite.hilite();__onload()}}}};
\ No newline at end of file
+Hilite={elementid:"content",exact:true,max_nodes:1000,onload:true,style_name:"hilite",style_name_suffix:true,debug_referrer:""};Hilite.search_engines=[["local","q"],["cnprog\\.","q"],["google\\.","q"],["search\\.yahoo\\.","p"],["search\\.msn\\.","q"],["search\\.live\\.","query"],["search\\.aol\\.","userQuery"],["ask\\.com","q"],["altavista\\.","q"],["feedster\\.","q"],["search\\.lycos\\.","q"],["alltheweb\\.","q"],["technorati\\.com/search/([^\\?/]+)",1],["dogpile\\.com/info\\.dogpl/search/web/([^\\?/]+)",1,true]];Hilite.decodeReferrer=function(d){var g=null;var e=new RegExp("");for(var c=0;c<Hilite.search_engines.length;c++){var f=Hilite.search_engines[c];e.compile("^http://(www\\.)?"+f[0],"i");var b=d.match(e);if(b){var a;if(isNaN(f[1])){a=Hilite.decodeReferrerQS(d,f[1])}else{a=b[f[1]+1]}if(a){a=decodeURIComponent(a);if(f.length>2&&f[2]){a=decodeURIComponent(a)}a=a.replace(/\'|"/g,"");a=a.split(/[\s,\+\.]+/);return a}break}}return null};Hilite.decodeReferrerQS=function(f,d){var b=f.indexOf("?");var c;if(b>=0){var a=new String(f.substring(b+1));b=0;c=0;while((b>=0)&&((c=a.indexOf("=",b))>=0)){var e,g;e=a.substring(b,c);b=a.indexOf("&",c)+1;if(e==d){if(b<=0){return a.substring(c+1)}else{return a.substring(c+1,b-1)}}else{if(b<=0){return null}}}}return null};Hilite.hiliteElement=function(f,e){if(!e||f.childNodes.length==0){return}var c=new Array();for(var b=0;b<e.length;b++){e[b]=e[b].toLowerCase();if(Hilite.exact){c.push("\\b"+e[b]+"\\b")}else{c.push(e[b])}}c=new RegExp(c.join("|"),"i");var a={};for(var b=0;b<e.length;b++){if(Hilite.style_name_suffix){a[e[b]]=Hilite.style_name+(b+1)}else{a[e[b]]=Hilite.style_name}}var d=function(m){var j=c.exec(m.data);if(j){var n=j[0];var i="";var h=m.splitText(j.index);var g=h.splitText(n.length);var l=m.ownerDocument.createElement("SPAN");m.parentNode.replaceChild(l,h);l.className=a[n.toLowerCase()];l.appendChild(h);return l}else{return m}};Hilite.walkElements(f.childNodes[0],1,d)};Hilite.hilite=function(){var a=Hilite.debug_referrer?Hilite.debug_referrer:document.referrer;var b=null;a=Hilite.decodeReferrer(a);if(a&&((Hilite.elementid&&(b=document.getElementById(Hilite.elementid)))||(b=document.body))){Hilite.hiliteElement(b,a)}};Hilite.walkElements=function(d,f,e){var a=/^(script|style|textarea)/i;var c=0;while(d&&f>0){c++;if(c>=Hilite.max_nodes){var b=function(){Hilite.walkElements(d,f,e)};setTimeout(b,50);return}if(d.nodeType==1){if(!a.test(d.tagName)&&d.childNodes.length>0){d=d.childNodes[0];f++;continue}}else{if(d.nodeType==3){d=e(d)}}if(d.nextSibling){d=d.nextSibling}else{while(f>0){d=d.parentNode;f--;if(d.nextSibling){d=d.nextSibling;break}}}}};if(Hilite.onload){if(window.attachEvent){window.attachEvent("onload",Hilite.hilite)}else{if(window.addEventListener){window.addEventListener("load",Hilite.hilite,false)}else{var __onload=window.onload;window.onload=function(){Hilite.hilite();__onload()}}}};
diff --git a/templates/content/style/openid.css b/templates/content/style/openid.css
index 7a892840..0d201df2 100644
--- a/templates/content/style/openid.css
+++ b/templates/content/style/openid.css
@@ -42,4 +42,4 @@
 	}
 	.openid_selected {
 		border: 4px solid #DDD;
-	}	
\ No newline at end of file
+	}	
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 1cd5d438..fa20b014 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -2,13 +2,15 @@
 @import url(/content/style/openid.css);
 @import url(/content/style/prettify.css);
 /* 公用 */
-body{background:#FFF; font-size:12px; line-height:150%; margin:0; padding:0; color:#000; font-family: "segoe ui",Helvetica,微软雅黑,宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif; 
+body{background:#FFF; font-size:12px; line-height:150%; margin:0; padding:0; color:#000; font-family: sans-serif; 
 }
 div{margin:0 auto; padding:0;}
 h1,h2,h3,h4,h5,h6,ul,li,dl,dt,dd,form,img,p{margin:0; padding:0; border:none; }
 input, select {font-family:Trebuchet MS,"segoe ui",Helvetica,"Microsoft YaHei",宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif;}
-p{margin-bottom:4px; font-size:13px; line-height:160%;}
+p{margin-bottom:13px; font-size:13px; line-height:140%;}
 a {color:#333333; text-decoration:none;}
+
+.badges a {color:#763333;text-decoration:underline;}
 a:hover {text-decoration:underline;}
 .block{width:960px; height:auto;}
 .fleft{float:left;}
@@ -76,45 +78,55 @@ blockquote
 
 /*页面布局*/
 #wrapper {width:960px;margin:auto;padding:0;}
-#roof {margin-top:0px;background:#FFF;}
-#room {padding-top:10px;background-color:#FFF;border-bottom:1px solid #777;}
-#CALeft{width:700px; float:left; position:relative;padding-left:5px}
-#CARight{width:240px; float:right; padding-right:5px}
+#roof {
+    position:relative;
+    margin-top:0px;
+    background:#FFF;
+}
+#room {padding:10px 0 10px 0;background-color:#FFF;border-bottom:1px solid #777;}
+#CALeft{width:710px; float:left; position:relative;}
+#CARight{width:240px; float:right;}
 #CAFull{float:left;padding:0 5px 0 5px;width:950px;}
-#ground {width:100%;border-top:1px solid #000; padding-top:6px; padding-bottom:10px; text-align:center;background:#777;}
-/*#licenseLogo {top:10px;right:10px;}*/
+#ground {width:100%;border-top:1px solid #000; padding-top:6px; padding-bottom:0px; text-align:center;background:#777;}
+/*#licenseLogo {position:absolute;top:10px;right:10px;}*/
 
 /*顶部及导航栏*/
-#top {height:20px; text-align:right; padding:3px;background-color:#ffffff;}
-#header {width:960px;}
+#top {
+	position:absolute;
+	top:0px;
+	right:0px;
+	height:20px; 
+	text-align:right; 
+    color:black;
+	padding:3px;
+	background-color:#ffffff;
+	width:500px;
+}
+/*#header {width:960px;}*/
 #top a {height:35px; text-align:right;
 	/*letter-spacing:1px; */
 		margin-left:20px;text-decoration:underline; font-size:12px; color:#333333;}
-#logo {padding:5px;}
+#logo {
+	padding: 5px 0px 0px 0px;
+	margin-bottom:-3px;
+}
 #navBar {float:clear;position:relative;display:block;width:960px;}
 #navBar .nav {margin:20px 0px 0px 16px;
 	/*letter-spacing:1px; */
 	}
-#navBar .nav a {color:#333; background-color:#F9F7ED; 
-				border-bottom: none;
-				border-left: 1px solid #aaaaaa;
-				border-right: 1px solid #aaaaaa;
-				border-top: 1px solid #aaaaaa;
-				padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:15px; font-weight:400; text-decoration:none;display: block;float: left;}
+#navBar .nav a {color:#333333; background-color:#F9F7ED; 
+                border: 1px solid #aaaaaa;
+                border-bottom: none;
+				padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:14px; font-weight:400; text-decoration:none;display: block;float: left;}
 #navBar .nav a:hover {text-decoration:underline}
-#navBar .nav a.on {height:24px;line-height:28px;
-	border-top:1px solid #e66222; 
-	border-bottom: 1px solid #d64000;
-	border-right:1px solid #e66222; 
-	border-left:1px solid #e66222; 
-	/*background:#A31E39; */
-	background:#d64000;
-	color:#FFF; font-weight:600; text-decoration:none}
+#navBar .nav a.on {height:24px;line-height:28px;border:1px solid #d64000; background:#B02B2C; color:#FFF; font-weight:600; text-decoration:none}
 #navBar .nav a.special {font-size:15px; color:#B02B2C; font-weight:bold; text-decoration:none; }
 #navBar .nav a.special:hover {text-decoration:underline;}
 #navBar .nav div.focus {float:right; padding-right:0px;}
 /*搜索栏*/
-#searchBar {background-color:#9db2b1;padding:5px;} /* #B02B2C */
+#searchBar {
+    background-color:#9db2b1;/*#e9b96e;*/
+    padding:5px 0 0 0;} /* #B02B2C */
 #searchBar .content { }
 #searchBar .searchInput {font-size:13px; height:18px; width:400px;}
 #searchBar .searchBtn {font-size:14px; height:26px; width:80px;}
@@ -130,9 +142,7 @@ blockquote
 #listA .qstA thumb {float:left; }
 #listA .qstA H2 {font-size:15px; font-weight:800; margin:8px auto;padding:0px;}
 #listA .qstA H2 a {color:#663333; }
-#listA .qstA .stat {font-size:13px;
-	/*letter-spacing:1px;*/
-	float:right;}
+#listA .qstA .stat {font-size:13px;letter-spacing:1px;float:right;}
 #listA .qstA .stat span {margin-right:5px;}
 #listA .qstA .stat td {min-width:40px;text-align:center;}
 #listA .qstA .stat .num {font-family:arial;color:#905213; font-size:20px; font-weight:800;}
@@ -146,8 +156,9 @@ blockquote
 #listA .qstA .author {font-weight:400; }
 #listA .qstA .author a{ }
 #listA .qstA .summary{margin-right:5px;}
+
 .evenMore {font-size:14px; font-weight:800;}
-.questions-count{font-size:32px;font-family:arial;font-weight:600;padding:5px;color:#777;}
+.questions-count{font-size:32px;font-family:sans-serif;font-weight:600;padding:0 0 5px 7px;color:#a40000;}
 
 /*内容块*/
 .boxA {background:#777; padding:6px; margin-bottom:8px;}
@@ -166,13 +177,13 @@ blockquote
 /** PAGINATOR **/
 .paginator {
     padding:5px 0 10px 0;
-    font:normal 12px arial;
+    font:normal 12px sans-serif;
 }
 
 .paginator .prev-na,
 .paginator .next-na {
 	padding:.3em;
-	font:bold .875em arial;
+	font:bold .875em sans-serif;
 }
 
 .paginator .prev-na,
@@ -189,7 +200,7 @@ blockquote
 	background-color:#fff;
 	color:#777;
 	padding:.3em;
-	font:bold 100% arial;
+	font:bold 100% sans-serif;
 }
 
 .paginator .prev, .paginator .prev-na { margin-right:.5em; }
@@ -224,7 +235,7 @@ blockquote
 .paginator .text{
     color:#777;
 	padding:.3em;
-	font:bold 100% arial;
+	font:bold 100% sans-serif;
 }
 
 .paginator-container{
@@ -237,11 +248,14 @@ blockquote
 }
 
 /*标签*/
-.tag {font-size:100%; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
-.tags {font-family:arial; line-height:200%; display:block; margin-top:5px;}
-.tags a {font-size:100%; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
+.tag {font-size:13px; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
+.tags {font-family:sans-serif; line-height:200%; display:block; margin-top:5px;}
+.tags a {font-size:13px; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
 .tags a:hover {background-color:#fFF;color:#333;}
-.tag-number {font-weight:700;font-family:arial;}
+.tagsbox {line-height:200%;}
+.tagsbox a {font-size:13px; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
+.tagsbox a:hover {background-color:#fFF;color:#333;}
+.tag-number {font-weight:700;font-family:sans-serif;}
 
 /*奖牌*/
 a.medal  { font-size:14px; line-height:250%; font-weight:800; color:#333; text-decoration:none; background:url(/content/images/medala.gif) no-repeat; border-left:1px solid #EEE; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:4px 12px 4px 6px;}
@@ -291,9 +305,7 @@ a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images
 .headMedals {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
 .headLogin {float:left; padding:3px; font-size:15px; font-weight:800; background:url(/content/images/ico_login.gif) no-repeat; padding-left:24px;}
 .headNormal {text-align:left;padding:3px; font-size:15px; margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
-.headUser {text-align:left;padding:5px; font-size:20px; 
-	/*letter-spacing:1px;*/
-		margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
+.headUser {text-align:left;padding:5px; font-size:20px; letter-spacing:1px;margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
 /*RSS订阅*/
 #feeds {margin:10px 0; }
 #feeds a {background:url(/content/images/feed-icon-small.png) no-repeat 0; padding-left:18px; font-weight:700; font-size:13px; }
@@ -322,7 +334,11 @@ a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images
     max-width:600px;
 }
 .question-mark{
-    background-color:#E9E9FF;
+    /*background-color:#fff5e0;
+    border-top: 1px solid #eeeeec;
+    border-right: 1px solid #babdb6;
+    border-bottom: 1px solid #babdb6;
+    border-left: 1px solid #eeeeec;*/
     text-align:left;
     padding:5px;
     overflow:hidden;
@@ -411,6 +427,7 @@ div.comments {
 
 div.post-comments{
     width:100%;
+    margin-bottom:10px;
 }
 
 form.post-comments textarea {
@@ -433,6 +450,9 @@ span.form-error {
     font-weight:normal;
     margin-left:5px;
 }
+p.form-item {
+	margin:0px;
+}
 
 div.comments-container, div.comments-container-accepted, div.comments-container-owner, div.comments-container-deleted {
     display:none;
@@ -473,11 +493,8 @@ a.comment-user:hover {
 /*回答*/
 #answers {}
 .answer{
-    border-bottom:1px dotted #666666;
-    padding-bottom:20px;
-    padding-top:20px;
+    padding-top:10px;
     width: 100%;
-    margin-bottom:10px;
 }
 .answer-body{
     min-height:80px;
@@ -511,7 +528,7 @@ a.comment-user:hover {
 .answered-accepted
 {
 	background: #CCC;
-	color: #663333;
+	color: #763333;
 }
 
 .unanswered
@@ -547,10 +564,11 @@ a.comment-user:hover {
 }
 
 /*标签列表*/
+/*
 .tagsbox {}
-.tagsbox a {color:#000;line-height:30px;margin-right:10px;font-size:100%;background-color:#F9F7ED;padding:3px;}
-.tagsbox a:hover {text-decoration:none;background-color:#F9F7CD;color:#B02B2C;}
-.tagsList {margin:0; list-style-type:none;padding:0px;min-height:360px;}
+.tagsbox a {color:#000;line-height:30px;margin-right:10px;font-size:100%;background-color:#F9F7ED;padding:3px;border:1px solid #aaaaaa;}
+.tagsbox a:hover {text-decoration:none;background-color:#F9F7ED;color:#B02B2C;} */
+.tagsList {margin:0; list-style-type:none;padding:0px;min-height:360px;} 
 .tagsList li {width:235px; float:left;}
 .badge-list{margin:0; list-style-type:none;}
 /*登录*/
@@ -563,7 +581,12 @@ a.comment-user:hover {
 .error{color:red;}
 .error-list li{padding:5px;}
 .login{margin-bottom:10px;}
-.fieldset{border:solid 1px #777;margin-top:10px;padding:10px;}
+.fieldset{
+/*	border:solid 1px #777;*/
+	border: none;
+	margin-top:10px;
+	padding:10px;
+}
 .openid-input{background:url(/content/images/openid.gif) no-repeat;padding-left:15px;cursor:pointer;}
 .openid-login-input{
     background-position:center left;
@@ -701,7 +724,7 @@ span.form-error {
 .revision-number{
     font-size:300%;
     font-weight:bold;
-    font-family:arial;
+    font-family:sans-serif;
 }
 
 .revision .body{
@@ -913,7 +936,7 @@ div.started .reputation-score {
     padding:3px;
     font-weight:bold;
     background-color:#CCC;
-    color:#663333;
+    color:#763333;
 }
 
 .revision-summary{
@@ -992,8 +1015,21 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p
 .user ul {margin:0; list-style-type:none;}
 .user .thumb{clear:both;float:left; margin-right:4px; display:inline;}
 .yellowbg{background:yellow;}
-.subtitle{line-height:30px;font-size:15px; font-weight:700;}
-.message{padding:5px;font-weight:bold;background-color:#eee;margin:10px 0 10px 0;}
+
+.message{
+    padding:5px;
+    margin:10px 0 10px 0;
+    background-color:#eee;
+    border: 1px solid #aaaaaa;
+}
+.message h1 {
+    padding-top:0px;
+    font-size:15px;
+}
+.message p {
+    margin-bottom:0px;
+}
+
 .warning{color:red;}
 .darkred{color:darkred;}
 .submit{
@@ -1015,30 +1051,68 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p
 	left: 0px;
 	width: 100%;
 	z-index: 100;
-	padding: 7px 0 5px 0;
+	padding: 0;
 	text-align: center;
-	font-size: 130%;
 	font-weight: Bold;
 	color: #444;
 	background-color: #F4A83D;
 }
-
-.notify span
-{
-	float: left;
-	width: 95%;
-	text-align: center;
+.notify p {
+    margin-top:5px;
+    margin-bottom:5px;
+    font-size:16px;
 }
-
-.close-notify
+#close-notify
 {
-	float: right;
-	margin-right: 20px;
+    position:absolute;
+    right:5px;
+    top:5px;
+    padding:0 3px 0 3px;
 	color: #735005;
 	text-decoration: none;
+    font-size:14px;
+    line-height:18px;
 	background-color: #FAD163;
 	border: 2px #735005 solid;
-	padding-left: 3px;
-	padding-right: 3px;
     cursor:pointer;
 }
+#close-notify:hover {
+    text-decoration:none;
+}
+
+.big {
+    font-size:15px;
+}
+.bigger {
+    font-size:14px;
+}
+.strong {
+    font-weight:bold;
+}
+.orange
+{
+	color:#d64000;
+	font-weight:bold;
+}
+
+.about div {
+    padding:10px 5px 10px 5px;
+    border-top:1px dashed #aaaaaa;
+}
+.about div.first {
+    padding-top:0;
+    border-top:none;
+}
+.about p {
+    margin-bottom:10px;
+}
+.about a {color:#d64000;text-decoration:underline;}
+.about h3{
+    line-height:30px;
+    font-size:15px; 
+    font-weight:700;
+    padding-top: 0px;
+}
+.highlight {
+    background-color:#FFF8C6;
+}
diff --git a/templates/faq.html b/templates/faq.html
index 253d3590..78c433ae 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -10,104 +10,139 @@
 <div class="headNormal">
     {% trans "Frequently Asked Questions " %}(FAQ)
 </div>
-<div id="main-body" style="width:100%">
-    
-    <h3 class="subtitle">{% trans "What kinds of questions can I ask here?" %}</h3>
-    <p>{% trans "Most importanly - questions should be <strong>relevant</strong> to this community." %}<br>
-	{% trans "Before asking the question - please make sure to use search to see whether your question has alredy been answered."%}<br>
-    </p><br>
-    
-        <h3 class="subtitle">{% trans "What questions should I avoid asking?" %}</h3>
-		<p>{% trans "Please avoid asking questions that are not relevant to this community, too subjective and argumentative." %}</p>
-    </p><br>
-    
-        <h3 class="subtitle">{% trans "What should I avoid in my answers?" %}</h3>
-        <p>{% trans "site title" %} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %} 
-    </p><br>
+<div id="main-body" class="about" style="width:100%">
+
+        <div class="first">
+            <h3 class="subtitle">{% trans "What kinds of questions can I ask here?" %}</h3>
+            <p>{% trans "Most importanly - questions should be <strong>relevant</strong> to this community." %}
+            {% trans "Before asking the question - please make sure to use search to see whether your question has alredy been answered."%}
+            </p>
+            
+                <h3 class="subtitle">{% trans "What questions should I avoid asking?" %}</h3>
+                <p>{% trans "Please avoid asking questions that are not relevant to this community, too subjective and argumentative." %}</p>
+            </p>
+        </div>
     
-        <h3 class="subtitle">{% trans "Who moderates this community?" %}</h3>
-		<p>{% trans "The short answer is: <strong>you</strong>." %}<br>
-		{% trans "This website is moderated by the users." %}
-		{% trans "The reputation system allows users earn the authorization to perform a variety of moderation tasks." %}
-    </p><br>
+        <div>
+            <h3 class="subtitle">{% trans "What should I avoid in my answers?" %}</h3>
+            <p>{% trans "site title" %} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %}</p>
+        </div>
     
-        <h3 class="subtitle">{% trans "How does reputation system work?" %}</h3>
-		<p>{% trans "Anyone can ask questions and give answers, points are not necessary for that." %}<br>
-        {% trans "As we've said before, users help running this site. Point system helps select users who can administer this community."%}
-		{% trans "Reputation points roughly measure how community trusts you. These points are given to you directly by other members of the community." %}
-		</p>
-		<p>
-		 {% trans "For example, if you ask an interesting question or give a helpful answer, your input will be upvoted and you will gain more trust in the community." %}
-         {% trans "If on the other hand someone gives a misleading answer, the answer will be voted down and he/she loses some points." %}
-		 {% trans "Each vote in favor will generate <strong>10</strong> points, each vote against will subtract <strong>2</strong> points." %}
-		 {% trans "Through the votes of other people you can accumulate a maximum of <strong>200</strong> points." %}
-		 {% trans "After accumulating certain number of points, you can do more:" %}
-        <table style="font-family:arial;" cellspacing="3" cellpadding="3">
-            <tr>
-                <th width="40px" style="text-align:right"></th>
-                <th width="300px"></th>
-            </tr>
-	        <tr>
-                <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
-                <td>{% trans "upvote" %}</td>
-	        </tr>
-	        <tr>
-                <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
-                <td>{% trans "use tags" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>50</strong></td>
-                <td>{% trans "add comments" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>100</strong></td>
-                <td>{% trans "downvote" %}</td>
-	        </tr><tr>
-                <td style="text-align:right;padding-right:5px"><strong>250</strong></td>
-                <td>打开关闭自己的问题</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>500</strong></td>
-                <td>{% trans "retag questions" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>750</strong></td>
-                <td>{% trans "edit community wiki questions" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>2000</strong></td>
-                <td>{% trans "edit any answer" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>3000</strong></td>
-                <td>{% trans "open any closed question" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>5000</strong></td>
-                <td>{% trans "delete any comment" %}</td>
-	        </tr>
-            <tr>
-                <td style="text-align:right;padding-right:5px"><strong>10000</strong></td>
-                <td>{% trans "delete any questions and answers and perform other moderation tasks" %}</td>
-	        </tr>
+        <div>
+            <h3 class="subtitle">{% trans "Who moderates this community?" %}</h3>
+            <p>{% trans "The short answer is: <strong>you</strong>." %}
+            {% trans "This website is moderated by the users." %}
+            {% trans "The reputation system allows users earn the authorization to perform a variety of moderation tasks." %} 
+            </p>
+        </div>
+
+        <div>
+            <h3 class="subtitle">{% trans "How does reputation system work?" %}</h3>
+            <p>{% trans "Rep system summary" %}</p>
+            <p>
+                For example, if you ask an interesting question or give a helpful answer, your input will be upvoted.
+                On the other hand if the answer is misleading - it will be downvoted.
+                Each vote in favor will generate <strong>10</strong> points, each vote against will subtract <strong>2</strong> points.
+                There is a limit of <strong>200</strong> points that can be accumulated per question or answer.
+
+                The table below explains reputation point requirements for each type of moderation task.
+            </p>
+
+            <table style="font-family:arial;" cellspacing="3" cellpadding="3">
+                <tr>
+                    <th width="40px" style="text-align:right"></th>
+                    <th width="300px"></th>
+                </tr>
+                <!--
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
+                    <td>{% trans "upvote" %}</td>
+                </tr>
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
+                    <td>{% trans "use tags" %}</td>
+                </tr>
+                -->
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>50</strong></td>
+                    <td>{% trans "add comments" %}</td>
+                </tr>
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>100</strong></td>
+                    <td>{% trans "downvote" %}</td>
+                </tr><tr>
+                    <td style="text-align:right;padding-right:5px"><strong>250</strong></td>
+                    <td>{% trans "open and close own questions" %}</td>
+                </tr>
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>500</strong></td>
+                    <td>{% trans "retag questions" %}</td>
+                </tr>
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>750</strong></td>
+                    <td>{% trans "edit community wiki questions" %}</td>
+                </tr>
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>2000</strong></td>
+                    <td>{% trans "edit any answer" %}</td>
+                </tr>
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>3000</strong></td>
+                    <td>{% trans "open any closed question" %}</td>
+                </tr>
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>5000</strong></td>
+                    <td>{% trans "delete any comment" %}</td>
+                </tr>
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>10000</strong></td>
+                    <td>{% trans "delete any questions and answers and perform other moderation tasks" %}</td>
+                </tr>
 
-        </table>
-        
-    </p><br>
-   
-        <h3 class="subtitle">{% trans "To register, do I need to create new password?" %}</h3>
-        <p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %}
-		<strong><a href="/account/signin">{% trans "Login now!" %}</a> »</strong>
-    </p><br>
+            </table>
+        </div>
+        {% ifequal settings.EMAIL_VALIDATION 'on' %}
+        <div>
+            <a id='validate'></a><h3 class="subtitle">{% trans "how to validate email title" %}</h3>
+            <!--special case here message must contain paragraphs-->
+            {% trans "how to validate email info" %}
+        </div>
+        {% endifequal %}
+        <div>
+            <a id='gravatar'></a><h3 class="subtitle">{% trans "what is gravatar" %}</h3>
+            <p>{% trans "gravatar faq info" %}</p>
+        </div>
+        <div>
+            <h3 class="subtitle">{% trans "To register, do I need to create new password?" %}</h3>
+            <p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %}
+            <strong><a href="/account/signin">{% trans "Login now!" %}</a> »</strong> 
+            </p>
+        </div>
     
-        <h3 class="subtitle">{% trans "Why other people can edit my questions/answers?" %}</h3>
-    <p> {% trans "Goal of this site is..." %} {% trans "So questions and answers can be edited like wiki pages by experienced users of this site and this improves the overall quality of the knowledge base content." %}
-	{% trans "If this approach is not for you, we respect your choice." %}
-    </p><br>
-        <h3 class="subtitle">{% trans "Still have questions?" %}</h3>
-    <p>{% trans "Please ask your question, help make our community better!" %} <a href="/tags/faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
-    </p>
-    <br><br>
+        <div>
+            <h3 class="subtitle">{% trans "Why other people can edit my questions/answers?" %}</h3>
+            <p> {% trans "Goal of this site is..." %} {% trans "So questions and answers can be edited like wiki pages by experienced users of this site and this improves the overall quality of the knowledge base content." %}
+            {% trans "If this approach is not for you, we respect your choice." %}
+            </p>
+        </div>
+        <div>
+            <h3 class="subtitle">{% trans "Still have questions?" %}</h3>
+            <p>{% trans "Please ask your question, help make our community better!" %} 
+            <!--
+            <a href="/tags/faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
+            -->
+            </p>
+        </div>
 </div>
+<script type="text/javascript">
+    //highlihts section if url has matching #anchor_name
+    $(document).ready(function (){
+        var hash = window.location.hash;
+        if (hash.length > 1){
+            $(hash).parent().addClass('highlight');
+            window.location.hash = hash;
+        }
+    })
+</script>
 {% endblock %}
 <!-- end template faq.html -->
diff --git a/templates/footer.html b/templates/footer.html
index 207104ce..637ca0d8 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -26,7 +26,7 @@
             </script>
             <script type="text/javascript">
             try {
-            var pageTracker = _gat._getTracker({{ google_analytics_key }});
+            var pageTracker = _gat._getTracker({{ settings.GOOGLE_ANALYTICS_KEY }});
             pageTracker._trackPageview();
             } catch(err) {}
         </script>
diff --git a/templates/header.html b/templates/header.html
index 64cf2bf0..db08a39a 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -1,30 +1,29 @@
 <!-- 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>
-                <a href="{% url user_signup %}">{% trans "signup" %}</a>
-            {% endif %}
-            <a href="/about">{% trans "about" %}</a>
-            <a href="/faq">{% trans "faq" %}</a>
-        </div>
-    </div>
 	<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>
+					<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>
diff --git a/templates/index.html b/templates/index.html
index db2bb12e..a1ab06a4 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,11 +1,12 @@
 {% extends "base.html" %}
+<!-- index.html -->
 {% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
 {% load extra_filters %}
 {% block title %}{% spaceless %}{% trans "Home" %}{% endspaceless %}{% endblock %}
-{% block meta %}<meta name="keywords" content="{{ APP_KEYWORDS }}" />
-        <meta name="description" content="{{ APP_DESCRIPTION }}" />{% endblock %}
+{% block meta %}<meta name="keywords" content="{{ settings.APP_KEYWORDS }}" />
+        <meta name="description" content="{{ settings.APP_DESCRIPTION }}" />{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
         $().ready(function(){
@@ -78,7 +79,7 @@
 <div class="boxA">
 	<h3>{% trans "welcome to website" %}</h3>
 	<div class="body">
-      {{ APP_INTRO|safe }}
+      {{ settings.APP_INTRO|safe }}
 	  <div class="more"><a href="/about">{% trans "about" %} »</a></div>
 	  <div class="more"><a href="/faq">{% trans "faq" %} »</a></div>
 	</div>
@@ -117,6 +118,7 @@
 {% endblock %}
 {% block tail %}
 <div style="padding:5px 0 5px 5px;">
-<span class="evenMore">{% trans "Still looking for more? See" %} <a href="/questions/">{% trans "complete list of quesionts" %}</a>, {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="/questions/unanswered">{% trans "unanswered questions" %}</a>{% trans "." %}</span>
+<span class="evenMore">{% trans "Still looking for more? See" %} <a href="/questions/">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="/questions/unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
 </div>
 {% endblock %}
+<!-- index.html -->
diff --git a/templates/logout.html b/templates/logout.html
index 6270924a..e05a4328 100644
--- a/templates/logout.html
+++ b/templates/logout.html
@@ -1,5 +1,5 @@
-<!-- template logout.html -->
 {% extends "base_content.html" %}
+<!-- template logout.html -->
 {% load extra_tags %}
 {% load humanize %}
 {% load i18n %}
@@ -22,4 +22,4 @@
     <br><br>
 </div>
 {% endblock %}
-<!-- ent template logout.html -->
+<!-- end logout.html -->
diff --git a/templates/pagesize.html b/templates/pagesize.html
index 90003749..5037f1f6 100644
--- a/templates/pagesize.html
+++ b/templates/pagesize.html
@@ -1,3 +1,4 @@
+<!-- template pagesize.html -->
 {% spaceless %}
 {% load i18n %}
 {% if is_paginated %}
@@ -23,3 +24,4 @@
 </div> 
 {% endif %}
 {% endspaceless %}
+<!-- end template pagesize.html -->
diff --git a/templates/question.html b/templates/question.html
index 5ba08b63..eaff9da3 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -1,5 +1,8 @@
+{% extends "base.html" %}
 <!-- question.html -->
-{% extends "base.html" %}{% load extra_tags %}{% load extra_filters %}{% load humanize %}
+{% load extra_tags %}
+{% load extra_filters %}
+{% load humanize %}
 {% load i18n %}
 {% block title %}{% spaceless %}{{ question.get_question_title }}{% endspaceless %}{% endblock %}
 {% block forejs %}
@@ -250,10 +253,10 @@
             </div>
             {% endif %}
             
-            {% ifnotequal question.answer_count 0 %}
+            {% ifnotequal answers.length 0 %}
                 <div class="tabBar">
                     <a name="sort-top"></a>
-                    <div class="headQuestions">{{ question.answer_count }}{% trans "Answers" %}:</div>
+                    <div class="headQuestions">{{ answers|length }}{% trans "Answers" %}:</div>
                     <div class="tabsA">
                          <a id="oldest" href="?sort=oldest#sort-top" title="{% trans "oldest answers will be shown first" %}">{% trans "oldest answers" %}</a>
                         <a id="latest" href="?sort=latest#sort-top" title="{% trans "newest answers will be shown first" %}">{% trans "newest answers" %}</a>
@@ -431,10 +434,12 @@
             </div>
             
             {% if not question.closed %}
-            {% if request.user.is_authenticated %}
             <div style="padding:10px 0 0 0;">
                 <div class="headNormal">{% trans "Your answer" %}:</div>
             </div>
+            {% if not request.user.is_authenticated %}
+                <div class="message">{% trans "you can answer anonymously and then login" %}</div>
+            {% endif %}
 
             <div id="description" class="" >
                 <div id="wmd-button-bar" class="wmd-panel"></div>
@@ -458,9 +463,11 @@
             </div>
             <br>
             <input type="submit" value="{% trans "Answer the question" %}" class="submit"><span class="form-error"></span>
-            {% else %}
-            <input id="btLogin" type="button" class="submit" style="width:200px" value="{% trans "Login to answer" %}">
-            {% endif %}
+                {% if request.user.is_authenticated %}
+                    {{ answer.email_notify }} <label for="question-subscribe-updates">{% trans "Notify me daily if there are any new answers." %}</label>
+                {% else %}
+                    <input type="checkbox" disabled><label>{% trans "once you sign in you will be able to subscribe for any updates here" %}</label>
+                {% endif %}
             {% endif %}
             <br><br>
         </form>
diff --git a/templates/question_edit.html b/templates/question_edit.html
index 6fe8bb41..9ad60a88 100644
--- a/templates/question_edit.html
+++ b/templates/question_edit.html
@@ -1,5 +1,5 @@
-<!-- question_edit.html -->
 {% extends "base.html" %}
+<!-- question_edit.html -->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Edit question" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
diff --git a/templates/question_retag.html b/templates/question_retag.html
index aebf93a5..c7062e30 100644
--- a/templates/question_retag.html
+++ b/templates/question_retag.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
-{% block title %}{% spaceless %}修改问题标签{% endspaceless %}{% endblock %}
+<!-- question_retag.html -->
+{% block title %}{% spaceless %}{% trans "Change tags" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
         <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
         <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
@@ -34,8 +35,8 @@
         		},
                 messages: {
         			tags: {
-                        required: " 标签不能为空。",
-                        maxlength: " 最多5个标签，每个标签长度小于20个字符。"
+                        required: "{% trans "tags are required" %}",
+                        maxlength: "{% trans "up to 5 tags, less than 20 characters each" %}
                     }
                 }
                 
@@ -48,7 +49,7 @@
         
 {% block content %}
 <div id="main-bar" class="headNormal">
-    修改标签 [<a href="{{ question.get_absolute_url }}">返回</a>]
+    {% trans "Change tags" %} [<a href="{{ question.get_absolute_url }}">{% trans "back" %}</a>]
 </div>
 <div id="main-body" class="ask-body">
     <div id="askform">
@@ -71,8 +72,8 @@
             <br>
             
             <div class="error" ></div>
-            <input type="submit" value="现在修改" class="submit" />
-            <input type="button" value="取消" class="submit" onclick="history.back(-1);" />
+            <input type="submit" value="{% trans "Save edit" %}" class="submit" />
+            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);" />
             <br>
             <br>
         </form>
@@ -82,20 +83,16 @@
 
 {% block sidebar %}
 <div class="boxC">
-    <p class="subtitle">为什么我只能修改问题标签？</p>
+    <p class="subtitle">{% trans "Why use and modify tags?" %}</p>
     <ul class="list-item">
-        
         <li>
-            CNProg用标签来分类系统的信息
-
+            {% trans "tags help us keep Questions organized" %}
         </li>
         <li>
             修改完整问题需要用户的积分达到一定条件（比如：积分 >= 3000分，自己发布的问题除外），而用户积分达到比较低的时候，就可以修改问题的标签（比如：积分 >= 500, 这里指所有问题的标签）。
-
         </li>
         <li>
-            修改标签的用户将授予特殊的社区奖牌 
-
+            {% trans "tag editors receive special awards from the community" %}
         </li>
     </ul>
     <a href="{% url faq %}" style="float:right;position:relative">faq »</a>
@@ -106,4 +103,4 @@
 
 {% block endjs %}
 {% endblock %}
-
+<!-- end question_retag.html -->
diff --git a/templates/questions.html b/templates/questions.html
index a531d954..5dac0156 100644
--- a/templates/questions.html
+++ b/templates/questions.html
@@ -1,6 +1,5 @@
-<!-- questions.html -->
 {% extends "base.html" %}
-{% load i18n %}
+<!-- questions.html -->
 {% load extra_tags %}
 {% load i18n %}
 {% load humanize %}
@@ -112,13 +111,20 @@
 			{% plural %}
 			have total {{q_num}} questions tagged {{tagname}}
 			{% endblocktrans %}
-		{% endif %}
-		{% if searchtitle %}
-			{% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}
-			have total {{q_num}} questions containing {{searchtitle}}
-			{% plural %}
-			have total {{q_num}} questions containing {{searchtitle}}
-			{% endblocktrans %}
+		{% else %}
+			{% if searchtitle %}
+				{% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}
+				have total {{q_num}} questions containing {{searchtitle}}
+				{% plural %}
+				have total {{q_num}} questions containing {{searchtitle}}
+				{% endblocktrans %}
+			{% else %}
+				{% blocktrans count questions as cnt with questions_count|intcomma as q_num %}
+				have total {{q_num}} questions
+				{% plural %}
+				have total {{q_num}} questions
+				{% endblocktrans %}
+			{% endif %}
 		{% endif %}
 
         {% ifequal tab_id "latest" %}
@@ -139,13 +145,15 @@
 			<p>{% trans "Questions are sorted by the <strong>number of votes</strong>." %}
             {% trans "Most voted questions are shown first." %}</p>
         {% endifequal %}
+        
+        
     </p>
 </div>
 <div class="boxC">
 	<h3 class="subtitle">{% trans "Related tags" %}</h3>
     <div class="tags">
         {% for tag in tags %}
-            <a rel="tag" title="{% blocktrans with tag.name as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
+            <a rel="tag" title="{% trans "see questions tagged" %}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
             <span class="tag-number">× {{ tag.used_count|intcomma }}</span>
             <br>
         {% endfor %}
diff --git a/templates/revisions_answer.html b/templates/revisions_answer.html
index 5ab12fbf..9c2e53eb 100644
--- a/templates/revisions_answer.html
+++ b/templates/revisions_answer.html
@@ -1,5 +1,5 @@
-<!-- revisions_answer.html -->
 {% extends "base_content.html" %}
+<!-- revisions_answer.html -->
 {% load i18n %}
 {% load extra_tags %}
 {% load extra_filters %}
diff --git a/templates/revisions_question.html b/templates/revisions_question.html
index 77a421bb..7ada3e74 100644
--- a/templates/revisions_question.html
+++ b/templates/revisions_question.html
@@ -1,5 +1,5 @@
-<!-- revisions_question.html -->
 {% extends "base_content.html" %}
+<!-- revisions_question.html -->
 <!--somehow very similar to revisions_answer.html-->
 {% load extra_tags %}
 {% load i18n %}
@@ -99,5 +99,4 @@
 
 {% block endjs %}
 {% endblock %}
-
 <!-- end revisions_question.html -->
diff --git a/templates/unanswered.html b/templates/unanswered.html
index 926f2ffd..13b3a3b2 100644
--- a/templates/unanswered.html
+++ b/templates/unanswered.html
@@ -1,5 +1,5 @@
-<!-- unanswered.html -->
 {% extends "base.html" %}
+<!-- unanswered.html -->
 {% load extra_tags %}
 {% load i18n %}
 {% load humanize %}
diff --git a/templates/user.html b/templates/user.html
index 8db15902..efca80e6 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -1,5 +1,5 @@
-<!-- user.html -->
 {% extends "base_content.html" %}
+<!-- user.html -->
 {% load extra_tags %}
 {% load humanize %}
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
@@ -16,14 +16,12 @@
                     $("#nav_profile").attr('className',"on");
                 {% else %}
                     $("#nav_users").attr('className',"on");
-               
                 {% endifequal %}
-            });     
+            }); 
         </script>
         {% block userjs %}
         {% endblock %}
 {% endblock %}
-
 {% block content %}
     <div id="mainbar-full">
         {% include "user_info.html" %}
diff --git a/templates/user_edit.html b/templates/user_edit.html
index 0f927374..b49cea31 100644
--- a/templates/user_edit.html
+++ b/templates/user_edit.html
@@ -1,5 +1,5 @@
-<!-- user_edit.html -->
 {% extends "base_content.html" %}
+<!-- user_edit.html -->
 {% load extra_tags %}
 {% load humanize %}
 {% load i18n %}
diff --git a/templates/user_favorites.html b/templates/user_favorites.html
index d47670bd..185423c6 100644
--- a/templates/user_favorites.html
+++ b/templates/user_favorites.html
@@ -1,5 +1,5 @@
-<!-- user_favorites.html -->
 {% extends "user.html" %}
+<!-- user_favorites.html -->
 {% load extra_tags %}
 {% load humanize %}
 
diff --git a/templates/user_info.html b/templates/user_info.html
index 8e6dca84..8d35015c 100644
--- a/templates/user_info.html
+++ b/templates/user_info.html
@@ -70,12 +70,14 @@
                     <td>{% get_age view_user.date_of_birth %} {% trans "age unit" %}</td>
                 </tr>
                 {% endif %}
+				<!--
                 {% if votes_today_left %}
                 <tr>
                     <td>{% trans "todays unused votes" %}</td>
                     <td><strong class="darkred">{{ votes_today_left }}</strong> {% trans "votes left" %}</td>
                 </tr>
                 {% endif %}
+				-->
             </table>
         </td>
         <td width="380">
diff --git a/templates/user_preferences.html b/templates/user_preferences.html
index 3a760a25..eb7c4761 100644
--- a/templates/user_preferences.html
+++ b/templates/user_preferences.html
@@ -1,20 +1,23 @@
 {% extends "user.html" %}
+<!-- user_preferences.html -->
+{% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
 
 {% block usercontent %}
         <div style="padding:5px;">
         <fieldset>
-            <legend><b>同步Twitter消息</b></legend>
+            <legend><b>{% trans "Connect with Twitter" %}</b></legend>
             <form>
-                <label for="name">账号:</label>
+                <label for="name">{% trans "Twitter account name:" %}</label>
                 <input id="name" /><br>
-                <label for="password">密码:</label>
+                <label for="password">{% trans "Twitter password:" %}</label>
                 <input id="password" type="password"/><br>
-                <input id="cbMessage" type="checkbox" />发布我的提问到我的Twitter<br>
-                <input id="cbReply" type="checkbox" />发布我的回答到我的Twitter<br>
-                <input type="submit" value="保存" />
+                <input id="cbMessage" type="checkbox" />{% trans "Send my Questions to Twitter" %}<br>
+                <input id="cbReply" type="checkbox" />{% trans "Send my Answers to Twitter" %}<br>
+                <input type="submit" value="{% trans "Save" %}" />
             </form>
         </fieldset>
         </div>
 {% endblock %}
+<!-- end user_preferences.html -->
diff --git a/templates/user_recent.html b/templates/user_recent.html
index 70c074ad..7f6c9c8c 100644
--- a/templates/user_recent.html
+++ b/templates/user_recent.html
@@ -1,5 +1,5 @@
-<!-- user_recent.html -->
 {% extends "user.html" %}
+<!-- user_recent.html -->
 {% load extra_tags %}
 {% load humanize %}
 
diff --git a/templates/user_reputation.html b/templates/user_reputation.html
index 7a1c7366..bb7200de 100644
--- a/templates/user_reputation.html
+++ b/templates/user_reputation.html
@@ -1,5 +1,5 @@
-<!-- user_reputation.html -->
 {% extends "user.html" %}
+<!-- user_reputation.html -->
 {% load extra_tags %}
 {% load humanize %}
 {% block userjs %}
diff --git a/templates/user_responses.html b/templates/user_responses.html
index 45aab21b..d739395b 100644
--- a/templates/user_responses.html
+++ b/templates/user_responses.html
@@ -1,5 +1,5 @@
-<!-- user_responses.html -->
 {% extends "user.html" %}
+<!-- user_responses.html -->
 {% load extra_tags %}
 {% load humanize %}
 
diff --git a/templates/user_stats.html b/templates/user_stats.html
index a5be1a77..432a5b34 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -1,5 +1,5 @@
-<!-- user_stats.html -->
 {% extends "user.html" %}
+<!-- user_stats.html -->
 {% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
diff --git a/templates/user_tabs.html b/templates/user_tabs.html
index 03a9d111..bcc12b8f 100644
--- a/templates/user_tabs.html
+++ b/templates/user_tabs.html
@@ -22,13 +22,11 @@
         <a id="favorites" {% ifequal tab_name "favorites" %}class="on"{% endifequal %} 
 			title="{% trans "questions that user selected as his/her favorite" 
 			href="/users/{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
-        <!--
         {% if request.user|can_view_user_preferences:view_user %}
         <a id="preferences" {% ifequal tab_name "preferences" %}class="on"{% endifequal %} 
 			title="{% trans "user preference settings" %}" 
 			href="/users/{{view_user.id}}/{{view_user.username}}?sort=preferences">{% trans "settings" %}</a>
         {% endif %}  
-        -->
     </div>
 </div>
 <!-- end user_tabs.html -->
diff --git a/templates/user_votes.html b/templates/user_votes.html
index ec967704..80fa27ee 100644
--- a/templates/user_votes.html
+++ b/templates/user_votes.html
@@ -1,5 +1,5 @@
-<!-- user_votes.html -->
 {% extends "user.html" %}
+<!-- user_votes.html -->
 {% load extra_tags %}
 {% load humanize %}
 {% load i18n %}
diff --git a/urls.py b/urls.py
index 802d401c..eb28cf69 100644
--- a/urls.py
+++ b/urls.py
@@ -23,6 +23,9 @@ urlpatterns = patterns('',
     ),
     (r'^account/', include('django_authopenid.urls')),
     (r'^signin/$', 'django_authopenid.views.signin'),
+    url(r'^email/change/$', 'django_authopenid.views.changeemail', name='user_changeemail'),
+    url(r'^email/sendkey/$', 'django_authopenid.views.send_email_key'),
+    url(r'^email/verify/(?P<id>\d+)/(?P<key>[\dabcdef]{32})/$', 'django_authopenid.views.verifyemail', name='user_verifyemail'),
     url(r'^about/$', app.about, name='about'),
     url(r'^faq/$', app.faq, name='faq'),
     url(r'^privacy/$', app.privacy, name='privacy'),
-- 
cgit v1.2.3-1-g7c22

-- 
cgit v1.2.3-1-g7c22


From ba4363f23c06e522cdfc2349c8b0112867247f42 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 5 Aug 2009 22:55:30 -0400
Subject: added some more files

---
 TODO                                               |   4 +
 django_authopenid/decorators.py                    |   2 +
 forum/management/commands/send_email_alerts.py     |  41 +++++++++
 locale/en/LC_MESSAGES/django.mo                    | Bin 0 -> 15885 bytes
 locale/es/LC_MESSAGES/django.mo                    | Bin 0 -> 39157 bytes
 locale/zh_CN/LC_MESSAGES/django.mo                 | Bin 0 -> 37880 bytes
 sql_scripts/update_2009_07_05_EF.sql               |   3 +
 templates/authopenid/email_validation.txt          |  15 ++++
 templates/content/jquery-openid/images/aol.gif     | Bin 0 -> 2205 bytes
 templates/content/jquery-openid/images/blogger.ico | Bin 0 -> 3638 bytes
 templates/content/jquery-openid/images/claimid.ico | Bin 0 -> 3638 bytes
 .../content/jquery-openid/images/facebook.gif      | Bin 0 -> 2075 bytes
 templates/content/jquery-openid/images/flickr.ico  | Bin 0 -> 1150 bytes
 templates/content/jquery-openid/images/google.gif  | Bin 0 -> 1596 bytes
 .../content/jquery-openid/images/livejournal.ico   | Bin 0 -> 5222 bytes
 .../content/jquery-openid/images/myopenid.ico      | Bin 0 -> 2862 bytes
 .../jquery-openid/images/openid-inputicon.gif      | Bin 0 -> 237 bytes
 templates/content/jquery-openid/images/openid.gif  | Bin 0 -> 740 bytes
 .../content/jquery-openid/images/openidico.png     | Bin 0 -> 654 bytes
 .../content/jquery-openid/images/technorati.ico    | Bin 0 -> 2294 bytes
 .../content/jquery-openid/images/verisign.ico      | Bin 0 -> 4710 bytes
 templates/content/jquery-openid/images/vidoop.ico  | Bin 0 -> 1406 bytes
 .../content/jquery-openid/images/wordpress.ico     | Bin 0 -> 1150 bytes
 templates/content/jquery-openid/images/yahoo.gif   | Bin 0 -> 1682 bytes
 templates/content/jquery-openid/jquery.openid.js   |  92 +++++++++++++++++++++
 templates/content/jquery-openid/openid.css         |  33 ++++++++
 26 files changed, 190 insertions(+)
 create mode 100644 TODO
 create mode 100644 django_authopenid/decorators.py
 create mode 100644 forum/management/commands/send_email_alerts.py
 create mode 100644 locale/en/LC_MESSAGES/django.mo
 create mode 100644 locale/es/LC_MESSAGES/django.mo
 create mode 100644 locale/zh_CN/LC_MESSAGES/django.mo
 create mode 100644 sql_scripts/update_2009_07_05_EF.sql
 create mode 100644 templates/authopenid/email_validation.txt
 create mode 100644 templates/content/jquery-openid/images/aol.gif
 create mode 100644 templates/content/jquery-openid/images/blogger.ico
 create mode 100644 templates/content/jquery-openid/images/claimid.ico
 create mode 100644 templates/content/jquery-openid/images/facebook.gif
 create mode 100644 templates/content/jquery-openid/images/flickr.ico
 create mode 100644 templates/content/jquery-openid/images/google.gif
 create mode 100644 templates/content/jquery-openid/images/livejournal.ico
 create mode 100644 templates/content/jquery-openid/images/myopenid.ico
 create mode 100644 templates/content/jquery-openid/images/openid-inputicon.gif
 create mode 100644 templates/content/jquery-openid/images/openid.gif
 create mode 100644 templates/content/jquery-openid/images/openidico.png
 create mode 100644 templates/content/jquery-openid/images/technorati.ico
 create mode 100644 templates/content/jquery-openid/images/verisign.ico
 create mode 100644 templates/content/jquery-openid/images/vidoop.ico
 create mode 100644 templates/content/jquery-openid/images/wordpress.ico
 create mode 100644 templates/content/jquery-openid/images/yahoo.gif
 create mode 100644 templates/content/jquery-openid/jquery.openid.js
 create mode 100644 templates/content/jquery-openid/openid.css

diff --git a/TODO b/TODO
new file mode 100644
index 00000000..3769fa08
--- /dev/null
+++ b/TODO
@@ -0,0 +1,4 @@
+*check change email function - there is a strange 'password' field in form
+*make reusable question-block template for index questions unanswered - get rid of copy-paste
+*unused votes count in user profile not working - left that commented out in templates/user_info.html
+*badge award notification messages need to be set fixed at place where badges are awarded
diff --git a/django_authopenid/decorators.py b/django_authopenid/decorators.py
new file mode 100644
index 00000000..94498574
--- /dev/null
+++ b/django_authopenid/decorators.py
@@ -0,0 +1,2 @@
+import settings
+def 
diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
new file mode 100644
index 00000000..3c37aaa3
--- /dev/null
+++ b/forum/management/commands/send_email_alerts.py
@@ -0,0 +1,41 @@
+from django.core.management.base import NoArgsCommand
+from django.db import connection
+from forum.models import *
+import collections
+from django.core.mail import EmailMessage
+from django.utils.translation import ugettext as _
+import settings
+
+class Command(NoArgsCommand):
+    def handle_noargs(self,**options):
+        try:
+            self.send_email_alerts()
+        except Exception, e:
+            print e
+        finally:
+            connection.close()
+
+    def send_email_alerts(self):
+        report_time = datetime.datetime.now()
+        feeds = EmailFeed.objects.all()
+        user_ctype = ContentType.objects.get_for_model(User)
+
+        #lists of update messages keyed by email address
+        update_collection = collections.defaultdict(list) 
+        for feed in feeds:
+            update_summary = feed.get_update_summary()
+            if update_summary != None:
+                email = feed.get_email()
+                update_collection[email].append(update_summary)
+                feed.reported_at = report_time
+                feed.save()
+
+        for email, updates in update_collection.items():
+            text = '\n'.join(updates)
+            subject = _('updates from website')
+            print 'sent %s to %s' % (updates,email)
+            msg = EmailMessage(subject, text, settings.DEFAULT_FROM_EMAIL, [email])
+            msg.content_subtype = 'html'
+            msg.send()
+
+            
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..39dba67d
Binary files /dev/null and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..a68a2fd3
Binary files /dev/null and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..5173c858
Binary files /dev/null and b/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/sql_scripts/update_2009_07_05_EF.sql b/sql_scripts/update_2009_07_05_EF.sql
new file mode 100644
index 00000000..43c7c2f0
--- /dev/null
+++ b/sql_scripts/update_2009_07_05_EF.sql
@@ -0,0 +1,3 @@
+ALTER TABLE auth_user ADD COLUMN email_isvalid TINYINT(1) NOT NULL;
+UPDATE auth_user SET email_isvalid=1;
+ALTER TABLE auth_user ADD COLUMN email_key varchar(32);
diff --git a/templates/authopenid/email_validation.txt b/templates/authopenid/email_validation.txt
new file mode 100644
index 00000000..5b166a9b
--- /dev/null
+++ b/templates/authopenid/email_validation.txt
@@ -0,0 +1,15 @@
+{% load i18n %}
+{% trans "Greetings from the Q&A forum" %},
+
+{% trans "To make use of the Forum, please follow the link below:" %}
+
+{{validation_link}}
+
+{% trans "Following the link above will help us verify your email address." %}
+
+{% blocktrans %}If you beleive that this message was sent in mistake - 
+no further action is needed. Just ingore this email, we apologize
+for any inconvenience{% endblocktrans %}
+
+{% blocktrans %}Sincerely,
+Forum Administrator{% endblocktrans %}
diff --git a/templates/content/jquery-openid/images/aol.gif b/templates/content/jquery-openid/images/aol.gif
new file mode 100644
index 00000000..decc4f12
Binary files /dev/null and b/templates/content/jquery-openid/images/aol.gif differ
diff --git a/templates/content/jquery-openid/images/blogger.ico b/templates/content/jquery-openid/images/blogger.ico
new file mode 100644
index 00000000..1b9730b0
Binary files /dev/null and b/templates/content/jquery-openid/images/blogger.ico differ
diff --git a/templates/content/jquery-openid/images/claimid.ico b/templates/content/jquery-openid/images/claimid.ico
new file mode 100644
index 00000000..2b80f491
Binary files /dev/null and b/templates/content/jquery-openid/images/claimid.ico differ
diff --git a/templates/content/jquery-openid/images/facebook.gif b/templates/content/jquery-openid/images/facebook.gif
new file mode 100644
index 00000000..b997b358
Binary files /dev/null and b/templates/content/jquery-openid/images/facebook.gif differ
diff --git a/templates/content/jquery-openid/images/flickr.ico b/templates/content/jquery-openid/images/flickr.ico
new file mode 100644
index 00000000..11f6e07f
Binary files /dev/null and b/templates/content/jquery-openid/images/flickr.ico differ
diff --git a/templates/content/jquery-openid/images/google.gif b/templates/content/jquery-openid/images/google.gif
new file mode 100644
index 00000000..1b6cd07b
Binary files /dev/null and b/templates/content/jquery-openid/images/google.gif differ
diff --git a/templates/content/jquery-openid/images/livejournal.ico b/templates/content/jquery-openid/images/livejournal.ico
new file mode 100644
index 00000000..f3d21ec5
Binary files /dev/null and b/templates/content/jquery-openid/images/livejournal.ico differ
diff --git a/templates/content/jquery-openid/images/myopenid.ico b/templates/content/jquery-openid/images/myopenid.ico
new file mode 100644
index 00000000..ceb06e6a
Binary files /dev/null and b/templates/content/jquery-openid/images/myopenid.ico differ
diff --git a/templates/content/jquery-openid/images/openid-inputicon.gif b/templates/content/jquery-openid/images/openid-inputicon.gif
new file mode 100644
index 00000000..cde836c8
Binary files /dev/null and b/templates/content/jquery-openid/images/openid-inputicon.gif differ
diff --git a/templates/content/jquery-openid/images/openid.gif b/templates/content/jquery-openid/images/openid.gif
new file mode 100644
index 00000000..c718b0e6
Binary files /dev/null and b/templates/content/jquery-openid/images/openid.gif differ
diff --git a/templates/content/jquery-openid/images/openidico.png b/templates/content/jquery-openid/images/openidico.png
new file mode 100644
index 00000000..ab622669
Binary files /dev/null and b/templates/content/jquery-openid/images/openidico.png differ
diff --git a/templates/content/jquery-openid/images/technorati.ico b/templates/content/jquery-openid/images/technorati.ico
new file mode 100644
index 00000000..fa1083c1
Binary files /dev/null and b/templates/content/jquery-openid/images/technorati.ico differ
diff --git a/templates/content/jquery-openid/images/verisign.ico b/templates/content/jquery-openid/images/verisign.ico
new file mode 100644
index 00000000..3953af93
Binary files /dev/null and b/templates/content/jquery-openid/images/verisign.ico differ
diff --git a/templates/content/jquery-openid/images/vidoop.ico b/templates/content/jquery-openid/images/vidoop.ico
new file mode 100644
index 00000000..bbd9a0d5
Binary files /dev/null and b/templates/content/jquery-openid/images/vidoop.ico differ
diff --git a/templates/content/jquery-openid/images/wordpress.ico b/templates/content/jquery-openid/images/wordpress.ico
new file mode 100644
index 00000000..31b7d2c2
Binary files /dev/null and b/templates/content/jquery-openid/images/wordpress.ico differ
diff --git a/templates/content/jquery-openid/images/yahoo.gif b/templates/content/jquery-openid/images/yahoo.gif
new file mode 100644
index 00000000..42adbfa5
Binary files /dev/null and b/templates/content/jquery-openid/images/yahoo.gif differ
diff --git a/templates/content/jquery-openid/jquery.openid.js b/templates/content/jquery-openid/jquery.openid.js
new file mode 100644
index 00000000..eec29ab2
--- /dev/null
+++ b/templates/content/jquery-openid/jquery.openid.js
@@ -0,0 +1,92 @@
+//jQuery OpenID Plugin 1.1 Copyright 2009 Jarrett Vance http://jvance.com/pages/jQueryOpenIdPlugin.xhtml
+$.fn.openid = function() {
+  var $this = $(this);
+
+  //name input value - needed for name based OpenID
+  var $usr = $this.find('input[name=openid_username]');
+
+  //final url input value
+  var $id = $this.find('input[name=openid_url]');
+
+  //beginning and end of name OpenID url (name being the middle)
+  var $front = $this.find('p:has(input[name=openid_username])>span:eq(0)');
+  var $end = $this.find('p:has(input[name=openid_username])>span:eq(1)');
+
+  //needed for special effects only
+  var $usrfs = $this.find('fieldset:has(input[name=openid_username])');
+  var $idfs = $this.find('fieldset:has(input[name=openid_url])');
+
+  var submitusr = function() {
+    if ($usr.val().length < 1) {
+      $usr.focus();
+      return false;
+    }
+    $id.val($front.text() + $usr.val() + $end.text());
+    return true;
+  };
+
+  var submitid = function() {
+    if ($id.val().length < 1) {
+      $id.focus();
+      return false;
+    }
+    return true;
+
+  };
+  var direct = function() {
+    var $li = $(this);
+    $li.parent().find('li').removeClass('highlight');
+    $li.addClass('highlight');
+    $usrfs.fadeOut('slow');
+    $idfs.fadeOut('slow');
+    $id.val($this.find("li.highlight span").text());
+    setTimeout(function(){$('#bsignin').click()},1000);
+    return false;
+  };
+
+  var openid = function() {
+    var $li = $(this);
+    $li.parent().find('li').removeClass('highlight');
+    $li.addClass('highlight');
+    $usrfs.hide();
+    $idfs.show();
+    $id.focus();
+    $this.unbind('submit').submit(submitid);
+    return false;
+  };
+
+  var username = function() {
+    var $li = $(this);
+    $li.parent().find('li').removeClass('highlight');
+    $li.addClass('highlight');
+    $idfs.hide();
+    $usrfs.show();
+    $this.find('#enter_your_what').text($li.attr("title"));
+    $front.text($li.find("span").text().split("username")[0]);
+    $end.text("").text($li.find("span").text().split("username")[1]);
+    $id.focus();
+    $this.unbind('submit').submit(submitusr);
+    return false;
+  };
+
+  $this.find('li.direct').click(direct);
+  $this.find('li.openid').click(openid);
+  $this.find('li.username').click(username);
+  $id.keypress(function(e) {
+    if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
+      return submitid();
+    }
+  });
+  $usr.keypress(function(e) {
+    if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
+      return submitusr();
+    }
+  });
+  $this.find('li span').hide();
+  $this.find('li').css('line-height', 0).css('cursor', 'pointer');
+  $this.find('li:eq(0)').click();
+
+  return this;
+};
+// submitting next=%2F&openid_username=&openid_url=http%3A%2F%2Fyahoo.com%2F
+// submitting next=%2F&openid_username=&openid_url=http%3A%2F%2Fyahoo.com%2F
diff --git a/templates/content/jquery-openid/openid.css b/templates/content/jquery-openid/openid.css
new file mode 100644
index 00000000..e53c1823
--- /dev/null
+++ b/templates/content/jquery-openid/openid.css
@@ -0,0 +1,33 @@
+fieldset {border-style:none;}
+img {border-style:none;}
+
+.logo_box {width:90px;height:40px;background:white;border:1px solid #dddddd;}
+.openid_box img {margin-top:6px;}
+.aol_box img {margin-top:6px;}
+.yahoo_box img {margin-top:13px;}
+.google_box img {margin-top:6px;}
+
+form.openid ul{ margin:0;padding:0;text-align:center; list-style-type:none; display:block;}
+form.openid ul li {float:left; padding:4px;} 
+form.openid ul li span {padding:0 1em 0 3px}
+form.openid ul li.first_tiny_li {clear:left;}
+form.openid fieldset {clear:both;padding:10px 0px 0px 0px;}
+form.openid div+fieldset {display:none}
+form.openid label {display:block; font-weight:bold; margin-bottom:.5em}
+input[name=openid_username] {width:8em}
+input[name=openid_identifier] {width:18em}
+form.openid ul li.highlight { -moz-border-radius:4px; -webkit-border-radius:4px; background-color: #FD6}
+form.openid fieldset div {-moz-border-radius:4px; -webkit-border-radius:4px; 
+                          background: #DCDCDC;
+						  padding:10px;display:inline-block}
+form.openid fieldset div p {padding:0px;margin:0px;}
+/*form.openid input[type='submit'] {margin-left:1em;}*/
+#openid_username {background:#ffffa0;}
+#openid_url {background:#ffffa0;}
+
+.openid_logo{color:#F7931E;padding:6px 0px 8px 28px; 
+background: url(images/openidico.png) no-repeat;
+}
+
+#openid_login {float:left; width:30%; margin:2em 1em; text-align:center}
+#openid_login div{margin-top:0.5em}
-- 
cgit v1.2.3-1-g7c22


From 8d5ef067c8c4e7de276d559af67417f5324f9171 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Thu, 6 Aug 2009 01:34:54 -0400
Subject: removed unused file

---
 django_authopenid/decorators.py | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 django_authopenid/decorators.py

diff --git a/django_authopenid/decorators.py b/django_authopenid/decorators.py
deleted file mode 100644
index 94498574..00000000
--- a/django_authopenid/decorators.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import settings
-def 
-- 
cgit v1.2.3-1-g7c22


From 48703d2eb746ba3fe911df9c61793abaced3729a Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Fri, 7 Aug 2009 11:22:37 -0600
Subject: adding some translation, fixing translation errors (Spanish)

---
 locale/es/LC_MESSAGES/django.mo | Bin 39157 -> 42843 bytes
 locale/es/LC_MESSAGES/django.po | 137 ++++++++++++++++++----------------------
 2 files changed, 60 insertions(+), 77 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index a68a2fd3..a2a27c2f 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index a8ac642a..b209c72c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2009-08-07 11:21-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -117,14 +117,12 @@ msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
 #: django_authopenid/urls.py:10
-#, fuzzy
 msgid "newquestion/"
-msgstr "pregunta"
+msgstr "nueva-pregunta/"
 
 #: django_authopenid/urls.py:11
-#, fuzzy
 msgid "newanswer/"
-msgstr "resputa"
+msgstr "respuesta-nueva/"
 
 #: django_authopenid/urls.py:12
 msgid "signout/"
@@ -165,17 +163,17 @@ msgstr "Contraseña modificada"
 
 #: django_authopenid/views.py:519 django_authopenid/views.py:524
 msgid "your email needs to be validated"
-msgstr ""
+msgstr "su correo electrónico necesita ser validado"
 
 #: django_authopenid/views.py:681 django_authopenid/views.py:833
 #, python-format
 msgid "No OpenID %s found associated in our database"
-msgstr "La OpenID %s no esta asociada en nuestra base de datos"
+msgstr "El OpenID %s no esta asociada en nuestra base de datos"
 
 #: django_authopenid/views.py:685 django_authopenid/views.py:840
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
-msgstr "La OpenID %s no esta asociada al usuario actualmente autenticado"
+msgstr "El OpenID %s no esta asociada al usuario actualmente autenticado"
 
 #: django_authopenid/views.py:693
 msgid "Email Changed."
@@ -183,12 +181,12 @@ msgstr "Email modificado"
 
 #: django_authopenid/views.py:768
 msgid "This OpenID is already associated with another account."
-msgstr "Esta OpenID ya está asociada a otra cuenta."
+msgstr "Este OpenID ya está asociada a otra cuenta."
 
 #: django_authopenid/views.py:773
 #, python-format
 msgid "OpenID %s is now associated with your account."
-msgstr "La OpenID %s está ahora asociada con tu cuenta."
+msgstr "El OpenID %s está ahora asociada con tu cuenta."
 
 #: django_authopenid/views.py:843
 msgid "Account deleted."
@@ -349,23 +347,22 @@ msgid "latest questions"
 msgstr "últimas preguntas"
 
 #: forum/feed.py:19
-#, fuzzy
 msgid "questions/"
-msgstr "preguntas"
+msgstr "preguntas/"
 
 #: forum/forms.py:14 templates/answer_edit_tips.html:34
 #: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31
 #: templates/question_edit_tips.html:36
 msgid "title"
-msgstr "titulo"
+msgstr "título"
 
 #: forum/forms.py:15
 msgid "please enter a descriptive title for your question"
-msgstr "ingrese un titulo descriptivo para su pregunta"
+msgstr "ingrese un título descriptivo para su pregunta"
 
 #: forum/forms.py:20
 msgid "title must be > 10 characters"
-msgstr "el titulo debe tener al menos 10 caracteres"
+msgstr "el título debe tener al menos 10 caracteres"
 
 #: forum/forms.py:29
 msgid "content"
@@ -466,27 +463,27 @@ msgstr "este email ya ha sido registrado, por favor use otro"
 #: forum/models.py:238
 #, fuzzy, python-format
 msgid "%(author)s modified the question"
-msgstr "Cerrar la pregunta"
+msgstr "%(author) modificó la pregunta"
 
 #: forum/models.py:242
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
-msgstr ""
+msgstr "%(people)s publicaron %(new_answer_count)s nuevas respuestas"
 
 #: forum/models.py:247
-#, fuzzy, python-format
+#, python-format
 msgid "%(people)s commented the question"
-msgstr "pregunta comentada"
+msgstr "%(people)s comentarion la pregunta"
 
 #: forum/models.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%(people)s commented answers"
-msgstr "respuesta comentada"
+msgstr "%(people)s comentaron la respuesta"
 
 #: forum/models.py:254
-#, fuzzy, python-format
+#, python-format
 msgid "%(people)s commented the answer"
-msgstr "respuesta comentada"
+msgstr "%(people)s comentaron la respuestas"
 
 #: forum/models.py:433 templates/badges.html:52
 msgid "gold"
@@ -585,14 +582,13 @@ msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
 #: forum/views.py:304
-#, fuzzy
 msgid "/account/"
-msgstr "cuenta/"
+msgstr "/cuenta/"
 
 #: forum/views.py:943
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
-msgstr ""
+msgstr "subscripción guardada, %(email)s necesita validación"
 
 #: forum/views.py:1853
 msgid "uploading images is limited to users with >60 reputation points"
@@ -617,9 +613,8 @@ msgstr ""
 "Error al subir el archivo. Por favor, contacte al administrador. Gracias. %s"
 
 #: forum/management/commands/send_email_alerts.py:35
-#, fuzzy
 msgid "updates from website"
-msgstr "sitio web del usuario"
+msgstr "actualizaciones del sitio"
 
 #: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168
 #: templates/header.html:33
@@ -818,25 +813,24 @@ msgstr "aprender mas sobre Markdown"
 
 #: templates/ask.html:4 templates/ask.html.py:60
 msgid "Ask a question"
-msgstr "Hacer una pregunta"
+msgstr "Preguntar"
 
 #: templates/ask.html:67
-#, fuzzy
 msgid "login to post question info"
-msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
+msgstr "Inicie sesión para publicar pregunta."
 
 #: templates/ask.html:73
 #, python-format
 msgid "must have valid %(email)s to post"
-msgstr ""
+msgstr "debe de tener un %(email)s válido para publicar"
 
 #: templates/ask.html:108
 msgid "(required)"
-msgstr ""
+msgstr "(requerido)"
 
 #: templates/ask.html:115
 msgid "Login/signup to post your question"
-msgstr ""
+msgstr "Iniciar sesión/registrarse para publicar su pregunta"
 
 #: templates/ask.html:117
 msgid "Ask your question"
@@ -863,13 +857,11 @@ msgid "Community gives you awards for your questions, answers and votes."
 msgstr "La comunidad te da distinciones por tus preguntas, respuestas y votos."
 
 #: templates/badges.html:22
-#, fuzzy
 msgid ""
 "Below is the list of available badges and number of times each type of badge "
 "has been awarded."
 msgstr ""
-"La comunidad te condecora con distinciones por tus preguntas, respuestas y "
-"votos. Debajo esta la lista de las distinciones disponibles y la cantidad de "
+"Debajo esta la lista de las distinciones disponibles y la cantidad de "
 "veces que han sido asignadas."
 
 #: templates/badges.html:49
@@ -1054,7 +1046,7 @@ msgstr "¿Que debo evitar en mis respuestas?"
 
 #: templates/faq.html:28 templates/faq.html.py:132
 msgid "site title"
-msgstr "titulo del sitio"
+msgstr "título del sitio"
 
 #: templates/faq.html:28
 msgid ""
@@ -1091,9 +1083,8 @@ msgid "How does reputation system work?"
 msgstr "¿Cómo funciona el sistema de reputación?"
 
 #: templates/faq.html:41
-#, fuzzy
 msgid "Rep system summary"
-msgstr "resumen de modificación"
+msgstr "resumen del sistema de reputación"
 
 #: templates/faq.html:59 templates/user_votes.html:14
 msgid "upvote"
@@ -1112,9 +1103,8 @@ msgid "downvote"
 msgstr "votar negativo"
 
 #: templates/faq.html:75
-#, fuzzy
 msgid "open and close own questions"
-msgstr "abrir cualquier pregunta cerrada"
+msgstr "abrir y cerrar sus propias preguntas"
 
 #: templates/faq.html:79
 msgid "retag questions"
@@ -1144,19 +1134,19 @@ msgstr ""
 
 #: templates/faq.html:106
 msgid "how to validate email title"
-msgstr ""
+msgstr "como validar el título del correo"
 
 #: templates/faq.html:108
 msgid "how to validate email info"
-msgstr ""
+msgstr "como validar la información del correo"
 
 #: templates/faq.html:112
 msgid "what is gravatar"
-msgstr ""
+msgstr "qué es gravatar"
 
 #: templates/faq.html:113
 msgid "gravatar faq info"
-msgstr ""
+msgstr "preguntas frecuentes sobre gravatar"
 
 #: templates/faq.html:116
 msgid "To register, do I need to create new password?"
@@ -1211,7 +1201,7 @@ msgstr "preguntas"
 
 #: templates/faq.html:132 templates/index.html:121
 msgid "."
-msgstr ""
+msgstr "."
 
 #: templates/footer.html:7 templates/header.html:14 templates/index.html:83
 msgid "about"
@@ -1365,7 +1355,6 @@ msgid "Still looking for more? See"
 msgstr "¿Aún sigues buscando más? Ver"
 
 #: templates/index.html:121
-#, fuzzy
 msgid "complete list of questions"
 msgstr "lista completa de preguntas"
 
@@ -1378,9 +1367,8 @@ msgid "Please help us answer"
 msgstr "Ayudanos a responder"
 
 #: templates/index.html:121
-#, fuzzy
 msgid "list of unanswered questions"
-msgstr "sin respuesta"
+msgstr "lista de preguntas sin respuesta"
 
 #: templates/logout.html:6 templates/logout.html.py:17
 msgid "Logout"
@@ -1696,7 +1684,7 @@ msgstr "Encontradas por etiqueta"
 
 #: templates/questions.html:23
 msgid "Found by title"
-msgstr "Encontradas por titulo"
+msgstr "Encontradas por título"
 
 #: templates/questions.html:23
 msgid "All questions"
@@ -1715,7 +1703,7 @@ msgid "active"
 msgstr "actividad"
 
 #: templates/questions.html:109
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
@@ -1724,8 +1712,12 @@ msgid_plural ""
 "\n"
 "\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
 "\t\t\t"
-msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
-msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
+msgstr[0] "\n" 
+"\t\t\ttiene un total de %(q_num)s preguntas etiquetadas con %(tagname)s\n"
+"\t\t\t"
+msgstr[1] "\n"
+"\t\t\ttiene un total de %(q_num)s preguntas etiquetadas con %(tagname)s\n"
+"\t\t\t"
 
 #: templates/questions.html:116
 #, fuzzy, python-format
@@ -1941,27 +1933,24 @@ msgid "Connect with Twitter"
 msgstr ""
 
 #: templates/user_preferences.html:12
-#, fuzzy
 msgid "Twitter account name:"
-msgstr "Esta cuenta esta inactiva."
+msgstr "Nombre de usuario en Twitter:"
 
 #: templates/user_preferences.html:14
-#, fuzzy
 msgid "Twitter password:"
-msgstr "Nueva contraseña"
+msgstr "Contraseña de Twitter:"
 
 #: templates/user_preferences.html:16
 msgid "Send my Questions to Twitter"
-msgstr ""
+msgstr "Enviar mis preguntas a Twitter"
 
 #: templates/user_preferences.html:17
 msgid "Send my Answers to Twitter"
-msgstr ""
+msgstr "Enviar mis respuestas a Twitter"
 
 #: templates/user_preferences.html:18
-#, fuzzy
 msgid "Save"
-msgstr "Guardar la edición"
+msgstr "Guardar"
 
 #: templates/user_stats.html:15
 msgid "User questions"
@@ -2064,7 +2053,7 @@ msgstr "Cambiar dirección email"
 #: templates/authopenid/changeemail.html:10
 #, fuzzy, python-format
 msgid "change %(email)s info"
-msgstr "Cambiar email "
+msgstr "Cambiar información del correo electrónico "
 
 #: templates/authopenid/changeemail.html:13
 #: templates/authopenid/changeopenid.html:14
@@ -2093,9 +2082,8 @@ msgid "validate %(email)s info"
 msgstr ""
 
 #: templates/authopenid/changeemail.html:50
-#, fuzzy
 msgid "Email not changed"
-msgstr "Email modificado."
+msgstr "Email no modificado."
 
 #: templates/authopenid/changeemail.html:53
 #, python-format
@@ -2103,7 +2091,6 @@ msgid "old %(email)s kept"
 msgstr ""
 
 #: templates/authopenid/changeemail.html:58
-#, fuzzy
 msgid "Email changed"
 msgstr "Email modificado."
 
@@ -2114,15 +2101,15 @@ msgstr ""
 
 #: templates/authopenid/changeemail.html:66
 msgid "Email verified"
-msgstr ""
+msgstr "Email verificado"
 
 #: templates/authopenid/changeemail.html:69
 msgid "thanks for verifying email"
-msgstr ""
+msgstr "gracias por verificar su correo"
 
 #: templates/authopenid/changeemail.html:74
 msgid "email key not sent"
-msgstr ""
+msgstr "llave de correo no enviada"
 
 #: templates/authopenid/changeemail.html:77
 #, python-format
@@ -2197,7 +2184,6 @@ msgid "Screen name label"
 msgstr ""
 
 #: templates/authopenid/complete.html:48
-#, fuzzy
 msgid "Email address label"
 msgstr "su email (correo electrónico)"
 
@@ -2231,11 +2217,10 @@ msgstr ""
 
 #: templates/authopenid/confirm_email.txt:4
 msgid "Your account details are:"
-msgstr ""
+msgstr "Los detalles de su cuenta son:"
 
 #: templates/authopenid/confirm_email.txt:6
 #: templates/authopenid/sendpw_email.txt:7
-#, fuzzy
 msgid "Username:"
 msgstr "Nombre de usuario"
 
@@ -2246,7 +2231,7 @@ msgstr "Contraseña"
 
 #: templates/authopenid/confirm_email.txt:9
 msgid "Please sign in here:"
-msgstr ""
+msgstr "Por favor inicie sesión aquí:"
 
 #: templates/authopenid/confirm_email.txt:12
 #: templates/authopenid/email_validation.txt:14
@@ -2294,11 +2279,11 @@ msgstr ""
 
 #: templates/authopenid/email_validation.txt:4
 msgid "To make use of the Forum, please follow the link below:"
-msgstr ""
+msgstr "Para usar el Foro, siga el siguiente enlace:"
 
 #: templates/authopenid/email_validation.txt:8
 msgid "Following the link above will help us verify your email address."
-msgstr ""
+msgstr "El siguiente enlace nos ayudará a verificar su correo electrónico."
 
 #: templates/authopenid/email_validation.txt:10
 msgid ""
@@ -2355,7 +2340,6 @@ msgid "Your new account details are:"
 msgstr ""
 
 #: templates/authopenid/sendpw_email.txt:8
-#, fuzzy
 msgid "New password:"
 msgstr "Nueva contraseña"
 
@@ -2441,7 +2425,6 @@ msgid "Login name"
 msgstr "Nombre de usuario"
 
 #: templates/authopenid/signin.html:141
-#, fuzzy
 msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-- 
cgit v1.2.3-1-g7c22


From 46da3fdbe80ea1f6b9278d2671757d5fdb8abcfb Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 7 Aug 2009 18:47:02 -0400
Subject: added spanish mods by Adolfo, fix in email notification and minor
 template change, removed site-specific staff from english .po file

---
 forum/auth.py                   |  449 +--------
 forum/models.py                 |  678 +-------------
 forum/views.py                  | 1965 ---------------------------------------
 locale/en/LC_MESSAGES/django.mo |  Bin 15885 -> 13992 bytes
 locale/en/LC_MESSAGES/django.po |   27 +-
 templates/reopen.html           |    5 +-
 6 files changed, 15 insertions(+), 3109 deletions(-)

diff --git a/forum/auth.py b/forum/auth.py
index 65ad6dad..36ca54d3 100644
--- a/forum/auth.py
+++ b/forum/auth.py
@@ -1,451 +1,4 @@
-"""
-Authorisation related functions.
-
-The actions a User is authorised to perform are dependent on their reputation
-and superuser status.
-"""
-import datetime
-from django.contrib.contenttypes.models import ContentType
-from django.db import transaction
-from models import Repute
-from models import Question
-from models import Answer
-from const import TYPE_REPUTATION
-question_type = ContentType.objects.get_for_model(Question)
-answer_type = ContentType.objects.get_for_model(Answer)
-
-VOTE_UP                   = 15
-FLAG_OFFENSIVE            = 15
-POST_IMAGES               = 15
-LEAVE_COMMENTS            = 50
-UPLOAD_FILES              = 60
-VOTE_DOWN                 = 100
-CLOSE_OWN_QUESTIONS       = 250
-RETAG_OTHER_QUESTIONS     = 500
-REOPEN_OWN_QUESTIONS      = 500
-EDIT_COMMUNITY_WIKI_POSTS = 750
-EDIT_OTHER_POSTS          = 2000
-DELETE_COMMENTS           = 2000
-VIEW_OFFENSIVE_FLAGS      = 2000
-DISABLE_URL_NOFOLLOW      = 2000
-CLOSE_OTHER_QUESTIONS     = 3000
-LOCK_POSTS                = 4000
-
-VOTE_RULES = {
-    'scope_votes_per_user_per_day' : 30, # how many votes of one user has everyday
-    'scope_flags_per_user_per_day' : 5,  # how many times user can flag posts everyday
-    'scope_warn_votes_left' : 10,        # start when to warn user how many votes left
-    'scope_deny_unvote_days' : 1,        # if 1 days passed, user can't cancel votes.
-    'scope_flags_invisible_main_page' : 3, # post doesn't show on main page if has more than 3 offensive flags
-    'scope_flags_delete_post' : 5,         # post will be deleted if it has more than 5 offensive flags
-}
-
-REPUTATION_RULES = {
-    'initial_score'                       : 1,
-    'scope_per_day_by_upvotes'            : 200,
-    'gain_by_upvoted'                     : 10,
-    'gain_by_answer_accepted'             : 15,
-    'gain_by_accepting_answer'            : 2,
-    'gain_by_downvote_canceled'           : 2,
-    'gain_by_canceling_downvote'          : 1,
-    'lose_by_canceling_accepted_answer'   : -2,
-    'lose_by_accepted_answer_cancled'     : -15,
-    'lose_by_downvoted'                   : -2,
-    'lose_by_flagged'                     : -2,
-    'lose_by_downvoting'                  : -1,
-    'lose_by_flagged_lastrevision_3_times': -30,
-    'lose_by_flagged_lastrevision_5_times': -100,
-    'lose_by_upvote_canceled'             : -10,
-}
-
-def can_vote_up(user):
-    """Determines if a User can vote Questions and Answers up."""
-    return user.is_authenticated() and (
-        user.reputation >= VOTE_UP or
-        user.is_superuser)
-
-def can_flag_offensive(user):
-    """Determines if a User can flag Questions and Answers as offensive."""
-    return user.is_authenticated() and (
-        user.reputation >= FLAG_OFFENSIVE or
-        user.is_superuser)
-
-def can_add_comments(user):
-    """Determines if a User can add comments to Questions and Answers."""
-    return user.is_authenticated() and (
-        user.reputation >= LEAVE_COMMENTS or
-        user.is_superuser)
-
-def can_vote_down(user):
-    """Determines if a User can vote Questions and Answers down."""
-    return user.is_authenticated() and (
-        user.reputation >= VOTE_DOWN or
-        user.is_superuser)
-
-def can_retag_questions(user):
-    """Determines if a User can retag Questions."""
-    return user.is_authenticated() and (
-        RETAG_OTHER_QUESTIONS <= user.reputation < EDIT_OTHER_POSTS or
-        user.is_superuser)
-
-def can_edit_post(user, post):
-    """Determines if a User can edit the given Question or Answer."""
-    return user.is_authenticated() and (
-        user.id == post.author_id or
-        (post.wiki and user.reputation >= EDIT_COMMUNITY_WIKI_POSTS) or
-        user.reputation >= EDIT_OTHER_POSTS or
-        user.is_superuser)
-
-def can_delete_comment(user, comment):
-    """Determines if a User can delete the given Comment."""
-    return user.is_authenticated() and (
-        user.id == comment.user_id or
-        user.reputation >= DELETE_COMMENTS or
-        user.is_superuser)
-
-def can_view_offensive_flags(user):
-    """Determines if a User can view offensive flag counts."""
-    return user.is_authenticated() and (
-        user.reputation >= VIEW_OFFENSIVE_FLAGS or
-        user.is_superuser)
-
-def can_close_question(user, question):
-    """Determines if a User can close the given Question."""
-    return user.is_authenticated() and (
-        (user.id == question.author_id and
-         user.reputation >= CLOSE_OWN_QUESTIONS) or
-        user.reputation >= CLOSE_OTHER_QUESTIONS or
-        user.is_superuser)
-
-def can_lock_posts(user):
-    """Determines if a User can lock Questions or Answers."""
-    return user.is_authenticated() and (
-        user.reputation >= LOCK_POSTS or
-        user.is_superuser)
-
-def can_follow_url(user):
-    """Determines if the URL link can be followed by Google search engine."""
-    return user.reputation >= DISABLE_URL_NOFOLLOW
-
-def can_accept_answer(user, question, answer):
-    return (user.is_authenticated() and
-        question.author != answer.author and
-        question.author == user) or user.is_superuser
-
-# now only support to reopen own question except superuser
-def can_reopen_question(user, question):
-    return (user.is_authenticated() and
-        user.id == question.author_id and
-        user.reputation >= REOPEN_OWN_QUESTIONS) or user.is_superuser
-
-def can_delete_post(user, post):
-    return (user.is_authenticated() and
-        user.id == post.author_id) or user.is_superuser
-
-def can_view_deleted_post(user, post):
-    return user.is_superuser
-
-# user preferences view permissions
-def is_user_self(request_user, target_user):
-    return (request_user.is_authenticated() and request_user == target_user)
-    
-def can_view_user_votes(request_user, target_user):
-    return (request_user.is_authenticated() and request_user == target_user)
-
-def can_view_user_preferences(request_user, target_user):
-    return (request_user.is_authenticated() and request_user == target_user)
-
-def can_view_user_edit(request_user, target_user):
-    return (request_user.is_authenticated() and request_user == target_user)
-
-def can_upload_files(request_user):
-    return (request_user.is_authenticated() and request_user.reputation >= UPLOAD_FILES) or \
-           request_user.is_superuser
-
-###########################################
-## actions and reputation changes event
-###########################################
-def calculate_reputation(origin, offset):
-    result = int(origin) + int(offset)
-    if (result > 0):
-        return result
-    else: 
-        return 1
-
-@transaction.commit_on_success
-def onFlaggedItem(item, post, user):
-
-    item.save()
-    post.offensive_flag_count = post.offensive_flag_count + 1
-    post.save()
-
-    post.author.reputation = calculate_reputation(post.author.reputation,
-                           int(REPUTATION_RULES['lose_by_flagged']))
-    post.author.save()
-
-    question = post
-    if ContentType.objects.get_for_model(post) == answer_type:
-        question = post.question
-
-    reputation = Repute(user=post.author,
-               negative=int(REPUTATION_RULES['lose_by_flagged']),
-               question=question, reputed_at=datetime.datetime.now(),
-               reputation_type=-4,
-               reputation=post.author.reputation)
-    reputation.save()
-
-    #todo: These should be updated to work on same revisions.
-    if post.offensive_flag_count ==  VOTE_RULES['scope_flags_invisible_main_page'] :
-        post.author.reputation = calculate_reputation(post.author.reputation,
-                               int(REPUTATION_RULES['lose_by_flagged_lastrevision_3_times']))
-        post.author.save()
-
-        reputation = Repute(user=post.author,
-                   negative=int(REPUTATION_RULES['lose_by_flagged_lastrevision_3_times']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=-6,
-                   reputation=post.author.reputation)
-        reputation.save()
-
-    elif post.offensive_flag_count == VOTE_RULES['scope_flags_delete_post']:
-        post.author.reputation = calculate_reputation(post.author.reputation,
-                               int(REPUTATION_RULES['lose_by_flagged_lastrevision_5_times']))
-        post.author.save()
-
-        reputation = Repute(user=post.author,
-                   negative=int(REPUTATION_RULES['lose_by_flagged_lastrevision_5_times']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=-7,
-                   reputation=post.author.reputation)
-        reputation.save()
-
-        post.deleted = True
-        #post.deleted_at = datetime.datetime.now()
-        #post.deleted_by = Admin
-        post.save()
-
-
-@transaction.commit_on_success
-def onAnswerAccept(answer, user):
-    answer.accepted = True
-    answer.accepted_at = datetime.datetime.now()
-    answer.question.answer_accepted = True
-    answer.save()
-    answer.question.save()
-
-    answer.author.reputation = calculate_reputation(answer.author.reputation,
-                             int(REPUTATION_RULES['gain_by_answer_accepted']))
-    answer.author.save()
-    reputation = Repute(user=answer.author,
-               positive=int(REPUTATION_RULES['gain_by_answer_accepted']),
-               question=answer.question,
-               reputed_at=datetime.datetime.now(),
-               reputation_type=2,
-               reputation=answer.author.reputation)
-    reputation.save()
-
-    user.reputation = calculate_reputation(user.reputation,
-                    int(REPUTATION_RULES['gain_by_accepting_answer']))
-    user.save()
-    reputation = Repute(user=user,
-               positive=int(REPUTATION_RULES['gain_by_accepting_answer']),
-               question=answer.question,
-               reputed_at=datetime.datetime.now(),
-               reputation_type=3,
-               reputation=user.reputation)
-    reputation.save()
-
-@transaction.commit_on_success
-def onAnswerAcceptCanceled(answer, user):
-    answer.accepted = False
-    answer.accepted_at = None
-    answer.question.answer_accepted = False
-    answer.save()
-    answer.question.save()
-
-    answer.author.reputation = calculate_reputation(answer.author.reputation,
-                             int(REPUTATION_RULES['lose_by_accepted_answer_cancled']))
-    answer.author.save()
-    reputation = Repute(user=answer.author,
-               negative=int(REPUTATION_RULES['lose_by_accepted_answer_cancled']),
-               question=answer.question,
-               reputed_at=datetime.datetime.now(),
-               reputation_type=-2,
-               reputation=answer.author.reputation)
-    reputation.save()
-
-    user.reputation = calculate_reputation(user.reputation,
-                    int(REPUTATION_RULES['lose_by_canceling_accepted_answer']))
-    user.save()
-    reputation = Repute(user=user,
-               negative=int(REPUTATION_RULES['lose_by_canceling_accepted_answer']),
-               question=answer.question,
-               reputed_at=datetime.datetime.now(),
-               reputation_type=-1,
-               reputation=user.reputation)
-    reputation.save()
-
-@transaction.commit_on_success
-def onUpVoted(vote, post, user):
-    vote.save()
-
-    post.vote_up_count = int(post.vote_up_count) + 1
-    post.score = int(post.score) + 1
-    post.save()
-
-    if not post.wiki:
-        author = post.author
-        if Repute.objects.get_reputation_by_upvoted_today(author) <  int(REPUTATION_RULES['scope_per_day_by_upvotes']):
-            author.reputation = calculate_reputation(author.reputation,
-                              int(REPUTATION_RULES['gain_by_upvoted']))
-            author.save()
-
-            question = post
-            if ContentType.objects.get_for_model(post) == answer_type:
-                question = post.question
-
-            reputation = Repute(user=author,
-                       positive=int(REPUTATION_RULES['gain_by_upvoted']),
-                       question=question,
-                       reputed_at=datetime.datetime.now(),
-                       reputation_type=1,
-                       reputation=author.reputation)
-            reputation.save()
-
-@transaction.commit_on_success
-def onUpVotedCanceled(vote, post, user):
-    vote.delete()
-
-    post.vote_up_count = int(post.vote_up_count) - 1
-    if post.vote_up_count < 0:
-        post.vote_up_count  = 0
-    post.score = int(post.score) - 1
-    post.save()
-
-    if not post.wiki:
-        author = post.author
-        author.reputation = calculate_reputation(author.reputation,
-                          int(REPUTATION_RULES['lose_by_upvote_canceled']))
-        author.save()
-
-        question = post
-        if ContentType.objects.get_for_model(post) == answer_type:
-            question = post.question
-
-        reputation = Repute(user=author,
-                   negative=int(REPUTATION_RULES['lose_by_upvote_canceled']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=-8,
-                   reputation=author.reputation)
-        reputation.save()
-
-@transaction.commit_on_success
-def onDownVoted(vote, post, user):
-    vote.save()
-
-    post.vote_down_count = int(post.vote_down_count) + 1
-    post.score = int(post.score) - 1
-    post.save()
-
-    if not post.wiki:
-        author = post.author
-        author.reputation = calculate_reputation(author.reputation,
-                          int(REPUTATION_RULES['lose_by_downvoted']))
-        author.save()
-
-        question = post
-        if ContentType.objects.get_for_model(post) == answer_type:
-            question = post.question
-
-        reputation = Repute(user=author,
-                   negative=int(REPUTATION_RULES['lose_by_downvoted']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=-3,
-                   reputation=author.reputation)
-        reputation.save()
-
-        user.reputation = calculate_reputation(user.reputation,
-                        int(REPUTATION_RULES['lose_by_downvoting']))
-        user.save()
-
-        reputation = Repute(user=user,
-                   negative=int(REPUTATION_RULES['lose_by_downvoting']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=-5,
-                   reputation=user.reputation)
-        reputation.save()
-
-@transaction.commit_on_success
-def onDownVotedCanceled(vote, post, user):
-    vote.delete()
-
-    post.vote_down_count = int(post.vote_down_count) - 1
-    if post.vote_down_count < 0:
-        post.vote_down_count  = 0
-    post.score = post.score + 1
-    post.save()
-
-    if not post.wiki:
-        author = post.author
-        author.reputation = calculate_reputation(author.reputation,
-                          int(REPUTATION_RULES['gain_by_downvote_canceled']))
-        author.save()
-
-        question = post
-        if ContentType.objects.get_for_model(post) == answer_type:
-            question = post.question
-
-        reputation = Repute(user=author,
-                   positive=int(REPUTATION_RULES['gain_by_downvote_canceled']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=4,
-                   reputation=author.reputation)
-        reputation.save()
-
-        user.reputation = calculate_reputation(user.reputation,
-                        int(REPUTATION_RULES['gain_by_canceling_downvote']))
-        user.save()
-
-        reputation = Repute(user=user,
-                   positive=int(REPUTATION_RULES['gain_by_canceling_downvote']),
-                   question=question,
-                   reputed_at=datetime.datetime.now(),
-                   reputation_type=5,
-                   reputation=user.reputation)
-        reputation.save()
-
-def onDeleteCanceled(post, user):
-    post.deleted = False
-    post.deleted_by = None
-    post.deleted_at = None
-    post.save()
-    for tag in list(post.tags.all()):
-        if tag.used_count == 1 and tag.deleted:
-            tag.deleted = False
-            tag.deleted_by = None
-            tag.deleted_at = None
-            tag.save()
-
-def onDeleted(post, user):
-    post.deleted = True
-    post.deleted_by = user
-    post.deleted_at = datetime.datetime.now()
-    post.save()
-
-    for tag in list(post.tags.all()):
-        if tag.used_count == 1:
-            tag.deleted = True
-            tag.deleted_by = user
-            tag.deleted_at = datetime.datetime.now()
-            tag.save()
-=======
-"""
+"""
 Authorisation related functions.
 
 The actions a User is authorised to perform are dependent on their reputation
diff --git a/forum/models.py b/forum/models.py
index c0def549..255eb21f 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -1,667 +1,4 @@
-# encoding:utf-8
-import datetime
-import hashlib
-from urllib import quote_plus, urlencode
-from django.db import models
-from django.utils.html import strip_tags
-from django.core.urlresolvers import reverse
-from django.contrib.auth.models import User
-from django.contrib.contenttypes import generic
-from django.contrib.contenttypes.models import ContentType
-from django.template.defaultfilters import slugify
-from django.db.models.signals import post_delete, post_save, pre_save
-from django.utils.translation import ugettext as _
-import django.dispatch
-
-from forum.managers import *
-from const import *
-
-class Tag(models.Model):
-    name       = models.CharField(max_length=255, unique=True)
-    created_by = models.ForeignKey(User, related_name='created_tags')
-    deleted         = models.BooleanField(default=False)
-    deleted_at      = models.DateTimeField(null=True, blank=True)
-    deleted_by      = models.ForeignKey(User, null=True, blank=True, related_name='deleted_tags')
-    # Denormalised data
-    used_count = models.PositiveIntegerField(default=0)
-
-    objects = TagManager()
-
-    class Meta:
-        db_table = u'tag'
-        ordering = ('-used_count', 'name')
-
-    def __unicode__(self):
-        return self.name
-
-class Comment(models.Model):
-    content_type   = models.ForeignKey(ContentType)
-    object_id      = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
-    user           = models.ForeignKey(User, related_name='comments')
-    comment        = models.CharField(max_length=300)
-    added_at       = models.DateTimeField(default=datetime.datetime.now)
-
-    class Meta:
-        ordering = ('-added_at',)
-        db_table = u'comment'
-    def __unicode__(self):
-        return self.comment
-
-class Vote(models.Model):
-    VOTE_UP = +1
-    VOTE_DOWN = -1
-    VOTE_CHOICES = (
-        (VOTE_UP,   u'Up'),
-        (VOTE_DOWN, u'Down'),
-    )
-
-    content_type   = models.ForeignKey(ContentType)
-    object_id      = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
-    user           = models.ForeignKey(User, related_name='votes')
-    vote           = models.SmallIntegerField(choices=VOTE_CHOICES)
-    voted_at       = models.DateTimeField(default=datetime.datetime.now)
-
-    objects = VoteManager()
-
-    class Meta:
-        unique_together = ('content_type', 'object_id', 'user')
-        db_table = u'vote'
-    def __unicode__(self):
-        return '[%s] voted at %s: %s' %(self.user, self.voted_at, self.vote)
-
-    def is_upvote(self):
-        return self.vote == self.VOTE_UP
-
-    def is_downvote(self):
-        return self.vote == self.VOTE_DOWN
-
-class FlaggedItem(models.Model):
-    """A flag on a Question or Answer indicating offensive content."""
-    content_type   = models.ForeignKey(ContentType)
-    object_id      = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
-    user           = models.ForeignKey(User, related_name='flagged_items')
-    flagged_at     = models.DateTimeField(default=datetime.datetime.now)
-
-    objects = FlaggedItemManager()
-
-    class Meta:
-        unique_together = ('content_type', 'object_id', 'user')
-        db_table = u'flagged_item'
-    def __unicode__(self):
-        return '[%s] flagged at %s' %(self.user, self.flagged_at)
-
-class Question(models.Model):
-    title    = models.CharField(max_length=300)
-    author   = models.ForeignKey(User, related_name='questions')
-    added_at = models.DateTimeField(default=datetime.datetime.now)
-    tags     = models.ManyToManyField(Tag, related_name='questions')
-    # Status
-    wiki            = models.BooleanField(default=False)
-    wikified_at     = models.DateTimeField(null=True, blank=True)
-    answer_accepted = models.BooleanField(default=False)
-    closed          = models.BooleanField(default=False)
-    closed_by       = models.ForeignKey(User, null=True, blank=True, related_name='closed_questions')
-    closed_at       = models.DateTimeField(null=True, blank=True)
-    close_reason    = models.SmallIntegerField(choices=CLOSE_REASONS, null=True, blank=True)
-    deleted         = models.BooleanField(default=False)
-    deleted_at      = models.DateTimeField(null=True, blank=True)
-    deleted_by      = models.ForeignKey(User, null=True, blank=True, related_name='deleted_questions')
-    locked          = models.BooleanField(default=False)
-    locked_by       = models.ForeignKey(User, null=True, blank=True, related_name='locked_questions')
-    locked_at       = models.DateTimeField(null=True, blank=True)
-    # Denormalised data
-    score                = models.IntegerField(default=0)
-    vote_up_count        = models.IntegerField(default=0)
-    vote_down_count      = models.IntegerField(default=0)
-    answer_count         = models.PositiveIntegerField(default=0)
-    comment_count        = models.PositiveIntegerField(default=0)
-    view_count           = models.PositiveIntegerField(default=0)
-    offensive_flag_count = models.SmallIntegerField(default=0)
-    favourite_count      = models.PositiveIntegerField(default=0)
-    last_edited_at       = models.DateTimeField(null=True, blank=True)
-    last_edited_by       = models.ForeignKey(User, null=True, blank=True, related_name='last_edited_questions')
-    last_activity_at     = models.DateTimeField(default=datetime.datetime.now)
-    last_activity_by     = models.ForeignKey(User, related_name='last_active_in_questions')
-    tagnames             = models.CharField(max_length=125)
-    summary              = models.CharField(max_length=180)
-    html                 = models.TextField()
-    comments             = generic.GenericRelation(Comment)
-    votes                = generic.GenericRelation(Vote)
-    flagged_items        = generic.GenericRelation(FlaggedItem)
-
-    objects = QuestionManager()
-
-    def save(self, **kwargs):
-        """
-        Overridden to manually manage addition of tags when the object
-        is first saved.
-
-        This is required as we're using ``tagnames`` as the sole means of
-        adding and editing tags.
-        """
-        initial_addition = (self.id is None)
-        super(Question, self).save(**kwargs)
-        if initial_addition:
-            tags = Tag.objects.get_or_create_multiple(self.tagname_list(),
-                                                      self.author)
-            self.tags.add(*tags)
-            Tag.objects.update_use_counts(tags)
-
-    def tagname_list(self):
-        """Creates a list of Tag names from the ``tagnames`` attribute."""
-        return [name for name in self.tagnames.split(u' ')]
-
-    def get_absolute_url(self):
-        return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-'))
-
-    def has_favorite_by_user(self, user):
-        if not user.is_authenticated():
-            return False
-        return FavoriteQuestion.objects.filter(question=self, user=user).count() > 0
-
-    def get_answer_count_by_user(self, user_id):
-        query_set = Answer.objects.filter(author__id=user_id)
-        return query_set.filter(question=self).count()
-
-    def get_question_title(self):
-        if self.closed:
-            attr = CONST['closed'] 
-        elif self.deleted:
-            attr = CONST['deleted']
-        else:
-            attr = None
-        if (attr is not None):
-            return u'%s %s' % (self.title, attr) 
-        else:
-           return self.title
-
-    def get_revision_url(self):
-        return reverse('question_revisions', args=[self.id])
-
-    def get_latest_revision(self):
-        return self.revisions.all()[0]
-
-    def __unicode__(self):
-        return self.title
-
-    class Meta:
-        db_table = u'question'
-
-class QuestionRevision(models.Model):
-    """A revision of a Question."""
-    question   = models.ForeignKey(Question, related_name='revisions')
-    revision   = models.PositiveIntegerField(blank=True)
-    title      = models.CharField(max_length=300)
-    author     = models.ForeignKey(User, related_name='question_revisions')
-    revised_at = models.DateTimeField()
-    tagnames   = models.CharField(max_length=125)
-    summary    = models.CharField(max_length=300, blank=True)
-    text       = models.TextField()
-
-    class Meta:
-        db_table = u'question_revision'
-        ordering = ('-revision',)
-
-    def get_question_title(self):
-        return self.question.title
-
-    def get_absolute_url(self):
-        return '/questions/%s/revisions' % (self.question.id)
-
-    def save(self, **kwargs):
-        """Looks up the next available revision number."""
-        if not self.revision:
-            self.revision = QuestionRevision.objects.filter(
-                question=self.question).values_list('revision',
-                                                    flat=True)[0] + 1
-        super(QuestionRevision, self).save(**kwargs)
-
-    def __unicode__(self):
-        return u'revision %s of %s' % (self.revision, self.title)
-
-class Answer(models.Model):
-    question = models.ForeignKey(Question, related_name='answers')
-    author   = models.ForeignKey(User, related_name='answers')
-    added_at = models.DateTimeField(default=datetime.datetime.now)
-    # Status
-    wiki        = models.BooleanField(default=False)
-    wikified_at = models.DateTimeField(null=True, blank=True)
-    accepted    = models.BooleanField(default=False)
-    accepted_at = models.DateTimeField(null=True, blank=True)
-    deleted     = models.BooleanField(default=False)
-    deleted_by  = models.ForeignKey(User, null=True, blank=True, related_name='deleted_answers')
-    locked      = models.BooleanField(default=False)
-    locked_by   = models.ForeignKey(User, null=True, blank=True, related_name='locked_answers')
-    locked_at   = models.DateTimeField(null=True, blank=True)
-    # Denormalised data
-    score                = models.IntegerField(default=0)
-    vote_up_count        = models.IntegerField(default=0)
-    vote_down_count      = models.IntegerField(default=0)
-    comment_count        = models.PositiveIntegerField(default=0)
-    offensive_flag_count = models.SmallIntegerField(default=0)
-    last_edited_at       = models.DateTimeField(null=True, blank=True)
-    last_edited_by       = models.ForeignKey(User, null=True, blank=True, related_name='last_edited_answers')
-    html                 = models.TextField()
-    comments             = generic.GenericRelation(Comment)
-    votes                = generic.GenericRelation(Vote)
-    flagged_items        = generic.GenericRelation(FlaggedItem)
-
-    objects = AnswerManager()
-
-    def get_user_vote(self, user):
-        votes = self.votes.filter(user=user)
-        if votes.count() > 0:
-            return votes[0]
-        else:
-            return None
-
-    def get_latest_revision(self):
-        return self.revisions.all()[0]
-
-    def get_question_title(self):
-        return self.question.title
-
-    def get_absolute_url(self):
-        return '%s%s#%s' % (reverse('question', args=[self.question.id]), self.question.title, self.id)
-
-    class Meta:
-        db_table = u'answer'
-
-    def __unicode__(self):
-        return self.html
-
-class AnswerRevision(models.Model):
-    """A revision of an Answer."""
-    answer     = models.ForeignKey(Answer, related_name='revisions')
-    revision   = models.PositiveIntegerField()
-    author     = models.ForeignKey(User, related_name='answer_revisions')
-    revised_at = models.DateTimeField()
-    summary    = models.CharField(max_length=300, blank=True)
-    text       = models.TextField()
-
-    def get_absolute_url(self):
-        return '/answers/%s/revisions' % (self.answer.id)
-
-    def get_question_title(self):
-        return self.answer.question.title
-
-    class Meta:
-        db_table = u'answer_revision'
-        ordering = ('-revision',)
-
-    def save(self, **kwargs):
-        """Looks up the next available revision number if not set."""
-        if not self.revision:
-            self.revision = AnswerRevision.objects.filter(
-                answer=self.answer).values_list('revision',
-                                                flat=True)[0] + 1
-        super(AnswerRevision, self).save(**kwargs)
-
-class FavoriteQuestion(models.Model):
-    """A favorite Question of a User."""
-    question      = models.ForeignKey(Question)
-    user          = models.ForeignKey(User, related_name='user_favorite_questions')
-    added_at = models.DateTimeField(default=datetime.datetime.now)
-    class Meta:
-        db_table = u'favorite_question'
-    def __unicode__(self):
-        return '[%s] favorited at %s' %(self.user, self.added_at)
-
-class Badge(models.Model):
-    """Awarded for notable actions performed on the site by Users."""
-    GOLD = 1
-    SILVER = 2
-    BRONZE = 3
-    TYPE_CHOICES = (
-        (GOLD,   _('gold')),
-        (SILVER, _('silver')),
-        (BRONZE, _('bronze')),
-    )
-
-    name        = models.CharField(max_length=50)
-    type        = models.SmallIntegerField(choices=TYPE_CHOICES)
-    slug        = models.SlugField(max_length=50, blank=True)
-    description = models.CharField(max_length=300)
-    multiple    = models.BooleanField(default=False)
-    # Denormalised data
-    awarded_count = models.PositiveIntegerField(default=0)
-
-    class Meta:
-        db_table = u'badge'
-        ordering = ('name',)
-        unique_together = ('name', 'type')
-
-    def __unicode__(self):
-        return u'%s: %s' % (self.get_type_display(), self.name)
-
-    def save(self, **kwargs):
-        if not self.slug:
-            self.slug = self.name#slugify(self.name)
-        super(Badge, self).save(**kwargs)
-
-    def get_absolute_url(self):
-        return '%s%s/' % (reverse('badge', args=[self.id]), self.slug)
-
-class Award(models.Model):
-    """The awarding of a Badge to a User."""
-    user       = models.ForeignKey(User, related_name='award_user')
-    badge      = models.ForeignKey(Badge, related_name='award_badge')
-    content_type   = models.ForeignKey(ContentType)
-    object_id      = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
-    awarded_at = models.DateTimeField(default=datetime.datetime.now)
-    notified   = models.BooleanField(default=False)
-    objects = AwardManager()
-    
-    def __unicode__(self):
-        return u'[%s] is awarded a badge [%s] at %s' % (self.user.username, self.badge.name, self.awarded_at)
-
-    class Meta:
-        db_table = u'award'
-
-class Repute(models.Model):
-    """The reputation histories for user"""
-    user     = models.ForeignKey(User)
-    positive = models.SmallIntegerField(default=0)
-    negative = models.SmallIntegerField(default=0)
-    question = models.ForeignKey(Question)
-    reputed_at = models.DateTimeField(default=datetime.datetime.now)
-    reputation_type = models.SmallIntegerField(choices=TYPE_REPUTATION)
-    reputation = models.IntegerField(default=1)
-    objects = ReputeManager()
-
-    def __unicode__(self):
-        return u'[%s]\' reputation changed at %s' % (self.user.username, self.reputed_at)
-
-    class Meta:
-        db_table = u'repute'
-
-class Activity(models.Model):
-    """
-    We keep some history data for user activities
-    """
-    user = models.ForeignKey(User)
-    activity_type = models.SmallIntegerField(choices=TYPE_ACTIVITY)
-    active_at = models.DateTimeField(default=datetime.datetime.now)
-    content_type   = models.ForeignKey(ContentType)
-    object_id      = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
-    is_auditted    = models.BooleanField(default=False)
-
-    def __unicode__(self):
-        return u'[%s] was active at %s' % (self.user.username, self.active_at)
-
-    class Meta:
-        db_table = u'activity'
-
-class Book(models.Model):
-    """
-    Model for book info
-    """
-    user = models.ForeignKey(User)
-    title = models.CharField(max_length=255)
-    short_name = models.CharField(max_length=255)
-    author = models.CharField(max_length=255)
-    price = models.DecimalField(max_digits=6, decimal_places=2)
-    pages = models.SmallIntegerField()
-    published_at = models.DateTimeField()
-    publication = models.CharField(max_length=255)
-    cover_img = models.CharField(max_length=255)
-    tagnames = models.CharField(max_length=125)
-    added_at = models.DateTimeField()
-    last_edited_at = models.DateTimeField()
-    questions = models.ManyToManyField(Question, related_name='book', db_table='book_question')
-    
-    def get_absolute_url(self):
-        return '%s' % reverse('book', args=[self.short_name])
-        
-    def __unicode__(self):
-        return self.title
-    class Meta:
-        db_table = u'book'
-
-class BookAuthorInfo(models.Model):
-    """
-    Model for book author info
-    """
-    user = models.ForeignKey(User)
-    book = models.ForeignKey(Book)
-    blog_url = models.CharField(max_length=255)
-    added_at = models.DateTimeField()
-    last_edited_at = models.DateTimeField()
-    
-    class Meta:
-        db_table = u'book_author_info'
-    
-class BookAuthorRss(models.Model):
-    """
-    Model for book author blog rss
-    """
-    user = models.ForeignKey(User)
-    book = models.ForeignKey(Book)
-    title = models.CharField(max_length=255)
-    url = models.CharField(max_length=255)
-    rss_created_at = models.DateTimeField()
-    added_at = models.DateTimeField()
-    
-    class Meta:
-        db_table = u'book_author_rss'
-
-# User extend properties
-QUESTIONS_PER_PAGE_CHOICES = (
-   (10, u'10'),
-   (30, u'30'),
-   (50, u'50'),
-)
-
-User.add_to_class('reputation', models.PositiveIntegerField(default=1))
-User.add_to_class('gravatar', models.CharField(max_length=32))
-User.add_to_class('favorite_questions',
-                  models.ManyToManyField(Question, through=FavoriteQuestion,
-                                         related_name='favorited_by'))
-User.add_to_class('badges', models.ManyToManyField(Badge, through=Award,
-                                                   related_name='awarded_to'))
-User.add_to_class('gold', models.SmallIntegerField(default=0))
-User.add_to_class('silver', models.SmallIntegerField(default=0))
-User.add_to_class('bronze', models.SmallIntegerField(default=0))
-User.add_to_class('questions_per_page',
-                  models.SmallIntegerField(choices=QUESTIONS_PER_PAGE_CHOICES, default=10))
-User.add_to_class('last_seen',
-                  models.DateTimeField(default=datetime.datetime.now))
-User.add_to_class('real_name', models.CharField(max_length=100, blank=True))
-User.add_to_class('website', models.URLField(max_length=200, blank=True))
-User.add_to_class('location', models.CharField(max_length=100, blank=True))
-User.add_to_class('date_of_birth', models.DateField(null=True, blank=True))
-User.add_to_class('about', models.TextField(blank=True))
-
-# custom signal
-tags_updated = django.dispatch.Signal(providing_args=["question"])
-edit_question_or_answer = django.dispatch.Signal(providing_args=["instance", "modified_by"])
-delete_post_or_answer = django.dispatch.Signal(providing_args=["instance", "deleted_by"])
-mark_offensive = django.dispatch.Signal(providing_args=["instance", "mark_by"])
-user_updated = django.dispatch.Signal(providing_args=["instance", "updated_by"])
-def get_messages(self):
-        messages = []
-        for m in self.message_set.all():
-            messages.append(m.message)
-        return messages
-
-def delete_messages(self):
-    self.message_set.all().delete()
-
-def get_profile_url(self):
-    """Returns the URL for this User's profile."""
-    return '%s%s/' % (reverse('user', args=[self.id]), self.username)
-User.add_to_class('get_profile_url', get_profile_url)
-User.add_to_class('get_messages', get_messages)
-User.add_to_class('delete_messages', delete_messages)
-
-def calculate_gravatar_hash(instance, **kwargs):
-    """Calculates a User's gravatar hash from their email address."""
-    if kwargs.get('raw', False):
-        return
-    instance.gravatar = hashlib.md5(instance.email).hexdigest()
-
-def record_ask_event(instance, created, **kwargs):
-    if created:
-        activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ASK_QUESTION)
-        activity.save()
-
-def record_answer_event(instance, created, **kwargs):
-    if created:
-        activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ANSWER)
-        activity.save()
-
-def record_comment_event(instance, created, **kwargs):
-    if created:
-        from django.contrib.contenttypes.models import ContentType
-        question_type = ContentType.objects.get_for_model(Question)
-        question_type_id = question_type.id
-        #python 2.4 issues - Adolfo Fitoria
-        #type = TYPE_ACTIVITY_COMMENT_QUESTION if instance.content_type_id == question_type_id else TYPE_ACTIVITY_COMMENT_ANSWER
-        if (instance.content_type_id == question_type_id):
-            type = TYPE_ACTIVITY_COMMENT_QUESTION
-        else:
-            type = TYPE_ACTIVITY_COMMENT_ANSWER
-        activity = Activity(user=instance.user, active_at=instance.added_at, content_object=instance, activity_type=type)
-        activity.save()
-
-def record_revision_question_event(instance, created, **kwargs):
-    if created and instance.revision <> 1:
-        activity = Activity(user=instance.author, active_at=instance.revised_at, content_object=instance, activity_type=TYPE_ACTIVITY_UPDATE_QUESTION)
-        activity.save()
-
-def record_revision_answer_event(instance, created, **kwargs):
-    if created and instance.revision <> 1:
-        activity = Activity(user=instance.author, active_at=instance.revised_at, content_object=instance, activity_type=TYPE_ACTIVITY_UPDATE_ANSWER)
-        activity.save()
-
-def record_award_event(instance, created, **kwargs):
-    """
-    After we awarded a badge to user, we need to record this activity and notify user.
-    We also recaculate awarded_count of this badge and user information.
-    """
-    if created:
-        activity = Activity(user=instance.user, active_at=instance.awarded_at, content_object=instance,
-            activity_type=TYPE_ACTIVITY_PRIZE)
-        activity.save()
-
-        instance.badge.awarded_count += 1
-        instance.badge.save()
-
-        if instance.badge.type == Badge.GOLD:
-            instance.user.gold += 1
-        if instance.badge.type == Badge.SILVER:
-            instance.user.silver += 1
-        if instance.badge.type == Badge.BRONZE:
-            instance.user.bronze += 1
-        instance.user.save()
-
-def notify_award_message(instance, created, **kwargs):
-    """
-    Notify users when they have been awarded badges by using Django message.
-    """
-    if created:
-        user = instance.user
-        user.message_set.create(message=u"%s" % instance.badge.name)
-
-def record_answer_accepted(instance, created, **kwargs):
-    """
-    when answer is accepted, we record this for question author - who accepted it.
-    """
-    if not created and instance.accepted:
-        activity = Activity(user=instance.question.author, active_at=datetime.datetime.now(), \
-            content_object=instance, activity_type=TYPE_ACTIVITY_MARK_ANSWER)
-        activity.save()
-
-def update_last_seen(instance, created, **kwargs):
-    """
-    when user has activities, we update 'last_seen' time stamp for him
-    """
-    user = instance.user
-    user.last_seen = datetime.datetime.now()
-    user.save()
-
-def record_vote(instance, created, **kwargs):
-    """
-    when user have voted
-    """
-    if created:
-        if instance.vote == 1:
-            vote_type = TYPE_ACTIVITY_VOTE_UP
-        else:
-            vote_type = TYPE_ACTIVITY_VOTE_DOWN
-
-        activity = Activity(user=instance.user, active_at=instance.voted_at, content_object=instance, activity_type=vote_type)
-        activity.save()
-
-def record_cancel_vote(instance, **kwargs):
-    """
-    when user canceled vote, the vote will be deleted.
-    """
-    activity = Activity(user=instance.user, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_CANCEL_VOTE)
-    activity.save()
-
-def record_delete_question(instance, delete_by, **kwargs):
-    """
-    when user deleted the question
-    """
-    if instance.__class__ == "Question":
-        activity_type = TYPE_ACTIVITY_DELETE_QUESTION
-    else:
-        activity_type = TYPE_ACTIVITY_DELETE_ANSWER
-
-    activity = Activity(user=delete_by, active_at=datetime.datetime.now(), content_object=instance, activity_type=activity_type)
-    activity.save()
-
-def record_mark_offensive(instance, mark_by, **kwargs):
-    activity = Activity(user=mark_by, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_MARK_OFFENSIVE)
-    activity.save()
-
-def record_update_tags(question, **kwargs):
-    """
-    when user updated tags of the question
-    """
-    activity = Activity(user=question.author, active_at=datetime.datetime.now(), content_object=question, activity_type=TYPE_ACTIVITY_UPDATE_TAGS)
-    activity.save()
-
-def record_favorite_question(instance, created, **kwargs):
-    """
-    when user add the question in him favorite questions list.
-    """
-    if created:
-        activity = Activity(user=instance.user, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_FAVORITE)
-        activity.save()
-
-def record_user_full_updated(instance, **kwargs):
-    activity = Activity(user=instance, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_USER_FULL_UPDATED)
-    activity.save()
-
-#signal for User modle save changes
-pre_save.connect(calculate_gravatar_hash, sender=User)
-post_save.connect(record_ask_event, sender=Question)
-post_save.connect(record_answer_event, sender=Answer)
-post_save.connect(record_comment_event, sender=Comment)
-post_save.connect(record_revision_question_event, sender=QuestionRevision)
-post_save.connect(record_revision_answer_event, sender=AnswerRevision)
-post_save.connect(record_award_event, sender=Award)
-post_save.connect(notify_award_message, sender=Award)
-post_save.connect(record_answer_accepted, sender=Answer)
-post_save.connect(update_last_seen, sender=Activity)
-post_save.connect(record_vote, sender=Vote)
-post_delete.connect(record_cancel_vote, sender=Vote)
-delete_post_or_answer.connect(record_delete_question, sender=Question)
-delete_post_or_answer.connect(record_delete_question, sender=Answer)
-mark_offensive.connect(record_mark_offensive, sender=Question)
-mark_offensive.connect(record_mark_offensive, sender=Answer)
-tags_updated.connect(record_update_tags, sender=Question)
-post_save.connect(record_favorite_question, sender=FavoriteQuestion)
-user_updated.connect(record_user_full_updated, sender=User)
-=======
-# encoding:utf-8
+# encoding:utf-8
 import datetime
 import hashlib
 from urllib import quote_plus, urlencode
@@ -884,8 +221,11 @@ class Question(models.Model):
         new_answers = []
         answer_comments = []
         modified_answers = []
+        commented_answers = []
+        import sets
+        commented_answers = sets.Set([])
         for answer in self.answers.all():
-            if (answer.added_at > last_reported_at):
+            if (answer.added_at > last_reported_at and answer.author.email != recipient_email):
                 new_answers.append(answer)
             if (answer.last_edited_at 
                 and answer.last_edited_at > last_reported_at 
@@ -893,9 +233,11 @@ class Question(models.Model):
                 modified_answers.append(answer)
             for comment in answer.comments.all():
                 if comment.added_at > last_reported_at and comment.user.email != recipient_email:
+                    commented_answers.add(answer)
                     answer_comments.append(comment)
+
+        #create the report
         if edited or comments or new_answers or modified_answers or answer_comments:
-            import sets
             out = [] 
             if edited:
                 out.append(_('%(author)s modified the question') % {'author':self.last_edited_by.username})
@@ -911,10 +253,10 @@ class Question(models.Model):
             if answer_comments:
                 names = sets.Set(map(lambda x: x.user.username,answer_comments))
                 people = ', '.join(names)
-                if len(answer_comments) > 1:
+                if len(commented_answers) > 1:
                     out.append(_('%(people)s commented answers') % {'people':people})
                 else:
-                    out.append(_('%(people)s commented the answer') % {'people':people})
+                    out.append(_('%(people)s commented an answer') % {'people':people})
             url = settings.APP_URL + self.get_absolute_url()
             retval = '<a href="%s">%s</a>:<br>\n' % (url,self.title)
             out = map(lambda x: '<li>' + x + '</li>',out)
diff --git a/forum/views.py b/forum/views.py
index cf909273..6ef7bd6d 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1,1968 +1,3 @@
-# encoding:utf-8
-import os.path
-import time, datetime, calendar, random
-import logging
-from urllib import quote, unquote
-from django.conf import settings
-from django.core.files.storage import default_storage
-from django.shortcuts import render_to_response, get_object_or_404
-from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseRedirect, HttpResponse,Http404
-from django.core.paginator import Paginator, EmptyPage, InvalidPage
-from django.template import RequestContext
-from django.utils.html import *
-from django.utils import simplejson
-from django.core import serializers
-from django.db import transaction
-from django.contrib.contenttypes.models import ContentType
-from django.utils.translation import ugettext as _
-
-from utils.html import sanitize_html
-from markdown2 import Markdown
-#from lxml.html.diff import htmldiff
-from forum.diff import textDiff as htmldiff
-from forum.forms import *
-from forum.models import *
-from forum.auth import *
-from forum.const import *
-from forum.user import *
-from forum import auth
-
-# used in index page
-INDEX_PAGE_SIZE = 20
-INDEX_AWARD_SIZE = 15
-INDEX_TAGS_SIZE = 100
-# used in tags list
-DEFAULT_PAGE_SIZE = 60
-# used in questions
-QUESTIONS_PAGE_SIZE = 10
-# used in users
-USERS_PAGE_SIZE = 35
-# used in answers
-ANSWERS_PAGE_SIZE = 10
-markdowner = Markdown(html4tags=True)
-question_type = ContentType.objects.get_for_model(Question)
-answer_type = ContentType.objects.get_for_model(Answer)
-comment_type = ContentType.objects.get_for_model(Comment)
-question_revision_type = ContentType.objects.get_for_model(QuestionRevision)
-answer_revision_type = ContentType.objects.get_for_model(AnswerRevision)
-repute_type =ContentType.objects.get_for_model(Repute)
-question_type_id = question_type.id
-answer_type_id = answer_type.id
-comment_type_id = comment_type.id
-question_revision_type_id = question_revision_type.id
-answer_revision_type_id = answer_revision_type.id
-repute_type_id = repute_type.id
-def _get_tags_cache_json():
-    tags = Tag.objects.filter(deleted=False).all()
-    tags_list = []
-    for tag in tags:
-        dic = {'n': tag.name, 'c': tag.used_count }
-        tags_list.append(dic)
-    tags = simplejson.dumps(tags_list)
-    return tags
-
-def index(request):
-    view_id = request.GET.get('sort', None)
-    view_dic = {
-             "latest":"-last_activity_at",
-             "hottest":"-answer_count",
-             "mostvoted":"-score",
-             "trans": "-last_activity_at"
-             }
-    try:
-        orderby = view_dic[view_id]
-    except KeyError:
-        view_id = "latest"
-        orderby = "-last_activity_at"
-    # group questions by author_id of 28,29
-    if view_id == 'trans':
-        questions = Question.objects.get_translation_questions(orderby, INDEX_PAGE_SIZE)
-    else:
-        questions = Question.objects.get_questions_by_pagesize(orderby, INDEX_PAGE_SIZE)
-    # RISK - inner join queries
-    questions = questions.select_related()
-    tags = Tag.objects.get_valid_tags(INDEX_TAGS_SIZE)
-
-    awards = Award.objects.get_recent_awards()
-
-    return render_to_response('index.html', {
-        "questions" : questions,
-        "tab_id" : view_id,
-        "tags" : tags,
-        "awards" : awards[:INDEX_AWARD_SIZE],
-        }, context_instance=RequestContext(request))
-
-def about(request):
-    return render_to_response('about.html', context_instance=RequestContext(request))
-
-def faq(request):
-    return render_to_response('faq.html', context_instance=RequestContext(request))
-
-def privacy(request):
-    return render_to_response('privacy.html', context_instance=RequestContext(request))
-
-def unanswered(request):
-    return questions(request, unanswered=True)
-
-def questions(request, tagname=None, unanswered=False):
-    """
-    List of Questions, Tagged questions, and Unanswered questions.
-    """
-    # template file
-    # "questions.html" or "unanswered.html"
-    template_file = "questions.html"
-    # Set flag to False by default. If it is equal to True, then need to be saved.
-    pagesize_changed = False
-    # get pagesize from session, if failed then get default value
-    pagesize = request.session.get("pagesize")
-    try:
-        page = int(request.GET.get('page', '1'))
-    except ValueError:
-        page = 1
-
-    view_id = request.GET.get('sort', None)
-    view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
-    try:
-        orderby = view_dic[view_id]
-    except KeyError:
-        view_id = "latest"
-        orderby = "-added_at"
-
-    # check if request is from tagged questions
-    if tagname is not None:
-        objects = Question.objects.get_questions_by_tag(tagname, orderby)
-    elif unanswered:
-        #check if request is from unanswered questions
-        template_file = "unanswered.html"
-        objects = Question.objects.get_unanswered_questions(orderby)
-    else:
-        objects = Question.objects.get_questions(orderby)
-
-    # RISK - inner join queries
-    objects = objects.select_related(depth=1);
-    objects_list = Paginator(objects, pagesize)
-    questions = objects_list.page(page)
-
-    # Get related tags from this page objects
-    if questions.object_list.count() > 0:
-        related_tags = Tag.objects.get_tags_by_questions(questions.object_list)
-    else:
-        related_tags = None
-    return render_to_response(template_file, {
-        "questions" : questions,
-        "tab_id" : view_id,
-        "questions_count" : objects_list.count,
-        "tags" : related_tags,
-        "searchtag" : tagname,
-        "is_unanswered" : unanswered,
-        "context" : {
-            'is_paginated' : True,
-            'pages': objects_list.num_pages,
-            'page': page,
-            'has_previous': questions.has_previous(),
-            'has_next': questions.has_next(),
-            'previous': questions.previous_page_number(),
-            'next': questions.next_page_number(),
-            'base_url' : request.path + '?sort=%s&' % view_id,
-            'pagesize' : pagesize
-        }}, context_instance=RequestContext(request))
-
-#TODO: allow anynomus user to ask question by providing email and username.
-@login_required
-def ask(request):
-    if request.method == "POST":
-        form = AskForm(request.POST)
-        if form.is_valid():
-            added_at = datetime.datetime.now()
-            html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
-            question = Question(
-                title            = strip_tags(form.cleaned_data['title']),
-                author           = request.user,
-                added_at         = added_at,
-                last_activity_at = added_at,
-                last_activity_by = request.user,
-                wiki             = form.cleaned_data['wiki'],
-                tagnames         = form.cleaned_data['tags'].strip(),
-                html             = html,
-                summary          = strip_tags(html)[:120]
-            )
-            if question.wiki:
-                question.last_edited_by = question.author
-                question.last_edited_at = added_at
-                question.wikified_at = added_at
-
-            question.save()
-
-            # create the first revision
-            QuestionRevision.objects.create(
-                question   = question,
-                revision   = 1,
-                title      = question.title,
-                author     = request.user,
-                revised_at = added_at,
-                tagnames   = question.tagnames,
-                summary    = CONST['default_version'],
-                text       = form.cleaned_data['text']
-            )
-
-            return HttpResponseRedirect(question.get_absolute_url())
-
-    else:
-        form = AskForm()
-
-    tags = _get_tags_cache_json()
-    return render_to_response('ask.html', {
-        'form' : form,
-        'tags' : tags,
-        }, context_instance=RequestContext(request))
-
-def question(request, id):
-    try:
-        page = int(request.GET.get('page', '1'))
-    except ValueError:
-        page = 1
-    view_id = request.GET.get('sort', 'votes')
-    view_dic = {"latest":"-added_at", "oldest":"added_at", "votes":"-score" }
-    try:
-        orderby = view_dic[view_id]
-    except KeyError:
-        view_id = "votes"
-        orderby = "-score"
-
-    question = get_object_or_404(Question, id=id)
-    if question.deleted and not can_view_deleted_post(request.user, question):
-        raise Http404
-    answer_form = AnswerForm(question)
-    answers = Answer.objects.get_answers_from_question(question, request.user)
-    answers = answers.select_related(depth=1)
-
-    favorited = question.has_favorite_by_user(request.user)
-    question_vote = question.votes.select_related().filter(user=request.user)
-    if question_vote is not None and question_vote.count() > 0:
-        question_vote = question_vote[0]
-
-    user_answer_votes = {}
-    for answer in answers:
-        vote = answer.get_user_vote(request.user)
-        if vote is not None and not user_answer_votes.has_key(answer.id):
-            vote_value = -1
-            if vote.is_upvote():
-                vote_value = 1
-            user_answer_votes[answer.id] = vote_value
-
-
-    if answers is not None:
-        answers = answers.order_by("-accepted", orderby)
-    objects_list = Paginator(answers, ANSWERS_PAGE_SIZE)
-    page_objects = objects_list.page(page)
-    # update view count
-    Question.objects.update_view_count(question)
-    return render_to_response('question.html', {
-        "question" : question,
-        "question_vote" : question_vote,
-        "question_comment_count":question.comments.count(),
-        "answer" : answer_form,
-        "answers" : page_objects.object_list,
-        "user_answer_votes": user_answer_votes,
-        "tags" : question.tags.all(),
-        "tab_id" : view_id,
-        "favorited" : favorited,
-        "similar_questions" : Question.objects.get_similar_questions(question),
-        "context" : {
-            'is_paginated' : True,
-            'pages': objects_list.num_pages,
-            'page': page,
-            'has_previous': page_objects.has_previous(),
-            'has_next': page_objects.has_next(),
-            'previous': page_objects.previous_page_number(),
-            'next': page_objects.next_page_number(),
-            'base_url' : request.path + '?sort=%s&' % view_id,
-            'extend_url' : "#sort-top"
-        }
-        }, context_instance=RequestContext(request))
-
-@login_required
-def close(request, id):
-    question = get_object_or_404(Question, id=id)
-    if not can_close_question(request.user, question):
-        return HttpResponse('Permission denied.')
-    if request.method == 'POST':
-        form = CloseForm(request.POST)
-        if form.is_valid():
-            reason = form.cleaned_data['reason']
-            question.closed = True
-            question.closed_by = request.user
-            question.closed_at = datetime.datetime.now()
-            question.close_reason = reason
-            question.save()
-        return HttpResponseRedirect(question.get_absolute_url())
-    else:
-        form = CloseForm()
-        return render_to_response('close.html', {
-            'form' : form,
-            'question' : question,
-            }, context_instance=RequestContext(request))
-
-@login_required
-def reopen(request, id):
-    question = get_object_or_404(Question, id=id)
-    # open question
-    if not can_reopen_question(request.user, question):
-        return HttpResponse('Permission denied.')
-    if request.method == 'POST' :
-        Question.objects.filter(id=question.id).update(closed=False,
-            closed_by=None, closed_at=None, close_reason=None)
-        return HttpResponseRedirect(question.get_absolute_url())
-    else:
-        return render_to_response('reopen.html', {
-            'question' : question,
-            }, context_instance=RequestContext(request))
-
-@login_required
-def edit_question(request, id):
-    question = get_object_or_404(Question, id=id)
-    if question.deleted and not can_view_deleted_post(request.user, question):
-        raise Http404
-    if can_edit_post(request.user, question):
-        return _edit_question(request, question)
-    elif can_retag_questions(request.user):
-        return _retag_question(request, question)
-    else:
-        raise Http404
-
-def _retag_question(request, question):
-    if request.method == 'POST':
-        form = RetagQuestionForm(question, request.POST)
-        if form.is_valid():
-            if form.has_changed():
-                latest_revision = question.get_latest_revision()
-                retagged_at = datetime.datetime.now()
-                # Update the Question itself
-                Question.objects.filter(id=question.id).update(
-                    tagnames         = form.cleaned_data['tags'],
-                    last_edited_at   = retagged_at,
-                    last_edited_by   = request.user,
-                    last_activity_at = retagged_at,
-                    last_activity_by = request.user
-                )
-                # Update the Question's tag associations
-                tags_updated = Question.objects.update_tags(question,
-                    form.cleaned_data['tags'], request.user)
-                # Create a new revision
-                QuestionRevision.objects.create(
-                    question   = question,
-                    title      = latest_revision.title,
-                    author     = request.user,
-                    revised_at = retagged_at,
-                    tagnames   = form.cleaned_data['tags'],
-                    summary    = CONST['retagged'],
-                    text       = latest_revision.text
-                )
-                # send tags updated singal
-                tags_updated.send(sender=question.__class__, question=question)
-
-            return HttpResponseRedirect(question.get_absolute_url())
-    else:
-        form = RetagQuestionForm(question)
-    return render_to_response('question_retag.html', {
-        'question': question,
-        'form' : form,
-        'tags' : _get_tags_cache_json(),
-    }, context_instance=RequestContext(request))
-
-
-def _edit_question(request, question):
-    latest_revision = question.get_latest_revision()
-    revision_form = None
-    if request.method == 'POST':
-        if 'select_revision' in request.POST:
-            # user has changed revistion number
-            revision_form = RevisionForm(question, latest_revision, request.POST)
-            if revision_form.is_valid():
-                # Replace with those from the selected revision
-                form = EditQuestionForm(question,
-                    QuestionRevision.objects.get(question=question,
-                        revision=revision_form.cleaned_data['revision']))
-            else:
-                form = EditQuestionForm(question, latest_revision, request.POST)
-        else:
-            # Always check modifications against the latest revision
-            form = EditQuestionForm(question, latest_revision, request.POST)
-            if form.is_valid():
-                html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
-                if form.has_changed():
-                    edited_at = datetime.datetime.now()
-                    tags_changed = (latest_revision.tagnames !=
-                                    form.cleaned_data['tags'])
-                    tags_updated = False
-                    # Update the Question itself
-                    updated_fields = {
-                        'title': form.cleaned_data['title'],
-                        'last_edited_at': edited_at,
-                        'last_edited_by': request.user,
-                        'last_activity_at': edited_at,
-                        'last_activity_by': request.user,
-                        'tagnames': form.cleaned_data['tags'],
-                        'summary': strip_tags(html)[:120],
-                        'html': html,
-                    }
-
-                    # only save when it's checked
-                    # because wiki doesn't allow to be edited if last version has been enabled already
-                    # and we make sure this in forms.
-                    if ('wiki' in form.cleaned_data and
-                        form.cleaned_data['wiki']):
-                        updated_fields['wiki'] = True
-                        updated_fields['wikified_at'] = edited_at
-
-                    Question.objects.filter(
-                        id=question.id).update(**updated_fields)
-                    # Update the Question's tag associations
-                    if tags_changed:
-                        tags_updated = Question.objects.update_tags(
-                            question, form.cleaned_data['tags'], request.user)
-                    # Create a new revision
-                    revision = QuestionRevision(
-                        question   = question,
-                        title      = form.cleaned_data['title'],
-                        author     = request.user,
-                        revised_at = edited_at,
-                        tagnames   = form.cleaned_data['tags'],
-                        text       = form.cleaned_data['text'],
-                    )
-                    if form.cleaned_data['summary']:
-                        revision.summary = form.cleaned_data['summary']
-                    else:
-                        revision.summary = 'No.%s Revision' % latest_revision.revision
-                    revision.save()
-
-                return HttpResponseRedirect(question.get_absolute_url())
-    else:
-
-        revision_form = RevisionForm(question, latest_revision)
-        form = EditQuestionForm(question, latest_revision)
-    return render_to_response('question_edit.html', {
-        'question': question,
-        'revision_form': revision_form,
-        'form' : form,
-        'tags' : _get_tags_cache_json()
-    }, context_instance=RequestContext(request))
-
-
-@login_required
-def edit_answer(request, id):
-    answer = get_object_or_404(Answer, id=id)
-    if answer.deleted and not can_view_deleted_post(request.user, answer):
-        raise Http404
-    elif not can_edit_post(request.user, answer):
-        raise Http404
-    else:
-        latest_revision = answer.get_latest_revision()
-        if request.method == "POST":
-            if 'select_revision' in request.POST:
-                # user has changed revistion number
-                revision_form = RevisionForm(answer, latest_revision, request.POST)
-                if revision_form.is_valid():
-                    # Replace with those from the selected revision
-                    form = EditAnswerForm(answer,
-                        AnswerRevision.objects.get(answer=answer,
-                            revision=revision_form.cleaned_data['revision']))
-                else:
-                    form = EditAnswerForm(answer, latest_revision, request.POST)
-            else:
-                form = EditAnswerForm(answer, latest_revision, request.POST)
-                if form.is_valid():
-                    html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
-                    if form.has_changed():
-                        edited_at = datetime.datetime.now()
-                        updated_fields = {
-                            'last_edited_at': edited_at,
-                            'last_edited_by': request.user,
-                            'html': html,
-                        }
-                        Answer.objects.filter(id=answer.id).update(**updated_fields)
-
-                        revision = AnswerRevision(
-                            answer     = answer,
-                            author     = request.user,
-                            revised_at = edited_at,
-                            text       = form.cleaned_data['text']
-                        )
-
-                        if form.cleaned_data['summary']:
-                            revision.summary = form.cleaned_data['summary']
-                        else:
-                            revision.summary = 'No.%s Revision' % latest_revision.revision
-                        revision.save()
-
-                        answer.question.last_activity_at = edited_at
-                        answer.question.last_activity_by = request.user
-                        answer.question.save()
-
-                    return HttpResponseRedirect(answer.get_absolute_url())
-        else:
-            revision_form = RevisionForm(answer, latest_revision)
-            form = EditAnswerForm(answer, latest_revision)
-        return render_to_response('answer_edit.html', {
-        'answer': answer,
-        'revision_form': revision_form,
-        'form' : form,
-    }, context_instance=RequestContext(request))
-
-QUESTION_REVISION_TEMPLATE = ('<h1>%(title)s</h1>\n'
-    '<div class="text">%(html)s</div>\n'
-    '<div class="tags">%(tags)s</div>')
-def question_revisions(request, id):
-    post = get_object_or_404(Question, id=id)
-    revisions = list(post.revisions.all())
-    for i, revision in enumerate(revisions):
-        revision.html = QUESTION_REVISION_TEMPLATE % {
-            'title': revision.title,
-            'html': sanitize_html(markdowner.convert(revision.text)),
-            'tags': ' '.join(['<a class="post-tag">%s</a>' % tag
-                              for tag in revision.tagnames.split(' ')]),
-        }
-        if i > 0:
-            revisions[i - 1].diff = htmldiff(revision.html,
-                                             revisions[i - 1].html)
-        else:
-            revisions[i - 1].diff = QUESTION_REVISION_TEMPLATE % {
-                'title': revisions[0].title,
-                'html': sanitize_html(markdowner.convert(revisions[0].text)),
-                'tags': ' '.join(['<a class="post-tag">%s</a>' % tag
-                                  for tag in revisions[0].tagnames.split(' ')]),
-            }
-            revisions[i - 1].summary = None
-    return render_to_response('revisions_question.html', {
-        'post': post,
-        'revisions': revisions,
-    }, context_instance=RequestContext(request))
-
-ANSWER_REVISION_TEMPLATE = ('<div class="text">%(html)s</div>')
-def answer_revisions(request, id):
-    post = get_object_or_404(Answer, id=id)
-    revisions = list(post.revisions.all())
-    for i, revision in enumerate(revisions):
-        revision.html = ANSWER_REVISION_TEMPLATE % {
-            'html': sanitize_html(markdowner.convert(revision.text))
-        }
-        if i > 0:
-            revisions[i - 1].diff = htmldiff(revision.html,
-                                             revisions[i - 1].html)
-        else:
-            revisions[i - 1].diff = revisions[i-1].text
-            revisions[i - 1].summary = None
-    return render_to_response('revisions_answer.html', {
-        'post': post,
-        'revisions': revisions,
-    }, context_instance=RequestContext(request))
-
-#TODO: allow anynomus
-@login_required
-def answer(request, id):
-    question = get_object_or_404(Question, id=id)
-    if request.method == "POST":
-        form = AnswerForm(question, request.POST)
-        if form.is_valid():
-            update_time = datetime.datetime.now()
-            answer = Answer(
-                question = question,
-                author = request.user,
-                added_at = update_time,
-                wiki = form.cleaned_data['wiki'],
-                html = sanitize_html(markdowner.convert(form.cleaned_data['text'])),
-            )
-            if answer.wiki:
-                answer.last_edited_by = answer.author
-                answer.last_edited_at = update_time
-                answer.wikified_at = update_time
-
-            answer.save()
-            Question.objects.update_answer_count(question)
-
-            question = get_object_or_404(Question, id=id)
-            question.last_activity_at = update_time
-            question.last_activity_by = request.user
-            question.save()
-
-            AnswerRevision.objects.create(
-                answer     = answer,
-                revision   = 1,
-                author     = request.user,
-                revised_at = update_time,
-                summary    = CONST['default_version'],
-                text       = form.cleaned_data['text']
-            )
-
-    return HttpResponseRedirect(question.get_absolute_url())
-
-def tags(request):
-    stag = ""
-    is_paginated = True
-    sortby = request.GET.get('sort', 'used')
-    try:
-        page = int(request.GET.get('page', '1'))
-    except ValueError:
-        page = 1
-
-    if request.method == "GET":
-        stag = request.GET.get("q", "").strip()
-        if stag is not None:
-            objects_list = Paginator(Tag.objects.filter(deleted=False).exclude(used_count=0).extra(where=['name like %s'], params=['%' + stag + '%']), DEFAULT_PAGE_SIZE)
-        else:
-            if sortby == "name":
-                objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("name"), DEFAULT_PAGE_SIZE)
-            else:
-                objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-used_count"), DEFAULT_PAGE_SIZE)
-
-    try:
-        tags = objects_list.page(page)
-    except (EmptyPage, InvalidPage):
-        tags = objects_list.page(objects_list.num_pages)
-
-    return render_to_response('tags.html', {
-        "tags" : tags,
-        "stag" : stag,
-        "tab_id" : sortby,
-        "keywords" : stag,
-        "context" : {
-            'is_paginated' : is_paginated,
-            'pages': objects_list.num_pages,
-            'page': page,
-            'has_previous': tags.has_previous(),
-            'has_next': tags.has_next(),
-            'previous': tags.previous_page_number(),
-            'next': tags.next_page_number(),
-            'base_url' : '/tags/?sort=%s&' % sortby
-        }
-
-        }, context_instance=RequestContext(request))
-
-def tag(request, tag):
-    return questions(request, tagname=tag)
-
-def vote(request, id):
-    """
-    vote_type:
-        acceptAnswer : 0,
-        questionUpVote : 1,
-        questionDownVote : 2,
-        favorite : 4,
-        answerUpVote: 5,
-        answerDownVote:6,
-        offensiveQuestion : 7,
-        offensiveAnswer:8,
-        removeQuestion: 9,
-        removeAnswer:10
-
-    accept answer code:
-        response_data['allowed'] = -1, Accept his own answer   0, no allowed - Anonymous    1, Allowed - by default
-        response_data['success'] =  0, failed                                               1, Success - by default
-        response_data['status']  =  0, By default                                           1, Answer has been accepted already(Cancel)
-
-    vote code:
-        allowed = -3, Don't have enough votes left
-                  -2, Don't have enough reputation score
-                  -1, Vote his own post
-                   0, no allowed - Anonymous
-                   1, Allowed - by default
-        status  =  0, By default
-                   1, Cancel
-                   2, Vote is too old to be canceled
-
-    offensive code:
-        allowed = -3, Don't have enough flags left
-                  -2, Don't have enough reputation score to do this
-                   0, not allowed
-                   1, allowed
-        status  =  0, by default
-                   1, can't do it again
-    """
-    response_data = {
-        "allowed": 1,
-        "success": 1,
-        "status" : 0,
-        "count"  : 0,
-        "message" : ''
-    }
-
-    def can_vote(vote_score, user):
-        if vote_score == 1:
-            return can_vote_up(request.user)
-        else:
-            return can_vote_down(request.user)
-
-    try:
-        if not request.user.is_authenticated():
-            response_data['allowed'] = 0
-            response_data['success'] = 0
-
-        elif request.is_ajax():
-            question = get_object_or_404(Question, id=id)
-            vote_type = request.POST.get('type')
-
-            #accept answer
-            if vote_type == '0':
-                answer_id = request.POST.get('postId')
-                answer = get_object_or_404(Answer, id=answer_id)
-                # make sure question author is current user
-                if question.author == request.user:
-                    # answer user who is also question author is not allow to accept answer
-                    if answer.author == question.author:
-                        response_data['success'] = 0
-                        response_data['allowed'] = -1
-                    # check if answer has been accepted already
-                    elif answer.accepted:
-                        onAnswerAcceptCanceled(answer, request.user)
-                        response_data['status'] = 1
-                    else:
-                        # set other answers in this question not accepted first
-                        for answer_of_question in Answer.objects.get_answers_from_question(question, request.user):
-                            if answer_of_question != answer and answer_of_question.accepted:
-                                onAnswerAcceptCanceled(answer_of_question, request.user)
-
-                        #make sure retrieve data again after above author changes, they may have related data
-                        answer = get_object_or_404(Answer, id=answer_id)
-                        onAnswerAccept(answer, request.user)
-                else:
-                    response_data['allowed'] = 0
-                    response_data['success'] = 0
-            # favorite
-            elif vote_type == '4':
-                has_favorited = False
-                fav_questions = FavoriteQuestion.objects.filter(question=question)
-                # if the same question has been favorited before, then delete it
-                if fav_questions is not None:
-                    for item in fav_questions:
-                        if item.user == request.user:
-                            item.delete()
-                            response_data['status'] = 1
-                            response_data['count']  = len(fav_questions) - 1
-                            if response_data['count'] < 0:
-                                response_data['count'] = 0
-                            has_favorited = True
-                # if above deletion has not been executed, just insert a new favorite question
-                if not has_favorited:
-                    new_item = FavoriteQuestion(question=question, user=request.user)
-                    new_item.save()
-                    response_data['count']  = FavoriteQuestion.objects.filter(question=question).count()
-                Question.objects.update_favorite_count(question)
-
-            elif vote_type in ['1', '2', '5', '6']:
-                post_id = id
-                post = question
-                vote_score = 1
-                if vote_type in ['5', '6']:
-                    answer_id = request.POST.get('postId')
-                    answer = get_object_or_404(Answer, id=answer_id)
-                    post_id = answer_id
-                    post = answer
-                if vote_type in ['2', '6']:
-                    vote_score = -1
-
-                if post.author == request.user:
-                    response_data['allowed'] = -1
-                elif not can_vote(vote_score, request.user):
-                    response_data['allowed'] = -2
-                elif post.votes.filter(user=request.user).count() > 0:
-                    vote = post.votes.filter(user=request.user)[0]
-                    # unvote should be less than certain time
-                    if (datetime.datetime.now().day - vote.voted_at.day) >= VOTE_RULES['scope_deny_unvote_days']:
-                        response_data['status'] = 2
-                    else:
-                        voted = vote.vote
-                        if voted > 0:
-                            # cancel upvote
-                            onUpVotedCanceled(vote, post, request.user)
-
-                        else:
-                            # cancel downvote
-                            onDownVotedCanceled(vote, post, request.user)
-
-                        response_data['status'] = 1
-                        response_data['count'] = post.score
-                elif Vote.objects.get_votes_count_today_from_user(request.user) >= VOTE_RULES['scope_votes_per_user_per_day']:
-                    response_data['allowed'] = -3
-                else:
-                    vote = Vote(user=request.user, content_object=post, vote=vote_score, voted_at=datetime.datetime.now())
-                    if vote_score > 0:
-                        # upvote
-                        onUpVoted(vote, post, request.user)
-                    else:
-                        # downvote
-                        onDownVoted(vote, post, request.user)
-
-                    votes_left = VOTE_RULES['scope_votes_per_user_per_day'] - Vote.objects.get_votes_count_today_from_user(request.user)
-                    if votes_left <= VOTE_RULES['scope_warn_votes_left']:
-                        response_data['message'] = u'%s votes left' % votes_left
-                    response_data['count'] = post.score
-            elif vote_type in ['7', '8']:
-                post = question
-                post_id = id
-                if vote_type == '8':
-                    post_id = request.POST.get('postId')
-                    post = get_object_or_404(Answer, id=post_id)
-
-                if FlaggedItem.objects.get_flagged_items_count_today(request.user) >= VOTE_RULES['scope_flags_per_user_per_day']:
-                    response_data['allowed'] = -3
-                elif not can_flag_offensive(request.user):
-                    response_data['allowed'] = -2
-                elif post.flagged_items.filter(user=request.user).count() > 0:
-                    response_data['status'] = 1
-                else:
-                    item = FlaggedItem(user=request.user, content_object=post, flagged_at=datetime.datetime.now())
-                    onFlaggedItem(item, post, request.user)
-                    response_data['count'] = post.offensive_flag_count
-                    # send signal when question or answer be marked offensive
-                    mark_offensive.send(sender=post.__class__, instance=post, mark_by=request.user)
-            elif vote_type in ['9', '10']:
-                post = question
-                post_id = id
-                if vote_type == '10':
-                    post_id = request.POST.get('postId')
-                    post = get_object_or_404(Answer, id=post_id)
-
-                if not can_delete_post(request.user, post):
-                    response_data['allowed'] = -2
-                elif post.deleted:
-                    onDeleteCanceled(post, request.user)
-                    response_data['status'] = 1
-                else:
-                    onDeleted(post, request.user)
-                    delete_post_or_answer.send(sender=post.__class__, instance=post, delete_by=request.user)
-        else:
-            response_data['success'] = 0
-            response_data['message'] = u'Request mode is not supported. Please try again.'
-
-        data = simplejson.dumps(response_data)
-
-    except Exception, e:
-        response_data['message'] = str(e)
-        data = simplejson.dumps(response_data)
-    return HttpResponse(data, mimetype="application/json")
-
-def users(request):
-    is_paginated = True
-    sortby = request.GET.get('sort', 'reputation')
-    suser = request.REQUEST.get('q',  "")
-    try:
-        page = int(request.GET.get('page', '1'))
-    except ValueError:
-        page = 1
-
-    if suser == "":
-        if sortby == "newest":
-            objects_list = Paginator(User.objects.all().order_by('-date_joined'), USERS_PAGE_SIZE)
-        elif sortby == "last":
-            objects_list = Paginator(User.objects.all().order_by('date_joined'), USERS_PAGE_SIZE)
-        elif sortby == "user":
-            objects_list = Paginator(User.objects.all().order_by('username'), USERS_PAGE_SIZE)
-        # default
-        else:
-            objects_list = Paginator(User.objects.all().order_by('-reputation'), USERS_PAGE_SIZE)
-        base_url = '/users/?sort=%s&' % sortby
-    else:
-        sortby = "reputation"
-        objects_list = Paginator(User.objects.extra(where=['username like %s'], params=['%' + suser + '%']).order_by('-reputation'), USERS_PAGE_SIZE)
-        base_url = '/users/?name=%s&sort=%s&' % (suser, sortby)
-
-    try:
-        users = objects_list.page(page)
-    except (EmptyPage, InvalidPage):
-        users = objects_list.page(objects_list.num_pages)
-
-    return render_to_response('users.html', {
-        "users" : users,
-        "suser" : suser,
-        "keywords" : suser,
-        "tab_id" : sortby,
-        "context" : {
-            'is_paginated' : is_paginated,
-            'pages': objects_list.num_pages,
-            'page': page,
-            'has_previous': users.has_previous(),
-            'has_next': users.has_next(),
-            'previous': users.previous_page_number(),
-            'next': users.next_page_number(),
-            'base_url' : base_url
-        }
-
-        }, context_instance=RequestContext(request))
-
-def user(request, id):
-    sort = request.GET.get('sort', 'stats')
-    user_view = dict((v.id, v) for v in USER_TEMPLATE_VIEWS).get(sort, USER_TEMPLATE_VIEWS[0])
-    from forum import views
-    func = getattr(views, user_view.view_name)
-    return func(request, id, user_view)
-
-@login_required
-def edit_user(request, id):
-    user = get_object_or_404(User, id=id)
-    if request.user != user:
-        raise Http404
-    if request.method == "POST":
-        form = EditUserForm(user, request.POST)
-        if form.is_valid():
-            user.email = sanitize_html(form.cleaned_data['email'])
-            user.real_name = sanitize_html(form.cleaned_data['realname'])
-            user.website = sanitize_html(form.cleaned_data['website'])
-            user.location = sanitize_html(form.cleaned_data['city'])
-            user.date_of_birth = sanitize_html(form.cleaned_data['birthday'])
-            if len(user.date_of_birth) == 0:
-                user.date_of_birth = '1900-01-01'
-            user.about = sanitize_html(form.cleaned_data['about'])
-
-            user.save()
-            # send user updated singal if full fields have been updated
-            if user.email and user.real_name and user.website and user.location and \
-                user.date_of_birth and user.about:
-                user_updated.send(sender=user.__class__, instance=user, updated_by=user)
-            return HttpResponseRedirect(user.get_profile_url())
-    else:
-        form = EditUserForm(user)
-    return render_to_response('user_edit.html', {
-        'form' : form,
-    }, context_instance=RequestContext(request))
-
-def user_stats(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
-    questions = Question.objects.extra(
-        select={
-            'vote_count' : 'question.score',
-            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s AND f.question_id = question.id',
-            'la_user_id' : 'auth_user.id',
-            'la_username' : 'auth_user.username',
-            'la_user_gold' : 'auth_user.gold',
-            'la_user_silver' : 'auth_user.silver',
-            'la_user_bronze' : 'auth_user.bronze',
-            'la_user_reputation' : 'auth_user.reputation'
-            },
-        select_params=[user_id],
-        tables=['question', 'auth_user'],
-        where=['question.deleted = 0 AND question.author_id=%s AND question.last_activity_by_id = auth_user.id'],
-        params=[user_id],
-        order_by=['-vote_count', '-last_activity_at']
-    ).values('vote_count',
-             'favorited_myself',
-             'id',
-             'title',
-             'author_id',
-             'added_at',
-             'answer_accepted',
-             'answer_count',
-             'comment_count',
-             'view_count',
-             'favourite_count',
-             'summary',
-             'tagnames',
-             'vote_up_count',
-             'vote_down_count',
-             'last_activity_at',
-             'la_user_id',
-             'la_username',
-             'la_user_gold',
-             'la_user_silver',
-             'la_user_bronze',
-             'la_user_reputation')[:100]
-
-    answered_questions = Question.objects.extra(
-        select={
-            'vote_up_count' : 'answer.vote_up_count',
-            'vote_down_count' : 'answer.vote_down_count',
-            'answer_id' : 'answer.id',
-            'accepted' : 'answer.accepted',
-            'vote_count' : 'answer.score',
-            'comment_count' : 'answer.comment_count'
-            },
-        tables=['question', 'answer'],
-        where=['answer.deleted=0 AND answer.author_id=%s AND answer.question_id=question.id'],
-        params=[user_id],
-        order_by=['-vote_count', '-answer_id'],
-        select_params=[user_id]
-    ).distinct().values('comment_count',
-                        'id',
-                        'answer_id',
-                        'title',
-                        'author_id',
-                        'accepted',
-                        'vote_count',
-                        'answer_count',
-                        'vote_up_count',
-                        'vote_down_count')[:100]
-    up_votes = Vote.objects.get_up_vote_count_from_user(user)
-    down_votes = Vote.objects.get_down_vote_count_from_user(user)
-    votes_today = Vote.objects.get_votes_count_today_from_user(user)
-    votes_total = VOTE_RULES['scope_votes_per_user_per_day']
-    tags = user.created_tags.all().order_by('-used_count')[:50]
-    awards = Award.objects.extra(
-        select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
-        tables=['award', 'badge'],
-        order_by=['-awarded_at'],
-        where=['user_id=%s AND badge_id=badge.id'],
-        params=[user.id]
-    ).values('id', 'count', 'name', 'description', 'type')
-    total_awards = awards.count()
-    awards.query.group_by = ['badge_id']
-
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "questions" : questions,
-        "answered_questions" : answered_questions,
-        "up_votes" : up_votes,
-        "down_votes" : down_votes,
-        "total_votes": up_votes + down_votes,
-        "votes_today_left": votes_total-votes_today,
-        "votes_total_per_day": votes_total,
-        "tags" : tags,
-        "awards": awards,
-        "total_awards" : total_awards,
-    }, context_instance=RequestContext(request))
-
-def user_recent(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
-    def get_type_name(type_id):
-        for item in TYPE_ACTIVITY:
-            if type_id in item:
-                return item[1]
-
-    class Event:
-        def __init__(self, time, type, title, summary, answer_id, question_id):
-            self.time = time
-            self.type = get_type_name(type)
-            self.type_id = type
-            self.title = title
-            self.summary = summary
-            #python 2.4 issue - Adolfo Fitoria
-            #self.title_link = u'/questions/%s/%s#%s' %(question_id, title, answer_id)\
-            #    if int(answer_id) > 0 else u'/questions/%s/%s' %(question_id, title)
-            if (int(answer_id)>0):
-                self.title_link = u'/questions/%s/%s#%s' %(question_id, title, answer_id)
-            else:
-                self.title_link =  u'/questions/%s/%s' %(question_id, title)
-
-    class AwardEvent:
-        def __init__(self, time, type, id):
-            self.time = time
-            self.type = get_type_name(type)
-            self.type_id = type
-            self.badge = get_object_or_404(Badge, id=id)
-
-    activities = []
-    # ask questions
-    questions = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'active_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = ' +
-            'question.id AND activity.user_id = %s AND activity.activity_type = %s'],
-        params=[question_type_id, user_id, TYPE_ACTIVITY_ASK_QUESTION],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'active_at',
-            'activity_type'
-            )
-    if len(questions) > 0:
-        questions = [(Event(q['active_at'], q['activity_type'], q['title'], '', '0', \
-            q['question_id'])) for q in questions]
-        activities.extend(questions)
-
-    # answers
-    answers = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'active_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'answer', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' + 
-            'answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
-        params=[answer_type_id, user_id, TYPE_ACTIVITY_ANSWER],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'active_at',
-            'activity_type'
-            )
-    if len(answers) > 0:
-        answers = [(Event(q['active_at'], q['activity_type'], q['title'], '', q['answer_id'], \
-            q['question_id'])) for q in answers]
-        activities.extend(answers)
-
-    # question comments
-    comments = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'comment.object_id',
-            'added_at' : 'comment.added_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'question', 'comment'],
-
-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
-            'activity.user_id = comment.user_id AND comment.object_id=question.id AND '+
-            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
-        params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],
-        order_by=['-comment.added_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'activity_type'
-            )
-
-    if len(comments) > 0:
-        comments = [(Event(q['added_at'], q['activity_type'], q['title'], '', '0', \
-            q['question_id'])) for q in comments]
-        activities.extend(comments)
-
-    # answer comments
-    comments = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'comment.added_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'question', 'answer', 'comment'],
-
-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
-            'activity.user_id = comment.user_id AND comment.object_id=answer.id AND '+
-            'comment.content_type_id=%s AND question.id = answer.question_id AND '+
-            'activity.user_id = %s AND activity.activity_type=%s'],
-        params=[comment_type_id, answer_type_id, user_id, TYPE_ACTIVITY_COMMENT_ANSWER],
-        order_by=['-comment.added_at']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'added_at',
-            'activity_type'
-            )
-
-    if len(comments) > 0:
-        comments = [(Event(q['added_at'], q['activity_type'], q['title'], '', q['answer_id'], \
-            q['question_id'])) for q in comments]
-        activities.extend(comments)
-
-    # question revisions
-    revisions = Activity.objects.extra(
-        select={
-            'title' : 'question_revision.title',
-            'question_id' : 'question_revision.question_id',
-            'added_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type',
-            'summary' : 'question_revision.summary'
-            },
-        tables=['activity', 'question_revision'],
-        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND '+
-            'activity.user_id = question_revision.author_id AND activity.user_id = %s AND '+
-            'activity.activity_type=%s'],
-        params=[question_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_QUESTION],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'activity_type',
-            'summary'
-            )
-
-    if len(revisions) > 0:
-        revisions = [(Event(q['added_at'], q['activity_type'], q['title'], q['summary'], '0', \
-            q['question_id'])) for q in revisions]
-        activities.extend(revisions)
-
-    # answer revisions
-    revisions = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type',
-            'summary' : 'answer_revision.summary'
-            },
-        tables=['activity', 'answer_revision', 'question', 'answer'],
-
-        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND '+
-            'activity.user_id = answer_revision.author_id AND activity.user_id = %s AND '+
-            'answer_revision.answer_id=answer.id AND answer.question_id = question.id AND '+
-            'activity.activity_type=%s'],
-        params=[answer_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_ANSWER],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'answer_id',
-            'activity_type',
-            'summary'
-            )
-
-    if len(revisions) > 0:
-        revisions = [(Event(q['added_at'], q['activity_type'], q['title'], q['summary'], \
-            q['answer_id'], q['question_id'])) for q in revisions]
-        activities.extend(revisions)
-
-    # accepted answers
-    accept_answers = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'added_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type',
-            },
-        tables=['activity', 'answer', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND '+
-            'activity.user_id = question.author_id AND activity.user_id = %s AND '+
-            'answer.question_id=question.id AND activity.activity_type=%s'],
-        params=[answer_type_id, user_id, TYPE_ACTIVITY_MARK_ANSWER],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'activity_type',
-            )
-    if len(accept_answers) > 0:
-        accept_answers = [(Event(q['added_at'], q['activity_type'], q['title'], '', '0', \
-            q['question_id'])) for q in accept_answers]
-        activities.extend(accept_answers)
-    #award history
-    awards = Activity.objects.extra(
-        select={
-            'badge_id' : 'badge.id',
-            'awarded_at': 'award.awarded_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'award', 'badge'],
-        where=['activity.user_id = award.user_id AND activity.user_id = %s AND '+
-            'award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
-        params=[user_id, TYPE_ACTIVITY_PRIZE],
-        order_by=['-activity.active_at']
-    ).values(
-            'badge_id',
-            'awarded_at',
-            'activity_type'
-            )
-    if len(awards) > 0:
-        awards = [(AwardEvent(q['awarded_at'], q['activity_type'], q['badge_id'])) for q in awards]
-        activities.extend(awards)
-
-    activities.sort(lambda x,y: cmp(y.time, x.time))
-
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "activities" : activities[:user_view.data_size]
-    }, context_instance=RequestContext(request))
-
-def user_responses(request, user_id, user_view):
-    """
-    We list answers for question, comments, and answer accepted by others for this user.
-    """
-    class Response:
-        def __init__(self, type, title, question_id, answer_id, time, username, user_id, content):
-            self.type = type
-            self.title = title
-            self.titlelink = u'/questions/%s/%s#%s' % (question_id, title, answer_id)
-            self.time = time
-            self.userlink = u'/users/%s/%s/' % (user_id, username)
-            self.username = username
-            self.content = u'%s ...' % strip_tags(content)[:300]
-
-        def __unicode__(self):
-            return u'%s %s' % (self.type, self.titlelink)
-
-    user = get_object_or_404(User, id=user_id)
-    responses = []
-    answers = Answer.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'answer.added_at',
-            'html' : 'answer.html',
-            'username' : 'auth_user.username',
-            'user_id' : 'auth_user.id'
-            },
-        select_params=[user_id],
-        tables=['answer', 'question', 'auth_user'],
-        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
-            'question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
-        params=[user_id, user_id],
-        order_by=['-answer.id']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'added_at',
-            'html',
-            'username',
-            'user_id'
-            )
-    if len(answers) > 0:
-        answers = [(Response(TYPE_RESPONSE['QUESTION_ANSWERED'], a['title'], a['question_id'],
-        a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
-        responses.extend(answers)
-
-
-    # question comments
-    comments = Comment.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'comment.object_id',
-            'added_at' : 'comment.added_at',
-            'comment' : 'comment.comment',
-            'username' : 'auth_user.username',
-            'user_id' : 'auth_user.id'
-            },
-        tables=['question', 'auth_user', 'comment'],
-        where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND '+
-            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
-        params=[user_id, question_type_id, user_id],
-        order_by=['-comment.added_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'comment',
-            'username',
-            'user_id'
-            )
-
-    if len(comments) > 0:
-        comments = [(Response(TYPE_RESPONSE['QUESTION_COMMENTED'], c['title'], c['question_id'],
-            '', c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
-        responses.extend(comments)
-
-    # answer comments
-    comments = Comment.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'comment.added_at',
-            'comment' : 'comment.comment',
-            'username' : 'auth_user.username',
-            'user_id' : 'auth_user.id'
-            },
-        tables=['answer', 'auth_user', 'comment', 'question'],
-        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND '+
-            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id '+
-            'AND question.id = answer.question_id'],
-        params=[user_id, answer_type_id, user_id],
-        order_by=['-comment.added_at']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'added_at',
-            'comment',
-            'username',
-            'user_id'
-            )
-
-    if len(comments) > 0:
-        comments = [(Response(TYPE_RESPONSE['ANSWER_COMMENTED'], c['title'], c['question_id'],
-        c['answer_id'], c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
-        responses.extend(comments)
-
-    # answer has been accepted
-    answers = Answer.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'answer.accepted_at',
-            'html' : 'answer.html',
-            'username' : 'auth_user.username',
-            'user_id' : 'auth_user.id'
-            },
-        select_params=[user_id],
-        tables=['answer', 'question', 'auth_user'],
-        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
-            'answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
-        params=[user_id],
-        order_by=['-answer.id']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'added_at',
-            'html',
-            'username',
-            'user_id'
-            )
-    if len(answers) > 0:
-        answers = [(Response(TYPE_RESPONSE['ANSWER_ACCEPTED'], a['title'], a['question_id'],
-            a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
-        responses.extend(answers)
-
-    # sort posts by time
-    responses.sort(lambda x,y: cmp(y.time, x.time))
-
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "responses" : responses[:user_view.data_size],
-
-    }, context_instance=RequestContext(request))
-
-def user_votes(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
-    if not can_view_user_votes(request.user, user):
-        raise Http404
-    votes = []
-    question_votes = Vote.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 0,
-            'voted_at' : 'vote.voted_at',
-            'vote' : 'vote',
-            },
-        select_params=[user_id],
-        tables=['vote', 'question', 'auth_user'],
-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id '+
-            'AND vote.user_id=auth_user.id'],
-        params=[question_type_id, user_id],
-        order_by=['-vote.id']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'voted_at',
-            'vote',
-            )
-    if(len(question_votes) > 0):
-        votes.extend(question_votes)
-
-    answer_votes = Vote.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'voted_at' : 'vote.voted_at',
-            'vote' : 'vote',
-            },
-        select_params=[user_id],
-        tables=['vote', 'answer', 'question', 'auth_user'],
-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id '+
-            'AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
-        params=[answer_type_id, user_id],
-        order_by=['-vote.id']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'voted_at',
-            'vote',
-            )
-    if(len(answer_votes) > 0):
-        votes.extend(answer_votes)
-    votes.sort(lambda x,y: cmp(y['voted_at'], x['voted_at']))
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "votes" : votes[:user_view.data_size]
-
-    }, context_instance=RequestContext(request))
-
-def user_reputation(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
-    reputation = Repute.objects.extra(
-        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 
-            'title': 'question.title'},
-        tables=['repute', 'question'],
-        order_by=['-reputed_at'],
-        where=['user_id=%s AND question_id=question.id'],
-        params=[user.id]
-    ).values('positive', 'negative', 'question_id', 'title', 'reputed_at', 'reputation')
-
-    reputation.query.group_by = ['question_id']
-
-
-    rep_list = []
-    for rep in Repute.objects.filter(user=user).order_by('reputed_at'):
-        dic = '[%s,%s]' % (calendar.timegm(rep.reputed_at.timetuple()) * 1000, rep.reputation)
-        rep_list.append(dic)
-    reps = ','.join(rep_list)
-    reps = '[%s]' % reps
-
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "reputation" : reputation,
-        "reps" : reps
-    }, context_instance=RequestContext(request))
-
-def user_favorites(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
-    questions = Question.objects.extra(
-        select={
-            'vote_count' : 'question.vote_up_count + question.vote_down_count',
-            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s '+
-                'AND f.question_id = question.id',
-            'la_user_id' : 'auth_user.id',
-            'la_username' : 'auth_user.username',
-            'la_user_gold' : 'auth_user.gold',
-            'la_user_silver' : 'auth_user.silver',
-            'la_user_bronze' : 'auth_user.bronze',
-            'la_user_reputation' : 'auth_user.reputation'
-            },
-        select_params=[user_id],
-        tables=['question', 'auth_user', 'favorite_question'],
-        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id '+
-            'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
-        params=[user_id],
-        order_by=['-vote_count', '-question.id']
-    ).values('vote_count',
-             'favorited_myself',
-             'id',
-             'title',
-             'author_id',
-             'added_at',
-             'answer_accepted',
-             'answer_count',
-             'comment_count',
-             'view_count',
-             'favourite_count',
-             'summary',
-             'tagnames',
-             'vote_up_count',
-             'vote_down_count',
-             'last_activity_at',
-             'la_user_id',
-             'la_username',
-             'la_user_gold',
-             'la_user_silver',
-             'la_user_bronze',
-             'la_user_reputation')
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "questions" : questions[:user_view.data_size],
-        "view_user" : user
-    }, context_instance=RequestContext(request))
-
-
-def user_preferences(request, user_id, user_view):
-    user = get_object_or_404(User, id=user_id)
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-    }, context_instance=RequestContext(request))
-
-def question_comments(request, id):
-    question = get_object_or_404(Question, id=id)
-    user = request.user
-    return __comments(request, question, 'question', user)
-
-def answer_comments(request, id):
-    answer = get_object_or_404(Answer, id=id)
-    user = request.user
-    return __comments(request, answer, 'answer', user)
-
-def __comments(request, obj, type, user):
-    # only support get comments by ajax now
-    if request.is_ajax():
-        if request.method == "GET":
-            return __generate_comments_json(obj, type, user)
-        elif request.method == "POST":
-            comment_data = request.POST.get('comment')
-            comment = Comment(content_object=obj, comment=comment_data, user=request.user)
-            comment.save()
-            obj.comment_count = obj.comment_count + 1
-            obj.save()
-            return __generate_comments_json(obj, type, user)
-
-def __generate_comments_json(obj, type, user):
-    comments = obj.comments.all().order_by('-id')
-    # {"Id":6,"PostId":38589,"CreationDate":"an hour ago","Text":"hello there!","UserDisplayName":"Jarrod Dixon","UserUrl":"/users/3/jarrod-dixon","DeleteUrl":null}
-    json_comments = []
-    for comment in comments:
-        comment_user = comment.user
-        delete_url = ""
-        if user != None and auth.can_delete_comment(user, comment):
-            #/posts/392845/comments/219852/delete
-            delete_url = "/" + type + "s/%s/comments/%s/delete/" % (obj.id, comment.id)
-        json_comments.append({"id" : comment.id,
-            "object_id" : obj.id,
-            "add_date" : comment.added_at.strftime('%Y-%m-%d'),
-            "text" : comment.comment,
-            "user_display_name" : comment_user.username,
-            "user_url" : "/users/%s/%s" % (comment_user.id, comment_user.username),
-            "delete_url" : delete_url
-        })
-
-    data = simplejson.dumps(json_comments)
-    return HttpResponse(data, mimetype="application/json")
-
-def delete_question_comment(request, question_id, comment_id):
-    if request.is_ajax():
-        question = get_object_or_404(Question, id=question_id)
-        comment = get_object_or_404(Comment, id=comment_id)
-
-        question.comments.remove(comment)
-        question.comment_count = question.comment_count - 1
-        question.save()
-        user = request.user
-        return __generate_comments_json(question, 'question', user)
-
-def delete_answer_comment(request, answer_id, comment_id):
-    if request.is_ajax():
-        answer = get_object_or_404(Answer, id=answer_id)
-        comment = get_object_or_404(Comment, id=comment_id)
-
-        answer.comments.remove(comment)
-        answer.comment_count = answer.comment_count - 1
-        answer.save()
-        user = request.user
-        return __generate_comments_json(answer, 'answer', user)
-
-def logout(request):
-    url = request.GET.get('next')
-    return render_to_response('logout.html', {
-        'next' : url,
-    }, context_instance=RequestContext(request))
-
-def badges(request):
-    badges = Badge.objects.all().order_by('type')
-    my_badges = []
-    if request.user.is_authenticated():
-        my_badges = Award.objects.filter(user=request.user)
-        my_badges.query.group_by = ['badge_id']
-
-    return render_to_response('badges.html', {
-        'badges' : badges,
-        'mybadges' : my_badges,
-    }, context_instance=RequestContext(request))
-
-def badge(request, id):
-    badge = get_object_or_404(Badge, id=id)
-    awards = Award.objects.extra(
-        select={'id': 'auth_user.id', 
-                'name': 'auth_user.username', 
-                'rep':'auth_user.reputation', 
-                'gold': 'auth_user.gold', 
-                'silver': 'auth_user.silver', 
-                'bronze': 'auth_user.bronze'},
-        tables=['award', 'auth_user'],
-        where=['badge_id=%s AND user_id=auth_user.id'],
-        params=[id]
-    ).values('id').distinct()
-
-    return render_to_response('badge.html', {
-        'awards' : awards,
-        'badge' : badge,
-    }, context_instance=RequestContext(request))
-
-def read_message(request):
-    if request.method == "POST":
-        if request.POST['formdata'] == 'required':
-            request.session['message_silent'] = 1
-
-            if request.user.is_authenticated():
-                request.user.delete_messages()
-    return HttpResponse('')
-
-def upload(request):
-    class FileTypeNotAllow(Exception):
-        pass
-    class FileSizeNotAllow(Exception):
-        pass
-    class UploadPermissionNotAuthorized(Exception):
-        pass
-
-    #<result><msg><![CDATA[%s]]></msg><error><![CDATA[%s]]></error><file_url>%s</file_url></result>
-    xml_template = "<result><msg><![CDATA[%s]]></msg><error><![CDATA[%s]]></error><file_url>%s</file_url></result>"
-
-    try:
-        f = request.FILES['file-upload']
-        # check upload permission
-        if not can_upload_files(request.user):
-            raise UploadPermissionNotAuthorized
-
-        # check file type
-        file_name_suffix = os.path.splitext(f.name)[1].lower()
-        if not file_name_suffix in settings.ALLOW_FILE_TYPES:
-            raise FileTypeNotAllow
-
-        # genetate new file name
-        new_file_name = str(time.time()).replace('.', str(random.randint(0,100000))) + file_name_suffix
-        # use default storage to store file
-        default_storage.save(new_file_name, f)
-        # check file size
-        # byte
-        size = default_storage.size(new_file_name)
-        if size > settings.ALLOW_MAX_FILE_SIZE:
-            default_storage.delete(new_file_name)
-            raise FileSizeNotAllow
-
-        result = xml_template % ('Good', '', default_storage.url(new_file_name))
-    except UploadPermissionNotAuthorized:
-        result = xml_template % ('', _('uploading images is limited to users with >60 reputation points'), '')
-    except FileTypeNotAllow:
-        result = xml_template % ('', _("allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"), '')
-    except FileSizeNotAllow:
-        result = xml_template % ('', _("maximum upload file size is %sK") % settings.ALLOW_MAX_FILE_SIZE / 1024, '')
-    except Exception as e:
-        result = xml_template % ('', _('Error uploading file. Please contact the site administrator. Thank you. %s' % e), '')
-
-    return HttpResponse(result, mimetype="application/xml")
-
-def books(request):
-    return HttpResponseRedirect("/books/mysql-zhaoyang")
-    
-def book(request, short_name, unanswered=False):
-    """
-    1. questions list
-    2. book info
-    3. author info and blog rss items
-    """
-    """
-    List of Questions, Tagged questions, and Unanswered questions.
-    """
-    books = Book.objects.extra(where=['short_name = %s'], params=[short_name])
-    match_count = len(books)
-    if match_count == 0 :
-        raise Http404
-    else:
-        # the book info
-        book = books[0]
-        # get author info
-        author_info = BookAuthorInfo.objects.get(book=book)
-        # get author rss info
-        author_rss = BookAuthorRss.objects.filter(book=book)
-
-        # get pagesize from session, if failed then get default value
-        user_page_size = request.session.get("pagesize", QUESTIONS_PAGE_SIZE)
-        # set pagesize equal to logon user specified value in database
-        if request.user.is_authenticated() and request.user.questions_per_page > 0:
-            user_page_size = request.user.questions_per_page
-            
-        try:
-            page = int(request.GET.get('page', '1'))
-        except ValueError:
-            page = 1
-
-        view_id = request.GET.get('sort', None)
-        view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
-        try:
-            orderby = view_dic[view_id]
-        except KeyError:
-            view_id = "latest"
-            orderby = "-added_at"
-            
-        # check if request is from tagged questions
-        if unanswered:
-            # check if request is from unanswered questions
-            # Article.objects.filter(publications__id__exact=1)
-            objects = Question.objects.filter(book__id__exact=book.id, deleted=False, answer_count=0).order_by(orderby)
-        else:
-            objects = Question.objects.filter(book__id__exact=book.id, deleted=False).order_by(orderby)
-
-        # RISK - inner join queries
-        objects = objects.select_related();
-        objects_list = Paginator(objects, user_page_size)
-        questions = objects_list.page(page)
-
-        return render_to_response('book.html', {
-            "book" : book,
-            "author_info" : author_info,
-            "author_rss" : author_rss,
-            "questions" : questions,
-            "context" : {
-                'is_paginated' : True,
-                'pages': objects_list.num_pages,
-                'page': page,
-                'has_previous': questions.has_previous(),
-                'has_next': questions.has_next(),
-                'previous': questions.previous_page_number(),
-                'next': questions.next_page_number(),
-                'base_url' : request.path + '?sort=%s&' % view_id,
-                'pagesize' : user_page_size
-            }
-        }, context_instance=RequestContext(request))
-
-@login_required
-def ask_book(request, short_name):
-    if request.method == "POST":
-        form = AskForm(request.POST)
-        if form.is_valid():
-            added_at = datetime.datetime.now()
-            html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
-            question = Question(
-                title            = strip_tags(form.cleaned_data['title']),
-                author           = request.user,
-                added_at         = added_at,
-                last_activity_at = added_at,
-                last_activity_by = request.user,
-                wiki             = form.cleaned_data['wiki'],
-                tagnames         = form.cleaned_data['tags'].strip(),
-                html             = html,
-                summary          = strip_tags(html)[:120]
-            )
-            if question.wiki:
-                question.last_edited_by = question.author
-                question.last_edited_at = added_at
-                question.wikified_at = added_at
-
-            question.save()
-
-            # create the first revision
-            QuestionRevision.objects.create(
-                question   = question,
-                revision   = 1,
-                title      = question.title,
-                author     = request.user,
-                revised_at = added_at,
-                tagnames   = question.tagnames,
-                summary    = CONST['default_version'],
-                text       = form.cleaned_data['text']
-            )
-            
-            books = Book.objects.extra(where=['short_name = %s'], params=[short_name])
-            match_count = len(books)
-            if match_count == 1:
-                # the book info
-                book = books[0]
-                book.questions.add(question)
-
-            return HttpResponseRedirect(question.get_absolute_url())
-    else:
-        form = AskForm()
-
-    tags = _get_tags_cache_json()
-    return render_to_response('ask.html', {
-        'form' : form,
-        'tags' : tags,
-        }, context_instance=RequestContext(request))
-
-def search(request):
-    """
-    Search by question, user and tag keywords.
-    For questions now we only search keywords in question title.
-    """
-    if request.method == "GET":
-        keywords = request.GET.get("q")
-        search_type = request.GET.get("t")
-        try:
-            page = int(request.GET.get('page', '1'))
-        except ValueError:
-            page = 1
-        if keywords is None:
-            return HttpResponseRedirect('/')
-        if search_type == 'tag':
-            return HttpResponseRedirect('/tags/?q=%s&page=%s' % (keywords.strip(), page))
-        elif search_type == "user":
-            return HttpResponseRedirect('/users/?q=%s&page=%s' % (keywords.strip(), page))
-        elif search_type == "question":
-            
-            template_file = "questions.html"
-            # Set flag to False by default. If it is equal to True, then need to be saved.
-            pagesize_changed = False
-            # get pagesize from session, if failed then get default value
-            user_page_size = request.session.get("pagesize", QUESTIONS_PAGE_SIZE)
-            # set pagesize equal to logon user specified value in database
-            if request.user.is_authenticated() and request.user.questions_per_page > 0:
-                user_page_size = request.user.questions_per_page
-
-            try:
-                page = int(request.GET.get('page', '1'))
-                # get new pagesize from UI selection
-                pagesize = int(request.GET.get('pagesize', user_page_size))
-                if pagesize <> user_page_size:
-                    pagesize_changed = True
-
-            except ValueError:
-                page = 1
-                pagesize  = user_page_size
-
-            # save this pagesize to user database
-            if pagesize_changed:
-                request.session["pagesize"] = pagesize
-                if request.user.is_authenticated():
-                    user = request.user
-                    user.questions_per_page = pagesize
-                    user.save()
-
-            view_id = request.GET.get('sort', None)
-            view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
-            try:
-                orderby = view_dic[view_id]
-            except KeyError:
-                view_id = "latest"
-                orderby = "-added_at"
-                
-            objects = Question.objects.filter(deleted=False).extra(where=['title like %s'], params=['%' + keywords + '%']).order_by(orderby)
-
-            # RISK - inner join queries
-            objects = objects.select_related();
-            objects_list = Paginator(objects, pagesize)
-            questions = objects_list.page(page)
-
-            # Get related tags from this page objects
-            related_tags = []
-            for question in questions.object_list:
-                tags = list(question.tags.all())
-                for tag in tags:
-                    if tag not in related_tags:
-                        related_tags.append(tag)
-
-            return render_to_response(template_file, {
-                "questions" : questions,
-                "tab_id" : view_id,
-                "questions_count" : objects_list.count,
-                "tags" : related_tags,
-                "searchtag" : None,
-                "searchtitle" : keywords,
-                "keywords" : keywords,
-                "is_unanswered" : False,
-                "context" : {
-                    'is_paginated' : True,
-                    'pages': objects_list.num_pages,
-                    'page': page,
-                    'has_previous': questions.has_previous(),
-                    'has_next': questions.has_next(),
-                    'previous': questions.previous_page_number(),
-                    'next': questions.next_page_number(),
-                    'base_url' : request.path + '?t=question&q=%s&sort=%s&' % (keywords, view_id),
-                    'pagesize' : pagesize
-                }}, context_instance=RequestContext(request))
- 
-    else:
-        raise Http404
-        
-=======
 # encoding:utf-8
 import os.path
 import time, datetime, calendar, random
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 39dba67d..11d15deb 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index cc42454c..3dda9ce9 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -148,7 +148,7 @@ msgstr ""
 
 #: django_authopenid/views.py:417 django_authopenid/views.py:544
 msgid "Welcome"
-msgstr "Verification Email from NMR Wiki Q&A"
+msgstr "Verification Email from Q&A forum"
 
 #: django_authopenid/views.py:507
 msgid "Password changed."
@@ -1013,12 +1013,6 @@ msgid ""
 "Most importanly - questions should be <strong>relevant</strong> to this "
 "community."
 msgstr ""
-"Please ask questions about all aspects of <strong>Magnetic Resonance</"
-"strong> - <strong>NMR</strong>, <strong>EPR</strong>, <strong>MRI</strong>. "
-"Questions about both theory and practice in these fields are welcome, "
-"including questions about the physical foundations, scientific applications, "
-"instrumentation, interpretation of data, software, preparation and handling "
-"of samples etc. "
 
 #: templates/faq.html:18
 msgid ""
@@ -1037,9 +1031,6 @@ msgid ""
 "Please avoid asking questions that are not relevant to this community, too "
 "subjective and argumentative."
 msgstr ""
-"Please avoid asking questions that are not relevant to the subjects of NMR, "
-"EPR or MRI, also please avoid asking questions that are too argumentative or "
-"subjective."
 
 #: templates/faq.html:27
 msgid "What should I avoid in my answers?"
@@ -1047,7 +1038,7 @@ msgstr ""
 
 #: templates/faq.html:28 templates/faq.html.py:132
 msgid "site title"
-msgstr "NMR Wiki Q&A"
+msgstr ""
 
 #: templates/faq.html:28
 msgid ""
@@ -1190,9 +1181,6 @@ msgstr ""
 #: templates/faq.html:124
 msgid "Goal of this site is..."
 msgstr ""
-"<span class='orange'>NMR Wiki Q&A</span> aims for offering a place for "
-"efficient exchange of ideas among users of <strong>Magnetic Resonance</"
-"strong>and specialists working in this field."
 
 #: templates/faq.html:124
 msgid ""
@@ -1339,7 +1327,7 @@ msgstr ""
 
 #: templates/index.html:80
 msgid "welcome to website"
-msgstr "Welcome to NMR Wiki Q&A"
+msgstr ""
 
 #: templates/index.html:89
 msgid "Recent tags"
@@ -1399,9 +1387,6 @@ msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
-"Clicking <strong>Logout</strong> will log you out from NMR Wiki Q&A.</"
-"p><p>If you wish to sign off completely - please make sure to log out from "
-"your OpenID provider."
 
 #: templates/logout.html:21
 msgid "Logout now"
@@ -2107,12 +2092,6 @@ msgstr ""
 #, python-format
 msgid "validate %(email)s info"
 msgstr ""
-"<span class=\"strong big\">An email with a validation link has been sent to %"
-"(email)s.</span> Please <strong>follow the emailed link</strong> with your "
-"web browser. Email validation is necessary to help insure the proper use of "
-"email on <span class=\"orange\">NMR Wiki Q&A</span>. If you would like to "
-"use <strong>another email</strong>, please <a href=\"/email/change/"
-"\"><strong>change it again</strong></a>."
 
 #: templates/authopenid/changeemail.html:50
 msgid "Email not changed"
diff --git a/templates/reopen.html b/templates/reopen.html
index 7ab59421..37fb69c1 100644
--- a/templates/reopen.html
+++ b/templates/reopen.html
@@ -1,5 +1,5 @@
-<!-- reopen.html -->
 {% extends "base_content.html" %}
+<!-- reopen.html -->
 {% load extra_tags %}
 {% load i18n %}
 {% load humanize %}
@@ -34,7 +34,4 @@
     </form>
 </div>
 {% endblock %}
-
-
-
 <!-- end reopen.html -->
-- 
cgit v1.2.3-1-g7c22


From 755ee6d0263ee60a5086d85117037fd7f41a835b Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sat, 8 Aug 2009 10:26:29 -0600
Subject: translating templates/content/js/com.cnprog.i18n.js to Spanish

---
 templates/content/js/com.cnprog.i18n.js | 61 ++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index 90166eec..96f755bf 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -84,9 +84,68 @@ var i18nEn = {
 	'characters':'characters left',
 };
 
+var i18nEs = {
+	'insufficient privilege':'privilegio insuficiente',
+	'cannot pick own answer as best':'no puede escoger su propia respuesta como la mejor',
+	'anonymous users cannot select favorite questions':'usuarios anonimos no pueden seleccionar',
+	'please login':'por favor inicie sesión',
+	'anonymous users cannot vote':'usuarios anónimos no pueden votar',
+	'>15 points requried to upvote': '>15 puntos requeridos para votar positivamente',
+	'>100 points required to downvote':'>100 puntos requeridos para votar negativamente',
+	'please see': 'por favor vea',
+	'cannot vote for own posts':'no se puede votar por sus propias publicaciones',
+	'daily vote cap exhausted':'cuota de votos diarios excedida',
+	'cannot revoke old vote':'no puede revocar un voto viejo',
+	'please confirm offensive':"por favor confirme ofensiva",
+	'anonymous users cannot flag offensive posts':'usuarios anónimos no pueden marcar publicaciones como ofensivas',
+	'cannot flag message as offensive twice':'no puede marcar mensaje como ofensivo dos veces',
+	'flag offensive cap exhausted':'cuota para marcar ofensivas ha sido excedida',
+	'need >15 points to report spam':"necesita >15 puntos para reportar spam,
+	'confirm delete':"¿Está seguro que desea borrar esto?",
+	'anonymous users cannot delete/undelete':"usuarios anónimos no pueden borrar o recuperar publicaciones",
+	'post recovered':"publicación recuperada",
+	'post deleted':"publicación borrada。",
+	'add comment':'agregar comentario',
+	'community reputation points':'reputación comunitaria',
+	'to comment, need':'para comentar, necesita reputación',
+	'delete this comment':'borrar este comentario',
+	'hide comments':"ocultar comentarios",
+	'add a comment':"agregar comentarios",
+	'comments':"comentarios",
+	'confirm delete comment':"¿Realmente desea borrar este comentario?",
+	'characters':'caracteres faltantes',
+	'can write':'tiene ',
+	'click to close':'haga click para cerrar',
+	'loading...':'cargando...',
+	'tags cannot be empty':'las etiquetas no pueden estar vacías',
+	'tablimits info':"hasta 5 etiquetas de no mas de 20 caracteres cada una",
+	'content cannot be empty':'el contenido no puede estar vacío',
+	'content minchars': 'por favor introduzca mas de {0} caracteres',
+	'please enter title':'por favor ingrese un título',
+	'title minchars':"por favor introduzca al menos {0} caracteres",
+	'delete':'borrar',
+	'undelete':	'recuperar',
+	'bold': 'negrita',
+	'italic':'cursiva',
+	'link':'enlace',
+	'quote':'citar',
+	'preformatted text':'texto preformateado',
+	'image':'imagen',
+	'numbered list':'lista numerada',
+	'bulleted list':'lista no numerada',
+	'heading':'标题',
+	'horizontal bar':'barra horizontal',
+	'undo':'deshacer',
+	'redo':'rehacer',
+	'enter image url':'introduzca la URL de la imagen, por ejemplo：<br />http://www.example.com/image.jpg   \"titulo de imagen\"',
+	'enter url':'introduzca direcciones web, ejemplo：<br />http://www.cnprog.com/   \"titulo del enlace\"</p>"',
+	'upload image':'cargar imagen：',
+};
+
 var i18n = {
 	'en':i18nEn,
-	'zh_CN':i18nZh
+	'zh_CN':i18nZh,
+	'es':i18nEs
 };
 
 var i18n_dict = i18n[i18nLang];
-- 
cgit v1.2.3-1-g7c22


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(-)

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 fed254aac68551d612f1ce0ab0e6d6a55f8b7c5a Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sat, 8 Aug 2009 21:34:53 -0600
Subject: fixing error in settings.py (missing template stuff for admin)

---
 settings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings.py b/settings.py
index fac3c0d5..fb594676 100644
--- a/settings.py
+++ b/settings.py
@@ -64,6 +64,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'context.auth_processor',
     'context.application_settings',
     #'django.core.context_processors.i18n',
+    'django.core.context_processors.auth' #this is required for admin
 )
 
 ROOT_URLCONF = 'urls'
-- 
cgit v1.2.3-1-g7c22


From 29828442db7d97354d84be133fad6401d2c53223 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Sun, 9 Aug 2009 00:50:20 -0300
Subject: Made local settings work again.

---
 settings.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/settings.py b/settings.py
index fac3c0d5..d51b3bbb 100644
--- a/settings.py
+++ b/settings.py
@@ -96,12 +96,3 @@ INSTALLED_APPS = (
 
 # User settings
 from settings_local import *
-
-USE_I18N = True
-LANGUAGE_CODE = 'en'
-EMAIL_VALIDATION = 'off'
-MIN_USERNAME_LENGTH = 1
-EMAIL_UNIQUE = False
-APP_URL = 'http://server.com' #used by email notif system and RSS
-GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
-GOOGLE_ANALYTICS_KEY = ''
-- 
cgit v1.2.3-1-g7c22


From cedac7935f10258230b4e5de7eb63dd098b87c3b Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sat, 8 Aug 2009 22:54:56 -0600
Subject: fixing a bug in question view

---
 forum/views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/forum/views.py b/forum/views.py
index 6ef7bd6d..1566e9a8 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -332,7 +332,10 @@ def question(request, id):
     answers = answers.select_related(depth=1)
 
     favorited = question.has_favorite_by_user(request.user)
-    question_vote = question.votes.select_related().filter(user=request.user)
+    if not request.user.is_anonymous():
+        question_vote = question.votes.select_related().filter(user=request.user)
+    else:
+        question_vote = None #is this correct?
     if question_vote is not None and question_vote.count() > 0:
         question_vote = question_vote[0]
 
-- 
cgit v1.2.3-1-g7c22


From 64b2939bfa1e60e61b51d8f59ddd40429bec1068 Mon Sep 17 00:00:00 2001
From: Mike Chen <chagel@gmail.com>
Date: Sun, 9 Aug 2009 21:44:05 +0800
Subject: merge of Evgenys changes on annoymous post

---
 TODO               | 4 ----
 cnprog.wsgi        | 8 --------
 drop-all-tables.sh | 4 ----
 rmpyc              | 1 -
 4 files changed, 17 deletions(-)
 delete mode 100644 TODO
 delete mode 100644 cnprog.wsgi
 delete mode 100644 drop-all-tables.sh
 delete mode 100644 rmpyc

diff --git a/TODO b/TODO
deleted file mode 100644
index 3769fa08..00000000
--- a/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-*check change email function - there is a strange 'password' field in form
-*make reusable question-block template for index questions unanswered - get rid of copy-paste
-*unused votes count in user profile not working - left that commented out in templates/user_info.html
-*badge award notification messages need to be set fixed at place where badges are awarded
diff --git a/cnprog.wsgi b/cnprog.wsgi
deleted file mode 100644
index a1bd8039..00000000
--- a/cnprog.wsgi
+++ /dev/null
@@ -1,8 +0,0 @@
-import os
-import sys
-
-sys.path.append('/var/www/vhosts')
-os.environ['DJANGO_SETTINGS_MODULE'] = 'cnprog.settings'
-
-import django.core.handlers.wsgi
-application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/drop-all-tables.sh b/drop-all-tables.sh
deleted file mode 100644
index 87783b77..00000000
--- a/drop-all-tables.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-mysql_username='cnprog'
-mysql_database='cnprog'
-mysqldump -u $mysql_username -p --add-drop-table --no-data $mysql_database | grep ^DROP 
-#| mysql -u[USERNAME] -p[PASSWORD] [DATABASE]
diff --git a/rmpyc b/rmpyc
deleted file mode 100644
index 014575f6..00000000
--- a/rmpyc
+++ /dev/null
@@ -1 +0,0 @@
-rm `find . -name '*.pyc'`
-- 
cgit v1.2.3-1-g7c22

-- 
cgit v1.2.3-1-g7c22


From b55d90628557be0d06035add1577410a74e3b3aa Mon Sep 17 00:00:00 2001
From: Mike Chen <chagel@gmail.com>
Date: Sun, 9 Aug 2009 22:15:28 +0800
Subject: changes to unix mode

---
 forum/auth.py   |  443 ++++++++++++
 forum/models.py |  808 +++++++++++++++++++++
 forum/views.py  | 2084 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 3335 insertions(+)

diff --git a/forum/auth.py b/forum/auth.py
index e69de29b..36ca54d3 100644
--- a/forum/auth.py
+++ b/forum/auth.py
@@ -0,0 +1,443 @@
+"""
+Authorisation related functions.
+
+The actions a User is authorised to perform are dependent on their reputation
+and superuser status.
+"""
+import datetime
+from django.contrib.contenttypes.models import ContentType
+from django.db import transaction
+from models import Repute
+from models import Question
+from models import Answer
+from const import TYPE_REPUTATION
+question_type = ContentType.objects.get_for_model(Question)
+answer_type = ContentType.objects.get_for_model(Answer)
+
+VOTE_UP                   = 15
+FLAG_OFFENSIVE            = 15
+POST_IMAGES               = 15
+LEAVE_COMMENTS            = 50
+UPLOAD_FILES              = 60
+VOTE_DOWN                 = 100
+CLOSE_OWN_QUESTIONS       = 250
+RETAG_OTHER_QUESTIONS     = 500
+REOPEN_OWN_QUESTIONS      = 500
+EDIT_COMMUNITY_WIKI_POSTS = 750
+EDIT_OTHER_POSTS          = 2000
+DELETE_COMMENTS           = 2000
+VIEW_OFFENSIVE_FLAGS      = 2000
+DISABLE_URL_NOFOLLOW      = 2000
+CLOSE_OTHER_QUESTIONS     = 3000
+LOCK_POSTS                = 4000
+
+VOTE_RULES = {
+    'scope_votes_per_user_per_day' : 30, # how many votes of one user has everyday
+    'scope_flags_per_user_per_day' : 5,  # how many times user can flag posts everyday
+    'scope_warn_votes_left' : 10,        # start when to warn user how many votes left
+    'scope_deny_unvote_days' : 1,        # if 1 days passed, user can't cancel votes.
+    'scope_flags_invisible_main_page' : 3, # post doesn't show on main page if has more than 3 offensive flags
+    'scope_flags_delete_post' : 5,         # post will be deleted if it has more than 5 offensive flags
+}
+
+REPUTATION_RULES = {
+    'initial_score'                       : 1,
+    'scope_per_day_by_upvotes'            : 200,
+    'gain_by_upvoted'                     : 10,
+    'gain_by_answer_accepted'             : 15,
+    'gain_by_accepting_answer'            : 2,
+    'gain_by_downvote_canceled'           : 2,
+    'gain_by_canceling_downvote'          : 1,
+    'lose_by_canceling_accepted_answer'   : -2,
+    'lose_by_accepted_answer_cancled'     : -15,
+    'lose_by_downvoted'                   : -2,
+    'lose_by_flagged'                     : -2,
+    'lose_by_downvoting'                  : -1,
+    'lose_by_flagged_lastrevision_3_times': -30,
+    'lose_by_flagged_lastrevision_5_times': -100,
+    'lose_by_upvote_canceled'             : -10,
+}
+
+def can_vote_up(user):
+    """Determines if a User can vote Questions and Answers up."""
+    return user.is_authenticated() and (
+        user.reputation >= VOTE_UP or
+        user.is_superuser)
+
+def can_flag_offensive(user):
+    """Determines if a User can flag Questions and Answers as offensive."""
+    return user.is_authenticated() and (
+        user.reputation >= FLAG_OFFENSIVE or
+        user.is_superuser)
+
+def can_add_comments(user):
+    """Determines if a User can add comments to Questions and Answers."""
+    return user.is_authenticated() and (
+        user.reputation >= LEAVE_COMMENTS or
+        user.is_superuser)
+
+def can_vote_down(user):
+    """Determines if a User can vote Questions and Answers down."""
+    return user.is_authenticated() and (
+        user.reputation >= VOTE_DOWN or
+        user.is_superuser)
+
+def can_retag_questions(user):
+    """Determines if a User can retag Questions."""
+    return user.is_authenticated() and (
+        RETAG_OTHER_QUESTIONS <= user.reputation < EDIT_OTHER_POSTS or
+        user.is_superuser)
+
+def can_edit_post(user, post):
+    """Determines if a User can edit the given Question or Answer."""
+    return user.is_authenticated() and (
+        user.id == post.author_id or
+        (post.wiki and user.reputation >= EDIT_COMMUNITY_WIKI_POSTS) or
+        user.reputation >= EDIT_OTHER_POSTS or
+        user.is_superuser)
+
+def can_delete_comment(user, comment):
+    """Determines if a User can delete the given Comment."""
+    return user.is_authenticated() and (
+        user.id == comment.user_id or
+        user.reputation >= DELETE_COMMENTS or
+        user.is_superuser)
+
+def can_view_offensive_flags(user):
+    """Determines if a User can view offensive flag counts."""
+    return user.is_authenticated() and (
+        user.reputation >= VIEW_OFFENSIVE_FLAGS or
+        user.is_superuser)
+
+def can_close_question(user, question):
+    """Determines if a User can close the given Question."""
+    return user.is_authenticated() and (
+        (user.id == question.author_id and
+         user.reputation >= CLOSE_OWN_QUESTIONS) or
+        user.reputation >= CLOSE_OTHER_QUESTIONS or
+        user.is_superuser)
+
+def can_lock_posts(user):
+    """Determines if a User can lock Questions or Answers."""
+    return user.is_authenticated() and (
+        user.reputation >= LOCK_POSTS or
+        user.is_superuser)
+
+def can_follow_url(user):
+    """Determines if the URL link can be followed by Google search engine."""
+    return user.reputation >= DISABLE_URL_NOFOLLOW
+
+def can_accept_answer(user, question, answer):
+    return (user.is_authenticated() and
+        question.author != answer.author and
+        question.author == user) or user.is_superuser
+
+# now only support to reopen own question except superuser
+def can_reopen_question(user, question):
+    return (user.is_authenticated() and
+        user.id == question.author_id and
+        user.reputation >= REOPEN_OWN_QUESTIONS) or user.is_superuser
+
+def can_delete_post(user, post):
+    return (user.is_authenticated() and
+        user.id == post.author_id) or user.is_superuser
+
+def can_view_deleted_post(user, post):
+    return user.is_superuser
+
+# user preferences view permissions
+def is_user_self(request_user, target_user):
+    return (request_user.is_authenticated() and request_user == target_user)
+    
+def can_view_user_votes(request_user, target_user):
+    return (request_user.is_authenticated() and request_user == target_user)
+
+def can_view_user_preferences(request_user, target_user):
+    return (request_user.is_authenticated() and request_user == target_user)
+
+def can_view_user_edit(request_user, target_user):
+    return (request_user.is_authenticated() and request_user == target_user)
+
+def can_upload_files(request_user):
+    return (request_user.is_authenticated() and request_user.reputation >= UPLOAD_FILES) or \
+           request_user.is_superuser
+
+###########################################
+## actions and reputation changes event
+###########################################
+def calculate_reputation(origin, offset):
+    result = int(origin) + int(offset)
+    return result if result > 0 else 1
+
+@transaction.commit_on_success
+def onFlaggedItem(item, post, user):
+
+    item.save()
+    post.offensive_flag_count = post.offensive_flag_count + 1
+    post.save()
+
+    post.author.reputation = calculate_reputation(post.author.reputation,
+                           int(REPUTATION_RULES['lose_by_flagged']))
+    post.author.save()
+
+    question = post
+    if ContentType.objects.get_for_model(post) == answer_type:
+        question = post.question
+
+    reputation = Repute(user=post.author,
+               negative=int(REPUTATION_RULES['lose_by_flagged']),
+               question=question, reputed_at=datetime.datetime.now(),
+               reputation_type=-4,
+               reputation=post.author.reputation)
+    reputation.save()
+
+    #todo: These should be updated to work on same revisions.
+    if post.offensive_flag_count ==  VOTE_RULES['scope_flags_invisible_main_page'] :
+        post.author.reputation = calculate_reputation(post.author.reputation,
+                               int(REPUTATION_RULES['lose_by_flagged_lastrevision_3_times']))
+        post.author.save()
+
+        reputation = Repute(user=post.author,
+                   negative=int(REPUTATION_RULES['lose_by_flagged_lastrevision_3_times']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=-6,
+                   reputation=post.author.reputation)
+        reputation.save()
+
+    elif post.offensive_flag_count == VOTE_RULES['scope_flags_delete_post']:
+        post.author.reputation = calculate_reputation(post.author.reputation,
+                               int(REPUTATION_RULES['lose_by_flagged_lastrevision_5_times']))
+        post.author.save()
+
+        reputation = Repute(user=post.author,
+                   negative=int(REPUTATION_RULES['lose_by_flagged_lastrevision_5_times']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=-7,
+                   reputation=post.author.reputation)
+        reputation.save()
+
+        post.deleted = True
+        #post.deleted_at = datetime.datetime.now()
+        #post.deleted_by = Admin
+        post.save()
+
+
+@transaction.commit_on_success
+def onAnswerAccept(answer, user):
+    answer.accepted = True
+    answer.accepted_at = datetime.datetime.now()
+    answer.question.answer_accepted = True
+    answer.save()
+    answer.question.save()
+
+    answer.author.reputation = calculate_reputation(answer.author.reputation,
+                             int(REPUTATION_RULES['gain_by_answer_accepted']))
+    answer.author.save()
+    reputation = Repute(user=answer.author,
+               positive=int(REPUTATION_RULES['gain_by_answer_accepted']),
+               question=answer.question,
+               reputed_at=datetime.datetime.now(),
+               reputation_type=2,
+               reputation=answer.author.reputation)
+    reputation.save()
+
+    user.reputation = calculate_reputation(user.reputation,
+                    int(REPUTATION_RULES['gain_by_accepting_answer']))
+    user.save()
+    reputation = Repute(user=user,
+               positive=int(REPUTATION_RULES['gain_by_accepting_answer']),
+               question=answer.question,
+               reputed_at=datetime.datetime.now(),
+               reputation_type=3,
+               reputation=user.reputation)
+    reputation.save()
+
+@transaction.commit_on_success
+def onAnswerAcceptCanceled(answer, user):
+    answer.accepted = False
+    answer.accepted_at = None
+    answer.question.answer_accepted = False
+    answer.save()
+    answer.question.save()
+
+    answer.author.reputation = calculate_reputation(answer.author.reputation,
+                             int(REPUTATION_RULES['lose_by_accepted_answer_cancled']))
+    answer.author.save()
+    reputation = Repute(user=answer.author,
+               negative=int(REPUTATION_RULES['lose_by_accepted_answer_cancled']),
+               question=answer.question,
+               reputed_at=datetime.datetime.now(),
+               reputation_type=-2,
+               reputation=answer.author.reputation)
+    reputation.save()
+
+    user.reputation = calculate_reputation(user.reputation,
+                    int(REPUTATION_RULES['lose_by_canceling_accepted_answer']))
+    user.save()
+    reputation = Repute(user=user,
+               negative=int(REPUTATION_RULES['lose_by_canceling_accepted_answer']),
+               question=answer.question,
+               reputed_at=datetime.datetime.now(),
+               reputation_type=-1,
+               reputation=user.reputation)
+    reputation.save()
+
+@transaction.commit_on_success
+def onUpVoted(vote, post, user):
+    vote.save()
+
+    post.vote_up_count = int(post.vote_up_count) + 1
+    post.score = int(post.score) + 1
+    post.save()
+
+    if not post.wiki:
+        author = post.author
+        if Repute.objects.get_reputation_by_upvoted_today(author) <  int(REPUTATION_RULES['scope_per_day_by_upvotes']):
+            author.reputation = calculate_reputation(author.reputation,
+                              int(REPUTATION_RULES['gain_by_upvoted']))
+            author.save()
+
+            question = post
+            if ContentType.objects.get_for_model(post) == answer_type:
+                question = post.question
+
+            reputation = Repute(user=author,
+                       positive=int(REPUTATION_RULES['gain_by_upvoted']),
+                       question=question,
+                       reputed_at=datetime.datetime.now(),
+                       reputation_type=1,
+                       reputation=author.reputation)
+            reputation.save()
+
+@transaction.commit_on_success
+def onUpVotedCanceled(vote, post, user):
+    vote.delete()
+
+    post.vote_up_count = int(post.vote_up_count) - 1
+    if post.vote_up_count < 0:
+        post.vote_up_count  = 0
+    post.score = int(post.score) - 1
+    post.save()
+
+    if not post.wiki:
+        author = post.author
+        author.reputation = calculate_reputation(author.reputation,
+                          int(REPUTATION_RULES['lose_by_upvote_canceled']))
+        author.save()
+
+        question = post
+        if ContentType.objects.get_for_model(post) == answer_type:
+            question = post.question
+
+        reputation = Repute(user=author,
+                   negative=int(REPUTATION_RULES['lose_by_upvote_canceled']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=-8,
+                   reputation=author.reputation)
+        reputation.save()
+
+@transaction.commit_on_success
+def onDownVoted(vote, post, user):
+    vote.save()
+
+    post.vote_down_count = int(post.vote_down_count) + 1
+    post.score = int(post.score) - 1
+    post.save()
+
+    if not post.wiki:
+        author = post.author
+        author.reputation = calculate_reputation(author.reputation,
+                          int(REPUTATION_RULES['lose_by_downvoted']))
+        author.save()
+
+        question = post
+        if ContentType.objects.get_for_model(post) == answer_type:
+            question = post.question
+
+        reputation = Repute(user=author,
+                   negative=int(REPUTATION_RULES['lose_by_downvoted']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=-3,
+                   reputation=author.reputation)
+        reputation.save()
+
+        user.reputation = calculate_reputation(user.reputation,
+                        int(REPUTATION_RULES['lose_by_downvoting']))
+        user.save()
+
+        reputation = Repute(user=user,
+                   negative=int(REPUTATION_RULES['lose_by_downvoting']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=-5,
+                   reputation=user.reputation)
+        reputation.save()
+
+@transaction.commit_on_success
+def onDownVotedCanceled(vote, post, user):
+    vote.delete()
+
+    post.vote_down_count = int(post.vote_down_count) - 1
+    if post.vote_down_count < 0:
+        post.vote_down_count  = 0
+    post.score = post.score + 1
+    post.save()
+
+    if not post.wiki:
+        author = post.author
+        author.reputation = calculate_reputation(author.reputation,
+                          int(REPUTATION_RULES['gain_by_downvote_canceled']))
+        author.save()
+
+        question = post
+        if ContentType.objects.get_for_model(post) == answer_type:
+            question = post.question
+
+        reputation = Repute(user=author,
+                   positive=int(REPUTATION_RULES['gain_by_downvote_canceled']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=4,
+                   reputation=author.reputation)
+        reputation.save()
+
+        user.reputation = calculate_reputation(user.reputation,
+                        int(REPUTATION_RULES['gain_by_canceling_downvote']))
+        user.save()
+
+        reputation = Repute(user=user,
+                   positive=int(REPUTATION_RULES['gain_by_canceling_downvote']),
+                   question=question,
+                   reputed_at=datetime.datetime.now(),
+                   reputation_type=5,
+                   reputation=user.reputation)
+        reputation.save()
+
+def onDeleteCanceled(post, user):
+    post.deleted = False
+    post.deleted_by = None
+    post.deleted_at = None
+    post.save()
+    for tag in list(post.tags.all()):
+        if tag.used_count == 1 and tag.deleted:
+            tag.deleted = False
+            tag.deleted_by = None
+            tag.deleted_at = None
+            tag.save()
+
+def onDeleted(post, user):
+    post.deleted = True
+    post.deleted_by = user
+    post.deleted_at = datetime.datetime.now()
+    post.save()
+
+    for tag in list(post.tags.all()):
+        if tag.used_count == 1:
+            tag.deleted = True
+            tag.deleted_by = user
+            tag.deleted_at = datetime.datetime.now()
+            tag.save()
diff --git a/forum/models.py b/forum/models.py
index e69de29b..255eb21f 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -0,0 +1,808 @@
+# encoding:utf-8
+import datetime
+import hashlib
+from urllib import quote_plus, urlencode
+from django.db import models
+from django.utils.html import strip_tags
+from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User
+from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.models import ContentType
+from django.template.defaultfilters import slugify
+from django.db.models.signals import post_delete, post_save, pre_save
+from django.utils.translation import ugettext as _
+import django.dispatch
+import settings
+
+from forum.managers import *
+from const import *
+
+class EmailFeed(models.Model):
+    #subscription key for unsubscribe by visiting emailed link
+    key = models.CharField(max_length=32)
+    #generic relation with feed content (i.e. question or tags)
+    feed_content_type = models.ForeignKey(ContentType,related_name='content_emailfeed')
+    feed_id = models.PositiveIntegerField()
+    content = generic.GenericForeignKey('feed_content_type','feed_id')
+    #generic relation with owner - either nameless email or User
+    subscriber_content_type = models.ForeignKey(ContentType,related_name='subscriber_emailfeed')
+    subscriber_id = models.PositiveIntegerField()
+    subscriber = generic.GenericForeignKey('subscriber_content_type','subscriber_id')
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    reported_at = models.DateTimeField(default=datetime.datetime.now)
+
+    #getter functions rely on implementations of similar functions in content
+    #of subscriber objects
+    def get_update_summary(self):
+        return self.content.get_update_summary(last_reported_at = self.reported_at,recipient_email = self.get_email())
+
+    def get_email(self):
+        return self.subscriber.email
+
+class Tag(models.Model):
+    name       = models.CharField(max_length=255, unique=True)
+    created_by = models.ForeignKey(User, related_name='created_tags')
+    deleted         = models.BooleanField(default=False)
+    deleted_at      = models.DateTimeField(null=True, blank=True)
+    deleted_by      = models.ForeignKey(User, null=True, blank=True, related_name='deleted_tags')
+    email_feeds     = generic.GenericRelation(EmailFeed)
+    # Denormalised data
+    used_count = models.PositiveIntegerField(default=0)
+
+    objects = TagManager()
+
+    class Meta:
+        db_table = u'tag'
+        ordering = ('-used_count', 'name')
+
+    def __unicode__(self):
+        return self.name
+
+class Comment(models.Model):
+    content_type   = models.ForeignKey(ContentType)
+    object_id      = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    user           = models.ForeignKey(User, related_name='comments')
+    comment        = models.CharField(max_length=300)
+    added_at       = models.DateTimeField(default=datetime.datetime.now)
+
+    class Meta:
+        ordering = ('-added_at',)
+        db_table = u'comment'
+    def __unicode__(self):
+        return self.comment
+
+class Vote(models.Model):
+    VOTE_UP = +1
+    VOTE_DOWN = -1
+    VOTE_CHOICES = (
+        (VOTE_UP,   u'Up'),
+        (VOTE_DOWN, u'Down'),
+    )
+
+    content_type   = models.ForeignKey(ContentType)
+    object_id      = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    user           = models.ForeignKey(User, related_name='votes')
+    vote           = models.SmallIntegerField(choices=VOTE_CHOICES)
+    voted_at       = models.DateTimeField(default=datetime.datetime.now)
+
+    objects = VoteManager()
+
+    class Meta:
+        unique_together = ('content_type', 'object_id', 'user')
+        db_table = u'vote'
+    def __unicode__(self):
+        return '[%s] voted at %s: %s' %(self.user, self.voted_at, self.vote)
+
+    def is_upvote(self):
+        return self.vote == self.VOTE_UP
+
+    def is_downvote(self):
+        return self.vote == self.VOTE_DOWN
+
+class FlaggedItem(models.Model):
+    """A flag on a Question or Answer indicating offensive content."""
+    content_type   = models.ForeignKey(ContentType)
+    object_id      = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    user           = models.ForeignKey(User, related_name='flagged_items')
+    flagged_at     = models.DateTimeField(default=datetime.datetime.now)
+
+    objects = FlaggedItemManager()
+
+    class Meta:
+        unique_together = ('content_type', 'object_id', 'user')
+        db_table = u'flagged_item'
+    def __unicode__(self):
+        return '[%s] flagged at %s' %(self.user, self.flagged_at)
+
+class Question(models.Model):
+    title    = models.CharField(max_length=300)
+    author   = models.ForeignKey(User, related_name='questions')
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    tags     = models.ManyToManyField(Tag, related_name='questions')
+    # Status
+    wiki            = models.BooleanField(default=False)
+    wikified_at     = models.DateTimeField(null=True, blank=True)
+    answer_accepted = models.BooleanField(default=False)
+    closed          = models.BooleanField(default=False)
+    closed_by       = models.ForeignKey(User, null=True, blank=True, related_name='closed_questions')
+    closed_at       = models.DateTimeField(null=True, blank=True)
+    close_reason    = models.SmallIntegerField(choices=CLOSE_REASONS, null=True, blank=True)
+    deleted         = models.BooleanField(default=False)
+    deleted_at      = models.DateTimeField(null=True, blank=True)
+    deleted_by      = models.ForeignKey(User, null=True, blank=True, related_name='deleted_questions')
+    locked          = models.BooleanField(default=False)
+    locked_by       = models.ForeignKey(User, null=True, blank=True, related_name='locked_questions')
+    locked_at       = models.DateTimeField(null=True, blank=True)
+    # Denormalised data
+    score                = models.IntegerField(default=0)
+    vote_up_count        = models.IntegerField(default=0)
+    vote_down_count      = models.IntegerField(default=0)
+    answer_count         = models.PositiveIntegerField(default=0)
+    comment_count        = models.PositiveIntegerField(default=0)
+    view_count           = models.PositiveIntegerField(default=0)
+    offensive_flag_count = models.SmallIntegerField(default=0)
+    favourite_count      = models.PositiveIntegerField(default=0)
+    last_edited_at       = models.DateTimeField(null=True, blank=True)
+    last_edited_by       = models.ForeignKey(User, null=True, blank=True, related_name='last_edited_questions')
+    last_activity_at     = models.DateTimeField(default=datetime.datetime.now)
+    last_activity_by     = models.ForeignKey(User, related_name='last_active_in_questions')
+    tagnames             = models.CharField(max_length=125)
+    summary              = models.CharField(max_length=180)
+    html                 = models.TextField()
+    comments             = generic.GenericRelation(Comment)
+    votes                = generic.GenericRelation(Vote)
+    flagged_items        = generic.GenericRelation(FlaggedItem)
+    email_feeds          = generic.GenericRelation(EmailFeed)
+
+    objects = QuestionManager()
+
+    def save(self, **kwargs):
+        """
+        Overridden to manually manage addition of tags when the object
+        is first saved.
+
+        This is required as we're using ``tagnames`` as the sole means of
+        adding and editing tags.
+        """
+        initial_addition = (self.id is None)
+        super(Question, self).save(**kwargs)
+        if initial_addition:
+            tags = Tag.objects.get_or_create_multiple(self.tagname_list(),
+                                                      self.author)
+            self.tags.add(*tags)
+            Tag.objects.update_use_counts(tags)
+
+    def tagname_list(self):
+        """Creates a list of Tag names from the ``tagnames`` attribute."""
+        return [name for name in self.tagnames.split(u' ')]
+
+    def get_absolute_url(self):
+        return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-'))
+
+    def has_favorite_by_user(self, user):
+        if not user.is_authenticated():
+            return False
+        return FavoriteQuestion.objects.filter(question=self, user=user).count() > 0
+
+    def get_answer_count_by_user(self, user_id):
+        query_set = Answer.objects.filter(author__id=user_id)
+        return query_set.filter(question=self).count()
+
+    def get_question_title(self):
+        if self.closed:
+            attr = CONST['closed'] 
+        elif self.deleted:
+            attr = CONST['deleted']
+        else:
+            attr = None
+        if attr is not None:
+            return u'%s %s' % (self.title, attr)
+        else:
+            return self.title
+
+    def get_revision_url(self):
+        return reverse('question_revisions', args=[self.id])
+
+    def get_latest_revision(self):
+        return self.revisions.all()[0]
+
+    def get_update_summary(self,last_reported_at=None,recipient_email=''):
+        edited = False 
+        if self.last_edited_at and self.last_edited_at > last_reported_at:
+            if self.last_edited_by.email != recipient_email:
+                edited = True 
+        comments = []
+        for comment in self.comments.all():
+            if comment.added_at > last_reported_at and comment.user.email != recipient_email:
+                comments.append(comment)
+        new_answers = []
+        answer_comments = []
+        modified_answers = []
+        commented_answers = []
+        import sets
+        commented_answers = sets.Set([])
+        for answer in self.answers.all():
+            if (answer.added_at > last_reported_at and answer.author.email != recipient_email):
+                new_answers.append(answer)
+            if (answer.last_edited_at 
+                and answer.last_edited_at > last_reported_at 
+                and answer.last_edited_by.email != recipient_email):
+                modified_answers.append(answer)
+            for comment in answer.comments.all():
+                if comment.added_at > last_reported_at and comment.user.email != recipient_email:
+                    commented_answers.add(answer)
+                    answer_comments.append(comment)
+
+        #create the report
+        if edited or comments or new_answers or modified_answers or answer_comments:
+            out = [] 
+            if edited:
+                out.append(_('%(author)s modified the question') % {'author':self.last_edited_by.username})
+            if new_answers:
+                names = sets.Set(map(lambda x: x.author.username,new_answers))
+                people = ', '.join(names)
+                out.append(_('%(people)s posted %(new_answer_count)s new answers') \
+                                % {'new_answer_count':len(new_answers),'people':people})
+            if comments:
+                names = sets.Set(map(lambda x: x.user.username,comments))
+                people = ', '.join(names)
+                out.append(_('%(people)s commented the question') % {'people':people})
+            if answer_comments:
+                names = sets.Set(map(lambda x: x.user.username,answer_comments))
+                people = ', '.join(names)
+                if len(commented_answers) > 1:
+                    out.append(_('%(people)s commented answers') % {'people':people})
+                else:
+                    out.append(_('%(people)s commented an answer') % {'people':people})
+            url = settings.APP_URL + self.get_absolute_url()
+            retval = '<a href="%s">%s</a>:<br>\n' % (url,self.title)
+            out = map(lambda x: '<li>' + x + '</li>',out)
+            retval += '<ul>' + '\n'.join(out) + '</ul><br>\n'
+            return retval
+        else:
+            return None
+
+    def __unicode__(self):
+        return self.title
+
+    class Meta:
+        db_table = u'question'
+
+class QuestionRevision(models.Model):
+    """A revision of a Question."""
+    question   = models.ForeignKey(Question, related_name='revisions')
+    revision   = models.PositiveIntegerField(blank=True)
+    title      = models.CharField(max_length=300)
+    author     = models.ForeignKey(User, related_name='question_revisions')
+    revised_at = models.DateTimeField()
+    tagnames   = models.CharField(max_length=125)
+    summary    = models.CharField(max_length=300, blank=True)
+    text       = models.TextField()
+
+    class Meta:
+        db_table = u'question_revision'
+        ordering = ('-revision',)
+
+    def get_question_title(self):
+        return self.question.title
+
+    def get_absolute_url(self):
+        return '/questions/%s/revisions' % (self.question.id)
+
+    def save(self, **kwargs):
+        """Looks up the next available revision number."""
+        if not self.revision:
+            self.revision = QuestionRevision.objects.filter(
+                question=self.question).values_list('revision',
+                                                    flat=True)[0] + 1
+        super(QuestionRevision, self).save(**kwargs)
+
+    def __unicode__(self):
+        return u'revision %s of %s' % (self.revision, self.title)
+
+class AnonymousAnswer(models.Model):
+    question = models.ForeignKey(Question, related_name='anonymous_answers')
+    session_key = models.CharField(max_length=40)  #session id for anonymous questions
+    wiki = models.BooleanField(default=False)
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    ip_addr = models.IPAddressField(max_length=21) #allow high port numbers
+    author = models.ForeignKey(User,null=True)
+    text = models.TextField()
+    summary = models.CharField(max_length=180)
+
+    def publish(self,user):
+        from forum.views import create_new_answer
+        added_at = datetime.datetime.now()
+        print user.id
+        create_new_answer(question=self.question,wiki=self.wiki,
+                            added_at=added_at,text=self.text,
+                            author=user)
+        self.delete()
+
+class AnonymousQuestion(models.Model):
+    title = models.CharField(max_length=300)
+    session_key = models.CharField(max_length=40)  #session id for anonymous questions
+    text = models.TextField()
+    summary = models.CharField(max_length=180)
+    tagnames = models.CharField(max_length=125)
+    wiki = models.BooleanField(default=False)
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    ip_addr = models.IPAddressField(max_length=21) #allow high port numbers
+    author = models.ForeignKey(User,null=True)
+
+    def publish(self,user):
+        from forum.views import create_new_question
+        added_at = datetime.datetime.now()
+        create_new_question(title=self.title, author=user, added_at=added_at,
+                                wiki=self.wiki, tagnames=self.tagnames,
+                                summary=self.summary, text=self.text)
+        self.delete()
+
+class Answer(models.Model):
+    question = models.ForeignKey(Question, related_name='answers')
+    author   = models.ForeignKey(User, related_name='answers')
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    # Status
+    wiki        = models.BooleanField(default=False)
+    wikified_at = models.DateTimeField(null=True, blank=True)
+    accepted    = models.BooleanField(default=False)
+    accepted_at = models.DateTimeField(null=True, blank=True)
+    deleted     = models.BooleanField(default=False)
+    deleted_by  = models.ForeignKey(User, null=True, blank=True, related_name='deleted_answers')
+    locked      = models.BooleanField(default=False)
+    locked_by   = models.ForeignKey(User, null=True, blank=True, related_name='locked_answers')
+    locked_at   = models.DateTimeField(null=True, blank=True)
+    # Denormalised data
+    score                = models.IntegerField(default=0)
+    vote_up_count        = models.IntegerField(default=0)
+    vote_down_count      = models.IntegerField(default=0)
+    comment_count        = models.PositiveIntegerField(default=0)
+    offensive_flag_count = models.SmallIntegerField(default=0)
+    last_edited_at       = models.DateTimeField(null=True, blank=True)
+    last_edited_by       = models.ForeignKey(User, null=True, blank=True, related_name='last_edited_answers')
+    html                 = models.TextField()
+    comments             = generic.GenericRelation(Comment)
+    votes                = generic.GenericRelation(Vote)
+    flagged_items        = generic.GenericRelation(FlaggedItem)
+
+    objects = AnswerManager()
+
+    def get_user_vote(self, user):
+        votes = self.votes.filter(user=user)
+        if votes.count() > 0:
+            return votes[0]
+        else:
+            return None
+
+    def get_latest_revision(self):
+        return self.revisions.all()[0]
+
+    def get_question_title(self):
+        return self.question.title
+
+    def get_absolute_url(self):
+        return '%s%s#%s' % (reverse('question', args=[self.question.id]), self.question.title, self.id)
+
+    class Meta:
+        db_table = u'answer'
+
+    def __unicode__(self):
+        return self.html
+
+class AnswerRevision(models.Model):
+    """A revision of an Answer."""
+    answer     = models.ForeignKey(Answer, related_name='revisions')
+    revision   = models.PositiveIntegerField()
+    author     = models.ForeignKey(User, related_name='answer_revisions')
+    revised_at = models.DateTimeField()
+    summary    = models.CharField(max_length=300, blank=True)
+    text       = models.TextField()
+
+    def get_absolute_url(self):
+        return '/answers/%s/revisions' % (self.answer.id)
+
+    def get_question_title(self):
+        return self.answer.question.title
+
+    class Meta:
+        db_table = u'answer_revision'
+        ordering = ('-revision',)
+
+    def save(self, **kwargs):
+        """Looks up the next available revision number if not set."""
+        if not self.revision:
+            self.revision = AnswerRevision.objects.filter(
+                answer=self.answer).values_list('revision',
+                                                flat=True)[0] + 1
+        super(AnswerRevision, self).save(**kwargs)
+
+class FavoriteQuestion(models.Model):
+    """A favorite Question of a User."""
+    question      = models.ForeignKey(Question)
+    user          = models.ForeignKey(User, related_name='user_favorite_questions')
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    class Meta:
+        db_table = u'favorite_question'
+    def __unicode__(self):
+        return '[%s] favorited at %s' %(self.user, self.added_at)
+
+class Badge(models.Model):
+    """Awarded for notable actions performed on the site by Users."""
+    GOLD = 1
+    SILVER = 2
+    BRONZE = 3
+    TYPE_CHOICES = (
+        (GOLD,   _('gold')),
+        (SILVER, _('silver')),
+        (BRONZE, _('bronze')),
+    )
+
+    name        = models.CharField(max_length=50)
+    type        = models.SmallIntegerField(choices=TYPE_CHOICES)
+    slug        = models.SlugField(max_length=50, blank=True)
+    description = models.CharField(max_length=300)
+    multiple    = models.BooleanField(default=False)
+    # Denormalised data
+    awarded_count = models.PositiveIntegerField(default=0)
+
+    class Meta:
+        db_table = u'badge'
+        ordering = ('name',)
+        unique_together = ('name', 'type')
+
+    def __unicode__(self):
+        return u'%s: %s' % (self.get_type_display(), self.name)
+
+    def save(self, **kwargs):
+        if not self.slug:
+            self.slug = self.name#slugify(self.name)
+        super(Badge, self).save(**kwargs)
+
+    def get_absolute_url(self):
+        return '%s%s/' % (reverse('badge', args=[self.id]), self.slug)
+
+class Award(models.Model):
+    """The awarding of a Badge to a User."""
+    user       = models.ForeignKey(User, related_name='award_user')
+    badge      = models.ForeignKey(Badge, related_name='award_badge')
+    content_type   = models.ForeignKey(ContentType)
+    object_id      = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    awarded_at = models.DateTimeField(default=datetime.datetime.now)
+    notified   = models.BooleanField(default=False)
+    objects = AwardManager()
+    
+    def __unicode__(self):
+        return u'[%s] is awarded a badge [%s] at %s' % (self.user.username, self.badge.name, self.awarded_at)
+
+    class Meta:
+        db_table = u'award'
+
+class Repute(models.Model):
+    """The reputation histories for user"""
+    user     = models.ForeignKey(User)
+    positive = models.SmallIntegerField(default=0)
+    negative = models.SmallIntegerField(default=0)
+    question = models.ForeignKey(Question)
+    reputed_at = models.DateTimeField(default=datetime.datetime.now)
+    reputation_type = models.SmallIntegerField(choices=TYPE_REPUTATION)
+    reputation = models.IntegerField(default=1)
+    objects = ReputeManager()
+
+    def __unicode__(self):
+        return u'[%s]\' reputation changed at %s' % (self.user.username, self.reputed_at)
+
+    class Meta:
+        db_table = u'repute'
+
+class Activity(models.Model):
+    """
+    We keep some history data for user activities
+    """
+    user = models.ForeignKey(User)
+    activity_type = models.SmallIntegerField(choices=TYPE_ACTIVITY)
+    active_at = models.DateTimeField(default=datetime.datetime.now)
+    content_type   = models.ForeignKey(ContentType)
+    object_id      = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    is_auditted    = models.BooleanField(default=False)
+
+    def __unicode__(self):
+        return u'[%s] was active at %s' % (self.user.username, self.active_at)
+
+    class Meta:
+        db_table = u'activity'
+
+class Book(models.Model):
+    """
+    Model for book info
+    """
+    user = models.ForeignKey(User)
+    title = models.CharField(max_length=255)
+    short_name = models.CharField(max_length=255)
+    author = models.CharField(max_length=255)
+    price = models.DecimalField(max_digits=6, decimal_places=2)
+    pages = models.SmallIntegerField()
+    published_at = models.DateTimeField()
+    publication = models.CharField(max_length=255)
+    cover_img = models.CharField(max_length=255)
+    tagnames = models.CharField(max_length=125)
+    added_at = models.DateTimeField()
+    last_edited_at = models.DateTimeField()
+    questions = models.ManyToManyField(Question, related_name='book', db_table='book_question')
+    
+    def get_absolute_url(self):
+        return '%s' % reverse('book', args=[self.short_name])
+        
+    def __unicode__(self):
+        return self.title
+    class Meta:
+        db_table = u'book'
+
+class BookAuthorInfo(models.Model):
+    """
+    Model for book author info
+    """
+    user = models.ForeignKey(User)
+    book = models.ForeignKey(Book)
+    blog_url = models.CharField(max_length=255)
+    added_at = models.DateTimeField()
+    last_edited_at = models.DateTimeField()
+    
+    class Meta:
+        db_table = u'book_author_info'
+    
+class BookAuthorRss(models.Model):
+    """
+    Model for book author blog rss
+    """
+    user = models.ForeignKey(User)
+    book = models.ForeignKey(Book)
+    title = models.CharField(max_length=255)
+    url = models.CharField(max_length=255)
+    rss_created_at = models.DateTimeField()
+    added_at = models.DateTimeField()
+    
+    class Meta:
+        db_table = u'book_author_rss'
+
+class AnonymousEmail(models.Model):
+    #validation key, if used
+    key = models.CharField(max_length=32)
+    email = models.EmailField(null=False,unique=True)
+    isvalid = models.BooleanField(default=False)
+    feeds = generic.GenericRelation(EmailFeed)
+
+# User extend properties
+QUESTIONS_PER_PAGE_CHOICES = (
+   (10, u'10'),
+   (30, u'30'),
+   (50, u'50'),
+)
+
+User.add_to_class('email_isvalid', models.BooleanField(default=False))
+User.add_to_class('email_key', models.CharField(max_length=16, null=True))
+User.add_to_class('reputation', models.PositiveIntegerField(default=1))
+User.add_to_class('gravatar', models.CharField(max_length=32))
+User.add_to_class('email_feeds', generic.GenericRelation(EmailFeed))
+User.add_to_class('favorite_questions',
+                  models.ManyToManyField(Question, through=FavoriteQuestion,
+                                         related_name='favorited_by'))
+User.add_to_class('badges', models.ManyToManyField(Badge, through=Award,
+                                                   related_name='awarded_to'))
+User.add_to_class('gold', models.SmallIntegerField(default=0))
+User.add_to_class('silver', models.SmallIntegerField(default=0))
+User.add_to_class('bronze', models.SmallIntegerField(default=0))
+User.add_to_class('questions_per_page',
+                  models.SmallIntegerField(choices=QUESTIONS_PER_PAGE_CHOICES, default=10))
+User.add_to_class('last_seen',
+                  models.DateTimeField(default=datetime.datetime.now))
+User.add_to_class('real_name', models.CharField(max_length=100, blank=True))
+User.add_to_class('website', models.URLField(max_length=200, blank=True))
+User.add_to_class('location', models.CharField(max_length=100, blank=True))
+User.add_to_class('date_of_birth', models.DateField(null=True, blank=True))
+User.add_to_class('about', models.TextField(blank=True))
+
+# custom signal
+tags_updated = django.dispatch.Signal(providing_args=["question"])
+edit_question_or_answer = django.dispatch.Signal(providing_args=["instance", "modified_by"])
+delete_post_or_answer = django.dispatch.Signal(providing_args=["instance", "deleted_by"])
+mark_offensive = django.dispatch.Signal(providing_args=["instance", "mark_by"])
+user_updated = django.dispatch.Signal(providing_args=["instance", "updated_by"])
+user_logged_in = django.dispatch.Signal(providing_args=["session"])
+
+
+def get_messages(self):
+    messages = []
+    for m in self.message_set.all():
+        messages.append(m.message)
+    return messages
+
+def delete_messages(self):
+    self.message_set.all().delete()
+
+def get_profile_url(self):
+    """Returns the URL for this User's profile."""
+    return '%s%s/' % (reverse('user', args=[self.id]), self.username)
+User.add_to_class('get_profile_url', get_profile_url)
+User.add_to_class('get_messages', get_messages)
+User.add_to_class('delete_messages', delete_messages)
+
+def calculate_gravatar_hash(instance, **kwargs):
+    """Calculates a User's gravatar hash from their email address."""
+    if kwargs.get('raw', False):
+        return
+    instance.gravatar = hashlib.md5(instance.email).hexdigest()
+
+def record_ask_event(instance, created, **kwargs):
+    if created:
+        activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ASK_QUESTION)
+        activity.save()
+
+def record_answer_event(instance, created, **kwargs):
+    if created:
+        activity = Activity(user=instance.author, active_at=instance.added_at, content_object=instance, activity_type=TYPE_ACTIVITY_ANSWER)
+        activity.save()
+
+def record_comment_event(instance, created, **kwargs):
+    if created:
+        from django.contrib.contenttypes.models import ContentType
+        question_type = ContentType.objects.get_for_model(Question)
+        question_type_id = question_type.id
+        type = TYPE_ACTIVITY_COMMENT_QUESTION if instance.content_type_id == question_type_id else TYPE_ACTIVITY_COMMENT_ANSWER
+        activity = Activity(user=instance.user, active_at=instance.added_at, content_object=instance, activity_type=type)
+        activity.save()
+
+def record_revision_question_event(instance, created, **kwargs):
+    if created and instance.revision <> 1:
+        activity = Activity(user=instance.author, active_at=instance.revised_at, content_object=instance, activity_type=TYPE_ACTIVITY_UPDATE_QUESTION)
+        activity.save()
+
+def record_revision_answer_event(instance, created, **kwargs):
+    if created and instance.revision <> 1:
+        activity = Activity(user=instance.author, active_at=instance.revised_at, content_object=instance, activity_type=TYPE_ACTIVITY_UPDATE_ANSWER)
+        activity.save()
+
+def record_award_event(instance, created, **kwargs):
+    """
+    After we awarded a badge to user, we need to record this activity and notify user.
+    We also recaculate awarded_count of this badge and user information.
+    """
+    if created:
+        activity = Activity(user=instance.user, active_at=instance.awarded_at, content_object=instance,
+            activity_type=TYPE_ACTIVITY_PRIZE)
+        activity.save()
+
+        instance.badge.awarded_count += 1
+        instance.badge.save()
+
+        if instance.badge.type == Badge.GOLD:
+            instance.user.gold += 1
+        if instance.badge.type == Badge.SILVER:
+            instance.user.silver += 1
+        if instance.badge.type == Badge.BRONZE:
+            instance.user.bronze += 1
+        instance.user.save()
+
+def notify_award_message(instance, created, **kwargs):
+    """
+    Notify users when they have been awarded badges by using Django message.
+    """
+    if created:
+        user = instance.user
+        user.message_set.create(message=u"%s" % instance.badge.name)
+
+def record_answer_accepted(instance, created, **kwargs):
+    """
+    when answer is accepted, we record this for question author - who accepted it.
+    """
+    if not created and instance.accepted:
+        activity = Activity(user=instance.question.author, active_at=datetime.datetime.now(), \
+            content_object=instance, activity_type=TYPE_ACTIVITY_MARK_ANSWER)
+        activity.save()
+
+def update_last_seen(instance, created, **kwargs):
+    """
+    when user has activities, we update 'last_seen' time stamp for him
+    """
+    user = instance.user
+    user.last_seen = datetime.datetime.now()
+    user.save()
+
+def record_vote(instance, created, **kwargs):
+    """
+    when user have voted
+    """
+    if created:
+        if instance.vote == 1:
+            vote_type = TYPE_ACTIVITY_VOTE_UP
+        else:
+            vote_type = TYPE_ACTIVITY_VOTE_DOWN
+
+        activity = Activity(user=instance.user, active_at=instance.voted_at, content_object=instance, activity_type=vote_type)
+        activity.save()
+
+def record_cancel_vote(instance, **kwargs):
+    """
+    when user canceled vote, the vote will be deleted.
+    """
+    activity = Activity(user=instance.user, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_CANCEL_VOTE)
+    activity.save()
+
+def record_delete_question(instance, delete_by, **kwargs):
+    """
+    when user deleted the question
+    """
+    if instance.__class__ == "Question":
+        activity_type = TYPE_ACTIVITY_DELETE_QUESTION
+    else:
+        activity_type = TYPE_ACTIVITY_DELETE_ANSWER
+
+    activity = Activity(user=delete_by, active_at=datetime.datetime.now(), content_object=instance, activity_type=activity_type)
+    activity.save()
+
+def record_mark_offensive(instance, mark_by, **kwargs):
+    activity = Activity(user=mark_by, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_MARK_OFFENSIVE)
+    activity.save()
+
+def record_update_tags(question, **kwargs):
+    """
+    when user updated tags of the question
+    """
+    activity = Activity(user=question.author, active_at=datetime.datetime.now(), content_object=question, activity_type=TYPE_ACTIVITY_UPDATE_TAGS)
+    activity.save()
+
+def record_favorite_question(instance, created, **kwargs):
+    """
+    when user add the question in him favorite questions list.
+    """
+    if created:
+        activity = Activity(user=instance.user, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_FAVORITE)
+        activity.save()
+
+def record_user_full_updated(instance, **kwargs):
+    activity = Activity(user=instance, active_at=datetime.datetime.now(), content_object=instance, activity_type=TYPE_ACTIVITY_USER_FULL_UPDATED)
+    activity.save()
+
+def post_stored_anonymous_content(sender,user,session_key,signal,*args,**kwargs):
+    aq_list = AnonymousQuestion.objects.filter(session_key = session_key)
+    aa_list = AnonymousAnswer.objects.filter(session_key = session_key)
+    import settings
+    if settings.EMAIL_VALIDATION == 'on':#add user to the record
+        for aq in aq_list:
+            aq.author = user
+            aq.save()
+        for aa in aa_list:
+            aa.author = user
+            aa.save()
+        #maybe add pending posts message?
+    else: #just publish the questions
+        for aq in aq_list:
+            aq.publish(user)
+        for aa in aa_list:
+            aa.publish(user)
+
+#signal for User modle save changes
+pre_save.connect(calculate_gravatar_hash, sender=User)
+post_save.connect(record_ask_event, sender=Question)
+post_save.connect(record_answer_event, sender=Answer)
+post_save.connect(record_comment_event, sender=Comment)
+post_save.connect(record_revision_question_event, sender=QuestionRevision)
+post_save.connect(record_revision_answer_event, sender=AnswerRevision)
+post_save.connect(record_award_event, sender=Award)
+post_save.connect(notify_award_message, sender=Award)
+post_save.connect(record_answer_accepted, sender=Answer)
+post_save.connect(update_last_seen, sender=Activity)
+post_save.connect(record_vote, sender=Vote)
+post_delete.connect(record_cancel_vote, sender=Vote)
+delete_post_or_answer.connect(record_delete_question, sender=Question)
+delete_post_or_answer.connect(record_delete_question, sender=Answer)
+mark_offensive.connect(record_mark_offensive, sender=Question)
+mark_offensive.connect(record_mark_offensive, sender=Answer)
+tags_updated.connect(record_update_tags, sender=Question)
+post_save.connect(record_favorite_question, sender=FavoriteQuestion)
+user_updated.connect(record_user_full_updated, sender=User)
+user_logged_in.connect(post_stored_anonymous_content)
diff --git a/forum/views.py b/forum/views.py
index e69de29b..6ef7bd6d 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -0,0 +1,2084 @@
+# encoding:utf-8
+import os.path
+import time, datetime, calendar, random
+import logging
+from urllib import quote, unquote
+from django.conf import settings
+from django.core.files.storage import default_storage
+from django.shortcuts import render_to_response, get_object_or_404
+from django.contrib.auth.decorators import login_required
+from django.http import HttpResponseRedirect, HttpResponse,Http404
+from django.core.paginator import Paginator, EmptyPage, InvalidPage
+from django.template import RequestContext
+from django.utils.html import *
+from django.utils import simplejson
+from django.core import serializers
+from django.db import transaction
+from django.contrib.contenttypes.models import ContentType
+from django.utils.translation import ugettext as _
+
+from utils.html import sanitize_html
+from markdown2 import Markdown
+#from lxml.html.diff import htmldiff
+from forum.diff import textDiff as htmldiff
+from forum.forms import *
+from forum.models import *
+from forum.auth import *
+from forum.const import *
+from forum.user import *
+from forum import auth
+
+# used in index page
+INDEX_PAGE_SIZE = 20
+INDEX_AWARD_SIZE = 15
+INDEX_TAGS_SIZE = 100
+# used in tags list
+DEFAULT_PAGE_SIZE = 60
+# used in questions
+QUESTIONS_PAGE_SIZE = 10
+# used in users
+USERS_PAGE_SIZE = 35
+# used in answers
+ANSWERS_PAGE_SIZE = 10
+markdowner = Markdown(html4tags=True)
+question_type = ContentType.objects.get_for_model(Question)
+answer_type = ContentType.objects.get_for_model(Answer)
+comment_type = ContentType.objects.get_for_model(Comment)
+question_revision_type = ContentType.objects.get_for_model(QuestionRevision)
+answer_revision_type = ContentType.objects.get_for_model(AnswerRevision)
+repute_type =ContentType.objects.get_for_model(Repute)
+question_type_id = question_type.id
+answer_type_id = answer_type.id
+comment_type_id = comment_type.id
+question_revision_type_id = question_revision_type.id
+answer_revision_type_id = answer_revision_type.id
+repute_type_id = repute_type.id
+def _get_tags_cache_json():
+    tags = Tag.objects.filter(deleted=False).all()
+    tags_list = []
+    for tag in tags:
+        dic = {'n': tag.name, 'c': tag.used_count }
+        tags_list.append(dic)
+    tags = simplejson.dumps(tags_list)
+    return tags
+
+def index(request):
+    view_id = request.GET.get('sort', None)
+    view_dic = {
+             "latest":"-last_activity_at",
+             "hottest":"-answer_count",
+             "mostvoted":"-score",
+             "trans": "-last_activity_at"
+             }
+    try:
+        orderby = view_dic[view_id]
+    except KeyError:
+        view_id = "latest"
+        orderby = "-last_activity_at"
+    # group questions by author_id of 28,29
+    if view_id == 'trans':
+        questions = Question.objects.get_translation_questions(orderby, INDEX_PAGE_SIZE)
+    else:
+        questions = Question.objects.get_questions_by_pagesize(orderby, INDEX_PAGE_SIZE)
+    # RISK - inner join queries
+    questions = questions.select_related()
+    tags = Tag.objects.get_valid_tags(INDEX_TAGS_SIZE)
+
+    awards = Award.objects.get_recent_awards()
+
+    return render_to_response('index.html', {
+        "questions" : questions,
+        "tab_id" : view_id,
+        "tags" : tags,
+        "awards" : awards[:INDEX_AWARD_SIZE],
+        }, context_instance=RequestContext(request))
+
+def about(request):
+    return render_to_response('about.html', context_instance=RequestContext(request))
+
+def faq(request):
+    return render_to_response('faq.html', context_instance=RequestContext(request))
+
+def privacy(request):
+    return render_to_response('privacy.html', context_instance=RequestContext(request))
+
+def unanswered(request):
+    return questions(request, unanswered=True)
+
+def questions(request, tagname=None, unanswered=False):
+    """
+    List of Questions, Tagged questions, and Unanswered questions.
+    """
+    # template file
+    # "questions.html" or "unanswered.html"
+    template_file = "questions.html"
+    # Set flag to False by default. If it is equal to True, then need to be saved.
+    pagesize_changed = False
+    # get pagesize from session, if failed then get default value
+    pagesize = request.session.get("pagesize",10)
+    try:
+        page = int(request.GET.get('page', '1'))
+    except ValueError:
+        page = 1
+
+    view_id = request.GET.get('sort', None)
+    view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
+    try:
+        orderby = view_dic[view_id]
+    except KeyError:
+        view_id = "latest"
+        orderby = "-added_at"
+
+    # check if request is from tagged questions
+    if tagname is not None:
+        objects = Question.objects.get_questions_by_tag(tagname, orderby)
+    elif unanswered:
+        #check if request is from unanswered questions
+        template_file = "unanswered.html"
+        objects = Question.objects.get_unanswered_questions(orderby)
+    else:
+        objects = Question.objects.get_questions(orderby)
+
+    # RISK - inner join queries
+    objects = objects.select_related(depth=1);
+    objects_list = Paginator(objects, pagesize)
+    questions = objects_list.page(page)
+
+    # Get related tags from this page objects
+    if questions.object_list.count() > 0:
+        related_tags = Tag.objects.get_tags_by_questions(questions.object_list)
+    else:
+        related_tags = None
+    return render_to_response(template_file, {
+        "questions" : questions,
+        "tab_id" : view_id,
+        "questions_count" : objects_list.count,
+        "tags" : related_tags,
+        "searchtag" : tagname,
+        "is_unanswered" : unanswered,
+        "context" : {
+            'is_paginated' : True,
+            'pages': objects_list.num_pages,
+            'page': page,
+            'has_previous': questions.has_previous(),
+            'has_next': questions.has_next(),
+            'previous': questions.previous_page_number(),
+            'next': questions.next_page_number(),
+            'base_url' : request.path + '?sort=%s&' % view_id,
+            'pagesize' : pagesize
+        }}, context_instance=RequestContext(request))
+
+def create_new_answer( question=None, author=None,\
+            added_at=None, wiki=False,\
+            text='', email_notify=False):
+
+    html = sanitize_html(markdowner.convert(text))
+
+    #create answer
+    answer = Answer(
+        question = question,
+        author = author,
+        added_at = added_at,
+        wiki = wiki,
+        html = html
+    )
+    if answer.wiki:
+        answer.last_edited_by = answer.author
+        answer.last_edited_at = added_at 
+        answer.wikified_at = added_at 
+
+    answer.save()
+
+    #update question data
+    question.last_activity_at = added_at 
+    question.last_activity_by = author 
+    question.save()
+    Question.objects.update_answer_count(question)
+
+    #update revision
+    AnswerRevision.objects.create(
+        answer     = answer,
+        revision   = 1,
+        author     = author,
+        revised_at = added_at,
+        summary    = CONST['default_version'],
+        text       = text
+    )
+
+    #set notification/delete
+    if email_notify:
+        try:
+            EmailFeed.objects.get(feed_id = question.id, subscriber_id = author.id, feed_content_type=question_type)
+        except EmailFeed.DoesNotExist:
+            feed = EmailFeed(content = question, subscriber = author)
+            feed.save()
+    else:
+        #not sure if this is necessary. ajax should take care of this...
+        try:
+            feed = Email.objects.get(feed_id = question.id, subscriber_id = author.id, feed_content_type=question_type)
+            feed.delete()
+        except:
+            pass
+
+def create_new_question(title=None,author=None,added_at=None,
+                        wiki=False,tagnames=None,summary=None,
+                        text=None):
+    """this is not a view
+    and maybe should become one of the methods on Question object?
+    """
+    html = sanitize_html(markdowner.convert(text))
+    question = Question(
+        title            = title,
+        author           = author, 
+        added_at         = added_at,
+        last_activity_at = added_at,
+        last_activity_by = author,
+        wiki             = wiki,
+        tagnames         = tagnames,
+        html             = html,
+        summary          = summary 
+    )
+    if question.wiki:
+        question.last_edited_by = question.author
+        question.last_edited_at = added_at
+        question.wikified_at = added_at
+
+    question.save()
+
+    # create the first revision
+    QuestionRevision.objects.create(
+        question   = question,
+        revision   = 1,
+        title      = question.title,
+        author     = author,
+        revised_at = added_at,
+        tagnames   = question.tagnames,
+        summary    = CONST['default_version'],
+        text       = text
+    )
+    return question
+
+#TODO: allow anynomus user to ask question by providing email and username.
+#@login_required
+def ask(request):
+    if request.method == "POST":
+        form = AskForm(request.POST)
+        if form.is_valid():
+
+            added_at = datetime.datetime.now()
+            title = strip_tags(form.cleaned_data['title'])
+            wiki = form.cleaned_data['wiki']
+            tagnames = form.cleaned_data['tags'].strip()
+            text = form.cleaned_data['text']
+            html = sanitize_html(markdowner.convert(text))
+            summary = strip_tags(html)[:120]
+
+            if request.user.is_authenticated():
+                author = request.user 
+
+                question = create_new_question(
+                    title            = title,
+                    author           = author, 
+                    added_at         = added_at,
+                    wiki             = wiki,
+                    tagnames         = tagnames,
+                    summary          = summary,
+                    text = text
+                )
+
+                return HttpResponseRedirect(question.get_absolute_url())
+            else:
+                request.session.flush()
+                session_key = request.session.session_key
+                question = AnonymousQuestion(
+                    session_key = session_key,
+                    title       = title,
+                    tagnames = tagnames,
+                    wiki = wiki,
+                    text = text,
+                    summary = summary,
+                    added_at = added_at,
+					ip_addr = request.META['REMOTE_ADDR'],
+                )
+                question.save()
+                return HttpResponseRedirect('%s%s%s' % ( _('/account/'),_('signin/'),('newquestion/')))
+    else:
+        form = AskForm()
+
+    tags = _get_tags_cache_json()
+    return render_to_response('ask.html', {
+        'form' : form,
+        'tags' : tags,
+        }, context_instance=RequestContext(request))
+
+def question(request, id):
+    try:
+        page = int(request.GET.get('page', '1'))
+    except ValueError:
+        page = 1
+    view_id = request.GET.get('sort', 'votes')
+    view_dic = {"latest":"-added_at", "oldest":"added_at", "votes":"-score" }
+    try:
+        orderby = view_dic[view_id]
+    except KeyError:
+        view_id = "votes"
+        orderby = "-score"
+
+    question = get_object_or_404(Question, id=id)
+    if question.deleted and not can_view_deleted_post(request.user, question):
+        raise Http404
+    answer_form = AnswerForm(question,request.user)
+    answers = Answer.objects.get_answers_from_question(question, request.user)
+    answers = answers.select_related(depth=1)
+
+    favorited = question.has_favorite_by_user(request.user)
+    question_vote = question.votes.select_related().filter(user=request.user)
+    if question_vote is not None and question_vote.count() > 0:
+        question_vote = question_vote[0]
+
+    user_answer_votes = {}
+    for answer in answers:
+        vote = answer.get_user_vote(request.user)
+        if vote is not None and not user_answer_votes.has_key(answer.id):
+            vote_value = -1
+            if vote.is_upvote():
+                vote_value = 1
+            user_answer_votes[answer.id] = vote_value
+
+
+    if answers is not None:
+        answers = answers.order_by("-accepted", orderby)
+
+    filtered_answers = []
+    for answer in answers:
+        if answer.deleted == True:
+            if answer.author_id == request.user.id:
+                filtered_answers.append(answer)
+        else:
+            filtered_answers.append(answer)
+
+    objects_list = Paginator(filtered_answers, ANSWERS_PAGE_SIZE)
+    page_objects = objects_list.page(page)
+    # update view count
+    Question.objects.update_view_count(question)
+    return render_to_response('question.html', {
+        "question" : question,
+        "question_vote" : question_vote,
+        "question_comment_count":question.comments.count(),
+        "answer" : answer_form,
+        "answers" : page_objects.object_list,
+        "user_answer_votes": user_answer_votes,
+        "tags" : question.tags.all(),
+        "tab_id" : view_id,
+        "favorited" : favorited,
+        "similar_questions" : Question.objects.get_similar_questions(question),
+        "context" : {
+            'is_paginated' : True,
+            'pages': objects_list.num_pages,
+            'page': page,
+            'has_previous': page_objects.has_previous(),
+            'has_next': page_objects.has_next(),
+            'previous': page_objects.previous_page_number(),
+            'next': page_objects.next_page_number(),
+            'base_url' : request.path + '?sort=%s&' % view_id,
+            'extend_url' : "#sort-top"
+        }
+        }, context_instance=RequestContext(request))
+
+@login_required
+def close(request, id):
+    question = get_object_or_404(Question, id=id)
+    if not can_close_question(request.user, question):
+        return HttpResponse('Permission denied.')
+    if request.method == 'POST':
+        form = CloseForm(request.POST)
+        if form.is_valid():
+            reason = form.cleaned_data['reason']
+            question.closed = True
+            question.closed_by = request.user
+            question.closed_at = datetime.datetime.now()
+            question.close_reason = reason
+            question.save()
+        return HttpResponseRedirect(question.get_absolute_url())
+    else:
+        form = CloseForm()
+        return render_to_response('close.html', {
+            'form' : form,
+            'question' : question,
+            }, context_instance=RequestContext(request))
+
+@login_required
+def reopen(request, id):
+    question = get_object_or_404(Question, id=id)
+    # open question
+    if not can_reopen_question(request.user, question):
+        return HttpResponse('Permission denied.')
+    if request.method == 'POST' :
+        Question.objects.filter(id=question.id).update(closed=False,
+            closed_by=None, closed_at=None, close_reason=None)
+        return HttpResponseRedirect(question.get_absolute_url())
+    else:
+        return render_to_response('reopen.html', {
+            'question' : question,
+            }, context_instance=RequestContext(request))
+
+@login_required
+def edit_question(request, id):
+    question = get_object_or_404(Question, id=id)
+    if question.deleted and not can_view_deleted_post(request.user, question):
+        raise Http404
+    if can_edit_post(request.user, question):
+        return _edit_question(request, question)
+    elif can_retag_questions(request.user):
+        return _retag_question(request, question)
+    else:
+        raise Http404
+
+def _retag_question(request, question):
+    if request.method == 'POST':
+        form = RetagQuestionForm(question, request.POST)
+        if form.is_valid():
+            if form.has_changed():
+                latest_revision = question.get_latest_revision()
+                retagged_at = datetime.datetime.now()
+                # Update the Question itself
+                Question.objects.filter(id=question.id).update(
+                    tagnames         = form.cleaned_data['tags'],
+                    last_edited_at   = retagged_at,
+                    last_edited_by   = request.user,
+                    last_activity_at = retagged_at,
+                    last_activity_by = request.user
+                )
+                # Update the Question's tag associations
+                tags_updated = Question.objects.update_tags(question,
+                    form.cleaned_data['tags'], request.user)
+                # Create a new revision
+                QuestionRevision.objects.create(
+                    question   = question,
+                    title      = latest_revision.title,
+                    author     = request.user,
+                    revised_at = retagged_at,
+                    tagnames   = form.cleaned_data['tags'],
+                    summary    = CONST['retagged'],
+                    text       = latest_revision.text
+                )
+                # send tags updated singal
+                tags_updated.send(sender=question.__class__, question=question)
+
+            return HttpResponseRedirect(question.get_absolute_url())
+    else:
+        form = RetagQuestionForm(question)
+    return render_to_response('question_retag.html', {
+        'question': question,
+        'form' : form,
+        'tags' : _get_tags_cache_json(),
+    }, context_instance=RequestContext(request))
+
+
+def _edit_question(request, question):
+    latest_revision = question.get_latest_revision()
+    revision_form = None
+    if request.method == 'POST':
+        if 'select_revision' in request.POST:
+            # user has changed revistion number
+            revision_form = RevisionForm(question, latest_revision, request.POST)
+            if revision_form.is_valid():
+                # Replace with those from the selected revision
+                form = EditQuestionForm(question,
+                    QuestionRevision.objects.get(question=question,
+                        revision=revision_form.cleaned_data['revision']))
+            else:
+                form = EditQuestionForm(question, latest_revision, request.POST)
+        else:
+            # Always check modifications against the latest revision
+            form = EditQuestionForm(question, latest_revision, request.POST)
+            if form.is_valid():
+                html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
+                if form.has_changed():
+                    edited_at = datetime.datetime.now()
+                    tags_changed = (latest_revision.tagnames !=
+                                    form.cleaned_data['tags'])
+                    tags_updated = False
+                    # Update the Question itself
+                    updated_fields = {
+                        'title': form.cleaned_data['title'],
+                        'last_edited_at': edited_at,
+                        'last_edited_by': request.user,
+                        'last_activity_at': edited_at,
+                        'last_activity_by': request.user,
+                        'tagnames': form.cleaned_data['tags'],
+                        'summary': strip_tags(html)[:120],
+                        'html': html,
+                    }
+
+                    # only save when it's checked
+                    # because wiki doesn't allow to be edited if last version has been enabled already
+                    # and we make sure this in forms.
+                    if ('wiki' in form.cleaned_data and
+                        form.cleaned_data['wiki']):
+                        updated_fields['wiki'] = True
+                        updated_fields['wikified_at'] = edited_at
+
+                    Question.objects.filter(
+                        id=question.id).update(**updated_fields)
+                    # Update the Question's tag associations
+                    if tags_changed:
+                        tags_updated = Question.objects.update_tags(
+                            question, form.cleaned_data['tags'], request.user)
+                    # Create a new revision
+                    revision = QuestionRevision(
+                        question   = question,
+                        title      = form.cleaned_data['title'],
+                        author     = request.user,
+                        revised_at = edited_at,
+                        tagnames   = form.cleaned_data['tags'],
+                        text       = form.cleaned_data['text'],
+                    )
+                    if form.cleaned_data['summary']:
+                        revision.summary = form.cleaned_data['summary']
+                    else:
+                        revision.summary = 'No.%s Revision' % latest_revision.revision
+                    revision.save()
+
+                return HttpResponseRedirect(question.get_absolute_url())
+    else:
+
+        revision_form = RevisionForm(question, latest_revision)
+        form = EditQuestionForm(question, latest_revision)
+    return render_to_response('question_edit.html', {
+        'question': question,
+        'revision_form': revision_form,
+        'form' : form,
+        'tags' : _get_tags_cache_json()
+    }, context_instance=RequestContext(request))
+
+
+@login_required
+def edit_answer(request, id):
+    answer = get_object_or_404(Answer, id=id)
+    if answer.deleted and not can_view_deleted_post(request.user, answer):
+        raise Http404
+    elif not can_edit_post(request.user, answer):
+        raise Http404
+    else:
+        latest_revision = answer.get_latest_revision()
+        if request.method == "POST":
+            if 'select_revision' in request.POST:
+                # user has changed revistion number
+                revision_form = RevisionForm(answer, latest_revision, request.POST)
+                if revision_form.is_valid():
+                    # Replace with those from the selected revision
+                    form = EditAnswerForm(answer,
+                        AnswerRevision.objects.get(answer=answer,
+                            revision=revision_form.cleaned_data['revision']))
+                else:
+                    form = EditAnswerForm(answer, latest_revision, request.POST)
+            else:
+                form = EditAnswerForm(answer, latest_revision, request.POST)
+                if form.is_valid():
+                    html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
+                    if form.has_changed():
+                        edited_at = datetime.datetime.now()
+                        updated_fields = {
+                            'last_edited_at': edited_at,
+                            'last_edited_by': request.user,
+                            'html': html,
+                        }
+                        Answer.objects.filter(id=answer.id).update(**updated_fields)
+
+                        revision = AnswerRevision(
+                            answer     = answer,
+                            author     = request.user,
+                            revised_at = edited_at,
+                            text       = form.cleaned_data['text']
+                        )
+
+                        if form.cleaned_data['summary']:
+                            revision.summary = form.cleaned_data['summary']
+                        else:
+                            revision.summary = 'No.%s Revision' % latest_revision.revision
+                        revision.save()
+
+                        answer.question.last_activity_at = edited_at
+                        answer.question.last_activity_by = request.user
+                        answer.question.save()
+
+                    return HttpResponseRedirect(answer.get_absolute_url())
+        else:
+            revision_form = RevisionForm(answer, latest_revision)
+            form = EditAnswerForm(answer, latest_revision)
+        return render_to_response('answer_edit.html', {
+        'answer': answer,
+        'revision_form': revision_form,
+        'form' : form,
+    }, context_instance=RequestContext(request))
+
+QUESTION_REVISION_TEMPLATE = ('<h1>%(title)s</h1>\n'
+    '<div class="text">%(html)s</div>\n'
+    '<div class="tags">%(tags)s</div>')
+def question_revisions(request, id):
+    post = get_object_or_404(Question, id=id)
+    revisions = list(post.revisions.all())
+    for i, revision in enumerate(revisions):
+        revision.html = QUESTION_REVISION_TEMPLATE % {
+            'title': revision.title,
+            'html': sanitize_html(markdowner.convert(revision.text)),
+            'tags': ' '.join(['<a class="post-tag">%s</a>' % tag
+                              for tag in revision.tagnames.split(' ')]),
+        }
+        if i > 0:
+            revisions[i - 1].diff = htmldiff(revision.html,
+                                             revisions[i - 1].html)
+        else:
+            revisions[i - 1].diff = QUESTION_REVISION_TEMPLATE % {
+                'title': revisions[0].title,
+                'html': sanitize_html(markdowner.convert(revisions[0].text)),
+                'tags': ' '.join(['<a class="post-tag">%s</a>' % tag
+                                  for tag in revisions[0].tagnames.split(' ')]),
+            }
+            revisions[i - 1].summary = None
+    return render_to_response('revisions_question.html', {
+        'post': post,
+        'revisions': revisions,
+    }, context_instance=RequestContext(request))
+
+ANSWER_REVISION_TEMPLATE = ('<div class="text">%(html)s</div>')
+def answer_revisions(request, id):
+    post = get_object_or_404(Answer, id=id)
+    revisions = list(post.revisions.all())
+    for i, revision in enumerate(revisions):
+        revision.html = ANSWER_REVISION_TEMPLATE % {
+            'html': sanitize_html(markdowner.convert(revision.text))
+        }
+        if i > 0:
+            revisions[i - 1].diff = htmldiff(revision.html,
+                                             revisions[i - 1].html)
+        else:
+            revisions[i - 1].diff = revisions[i-1].text
+            revisions[i - 1].summary = None
+    return render_to_response('revisions_answer.html', {
+        'post': post,
+        'revisions': revisions,
+    }, context_instance=RequestContext(request))
+
+def answer(request, id):
+    question = get_object_or_404(Question, id=id)
+    if request.method == "POST":
+        form = AnswerForm(question, request.user, request.POST)
+        if form.is_valid():
+            wiki = form.cleaned_data['wiki']
+            text = form.cleaned_data['text']
+            update_time = datetime.datetime.now()
+
+            if request.user.is_authenticated():
+                create_new_answer(
+                        question=question,
+                        author=request.user,
+                        added_at=update_time,
+                        wiki=wiki,
+                        text=text,
+                        email_notify=form.cleaned_data['email_notify']
+                    )
+            else:
+                request.session.flush()
+                html = sanitize_html(markdowner.convert(text))
+                summary = strip_tags(html)[:120]
+                anon = AnonymousAnswer(
+                    question = question,
+                    wiki = wiki,
+                    text = text,
+                    summary = summary,
+                    session_key = request.session.session_key,
+                    ip_addr = request.META['REMOTE_ADDR'],
+                    )
+                anon.save()
+                return HttpResponseRedirect('/account/signin/newanswer')
+
+    return HttpResponseRedirect(question.get_absolute_url())
+
+def tags(request):
+    stag = ""
+    is_paginated = True
+    sortby = request.GET.get('sort', 'used')
+    try:
+        page = int(request.GET.get('page', '1'))
+    except ValueError:
+        page = 1
+
+    if request.method == "GET":
+        stag = request.GET.get("q", "").strip()
+        if stag is not None:
+            objects_list = Paginator(Tag.objects.filter(deleted=False).exclude(used_count=0).extra(where=['name like %s'], params=['%' + stag + '%']), DEFAULT_PAGE_SIZE)
+        else:
+            if sortby == "name":
+                objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("name"), DEFAULT_PAGE_SIZE)
+            else:
+                objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-used_count"), DEFAULT_PAGE_SIZE)
+
+    try:
+        tags = objects_list.page(page)
+    except (EmptyPage, InvalidPage):
+        tags = objects_list.page(objects_list.num_pages)
+
+    return render_to_response('tags.html', {
+        "tags" : tags,
+        "stag" : stag,
+        "tab_id" : sortby,
+        "keywords" : stag,
+        "context" : {
+            'is_paginated' : is_paginated,
+            'pages': objects_list.num_pages,
+            'page': page,
+            'has_previous': tags.has_previous(),
+            'has_next': tags.has_next(),
+            'previous': tags.previous_page_number(),
+            'next': tags.next_page_number(),
+            'base_url' : '/tags/?sort=%s&' % sortby
+        }
+
+        }, context_instance=RequestContext(request))
+
+def tag(request, tag):
+    return questions(request, tagname=tag)
+
+def vote(request, id):
+    """
+    vote_type:
+        acceptAnswer : 0,
+        questionUpVote : 1,
+        questionDownVote : 2,
+        favorite : 4,
+        answerUpVote: 5,
+        answerDownVote:6,
+        offensiveQuestion : 7,
+        offensiveAnswer:8,
+        removeQuestion: 9,
+        removeAnswer:10
+        questionSubscribeUpdates:11
+
+    accept answer code:
+        response_data['allowed'] = -1, Accept his own answer   0, no allowed - Anonymous    1, Allowed - by default
+        response_data['success'] =  0, failed                                               1, Success - by default
+        response_data['status']  =  0, By default                                           1, Answer has been accepted already(Cancel)
+
+    vote code:
+        allowed = -3, Don't have enough votes left
+                  -2, Don't have enough reputation score
+                  -1, Vote his own post
+                   0, no allowed - Anonymous
+                   1, Allowed - by default
+        status  =  0, By default
+                   1, Cancel
+                   2, Vote is too old to be canceled
+
+    offensive code:
+        allowed = -3, Don't have enough flags left
+                  -2, Don't have enough reputation score to do this
+                   0, not allowed
+                   1, allowed
+        status  =  0, by default
+                   1, can't do it again
+    """
+    response_data = {
+        "allowed": 1,
+        "success": 1,
+        "status" : 0,
+        "count"  : 0,
+        "message" : ''
+    }
+
+    def can_vote(vote_score, user):
+        if vote_score == 1:
+            return can_vote_up(request.user)
+        else:
+            return can_vote_down(request.user)
+
+    try:
+        if not request.user.is_authenticated():
+            response_data['allowed'] = 0
+            response_data['success'] = 0
+
+        elif request.is_ajax():
+            question = get_object_or_404(Question, id=id)
+            vote_type = request.POST.get('type')
+
+            #accept answer
+            if vote_type == '0':
+                answer_id = request.POST.get('postId')
+                answer = get_object_or_404(Answer, id=answer_id)
+                # make sure question author is current user
+                if question.author == request.user:
+                    # answer user who is also question author is not allow to accept answer
+                    if answer.author == question.author:
+                        response_data['success'] = 0
+                        response_data['allowed'] = -1
+                    # check if answer has been accepted already
+                    elif answer.accepted:
+                        onAnswerAcceptCanceled(answer, request.user)
+                        response_data['status'] = 1
+                    else:
+                        # set other answers in this question not accepted first
+                        for answer_of_question in Answer.objects.get_answers_from_question(question, request.user):
+                            if answer_of_question != answer and answer_of_question.accepted:
+                                onAnswerAcceptCanceled(answer_of_question, request.user)
+
+                        #make sure retrieve data again after above author changes, they may have related data
+                        answer = get_object_or_404(Answer, id=answer_id)
+                        onAnswerAccept(answer, request.user)
+                else:
+                    response_data['allowed'] = 0
+                    response_data['success'] = 0
+            # favorite
+            elif vote_type == '4':
+                has_favorited = False
+                fav_questions = FavoriteQuestion.objects.filter(question=question)
+                # if the same question has been favorited before, then delete it
+                if fav_questions is not None:
+                    for item in fav_questions:
+                        if item.user == request.user:
+                            item.delete()
+                            response_data['status'] = 1
+                            response_data['count']  = len(fav_questions) - 1
+                            if response_data['count'] < 0:
+                                response_data['count'] = 0
+                            has_favorited = True
+                # if above deletion has not been executed, just insert a new favorite question
+                if not has_favorited:
+                    new_item = FavoriteQuestion(question=question, user=request.user)
+                    new_item.save()
+                    response_data['count']  = FavoriteQuestion.objects.filter(question=question).count()
+                Question.objects.update_favorite_count(question)
+
+            elif vote_type in ['1', '2', '5', '6']:
+                post_id = id
+                post = question
+                vote_score = 1
+                if vote_type in ['5', '6']:
+                    answer_id = request.POST.get('postId')
+                    answer = get_object_or_404(Answer, id=answer_id)
+                    post_id = answer_id
+                    post = answer
+                if vote_type in ['2', '6']:
+                    vote_score = -1
+
+                if post.author == request.user:
+                    response_data['allowed'] = -1
+                elif not can_vote(vote_score, request.user):
+                    response_data['allowed'] = -2
+                elif post.votes.filter(user=request.user).count() > 0:
+                    vote = post.votes.filter(user=request.user)[0]
+                    # unvote should be less than certain time
+                    if (datetime.datetime.now().day - vote.voted_at.day) >= VOTE_RULES['scope_deny_unvote_days']:
+                        response_data['status'] = 2
+                    else:
+                        voted = vote.vote
+                        if voted > 0:
+                            # cancel upvote
+                            onUpVotedCanceled(vote, post, request.user)
+
+                        else:
+                            # cancel downvote
+                            onDownVotedCanceled(vote, post, request.user)
+
+                        response_data['status'] = 1
+                        response_data['count'] = post.score
+                elif Vote.objects.get_votes_count_today_from_user(request.user) >= VOTE_RULES['scope_votes_per_user_per_day']:
+                    response_data['allowed'] = -3
+                else:
+                    vote = Vote(user=request.user, content_object=post, vote=vote_score, voted_at=datetime.datetime.now())
+                    if vote_score > 0:
+                        # upvote
+                        onUpVoted(vote, post, request.user)
+                    else:
+                        # downvote
+                        onDownVoted(vote, post, request.user)
+
+                    votes_left = VOTE_RULES['scope_votes_per_user_per_day'] - Vote.objects.get_votes_count_today_from_user(request.user)
+                    if votes_left <= VOTE_RULES['scope_warn_votes_left']:
+                        response_data['message'] = u'%s votes left' % votes_left
+                    response_data['count'] = post.score
+            elif vote_type in ['7', '8']:
+                post = question
+                post_id = id
+                if vote_type == '8':
+                    post_id = request.POST.get('postId')
+                    post = get_object_or_404(Answer, id=post_id)
+
+                if FlaggedItem.objects.get_flagged_items_count_today(request.user) >= VOTE_RULES['scope_flags_per_user_per_day']:
+                    response_data['allowed'] = -3
+                elif not can_flag_offensive(request.user):
+                    response_data['allowed'] = -2
+                elif post.flagged_items.filter(user=request.user).count() > 0:
+                    response_data['status'] = 1
+                else:
+                    item = FlaggedItem(user=request.user, content_object=post, flagged_at=datetime.datetime.now())
+                    onFlaggedItem(item, post, request.user)
+                    response_data['count'] = post.offensive_flag_count
+                    # send signal when question or answer be marked offensive
+                    mark_offensive.send(sender=post.__class__, instance=post, mark_by=request.user)
+            elif vote_type in ['9', '10']:
+                post = question
+                post_id = id
+                if vote_type == '10':
+                    post_id = request.POST.get('postId')
+                    post = get_object_or_404(Answer, id=post_id)
+
+                if not can_delete_post(request.user, post):
+                    response_data['allowed'] = -2
+                elif post.deleted:
+                    onDeleteCanceled(post, request.user)
+                    response_data['status'] = 1
+                else:
+                    onDeleted(post, request.user)
+                    delete_post_or_answer.send(sender=post.__class__, instance=post, delete_by=request.user)
+            elif vote_type == '11':#subscribe q updates
+                user = request.user
+                if user.is_authenticated():
+                    try:
+                        EmailFeed.objects.get(feed_id=question.id,subscriber_id=user.id,feed_content_type=question_type)
+                    except EmailFeed.DoesNotExist:
+                        feed = EmailFeed(subscriber=user,content=question)
+                        feed.save()
+                        if settings.EMAIL_VALIDATION == 'on' and user.email_isvalid == False:
+                            response_data['message'] = _('subscription saved, %(email)s needs validation') % {'email':user.email}
+                    #response_data['status'] = 1
+                    #responst_data['allowed'] = 1
+                else:
+                    pass
+                    #response_data['status'] = 0
+                    #response_data['allowed'] = 0
+            elif vote_type == '12':#unsubscribe q updates
+                user = request.user
+                if user.is_authenticated():
+                    try:
+                        feed = EmailFeed.objects.get(feed_id=question.id,subscriber_id=user.id)
+                        feed.delete()
+                    except EmailFeed.DoesNotExist:
+                        pass
+                    
+        else:
+            response_data['success'] = 0
+            response_data['message'] = u'Request mode is not supported. Please try again.'
+
+        data = simplejson.dumps(response_data)
+
+    except Exception, e:
+        response_data['message'] = str(e)
+        data = simplejson.dumps(response_data)
+    return HttpResponse(data, mimetype="application/json")
+
+def users(request):
+    is_paginated = True
+    sortby = request.GET.get('sort', 'reputation')
+    suser = request.REQUEST.get('q',  "")
+    try:
+        page = int(request.GET.get('page', '1'))
+    except ValueError:
+        page = 1
+
+    if suser == "":
+        if sortby == "newest":
+            objects_list = Paginator(User.objects.all().order_by('-date_joined'), USERS_PAGE_SIZE)
+        elif sortby == "last":
+            objects_list = Paginator(User.objects.all().order_by('date_joined'), USERS_PAGE_SIZE)
+        elif sortby == "user":
+            objects_list = Paginator(User.objects.all().order_by('username'), USERS_PAGE_SIZE)
+        # default
+        else:
+            objects_list = Paginator(User.objects.all().order_by('-reputation'), USERS_PAGE_SIZE)
+        base_url = '/users/?sort=%s&' % sortby
+    else:
+        sortby = "reputation"
+        objects_list = Paginator(User.objects.extra(where=['username like %s'], params=['%' + suser + '%']).order_by('-reputation'), USERS_PAGE_SIZE)
+        base_url = '/users/?name=%s&sort=%s&' % (suser, sortby)
+
+    try:
+        users = objects_list.page(page)
+    except (EmptyPage, InvalidPage):
+        users = objects_list.page(objects_list.num_pages)
+
+    return render_to_response('users.html', {
+        "users" : users,
+        "suser" : suser,
+        "keywords" : suser,
+        "tab_id" : sortby,
+        "context" : {
+            'is_paginated' : is_paginated,
+            'pages': objects_list.num_pages,
+            'page': page,
+            'has_previous': users.has_previous(),
+            'has_next': users.has_next(),
+            'previous': users.previous_page_number(),
+            'next': users.next_page_number(),
+            'base_url' : base_url
+        }
+
+        }, context_instance=RequestContext(request))
+
+def user(request, id):
+    sort = request.GET.get('sort', 'stats')
+    user_view = dict((v.id, v) for v in USER_TEMPLATE_VIEWS).get(sort, USER_TEMPLATE_VIEWS[0])
+    from forum import views
+    func = getattr(views, user_view.view_name)
+    return func(request, id, user_view)
+
+@login_required
+def edit_user(request, id):
+    user = get_object_or_404(User, id=id)
+    if request.user != user:
+        raise Http404
+    if request.method == "POST":
+        form = EditUserForm(user, request.POST)
+        if form.is_valid():
+            new_email = sanitize_html(form.cleaned_data['email'])
+
+            from django_authopenid.views import set_new_email
+            set_new_email(user, new_email)
+
+            user.real_name = sanitize_html(form.cleaned_data['realname'])
+            user.website = sanitize_html(form.cleaned_data['website'])
+            user.location = sanitize_html(form.cleaned_data['city'])
+            user.date_of_birth = sanitize_html(form.cleaned_data['birthday'])
+            if len(user.date_of_birth) == 0:
+                user.date_of_birth = '1900-01-01'
+            user.about = sanitize_html(form.cleaned_data['about'])
+
+            user.save()
+            # send user updated singal if full fields have been updated
+            if user.email and user.real_name and user.website and user.location and \
+                user.date_of_birth and user.about:
+                user_updated.send(sender=user.__class__, instance=user, updated_by=user)
+            return HttpResponseRedirect(user.get_profile_url())
+    else:
+        form = EditUserForm(user)
+    return render_to_response('user_edit.html', {
+        'form' : form,
+    }, context_instance=RequestContext(request))
+
+def user_stats(request, user_id, user_view):
+    user = get_object_or_404(User, id=user_id)
+    questions = Question.objects.extra(
+        select={
+            'vote_count' : 'question.score',
+            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s AND f.question_id = question.id',
+            'la_user_id' : 'auth_user.id',
+            'la_username' : 'auth_user.username',
+            'la_user_gold' : 'auth_user.gold',
+            'la_user_silver' : 'auth_user.silver',
+            'la_user_bronze' : 'auth_user.bronze',
+            'la_user_reputation' : 'auth_user.reputation'
+            },
+        select_params=[user_id],
+        tables=['question', 'auth_user'],
+        where=['question.deleted = 0 AND question.author_id=%s AND question.last_activity_by_id = auth_user.id'],
+        params=[user_id],
+        order_by=['-vote_count', '-last_activity_at']
+    ).values('vote_count',
+             'favorited_myself',
+             'id',
+             'title',
+             'author_id',
+             'added_at',
+             'answer_accepted',
+             'answer_count',
+             'comment_count',
+             'view_count',
+             'favourite_count',
+             'summary',
+             'tagnames',
+             'vote_up_count',
+             'vote_down_count',
+             'last_activity_at',
+             'la_user_id',
+             'la_username',
+             'la_user_gold',
+             'la_user_silver',
+             'la_user_bronze',
+             'la_user_reputation')[:100]
+
+    answered_questions = Question.objects.extra(
+        select={
+            'vote_up_count' : 'answer.vote_up_count',
+            'vote_down_count' : 'answer.vote_down_count',
+            'answer_id' : 'answer.id',
+            'accepted' : 'answer.accepted',
+            'vote_count' : 'answer.score',
+            'comment_count' : 'answer.comment_count'
+            },
+        tables=['question', 'answer'],
+        where=['answer.deleted=0 AND answer.author_id=%s AND answer.question_id=question.id'],
+        params=[user_id],
+        order_by=['-vote_count', '-answer_id'],
+        select_params=[user_id]
+    ).distinct().values('comment_count',
+                        'id',
+                        'answer_id',
+                        'title',
+                        'author_id',
+                        'accepted',
+                        'vote_count',
+                        'answer_count',
+                        'vote_up_count',
+                        'vote_down_count')[:100]
+    up_votes = Vote.objects.get_up_vote_count_from_user(user)
+    down_votes = Vote.objects.get_down_vote_count_from_user(user)
+    votes_today = Vote.objects.get_votes_count_today_from_user(user)
+    votes_total = VOTE_RULES['scope_votes_per_user_per_day']
+    tags = user.created_tags.all().order_by('-used_count')[:50]
+    awards = Award.objects.extra(
+        select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
+        tables=['award', 'badge'],
+        order_by=['-awarded_at'],
+        where=['user_id=%s AND badge_id=badge.id'],
+        params=[user.id]
+    ).values('id', 'count', 'name', 'description', 'type')
+    total_awards = awards.count()
+    awards.query.group_by = ['badge_id']
+
+    return render_to_response(user_view.template_file,{
+        "tab_name" : user_view.id,
+        "tab_description" : user_view.tab_description,
+        "page_title" : user_view.page_title,
+        "view_user" : user,
+        "questions" : questions,
+        "answered_questions" : answered_questions,
+        "up_votes" : up_votes,
+        "down_votes" : down_votes,
+        "total_votes": up_votes + down_votes,
+        "votes_today_left": votes_total-votes_today,
+        "votes_total_per_day": votes_total,
+        "tags" : tags,
+        "awards": awards,
+        "total_awards" : total_awards,
+    }, context_instance=RequestContext(request))
+
+def user_recent(request, user_id, user_view):
+    user = get_object_or_404(User, id=user_id)
+    def get_type_name(type_id):
+        for item in TYPE_ACTIVITY:
+            if type_id in item:
+                return item[1]
+
+    class Event:
+        def __init__(self, time, type, title, summary, answer_id, question_id):
+            self.time = time
+            self.type = get_type_name(type)
+            self.type_id = type
+            self.title = title
+            self.summary = summary
+            self.title_link = u'/questions/%s/%s#%s' %(question_id, title, answer_id)\
+                if int(answer_id) > 0 else u'/questions/%s/%s' %(question_id, title)
+    class AwardEvent:
+        def __init__(self, time, type, id):
+            self.time = time
+            self.type = get_type_name(type)
+            self.type_id = type
+            self.badge = get_object_or_404(Badge, id=id)
+
+    activities = []
+    # ask questions
+    questions = Activity.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'active_at' : 'activity.active_at',
+            'activity_type' : 'activity.activity_type'
+            },
+        tables=['activity', 'question'],
+        where=['activity.content_type_id = %s AND activity.object_id = ' +
+            'question.id AND activity.user_id = %s AND activity.activity_type = %s'],
+        params=[question_type_id, user_id, TYPE_ACTIVITY_ASK_QUESTION],
+        order_by=['-activity.active_at']
+    ).values(
+            'title',
+            'question_id',
+            'active_at',
+            'activity_type'
+            )
+    if len(questions) > 0:
+        questions = [(Event(q['active_at'], q['activity_type'], q['title'], '', '0', \
+            q['question_id'])) for q in questions]
+        activities.extend(questions)
+
+    # answers
+    answers = Activity.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 'answer.id',
+            'active_at' : 'activity.active_at',
+            'activity_type' : 'activity.activity_type'
+            },
+        tables=['activity', 'answer', 'question'],
+        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' + 
+            'answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
+        params=[answer_type_id, user_id, TYPE_ACTIVITY_ANSWER],
+        order_by=['-activity.active_at']
+    ).values(
+            'title',
+            'question_id',
+            'answer_id',
+            'active_at',
+            'activity_type'
+            )
+    if len(answers) > 0:
+        answers = [(Event(q['active_at'], q['activity_type'], q['title'], '', q['answer_id'], \
+            q['question_id'])) for q in answers]
+        activities.extend(answers)
+
+    # question comments
+    comments = Activity.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'comment.object_id',
+            'added_at' : 'comment.added_at',
+            'activity_type' : 'activity.activity_type'
+            },
+        tables=['activity', 'question', 'comment'],
+
+        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
+            'activity.user_id = comment.user_id AND comment.object_id=question.id AND '+
+            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
+        params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],
+        order_by=['-comment.added_at']
+    ).values(
+            'title',
+            'question_id',
+            'added_at',
+            'activity_type'
+            )
+
+    if len(comments) > 0:
+        comments = [(Event(q['added_at'], q['activity_type'], q['title'], '', '0', \
+            q['question_id'])) for q in comments]
+        activities.extend(comments)
+
+    # answer comments
+    comments = Activity.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 'answer.id',
+            'added_at' : 'comment.added_at',
+            'activity_type' : 'activity.activity_type'
+            },
+        tables=['activity', 'question', 'answer', 'comment'],
+
+        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
+            'activity.user_id = comment.user_id AND comment.object_id=answer.id AND '+
+            'comment.content_type_id=%s AND question.id = answer.question_id AND '+
+            'activity.user_id = %s AND activity.activity_type=%s'],
+        params=[comment_type_id, answer_type_id, user_id, TYPE_ACTIVITY_COMMENT_ANSWER],
+        order_by=['-comment.added_at']
+    ).values(
+            'title',
+            'question_id',
+            'answer_id',
+            'added_at',
+            'activity_type'
+            )
+
+    if len(comments) > 0:
+        comments = [(Event(q['added_at'], q['activity_type'], q['title'], '', q['answer_id'], \
+            q['question_id'])) for q in comments]
+        activities.extend(comments)
+
+    # question revisions
+    revisions = Activity.objects.extra(
+        select={
+            'title' : 'question_revision.title',
+            'question_id' : 'question_revision.question_id',
+            'added_at' : 'activity.active_at',
+            'activity_type' : 'activity.activity_type',
+            'summary' : 'question_revision.summary'
+            },
+        tables=['activity', 'question_revision'],
+        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND '+
+            'activity.user_id = question_revision.author_id AND activity.user_id = %s AND '+
+            'activity.activity_type=%s'],
+        params=[question_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_QUESTION],
+        order_by=['-activity.active_at']
+    ).values(
+            'title',
+            'question_id',
+            'added_at',
+            'activity_type',
+            'summary'
+            )
+
+    if len(revisions) > 0:
+        revisions = [(Event(q['added_at'], q['activity_type'], q['title'], q['summary'], '0', \
+            q['question_id'])) for q in revisions]
+        activities.extend(revisions)
+
+    # answer revisions
+    revisions = Activity.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 'answer.id',
+            'added_at' : 'activity.active_at',
+            'activity_type' : 'activity.activity_type',
+            'summary' : 'answer_revision.summary'
+            },
+        tables=['activity', 'answer_revision', 'question', 'answer'],
+
+        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND '+
+            'activity.user_id = answer_revision.author_id AND activity.user_id = %s AND '+
+            'answer_revision.answer_id=answer.id AND answer.question_id = question.id AND '+
+            'activity.activity_type=%s'],
+        params=[answer_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_ANSWER],
+        order_by=['-activity.active_at']
+    ).values(
+            'title',
+            'question_id',
+            'added_at',
+            'answer_id',
+            'activity_type',
+            'summary'
+            )
+
+    if len(revisions) > 0:
+        revisions = [(Event(q['added_at'], q['activity_type'], q['title'], q['summary'], \
+            q['answer_id'], q['question_id'])) for q in revisions]
+        activities.extend(revisions)
+
+    # accepted answers
+    accept_answers = Activity.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'added_at' : 'activity.active_at',
+            'activity_type' : 'activity.activity_type',
+            },
+        tables=['activity', 'answer', 'question'],
+        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND '+
+            'activity.user_id = question.author_id AND activity.user_id = %s AND '+
+            'answer.question_id=question.id AND activity.activity_type=%s'],
+        params=[answer_type_id, user_id, TYPE_ACTIVITY_MARK_ANSWER],
+        order_by=['-activity.active_at']
+    ).values(
+            'title',
+            'question_id',
+            'added_at',
+            'activity_type',
+            )
+    if len(accept_answers) > 0:
+        accept_answers = [(Event(q['added_at'], q['activity_type'], q['title'], '', '0', \
+            q['question_id'])) for q in accept_answers]
+        activities.extend(accept_answers)
+    #award history
+    awards = Activity.objects.extra(
+        select={
+            'badge_id' : 'badge.id',
+            'awarded_at': 'award.awarded_at',
+            'activity_type' : 'activity.activity_type'
+            },
+        tables=['activity', 'award', 'badge'],
+        where=['activity.user_id = award.user_id AND activity.user_id = %s AND '+
+            'award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
+        params=[user_id, TYPE_ACTIVITY_PRIZE],
+        order_by=['-activity.active_at']
+    ).values(
+            'badge_id',
+            'awarded_at',
+            'activity_type'
+            )
+    if len(awards) > 0:
+        awards = [(AwardEvent(q['awarded_at'], q['activity_type'], q['badge_id'])) for q in awards]
+        activities.extend(awards)
+
+    activities.sort(lambda x,y: cmp(y.time, x.time))
+
+    return render_to_response(user_view.template_file,{
+        "tab_name" : user_view.id,
+        "tab_description" : user_view.tab_description,
+        "page_title" : user_view.page_title,
+        "view_user" : user,
+        "activities" : activities[:user_view.data_size]
+    }, context_instance=RequestContext(request))
+
+def user_responses(request, user_id, user_view):
+    """
+    We list answers for question, comments, and answer accepted by others for this user.
+    """
+    class Response:
+        def __init__(self, type, title, question_id, answer_id, time, username, user_id, content):
+            self.type = type
+            self.title = title
+            self.titlelink = u'/questions/%s/%s#%s' % (question_id, title, answer_id)
+            self.time = time
+            self.userlink = u'/users/%s/%s/' % (user_id, username)
+            self.username = username
+            self.content = u'%s ...' % strip_tags(content)[:300]
+
+        def __unicode__(self):
+            return u'%s %s' % (self.type, self.titlelink)
+
+    user = get_object_or_404(User, id=user_id)
+    responses = []
+    answers = Answer.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 'answer.id',
+            'added_at' : 'answer.added_at',
+            'html' : 'answer.html',
+            'username' : 'auth_user.username',
+            'user_id' : 'auth_user.id'
+            },
+        select_params=[user_id],
+        tables=['answer', 'question', 'auth_user'],
+        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
+            'question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
+        params=[user_id, user_id],
+        order_by=['-answer.id']
+    ).values(
+            'title',
+            'question_id',
+            'answer_id',
+            'added_at',
+            'html',
+            'username',
+            'user_id'
+            )
+    if len(answers) > 0:
+        answers = [(Response(TYPE_RESPONSE['QUESTION_ANSWERED'], a['title'], a['question_id'],
+        a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
+        responses.extend(answers)
+
+
+    # question comments
+    comments = Comment.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'comment.object_id',
+            'added_at' : 'comment.added_at',
+            'comment' : 'comment.comment',
+            'username' : 'auth_user.username',
+            'user_id' : 'auth_user.id'
+            },
+        tables=['question', 'auth_user', 'comment'],
+        where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND '+
+            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
+        params=[user_id, question_type_id, user_id],
+        order_by=['-comment.added_at']
+    ).values(
+            'title',
+            'question_id',
+            'added_at',
+            'comment',
+            'username',
+            'user_id'
+            )
+
+    if len(comments) > 0:
+        comments = [(Response(TYPE_RESPONSE['QUESTION_COMMENTED'], c['title'], c['question_id'],
+            '', c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
+        responses.extend(comments)
+
+    # answer comments
+    comments = Comment.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 'answer.id',
+            'added_at' : 'comment.added_at',
+            'comment' : 'comment.comment',
+            'username' : 'auth_user.username',
+            'user_id' : 'auth_user.id'
+            },
+        tables=['answer', 'auth_user', 'comment', 'question'],
+        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND '+
+            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id '+
+            'AND question.id = answer.question_id'],
+        params=[user_id, answer_type_id, user_id],
+        order_by=['-comment.added_at']
+    ).values(
+            'title',
+            'question_id',
+            'answer_id',
+            'added_at',
+            'comment',
+            'username',
+            'user_id'
+            )
+
+    if len(comments) > 0:
+        comments = [(Response(TYPE_RESPONSE['ANSWER_COMMENTED'], c['title'], c['question_id'],
+        c['answer_id'], c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
+        responses.extend(comments)
+
+    # answer has been accepted
+    answers = Answer.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 'answer.id',
+            'added_at' : 'answer.accepted_at',
+            'html' : 'answer.html',
+            'username' : 'auth_user.username',
+            'user_id' : 'auth_user.id'
+            },
+        select_params=[user_id],
+        tables=['answer', 'question', 'auth_user'],
+        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
+            'answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
+        params=[user_id],
+        order_by=['-answer.id']
+    ).values(
+            'title',
+            'question_id',
+            'answer_id',
+            'added_at',
+            'html',
+            'username',
+            'user_id'
+            )
+    if len(answers) > 0:
+        answers = [(Response(TYPE_RESPONSE['ANSWER_ACCEPTED'], a['title'], a['question_id'],
+            a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
+        responses.extend(answers)
+
+    # sort posts by time
+    responses.sort(lambda x,y: cmp(y.time, x.time))
+
+    return render_to_response(user_view.template_file,{
+        "tab_name" : user_view.id,
+        "tab_description" : user_view.tab_description,
+        "page_title" : user_view.page_title,
+        "view_user" : user,
+        "responses" : responses[:user_view.data_size],
+
+    }, context_instance=RequestContext(request))
+
+def user_votes(request, user_id, user_view):
+    user = get_object_or_404(User, id=user_id)
+    if not can_view_user_votes(request.user, user):
+        raise Http404
+    votes = []
+    question_votes = Vote.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 0,
+            'voted_at' : 'vote.voted_at',
+            'vote' : 'vote',
+            },
+        select_params=[user_id],
+        tables=['vote', 'question', 'auth_user'],
+        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id '+
+            'AND vote.user_id=auth_user.id'],
+        params=[question_type_id, user_id],
+        order_by=['-vote.id']
+    ).values(
+            'title',
+            'question_id',
+            'answer_id',
+            'voted_at',
+            'vote',
+            )
+    if(len(question_votes) > 0):
+        votes.extend(question_votes)
+
+    answer_votes = Vote.objects.extra(
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 'answer.id',
+            'voted_at' : 'vote.voted_at',
+            'vote' : 'vote',
+            },
+        select_params=[user_id],
+        tables=['vote', 'answer', 'question', 'auth_user'],
+        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id '+
+            'AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
+        params=[answer_type_id, user_id],
+        order_by=['-vote.id']
+    ).values(
+            'title',
+            'question_id',
+            'answer_id',
+            'voted_at',
+            'vote',
+            )
+    if(len(answer_votes) > 0):
+        votes.extend(answer_votes)
+    votes.sort(lambda x,y: cmp(y['voted_at'], x['voted_at']))
+    return render_to_response(user_view.template_file,{
+        "tab_name" : user_view.id,
+        "tab_description" : user_view.tab_description,
+        "page_title" : user_view.page_title,
+        "view_user" : user,
+        "votes" : votes[:user_view.data_size]
+
+    }, context_instance=RequestContext(request))
+
+def user_reputation(request, user_id, user_view):
+    user = get_object_or_404(User, id=user_id)
+    reputation = Repute.objects.extra(
+        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 
+            'title': 'question.title'},
+        tables=['repute', 'question'],
+        order_by=['-reputed_at'],
+        where=['user_id=%s AND question_id=question.id'],
+        params=[user.id]
+    ).values('positive', 'negative', 'question_id', 'title', 'reputed_at', 'reputation')
+
+    reputation.query.group_by = ['question_id']
+
+    rep_list = []
+    for rep in Repute.objects.filter(user=user).order_by('reputed_at'):
+        dic = '[%s,%s]' % (calendar.timegm(rep.reputed_at.timetuple()) * 1000, rep.reputation)
+        rep_list.append(dic)
+    reps = ','.join(rep_list)
+    reps = '[%s]' % reps
+
+    return render_to_response(user_view.template_file,{
+        "tab_name" : user_view.id,
+        "tab_description" : user_view.tab_description,
+        "page_title" : user_view.page_title,
+        "view_user" : user,
+        "reputation" : reputation,
+        "reps" : reps
+    }, context_instance=RequestContext(request))
+
+def user_favorites(request, user_id, user_view):
+    user = get_object_or_404(User, id=user_id)
+    questions = Question.objects.extra(
+        select={
+            'vote_count' : 'question.vote_up_count + question.vote_down_count',
+            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s '+
+                'AND f.question_id = question.id',
+            'la_user_id' : 'auth_user.id',
+            'la_username' : 'auth_user.username',
+            'la_user_gold' : 'auth_user.gold',
+            'la_user_silver' : 'auth_user.silver',
+            'la_user_bronze' : 'auth_user.bronze',
+            'la_user_reputation' : 'auth_user.reputation'
+            },
+        select_params=[user_id],
+        tables=['question', 'auth_user', 'favorite_question'],
+        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id '+
+            'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
+        params=[user_id],
+        order_by=['-vote_count', '-question.id']
+    ).values('vote_count',
+             'favorited_myself',
+             'id',
+             'title',
+             'author_id',
+             'added_at',
+             'answer_accepted',
+             'answer_count',
+             'comment_count',
+             'view_count',
+             'favourite_count',
+             'summary',
+             'tagnames',
+             'vote_up_count',
+             'vote_down_count',
+             'last_activity_at',
+             'la_user_id',
+             'la_username',
+             'la_user_gold',
+             'la_user_silver',
+             'la_user_bronze',
+             'la_user_reputation')
+    return render_to_response(user_view.template_file,{
+        "tab_name" : user_view.id,
+        "tab_description" : user_view.tab_description,
+        "page_title" : user_view.page_title,
+        "questions" : questions[:user_view.data_size],
+        "view_user" : user
+    }, context_instance=RequestContext(request))
+
+
+def user_preferences(request, user_id, user_view):
+    user = get_object_or_404(User, id=user_id)
+    return render_to_response(user_view.template_file,{
+        "tab_name" : user_view.id,
+        "tab_description" : user_view.tab_description,
+        "page_title" : user_view.page_title,
+        "view_user" : user,
+    }, context_instance=RequestContext(request))
+
+def question_comments(request, id):
+    question = get_object_or_404(Question, id=id)
+    user = request.user
+    return __comments(request, question, 'question', user)
+
+def answer_comments(request, id):
+    answer = get_object_or_404(Answer, id=id)
+    user = request.user
+    return __comments(request, answer, 'answer', user)
+
+def __comments(request, obj, type, user):
+    # only support get comments by ajax now
+    if request.is_ajax():
+        if request.method == "GET":
+            return __generate_comments_json(obj, type, user)
+        elif request.method == "POST":
+            comment_data = request.POST.get('comment')
+            comment = Comment(content_object=obj, comment=comment_data, user=request.user)
+            comment.save()
+            obj.comment_count = obj.comment_count + 1
+            obj.save()
+            return __generate_comments_json(obj, type, user)
+
+def __generate_comments_json(obj, type, user):
+    comments = obj.comments.all().order_by('-id')
+    # {"Id":6,"PostId":38589,"CreationDate":"an hour ago","Text":"hello there!","UserDisplayName":"Jarrod Dixon","UserUrl":"/users/3/jarrod-dixon","DeleteUrl":null}
+    json_comments = []
+    for comment in comments:
+        comment_user = comment.user
+        delete_url = ""
+        if user != None and auth.can_delete_comment(user, comment):
+            #/posts/392845/comments/219852/delete
+            delete_url = "/" + type + "s/%s/comments/%s/delete/" % (obj.id, comment.id)
+        json_comments.append({"id" : comment.id,
+            "object_id" : obj.id,
+            "add_date" : comment.added_at.strftime('%Y-%m-%d'),
+            "text" : comment.comment,
+            "user_display_name" : comment_user.username,
+            "user_url" : "/users/%s/%s" % (comment_user.id, comment_user.username),
+            "delete_url" : delete_url
+        })
+
+    data = simplejson.dumps(json_comments)
+    return HttpResponse(data, mimetype="application/json")
+
+def delete_question_comment(request, question_id, comment_id):
+    if request.is_ajax():
+        question = get_object_or_404(Question, id=question_id)
+        comment = get_object_or_404(Comment, id=comment_id)
+
+        question.comments.remove(comment)
+        question.comment_count = question.comment_count - 1
+        question.save()
+        user = request.user
+        return __generate_comments_json(question, 'question', user)
+
+def delete_answer_comment(request, answer_id, comment_id):
+    if request.is_ajax():
+        answer = get_object_or_404(Answer, id=answer_id)
+        comment = get_object_or_404(Comment, id=comment_id)
+
+        answer.comments.remove(comment)
+        answer.comment_count = answer.comment_count - 1
+        answer.save()
+        user = request.user
+        return __generate_comments_json(answer, 'answer', user)
+
+def logout(request):
+    url = request.GET.get('next')
+    return render_to_response('logout.html', {
+        'next' : url,
+    }, context_instance=RequestContext(request))
+
+def badges(request):
+    badges = Badge.objects.all().order_by('type')
+    my_badges = []
+    if request.user.is_authenticated():
+        my_badges = Award.objects.filter(user=request.user)
+        my_badges.query.group_by = ['badge_id']
+
+    return render_to_response('badges.html', {
+        'badges' : badges,
+        'mybadges' : my_badges,
+    }, context_instance=RequestContext(request))
+
+def badge(request, id):
+    badge = get_object_or_404(Badge, id=id)
+    awards = Award.objects.extra(
+        select={'id': 'auth_user.id', 
+                'name': 'auth_user.username', 
+                'rep':'auth_user.reputation', 
+                'gold': 'auth_user.gold', 
+                'silver': 'auth_user.silver', 
+                'bronze': 'auth_user.bronze'},
+        tables=['award', 'auth_user'],
+        where=['badge_id=%s AND user_id=auth_user.id'],
+        params=[id]
+    ).values('id').distinct()
+
+    return render_to_response('badge.html', {
+        'awards' : awards,
+        'badge' : badge,
+    }, context_instance=RequestContext(request))
+
+def read_message(request):
+    if request.method == "POST":
+        if request.POST['formdata'] == 'required':
+            request.session['message_silent'] = 1
+            if request.user.is_authenticated():
+                request.user.delete_messages()
+    return HttpResponse('')
+
+def upload(request):
+    class FileTypeNotAllow(Exception):
+        pass
+    class FileSizeNotAllow(Exception):
+        pass
+    class UploadPermissionNotAuthorized(Exception):
+        pass
+
+    #<result><msg><![CDATA[%s]]></msg><error><![CDATA[%s]]></error><file_url>%s</file_url></result>
+    xml_template = "<result><msg><![CDATA[%s]]></msg><error><![CDATA[%s]]></error><file_url>%s</file_url></result>"
+
+    try:
+        f = request.FILES['file-upload']
+        # check upload permission
+        if not can_upload_files(request.user):
+            raise UploadPermissionNotAuthorized
+
+        # check file type
+        file_name_suffix = os.path.splitext(f.name)[1].lower()
+        if not file_name_suffix in settings.ALLOW_FILE_TYPES:
+            raise FileTypeNotAllow
+
+        # genetate new file name
+        new_file_name = str(time.time()).replace('.', str(random.randint(0,100000))) + file_name_suffix
+        # use default storage to store file
+        default_storage.save(new_file_name, f)
+        # check file size
+        # byte
+        size = default_storage.size(new_file_name)
+        if size > settings.ALLOW_MAX_FILE_SIZE:
+            default_storage.delete(new_file_name)
+            raise FileSizeNotAllow
+
+        result = xml_template % ('Good', '', default_storage.url(new_file_name))
+    except UploadPermissionNotAuthorized:
+        result = xml_template % ('', _('uploading images is limited to users with >60 reputation points'), '')
+    except FileTypeNotAllow:
+        result = xml_template % ('', _("allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"), '')
+    except FileSizeNotAllow:
+        result = xml_template % ('', _("maximum upload file size is %sK") % settings.ALLOW_MAX_FILE_SIZE / 1024, '')
+    except Exception:
+        result = xml_template % ('', _('Error uploading file. Please contact the site administrator. Thank you. %s' % Exception), '')
+
+    return HttpResponse(result, mimetype="application/xml")
+
+def books(request):
+    return HttpResponseRedirect("/books/mysql-zhaoyang")
+    
+def book(request, short_name, unanswered=False):
+    """
+    1. questions list
+    2. book info
+    3. author info and blog rss items
+    """
+    """
+    List of Questions, Tagged questions, and Unanswered questions.
+    """
+    books = Book.objects.extra(where=['short_name = %s'], params=[short_name])
+    match_count = len(books)
+    if match_count == 0 :
+        raise Http404
+    else:
+        # the book info
+        book = books[0]
+        # get author info
+        author_info = BookAuthorInfo.objects.get(book=book)
+        # get author rss info
+        author_rss = BookAuthorRss.objects.filter(book=book)
+
+        # get pagesize from session, if failed then get default value
+        user_page_size = request.session.get("pagesize", QUESTIONS_PAGE_SIZE)
+        # set pagesize equal to logon user specified value in database
+        if request.user.is_authenticated() and request.user.questions_per_page > 0:
+            user_page_size = request.user.questions_per_page
+            
+        try:
+            page = int(request.GET.get('page', '1'))
+        except ValueError:
+            page = 1
+
+        view_id = request.GET.get('sort', None)
+        view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
+        try:
+            orderby = view_dic[view_id]
+        except KeyError:
+            view_id = "latest"
+            orderby = "-added_at"
+            
+        # check if request is from tagged questions
+        if unanswered:
+            # check if request is from unanswered questions
+            # Article.objects.filter(publications__id__exact=1)
+            objects = Question.objects.filter(book__id__exact=book.id, deleted=False, answer_count=0).order_by(orderby)
+        else:
+            objects = Question.objects.filter(book__id__exact=book.id, deleted=False).order_by(orderby)
+
+        # RISK - inner join queries
+        objects = objects.select_related();
+        objects_list = Paginator(objects, user_page_size)
+        questions = objects_list.page(page)
+
+        return render_to_response('book.html', {
+            "book" : book,
+            "author_info" : author_info,
+            "author_rss" : author_rss,
+            "questions" : questions,
+            "context" : {
+                'is_paginated' : True,
+                'pages': objects_list.num_pages,
+                'page': page,
+                'has_previous': questions.has_previous(),
+                'has_next': questions.has_next(),
+                'previous': questions.previous_page_number(),
+                'next': questions.next_page_number(),
+                'base_url' : request.path + '?sort=%s&' % view_id,
+                'pagesize' : user_page_size
+            }
+        }, context_instance=RequestContext(request))
+
+@login_required
+def ask_book(request, short_name):
+    if request.method == "POST":
+        form = AskForm(request.POST)
+        if form.is_valid():
+            added_at = datetime.datetime.now()
+            html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
+            question = Question(
+                title            = strip_tags(form.cleaned_data['title']),
+                author           = request.user,
+                added_at         = added_at,
+                last_activity_at = added_at,
+                last_activity_by = request.user,
+                wiki             = form.cleaned_data['wiki'],
+                tagnames         = form.cleaned_data['tags'].strip(),
+                html             = html,
+                summary          = strip_tags(html)[:120]
+            )
+            if question.wiki:
+                question.last_edited_by = question.author
+                question.last_edited_at = added_at
+                question.wikified_at = added_at
+
+            question.save()
+
+            # create the first revision
+            QuestionRevision.objects.create(
+                question   = question,
+                revision   = 1,
+                title      = question.title,
+                author     = request.user,
+                revised_at = added_at,
+                tagnames   = question.tagnames,
+                summary    = CONST['default_version'],
+                text       = form.cleaned_data['text']
+            )
+            
+            books = Book.objects.extra(where=['short_name = %s'], params=[short_name])
+            match_count = len(books)
+            if match_count == 1:
+                # the book info
+                book = books[0]
+                book.questions.add(question)
+
+            return HttpResponseRedirect(question.get_absolute_url())
+    else:
+        form = AskForm()
+
+    tags = _get_tags_cache_json()
+    return render_to_response('ask.html', {
+        'form' : form,
+        'tags' : tags,
+        }, context_instance=RequestContext(request))
+
+def search(request):
+    """
+    Search by question, user and tag keywords.
+    For questions now we only search keywords in question title.
+    """
+    if request.method == "GET":
+        keywords = request.GET.get("q")
+        search_type = request.GET.get("t")
+        try:
+            page = int(request.GET.get('page', '1'))
+        except ValueError:
+            page = 1
+        if keywords is None:
+            return HttpResponseRedirect('/')
+        if search_type == 'tag':
+            return HttpResponseRedirect('/tags/?q=%s&page=%s' % (keywords.strip(), page))
+        elif search_type == "user":
+            return HttpResponseRedirect('/users/?q=%s&page=%s' % (keywords.strip(), page))
+        elif search_type == "question":
+            
+            template_file = "questions.html"
+            # Set flag to False by default. If it is equal to True, then need to be saved.
+            pagesize_changed = False
+            # get pagesize from session, if failed then get default value
+            user_page_size = request.session.get("pagesize", QUESTIONS_PAGE_SIZE)
+            # set pagesize equal to logon user specified value in database
+            if request.user.is_authenticated() and request.user.questions_per_page > 0:
+                user_page_size = request.user.questions_per_page
+
+            try:
+                page = int(request.GET.get('page', '1'))
+                # get new pagesize from UI selection
+                pagesize = int(request.GET.get('pagesize', user_page_size))
+                if pagesize <> user_page_size:
+                    pagesize_changed = True
+
+            except ValueError:
+                page = 1
+                pagesize  = user_page_size
+
+            # save this pagesize to user database
+            if pagesize_changed:
+                request.session["pagesize"] = pagesize
+                if request.user.is_authenticated():
+                    user = request.user
+                    user.questions_per_page = pagesize
+                    user.save()
+
+            view_id = request.GET.get('sort', None)
+            view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
+            try:
+                orderby = view_dic[view_id]
+            except KeyError:
+                view_id = "latest"
+                orderby = "-added_at"
+                
+            objects = Question.objects.filter(deleted=False).extra(where=['title like %s'], params=['%' + keywords + '%']).order_by(orderby)
+
+            # RISK - inner join queries
+            objects = objects.select_related();
+            objects_list = Paginator(objects, pagesize)
+            questions = objects_list.page(page)
+
+            # Get related tags from this page objects
+            related_tags = []
+            for question in questions.object_list:
+                tags = list(question.tags.all())
+                for tag in tags:
+                    if tag not in related_tags:
+                        related_tags.append(tag)
+
+            return render_to_response(template_file, {
+                "questions" : questions,
+                "tab_id" : view_id,
+                "questions_count" : objects_list.count,
+                "tags" : related_tags,
+                "searchtag" : None,
+                "searchtitle" : keywords,
+                "keywords" : keywords,
+                "is_unanswered" : False,
+                "context" : {
+                    'is_paginated' : True,
+                    'pages': objects_list.num_pages,
+                    'page': page,
+                    'has_previous': questions.has_previous(),
+                    'has_next': questions.has_next(),
+                    'previous': questions.previous_page_number(),
+                    'next': questions.next_page_number(),
+                    'base_url' : request.path + '?t=question&q=%s&sort=%s&' % (keywords, view_id),
+                    'pagesize' : pagesize
+                }}, context_instance=RequestContext(request))
+ 
+    else:
+        raise Http404
-- 
cgit v1.2.3-1-g7c22


From f5eb705941a8d67397d733dcb2acde1e35728cce Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sun, 9 Aug 2009 16:06:30 -0600
Subject: moving settings values from settings.py to settings_local.py for
 better organization

---
 settings.py | 51 ++++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/settings.py b/settings.py
index fb594676..5947617e 100644
--- a/settings.py
+++ b/settings.py
@@ -17,27 +17,27 @@ ADMINS = (
 )
 MANAGERS = ADMINS
 
-#email server settings
-SERVER_EMAIL = ''
-DEFAULT_FROM_EMAIL = 'team@cnprog.com'
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
-EMAIL_HOST='smtp.gmail.com'
-EMAIL_PORT='587'
-EMAIL_USE_TLS=True
+#email server settings (moved to settings_local)
+#SERVER_EMAIL = ''
+#DEFAULT_FROM_EMAIL = 'team@cnprog.com'
+#EMAIL_HOST_USER = ''
+#EMAIL_HOST_PASSWORD = ''
+#EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
+#EMAIL_HOST='smtp.gmail.com'
+#EMAIL_PORT='587'
+#EMAIL_USE_TLS=True
 
-#LOCALIZATIONS
-TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
+#LOCALIZATIONS (Moved to settings_local)
+#TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
 # LANGUAGE_CODE = 'en-us'
 SITE_ID = 1
 
-#OTHER SETTINGS
-APP_TITLE = u'CNProg.com 程序员问答社区'
-APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
-APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
-APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
-APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
+#OTHER SETTINGS (Moved to settings_local)
+#APP_TITLE = u'CNProg.com 程序员问答社区'
+#APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
+#APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
+#APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
+#APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
 ADMIN_MEDIA_PREFIX = '/admin/media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 # List of callables that know how to import templates from various sources.
@@ -98,11 +98,12 @@ INSTALLED_APPS = (
 # User settings
 from settings_local import *
 
-USE_I18N = True
-LANGUAGE_CODE = 'en'
-EMAIL_VALIDATION = 'off'
-MIN_USERNAME_LENGTH = 1
-EMAIL_UNIQUE = False
-APP_URL = 'http://server.com' #used by email notif system and RSS
-GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
-GOOGLE_ANALYTICS_KEY = ''
+#Moved to settings_local
+#USE_I18N = True
+#LANGUAGE_CODE = 'en'
+#EMAIL_VALIDATION = 'off'
+#MIN_USERNAME_LENGTH = 1
+#EMAIL_UNIQUE = False
+#APP_URL = 'http://server.com' #used by email notif system and RSS
+#GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
+#GOOGLE_ANALYTICS_KEY = ''
-- 
cgit v1.2.3-1-g7c22

-- 
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.

---
 locale/es/LC_MESSAGES/django.po |  2 +-
 templates/header.html           | 22 +++++++++++-----------
 urls.py                         |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 8dfa7959..bcbf65bf 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-08 20:34-0300\n"
+"POT-Creation-Date: 2009-08-09 01:12-0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
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 %}
diff --git a/urls.py b/urls.py
index eb28cf69..4bc90bb9 100644
--- a/urls.py
+++ b/urls.py
@@ -47,9 +47,9 @@ urlpatterns = patterns('',
     url(r'^answers/(?P<answer_id>\d+)/comments/(?P<comment_id>\d+)/delete/$', app.delete_answer_comment, name='delete_answer_comment'),
     #place general question item in the end of other operations
     url(r'^questions/(?P<id>\d+)//*', app.question, name='question'),
-    (r'^tags/$', app.tags),
-    (r'^tags/(?P<tag>[^/]+)/$', app.tag),
-    (r'^users/$',app.users),
+    url(r'^tags/$', app.tags, name='tags'),
+    url(r'^tags/(?P<tag>[^/]+)/$', app.tag),
+    url(r'^users/$',app.users, name='users'),
     url(r'^users/(?P<id>\d+)/edit/$', app.edit_user, name='edit_user'),
     url(r'^users/(?P<id>\d+)//*', app.user, name='user'),
     url(r'^badges/$',app.badges, name='badges'),
-- 
cgit v1.2.3-1-g7c22


From 56202f708e0433e6dadf17a1657f1d3cd7cb2879 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sun, 9 Aug 2009 17:35:31 -0600
Subject: fixing python2.4 compat in views

---
 forum/views.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/forum/views.py b/forum/views.py
index 1566e9a8..4dc56946 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1169,8 +1169,11 @@ def user_recent(request, user_id, user_view):
             self.type_id = type
             self.title = title
             self.summary = summary
-            self.title_link = u'/questions/%s/%s#%s' %(question_id, title, answer_id)\
-                if int(answer_id) > 0 else u'/questions/%s/%s' %(question_id, title)
+            if int(answer_id) > 0:
+                self.title_link = u'/questions/%s/%s#%s' %(question_id, title, answer_id)
+            else:
+                self.title_link = u'/questions/%s/%s' %(question_id, title)
+
     class AwardEvent:
         def __init__(self, time, type, id):
             self.time = time
-- 
cgit v1.2.3-1-g7c22


From a084c0a71fd69ac57740eb8411df9499e6458915 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sun, 9 Aug 2009 17:41:57 -0600
Subject: fixing more python 2.4 compat issues (hope it will be the last ones)

---
 forum/auth.py   | 5 ++++-
 forum/models.py | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/forum/auth.py b/forum/auth.py
index 36ca54d3..776746e8 100644
--- a/forum/auth.py
+++ b/forum/auth.py
@@ -167,7 +167,10 @@ def can_upload_files(request_user):
 ###########################################
 def calculate_reputation(origin, offset):
     result = int(origin) + int(offset)
-    return result if result > 0 else 1
+    if (result > 0):
+        return result
+    else:
+        return 1
 
 @transaction.commit_on_success
 def onFlaggedItem(item, post, user):
diff --git a/forum/models.py b/forum/models.py
index 255eb21f..4d8894e4 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -652,7 +652,10 @@ def record_comment_event(instance, created, **kwargs):
         from django.contrib.contenttypes.models import ContentType
         question_type = ContentType.objects.get_for_model(Question)
         question_type_id = question_type.id
-        type = TYPE_ACTIVITY_COMMENT_QUESTION if instance.content_type_id == question_type_id else TYPE_ACTIVITY_COMMENT_ANSWER
+        if (instance.content_type_id == question_type_id): 
+            type = TYPE_ACTIVITY_COMMENT_QUESTION 
+        else:
+            type = TYPE_ACTIVITY_COMMENT_ANSWER
         activity = Activity(user=instance.user, active_at=instance.added_at, content_object=instance, activity_type=type)
         activity.save()
 
-- 
cgit v1.2.3-1-g7c22


From e9e5b0c7f5f71e439c4b028d30ff828baf9cc4d4 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sun, 9 Aug 2009 18:42:48 -0600
Subject: fixing a translation (to fit style)

---
 locale/es/LC_MESSAGES/django.mo | Bin 42843 -> 42834 bytes
 locale/es/LC_MESSAGES/django.po |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index a2a27c2f..6c616b17 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b209c72c..7f407da3 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: 2009-08-07 11:21-0600\n"
+"PO-Revision-Date: 2009-08-09 18:42-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1261,7 +1261,7 @@ msgstr "mi perfil"
 
 #: templates/header.html:42
 msgid "ask a question"
-msgstr "hacer una pregunta"
+msgstr "preguntar"
 
 #: templates/header.html:57
 msgid "search"
-- 
cgit v1.2.3-1-g7c22


From 039f563c62bf800304b621af490a8a4b071e5af6 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Sun, 9 Aug 2009 23:52:13 -0300
Subject: Added About for Preguntalo.com.uy

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

diff --git a/templates/about.html b/templates/about.html
index eaf0d591..7beedb0b 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -12,10 +12,13 @@
 </div>
 
 <div class="content">
-	<p>edit file templates/about.html. Below are just suggestions of what can go here</p>
-	<p>what is your site for?</p>
-	<p>how does it work? what are roles of members?</p>
-	<p>is there a place to find out more about this website?</p>
+	<p>Preguntalo.com.uy es una herramienta social para hacer preguntas y recibir respuestas
+	de forma colectiva, incentivando a quienes aporten contenidos relevantes mediante un 
+	sistema de reputación.</p>
+	<p>Si haces una pregunta ques es votada por los usuarios como útil, recibiras
+	puntos de reputación, también si respondes una pregunta, y más puntos aún si tu respuesta
+	es aceptada como la correcta!</p>
+	<p>Estamos en estapa de desarrollo. Si tenés alguna duda, preguntalo.com.uy! :)</p>
 </div>
 {% endblock %}
 <!-- end template about.html -->
-- 
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.

---
 django_authopenid/urls.py         |   6 +-
 forum/views.py                    |  25 ++---
 locale/es/LC_MESSAGES/django.po   | 196 +++++++++++++++++++++++++++++++-------
 templates/404.html                |   6 +-
 templates/500.html                |   4 +-
 templates/answer_edit_tips.html   |   2 +-
 templates/badge.html              |   2 +-
 templates/book.html               |   4 +-
 templates/faq.html                |   4 +-
 templates/footer.html             |   6 +-
 templates/header.html             |   6 +-
 templates/index.html              |  16 ++--
 templates/question.html           |  18 ++--
 templates/question_edit_tips.html |   2 +-
 templates/revisions_answer.html   |   2 +-
 templates/revisions_question.html |   2 +-
 templates/tags.html               |   4 +-
 templates/user_info.html          |   2 +-
 templates/user_reputation.html    |   2 +-
 templates/user_stats.html         |   4 +-
 templates/user_tabs.html          |  14 +--
 templates/user_votes.html         |   4 +-
 templates/users_questions.html    |   6 +-
 urls.py                           |  85 +++++++++--------
 24 files changed, 278 insertions(+), 144 deletions(-)

diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py
index 6843e5c0..9c0887d8 100644
--- a/django_authopenid/urls.py
+++ b/django_authopenid/urls.py
@@ -21,10 +21,10 @@ urlpatterns = patterns('django_authopenid.views',
     #    name='user_confirmchangepw'),
 
     # manage account settings
-    #url(r'^$', 'account_settings', name='user_account_settings'),
+    #url(r'^$', _('account_settings'), name='user_account_settings'),
     #url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'),
-    url(r'^%s$' % 'email/', 'changeemail', name='user_changeemail',kwargs = {'action':'change'}),
-    url(r'^%s%s$' % ('email/','validate/'), 'changeemail', name='user_changeemail',kwargs = {'action':'validate'}),
+    url(r'^%s$' % _('email/'), 'changeemail', name='user_changeemail',kwargs = {'action':'change'}),
+    url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_changeemail',kwargs = {'action':'validate'}),
     #url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'),
     url(r'^%s$' % _('delete/'), 'delete', name='user_delete'),
 )
diff --git a/forum/views.py b/forum/views.py
index 6ef7bd6d..a118cc57 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -301,7 +301,7 @@ def ask(request):
 					ip_addr = request.META['REMOTE_ADDR'],
                 )
                 question.save()
-                return HttpResponseRedirect('%s%s%s' % ( _('/account/'),_('signin/'),('newquestion/')))
+                return HttpResponseRedirect('/%s%s%s' % ( _('account/'),_('signin/'),_('newquestion/')))
     else:
         form = AskForm()
 
@@ -692,7 +692,8 @@ def answer(request, id):
                     ip_addr = request.META['REMOTE_ADDR'],
                     )
                 anon.save()
-                return HttpResponseRedirect('/account/signin/newanswer')
+                return HttpResponseRedirect('/%s%s%s' % ( _('account/'),
+                    _('signin/'),_('newquestion/')))
 
     return HttpResponseRedirect(question.get_absolute_url())
 
@@ -733,7 +734,7 @@ def tags(request):
             'has_next': tags.has_next(),
             'previous': tags.previous_page_number(),
             'next': tags.next_page_number(),
-            'base_url' : '/tags/?sort=%s&' % sortby
+            'base_url' : '/%s?sort=%s&' % (_('tags/'), sortby)
         }
 
         }, context_instance=RequestContext(request))
@@ -986,11 +987,11 @@ def users(request):
         # default
         else:
             objects_list = Paginator(User.objects.all().order_by('-reputation'), USERS_PAGE_SIZE)
-        base_url = '/users/?sort=%s&' % sortby
+        base_url = '/%s?sort=%s&' % (_('users/'), sortby)
     else:
         sortby = "reputation"
         objects_list = Paginator(User.objects.extra(where=['username like %s'], params=['%' + suser + '%']).order_by('-reputation'), USERS_PAGE_SIZE)
-        base_url = '/users/?name=%s&sort=%s&' % (suser, sortby)
+        base_url = '/%s?name=%s&sort=%s&' % (_('users/'), suser, sortby)
 
     try:
         users = objects_list.page(page)
@@ -1166,8 +1167,8 @@ def user_recent(request, user_id, user_view):
             self.type_id = type
             self.title = title
             self.summary = summary
-            self.title_link = u'/questions/%s/%s#%s' %(question_id, title, answer_id)\
-                if int(answer_id) > 0 else u'/questions/%s/%s' %(question_id, title)
+            self.title_link = u'/%s%s/%s#%s' %(_('questions/'),question_id, title, answer_id)\
+                if int(answer_id) > 0 else u'/%s%s/%s' %(_('questions/'), question_id, title)
     class AwardEvent:
         def __init__(self, time, type, id):
             self.time = time
@@ -1406,9 +1407,9 @@ def user_responses(request, user_id, user_view):
         def __init__(self, type, title, question_id, answer_id, time, username, user_id, content):
             self.type = type
             self.title = title
-            self.titlelink = u'/questions/%s/%s#%s' % (question_id, title, answer_id)
+            self.titlelink = u'/%s%s/%s#%s' % (_('questions/'), question_id, title, answer_id)
             self.time = time
-            self.userlink = u'/users/%s/%s/' % (user_id, username)
+            self.userlink = u'/%s%s/%s/' % (_('users/'), user_id, username)
             self.username = username
             self.content = u'%s ...' % strip_tags(content)[:300]
 
@@ -1741,7 +1742,7 @@ def __generate_comments_json(obj, type, user):
             "add_date" : comment.added_at.strftime('%Y-%m-%d'),
             "text" : comment.comment,
             "user_display_name" : comment_user.username,
-            "user_url" : "/users/%s/%s" % (comment_user.id, comment_user.username),
+            "user_url" : "/%s%s/%s" % (_('users/'), comment_user.id, comment_user.username),
             "delete_url" : delete_url
         })
 
@@ -2003,9 +2004,9 @@ def search(request):
         if keywords is None:
             return HttpResponseRedirect('/')
         if search_type == 'tag':
-            return HttpResponseRedirect('/tags/?q=%s&page=%s' % (keywords.strip(), page))
+            return HttpResponseRedirect('/%s?q=%s&page=%s' % (_('tags/'), keywords.strip(), page))
         elif search_type == "user":
-            return HttpResponseRedirect('/users/?q=%s&page=%s' % (keywords.strip(), page))
+            return HttpResponseRedirect('/%s?q=%s&page=%s' % (_('users/'), keywords.strip(), page))
         elif search_type == "question":
             
             template_file = "questions.html"
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index bcbf65bf..b2580d42 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-09 01:12-0300\n"
+"POT-Creation-Date: 2009-08-09 22:45-0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -10,16 +10,149 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12
+#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:695
 msgid "account/"
 msgstr "cuenta/"
 
-#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:10
-#: django_authopenid/urls.py:11 django_authopenid/urls.py:13
-#: forum/views.py:304
+#: settings.py:12 urls.py:26 django_authopenid/urls.py:9
+#: django_authopenid/urls.py:10 django_authopenid/urls.py:11
+#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:696
 msgid "signin/"
 msgstr "ingresar/"
 
+#: urls.py:22
+msgid "upfiles/"
+msgstr "archivossubidos/"
+
+#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26
+#: django_authopenid/urls.py:27
+msgid "email/"
+msgstr "email/"
+
+#: urls.py:27
+msgid "change/"
+msgstr "cambiar/"
+
+#: urls.py:28
+msgid "sendkey/"
+msgstr "enviarclave/"
+
+#: urls.py:29
+msgid "verify/"
+msgstr "verificar/"
+
+#: urls.py:30
+msgid "about/"
+msgstr "acercadenosotros/"
+
+#: urls.py:31
+msgid "faq/"
+msgstr "preguntasfrecuentes/"
+
+#: urls.py:32
+msgid "privacy/"
+msgstr "códigodeprivacidad/"
+
+#: urls.py:33
+msgid "logout/"
+msgstr "cerrarsesion/"
+
+#: urls.py:34 urls.py:35 urls.py:36 urls.py:48
+msgid "answers/"
+msgstr "respuestas/"
+
+#: urls.py:34 urls.py:46
+msgid "comments/"
+msgstr "comentarios/"
+
+#: urls.py:35 urls.py:40 urls.py:54
+msgid "edit/"
+msgstr "editar/"
+
+#: urls.py:36 urls.py:45
+msgid "revisions/"
+msgstr "revisiones/"
+
+#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
+#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
+#: forum/views.py:1170 forum/views.py:1171 forum/views.py:1410
+msgid "questions/"
+msgstr "preguntas/"
+
+#: urls.py:38 urls.py:64
+msgid "ask/"
+msgstr "preguntar/"
+
+#: urls.py:39
+msgid "unanswered/"
+msgstr "sinrespuesta/"
+
+#: urls.py:41
+msgid "close/"
+msgstr "cerrar/"
+
+#: urls.py:42
+msgid "reopen/"
+msgstr "reabrir/"
+
+#: urls.py:43
+msgid "answer/"
+msgstr "respuesta/"
+
+#: urls.py:44
+msgid "vote/"
+msgstr "votar/"
+
+#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
+msgid "delete/"
+msgstr "borrar/"
+
+#: urls.py:50
+#, fuzzy
+msgid "question/"
+msgstr "preguntas/"
+
+#: urls.py:51 urls.py:52 forum/views.py:737 forum/views.py:2007
+msgid "tags/"
+msgstr "etiquetas/"
+
+#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:990 forum/views.py:994
+#: forum/views.py:1412 forum/views.py:2009
+msgid "users/"
+msgstr "usuarios/"
+
+#: urls.py:56 urls.py:57
+msgid "badges/"
+msgstr "distinciones/"
+
+#: urls.py:58
+msgid "messages/"
+msgstr "mensajes/"
+
+#: urls.py:58
+msgid "markread/"
+msgstr "marcarleido/"
+
+#: urls.py:60
+msgid "nimda/"
+msgstr "administrador/"
+
+#: urls.py:61
+msgid "feeds/"
+msgstr ""
+
+#: urls.py:62
+msgid "upload/"
+msgstr "subir/"
+
+#: urls.py:63 urls.py:64 urls.py:65
+msgid "books/"
+msgstr "libros/"
+
+#: urls.py:66
+msgid "search/"
+msgstr "buscar/"
+
 #: django_authopenid/forms.py:67 django_authopenid/views.py:102
 msgid "i-names are not supported"
 msgstr "i-names no son soportados"
@@ -111,10 +244,9 @@ msgstr "la nueva contraseña no coincide"
 msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
-#: django_authopenid/urls.py:10
-#, fuzzy
+#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:696
 msgid "newquestion/"
-msgstr "preguntas/"
+msgstr "nuevapregunta/"
 
 #: django_authopenid/urls.py:11
 msgid "newanswer/"
@@ -140,14 +272,15 @@ msgstr "registrarse/"
 msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
-#: django_authopenid/urls.py:29
-msgid "delete/"
-msgstr "borrar/"
+#: django_authopenid/urls.py:27
+#, fuzzy
+msgid "validate/"
+msgstr "Cambiar dirección email"
 
 #: django_authopenid/views.py:108
 #, python-format
 msgid "OpenID %(openid_url)s is invalid"
-msgstr ""
+msgstr "El OpenID %(openid_url)s no es valido"
 
 #: django_authopenid/views.py:417 django_authopenid/views.py:544
 msgid "Welcome"
@@ -256,7 +389,7 @@ msgstr "pregunta"
 
 #: forum/const.py:57 templates/book.html:110
 msgid "answer"
-msgstr "resputa"
+msgstr "respuesta"
 
 #: forum/const.py:58
 msgid "commented question"
@@ -342,10 +475,6 @@ msgstr " - "
 msgid "latest questions"
 msgstr "últimas preguntas"
 
-#: forum/feed.py:19
-msgid "questions/"
-msgstr "preguntas/"
-
 #: forum/forms.py:14 templates/answer_edit_tips.html:34
 #: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31
 #: templates/question_edit_tips.html:36
@@ -580,31 +709,27 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:304
-msgid "/account/"
-msgstr "/cuenta/"
-
-#: forum/views.py:943
+#: forum/views.py:944
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr "subscripción guardada, %(email)s necesita validación"
 
-#: forum/views.py:1853
+#: forum/views.py:1854
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr "para subir imagenes debes tener más de 60 puntos de reputación"
 
-#: forum/views.py:1855
+#: forum/views.py:1856
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', "
 "'tiff'"
 
-#: forum/views.py:1857
+#: forum/views.py:1858
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1859
+#: forum/views.py:1860
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -1317,7 +1442,6 @@ msgstr "respuestas"
 #: templates/questions.html.py:156 templates/tags.html:47
 #: templates/unanswered.html:75 templates/unanswered.html.py:109
 #: templates/users_questions.html:52
-#, fuzzy
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
@@ -1682,7 +1806,7 @@ msgstr "¿Porqué usar y modificar etiquetas?"
 
 #: templates/question_retag.html:89
 msgid "tags help us keep Questions organized"
-msgstr ""
+msgstr "las etiquetas nos permiten mantener las Preguntas organizadas"
 
 #: templates/question_retag.html:95
 msgid "tag editors receive special awards from the community"
@@ -2199,11 +2323,11 @@ msgstr "Ups, parece que hay errores:"
 
 #: templates/authopenid/complete.html:47
 msgid "Screen name label"
-msgstr ""
+msgstr "Nombre de Usuario"
 
 #: templates/authopenid/complete.html:48
 msgid "Email address label"
-msgstr "su email (correo electrónico)"
+msgstr "Su email (correo electrónico)"
 
 #: templates/authopenid/complete.html:49
 msgid "create account"
@@ -2238,6 +2362,8 @@ msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
 msgstr ""
+"Nota: Luego de borrar tu cuenta, cualquiera va a poder registrarse con este "
+"nombre de usuario."
 
 #: templates/authopenid/delete.html:17
 msgid "Check confirm box, if you want delete your account."
@@ -2353,11 +2479,11 @@ msgstr ""
 
 #: templates/authopenid/signin.html:40
 msgid "Click to sign in through any of these services."
-msgstr ""
+msgstr "Clickea para entrar por cualquiera de estos servicios."
 
 #: templates/authopenid/signin.html:103
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
-msgstr ""
+msgstr "Ingresa tu <span id=\"enter_your_what\">nombre de usuario</span>"
 
 #: templates/authopenid/signin.html:110
 msgid ""
@@ -2459,3 +2585,9 @@ msgstr "Registrate con tu OpenID"
 #: templates/authopenid/signup.html:51
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
+
+#~ msgid "/account/"
+#~ msgstr "/cuenta/"
+
+#~ msgid "content/"
+#~ msgstr "contenido/"
diff --git a/templates/404.html b/templates/404.html
index cd23a36b..6b3fc368 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -27,7 +27,7 @@
         <ul>
             <li>{% trans "this question or answer has been deleted;" %}</li>
             <li>{% trans "url has error - please check it;" %}</li>
-            <li>{% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} <a href="/faq"> faq</a>；</li>
+            <li>{% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} <a href="{% url faq %}"> faq</a>；</li>
             <li>{% trans "if you believe this error 404 should not have occured, please" %} 
 				<a href="{{feedback_site_url}}" target="_blank">{% trans "report this problem" %}</a></li>
             </u>
@@ -39,8 +39,8 @@
         <script type="text/javascript" src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
         <ul>
             <li><a href="#" id="linkPrevious">{% trans "back to previous page" %} » </li>
-            <li><a href="/questions">{% trans "see all questions" %} » </a></li>
-            <li><a href="/tags/">{% trans "see all tags" %} » </a></li>
+            <li><a href="{% url questions %}">{% trans "see all questions" %} » </a></li>
+            <li><a href="{% url tags %}">{% trans "see all tags" %} » </a></li>
         </u>
     </div>
 
diff --git a/templates/500.html b/templates/500.html
index 52dcafae..1990edbc 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -25,8 +25,8 @@
 		{% trans "please report the error to the site administrators if you wish" %}
         <ul>
             <li><a href="#" id="linkPrevious">{% trans "back to previous page" %}</li>
-            <li><a href="/questions">{% trans "see latest questions" %}</a></li>
-            <li><a href="/tags/">{% trans "see tags" %}</a></li>
+            <li><a href="{% url questions %}">{% trans "see latest questions" %}</a></li>
+            <li><a href="{% url tags %}">{% trans "see tags" %}</a></li>
         </u>
     </div>
 
diff --git a/templates/answer_edit_tips.html b/templates/answer_edit_tips.html
index 31f71e34..98a5ab16 100644
--- a/templates/answer_edit_tips.html
+++ b/templates/answer_edit_tips.html
@@ -16,7 +16,7 @@
 				{% trans "be clear and concise" %}
             </li>
         </ul>
-         <a href="/faq/" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
+         <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
          <br>  
     </div>
 </div>
diff --git a/templates/badge.html b/templates/badge.html
index 029ba0d9..73cba4ba 100644
--- a/templates/badge.html
+++ b/templates/badge.html
@@ -28,7 +28,7 @@
     </div>
     <div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
         {% for award in awards %}
-        <p style="width:185px;float:left"><a href="/users/{{ award.id }}/{{ award.name }}">{{ award.name }}</a> {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}</p>
+        <p style="width:185px;float:left"><a href="{% url users %}{{ award.id }}/{{ award.name }}">{{ award.name }}</a> {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}</p>
         {% endfor %}
     </div>
 
diff --git a/templates/book.html b/templates/book.html
index dddd13e6..37bf0101 100644
--- a/templates/book.html
+++ b/templates/book.html
@@ -98,7 +98,7 @@
                     <div class="favorites-empty"> </div>
                 {% endif %}
             <div id="question-summary-{{question.id}}" class="question-summary narrow">
-                <a style="text-decoration: none;" href="/questions/{{question.id}}/{{question.get_question_title}}">
+                <a style="text-decoration: none;" href="{% url questions %}{{question.id}}/{{question.get_question_title}}">
                     <div class="stats">
                         <div class="votes">
                             <div class="vote-count-post">{{question.score|intcomma}}</div> 
@@ -118,7 +118,7 @@
                 </a>
                 <div class="bookQuestionItem">
                     <h3>
-                        <a title="{{question.summary}}" href="/questions/{{question.id}}/{{question.title}}">{{question.title}}</a>
+                        <a title="{{question.summary}}" href="{% url questions %}{{question.id}}/{{question.title}}">{{question.title}}</a>
                     </h3>
                     <div class="tags">
                         {% for tag in question.tagname_list %}
diff --git a/templates/faq.html b/templates/faq.html
index 78c433ae..8df711ca 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -115,7 +115,7 @@
         <div>
             <h3 class="subtitle">{% trans "To register, do I need to create new password?" %}</h3>
             <p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %}
-            <strong><a href="/account/signin">{% trans "Login now!" %}</a> »</strong> 
+            <strong><a href="{% url user_signin %}">{% trans "Login now!" %}</a> »</strong> 
             </p>
         </div>
     
@@ -129,7 +129,7 @@
             <h3 class="subtitle">{% trans "Still have questions?" %}</h3>
             <p>{% trans "Please ask your question, help make our community better!" %} 
             <!--
-            <a href="/tags/faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
+            <a href="{% url tags %}faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
             -->
             </p>
         </div>
diff --git a/templates/footer.html b/templates/footer.html
index 637ca0d8..bac698cb 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -4,11 +4,11 @@
 <!-- 页面底部开始： -->
     <div id="ground">
         <div class="footerLinks" >
-            <a href="/about">{% trans "about" %}</a><span class="link-separator"> |</span>
-            <a href="/faq">{% trans "faq" %}</a><span class="link-separator"> |</span>
+            <a href="{% url about %}">{% trans "about" %}</a><span class="link-separator"> |</span>
+            <a href="{% url faq %}">{% trans "faq" %}</a><span class="link-separator"> |</span>
             <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
             <a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>
-            <a href="/privacy">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
+            <a href="{% url privacy %}">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
             <a href="{{ feedback_url }}" target="_blank">{% trans "give feedback" %}</a>
         </div>
 	  <p style="margin-top:10px;">
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" >
diff --git a/templates/index.html b/templates/index.html
index a1ab06a4..239b0ff4 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -24,7 +24,7 @@
     	 <a id="latest" href="?sort=latest" title="{% trans "last updated questions" %}" >{% trans "newest" %}</a>
         <a id="hottest" href="?sort=hottest" title="{% trans "hottest questions" %}" >{% trans "hottest" %}</a>
         <a id="mostvoted" href="?sort=mostvoted" title="{% trans "most voted questions" %}" >{% trans "most voted" %}</a>
-        <a id="all" href="/questions/" title="{% trans "all questions" %}" >{% trans "all questions" %}</a>
+        <a id="all" href="{% url questions %}" title="{% trans "all questions" %}" >{% trans "all questions" %}</a>
     </div>
 </div>
 <!-- 问题列表 -->
@@ -80,8 +80,8 @@
 	<h3>{% trans "welcome to website" %}</h3>
 	<div class="body">
       {{ settings.APP_INTRO|safe }}
-	  <div class="more"><a href="/about">{% trans "about" %} »</a></div>
-	  <div class="more"><a href="/faq">{% trans "faq" %} »</a></div>
+	  <div class="more"><a href="{% url about %}">{% trans "about" %} »</a></div>
+	  <div class="more"><a href="{% url faq %}">{% trans "faq" %} »</a></div>
 	</div>
 </div>
 {% endif %}
@@ -94,7 +94,7 @@
 				title="{% blocktrans with tag.name as tagname %}see questions tagged '{{tagname}}'{% endblocktrans %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
         {% endfor %}
         </p>
-        <div class="more"><a href="/tags">{% trans "popular tags" %} »</a> </div>
+        <div class="more"><a href="{% url tags %}">{% trans "popular tags" %} »</a> </div>
     </div>
 </div>
 <div class="boxB">
@@ -103,13 +103,13 @@
              <ul class="badge-list">
              {% for award in awards %}
                 <li>
-                <a href="/badges/{{award.badge_id}}/{{award.badge_name}}" title="{{ award.badge_description }}" class="medal">
+                <a href="{% url badges %}{{award.badge_id}}/{{award.badge_name}}" title="{{ award.badge_description }}" class="medal">
                 <span class="badge{{ award.badge_type }}">&#9679;</span>&nbsp;{{ award.badge_name }}</a> {% trans "given to" %}
-                <a href="/users/{{award.user_id}}/{{award.user_name}}">{{ award.user_name }}</a>
+                <a href="{% url users %}{{award.user_id}}/{{award.user_name}}">{{ award.user_name }}</a>
                 </li>
             {% endfor %}
             </ul>
-        	<div class="more"><a href="/badges/">{% trans "all awards" %} »</a> </div>
+        	<div class="more"><a href="{% url badges %}">{% trans "all awards" %} »</a> </div>
          </div>
 </div>
 <div id="feeds">
@@ -118,7 +118,7 @@
 {% endblock %}
 {% block tail %}
 <div style="padding:5px 0 5px 5px;">
-<span class="evenMore">{% trans "Still looking for more? See" %} <a href="/questions/">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="/questions/unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
+<span class="evenMore">{% trans "Still looking for more? See" %} <a href="{% url questions %}">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="{% url questions %}unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
 </div>
 {% endblock %}
 <!-- index.html -->
diff --git a/templates/question.html b/templates/question.html
index eaff9da3..a0fc194d 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -27,7 +27,7 @@
             {% if not question.closed and request.user.is_authenticated %}initEditor();{% endif %}
             
             lanai.highlightSyntax();
-            $('#btLogin').bind('click', function(){window.location.href='/account/signin/'; } )
+            $('#btLogin').bind('click', function(){window.location.href='{% url user_signin %}'; } )
         });
         
         function initEditor(){
@@ -112,7 +112,7 @@
                             <div id="question-tags" class="tags" >
                                 {% for tag in question.tagname_list %}
                                     <a href="{% url forum.views.tag tag|urlencode %}" class="post-tag" 
-										title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
+										title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>
                                 {% endfor %}
                             </div>
                             <div id="question-controls" style="clear:both;">
@@ -164,7 +164,7 @@
                                                         {% gravatar question.last_edited_by 32 %}
                                                         </td>
                                                         <td style="width:160px; vertical-align:top">
-                                                            <a href="/users/{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a>
+                                                            <a href="{% url users %}{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a>
                                                         </td>
                                                     </tr>
                                                     {% else %}
@@ -179,7 +179,7 @@
                                                         {% gravatar question.last_edited_by 32 %}
                                                         </td>
                                                         <td style="width:160px; vertical-align:top">
-                                                            <div><a href="/users/{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a></div>
+                                                            <div><a href="{% url users %}{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a></div>
                                 
                                                             <div>
                                                             {% get_score_badge question.last_edited_by %}
@@ -213,7 +213,7 @@
                                                         {% gravatar question.author 32 %}
                                                         </td>
                                                         <td align="left" style="width:160px;vertical-align:top">
-                                                            <div><a href="/users/{{ question.author.id }}/{{ question.author }}">{{ question.author }}</a></div>
+                                                            <div><a href="{% url users %}{{ question.author.id }}/{{ question.author }}">{{ question.author }}</a></div>
                                                             <div>
                                                             {% get_score_badge question.author %}
                                                             </div>
@@ -346,7 +346,7 @@
                                                                 {% gravatar answer.last_edited_by 32 %}
                                                                 </td>
                                                                 <td style="width:160px; vertical-align:top">
-                                                                    <div><a href="/users/{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
+                                                                    <div><a href="{% url users %}{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
                                                                
                                                                 </td>
                                                             </tr>
@@ -362,7 +362,7 @@
                                                                 {% gravatar answer.last_edited_by 32 %}
                                                                 </td>
                                                                 <td style="width:160px; vertical-align:top">
-                                                                    <div><a href="/users/{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
+                                                                    <div><a href="{% url users %}{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
                                                                     <div>
                                                                     {% get_score_badge answer.last_edited_by %}
                                                                     </div>
@@ -392,7 +392,7 @@
                                                                 {% gravatar answer.author 32 %}
                                                                 </td>
                                                                 <td style="width:160px; vertical-align:top">
-                                                                    <div><a href="/users/{{ answer.author.id }}/{{ answer.author.username }}">{{ answer.author }}</a></div>
+                                                                    <div><a href="{% url users %}{{ answer.author.id }}/{{ answer.author.username }}">{{ answer.author }}</a></div>
                                                                     <div>
                                                                     {% get_score_badge answer.author %}
                                                                     </div>
@@ -503,7 +503,7 @@
     <div class="questions-related">
         {% for question in similar_questions %}
         <p>
-            <a href="/questions/{{question.id}}/{{ question.get_question_title }}">{{ question.get_question_title }}</a>
+            <a href="{% url questions %}{{question.id}}/{{ question.get_question_title }}">{{ question.get_question_title }}</a>
         </p>
         {% endfor %}
     </div>
diff --git a/templates/question_edit_tips.html b/templates/question_edit_tips.html
index 4ac666a6..f57440c2 100644
--- a/templates/question_edit_tips.html
+++ b/templates/question_edit_tips.html
@@ -13,7 +13,7 @@
 				{% trans "be clear and concise" %}
             </li>
         </ul>
-         <a href="/faq/" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
+         <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
          <br>  
     </div>
 </div>
diff --git a/templates/revisions_answer.html b/templates/revisions_answer.html
index 9c2e53eb..23606dc9 100644
--- a/templates/revisions_answer.html
+++ b/templates/revisions_answer.html
@@ -73,7 +73,7 @@
                                     </td>
                                     <td style="width:120px; vertical-align:top">
                                         <div style="height:18px">
-                                            <a href="/users/{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
+                                            <a href="{% url users %}{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
                                         <div>
                                         {% get_score_badge revision.author %}
                                         </div>
diff --git a/templates/revisions_question.html b/templates/revisions_question.html
index 7ada3e74..b76ced24 100644
--- a/templates/revisions_question.html
+++ b/templates/revisions_question.html
@@ -73,7 +73,7 @@
                                     </td>
                                     <td style="width:120px; vertical-align:top">
                                         <div style="height:18px">
-                                            <a href="/users/{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
+                                            <a href="{% url users %}{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
                                         <div>
                                         {% get_score_badge revision.author %}
                                         </div>
diff --git a/templates/tags.html b/templates/tags.html
index 6f9b3aed..fa2b4201 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -28,8 +28,8 @@
 <div class="tabBar">
     <div class="headQuestions">{% trans "Tag list" %}</div>
     <div class="tabsA">
-        <a id="sort_name" href="/tags/?sort=name" class="off" title="{% trans "sorted alphabetically" %}">{% trans "by name" %}</a>
-        <a id="sort_used" href="/tags/?sort=used" class="off" title="{% trans "sorted by frequency of tag use" %}">{% trans "by popularity" %}</a>
+        <a id="sort_name" href="{% url tags %}?sort=name" class="off" title="{% trans "sorted alphabetically" %}">{% trans "by name" %}</a>
+        <a id="sort_used" href="{% url tags %}?sort=used" class="off" title="{% trans "sorted by frequency of tag use" %}">{% trans "by popularity" %}</a>
     </div>
 </div>
 <div id="searchtags">
diff --git a/templates/user_info.html b/templates/user_info.html
index 8d35015c..d6804d71 100644
--- a/templates/user_info.html
+++ b/templates/user_info.html
@@ -31,7 +31,7 @@
                     <th width="130" align="left"><strong>{% trans "Registered user" %}</strong></th>
                     <th width="230"  align="right">
                         {% if request.user|can_view_user_edit:view_user %}
-                        <span class="user-edit-link"><a href="/users/{{ view_user.id }}/edit/">{% trans "update profile" %}</a></span>
+                        <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/edit/">{% trans "update profile" %}</a></span>
                         {% endif %}
                     </th>
                 </tr>
diff --git a/templates/user_reputation.html b/templates/user_reputation.html
index bb7200de..270bb37d 100644
--- a/templates/user_reputation.html
+++ b/templates/user_reputation.html
@@ -33,7 +33,7 @@
                         <div style="float:left;width:20px;color:red">{{ rep.negative }}</div>
                         
                     </div>
-                    <a href="/questions/{{ rep.question_id }}/{{ rep.title }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span>                    
+                    <a href="{% url questions %}{{ rep.question_id }}/{{ rep.title }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span>                    
                 </p>
                 {% endfor %}
             </div>
diff --git a/templates/user_stats.html b/templates/user_stats.html
index 432a5b34..41253494 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -32,14 +32,14 @@
         <div class="user-stats-table">
             {% for answered_question in answered_questions %}
             <div class="answer-summary">
-                <a title="{{answered_question.summary}}" href="/questions/{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
+                <a title="{{answered_question.summary}}" href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
                     <div class="answer-votes {% if answered_question.accepted %}answered-accepted{% endif %}" 
 						title="{% blocktrans with answered_question.vote_count as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %}&#13;{% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
                         {{ answered_question.vote_count }}
                     </div>
                 </a>
                 <div class="answer-link">
-                    <a href="/questions/{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> {% if answered_question.comment_count %}<span 
+                    <a href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> {% if answered_question.comment_count %}<span 
 					title="{% blocktrans %}the answer has been commented {{ answered_question.comment_count }} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %}
                 </div>
             </div>
diff --git a/templates/user_tabs.html b/templates/user_tabs.html
index bcc12b8f..96cc5aca 100644
--- a/templates/user_tabs.html
+++ b/templates/user_tabs.html
@@ -4,28 +4,28 @@
 <div class="tabBar">
     <div class="tabsA">
         <a id="stats" {% ifequal tab_name "stats" %}class="on"{% endifequal %} 
-			title="{% trans "User profile" %}" href="/users/{{view_user.id}}/{{view_user.username}}?sort=stats">{% trans "overview" %}</a>
+			title="{% trans "User profile" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=stats">{% trans "overview" %}</a>
         <a id="recent" {% ifequal tab_name "recent" %}class="on"{% endifequal %} 
-			title="{% trans "recent activity" %}" href="/users/{{view_user.id}}/{{view_user.username}}?sort=recent">{% trans "recent activity" %}</a>
+			title="{% trans "recent activity" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=recent">{% trans "recent activity" %}</a>
         {% if request.user|is_user_self:view_user %}
         <a id="responses" {% ifequal tab_name "responses" %}class="on"{% endifequal %} 
 			title="{% trans "comments and answers to others questions" %}" 
-			href="/users/{{view_user.id}}/{{view_user.username}}?sort=responses">{% trans "responses" %}</a>
+			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=responses">{% trans "responses" %}</a>
         {% endif %}
         <a id="reputation" {% ifequal tab_name "reputation" %}class="on"{% endifequal %} 
 			title="{% trans "graph of user reputation" %}" 
-			href="/users/{{view_user.id}}/{{view_user.username}}?sort=reputation">{% trans "reputation history" %}</a>
+			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=reputation">{% trans "reputation history" %}</a>
         {% if request.user|can_view_user_votes:view_user %}
         <a id="votes" {% ifequal tab_name "votes" %}class="on"{% endifequal %} 
-			title="{% trans "user vote record" %}" href="/users/{{view_user.id}}/{{view_user.username}}?sort=votes">{% trans "casted votes" %}</a>
+			title="{% trans "user vote record" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=votes">{% trans "casted votes" %}</a>
         {% endif %}
         <a id="favorites" {% ifequal tab_name "favorites" %}class="on"{% endifequal %} 
 			title="{% trans "questions that user selected as his/her favorite" 
-			href="/users/{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
+			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
         {% if request.user|can_view_user_preferences:view_user %}
         <a id="preferences" {% ifequal tab_name "preferences" %}class="on"{% endifequal %} 
 			title="{% trans "user preference settings" %}" 
-			href="/users/{{view_user.id}}/{{view_user.username}}?sort=preferences">{% trans "settings" %}</a>
+			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=preferences">{% trans "settings" %}</a>
         {% endif %}  
     </div>
 </div>
diff --git a/templates/user_votes.html b/templates/user_votes.html
index 80fa27ee..45134ac9 100644
--- a/templates/user_votes.html
+++ b/templates/user_votes.html
@@ -18,9 +18,9 @@
                 </div>
                 <div style="float:left;overflow:hidden;width:750px">
                     {% ifequal vote.answer_id 0 %}
-                    <span class="question-title-link"><a href="/questions/{{ vote.question_id }}/{{ vote.title }}">{{ vote.title }}</a></span>
+                    <span class="question-title-link"><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title }}">{{ vote.title }}</a></span>
                     {% else %}
-                    <span class="answer-title-link" ><a href="/questions/{{ vote.question_id }}/{{ vote.title }}#{{ vote.answer_id }}">{{ vote.title }}</a></span>
+                    <span class="answer-title-link" ><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title }}#{{ vote.answer_id }}">{{ vote.title }}</a></span>
                     {% endifequal %}
                     <div style="height:5px"></div>
                 </div>          
diff --git a/templates/users_questions.html b/templates/users_questions.html
index dfb87c8f..dd818ddb 100644
--- a/templates/users_questions.html
+++ b/templates/users_questions.html
@@ -23,7 +23,7 @@
             <div class="favorites-empty"> </div>
         {% endif %}
     <div id="question-summary-{{question.id}}" class="question-summary narrow">
-        <a style="text-decoration: none;" href="/questions/{{question.id}}/{{question.get_question_title}}">
+        <a style="text-decoration: none;" href="{% url questions %}{{question.id}}/{{question.get_question_title}}">
             <div class="stats">
                 <div class="votes">
                     <div class="vote-count-post">{{question.vote_count|intcomma}}</div> 
@@ -43,7 +43,7 @@
         </a>
         <div class="summary">
             <h3>
-                <a title="{{question.summary}}" href="/questions/{{question.id}}/{{question.title}}">{{question.title}}</a>
+                <a title="{{question.summary}}" href="{% url questions %}{{question.id}}/{{question.title}}">{{question.title}}</a>
             </h3>
             <div class="tags">
                 {% convert2tagname_list question %}
@@ -55,7 +55,7 @@
             <div class="started">
                 <span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>
                 {% if question.la_username %}
-                    <a href="/users/{{question.la_user_id}}/{{question.la_username}}">{{question.la_username}}</a> {% get_score_badge_by_details question.la_user_reputation question.la_user_gold question.la_user_silver question.la_user_bronze%}
+                    <a href="{% url users %}{{question.la_user_id}}/{{question.la_username}}">{{question.la_username}}</a> {% get_score_badge_by_details question.la_user_reputation question.la_user_gold question.la_user_silver question.la_user_bronze%}
                 {% endif %}
             </div>
         </div>
diff --git a/urls.py b/urls.py
index 4bc90bb9..cce4969e 100644
--- a/urls.py
+++ b/urls.py
@@ -4,6 +4,7 @@ from django.contrib import admin
 from forum.views import index
 from forum import views as app
 from forum.feed import RssLastestQuestionsFeed
+from django.utils.translation import ugettext as _
 
 admin.autodiscover()
 feeds = {
@@ -18,50 +19,50 @@ urlpatterns = patterns('',
     (r'^content/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': os.path.join(APP_PATH, 'templates/content').replace('\\','/')}
     ),
-    (r'^upfiles/(?P<path>.*)$', 'django.views.static.serve',
+    (r'^%s(?P<path>.*)$' % _('upfiles/'), 'django.views.static.serve',
         {'document_root': os.path.join(APP_PATH, 'templates/upfiles').replace('\\','/')}
     ),
-    (r'^account/', include('django_authopenid.urls')),
-    (r'^signin/$', 'django_authopenid.views.signin'),
-    url(r'^email/change/$', 'django_authopenid.views.changeemail', name='user_changeemail'),
-    url(r'^email/sendkey/$', 'django_authopenid.views.send_email_key'),
-    url(r'^email/verify/(?P<id>\d+)/(?P<key>[\dabcdef]{32})/$', 'django_authopenid.views.verifyemail', name='user_verifyemail'),
-    url(r'^about/$', app.about, name='about'),
-    url(r'^faq/$', app.faq, name='faq'),
-    url(r'^privacy/$', app.privacy, name='privacy'),
-    url(r'^logout/$', app.logout, name='logout'),
-    url(r'^answers/(?P<id>\d+)/comments/$', app.answer_comments, name='answer_comments'),
-    url(r'^answers/(?P<id>\d+)/edit/$', app.edit_answer, name='edit_answer'),
-    url(r'^answers/(?P<id>\d+)/revisions/$', app.answer_revisions, name='answer_revisions'),
-    url(r'^questions/$', app.questions, name='questions'),
-    url(r'^questions/ask/$', app.ask, name='ask'),
-    url(r'^questions/unanswered/$', app.unanswered, name='unanswered'),
-    url(r'^questions/(?P<id>\d+)/edit/$', app.edit_question, name='edit_question'),
-    url(r'^questions/(?P<id>\d+)/close/$', app.close, name='close'),
-    url(r'^questions/(?P<id>\d+)/reopen/$', app.reopen, name='reopen'),
-    url(r'^questions/(?P<id>\d+)/answer/$', app.answer, name='answer'),
-    url(r'^questions/(?P<id>\d+)/vote/$', app.vote, name='vote'),
-    url(r'^questions/(?P<id>\d+)/revisions/$', app.question_revisions, name='question_revisions'),
-    url(r'^questions/(?P<id>\d+)/comments/$', app.question_comments, name='question_comments'),
-    url(r'^questions/(?P<question_id>\d+)/comments/(?P<comment_id>\d+)/delete/$', app.delete_question_comment, name='delete_question_comment'),
-    url(r'^answers/(?P<answer_id>\d+)/comments/(?P<comment_id>\d+)/delete/$', app.delete_answer_comment, name='delete_answer_comment'),
+    (r'^%s' % _('account/'), include('django_authopenid.urls')),
+    (r'^%s/$' % _('signin/'), 'django_authopenid.views.signin'),
+    url(r'^%s%s$' % (_('email/'), _('change/')), 'django_authopenid.views.changeemail', name='user_changeemail'),
+    url(r'^%s%s$' % (_('email/'), _('sendkey/')), 'django_authopenid.views.send_email_key'),
+    url(r'^%s%s(?P<id>\d+)/(?P<key>[\dabcdef]{32})/$' % (_('email/'), _('verify/')), 'django_authopenid.views.verifyemail', name='user_verifyemail'),
+    url(r'^%s$' % _('about/'), app.about, name='about'),
+    url(r'^%s$' % _('faq/'), app.faq, name='faq'),
+    url(r'^%s$' % _('privacy/'), app.privacy, name='privacy'),
+    url(r'^%s$' % _('logout/'), app.logout, name='logout'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('comments/')), app.answer_comments, name='answer_comments'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('edit/')), app.edit_answer, name='edit_answer'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('revisions/')), app.answer_revisions, name='answer_revisions'),
+    url(r'^%s$' % _('questions/'), app.questions, name='questions'),
+    url(r'^%s%s$' % (_('questions/'), _('ask/')), app.ask, name='ask'),
+    url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.unanswered, name='unanswered'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('edit/')), app.edit_question, name='edit_question'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('close/')), app.close, name='close'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('reopen/')), app.reopen, name='reopen'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('answer/')), app.answer, name='answer'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('vote/')), app.vote, name='vote'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('revisions/')), app.question_revisions, name='question_revisions'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('comments/')), app.question_comments, name='question_comments'),
+    url(r'^%s(?P<question_id>\d+)/%s(?P<comment_id>\d+)/%s$' % (_('questions/'), _('questions/'),_('delete/')), app.delete_question_comment, name='delete_question_comment'),
+    url(r'^%s(?P<answer_id>\d+)/%s(?P<comment_id>\d+)/%s$' % (_('answers/'), _('answers/'),_('delete/')), app.delete_answer_comment, name='delete_answer_comment'),
     #place general question item in the end of other operations
-    url(r'^questions/(?P<id>\d+)//*', app.question, name='question'),
-    url(r'^tags/$', app.tags, name='tags'),
-    url(r'^tags/(?P<tag>[^/]+)/$', app.tag),
-    url(r'^users/$',app.users, name='users'),
-    url(r'^users/(?P<id>\d+)/edit/$', app.edit_user, name='edit_user'),
-    url(r'^users/(?P<id>\d+)//*', app.user, name='user'),
-    url(r'^badges/$',app.badges, name='badges'),
-    url(r'^badges/(?P<id>\d+)//*', app.badge, name='badge'),
-    url(r'^messages/markread/$',app.read_message, name='read_message'),
-    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    (r'^nimda/(.*)', admin.site.root),
-    (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
-    (r'^upload/$', app.upload),
-    url(r'^books/$', app.books, name='books'),
-    url(r'^books/ask/(?P<short_name>[^/]+)/$', app.ask_book, name='ask_book'),
-    url(r'^books/(?P<short_name>[^/]+)/$', app.book, name='book'),
-    url(r'^search/$', app.search, name='search'),
+    url(r'^%s(?P<id>\d+)//*' % _('question/'), app.question, name='question'),
+    url(r'^%s$' % _('tags/'), app.tags, name='tags'),
+    url(r'^%s(?P<tag>[^/]+)/$' % _('tags/'), app.tag),
+    url(r'^%s$' % _('users/'),app.users, name='users'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('users/'), _('edit/')), app.edit_user, name='edit_user'),
+    url(r'^%s(?P<id>\d+)//*' % _('users/'), app.user, name='user'),
+    url(r'^%s$' % _('badges/'),app.badges, name='badges'),
+    url(r'^%s(?P<id>\d+)//*' % _('badges/'), app.badge, name='badge'),
+    url(r'^%s%s$' % (_('messages/'), _('markread/')),app.read_message, name='read_message'),
+    # (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')),
+    (r'^%s(.*)' % _('nimda/'), admin.site.root),
+    url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
+    (r'^%s$' % _('upload/'), app.upload),
+    url(r'^%s$' % _('books/'), app.books, name='books'),
+    url(r'^%s%s(?P<short_name>[^/]+)/$' % (_('books/'), _('ask/')), app.ask_book, name='ask_book'),
+    url(r'^%s(?P<short_name>[^/]+)/$' % _('books/'), app.book, name='book'),
+    url(r'^%s$' % _('search/'), app.search, name='search'),
     (r'^i18n/', include('django.conf.urls.i18n')),
 )
-- 
cgit v1.2.3-1-g7c22


From 79457f57c3e60032eecf563e6172522dc344172c Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Sun, 9 Aug 2009 23:59:48 -0300
Subject: Applied preguntalo.com.uy colors.

---
 templates/content/style/style.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index b3fa6a6c..6c53eec9 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -119,14 +119,14 @@ blockquote
                 border-bottom: none;
 				padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:14px; font-weight:400; text-decoration:none;display: block;float: left;}
 #navBar .nav a:hover {text-decoration:underline}
-#navBar .nav a.on {height:24px;line-height:28px;border:1px solid #d64000; background:#B02B2C; color:#FFF; font-weight:600; text-decoration:none}
-#navBar .nav a.special {font-size:15px; color:#B02B2C; font-weight:bold; text-decoration:none; border:solid 1px;}
+#navBar .nav a.on {height:24px;line-height:28px;border:1px solid green; background:green; color:#FFF; font-weight:600; text-decoration:none}
+#navBar .nav a.special {font-size:15px; color:green; font-weight:bold; text-decoration:none; border:solid 1px;}
 #navBar .nav a.special:hover {text-decoration:underline;}
 #navBar .nav div.focus {position: absolute; top:10px;
  padding-right:0px;}
 /*搜索栏*/
 #searchBar {
-    background-color:#9db2b1;/*#e9b96e;*/
+    background-color:green;/*#e9b96e;*/
     padding:5px 0 0 0;} /* #B02B2C */
 #searchBar .content { }
 #searchBar .searchInput {font-size:13px; height:18px; width:400px;}
-- 
cgit v1.2.3-1-g7c22


From 8fe45d961de797eae931656ec78edbb29eeadf02 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Mon, 10 Aug 2009 00:14:49 -0300
Subject: Translation.

---
 locale/es/LC_MESSAGES/django.po   | 2 +-
 templates/question_edit_tips.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b2580d42..54047c85 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -1693,7 +1693,7 @@ msgstr "las preguntas más votadas serán mostradas primero"
 
 #: templates/question.html:263
 msgid "popular answers"
-msgstr "respuestas populares serán mostradas primero"
+msgstr "respuestas populares"
 
 #: templates/question.html:275
 msgid "i like this answer (click again to cancel)"
diff --git a/templates/question_edit_tips.html b/templates/question_edit_tips.html
index f57440c2..caf292e3 100644
--- a/templates/question_edit_tips.html
+++ b/templates/question_edit_tips.html
@@ -13,7 +13,7 @@
 				{% trans "be clear and concise" %}
             </li>
         </ul>
-         <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
+         <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">{% trans "faq" %} »</a>
          <br>  
     </div>
 </div>
-- 
cgit v1.2.3-1-g7c22


From 6b563bde2d2e6e20bc2d31d9575431131a7ca0c8 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sun, 9 Aug 2009 21:30:49 -0600
Subject: fixing stupid bug in templates.content/js/com.cnprog.i18n.js

---
 templates/content/js/com.cnprog.i18n.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index 96f755bf..848ad59e 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -100,7 +100,7 @@ var i18nEs = {
 	'anonymous users cannot flag offensive posts':'usuarios anónimos no pueden marcar publicaciones como ofensivas',
 	'cannot flag message as offensive twice':'no puede marcar mensaje como ofensivo dos veces',
 	'flag offensive cap exhausted':'cuota para marcar ofensivas ha sido excedida',
-	'need >15 points to report spam':"necesita >15 puntos para reportar spam,
+	'need >15 points to report spam':"necesita >15 puntos para reportar spam",
 	'confirm delete':"¿Está seguro que desea borrar esto?",
 	'anonymous users cannot delete/undelete':"usuarios anónimos no pueden borrar o recuperar publicaciones",
 	'post recovered':"publicación recuperada",
-- 
cgit v1.2.3-1-g7c22


From 725dbd5794ba7e19c218ca2cd1f2e798255acdf0 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sun, 9 Aug 2009 21:34:41 -0600
Subject: modified settings.py and settings_local.py.dist to be more organized

---
 settings.py            | 29 --------------------------
 settings_local.py.dist | 56 +++++++++++++++++++++++++++++++++++---------------
 2 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/settings.py b/settings.py
index 5947617e..fcfdb548 100644
--- a/settings.py
+++ b/settings.py
@@ -17,27 +17,8 @@ ADMINS = (
 )
 MANAGERS = ADMINS
 
-#email server settings (moved to settings_local)
-#SERVER_EMAIL = ''
-#DEFAULT_FROM_EMAIL = 'team@cnprog.com'
-#EMAIL_HOST_USER = ''
-#EMAIL_HOST_PASSWORD = ''
-#EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
-#EMAIL_HOST='smtp.gmail.com'
-#EMAIL_PORT='587'
-#EMAIL_USE_TLS=True
-
-#LOCALIZATIONS (Moved to settings_local)
-#TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
-# LANGUAGE_CODE = 'en-us'
 SITE_ID = 1
 
-#OTHER SETTINGS (Moved to settings_local)
-#APP_TITLE = u'CNProg.com 程序员问答社区'
-#APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
-#APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
-#APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
-#APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
 ADMIN_MEDIA_PREFIX = '/admin/media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 # List of callables that know how to import templates from various sources.
@@ -97,13 +78,3 @@ INSTALLED_APPS = (
 
 # User settings
 from settings_local import *
-
-#Moved to settings_local
-#USE_I18N = True
-#LANGUAGE_CODE = 'en'
-#EMAIL_VALIDATION = 'off'
-#MIN_USERNAME_LENGTH = 1
-#EMAIL_UNIQUE = False
-#APP_URL = 'http://server.com' #used by email notif system and RSS
-#GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
-#GOOGLE_ANALYTICS_KEY = ''
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 2c8f939d..d6273070 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -1,25 +1,47 @@
-SITE_SRC_ROOT = '/Users/sailing/Development/cnprog_beta2'
+# encoding:utf-8
+import os.path
+
+SITE_SRC_ROOT = os.path.dirname(__file__) 
+LOG_FILENAME = 'django.lanai.log'
 
 #for logging
 import logging
-LOG_FILENAME = '/Users/sailing/Development/cnprog_beta2/django.lanai.log'
-logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,)
-
+logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
 
-#Database configuration 
-DATABASE_ENGINE = 'mysql'      
-DATABASE_HOST = ''            
-DATABASE_PORT = ''          
-DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'root'               # Not used with sqlite3.
+DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
+DATABASE_ENGINE = ''  #mysql, etc
+
+#Moved from settings.py for better organization. (please check it up to clean up settings.py)
+
+#email server settings
+SERVER_EMAIL = ''
+DEFAULT_FROM_EMAIL = 'team@cnprog.com'
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
+EMAIL_HOST='smtp.gmail.com'
+EMAIL_PORT='587'
+EMAIL_USE_TLS=True
+
+#LOCALIZATIONS
+TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
+# LANGUAGE_CODE = 'en-us'
 
+#OTHER SETTINGS
+APP_TITLE = u'CNProg.com 程序员问答社区'
+APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
+APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
+APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
+APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
 
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = '/Users/sailing/Development/cnprog_beta2/templates/upfiles/'
+USE_I18N = True
+LANGUAGE_CODE = 'en'
+EMAIL_VALIDATION = 'off'
+MIN_USERNAME_LENGTH = 1
+EMAIL_UNIQUE = False
+APP_URL = 'http://server.com' #used by email notif system and RSS
+GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
+GOOGLE_ANALYTICS_KEY = ''
 
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = 'http://127.0.0.1:8000/upfiles/'
-- 
cgit v1.2.3-1-g7c22


From 306b82e6ef376fd3362dde41e3853dcf5688106d Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Mon, 10 Aug 2009 00:39:40 -0300
Subject: Translation.  * translate url update profile

---
 templates/user_info.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/user_info.html b/templates/user_info.html
index d6804d71..2ef2dd9a 100644
--- a/templates/user_info.html
+++ b/templates/user_info.html
@@ -31,7 +31,7 @@
                     <th width="130" align="left"><strong>{% trans "Registered user" %}</strong></th>
                     <th width="230"  align="right">
                         {% if request.user|can_view_user_edit:view_user %}
-                        <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/edit/">{% trans "update profile" %}</a></span>
+                        <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/{% trans "edit/" %}">{% trans "update profile" %}</a></span>
                         {% endif %}
                     </th>
                 </tr>
-- 
cgit v1.2.3-1-g7c22


From 0f607d83e801192977bff15c256456fa2f44ff85 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sun, 9 Aug 2009 22:36:26 -0600
Subject: adding meta keywords to questions and canonical tag

---
 forum/models.py         | 3 +++
 templates/question.html | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/forum/models.py b/forum/models.py
index 4d8894e4..7de703ca 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -179,6 +179,9 @@ class Question(models.Model):
         """Creates a list of Tag names from the ``tagnames`` attribute."""
         return [name for name in self.tagnames.split(u' ')]
 
+    def tagname_meta_generator(self):
+        return ','.join([str(tag) for tag in self.tagname_list()])
+
     def get_absolute_url(self):
         return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-'))
 
diff --git a/templates/question.html b/templates/question.html
index eaff9da3..1fd6467d 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -6,6 +6,9 @@
 {% load i18n %}
 {% block title %}{% spaceless %}{{ question.get_question_title }}{% endspaceless %}{% endblock %}
 {% block forejs %}
+        <meta name="description" content="{{question.summary}}" />
+        <meta name="keywords" content="{{question.tagname_meta_generator}}" />
+        <link rel="canonical" href="{{question.get_absolute_url}}"/>
         {% if not question.closed and request.user.is_authenticated %}
         <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
         <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
-- 
cgit v1.2.3-1-g7c22


From 1eacc7a42618e84766477fbcc2c32a1da3547115 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Mon, 10 Aug 2009 21:40:01 -0400
Subject: untested commit. merged Adolfos mods, validated most of html, slugify
 urls, fixed IE issues in openid signin

---
 forum/models.py                                    |  20 ++++-----
 forum/templatetags/extra_filters.py                |   9 +++-
 forum/templatetags/extra_tags.py                   |   6 ++-
 locale/en/LC_MESSAGES/django.po                    |  44 +++++++++----------
 locale/es/LC_MESSAGES/django.po                    |   4 +-
 templates/404.html                                 |   2 +-
 templates/500.html                                 |   4 +-
 templates/answer_edit.html                         |  12 ++----
 templates/answer_edit_tips.html                    |   2 -
 templates/ask.html                                 |  17 ++++----
 templates/authopenid/changeemail.html              |   2 +-
 templates/authopenid/complete.html                 |  28 ++++++------
 templates/authopenid/sendpw.html                   |   4 +-
 templates/authopenid/signin.html                   |  29 ++++++-------
 templates/authopenid/signup.html                   |  10 ++---
 templates/badges.html                              |   5 +--
 templates/base.html                                |  10 +++--
 templates/base_content.html                        |  12 +++---
 templates/book.html                                |   2 +-
 .../content/jquery-openid/images/blogger-1.png     | Bin 0 -> 432 bytes
 .../content/jquery-openid/images/claimid-0.png     | Bin 0 -> 629 bytes
 templates/content/jquery-openid/images/flickr.png  | Bin 0 -> 426 bytes
 .../content/jquery-openid/images/livejournal-1.png | Bin 0 -> 713 bytes
 .../content/jquery-openid/images/myopenid-2.png    | Bin 0 -> 511 bytes
 .../content/jquery-openid/images/technorati-1.png  | Bin 0 -> 606 bytes
 .../content/jquery-openid/images/verisign-2.png    | Bin 0 -> 859 bytes
 templates/content/jquery-openid/images/vidoop.png  | Bin 0 -> 499 bytes
 .../content/jquery-openid/images/wordpress.png     | Bin 0 -> 566 bytes
 templates/content/jquery-openid/openid.css         |   2 +-
 templates/content/style/style.css                  |   1 -
 templates/faq.html                                 |   2 +-
 templates/footer.html                              |   6 ++-
 templates/header.html                              |  17 ++++----
 templates/index.html                               |  12 +++---
 templates/logout.html                              |   1 -
 templates/privacy.html                             |   1 -
 templates/question.html                            |  47 ++++++++++++---------
 templates/question_edit.html                       |  16 +++----
 templates/question_edit_tips.html                  |   2 -
 templates/question_retag.html                      |   7 +--
 templates/questions.html                           |  22 +++++-----
 templates/tags.html                                |   7 ++-
 templates/unanswered.html                          |  10 ++---
 templates/user_info.html                           |   2 +-
 templates/user_preferences.html                    |  11 ++---
 templates/user_responses.html                      |   2 +-
 templates/user_stats.html                          |   9 ++--
 templates/user_tabs.html                           |   2 +-
 templates/users_questions.html                     |   2 +-
 49 files changed, 199 insertions(+), 204 deletions(-)
 create mode 100644 templates/content/jquery-openid/images/blogger-1.png
 create mode 100644 templates/content/jquery-openid/images/claimid-0.png
 create mode 100644 templates/content/jquery-openid/images/flickr.png
 create mode 100644 templates/content/jquery-openid/images/livejournal-1.png
 create mode 100644 templates/content/jquery-openid/images/myopenid-2.png
 create mode 100644 templates/content/jquery-openid/images/technorati-1.png
 create mode 100644 templates/content/jquery-openid/images/verisign-2.png
 create mode 100644 templates/content/jquery-openid/images/vidoop.png
 create mode 100644 templates/content/jquery-openid/images/wordpress.png

diff --git a/forum/models.py b/forum/models.py
index 7de703ca..9510476a 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -274,6 +274,16 @@ class Question(models.Model):
     class Meta:
         db_table = u'question'
 
+class FavoriteQuestion(models.Model):
+    """A favorite Question of a User."""
+    question      = models.ForeignKey(Question)
+    user          = models.ForeignKey(User, related_name='user_favorite_questions')
+    added_at = models.DateTimeField(default=datetime.datetime.now)
+    class Meta:
+        db_table = u'favorite_question'
+    def __unicode__(self):
+        return '[%s] favorited at %s' %(self.user, self.added_at)
+
 class QuestionRevision(models.Model):
     """A revision of a Question."""
     question   = models.ForeignKey(Question, related_name='revisions')
@@ -422,16 +432,6 @@ class AnswerRevision(models.Model):
                                                 flat=True)[0] + 1
         super(AnswerRevision, self).save(**kwargs)
 
-class FavoriteQuestion(models.Model):
-    """A favorite Question of a User."""
-    question      = models.ForeignKey(Question)
-    user          = models.ForeignKey(User, related_name='user_favorite_questions')
-    added_at = models.DateTimeField(default=datetime.datetime.now)
-    class Meta:
-        db_table = u'favorite_question'
-    def __unicode__(self):
-        return '[%s] favorited at %s' %(self.user, self.added_at)
-
 class Badge(models.Model):
     """Awarded for notable actions performed on the site by Users."""
     GOLD = 1
diff --git a/forum/templatetags/extra_filters.py b/forum/templatetags/extra_filters.py
index cec97920..d8b8e61f 100644
--- a/forum/templatetags/extra_filters.py
+++ b/forum/templatetags/extra_filters.py
@@ -1,8 +1,13 @@
-from django import template
+from django import template
 from forum import auth
 
 register = template.Library()
 
+@template.defaultfilters.stringfilter
+@register.filter
+def collapse(input):
+    return ' '.join(input.split())
+
 @register.filter
 def can_vote_up(user):
     return auth.can_vote_up(user)
@@ -80,4 +85,4 @@ def cnprog_intword(number):
         else:
             return number
     except:
-        return number
\ No newline at end of file
+        return number
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index ac4e6ca3..06a2d27c 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -14,7 +14,8 @@ register = template.Library()
 
 GRAVATAR_TEMPLATE = ('<img width="%(size)s" height="%(size)s" '
                      'src="http://www.gravatar.com/avatar/%(gravatar_hash)s'
-                     '?s=%(size)s&d=identicon&r=PG">')
+                     '?s=%(size)s&amp;d=identicon&amp;r=PG" '
+                     'alt="%(username)s\'s gravatar image" />')
 
 @register.simple_tag
 def gravatar(user, size):
@@ -26,11 +27,14 @@ def gravatar(user, size):
     """
     try:
         gravatar = user['gravatar']
+        username = user['username']
     except (TypeError, AttributeError, KeyError):
         gravatar = user.gravatar
+        username = user.username
     return mark_safe(GRAVATAR_TEMPLATE % {
         'size': size,
         'gravatar_hash': gravatar,
+        'username': template.defaultfilters.urlencode(username),
     })
 
 MAX_FONTSIZE = 18
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 3dda9ce9..07532566 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -148,7 +148,7 @@ msgstr ""
 
 #: django_authopenid/views.py:417 django_authopenid/views.py:544
 msgid "Welcome"
-msgstr "Verification Email from Q&A forum"
+msgstr "Verification Email from Q&amp;A forum"
 
 #: django_authopenid/views.py:507
 msgid "Password changed."
@@ -812,7 +812,7 @@ msgid "must have valid %(email)s to post"
 msgstr ""
 "<span class='strong big'>Looks like your email address, %(email)s has not "
 "yet been validated.</span> To post messages you must verify your email, "
-"please see <a href='/faq#validate'>more details here</a>.<br>You can submit "
+"please see <a href='/faq#validate'>more details here</a>.<br/>You can submit "
 "your question now and validate email after that. Your question will saved as "
 "pending meanwhile. "
 
@@ -1135,12 +1135,12 @@ msgstr ""
 "<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
 "\"bigger strong\">How?</span> If you have just set or changed your email "
 "address - <strong>check your email and click the included link</strong>."
-"<br>The link contains a key generated specifically for you. You can also "
+"<br/>The link contains a key generated specifically for you. You can also "
 "<button style='display:inline' type='submit'><strong>get a new key</strong></"
 "button> and check your email again.</p></form><span class=\"bigger strong"
 "\">Why?</span> Email validation is required to make sure that <strong>only "
 "you can post messages</strong> on your behalf and to <strong>minimize spam</"
-"strong> posts.<br>With email you can <strong>subscribe for updates</strong> "
+"strong> posts.<br/>With email you can <strong>subscribe for updates</strong> "
 "on the most interesting questions. Also, when you sign up for the first time "
 "- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
 "personal image.</p>"
@@ -1716,12 +1716,12 @@ msgid_plural ""
 "\t\t\t"
 msgstr[0] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>question tagged</p><p><span "
-"class=\"tag\">%(tagname)s</span></p>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>question tagged <span "
+"class=\"tag\">%(tagname)s</span>"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
-"class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged "
+"<span class=\"tag\">%(tagname)s</span>"
 
 #: templates/questions.html:116
 #, python-format
@@ -1735,14 +1735,12 @@ msgid_plural ""
 "\t\t\t\t"
 msgstr[0] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>question with title "
-"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
-"p>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>question with title "
+"containing <span class=\"darkred strong\">%(searchtitle)s</span>"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions with title "
-"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
-"p>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>questions with title "
+"containing <span class=\"darkred strong\">%(searchtitle)s</span></strong>"
 
 #: templates/questions.html:122
 #, python-format
@@ -1756,10 +1754,10 @@ msgid_plural ""
 "\t\t\t\t"
 msgstr[0] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>question</p>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>question"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>questions"
 
 #: templates/questions.html:131
 msgid "latest questions info"
@@ -1866,7 +1864,7 @@ msgstr ""
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
+"<span class=\"questions-count\">%(num_q)s</span><br/><strong>unanswered</strong> "
 "questions"
 
 #: templates/unanswered.html:99
@@ -2197,7 +2195,7 @@ msgstr "New user signup"
 #, python-format
 msgid "register new %(provider)s account info"
 msgstr ""
-"<p><span class=\"big strong\">You are here for the first time with your %"
+"<span class=\"big strong\">You are here for the first time with your %"
 "(provider)s login.</span> Please create your <strong>screen name</strong> "
 "and save your <strong>email</strong> address. Saved email address will let "
 "you <strong>subscribe for the updates</strong> on the most interesting "
@@ -2249,7 +2247,7 @@ msgstr ""
 
 #: templates/authopenid/confirm_email.txt:2
 msgid "Thank you for registering at our Q&A forum!"
-msgstr ""
+msgstr "Thank you for registering at our Q&amp;A forum!"
 
 #: templates/authopenid/confirm_email.txt:4
 msgid "Your account details are:"
@@ -2309,7 +2307,7 @@ msgstr ""
 
 #: templates/authopenid/email_validation.txt:2
 msgid "Greetings from the Q&A forum"
-msgstr ""
+msgstr "Greetings from the Q&amp;A forum"
 
 #: templates/authopenid/email_validation.txt:4
 msgid "To make use of the Forum, please follow the link below:"
@@ -2434,14 +2432,14 @@ msgid "Click to sign in through any of these services."
 msgstr ""
 "<p><span class=\"big strong\">We accept <a href=\"http://openid.net"
 "\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new "
-"password - log in through any of the services below.<p><span class=\"big "
+"password - log in through any of the services below.</font></p><p><span class=\"big "
 "strong\">1. Select the login service by clicking one of the icons</span></p>"
 
 #: templates/authopenid/signin.html:103
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
 msgstr ""
 "<span class=\"big strong\">2. Enter your <span id=\"enter_your_what"
-"\">Provider user name</span></span><br>(or select another OpenID provider "
+"\">Provider user name</span></span><br/>(or select another OpenID provider "
 "above)"
 
 #: templates/authopenid/signin.html:110
@@ -2450,7 +2448,7 @@ msgid ""
 "web address"
 msgstr ""
 "<span class=\"big strong\">2. Enter your <a class=\"openid_logo\" href="
-"\"http://openid.net\">OpenID</a> web address</span><br>(or choose specific "
+"\"http://openid.net\">OpenID</a> web address</span><br/>(or choose specific "
 "provider by clicking on one of the icons above)"
 
 #: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 7f407da3..b209c72c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: 2009-08-09 18:42-0600\n"
+"PO-Revision-Date: 2009-08-07 11:21-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1261,7 +1261,7 @@ msgstr "mi perfil"
 
 #: templates/header.html:42
 msgid "ask a question"
-msgstr "preguntar"
+msgstr "hacer una pregunta"
 
 #: templates/header.html:57
 msgid "search"
diff --git a/templates/404.html b/templates/404.html
index cd23a36b..7090156b 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -23,7 +23,7 @@
     <div style="padding:5px 0px 10px 0;line-height:25px;">
         <h3>{% trans "Sorry, could not find the page you requested." %}</h3>
         <div style="margin-top:5px">
-        {% trans "This might have happened for the following reasons:" %}<br>
+        {% trans "This might have happened for the following reasons:" %}<br/>
         <ul>
             <li>{% trans "this question or answer has been deleted;" %}</li>
             <li>{% trans "url has error - please check it;" %}</li>
diff --git a/templates/500.html b/templates/500.html
index 52dcafae..313150fb 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -20,8 +20,8 @@
 <div id="main-body" class="headNormal">
     <div style="padding:5px 0px 10px 0;line-height:25px">
         <h3>{% trans "sorry, system error" %}</h3>
-        <br>
-        {% trans "system error log is recorded, error will be fixed as soon as possible" %}<br>
+        <br/>
+        {% trans "system error log is recorded, error will be fixed as soon as possible" %}<br/>
 		{% trans "please report the error to the site administrators if you wish" %}
         <ul>
             <li><a href="#" id="linkPrevious">{% trans "back to previous page" %}</li>
diff --git a/templates/answer_edit.html b/templates/answer_edit.html
index 9f0f1bec..8baa7c1e 100644
--- a/templates/answer_edit.html
+++ b/templates/answer_edit.html
@@ -49,31 +49,27 @@
 <div id="main-body" class="ask-body">
     <div id="askform">
         <form id="fmedit" action="{% url edit_answer answer.id %}" method="post" >
-            <label for="id_revision" ><strong>{% trans "revision" %}:</strong></label> <br> 
+            <label for="id_revision" ><strong>{% trans "revision" %}:</strong></label> <br/> 
             {% if revision_form.revision.errors %}{{ revision_form.revision.errors.as_ul }}{% endif %}
             <div style="vertical-align:middle">
             {{ revision_form.revision }} <input type="submit" style="display:none" id="select_revision" name="select_revision" value="{% trans "select revision" %}">
-            </div><br>
+            </div>
             <div class="form-item">
                 <div id="wmd-button-bar" class="wmd-panel"></div>
                 {{ form.text }}
                 <span class="form-error"></span>
                 <div class="preview-toggle"><span id="pre-collapse" 
-					title="{% trans "Toggle the real time Markdown editor preview" %}打">{% trans "toggle preview" %}</span></div>
+					title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span></div>
                 <div id="previewer" class="wmd-preview"></div>
-                <br>
             </div>
             
-            <strong>{{ form.summary.label_tag }}</strong> <br>
+            <strong>{{ form.summary.label_tag }}</strong> <br/>
             {{ form.summary }}  {{ form.summary.errors }}
             <div class="title-desc">
                 {{ form.summary.help_text }}
             </div>
-            <br>
             <input type="submit" value="{% trans "Save edit" %}" class="submit" />
             <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);" />
-            <br>
-            <br>
         </form>
     </div>
 </div>
diff --git a/templates/answer_edit_tips.html b/templates/answer_edit_tips.html
index 31f71e34..bf1cd516 100644
--- a/templates/answer_edit_tips.html
+++ b/templates/answer_edit_tips.html
@@ -17,7 +17,6 @@
             </li>
         </ul>
          <a href="/faq/" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
-         <br>  
     </div>
 </div>
 
@@ -48,6 +47,5 @@
         </li>
     </ul>
     <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank" style="float:right;position:relative">{% trans "learn more about Markdown" %} »</a>
-    <br>  
 </div>
 <!-- end template answer_edit_tips.html -->
diff --git a/templates/ask.html b/templates/ask.html
index 4aa18dd5..9e86a5a0 100644
--- a/templates/ask.html
+++ b/templates/ask.html
@@ -75,15 +75,15 @@
                     {% endif %}
                 {% endifequal %}
 			{% endif %}
-            <p class="form-item">
-                <label for="id_title" ><strong>{{ form.title.label_tag }}:</strong></label> <span class="form-error"></span><br>
+            <div class="form-item">
+                <label for="id_title" ><strong>{{ form.title.label_tag }}:</strong></label> <span class="form-error"></span><br/>
                 {{ form.title }} {{ form.title.errors }}
                 <div class="title-desc">
                     {{ form.title.help_text }}
                 </div>
-            </p>
+            </div>
 
-            <p class="form-item">
+            <div class="form-item">
                 <div id="wmd-button-bar" class="wmd-panel"></div>
                 {{ form.text }}
 
@@ -102,12 +102,11 @@
                 </div>
                 <div id="previewer" class="wmd-preview"></div>
                 <span class="form-error"></span>
-                <br>
-            </p>
-            <p class="form-item">
-                <strong>{{ form.tags.label_tag }}:</strong> {% trans "(required)" %} <span class="form-error"></span><br>
+            </div>
+            <div class="form-item">
+                <strong>{{ form.tags.label_tag }}:</strong> {% trans "(required)" %} <span class="form-error"></span><br/>
                 {{ form.tags }}  {{ form.tags.errors }}
-            </p>
+            </div>
 			<p class="title-desc">
 				{{ form.tags.help_text }}
 			</p>
diff --git a/templates/authopenid/changeemail.html b/templates/authopenid/changeemail.html
index d5acb6c9..09857d17 100644
--- a/templates/authopenid/changeemail.html
+++ b/templates/authopenid/changeemail.html
@@ -27,7 +27,7 @@
     <div class="aligned">
         <form action="." method="post" accept-charset="utf-8">
 
-            <div class="form-row"><label for="id_email">{% trans "Your new Email" %}</label><br>{{ form.email }}</div>
+            <div class="form-row"><label for="id_email">{% trans "Your new Email" %}</label><br/>{{ form.email }}</div>
             <!--<div class="form-row"><label for="id_password">{% trans "Password" %}</label>{{ form.password }}</div>-->
             <div class="submit-row">
                 <input class="submit" type="submit" name="change_email" value="{% trans "Change email" %}">
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index b9a14e16..f29b7670 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -7,16 +7,16 @@
     <div id="main-bar" class="headNormal">
 		{% trans "Connect your OpenID with your account on this site" %}
     </div>      
-	<p id="completetxt" >
+	<div id="completetxt" >
         <div class="message">
             {% blocktrans %}register new {{provider}} account info{% endblocktrans %}
         </div>
     	<p style="display:none">{% trans "This account already exists, please use another." %}</p>
-	</p>
+	</div>
 
 	{% if form1.errors %}
-	<p class="errors">
-        <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br>
+	<div class="errors">
+        <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
         <ul class="error-list">
 		{% if form1.username.errors %} 
 			<li><span class="error">{{ form1.username.errors|join:", " }}</span></li>
@@ -25,11 +25,11 @@
 			<li><span class="error">{{ form1.email.errors|join:", " }}</span></li>
 		{% endif %}
         </ul>
-	</p>
+	</div>
 	{% endif %}
 	{% if form2.errors %}
-	<p class="errors">
-        <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br>
+	<div class="errors">
+        <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
         <ul class="error-list">
 		{% if form2.username.errors %} 
 			<li><span class="error">{{ form2.username.errors|join:", " }}</span></li>
@@ -38,15 +38,15 @@
 			<li><span class="error">{{ form2.password.errors|join:", " }}</span></li>
 		{% endif %}
        </ul>
-	</p>
+	</div>
 	{% endif %}
 
 	<div class="login">
         <form name="fregister" action="{% url user_register %}" method="POST">
             {{ form.next }}
-            <div class="form-row"><label for="id_username">{% trans "Screen name label" %}</label><br />{{ form1.username }}</div>
-            <div class="form-row"><label for="id_email">{% trans "Email address label" %}</label><br />{{ form1.email }}</div>
-            <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"></div>
+            <div class="form-row"><label for="id_username">{% trans "Screen name label" %}</label><br/>{{ form1.username }}</div>
+            <div class="form-row"><label for="id_email">{% trans "Email address label" %}</label><br/>{{ form1.email }}</div>
+            <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div>
 		</form>
 	</div>
 	<div class="login" style="display:none">
@@ -54,11 +54,11 @@
             {{ form.next }}
 			<fieldset style="padding:10px">
 				<legend class="big">{% trans "Existing account" %}</legend>
-				<div class="form-row"><label for="id_username">{% trans "user name" %}</label><br />{{ form2.username }}</div>
-				<div class="form-row"><label for="id_passwordl">{% trans "password" %}</label><br />{{ form2.password }}</div>
+				<div class="form-row"><label for="id_username">{% trans "user name" %}</label><br/>{{ form2.username }}</div>
+				<div class="form-row"><label for="id_passwordl">{% trans "password" %}</label><br/>{{ form2.password }}</div>
 				<!--todo double check translation from chinese 确认 = "Register" -->
 				<div class="submit-row">
-					<input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"> 
+					<input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"/> 
 					<a href="">{% trans "Forgot your password?" %}</a>
 				</div>
 			</fieldset>
diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
index ba81dba4..383723ca 100644
--- a/templates/authopenid/sendpw.html
+++ b/templates/authopenid/sendpw.html
@@ -9,11 +9,11 @@
 
 </div>
 <div class="paragraph">
-{% trans "Lost your password? No problem - here you can reset it." %}<br>
+{% trans "Lost your password? No problem - here you can reset it." %}<br/>
 {% trans "Please enter your username below and new password will be sent to your registered e-mail" %}
 </div>
 {% if form.errors %}
-<p class="errors"><span class="big">{% "Sorry, looks like we have some errors:" %}</span><br>
+<p class="errors"><span class="big">{% "Sorry, looks like we have some errors:" %}</span><br/>
 	{% if form.username.errors %} 
 		<span class="error">{{ form.username.errors|join:", " }}</span>
 	{% endif %}
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index 9a1a6780..8601f6ee 100644
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -62,39 +62,39 @@
 				</div>
 			  </li>
 			  <li class="username first_tiny_li" title="MyOpenID user name"> 
-					<img src="/content/jquery-openid/images/myopenid.ico" alt="icon" />
+					<img src="/content/jquery-openid/images/myopenid-2.png" alt="icon" />
 					<span>http://<strong>username</strong>.myopenid.com/</span>
 		      </li> 
 			  <li class="username" title="Flickr user name"> 
-					<img src="/content/jquery-openid/images/flickr.ico" alt="icon" />
+					<img src="/content/jquery-openid/images/flickr.png" alt="icon" />
 					<span>http://flickr.com/<strong>username</strong>/</span>
 			  </li> 
 			  <li class="username" title="Technorati user name"> 
-					<img src="/content/jquery-openid/images/technorati.ico" alt="icon" />
+					<img src="/content/jquery-openid/images/technorati-1.png" alt="icon" />
 					<span>http://technorati.com/people/technorati/<strong>username</strong>/</span>
 			  </li> 
 			  <li class="username" title="Wordpress blog name"> 
-					<img src="/content/jquery-openid/images/wordpress.ico" alt="icon" />
+					<img src="/content/jquery-openid/images/wordpress.png" alt="icon" />
 					<span>http://<strong>username</strong>.wordpress.com</span>
               </li> 
 			  <li class="username" title="Blogger blog name"> 
-					<img src="/content/jquery-openid/images/blogger.ico" alt="icon" />
+					<img src="/content/jquery-openid/images/blogger-1.png" alt="icon" />
 					<span>http://<strong>username</strong>.blogspot.com/</span>
 			  </li> 
 			  <li class="username" title="LiveJournal blog name"> 
-					<img src="/content/jquery-openid/images/livejournal.ico" alt="icon" />
+					<img src="/content/jquery-openid/images/livejournal-1.png" alt="icon" />
 					<span>http://<strong>username</strong>.livejournal.com</span>
 			  </li> 
 			  <li class="username" title="ClaimID user name"> 
-					<img src="/content/jquery-openid/images/claimid.ico" alt="icon" />
+					<img src="/content/jquery-openid/images/claimid-0.png" alt="icon" />
 					<span>http://claimid.com/<strong>username</strong></span>
 			  </li> 
 			  <li class="username" title="Vidoop user name"> 
-					<img src="/content/jquery-openid/images/vidoop.ico" alt="icon" />
+					<img src="/content/jquery-openid/images/vidoop.png" alt="icon" />
 					<span>http://<strong>username</strong>.myvidoop.com/</span>
 			  </li> 
 			  <li class="username" title="Verisign user name"> 
-					<img src="/content/jquery-openid/images/verisign.ico" alt="icon" />
+					<img src="/content/jquery-openid/images/verisign-2.png" alt="icon" />
 					<span>http://<strong>username</strong>.pip.verisignlabs.com/</span>
 			  </li> 
 			  </ul>
@@ -115,10 +115,9 @@
 <div class="login">
         <p style="display:none">{% trans "we support two login modes" %}</p>
     <div style="display:none">
-        <br>
         {% if form1.errors %}
         <p class="errors">
-            <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br>
+            <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
             <ul class="error-list">
                 {% if form1.username.errors %} 
                 <li><span class="error">{{ form1.username.errors|join:", " }}</span></li>
@@ -129,14 +128,13 @@
             </ul>
         </p>
         {% endif %}
-        <br>
         <form name="fauth" action="{% url user_signin %}" method="post">
             {{ form1.next }}
         	<fieldset class="fieldset" >
         		<legend class="big">{% trans "Use login name and password" %}</legend>
         		<div class="form-row"><label for="id_username">{% trans "Login name" %}:</label><br />{{ form1.username }}</div>
         		<div class="form-row"><label for="id_password">{% trans "Password" %}:</label><br />{{ form1.password }}</div>
-               <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"> 
+               <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"/> 
 			   <a href="">{% trans "Forgot your password?" %}</a> 
 			   <a href="">{% trans "Create new account" %}</a></div>
         	</fieldset>	
@@ -148,7 +146,6 @@
 {% block sidebar %}
 <div class="boxC">
     <h3 class="subtitle">{% trans "Why use OpenID?" %}</h3>
-    <p>
     <ul class="list-item">
         <li>
 		{% trans "with openid it is easier" %}
@@ -164,10 +161,10 @@
         </li>
         
     </ul>
-    <a href="http://openid.net/what/" target="_blank" style="float:right;position:relative">{% trans "Find out more" %} »</a><br>
+    <p>
+    <a href="http://openid.net/what/" target="_blank" style="float:right;position:relative">{% trans "Find out more" %} »</a><br/>
     <a href="http://openid.net/get/" target="_blank" style="float:right;position:relative">{% trans "Get OpenID" %} »</a>
     </p>
-    <br>  
 </div>
 {% endblock%}
 
diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html
index a65dafdc..5e405d3f 100644
--- a/templates/authopenid/signup.html
+++ b/templates/authopenid/signup.html
@@ -14,7 +14,7 @@
     {% if form.errors %}
     
     <p class="errors">
-        <span class="big">{% trans "Sorry, looks like we have some errors" %}</span><br>
+        <span class="big">{% trans "Sorry, looks like we have some errors" %}</span><br/>
         <ul class="error-list">
         {% if form.username.errors %} 
         <li><span class="error">{{ form.username.errors|join:", " }}</span></li>
@@ -33,17 +33,15 @@
     <form action="{% url user_signup %}" method="post" accept-charset="utf-8">
         <fieldset class="fieldset">
         <legend class="big">{% trans "Conventional registration" %}</legend>	
-            <div class="form-row"><label for="id_username">{% trans "choose a user name" %}:</label><br>{{ form.username }}</div>
+            <div class="form-row"><label for="id_username">{% trans "choose a user name" %}:</label><br/>{{ form.username }}</div>
 
-            <div class="form-row"><label for="id_email">{% trans "your email address" %}:</label><br>{{ form.email }}</div>
+            <div class="form-row"><label for="id_email">{% trans "your email address" %}:</label><br/>{{ form.email }}</div>
             <div class="form-row"><label for="id_password1">{% trans "choose password" %}:</label><br />{{ form.password1 }}</div>
-            <div class="form-row"><label for="id_password2">{% trans "retype password" %}:</label><br>{{ form.password2 }}</div>
+            <div class="form-row"><label for="id_password2">{% trans "retype password" %}:</label><br/>{{ form.password2 }}</div>
             <div class="submit-row"><input type="submit" class="submit" value="{% trans "login" %}" > 
 			<a href="{% url user_signin %}">{% trans "back to login" %}</a></div>
         </fieldset>
-            <br >
     </form>
-    <br >
     <div style="display:none">
     <h2 class="signup">{% trans "Register with your OpenID" %}</h2>
     <form name="fopenid" action="{% url user_signin %}" method="post">
diff --git a/templates/badges.html b/templates/badges.html
index 69ddc39f..4a1ba091 100644
--- a/templates/badges.html
+++ b/templates/badges.html
@@ -18,10 +18,9 @@
 </div>
 <div class="badges" id="main-body" style="width:100%">
     <p>
-	{% trans "Community gives you awards for your questions, answers and votes." %}<br>
+	{% trans "Community gives you awards for your questions, answers and votes." %}<br/>
 	{% trans "Below is the list of available badges and number of times each type of badge has been awarded." %}
     </p>
-    <br>
     <div id="medalList">
         {% for badge in badges %}
         <div style="clear:both;line-height:30px">
@@ -33,7 +32,7 @@
             {% endfor %}
             </div>
             <div style="float:left;width:180px;">
-                <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a><strong> × {{ badge.awarded_count|intcomma }}</strong>
+                <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a><strong> &#x2715; {{ badge.awarded_count|intcomma }}</strong>
             </div>
             <p style="float:left;width:350px;">
                 {{ badge.description }}
diff --git a/templates/base.html b/templates/base.html
index ae389255..0f568f73 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,12 +8,14 @@
         {% spaceless %}
         {% block meta %}{% endblock %}
         {% endspaceless %}
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        {% if settings.GOOGLE_SITEMAP_CODE %}
         <meta name="verify-v1" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
-        <link rel="shortcut icon" href="/content/images/favicon.ico" >
+        {% endif %}
+        <link rel="shortcut icon" href="/content/images/favicon.ico" />
         <link href="/content/style/style.css" rel="stylesheet" type="text/css" />
-        <script src="http://www.google.com/jsapi"></script>
-        <script>google.load("jquery", "1.2.6");</script>
+        <script src="http://www.google.com/jsapi" type="text/javascript"></script>
+        <script type="text/javascript">google.load("jquery", "1.2.6");</script>
 		<script type="text/javascript">
 			var i18nLang = '{{settings.LANGUAGE_CODE}}';
 		</script>
diff --git a/templates/base_content.html b/templates/base_content.html
index 4ee9675f..a05198f5 100644
--- a/templates/base_content.html
+++ b/templates/base_content.html
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!-- base_content.html -->
 {% load i18n %}
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <meta name="verify-v1" content="{{ settings.GOOGLE_SITEMAP_CODE }}" />
-        <link rel="shortcut icon" href="/content/images/favicon.ico" >
+        <link rel="shortcut icon" href="/content/images/favicon.ico" />
         <link href="/content/style/style.css" rel="stylesheet" type="text/css" />
 		 {% spaceless %}
         {% block forestyle %}{% endblock %}
         {% endspaceless %}
-        <script src="http://www.google.com/jsapi"></script>
-        <script>google.load("jquery", "1.2.6");</script>
+        <script src="http://www.google.com/jsapi" type="text/javascript"></script>
+        <script type="text/javascript">google.load("jquery", "1.2.6");</script>
 		<script type="text/javascript">
 			var i18nLang = '{{ settings.LANGUAGE_CODE }}';
 		</script>
diff --git a/templates/book.html b/templates/book.html
index dddd13e6..23166cb7 100644
--- a/templates/book.html
+++ b/templates/book.html
@@ -118,7 +118,7 @@
                 </a>
                 <div class="bookQuestionItem">
                     <h3>
-                        <a title="{{question.summary}}" href="/questions/{{question.id}}/{{question.title}}">{{question.title}}</a>
+                        <a title="{{question.summary|collapse}}" href="/questions/{{question.id}}/{{question.title}}">{{question.title}}</a>
                     </h3>
                     <div class="tags">
                         {% for tag in question.tagname_list %}
diff --git a/templates/content/jquery-openid/images/blogger-1.png b/templates/content/jquery-openid/images/blogger-1.png
new file mode 100644
index 00000000..8b360ea5
Binary files /dev/null and b/templates/content/jquery-openid/images/blogger-1.png differ
diff --git a/templates/content/jquery-openid/images/claimid-0.png b/templates/content/jquery-openid/images/claimid-0.png
new file mode 100644
index 00000000..4a0ea1b3
Binary files /dev/null and b/templates/content/jquery-openid/images/claimid-0.png differ
diff --git a/templates/content/jquery-openid/images/flickr.png b/templates/content/jquery-openid/images/flickr.png
new file mode 100644
index 00000000..142405a6
Binary files /dev/null and b/templates/content/jquery-openid/images/flickr.png differ
diff --git a/templates/content/jquery-openid/images/livejournal-1.png b/templates/content/jquery-openid/images/livejournal-1.png
new file mode 100644
index 00000000..e6436081
Binary files /dev/null and b/templates/content/jquery-openid/images/livejournal-1.png differ
diff --git a/templates/content/jquery-openid/images/myopenid-2.png b/templates/content/jquery-openid/images/myopenid-2.png
new file mode 100644
index 00000000..f64fb8e8
Binary files /dev/null and b/templates/content/jquery-openid/images/myopenid-2.png differ
diff --git a/templates/content/jquery-openid/images/technorati-1.png b/templates/content/jquery-openid/images/technorati-1.png
new file mode 100644
index 00000000..f7195240
Binary files /dev/null and b/templates/content/jquery-openid/images/technorati-1.png differ
diff --git a/templates/content/jquery-openid/images/verisign-2.png b/templates/content/jquery-openid/images/verisign-2.png
new file mode 100644
index 00000000..c1467008
Binary files /dev/null and b/templates/content/jquery-openid/images/verisign-2.png differ
diff --git a/templates/content/jquery-openid/images/vidoop.png b/templates/content/jquery-openid/images/vidoop.png
new file mode 100644
index 00000000..032c9e98
Binary files /dev/null and b/templates/content/jquery-openid/images/vidoop.png differ
diff --git a/templates/content/jquery-openid/images/wordpress.png b/templates/content/jquery-openid/images/wordpress.png
new file mode 100644
index 00000000..ee29f0cf
Binary files /dev/null and b/templates/content/jquery-openid/images/wordpress.png differ
diff --git a/templates/content/jquery-openid/openid.css b/templates/content/jquery-openid/openid.css
index e53c1823..6c59192f 100644
--- a/templates/content/jquery-openid/openid.css
+++ b/templates/content/jquery-openid/openid.css
@@ -1,7 +1,7 @@
 fieldset {border-style:none;}
 img {border-style:none;}
 
-.logo_box {width:90px;height:40px;background:white;border:1px solid #dddddd;}
+.logo_box {display:inline-block;width:90px;height:40px;background:white;border:1px solid #dddddd;}
 .openid_box img {margin-top:6px;}
 .aol_box img {margin-top:6px;}
 .yahoo_box img {margin-top:13px;}
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index fa20b014..e353dd47 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -97,7 +97,6 @@ blockquote
 	right:0px;
 	height:20px; 
 	text-align:right; 
-    color:black;
 	padding:3px;
 	background-color:#ffffff;
 	width:500px;
diff --git a/templates/faq.html b/templates/faq.html
index 78c433ae..7e99ae7f 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -19,7 +19,7 @@
             </p>
             
                 <h3 class="subtitle">{% trans "What questions should I avoid asking?" %}</h3>
-                <p>{% trans "Please avoid asking questions that are not relevant to this community, too subjective and argumentative." %}</p>
+            <p>{% trans "Please avoid asking questions that are not relevant to this community, too subjective and argumentative." %}
             </p>
         </div>
     
diff --git a/templates/footer.html b/templates/footer.html
index 637ca0d8..c291c328 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -13,13 +13,14 @@
         </div>
 	  <p style="margin-top:10px;">
          <a href="http://code.google.com/p/cnprog/" target="_blank">
-            <img src="/content/images/djangomade124x25_grey.gif" border="0" alt="Made with Django." title="Made with Django." >
+            <img src="/content/images/djangomade124x25_grey.gif" border="0" alt="Made with Django." title="Made with Django." />
          </a>
          <!--<div style="font-size:90%;color:#333">{% trans "current revision" %}: R-0120-20090406</div>-->
       </p>
 	  <p id="licenseLogo"><img src="/content/images/cc-wiki.png" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" /></p>
 	</div>
 	<!-- 页面底部结束： -->
+    {% if settings.GOOGLE_ANALYTICS_KEY %}
         <script type="text/javascript">
             var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
             document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
@@ -30,4 +31,5 @@
             pageTracker._trackPageview();
             } catch(err) {}
         </script>
-<!-- end template footer.html -->
+    {% endif %}
+<!-- end footer.html -->
diff --git a/templates/header.html b/templates/header.html
index db08a39a..d606e9e7 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -20,7 +20,7 @@
 				<td width="23%">
 					<div id="logo">
 						<a href="/">
-							<img src="/content/images/logo.png" title="{% trans "back to home page" %}" />
+							<img src="/content/images/logo.png" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>
 						</a>
 					</div>
             	</td>
@@ -48,18 +48,19 @@
 			</table>
 		</div>
 		<div id="searchBar">
-			<table width="100%" height="60" border="0" cellpadding="0" cellspacing="0" class="content">
+			<table width="100%" border="0" cellpadding="0" cellspacing="0" class="content">
             <tr>
                 <td align="center" valign="middle">
-                    <form action="/search/" method="GET">
+                    <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" >
+                            <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" %}
+                            <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" %}
                         </div>
                     </form>
                 </td>
diff --git a/templates/index.html b/templates/index.html
index a1ab06a4..964721f7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -32,7 +32,7 @@
     {% for question in questions %}
     <div class="qstA">
         <h2>
-            <a href="{{ question.get_absolute_url }}" title="{{ question.summary }}...">
+            <a href="{{ question.get_absolute_url }}" title="{{ question.summary|collapse }}...">
             {{ question.get_question_title }}
             </a>
         </h2>
@@ -51,7 +51,7 @@
             </table>
         </div>
         <div class="summary">
-            {{ question.summary }}...
+            {{ question.summary}}...
         </div>
         {% if question.wiki %}
         <span class="from wiki">{% trans "community wiki" %}</span>
@@ -79,7 +79,7 @@
 <div class="boxA">
 	<h3>{% trans "welcome to website" %}</h3>
 	<div class="body">
-      {{ settings.APP_INTRO|safe }}
+      {{settings.APP_INTRO|safe}}
 	  <div class="more"><a href="/about">{% trans "about" %} »</a></div>
 	  <div class="more"><a href="/faq">{% trans "faq" %} »</a></div>
 	</div>
@@ -88,15 +88,16 @@
 <div class="boxB">
 	<h3>{% trans "Recent tags" %}</h3>
 	<div class="body">
-         <p class="tagsbox">
+         <div class="tags">
         {% for tag in tags %}
             <a rel="tag" 
 				title="{% blocktrans with tag.name as tagname %}see questions tagged '{{tagname}}'{% endblocktrans %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
         {% endfor %}
-        </p>
+        </div>
         <div class="more"><a href="/tags">{% trans "popular tags" %} »</a> </div>
     </div>
 </div>
+{% if awards %}
 <div class="boxB">
     <h3>{% trans "Recent awards" %}</h3>
         <div class="body">
@@ -112,6 +113,7 @@
         	<div class="more"><a href="/badges/">{% trans "all awards" %} »</a> </div>
          </div>
 </div>
+{% endif %}
 <div id="feeds">
 <a href="/feeds/rss" title="{% trans "subscribe to last 30 questions by RSS" %}">{% trans "subscribe to the questions feed" %}</a>
 </div>
diff --git a/templates/logout.html b/templates/logout.html
index e05a4328..2cd935a0 100644
--- a/templates/logout.html
+++ b/templates/logout.html
@@ -19,7 +19,6 @@
 <div id="main-body" style="width:100%">
     <p>{% trans "As a registered user you can login with your OpenID, log out of the site or permanently remove your account." %}</p>
     <input id="btLogout" type="button" class="submit" value="{% trans "Logout now" %}"><!-- style="width:150px">-->
-    <br><br>
 </div>
 {% endblock %}
 <!-- end logout.html -->
diff --git a/templates/privacy.html b/templates/privacy.html
index d5d7dd43..e66086dd 100644
--- a/templates/privacy.html
+++ b/templates/privacy.html
@@ -37,7 +37,6 @@
         <h3 class="subtitle">{% trans "Policy Changes" %}</h3>
     <p>{% trans "how privacy policies can be changed" %}
     </p>
-    <br><br>
 </div>
 {% endblock %}
 <!-- end privacy.html -->
diff --git a/templates/question.html b/templates/question.html
index 1fd6467d..a2628859 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -69,38 +69,45 @@
                             {% if question_vote %}
                             <img id="question-img-upvote-{{ question.id }}" class="question-img-upvote" 
 								src="/content/images/vote-arrow-up{% if question_vote.is_upvote %}-on{% endif %}.png" 
-								title="{% trans "i like this post (click again to cancel)" %}" >
+                                alt="{% trans "i like this post (click again to cancel)" %}"
+								title="{% trans "i like this post (click again to cancel)" %}" />
                             <div id="question-vote-number-{{ question.id }}" class="vote-number" 
 								title="{% trans "current number of votes" %}">
                                 {{ question.score }}
                             </div>
                             <img id="question-img-downvote-{{ question.id }}" class="question-img-downvote" 
 								src="/content/images/vote-arrow-down{% if question_vote.is_downvote %}-on{% endif %}.png" 
-								title="{% trans "i dont like this post (click again to cancel)" %}" >
+                                alt="{% trans "i dont like this post (click again to cancel)" %}"
+								title="{% trans "i dont like this post (click again to cancel)" %}" />
                            
                             {% else %}
                             <img id="question-img-upvote-{{ question.id }}" class="question-img-upvote" 
+                                alt="{% trans "i like this post (click again to cancel)" %}"
 								src="/content/images/vote-arrow-up.png" 
-								title="{% trans "i like this post (click again to cancel)" %}" >
+								title="{% trans "i like this post (click again to cancel)" %}" />
                             <div id="question-vote-number-{{ question.id }}" class="vote-number" 
 								title="{% trans "current number of votes" %}">
                                 {{ question.score }}
                             </div>
                             <img id="question-img-downvote-{{ question.id }}" class="question-img-downvote" 
-								src="/content/images/vote-arrow-down.png" title="{% trans "i dont like this post (click again to cancel)" %}" >    
+								src="/content/images/vote-arrow-down.png" 
+                                alt="{% trans "i dont like this post (click again to cancel)" %}"
+                                title="{% trans "i dont like this post (click again to cancel)" %}" />
           
                             {% endif %}
-                            <br><br>
                             {% if favorited %}
                             <img class="question-img-favorite" src="/content/images/vote-favorite-on.png" 
-								title="{% trans "mark this question as favorite (click again to cancel)" %}" >
+								alt="{% trans "mark this question as favorite (click again to cancel)" %}"
+								title="{% trans "mark this question as favorite (click again to cancel)" %}" />
                             <div id="favorite-number" class="favorite-number my-favorite-number">
                                 {{ question.favourite_count }}
                             </div>
                             {% else %}
                             <img class="question-img-favorite" src="/content/images/vote-favorite-off.png" 
-								title="{% trans "remove favorite mark from this question (click again to restore mark)" %}" >   
-                            <div id="favorite-number" class="favorite-number">{% ifnotequal question.favourite_count 0 %}{{ question.favourite_count }}{% endifnotequal %}
+								alt="{% trans "remove favorite mark from this question (click again to restore mark)" %}"
+								title="{% trans "remove favorite mark from this question (click again to restore mark)" %}" />
+                            <div id="favorite-number" class="favorite-number">
+                               {% ifnotequal question.favourite_count 0 %}{{ question.favourite_count }}{% endifnotequal %}
                             </div>
                         
                             {% endif %}
@@ -275,24 +282,29 @@
                             <tr>
                                 <td style="width:30px;vertical-align:top">
                                     <div class="vote-buttons">
-                                        <img id="answer-img-upvote-{{ answer.id }}" class="answer-img-upvote" src="/content/images/vote-arrow-up{% get_user_vote_image user_answer_votes answer.id 1 %}.png" title="{% trans "i like this answer (click again to cancel)" %}">
+                                        <img id="answer-img-upvote-{{ answer.id }}" class="answer-img-upvote" 
+                                                src="/content/images/vote-arrow-up{% get_user_vote_image user_answer_votes answer.id 1 %}.png" 
+                                                alt="{% trans "i like this answer (click again to cancel)" %}"
+                                                title="{% trans "i like this answer (click again to cancel)" %}"/>
                                         <div id="answer-vote-number-{{ answer.id }}" class="vote-number" title="{% trans "current number of votes" %}">
                                             {{ answer.score }}
                                         </div>
                                         <img id="answer-img-downvote-{{ answer.id }}" class="answer-img-downvote" 
 											src="/content/images/vote-arrow-down{% get_user_vote_image user_answer_votes answer.id -1 %}.png" 
-											title="{% trans "i dont like this answer (click again to cancel)" %}" >
+											alt="{% trans "i dont like this answer (click again to cancel)" %}"
+											title="{% trans "i dont like this answer (click again to cancel)" %}" />
                                      
-                                        <br><br>
                                         {% ifequal request.user question.author  %}
                                         <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" 
 											src="/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png" 
-											title="{% trans "mark this answer as favorite (click again to undo)" %}" >
+											alt="{% trans "mark this answer as favorite (click again to undo)" %}"
+											title="{% trans "mark this answer as favorite (click again to undo)" %}" />
                                         {% else %}
                                             {% if answer.accepted %}
                                             <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" 
 												src="/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png" 
-												title="{% trans "the author of the question has selected this answer as correct" %}" >
+												alt="{% trans "the author of the question has selected this answer as correct" %}"
+												title="{% trans "the author of the question has selected this answer as correct" %}" />
                                             {% endif %}
                                         {% endifequal %}
                                     </div>
@@ -464,15 +476,13 @@
                 <div id="previewer" class="wmd-preview"></div>
                 {{ answer.text.errors }}
             </div>
-            <br>
-            <input type="submit" value="{% trans "Answer the question" %}" class="submit"><span class="form-error"></span>
+            <input type="submit" value="{% trans "Answer the question" %}" class="submit"/><span class="form-error"></span>
                 {% if request.user.is_authenticated %}
                     {{ answer.email_notify }} <label for="question-subscribe-updates">{% trans "Notify me daily if there are any new answers." %}</label>
                 {% else %}
-                    <input type="checkbox" disabled><label>{% trans "once you sign in you will be able to subscribe for any updates here" %}</label>
+                    <input type="checkbox" disabled="disabled" /><label>{% trans "once you sign in you will be able to subscribe for any updates here" %}</label>
                 {% endif %}
             {% endif %}
-            <br><br>
         </form>
     </div>
 </div>
@@ -487,7 +497,7 @@
         {% for tag in tags %}
         	<a href="{% url forum.views.tag tag.name|urlencode %}" 
 			title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" 
-			rel="tag">{{ tag.name }}</a> <span class="tag-number">× {{ tag.used_count|intcomma }}</span><br>
+			rel="tag">{{ tag.name }}</a> <span class="tag-number">&#x2715;{{ tag.used_count|intcomma }}</span><br/>
         {% endfor %}
     </p>
     <p>
@@ -510,7 +520,6 @@
         </p>
         {% endfor %}
     </div>
-    <br>  
 </div>
 
 {% endblock %}
diff --git a/templates/question_edit.html b/templates/question_edit.html
index 9ad60a88..db090ca3 100644
--- a/templates/question_edit.html
+++ b/templates/question_edit.html
@@ -67,14 +67,14 @@
 <div id="main-body" class="ask-body">
     <div id="askform">
         <form id="fmedit" action="{% url edit_question question.id %}" method="post" >
-            <label for="id_revision" ><strong>{% trans "revision" %}:</strong></label> <br> 
+            <label for="id_revision" ><strong>{% trans "revision" %}:</strong></label> <br/> 
             {% if revision_form.revision.errors %}{{ revision_form.revision.errors.as_ul }}{% endif %}
             <div style="vertical-align:middle">
             {{ revision_form.revision }} <input type="submit" style="display:none" id="select_revision" name="select_revision" 
 											value="{% trans "select revision"%}">
-            </div><br> 
+            </div> 
             <div class="form-item">
-                <label for="id_title" ><strong>{{ form.title.label_tag }}:</strong></label> <span class="form-error"></span><br> 
+                <label for="id_title" ><strong>{{ form.title.label_tag }}:</strong></label> <span class="form-error"></span><br/> 
                 {{ form.title }} {{ form.title.errors }}  
                 <div class="title-desc">
                     {{ form.title.help_text }}
@@ -98,28 +98,22 @@
                     </table>   
                 </div>
                 <div id="previewer" class="wmd-preview"></div>
-                <br>
             </div>
             <div class="form-item">
-                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br>
+                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br/>
                 {{ form.tags }}  {{ form.tags.errors }}
                 <div class="title-desc">
                     {{ form.tags.help_text }}
                 </div>
             </div>
-            <br>
-            <strong>{{ form.summary.label_tag }}</strong> <br>
+            <strong>{{ form.summary.label_tag }}</strong> <br/>
             {{ form.summary }}  {{ form.summary.errors }}
             <div class="title-desc">
                 {{ form.summary.help_text }}
             </div>
-            <br>
-
             <div class="error" ></div>
             <input type="submit" value="{% trans "Save edit" %}" class="submit" />
             <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);" />
-            <br>
-            <br>
         </form>
     </div>
 </div>
diff --git a/templates/question_edit_tips.html b/templates/question_edit_tips.html
index 4ac666a6..ef6dca15 100644
--- a/templates/question_edit_tips.html
+++ b/templates/question_edit_tips.html
@@ -14,7 +14,6 @@
             </li>
         </ul>
          <a href="/faq/" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
-         <br>  
     </div>
 </div>
 
@@ -46,6 +45,5 @@
         </li>
     </ul>
     <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank" style="float:right;position:relative">{% trans "learn more about Markdown" %} »</a>
-    <br>  
 </div>
 <!-- end question_edit_tips.html -->
diff --git a/templates/question_retag.html b/templates/question_retag.html
index c7062e30..66e51c8c 100644
--- a/templates/question_retag.html
+++ b/templates/question_retag.html
@@ -63,19 +63,15 @@
            
             
             <div class="form-item">
-                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br>
+                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br/>
                 {{ form.tags }}  {{ form.tags.errors }}
                 <div class="title-desc">
                     {{ form.tags.help_text }}
                 </div>
             </div>
-            <br>
-            
             <div class="error" ></div>
             <input type="submit" value="{% trans "Save edit" %}" class="submit" />
             <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);" />
-            <br>
-            <br>
         </form>
     </div>
 </div>
@@ -96,7 +92,6 @@
         </li>
     </ul>
     <a href="{% url faq %}" style="float:right;position:relative">faq »</a>
-    <br>  
 </div>
 
 {% endblock %}
diff --git a/templates/questions.html b/templates/questions.html
index 5dac0156..985b4921 100644
--- a/templates/questions.html
+++ b/templates/questions.html
@@ -126,24 +126,24 @@
 				{% endblocktrans %}
 			{% endif %}
 		{% endif %}
-
+        <br/>
         {% ifequal tab_id "latest" %}
-			<p>{% trans "latest questions info" %}</p>
+			{% trans "latest questions info" %}
         {% endifequal %}
         
         {% ifequal tab_id "active" %}
-            <p>{% trans "Questions are sorted by the <strong>time of last update</strong>." %} 
-			{% trans "Most recently answered ones are shown first." %}</p>
+            {% trans "Questions are sorted by the <strong>time of last update</strong>." %} 
+			{% trans "Most recently answered ones are shown first." %}
         {% endifequal %}
         
         {% ifequal tab_id "hottest" %}
-			<p>{% trans "Questions sorted by <strong>number of responses</strong>." %}
-            {% trans "Most answered questions are shown first." %}</p>
+			{% trans "Questions sorted by <strong>number of responses</strong>." %}
+            {% trans "Most answered questions are shown first." %}
         {% endifequal %}
         
         {% ifequal tab_id "mostvoted" %}
-			<p>{% trans "Questions are sorted by the <strong>number of votes</strong>." %}
-            {% trans "Most voted questions are shown first." %}</p>
+			{% trans "Questions are sorted by the <strong>number of votes</strong>." %}
+            {% trans "Most voted questions are shown first." %}
         {% endifequal %}
         
         
@@ -154,10 +154,10 @@
     <div class="tags">
         {% for tag in tags %}
             <a rel="tag" title="{% trans "see questions tagged" %}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
-            <span class="tag-number">× {{ tag.used_count|intcomma }}</span>
-            <br>
+            <span class="tag-number">&#x2715; {{ tag.used_count|intcomma }}</span>
+            <br />
         {% endfor %}
-        <br>
+        <br />
     </div>
 </div>
 
diff --git a/templates/tags.html b/templates/tags.html
index 6f9b3aed..65a7e4dd 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -6,6 +6,7 @@
 {% block title %}{% spaceless %}{% trans "Tag list" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
+       /*<![CDATA[*/
         $().ready(function(){
             $("#nav_tags").attr('className',"on");
             $("#ipSearchTag").focus();
@@ -20,7 +21,7 @@
             Hilite.elementid = "searchtags";
             Hilite.debug_referrer = location.href;
         });
-
+        /*]]>*/
         </script>
 {% endblock %}
 {% block content %}
@@ -41,6 +42,7 @@
     <span>{% trans "Nothing found" %}</span>
 {% endif %}
 </p>
+{% if tags.object_list %}
 <ul class="tagsList tags">
 {% for tag in tags.object_list %}
    <li>
@@ -48,11 +50,12 @@
         {{ tag }}
     </a>&nbsp;
     <span class="tag-number">× {{ tag.used_count|intcomma }}</span>
-    <br>
+    <br/>
 
     </li>
 {% endfor %}
 </ul>
+{% endif %}
 </div>
 
 {% endblock %}
diff --git a/templates/unanswered.html b/templates/unanswered.html
index 13b3a3b2..a56d3ae3 100644
--- a/templates/unanswered.html
+++ b/templates/unanswered.html
@@ -95,9 +95,6 @@
 <div class="boxC">
     <p>
 		{% blocktrans with questions_count|intcomma as num_q %}have {{num_q}} unanswered questions{% endblocktrans %}
-		{% comment %}
-		{% trans "Have a total of" %}<br><div class="questions-count">{{ questions_count|intcomma }}</div>
-		{% endcomment %}
         <!---<p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>-->
     </p>
 </div>
@@ -107,14 +104,13 @@
     <div class="tags">
         {% for tag in tags %}
             <a rel="tag" title="{% trans "see questions tagged"%}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
-            <span class="tag-number">× {{ tag.used_count|intcomma }}</span>
-            <br>
+            <span class="tag-number"> &#x2715; {{ tag.used_count|intcomma }}</span>
+            <br/>
         {% endfor %}
-        <br>
+        <br/>
     </div>
     </div>
 </div>
 
 {% endblock %}
-
 <!-- end unanswered.html -->
diff --git a/templates/user_info.html b/templates/user_info.html
index 8d35015c..86e36023 100644
--- a/templates/user_info.html
+++ b/templates/user_info.html
@@ -27,7 +27,7 @@
         </td>
         <td width="360" style="vertical-align: top;">
             <table class="user-details">
-                <tr height="30px">
+                <tr>
                     <th width="130" align="left"><strong>{% trans "Registered user" %}</strong></th>
                     <th width="230"  align="right">
                         {% if request.user|can_view_user_edit:view_user %}
diff --git a/templates/user_preferences.html b/templates/user_preferences.html
index eb7c4761..00129c28 100644
--- a/templates/user_preferences.html
+++ b/templates/user_preferences.html
@@ -8,13 +8,14 @@
         <div style="padding:5px;">
         <fieldset>
             <legend><b>{% trans "Connect with Twitter" %}</b></legend>
-            <form>
+            <!-- todo: form action needs to be fixed -->
+            <form name="twittersync" action="/sdfgsdlgjkhsdfljh">
                 <label for="name">{% trans "Twitter account name:" %}</label>
-                <input id="name" /><br>
+                <input id="name" /><br/>
                 <label for="password">{% trans "Twitter password:" %}</label>
-                <input id="password" type="password"/><br>
-                <input id="cbMessage" type="checkbox" />{% trans "Send my Questions to Twitter" %}<br>
-                <input id="cbReply" type="checkbox" />{% trans "Send my Answers to Twitter" %}<br>
+                <input id="password" type="password"/><br/>
+                <input id="cbMessage" type="checkbox" />{% trans "Send my Questions to Twitter" %}<br/>
+                <input id="cbReply" type="checkbox" />{% trans "Send my Answers to Twitter" %}<br/>
                 <input type="submit" value="{% trans "Save" %}" />
             </form>
         </fieldset>
diff --git a/templates/user_responses.html b/templates/user_responses.html
index d739395b..c4f4ffed 100644
--- a/templates/user_responses.html
+++ b/templates/user_responses.html
@@ -11,7 +11,7 @@
                 <div style="width:100px;float:left"><a href="{{ response.userlink }}">{{ response.username }}</a></div>
                 <div style="float:left;overflow:hidden;width:680px">
                     <strong {% ifequal response.type "question_answered" %}class="user-action-2"{% endifequal %}{% ifequal response.type "answer_accepted" %}class="user-action-8"{% endifequal %}>{{ response.type }}</strong>：
-                    <a href="{{ response.titlelink }}">{{ response.title }}</a><br>
+                    <a href="{{ response.titlelink }}">{{ response.title }}</a><br/>
                     {{ response.content|safe }}
                     <div style="height:10px"></div>
                 </div>
diff --git a/templates/user_stats.html b/templates/user_stats.html
index 432a5b34..2c2a7a72 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -2,6 +2,7 @@
 <!-- user_stats.html -->
 {% load i18n %}
 {% load extra_tags %}
+{% load extra_filters %}
 {% load humanize %}
 		{% block usercontent %}
 	
@@ -32,7 +33,7 @@
         <div class="user-stats-table">
             {% for answered_question in answered_questions %}
             <div class="answer-summary">
-                <a title="{{answered_question.summary}}" href="/questions/{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
+                <a title="{{answered_question.summary|collapse}}" href="/questions/{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
                     <div class="answer-votes {% if answered_question.accepted %}answered-accepted{% endif %}" 
 						title="{% blocktrans with answered_question.vote_count as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %}&#13;{% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
                         {{ answered_question.vote_count }}
@@ -40,7 +41,7 @@
                 </a>
                 <div class="answer-link">
                     <a href="/questions/{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> {% if answered_question.comment_count %}<span 
-					title="{% blocktrans %}the answer has been commented {{ answered_question.comment_count }} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %}
+					title="{% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %}
                 </div>
             </div>
             {% endfor %}
@@ -92,7 +93,7 @@
                         {% for tag in tags%}
                         <a rel="tag" 
 							title="{% blocktrans %}see other questions tagged '{{ tag }}' {% endblocktrans %}" 
-							href="{% url forum.views.tag tag|urlencode %}">{{tag.name}}</a><span class="tag-number"> × {{ tag.used_count|intcomma }}</span><br>
+							href="{% url forum.views.tag tag|urlencode %}">{{tag.name}}</a><span class="tag-number"> × {{ tag.used_count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"10" %}
                                 </td>
                                 <td width="180"  valign="top">
@@ -119,7 +120,7 @@
                 <tr>
                     <td width="180" style="line-height:35px">
                         {% for award in awards %}
-                            <a href="/badges/{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> × {{ award.count|intcomma }}</span><br>
+                            <a href="/badges/{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> × {{ award.count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"6" %}
                                 </td>
                                 <td width="180" style="line-height:35px">
diff --git a/templates/user_tabs.html b/templates/user_tabs.html
index bcc12b8f..7800eb00 100644
--- a/templates/user_tabs.html
+++ b/templates/user_tabs.html
@@ -20,7 +20,7 @@
 			title="{% trans "user vote record" %}" href="/users/{{view_user.id}}/{{view_user.username}}?sort=votes">{% trans "casted votes" %}</a>
         {% endif %}
         <a id="favorites" {% ifequal tab_name "favorites" %}class="on"{% endifequal %} 
-			title="{% trans "questions that user selected as his/her favorite" 
+			title="{% trans "questions that user selected as his/her favorite" %}"
 			href="/users/{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
         {% if request.user|can_view_user_preferences:view_user %}
         <a id="preferences" {% ifequal tab_name "preferences" %}class="on"{% endifequal %} 
diff --git a/templates/users_questions.html b/templates/users_questions.html
index dfb87c8f..7b00fd3f 100644
--- a/templates/users_questions.html
+++ b/templates/users_questions.html
@@ -43,7 +43,7 @@
         </a>
         <div class="summary">
             <h3>
-                <a title="{{question.summary}}" href="/questions/{{question.id}}/{{question.title}}">{{question.title}}</a>
+                <a title="{{question.summary|collapse}}" href="/questions/{{question.id}}/{{question.title}}">{{question.title}}</a>
             </h3>
             <div class="tags">
                 {% convert2tagname_list question %}
-- 
cgit v1.2.3-1-g7c22


From fdeb08ef0ff52f41ab2ba10e79dc24e78053b49d Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Tue, 11 Aug 2009 02:54:13 -0300
Subject: Fixed MyOpenID bug. It was not in the list of providers.

---
 django_authopenid/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/django_authopenid/views.py b/django_authopenid/views.py
index 1cb8928b..cf14b538 100644
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -358,6 +358,7 @@ def register(request):
                 'flickr':'<font color="#0063dc">flick</font><font color="#ff0084">r</font>&trade;',
                 'google':'Google&trade;',
                 'aol':'<font color="#31658e">AOL</font>',
+                'myopenid':'OpenID',
                 }
     if provider_name not in providers:
         provider_logo = provider_name
-- 
cgit v1.2.3-1-g7c22


From 3f3d9b3898df78778d8e603c4c8418776f8a990e Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Tue, 11 Aug 2009 04:16:47 -0300
Subject: Typo.

---
 django_authopenid/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/django_authopenid/views.py b/django_authopenid/views.py
index cf14b538..218a31a2 100644
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -358,7 +358,7 @@ def register(request):
                 'flickr':'<font color="#0063dc">flick</font><font color="#ff0084">r</font>&trade;',
                 'google':'Google&trade;',
                 'aol':'<font color="#31658e">AOL</font>',
-                'myopenid':'OpenID',
+                'myopenid':'MyOpenID',
                 }
     if provider_name not in providers:
         provider_logo = provider_name
-- 
cgit v1.2.3-1-g7c22


From dad43ef25f1516581f1a19135fa0c594997e45fc Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Tue, 11 Aug 2009 04:17:00 -0300
Subject: FAQ translation for Preguntalo.com.uy

---
 locale/es/LC_MESSAGES/django.po | 608 ++++++++++++++++++++++++----------------
 templates/faq.html              |   8 +-
 2 files changed, 360 insertions(+), 256 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 54047c85..383ed961 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-09 22:45-0300\n"
+"POT-Creation-Date: 2009-08-11 04:13-0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -10,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:695
+#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698
 msgid "account/"
 msgstr "cuenta/"
 
 #: settings.py:12 urls.py:26 django_authopenid/urls.py:9
 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11
-#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:696
+#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -65,7 +65,7 @@ msgstr "respuestas/"
 msgid "comments/"
 msgstr "comentarios/"
 
-#: urls.py:35 urls.py:40 urls.py:54
+#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
 msgid "edit/"
 msgstr "editar/"
 
@@ -75,7 +75,7 @@ msgstr "revisiones/"
 
 #: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
 #: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
-#: forum/views.py:1170 forum/views.py:1171 forum/views.py:1410
+#: forum/views.py:1416
 msgid "questions/"
 msgstr "preguntas/"
 
@@ -112,12 +112,12 @@ msgstr "borrar/"
 msgid "question/"
 msgstr "preguntas/"
 
-#: urls.py:51 urls.py:52 forum/views.py:737 forum/views.py:2007
+#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
 msgid "tags/"
 msgstr "etiquetas/"
 
-#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:990 forum/views.py:994
-#: forum/views.py:1412 forum/views.py:2009
+#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997
+#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015
 msgid "users/"
 msgstr "usuarios/"
 
@@ -137,10 +137,6 @@ msgstr "marcarleido/"
 msgid "nimda/"
 msgstr "administrador/"
 
-#: urls.py:61
-msgid "feeds/"
-msgstr ""
-
 #: urls.py:62
 msgid "upload/"
 msgstr "subir/"
@@ -244,7 +240,7 @@ msgstr "la nueva contraseña no coincide"
 msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
-#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:696
+#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699
 msgid "newquestion/"
 msgstr "nuevapregunta/"
 
@@ -282,54 +278,54 @@ msgstr "Cambiar dirección email"
 msgid "OpenID %(openid_url)s is invalid"
 msgstr "El OpenID %(openid_url)s no es valido"
 
-#: django_authopenid/views.py:417 django_authopenid/views.py:544
+#: django_authopenid/views.py:418 django_authopenid/views.py:545
 msgid "Welcome"
 msgstr "Bienvenido"
 
-#: django_authopenid/views.py:507
+#: django_authopenid/views.py:508
 msgid "Password changed."
 msgstr "Contraseña modificada"
 
-#: django_authopenid/views.py:519 django_authopenid/views.py:524
+#: django_authopenid/views.py:520 django_authopenid/views.py:525
 msgid "your email needs to be validated"
 msgstr "su correo electrónico necesita ser validado"
 
-#: django_authopenid/views.py:681 django_authopenid/views.py:833
+#: django_authopenid/views.py:682 django_authopenid/views.py:834
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr "El OpenID %s no esta asociada en nuestra base de datos"
 
-#: django_authopenid/views.py:685 django_authopenid/views.py:840
+#: django_authopenid/views.py:686 django_authopenid/views.py:841
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr "El OpenID %s no esta asociada al usuario actualmente autenticado"
 
-#: django_authopenid/views.py:693
+#: django_authopenid/views.py:694
 msgid "Email Changed."
 msgstr "Email modificado"
 
-#: django_authopenid/views.py:768
+#: django_authopenid/views.py:769
 msgid "This OpenID is already associated with another account."
 msgstr "Este OpenID ya está asociada a otra cuenta."
 
-#: django_authopenid/views.py:773
+#: django_authopenid/views.py:774
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr "El OpenID %s está ahora asociada con tu cuenta."
 
-#: django_authopenid/views.py:843
+#: django_authopenid/views.py:844
 msgid "Account deleted."
 msgstr "Cuenta borrada."
 
-#: django_authopenid/views.py:883
+#: django_authopenid/views.py:884
 msgid "Request for new password"
 msgstr "Pedir nueva contraseña"
 
-#: django_authopenid/views.py:896
+#: django_authopenid/views.py:897
 msgid "A new password has been sent to your email address."
 msgstr "Una nueva contraseña ha sido enviada a tu cuenta de Email."
 
-#: django_authopenid/views.py:926
+#: django_authopenid/views.py:927
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
@@ -338,7 +334,7 @@ msgstr ""
 "No se ha podido modificar la contraseña. La clave de confirmación '%s' no "
 "está registrada"
 
-#: django_authopenid/views.py:935
+#: django_authopenid/views.py:936
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
@@ -346,7 +342,7 @@ msgstr ""
 "No se puede cambiar la contraseña. El usuario no existe más en nuestra base "
 "de datos."
 
-#: django_authopenid/views.py:944
+#: django_authopenid/views.py:945
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr "Contraseña cambiada por %s. Ahora puedes ingresar."
@@ -388,6 +384,9 @@ msgid "question"
 msgstr "pregunta"
 
 #: forum/const.py:57 templates/book.html:110
+#: templates/book.html.BASE.30295.html:110
+#: templates/book.html.LOCAL.30295.html:110
+#: templates/book.html.REMOTE.30295.html:110
 msgid "answer"
 msgstr "respuesta"
 
@@ -475,8 +474,8 @@ msgstr " - "
 msgid "latest questions"
 msgstr "últimas preguntas"
 
-#: forum/forms.py:14 templates/answer_edit_tips.html:34
-#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31
+#: forum/forms.py:14 templates/answer_edit_tips.html:33
+#: templates/answer_edit_tips.html.py:37 templates/question_edit_tips.html:31
 #: templates/question_edit_tips.html:36
 msgid "title"
 msgstr "título"
@@ -497,7 +496,7 @@ msgstr "contenido"
 msgid "question content must be > 10 characters"
 msgstr "el contenido de la pregunta debe ser al menos de 10 caracteres"
 
-#: forum/forms.py:45 templates/header.html:34 templates/header.html.py:62
+#: forum/forms.py:45 templates/header.html:34 templates/header.html.py:63
 msgid "tags"
 msgstr "etiquetas"
 
@@ -528,8 +527,8 @@ msgstr ""
 "por favor use solo los siguientes caracteres en los nombres de etiquetas: "
 "letras 'a-z', números y caracteres '.-_#'"
 
-#: forum/forms.py:75 templates/index.html:57 templates/question.html:199
-#: templates/question.html.py:380 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:209
+#: templates/question.html.py:395 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
 #: templates/unanswered.html.py:60
 #, fuzzy
@@ -588,42 +587,42 @@ msgstr "Perfil"
 msgid "this email has already been registered, please use another one"
 msgstr "este email ya ha sido registrado, por favor use otro"
 
-#: forum/models.py:243
+#: forum/models.py:246
 #, fuzzy, python-format
 msgid "%(author)s modified the question"
 msgstr "%(author) modificó la pregunta"
 
-#: forum/models.py:247
+#: forum/models.py:250
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr "%(people)s publicaron %(new_answer_count)s nuevas respuestas"
 
-#: forum/models.py:252
+#: forum/models.py:255
 #, python-format
 msgid "%(people)s commented the question"
 msgstr "%(people)s comentarion la pregunta"
 
-#: forum/models.py:257
+#: forum/models.py:260
 #, python-format
 msgid "%(people)s commented answers"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:259
+#: forum/models.py:262
 #, fuzzy, python-format
 msgid "%(people)s commented an answer"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:438 templates/badges.html:52
+#: forum/models.py:441 templates/badges.html:51
 msgid "gold"
 msgstr "oro"
 
-#: forum/models.py:439 templates/badges.html:60
+#: forum/models.py:442 templates/badges.html:59
 msgid "silver"
 msgstr "plata"
 
-#: forum/models.py:440 templates/badges.html:67
+#: forum/models.py:443 templates/badges.html:66
 msgid "bronze"
-msgstr "bronze"
+msgstr "bronce"
 
 #: forum/user.py:16 templates/user_tabs.html:7
 msgid "overview"
@@ -709,27 +708,27 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:944
+#: forum/views.py:947
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr "subscripción guardada, %(email)s necesita validación"
 
-#: forum/views.py:1854
+#: forum/views.py:1860
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr "para subir imagenes debes tener más de 60 puntos de reputación"
 
-#: forum/views.py:1856
+#: forum/views.py:1862
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', "
 "'tiff'"
 
-#: forum/views.py:1858
+#: forum/views.py:1864
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1860
+#: forum/views.py:1866
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -740,16 +739,16 @@ msgstr ""
 msgid "updates from website"
 msgstr "actualizaciones del sitio"
 
-#: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168
+#: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
 #: templates/header.html:37
 msgid "badges"
 msgstr "distinciones"
 
-#: forum/templatetags/extra_tags.py:140 forum/templatetags/extra_tags.py:167
+#: forum/templatetags/extra_tags.py:144 forum/templatetags/extra_tags.py:171
 msgid "reputation points"
 msgstr "puntos de reputación"
 
-#: forum/templatetags/extra_tags.py:221
+#: forum/templatetags/extra_tags.py:225
 msgid " ago"
 msgstr " atras"
 
@@ -827,13 +826,13 @@ msgid "Edit answer"
 msgstr "Editar respuesta"
 
 #: templates/answer_edit.html:24 templates/answer_edit.html.py:27
-#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40
-#: templates/question.html.py:43 templates/question_edit.html:27
+#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:43
+#: templates/question.html.py:46 templates/question_edit.html:27
 msgid "hide preview"
 msgstr "ocultar previsualización"
 
 #: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:43 templates/question_edit.html:27
+#: templates/question.html:46 templates/question_edit.html:27
 msgid "show preview"
 msgstr "ver previsualización"
 
@@ -853,22 +852,22 @@ msgid "select revision"
 msgstr "seleccionar revisión"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:452 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "Toggle the real time Markdown editor preview"
 msgstr "Activar la visualización en tiempo real de Markdown"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:452 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr "Activar previsualización"
 
-#: templates/answer_edit.html:73 templates/question_edit.html:119
-#: templates/question_retag.html:75
+#: templates/answer_edit.html:71 templates/question_edit.html:115
+#: templates/question_retag.html:73
 msgid "Save edit"
 msgstr "Guardar la edición"
 
-#: templates/answer_edit.html:74 templates/close.html:29
-#: templates/question_edit.html:120 templates/question_retag.html:76
+#: templates/answer_edit.html:72 templates/close.html:29
+#: templates/question_edit.html:116 templates/question_retag.html:74
 #: templates/reopen.html:30 templates/user_edit.html:83
 #: templates/authopenid/changeemail.html:34
 msgid "Cancel"
@@ -899,40 +898,40 @@ msgstr "ser claro y conciso"
 msgid "see frequently asked questions"
 msgstr "ver preguntas frecuentes"
 
-#: templates/answer_edit_tips.html:25 templates/question_edit_tips.html:22
+#: templates/answer_edit_tips.html:24 templates/question_edit_tips.html:22
 msgid "Markdown tips"
 msgstr "sugerencias de Markdown"
 
-#: templates/answer_edit_tips.html:28 templates/question_edit_tips.html:25
+#: templates/answer_edit_tips.html:27 templates/question_edit_tips.html:25
 msgid "*italic* or __italic__"
 msgstr "*itálica* o __itálica__"
 
-#: templates/answer_edit_tips.html:31 templates/question_edit_tips.html:28
+#: templates/answer_edit_tips.html:30 templates/question_edit_tips.html:28
 msgid "**bold** or __bold__"
 msgstr "**negrita** o __negrita__"
 
-#: templates/answer_edit_tips.html:34 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html:33 templates/question_edit_tips.html:31
 msgid "link"
 msgstr "enlace"
 
-#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:38
+#: templates/answer_edit_tips.html:33 templates/answer_edit_tips.html.py:37
 #: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36
 msgid "text"
 msgstr "texto"
 
-#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:37 templates/question_edit_tips.html:36
 msgid "image"
 msgstr "imagen"
 
-#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40
+#: templates/answer_edit_tips.html:41 templates/question_edit_tips.html:40
 msgid "numbered list:"
 msgstr "lista numerada"
 
-#: templates/answer_edit_tips.html:47 templates/question_edit_tips.html:45
+#: templates/answer_edit_tips.html:46 templates/question_edit_tips.html:45
 msgid "basic HTML tags are also supported"
 msgstr "etiquetas básicas de HTML permitidas"
 
-#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48
+#: templates/answer_edit_tips.html:49 templates/question_edit_tips.html:48
 msgid "learn more about Markdown"
 msgstr "aprender mas sobre Markdown"
 
@@ -942,22 +941,33 @@ msgstr "Hacer una pregunta"
 
 #: templates/ask.html:67
 msgid "login to post question info"
-msgstr "Inicie sesión para publicar pregunta."
+msgstr ""
+"<span class='strong big'>Puedes comenzar a realizar tu pregunta de forma "
+"anonima</span> - actualmente no te encuentras Ingresado. Cuando envíes tu "
+"pregunta, serás redireccionado a la página de Ingreso/registro. Tu pregunta "
+"será guardada temporalemente y será enviada cuando ingreses. El proceso de "
+"Ingreso/Registro es muy simple. Ingresar lleva unos 30 segundos, registrarse "
+"por primera vez lleva un minuto."
 
 #: templates/ask.html:73
 #, python-format
 msgid "must have valid %(email)s to post"
-msgstr "debe de tener un %(email)s válido para publicar"
+msgstr ""
+"<span class='strong big'>Parece ser que tu dirección de email, %(email)s no "
+"ha sido validada aún.</span> Para enviar mensajes debes verificar tu "
+"dirección de email, puedes ver <a href='/faq#validate'>más detalles aquí</"
+"a>. <br/> Puedes enviar tu pregunta ahora y validar tu email luego. Tu "
+"pregunta será guardada mientras tanto y publicada cuando valides tu email."
 
-#: templates/ask.html:108
+#: templates/ask.html:107
 msgid "(required)"
 msgstr "(requerido)"
 
-#: templates/ask.html:115
+#: templates/ask.html:114
 msgid "Login/signup to post your question"
 msgstr "Iniciar sesión/registrarse para publicar su pregunta"
 
-#: templates/ask.html:117
+#: templates/ask.html:116
 msgid "Ask your question"
 msgstr "Haz tu pregunta"
 
@@ -973,7 +983,7 @@ msgstr "Usuarios han sido galardonados con distinciones:"
 msgid "Badges summary"
 msgstr "Resumen de distinciones"
 
-#: templates/badges.html:17 templates/user_stats.html:113
+#: templates/badges.html:17 templates/user_stats.html:114
 msgid "Badges"
 msgstr "Distinciones"
 
@@ -989,127 +999,180 @@ msgstr ""
 "Debajo esta la lista de las distinciones disponibles y la cantidad de veces "
 "que han sido asignadas."
 
-#: templates/badges.html:49
+#: templates/badges.html:48
 msgid "Community badges"
 msgstr "Distinciones de la comunidad"
 
-#: templates/badges.html:55
+#: templates/badges.html:54
 msgid "gold badge description"
 msgstr ""
 "Las distinciones de Oro son excepcionales. Para obtenerla debes demostrar un "
 "profundo conocimiento y habilidad además de participar activamente en la "
 "comunidad. La distinción de Oro es la condecoración máxima en esta comunidad"
 
-#: templates/badges.html:63
+#: templates/badges.html:62
 msgid "silver badge description"
 msgstr ""
 "Obtener una distinción de Plata requiere de paciencia. Si has logrado una, "
 "quiere decir que haz significativamente aportado a esta comunidad."
 
-#: templates/badges.html:66
+#: templates/badges.html:65
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 "distinción de bronce: con frecuencia entregada como reconocimiento especial."
 
-#: templates/badges.html:70
+#: templates/badges.html:69
 msgid "bronze badge description"
 msgstr ""
 "Si eres un usuario activo de esta comunidad, recibirás esta distinción - de "
 "todas maneras es un honor especial."
 
-#: templates/book.html:7
+#: templates/book.html:7 templates/book.html.BASE.30295.html:7
+#: templates/book.html.LOCAL.30295.html:7
+#: templates/book.html.REMOTE.30295.html:7
 msgid "reading channel"
 msgstr "canal de lectura"
 
-#: templates/book.html:26
+#: templates/book.html:26 templates/book.html.BASE.30295.html:26
+#: templates/book.html.LOCAL.30295.html:26
+#: templates/book.html.REMOTE.30295.html:26
 msgid "[author]"
 msgstr "[autor]"
 
-#: templates/book.html:30
+#: templates/book.html:30 templates/book.html.BASE.30295.html:30
+#: templates/book.html.LOCAL.30295.html:30
+#: templates/book.html.REMOTE.30295.html:30
 msgid "[publisher]"
 msgstr "[editorial]"
 
-#: templates/book.html:34
+#: templates/book.html:34 templates/book.html.BASE.30295.html:34
+#: templates/book.html.LOCAL.30295.html:34
+#: templates/book.html.REMOTE.30295.html:34
 msgid "[publication date]"
 msgstr "[fecha de publicación]"
 
-#: templates/book.html:38
+#: templates/book.html:38 templates/book.html.BASE.30295.html:38
+#: templates/book.html.LOCAL.30295.html:38
+#: templates/book.html.REMOTE.30295.html:38
 msgid "[price]"
 msgstr "[precio]"
 
-#: templates/book.html:39
+#: templates/book.html:39 templates/book.html.BASE.30295.html:39
+#: templates/book.html.LOCAL.30295.html:39
+#: templates/book.html.REMOTE.30295.html:39
 msgid "currency unit"
 msgstr "unidad de moneda"
 
-#: templates/book.html:42
+#: templates/book.html:42 templates/book.html.BASE.30295.html:42
+#: templates/book.html.LOCAL.30295.html:42
+#: templates/book.html.REMOTE.30295.html:42
 msgid "[pages]"
 msgstr "[páginas]"
 
-#: templates/book.html:43
+#: templates/book.html:43 templates/book.html.BASE.30295.html:43
+#: templates/book.html.LOCAL.30295.html:43
+#: templates/book.html.REMOTE.30295.html:43
 msgid "pages abbreviation"
 msgstr "abreviación de páginas"
 
-#: templates/book.html:46
+#: templates/book.html:46 templates/book.html.BASE.30295.html:46
+#: templates/book.html.LOCAL.30295.html:46
+#: templates/book.html.REMOTE.30295.html:46
 msgid "[tags]"
 msgstr "[etiquetas]"
 
-#: templates/book.html:56
+#: templates/book.html:56 templates/book.html.BASE.30295.html:56
+#: templates/book.html.LOCAL.30295.html:56
+#: templates/book.html.REMOTE.30295.html:56
 msgid "author blog"
 msgstr "blog del autor"
 
-#: templates/book.html:62
+#: templates/book.html:62 templates/book.html.BASE.30295.html:62
+#: templates/book.html.LOCAL.30295.html:62
+#: templates/book.html.REMOTE.30295.html:62
 msgid "book directory"
 msgstr "directorio del libro"
 
-#: templates/book.html:66
+#: templates/book.html:66 templates/book.html.BASE.30295.html:66
+#: templates/book.html.LOCAL.30295.html:66
+#: templates/book.html.REMOTE.30295.html:66
 msgid "buy online"
 msgstr "comprar en-linea"
 
-#: templates/book.html:79
+#: templates/book.html:79 templates/book.html.BASE.30295.html:79
+#: templates/book.html.LOCAL.30295.html:79
+#: templates/book.html.REMOTE.30295.html:79
 msgid "reader questions"
 msgstr "pregunta de lector"
 
-#: templates/book.html:82
+#: templates/book.html:82 templates/book.html.BASE.30295.html:82
+#: templates/book.html.LOCAL.30295.html:82
+#: templates/book.html.REMOTE.30295.html:82
 msgid "ask the author"
 msgstr "preguntar al autor"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:17
+#: templates/book.html.BASE.30295.html:88
+#: templates/book.html.BASE.30295.html:93
+#: templates/book.html.LOCAL.30295.html:88
+#: templates/book.html.LOCAL.30295.html:93
+#: templates/book.html.REMOTE.30295.html:88
+#: templates/book.html.REMOTE.30295.html:93 templates/users_questions.html:17
 msgid "this question was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:11 templates/users_questions.html.py:17
+#: templates/book.html.BASE.30295.html:88
+#: templates/book.html.BASE.30295.html:93
+#: templates/book.html.LOCAL.30295.html:88
+#: templates/book.html.LOCAL.30295.html:93
+#: templates/book.html.REMOTE.30295.html:88
+#: templates/book.html.REMOTE.30295.html:93 templates/users_questions.html:11
+#: templates/users_questions.html.py:17
 msgid "number of times"
 msgstr "numero de veces"
 
-#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
-#: templates/unanswered.html:37 templates/users_questions.html:30
+#: templates/book.html:105 templates/book.html.BASE.30295.html:105
+#: templates/book.html.LOCAL.30295.html:105
+#: templates/book.html.REMOTE.30295.html:105 templates/index.html:48
+#: templates/questions.html:46 templates/unanswered.html:37
+#: templates/users_questions.html:30
 msgid "votes"
 msgstr "votos"
 
-#: templates/book.html:108
+#: templates/book.html:108 templates/book.html.BASE.30295.html:108
+#: templates/book.html.LOCAL.30295.html:108
+#: templates/book.html.REMOTE.30295.html:108
 msgid "the answer has been accepted to be correct"
 msgstr "la respuesta ha sido aceptada como correcta"
 
-#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
-#: templates/unanswered.html:38 templates/users_questions.html:40
+#: templates/book.html:115 templates/book.html.BASE.30295.html:115
+#: templates/book.html.LOCAL.30295.html:115
+#: templates/book.html.REMOTE.30295.html:115 templates/index.html:49
+#: templates/questions.html:47 templates/unanswered.html:38
+#: templates/users_questions.html:40
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/index.html:69 templates/question.html:115
-#: templates/question.html.py:486 templates/questions.html:84
-#: templates/questions.html.py:156 templates/tags.html:47
-#: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52
+#: templates/book.html:125 templates/book.html.BASE.30295.html:125
+#: templates/book.html.LOCAL.30295.html:125
+#: templates/book.html.REMOTE.30295.html:125 templates/index.html:69
+#: templates/question.html:125 templates/question.html.py:499
+#: templates/questions.html:84 templates/questions.html.py:156
+#: templates/tags.html:49 templates/unanswered.html:75
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "using tags"
 msgstr "usando etiquetas"
 
-#: templates/book.html:147
+#: templates/book.html:147 templates/book.html.BASE.30295.html:147
+#: templates/book.html.LOCAL.30295.html:147
+#: templates/book.html.REMOTE.30295.html:147
 msgid "subscribe to book RSS feed"
 msgstr "suscribirse al RSS del libro"
 
-#: templates/book.html:147 templates/index.html:116
+#: templates/book.html:147 templates/book.html.BASE.30295.html:147
+#: templates/book.html.LOCAL.30295.html:147
+#: templates/book.html.REMOTE.30295.html:147 templates/index.html:118
 msgid "subscribe to the questions feed"
 msgstr "suscribirse al agregado de noticias"
 
@@ -1169,9 +1232,9 @@ msgstr ""
 msgid "What should I avoid in my answers?"
 msgstr "¿Que debo evitar en mis respuestas?"
 
-#: templates/faq.html:28 templates/faq.html.py:132
+#: templates/faq.html:28 templates/faq.html.py:126
 msgid "site title"
-msgstr "título del sitio"
+msgstr "Preguntalo.com.uy"
 
 #: templates/faq.html:28
 msgid ""
@@ -1209,75 +1272,118 @@ msgstr "¿Cómo funciona el sistema de reputación?"
 
 #: templates/faq.html:41
 msgid "Rep system summary"
-msgstr "resumen del sistema de reputación"
+msgstr ""
+"Cuando una pregunta o respuesta es votada positivamente, el usuario que la "
+"realizo ganará algunos puntos, que llamamos \"puntos de reputación\". Estos "
+"puntos sirven a groso modo para medir la confianza que la comunidad le "
+"tiene. Diversas tareas de moderación son gradualmente asignadas a los "
+"usuarios basado en estos puntos de reputación."
 
-#: templates/faq.html:59 templates/user_votes.html:14
+#: templates/faq.html:42
+msgid ""
+"For example, if you ask an interesting question or give a helpful answer, "
+"your input will be upvoted. On the other hand if the answer is misleading - "
+"it will be downvoted. Each vote in favor will generate <strong>10</strong> "
+"points, each vote against will subtract <strong>2</strong> points. There is "
+"a limit of <strong>200</strong> points that can be accumulated per question "
+"or answer. The table below explains reputation point requirements for each "
+"type of moderation task."
+msgstr ""
+"Por ejemplo, si haces una pregunta interesante o das una respuesta útil, tu "
+"adición será votada positivamente. Por otro lado, si la respuesta es fuera "
+"de lugar - será votada negativamente. Cada voto a favor genera <strong>10"
+"</strong> puntos, cada voto en contra restará <strong>2</strong> puntos. Hay "
+"un limite de <strong>200</strong> puntos que puedes acumular por pregunta o "
+"respuesta. La tabla debajo explica los puntos de reputación requeridos para "
+"cada tarea de moderación."
+
+#: templates/faq.html:53 templates/user_votes.html:14
 msgid "upvote"
 msgstr "votar positivo"
 
-#: templates/faq.html:63
+#: templates/faq.html:57
 msgid "use tags"
 msgstr "etiquetas usadas"
 
-#: templates/faq.html:68
+#: templates/faq.html:62
 msgid "add comments"
 msgstr "agregar comentarios"
 
-#: templates/faq.html:72 templates/user_votes.html:16
+#: templates/faq.html:66 templates/user_votes.html:16
 msgid "downvote"
 msgstr "votar negativo"
 
-#: templates/faq.html:75
+#: templates/faq.html:69
 msgid "open and close own questions"
 msgstr "abrir y cerrar sus propias preguntas"
 
-#: templates/faq.html:79
+#: templates/faq.html:73
 msgid "retag questions"
 msgstr "re-etiquetar preguntas"
 
-#: templates/faq.html:83
+#: templates/faq.html:77
 msgid "edit community wiki questions"
 msgstr "editar preguntas de la wiki comunitaria"
 
-#: templates/faq.html:87
+#: templates/faq.html:81
 msgid "edit any answer"
 msgstr "editar cualquier pregunta"
 
-#: templates/faq.html:91
+#: templates/faq.html:85
 msgid "open any closed question"
 msgstr "abrir cualquier pregunta cerrada"
 
-#: templates/faq.html:95
+#: templates/faq.html:89
 msgid "delete any comment"
 msgstr "borrar cualquier comentario"
 
-#: templates/faq.html:99
+#: templates/faq.html:93
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 "borrar cualquier pregunta o respuesta y realizar otras tareas de "
 "administración."
 
-#: templates/faq.html:106
+#: templates/faq.html:100
 msgid "how to validate email title"
-msgstr "como validar el título del correo"
+msgstr "¿Cómo validar mi correo electrónico?"
 
-#: templates/faq.html:108
+#: templates/faq.html:102
 msgid "how to validate email info"
-msgstr "como validar la información del correo"
+msgstr ""
+"<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
+"\"bigger strong\">¿Cómo?</span> Si acabas de asignar o cambiar tu correo "
+"electrónico - <strong>verifica tu casilla de mensajes y clickea en el link "
+"incluido</strong>. <br/> El link contiene una clave generada especificamente "
+"para ti. <button style='display:inline' type='submit'><strong>get a new key</"
+"strong></button> y vuelve a revisar tu casilla de mensajes.</p></form><span "
+"class=\"bigger strong\">¿Porqué?</span> La validación del email es requerida "
+"para estar seguros the que <strong>solo tu puedes enviar mensajes</strong> "
+"bajo tu concentimiento y para <strong>minimizar el spam</strong>.<br/> Con "
+"tu email podrás <strong>suscribirte a actualizaciones</strong> en las "
+"preguntas mas interesantes. También, cuando te registras por primera vez - "
+"se crea un imagen personal única de <a href='/"
+"faq#gravatar'><strong>gravatar</strong></a>."
 
-#: templates/faq.html:112
+#: templates/faq.html:106
 msgid "what is gravatar"
-msgstr "qué es gravatar"
+msgstr "¿Qué es gravatar?"
 
-#: templates/faq.html:113
+#: templates/faq.html:107
 msgid "gravatar faq info"
-msgstr "preguntas frecuentes sobre gravatar"
-
-#: templates/faq.html:116
+msgstr ""
+"<strong>Gravatar</strong> significa <strong>g</strong>lobalmente <strong>r</"
+"strong>econocido <strong>avatar</strong> - tu imagen única asociada a tu "
+"email. Es simplemente una imagen que se muestra junto con tus mensajes en "
+"sitios que soportan gravatar. Por defecto gravatar aparece como un cuadrado "
+"rellenado con figuras parecidas a copos de nieve. Puedes <strong>seleccionar "
+"tu imagen</strong> en <a href='http://gravatar.com'><strong>gravatar.com</"
+"strong></a>"
+
+#: templates/faq.html:110
 msgid "To register, do I need to create new password?"
 msgstr "¿Para registrarme, debo crearme una cuenta?"
 
-#: templates/faq.html:117
+#: templates/faq.html:111
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
@@ -1285,19 +1391,21 @@ msgstr ""
 "No tienes porqué. Puedes ingresar usando cualquiera de los servicios que "
 "soportan OpenID, ej. Google, Yahoo, AOL, MyOpenID, etc."
 
-#: templates/faq.html:118
+#: templates/faq.html:112
 msgid "Login now!"
 msgstr "Ingresa ahora!"
 
-#: templates/faq.html:123
+#: templates/faq.html:117
 msgid "Why other people can edit my questions/answers?"
 msgstr "¿Porqué otras personas pueden editar mis preguntas y respuestas?"
 
-#: templates/faq.html:124
+#: templates/faq.html:118
 msgid "Goal of this site is..."
-msgstr "El objetivo de este sitio es..."
+msgstr ""
+"El objetivo de este sitio es generar contenido valioso mediante preguntas y "
+"respuestas, de forma colaborativa. "
 
-#: templates/faq.html:124
+#: templates/faq.html:118
 msgid ""
 "So questions and answers can be edited like wiki pages by experienced users "
 "of this site and this improves the overall quality of the knowledge base "
@@ -1305,26 +1413,26 @@ msgid ""
 msgstr ""
 "Entonces, las preguntas y respuestas pueden ser editadas como wiki por "
 "usuarios con experiencia, y esto mejora la calidad general del conocimiento "
-"guardado."
+"acumulado."
 
-#: templates/faq.html:125
+#: templates/faq.html:119
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 "Si esta forma de funcionamiento no es de tu agrado, respetamos tu elección."
 
-#: templates/faq.html:129
+#: templates/faq.html:123
 msgid "Still have questions?"
 msgstr "¿Aún tienes preguntas?"
 
-#: templates/faq.html:130
+#: templates/faq.html:124
 msgid "Please ask your question, help make our community better!"
 msgstr "Por favor haz tu pregunta, ¡ayudanos a mejorar nuestra comunidad!"
 
-#: templates/faq.html:132 templates/header.html:33 templates/header.html.py:61
+#: templates/faq.html:126 templates/header.html:33 templates/header.html.py:62
 msgid "questions"
 msgstr "preguntas"
 
-#: templates/faq.html:132 templates/index.html:121
+#: templates/faq.html:126 templates/index.html:123
 msgid "."
 msgstr "."
 
@@ -1333,6 +1441,7 @@ msgid "about"
 msgstr "acerca de nosotros"
 
 #: templates/footer.html:8 templates/header.html:15 templates/index.html:84
+#: templates/question_edit_tips.html:16
 msgid "faq"
 msgstr "preguntas frecuentes"
 
@@ -1372,7 +1481,7 @@ msgstr "volver página principal"
 msgid "ask a question"
 msgstr "hacer una pregunta"
 
-#: templates/header.html:35 templates/header.html.py:63
+#: templates/header.html:35 templates/header.html.py:64
 msgid "users"
 msgstr "usuarios"
 
@@ -1437,10 +1546,10 @@ msgstr "todas las preguntas"
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:69 templates/question.html:115
-#: templates/question.html.py:486 templates/questions.html:84
-#: templates/questions.html.py:156 templates/tags.html:47
-#: templates/unanswered.html:75 templates/unanswered.html.py:109
+#: templates/index.html:69 templates/question.html:125
+#: templates/question.html.py:499 templates/questions.html:84
+#: templates/questions.html.py:156 templates/tags.html:49
+#: templates/unanswered.html:75 templates/unanswered.html.py:106
 #: templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
@@ -1458,44 +1567,44 @@ msgstr "Etiquetas recientes"
 msgid "see questions tagged '%(tagname)s'"
 msgstr "ver preguntas etiquetadas '%(tagname)s'"
 
-#: templates/index.html:97 templates/index.html.py:121
+#: templates/index.html:97 templates/index.html.py:123
 msgid "popular tags"
 msgstr "etiquetas populares"
 
-#: templates/index.html:101
+#: templates/index.html:102
 msgid "Recent awards"
 msgstr "Reconocimientos recientes"
 
-#: templates/index.html:107
+#: templates/index.html:108
 msgid "given to"
 msgstr "dados a"
 
-#: templates/index.html:112
+#: templates/index.html:113
 msgid "all awards"
 msgstr "todos los reconocimientos"
 
-#: templates/index.html:116
+#: templates/index.html:118
 msgid "subscribe to last 30 questions by RSS"
 msgstr "suscribirse a las últimas 30 preguntas por RSS"
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "Still looking for more? See"
 msgstr "¿Aún sigues buscando más? Ver"
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "complete list of questions"
 msgstr "lista completa de preguntas"
 
-#: templates/index.html:121
+#: templates/index.html:123
 #, fuzzy
 msgid "or"
 msgstr "ó"
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "Please help us answer"
 msgstr "Ayudanos a responder"
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "list of unanswered questions"
 msgstr "lista de preguntas sin respuesta"
 
@@ -1585,75 +1694,77 @@ msgstr "Cambios de Códigos"
 msgid "how privacy policies can be changed"
 msgstr "como pueden ser cambiados los códigos de privacidad"
 
-#: templates/question.html:69 templates/question.html.py:81
+#: templates/question.html:72 templates/question.html.py:73
+#: templates/question.html:85 templates/question.html.py:87
 msgid "i like this post (click again to cancel)"
 msgstr "Me gusta esta entrada (clickear devuelta para cancelar)"
 
-#: templates/question.html:71 templates/question.html.py:83
-#: templates/question.html:276
+#: templates/question.html:75 templates/question.html.py:89
+#: templates/question.html:289
 msgid "current number of votes"
 msgstr "número actual de votos"
 
-#: templates/question.html:76 templates/question.html.py:87
+#: templates/question.html:80 templates/question.html.py:81
+#: templates/question.html:94 templates/question.html.py:95
 msgid "i dont like this post (click again to cancel)"
 msgstr "No me gusta esta entrada (clickear devuelta para cancelar)"
 
-#: templates/question.html:93
+#: templates/question.html:100 templates/question.html.py:101
 msgid "mark this question as favorite (click again to cancel)"
 msgstr "marcar esta pregunta como favorita (clickear devuelta para cancelar)"
 
-#: templates/question.html:99
+#: templates/question.html:107 templates/question.html.py:108
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 "remover marca de favorito a esta pregunta (clickear devuelta para volver a "
 "marcar)"
 
-#: templates/question.html:124 templates/question.html.py:307
+#: templates/question.html:134 templates/question.html.py:322
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
 msgstr "editar"
 
-#: templates/question.html:128 templates/question.html.py:317
+#: templates/question.html:138 templates/question.html.py:332
 msgid "delete"
 msgstr "borrar"
 
-#: templates/question.html:133
+#: templates/question.html:143
 msgid "reopen"
 msgstr "re-abrir"
 
-#: templates/question.html:138
+#: templates/question.html:148
 msgid "close"
 msgstr "cerrar"
 
-#: templates/question.html:144 templates/question.html.py:330
+#: templates/question.html:154 templates/question.html.py:345
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 "reportar como ofensivo (ej. contiene spam, publicidad, texto malicioso, etc.)"
 
-#: templates/question.html:145 templates/question.html.py:331
+#: templates/question.html:155 templates/question.html.py:346
 msgid "flag offensive"
 msgstr "marcar como ofensivo"
 
-#: templates/question.html:157 templates/question.html.py:340
+#: templates/question.html:167 templates/question.html.py:355
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
 msgstr "actualizado"
 
-#: templates/question.html:206 templates/question.html.py:387
+#: templates/question.html:216 templates/question.html.py:402
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
 msgstr "preguntado"
 
-#: templates/question.html:236 templates/question.html.py:414
+#: templates/question.html:246 templates/question.html.py:429
 msgid "comments"
 msgstr "comentarios"
 
-#: templates/question.html:237 templates/question.html.py:415
+#: templates/question.html:247 templates/question.html.py:430
 msgid "add comment"
 msgstr "agregar comentario"
 
-#: templates/question.html:250
+#: templates/question.html:260
 #, python-format
 msgid ""
 "The question has been closed for the following reason \"%(question."
@@ -1662,117 +1773,117 @@ msgstr ""
 "La pregunta ha sido cerrada por el siguiente motivo \"%(question."
 "get_close_reason_display)s\" por"
 
-#: templates/question.html:252
+#: templates/question.html:262
 #, python-format
 msgid "close date %(question.closed_at)s"
 msgstr "fecha de cerrada %(question.closed_at)s"
 
-#: templates/question.html:259 templates/user_stats.html:28
+#: templates/question.html:269 templates/user_stats.html:29
 msgid "Answers"
 msgstr "Respuestas"
 
-#: templates/question.html:261
+#: templates/question.html:271
 msgid "oldest answers will be shown first"
 msgstr "la respuesta mas vieja será mostrada primero"
 
-#: templates/question.html:261
+#: templates/question.html:271
 msgid "oldest answers"
 msgstr "pregunta más vieja"
 
-#: templates/question.html:262
+#: templates/question.html:272
 msgid "newest answers will be shown first"
 msgstr "preguntas más nuevas serán mostradas primero"
 
-#: templates/question.html:262
+#: templates/question.html:272
 msgid "newest answers"
 msgstr "más nuevas"
 
-#: templates/question.html:263
+#: templates/question.html:273
 msgid "most voted answers will be shown first"
 msgstr "las preguntas más votadas serán mostradas primero"
 
-#: templates/question.html:263
+#: templates/question.html:273
 msgid "popular answers"
 msgstr "respuestas populares"
 
-#: templates/question.html:275
+#: templates/question.html:287 templates/question.html.py:288
 msgid "i like this answer (click again to cancel)"
 msgstr "me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:281
+#: templates/question.html:294 templates/question.html.py:295
 msgid "i dont like this answer (click again to cancel)"
 msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:287
+#: templates/question.html:300 templates/question.html.py:301
 msgid "mark this answer as favorite (click again to undo)"
 msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)"
 
-#: templates/question.html:292
+#: templates/question.html:306 templates/question.html.py:307
 msgid "the author of the question has selected this answer as correct"
 msgstr "el autor de esta pregunta ha seleccionado esta respuesta como correcta"
 
-#: templates/question.html:314
+#: templates/question.html:329
 msgid "undelete"
 msgstr "deshacer eliminar"
 
-#: templates/question.html:324
+#: templates/question.html:339
 msgid "answer permanent link"
 msgstr "enlace permanente a respuesta"
 
-#: templates/question.html:325
+#: templates/question.html:340
 msgid "permanent link"
 msgstr "enlace permanente"
 
-#: templates/question.html:438
+#: templates/question.html:453
 msgid "Your answer"
 msgstr "Tu respuesta"
 
-#: templates/question.html:441
+#: templates/question.html:456
 msgid "you can answer anonymously and then login"
 msgstr "puedes responder de forma anónima y luego ingresar"
 
-#: templates/question.html:465
+#: templates/question.html:479
 msgid "Answer the question"
 msgstr "Responde la pregunta"
 
-#: templates/question.html:467
+#: templates/question.html:481
 msgid "Notify me daily if there are any new answers."
 msgstr "Notificarme diariamente si hay nuevas respuestas."
 
-#: templates/question.html:469
+#: templates/question.html:483
 msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr ""
 "una vez que hayas ingresado podrás suscribirte a cualquiera de las "
 "actualizaciones aquí."
 
-#: templates/question.html:481
+#: templates/question.html:494
 #, fuzzy
 msgid "Question tags"
 msgstr "Tags de la pregunta"
 
-#: templates/question.html:491
+#: templates/question.html:504
 msgid "question asked"
 msgstr "pregunta preguntada"
 
-#: templates/question.html:491 templates/question.html.py:497
+#: templates/question.html:504 templates/question.html.py:510
 #: templates/user_info.html:51
 #, fuzzy
 msgid "ago"
 msgstr " atras"
 
-#: templates/question.html:494
+#: templates/question.html:507
 msgid "question was seen"
 msgstr "la pregunta fue vista"
 
-#: templates/question.html:494
+#: templates/question.html:507
 msgid "times"
 msgstr "veces"
 
-#: templates/question.html:497
+#: templates/question.html:510
 msgid "last updated"
 msgstr "última vez actualizada"
 
-#: templates/question.html:502
+#: templates/question.html:515
 msgid "Related questions"
 msgstr "Preguntas relacionadas"
 
@@ -1800,15 +1911,15 @@ msgstr "Cambiar etiquetas"
 msgid "up to 5 tags, less than 20 characters each"
 msgstr "hasta 5 etiquetas, menos de 20 caracteres cada una"
 
-#: templates/question_retag.html:86
+#: templates/question_retag.html:82
 msgid "Why use and modify tags?"
 msgstr "¿Porqué usar y modificar etiquetas?"
 
-#: templates/question_retag.html:89
+#: templates/question_retag.html:85
 msgid "tags help us keep Questions organized"
 msgstr "las etiquetas nos permiten mantener las Preguntas organizadas"
 
-#: templates/question_retag.html:95
+#: templates/question_retag.html:91
 msgid "tag editors receive special awards from the community"
 msgstr ""
 "los editores de etiquetas reciben distinciones especiales de la comunidad"
@@ -1917,7 +2028,7 @@ msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>."
 msgid "Most voted questions are shown first."
 msgstr "Las preguntas más votadas son mostradas primero."
 
-#: templates/questions.html:153 templates/unanswered.html:105
+#: templates/questions.html:153 templates/unanswered.html:102
 msgid "Related tags"
 msgstr "Etiquetas relacionadas"
 
@@ -1955,35 +2066,35 @@ msgstr "Re-abrir esta pregunta"
 msgid "Revision history"
 msgstr "Historial de revisiones"
 
-#: templates/tags.html:6 templates/tags.html.py:29
+#: templates/tags.html:6 templates/tags.html.py:30
 msgid "Tag list"
 msgstr "Lista de etiquetas"
 
-#: templates/tags.html:31
+#: templates/tags.html:32
 msgid "sorted alphabetically"
 msgstr "ordenar alfabéticamente"
 
-#: templates/tags.html:31
+#: templates/tags.html:32
 msgid "by name"
 msgstr "por nombre"
 
-#: templates/tags.html:32
+#: templates/tags.html:33
 msgid "sorted by frequency of tag use"
 msgstr "ordenar por frecuencia de uso de la etiqueta"
 
-#: templates/tags.html:32
+#: templates/tags.html:33
 msgid "by popularity"
 msgstr "por popularidad"
 
-#: templates/tags.html:38
+#: templates/tags.html:39
 msgid "All tags matching query"
 msgstr "Todas las etiquetas que coincidan con la busqueda"
 
-#: templates/tags.html:38
+#: templates/tags.html:39
 msgid "all tags - make this empty in english"
 msgstr "todas las tags"
 
-#: templates/tags.html:41
+#: templates/tags.html:42
 msgid "Nothing found"
 msgstr "Nada encontrado"
 
@@ -1998,10 +2109,6 @@ msgstr ""
 "<div class=\"questions-count\">%(num_q)s</div> preguntas <strong>sin "
 "respuesta</strong> "
 
-#: templates/unanswered.html:99
-msgid "Have a total of"
-msgstr "Hay un total de"
-
 #: templates/user_edit.html:6
 #, fuzzy
 msgid "Edit user profile"
@@ -2072,62 +2179,62 @@ msgstr "votos restantes"
 msgid "Connect with Twitter"
 msgstr "Conectar con Twitter"
 
-#: templates/user_preferences.html:12
+#: templates/user_preferences.html:13
 msgid "Twitter account name:"
 msgstr "Nombre de usuario en Twitter:"
 
-#: templates/user_preferences.html:14
+#: templates/user_preferences.html:15
 msgid "Twitter password:"
 msgstr "Contraseña de Twitter:"
 
-#: templates/user_preferences.html:16
+#: templates/user_preferences.html:17
 msgid "Send my Questions to Twitter"
 msgstr "Enviar mis preguntas a Twitter"
 
-#: templates/user_preferences.html:17
+#: templates/user_preferences.html:18
 msgid "Send my Answers to Twitter"
 msgstr "Enviar mis respuestas a Twitter"
 
-#: templates/user_preferences.html:18
+#: templates/user_preferences.html:19
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/user_stats.html:15
+#: templates/user_stats.html:16
 msgid "User questions"
 msgstr "Preguntas del usuario"
 
-#: templates/user_stats.html:37
+#: templates/user_stats.html:38
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr "la respuesta ha sido votada %(vote_count)s veces"
 
-#: templates/user_stats.html:37
+#: templates/user_stats.html:38
 msgid "this answer has been selected as correct"
 msgstr "esta respuesta ha sido seleccionada como correcta"
 
-#: templates/user_stats.html:43
-#, python-format
-msgid "the answer has been commented %(answered_question.comment_count)s times"
+#: templates/user_stats.html:44
+#, fuzzy, python-format
+msgid "the answer has been commented %(comment_count)s times"
 msgstr ""
 "la respuesta ha sido comentada %(answered_question.comment_count)s veces"
 
-#: templates/user_stats.html:56
+#: templates/user_stats.html:57
 msgid "votes total"
 msgstr "votos totales"
 
-#: templates/user_stats.html:65
+#: templates/user_stats.html:66
 msgid "user has voted up this many times"
 msgstr "el usuario ha votado positivo esta cantidad de veces"
 
-#: templates/user_stats.html:70
+#: templates/user_stats.html:71
 msgid "user voted down this many times"
 msgstr "el usuario voto negativo esta cantidad de veces"
 
-#: templates/user_stats.html:84
+#: templates/user_stats.html:85
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/user_stats.html:94
+#: templates/user_stats.html:95
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr "ver otras preguntas etiqueteadas '%(tag)s'"
@@ -2209,7 +2316,7 @@ msgid "Your new Email"
 msgstr "Tu nuevo Email"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:138
+#: templates/authopenid/signin.html:136
 msgid "Password"
 msgstr "Contraseña"
 
@@ -2317,7 +2424,7 @@ msgid "This account already exists, please use another."
 msgstr "Esta cuenta ya existe, por favor usar otra."
 
 #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/signin.html:121
+#: templates/authopenid/signin.html:120
 msgid "Sorry, looks like we have some errors:"
 msgstr "Ups, parece que hay errores:"
 
@@ -2349,7 +2456,7 @@ msgstr "contraseña"
 msgid "Register"
 msgstr "Registrarse"
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:140
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
@@ -2493,7 +2600,7 @@ msgstr ""
 "Ingresa tu dirección (URL) de <a class=\"openid_logo\" href=\"http://openid."
 "net\">OpenID</a>"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
 msgid "Login"
 msgstr "Ingresar"
 
@@ -2501,48 +2608,48 @@ msgstr "Ingresar"
 msgid "we support two login modes"
 msgstr "soportamos dos tipos de ingreso"
 
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:134
 msgid "Use login name and password"
 msgstr "Nombre de usuario y contraseña"
 
-#: templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:135
 msgid "Login name"
 msgstr "Nombre de usuario"
 
-#: templates/authopenid/signin.html:141
+#: templates/authopenid/signin.html:139
 msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-#: templates/authopenid/signin.html:150
+#: templates/authopenid/signin.html:148
 msgid "Why use OpenID?"
 msgstr "¿Porqué usar OpenID?"
 
-#: templates/authopenid/signin.html:154
+#: templates/authopenid/signin.html:151
 msgid "with openid it is easier"
 msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña."
 
-#: templates/authopenid/signin.html:157
+#: templates/authopenid/signin.html:154
 msgid "reuse openid"
 msgstr ""
 "Puedes de forma segura re-usar el mismo nombre de usuario para todos los "
 "sitios que acepten OpenID."
 
-#: templates/authopenid/signin.html:160
+#: templates/authopenid/signin.html:157
 msgid "openid is widely adopted"
 msgstr ""
 "OpenID es extensamente usado. Hay más de 160,000,000 cuentas de OpenID en "
 "uso en el mundo. Mas de 10,000 sitios aceptan OpenID."
 
-#: templates/authopenid/signin.html:163
+#: templates/authopenid/signin.html:160
 msgid "openid is supported open standard"
 msgstr ""
 "OpenID es basado en un standard abierto, apoyado por muchas organizaciones."
 
-#: templates/authopenid/signin.html:167
+#: templates/authopenid/signin.html:165
 msgid "Find out more"
 msgstr "Averigua más"
 
-#: templates/authopenid/signin.html:168
+#: templates/authopenid/signin.html:166
 msgid "Get OpenID"
 msgstr "Adquiere una OpenID"
 
@@ -2578,14 +2685,17 @@ msgstr "elije un nombre de usuario"
 msgid "back to login"
 msgstr "volver al ingreso de usuario"
 
-#: templates/authopenid/signup.html:48
+#: templates/authopenid/signup.html:46
 msgid "Register with your OpenID"
 msgstr "Registrate con tu OpenID"
 
-#: templates/authopenid/signup.html:51
+#: templates/authopenid/signup.html:49
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
+#~ msgid "Have a total of"
+#~ msgstr "Hay un total de"
+
 #~ msgid "/account/"
 #~ msgstr "/cuenta/"
 
diff --git a/templates/faq.html b/templates/faq.html
index 8adee552..ffbc2ed7 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -39,13 +39,7 @@
         <div>
             <h3 class="subtitle">{% trans "How does reputation system work?" %}</h3>
             <p>{% trans "Rep system summary" %}</p>
-            <p>
-                For example, if you ask an interesting question or give a helpful answer, your input will be upvoted.
-                On the other hand if the answer is misleading - it will be downvoted.
-                Each vote in favor will generate <strong>10</strong> points, each vote against will subtract <strong>2</strong> points.
-                There is a limit of <strong>200</strong> points that can be accumulated per question or answer.
-
-                The table below explains reputation point requirements for each type of moderation task.
+            <p>{% blocktrans %}For example, if you ask an interesting question or give a helpful answer, your input will be upvoted. On the other hand if the answer is misleading - it will be downvoted. Each vote in favor will generate <strong>10</strong> points, each vote against will subtract <strong>2</strong> points. There is a limit of <strong>200</strong> points that can be accumulated per question or answer. The table below explains reputation point requirements for each type of moderation task.{% endblocktrans %}
             </p>
 
             <table style="font-family:arial;" cellspacing="3" cellpadding="3">
-- 
cgit v1.2.3-1-g7c22


From 34f55657a299fa3b72abf4d6c49382aaa063f969 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Tue, 11 Aug 2009 04:18:36 -0300
Subject: Typo

---
 templates/about.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/about.html b/templates/about.html
index 7beedb0b..9a3e2101 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -18,7 +18,7 @@
 	<p>Si haces una pregunta ques es votada por los usuarios como útil, recibiras
 	puntos de reputación, también si respondes una pregunta, y más puntos aún si tu respuesta
 	es aceptada como la correcta!</p>
-	<p>Estamos en estapa de desarrollo. Si tenés alguna duda, preguntalo.com.uy! :)</p>
+	<p>Si tenés alguna duda, no dudes en preguntalo! :)</p>
 </div>
 {% endblock %}
 <!-- end template about.html -->
-- 
cgit v1.2.3-1-g7c22


From 04731fe24e0117486c8ff30ad893a2cd3cb48356 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Tue, 11 Aug 2009 05:34:53 -0300
Subject: Fix for analytics to work, testing.

---
 templates/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/footer.html b/templates/footer.html
index f182ca3c..9e877b42 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -27,7 +27,7 @@
             </script>
             <script type="text/javascript">
             try {
-            var pageTracker = _gat._getTracker({{ settings.GOOGLE_ANALYTICS_KEY }});
+            var pageTracker = _gat._getTracker("{{ settings.GOOGLE_ANALYTICS_KEY }}");
             pageTracker._trackPageview();
             } catch(err) {}
         </script>
-- 
cgit v1.2.3-1-g7c22


From 7b559daeac59b56adb7e911dad4e692a7e6fa6c4 Mon Sep 17 00:00:00 2001
From: unknown <mike@.(none)>
Date: Wed, 12 Aug 2009 00:20:14 +0800
Subject: remove settings_local.py

---
 .gitignore                            |  1 +
 LICENSE                               | 28 +++++++++++++--------------
 settings.py                           |  2 +-
 sql_scripts/update_2009_01_25_001.sql |  2 +-
 sql_scripts/update_2009_02_26_001.sql | 36 +++++++++++++++++------------------
 sql_scripts/update_2009_04_10_001.sql |  4 ++--
 templates/content/js/compress.bat     | 10 +++++-----
 templates/content/js/flot-build.bat   |  4 ++--
 8 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f83efab..bb9e4490 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.pyc
 *.swp
 nbproject
+
diff --git a/LICENSE b/LICENSE
index cb24f678..803781c5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,14 +1,14 @@
-Copyright (C) 2009.  Chen Gang
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Copyright (C) 2009.  Chen Gang
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/settings.py b/settings.py
index fac3c0d5..5eb7ceda 100644
--- a/settings.py
+++ b/settings.py
@@ -91,7 +91,7 @@ INSTALLED_APPS = (
     'django.contrib.humanize',
     'forum',
     'django_authopenid',
-    'debug_toolbar' ,
+    #'debug_toolbar' ,
 )
 
 # User settings
diff --git a/sql_scripts/update_2009_01_25_001.sql b/sql_scripts/update_2009_01_25_001.sql
index 1f1942e3..f6f3bed2 100644
--- a/sql_scripts/update_2009_01_25_001.sql
+++ b/sql_scripts/update_2009_01_25_001.sql
@@ -1,2 +1,2 @@
-ALTER TABLE `award` ADD `content_type_id` INT NULL 
+ALTER TABLE `award` ADD `content_type_id` INT NULL 
 ALTER TABLE `award` ADD `object_id` INT NULL 
\ No newline at end of file
diff --git a/sql_scripts/update_2009_02_26_001.sql b/sql_scripts/update_2009_02_26_001.sql
index 9cc80974..4113d8f5 100644
--- a/sql_scripts/update_2009_02_26_001.sql
+++ b/sql_scripts/update_2009_02_26_001.sql
@@ -1,19 +1,19 @@
-ALTER TABLE answer ADD COLUMN `accepted_at` datetime default null;
-
-/* Update accepted_at column with answer added datetime for existing data */
-UPDATE answer
-SET accepted_at = added_at
-WHERE accepted = 1 AND accepted_at IS NULL;
-
-/* workround for c# url problem on bluehost server */
-UPDATE tag
-SET name = 'csharp'
-WHERE name = 'c#'
-
-UPDATE question
-SET tagnames = replace(tagnames, 'c#', 'csharp')
-WHERE tagnames like '%c#%'
-
-UPDATE question_revision
-SET tagnames = replace(tagnames, 'c#', 'csharp')
+ALTER TABLE answer ADD COLUMN `accepted_at` datetime default null;
+
+/* Update accepted_at column with answer added datetime for existing data */
+UPDATE answer
+SET accepted_at = added_at
+WHERE accepted = 1 AND accepted_at IS NULL;
+
+/* workround for c# url problem on bluehost server */
+UPDATE tag
+SET name = 'csharp'
+WHERE name = 'c#'
+
+UPDATE question
+SET tagnames = replace(tagnames, 'c#', 'csharp')
+WHERE tagnames like '%c#%'
+
+UPDATE question_revision
+SET tagnames = replace(tagnames, 'c#', 'csharp')
 WHERE tagnames like '%c#%'
\ No newline at end of file
diff --git a/sql_scripts/update_2009_04_10_001.sql b/sql_scripts/update_2009_04_10_001.sql
index b0d05ac7..e1ceb3bc 100644
--- a/sql_scripts/update_2009_04_10_001.sql
+++ b/sql_scripts/update_2009_04_10_001.sql
@@ -1,3 +1,3 @@
-ALTER TABLE Tag ADD COLUMN deleted_at datetime default null;
-ALTER TABLE Tag ADD COLUMN deleted_by_id INTEGER NULL;
+ALTER TABLE Tag ADD COLUMN deleted_at datetime default null;
+ALTER TABLE Tag ADD COLUMN deleted_by_id INTEGER NULL;
 ALTER TABLE Tag ADD COLUMN deleted TINYINT NOT NULL;
\ No newline at end of file
diff --git a/templates/content/js/compress.bat b/templates/content/js/compress.bat
index aa31271c..41e1882a 100644
--- a/templates/content/js/compress.bat
+++ b/templates/content/js/compress.bat
@@ -1,6 +1,6 @@
-#java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 wmd\wmd.js -o wmd\wmd-min.js
-#java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 wmd\showdown.js -o wmd\showdown-min.js
-#java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 com.cnprog.post.js -o com.cnprog.post.pack.js
-java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 se_hilite_src.js -o se_hilite.js
-
+#java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 wmd\wmd.js -o wmd\wmd-min.js
+#java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 wmd\showdown.js -o wmd\showdown-min.js
+#java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 com.cnprog.post.js -o com.cnprog.post.pack.js
+java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 se_hilite_src.js -o se_hilite.js
+
 pause
\ No newline at end of file
diff --git a/templates/content/js/flot-build.bat b/templates/content/js/flot-build.bat
index 28304966..fc715e3a 100644
--- a/templates/content/js/flot-build.bat
+++ b/templates/content/js/flot-build.bat
@@ -1,3 +1,3 @@
-java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 jquery.flot.js -o jquery.flot.pack.js
-
+java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 jquery.flot.js -o jquery.flot.pack.js
+
 pause
\ No newline at end of file
-- 
cgit v1.2.3-1-g7c22


From 57785f8db55e71d81c03d158cf6035768e22c63f Mon Sep 17 00:00:00 2001
From: unknown <mike@.(none)>
Date: Wed, 12 Aug 2009 00:21:27 +0800
Subject: update .gitignore to exclude settings_local.py

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index bb9e4490..05a341b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 *.pyc
 *.swp
 nbproject
-
+settings_local.py
-- 
cgit v1.2.3-1-g7c22


From 42a226eac8e9c4b06c1c25b6d813d0eb342bc0d0 Mon Sep 17 00:00:00 2001
From: Mike Chen <chagel@gmail.com>
Date: Wed, 12 Aug 2009 00:50:09 +0800
Subject: update settings.py and settings_local.py.dist suggested by Adolfo
 Fitoria

---
 settings.py            | 31 ++----------------------
 settings_local.py.dist | 65 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/settings.py b/settings.py
index 5eb7ceda..ce8c9d89 100644
--- a/settings.py
+++ b/settings.py
@@ -17,27 +17,8 @@ ADMINS = (
 )
 MANAGERS = ADMINS
 
-#email server settings
-SERVER_EMAIL = ''
-DEFAULT_FROM_EMAIL = 'team@cnprog.com'
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
-EMAIL_HOST='smtp.gmail.com'
-EMAIL_PORT='587'
-EMAIL_USE_TLS=True
-
-#LOCALIZATIONS
-TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
-# LANGUAGE_CODE = 'en-us'
 SITE_ID = 1
 
-#OTHER SETTINGS
-APP_TITLE = u'CNProg.com 程序员问答社区'
-APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
-APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
-APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
-APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
 ADMIN_MEDIA_PREFIX = '/admin/media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 # List of callables that know how to import templates from various sources.
@@ -64,6 +45,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'context.auth_processor',
     'context.application_settings',
     #'django.core.context_processors.i18n',
+    'django.core.context_processors.auth' #this is required for admin
 )
 
 ROOT_URLCONF = 'urls'
@@ -95,13 +77,4 @@ INSTALLED_APPS = (
 )
 
 # User settings
-from settings_local import *
-
-USE_I18N = True
-LANGUAGE_CODE = 'en'
-EMAIL_VALIDATION = 'off'
-MIN_USERNAME_LENGTH = 1
-EMAIL_UNIQUE = False
-APP_URL = 'http://server.com' #used by email notif system and RSS
-GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
-GOOGLE_ANALYTICS_KEY = ''
+from settings_local import *
\ No newline at end of file
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 2c8f939d..453bbcaf 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -1,25 +1,46 @@
-SITE_SRC_ROOT = '/Users/sailing/Development/cnprog_beta2'
-
+# encoding:utf-8
+import os.path
+ 
+SITE_SRC_ROOT = os.path.dirname(__file__) 
+LOG_FILENAME = 'django.lanai.log'
+ 
 #for logging
 import logging
-LOG_FILENAME = '/Users/sailing/Development/cnprog_beta2/django.lanai.log'
-logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,)
-
-
-#Database configuration 
-DATABASE_ENGINE = 'mysql'      
-DATABASE_HOST = ''            
-DATABASE_PORT = ''          
-DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'root'               # Not used with sqlite3.
+logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
+ 
+DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
-
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = '/Users/sailing/Development/cnprog_beta2/templates/upfiles/'
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = 'http://127.0.0.1:8000/upfiles/'
+DATABASE_ENGINE = ''  #mysql, etc
+ 
+#Moved from settings.py for better organization. (please check it up to clean up settings.py)
+ 
+#email server settings
+SERVER_EMAIL = ''
+DEFAULT_FROM_EMAIL = 'team@cnprog.com'
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
+EMAIL_HOST='smtp.gmail.com'
+EMAIL_PORT='587'
+EMAIL_USE_TLS=True
+ 
+#LOCALIZATIONS
+TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
+# LANGUAGE_CODE = 'en-us'
+ 
+#OTHER SETTINGS
+APP_TITLE = u'CNProg.com 程序员问答社区'
+APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
+APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
+APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
+APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
+ 
+USE_I18N = True
+LANGUAGE_CODE = 'en'
+EMAIL_VALIDATION = 'off'
+MIN_USERNAME_LENGTH = 1
+EMAIL_UNIQUE = False
+APP_URL = 'http://server.com' #used by email notif system and RSS
+GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
+GOOGLE_ANALYTICS_KEY = ''
\ No newline at end of file
-- 
cgit v1.2.3-1-g7c22


From 3bf18ad5c7616379038ad301e7d92b9620159c57 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Tue, 11 Aug 2009 15:41:48 -0300
Subject: Fixed voting problem. Should still work on i18n for JS voting and
 some urls. Non-ascii chars in tags bring syntax error for new meta-tags
 parsing.

---
 forum/models.py                         | 2 +-
 locale/es/LC_MESSAGES/django.po         | 9 ++++-----
 templates/content/js/com.cnprog.i18n.js | 2 ++
 templates/content/js/com.cnprog.post.js | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/forum/models.py b/forum/models.py
index 9510476a..52f7af0f 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -180,7 +180,7 @@ class Question(models.Model):
         return [name for name in self.tagnames.split(u' ')]
 
     def tagname_meta_generator(self):
-        return ','.join([str(tag) for tag in self.tagname_list()])
+        return u','.join([str(tag) for tag in self.tagname_list()])
 
     def get_absolute_url(self):
         return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-'))
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 383ed961..16ccc51a 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 04:13-0300\n"
+"POT-Creation-Date: 2009-08-11 15:39-0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,9 +108,8 @@ msgid "delete/"
 msgstr "borrar/"
 
 #: urls.py:50
-#, fuzzy
 msgid "question/"
-msgstr "preguntas/"
+msgstr "pregunta/"
 
 #: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
 msgid "tags/"
@@ -1291,8 +1290,8 @@ msgid ""
 msgstr ""
 "Por ejemplo, si haces una pregunta interesante o das una respuesta útil, tu "
 "adición será votada positivamente. Por otro lado, si la respuesta es fuera "
-"de lugar - será votada negativamente. Cada voto a favor genera <strong>10"
-"</strong> puntos, cada voto en contra restará <strong>2</strong> puntos. Hay "
+"de lugar - será votada negativamente. Cada voto a favor genera <strong>10</"
+"strong> puntos, cada voto en contra restará <strong>2</strong> puntos. Hay "
 "un limite de <strong>200</strong> puntos que puedes acumular por pregunta o "
 "respuesta. La tabla debajo explica los puntos de reputación requeridos para "
 "cada tarea de moderación."
diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index 848ad59e..6ba8b59d 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -140,6 +140,8 @@ var i18nEs = {
 	'enter image url':'introduzca la URL de la imagen, por ejemplo：<br />http://www.example.com/image.jpg   \"titulo de imagen\"',
 	'enter url':'introduzca direcciones web, ejemplo：<br />http://www.cnprog.com/   \"titulo del enlace\"</p>"',
 	'upload image':'cargar imagen：',
+	'questions/' : 'preguntas/',
+	'vote/' : 'votar/',
 };
 
 var i18n = {
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index 546cf101..aa6c51b6 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -243,7 +243,7 @@ var Vote = function(){
             type: "POST",
             cache: false,
             dataType: "json",
-            url: "/questions/" + questionId + "/vote/",
+            url: "/" + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"),
             data: { "type": voteType, "postId": postId },
             error: handleFail,
             success: function(data){callback(object, voteType, data)}});
-- 
cgit v1.2.3-1-g7c22


From 1f034e12f4deeb27cd641c73e555c050e5f4d942 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Tue, 11 Aug 2009 15:49:55 -0300
Subject: Added unicode encoding for tags.

---
 forum/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forum/models.py b/forum/models.py
index 52f7af0f..9060b436 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -180,7 +180,7 @@ class Question(models.Model):
         return [name for name in self.tagnames.split(u' ')]
 
     def tagname_meta_generator(self):
-        return u','.join([str(tag) for tag in self.tagname_list()])
+        return u','.join([unicode(tag) for tag in self.tagname_list()])
 
     def get_absolute_url(self):
         return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-'))
-- 
cgit v1.2.3-1-g7c22


From f7f910a8d7a839c199f9e511f64161768aef4b80 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Wed, 12 Aug 2009 09:52:55 -0600
Subject: fixing canonical tag

---
 templates/question.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/question.html b/templates/question.html
index a2628859..74bc014b 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -8,7 +8,7 @@
 {% block forejs %}
         <meta name="description" content="{{question.summary}}" />
         <meta name="keywords" content="{{question.tagname_meta_generator}}" />
-        <link rel="canonical" href="{{question.get_absolute_url}}"/>
+        <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}"/>
         {% if not question.closed and request.user.is_authenticated %}
         <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
         <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
-- 
cgit v1.2.3-1-g7c22


From 3b3b19e16e9a040275d9dc157c3a87ba6adf215e Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Wed, 12 Aug 2009 10:35:51 -0600
Subject: updating some missing translations

---
 locale/es/LC_MESSAGES/django.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b209c72c..256387dc 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: 2009-08-07 11:21-0600\n"
+"PO-Revision-Date: 2009-08-12 10:35-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1606,11 +1606,11 @@ msgstr "Responde la pregunta"
 
 #: templates/question.html:467
 msgid "Notify me daily if there are any new answers."
-msgstr ""
+msgstr "Notifiquema diariamente si hay nuevas respuestas"
 
 #: templates/question.html:469
 msgid "once you sign in you will be able to subscribe for any updates here"
-msgstr ""
+msgstr "Una vez que inicie sesión se podrá suscribir a cualquier actualización aquí"
 
 #: templates/question.html:481
 msgid "Question tags"
@@ -1671,7 +1671,7 @@ msgstr "¿Porqué usar y modificar etiquetas?"
 
 #: templates/question_retag.html:89
 msgid "tags help us keep Questions organized"
-msgstr ""
+msgstr "las etiquetas nos ayudan a mantener las preguntar organizadas"
 
 #: templates/question_retag.html:95
 msgid "tag editors receive special awards from the community"
-- 
cgit v1.2.3-1-g7c22


From 1453809f46d760c42c485587d04072d38ea0b2b2 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Wed, 12 Aug 2009 10:35:51 -0600
Subject: updating some missing translations

---
 locale/en/LC_MESSAGES/django.mo | Bin 13992 -> 14218 bytes
 locale/es/LC_MESSAGES/django.mo | Bin 42834 -> 43234 bytes
 locale/es/LC_MESSAGES/django.po |   8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 11d15deb..d7523d09 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 6c616b17..c8b8b5ee 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b209c72c..4eb3757e 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: 2009-08-07 11:21-0600\n"
+"PO-Revision-Date: 2009-08-12 11:00-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1606,11 +1606,11 @@ msgstr "Responde la pregunta"
 
 #: templates/question.html:467
 msgid "Notify me daily if there are any new answers."
-msgstr ""
+msgstr "Notificarme diariamente si hay nuevas respuestas"
 
 #: templates/question.html:469
 msgid "once you sign in you will be able to subscribe for any updates here"
-msgstr ""
+msgstr "Una vez que inicie sesión se podrá suscribir a cualquier actualización aquí"
 
 #: templates/question.html:481
 msgid "Question tags"
@@ -1671,7 +1671,7 @@ msgstr "¿Porqué usar y modificar etiquetas?"
 
 #: templates/question_retag.html:89
 msgid "tags help us keep Questions organized"
-msgstr ""
+msgstr "las etiquetas nos ayudan a mantener las preguntar organizadas"
 
 #: templates/question_retag.html:95
 msgid "tag editors receive special awards from the community"
-- 
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

---
 context.py                                  |   1 +
 django_authopenid/views.py                  |   2 +
 forum/models.py                             |  10 +-
 forum/views.py                              |   2 +-
 locale/en/LC_MESSAGES/django.mo             | Bin 13992 -> 14334 bytes
 locale/en/LC_MESSAGES/django.po             | 606 +++++++++++++++++-----------
 locale/es/LC_MESSAGES/django.mo             | Bin 0 -> 49713 bytes
 locale/es/LC_MESSAGES/django.po             | 281 +++++++------
 settings_local.py.dist                      |   2 +-
 templates/404.html                          |   8 +-
 templates/about.html                        |  11 +-
 templates/content/images/logo.png           | Bin 4972 -> 3631 bytes
 templates/content/images/originals/logo.svg | 119 ------
 templates/content/style/style.css           |  13 +-
 templates/faq.html                          |   4 +-
 templates/header.html                       |  13 +-
 templates/index.html                        |   8 +-
 templates/question.html                     |   2 +-
 templates/user_stats.html                   |  84 +---
 templates/user_tabs.html                    |   2 +-
 templates/users_questions.html              |  30 +-
 21 files changed, 580 insertions(+), 618 deletions(-)
 create mode 100644 locale/es/LC_MESSAGES/django.mo
 delete mode 100644 templates/content/images/originals/logo.svg

diff --git a/context.py b/context.py
index c068332c..3da69f7b 100644
--- a/context.py
+++ b/context.py
@@ -10,6 +10,7 @@ def application_settings(context):
         'LANGUAGE_CODE': settings.LANGUAGE_CODE,
         'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE,
         'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY,
+        'BOOKS_ON':settings.BOOKS_ON,
         }
     return {'settings':my_settings}
 
diff --git a/django_authopenid/views.py b/django_authopenid/views.py
index 218a31a2..d055396b 100644
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -555,6 +555,8 @@ def send_new_email_key(user,nomessage=False):
     import random
     random.seed()
     user.email_key = '%032x' % random.getrandbits(128) 
+    print len(user.email_key)
+    print user.email_key
     user.save()
     _send_email_key(user)
     if nomessage==False:
diff --git a/forum/models.py b/forum/models.py
index 9060b436..f647ba12 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -183,7 +183,7 @@ class Question(models.Model):
         return u','.join([unicode(tag) for tag in self.tagname_list()])
 
     def get_absolute_url(self):
-        return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-'))
+        return '%s%s' % (reverse('question', args=[self.id]), slugify(self.title))
 
     def has_favorite_by_user(self, user):
         if not user.is_authenticated():
@@ -303,7 +303,7 @@ class QuestionRevision(models.Model):
         return self.question.title
 
     def get_absolute_url(self):
-        return '/questions/%s/revisions' % (self.question.id)
+        return '/%s%s/%s' % (_('questions/'),self.question.id,_('revisions'))
 
     def save(self, **kwargs):
         """Looks up the next available revision number."""
@@ -415,7 +415,7 @@ class AnswerRevision(models.Model):
     text       = models.TextField()
 
     def get_absolute_url(self):
-        return '/answers/%s/revisions' % (self.answer.id)
+        return '/%s%s/%s' % (_('answers/'),self.answer.id,_('revisions'))
 
     def get_question_title(self):
         return self.answer.question.title
@@ -587,7 +587,7 @@ QUESTIONS_PER_PAGE_CHOICES = (
 )
 
 User.add_to_class('email_isvalid', models.BooleanField(default=False))
-User.add_to_class('email_key', models.CharField(max_length=16, null=True))
+User.add_to_class('email_key', models.CharField(max_length=32, null=True))
 User.add_to_class('reputation', models.PositiveIntegerField(default=1))
 User.add_to_class('gravatar', models.CharField(max_length=32))
 User.add_to_class('email_feeds', generic.GenericRelation(EmailFeed))
@@ -629,7 +629,7 @@ def delete_messages(self):
 
 def get_profile_url(self):
     """Returns the URL for this User's profile."""
-    return '%s%s/' % (reverse('user', args=[self.id]), self.username)
+    return '%s%s/' % (reverse('user', args=[self.id]), slugify(self.username))
 User.add_to_class('get_profile_url', get_profile_url)
 User.add_to_class('get_messages', get_messages)
 User.add_to_class('delete_messages', delete_messages)
diff --git a/forum/views.py b/forum/views.py
index 626c93a3..89d0cbfd 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -332,7 +332,7 @@ def question(request, id):
     answers = answers.select_related(depth=1)
 
     favorited = question.has_favorite_by_user(request.user)
-    if not request.user.is_anonymous():
+    if request.user.is_authenticated():
         question_vote = question.votes.select_related().filter(user=request.user)
     else:
         question_vote = None #is this correct?
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 11d15deb..447afac4 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 07532566..ff280947 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-05 22:26-0400\n"
+"POT-Creation-Date: 2009-08-12 15:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,16 +16,145 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12
+#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698
 msgid "account/"
 msgstr ""
 
-#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:10
-#: django_authopenid/urls.py:11 django_authopenid/urls.py:13
-#: forum/views.py:304 templates/authopenid/confirm_email.txt:10
+#: settings.py:12 urls.py:26 django_authopenid/urls.py:9
+#: django_authopenid/urls.py:10 django_authopenid/urls.py:11
+#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699
+#: templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr ""
 
+#: urls.py:22
+msgid "upfiles/"
+msgstr ""
+
+#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26
+#: django_authopenid/urls.py:27
+msgid "email/"
+msgstr ""
+
+#: urls.py:27
+msgid "change/"
+msgstr ""
+
+#: urls.py:28
+msgid "sendkey/"
+msgstr ""
+
+#: urls.py:29
+msgid "verify/"
+msgstr ""
+
+#: urls.py:30
+msgid "about/"
+msgstr ""
+
+#: urls.py:31
+msgid "faq/"
+msgstr ""
+
+#: urls.py:32
+msgid "privacy/"
+msgstr ""
+
+#: urls.py:33
+msgid "logout/"
+msgstr ""
+
+#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
+msgid "answers/"
+msgstr ""
+
+#: urls.py:34 urls.py:46
+msgid "comments/"
+msgstr ""
+
+#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
+msgid "edit/"
+msgstr ""
+
+#: urls.py:36 urls.py:45
+msgid "revisions/"
+msgstr ""
+
+#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
+#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
+#: forum/models.py:306 forum/views.py:1416
+msgid "questions/"
+msgstr ""
+
+#: urls.py:38 urls.py:64
+msgid "ask/"
+msgstr ""
+
+#: urls.py:39
+msgid "unanswered/"
+msgstr ""
+
+#: urls.py:41
+msgid "close/"
+msgstr ""
+
+#: urls.py:42
+msgid "reopen/"
+msgstr ""
+
+#: urls.py:43
+msgid "answer/"
+msgstr ""
+
+#: urls.py:44
+msgid "vote/"
+msgstr ""
+
+#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
+msgid "delete/"
+msgstr ""
+
+#: urls.py:50
+msgid "question/"
+msgstr ""
+
+#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
+msgid "tags/"
+msgstr ""
+
+#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997
+#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015
+msgid "users/"
+msgstr ""
+
+#: urls.py:56 urls.py:57
+msgid "badges/"
+msgstr ""
+
+#: urls.py:58
+msgid "messages/"
+msgstr ""
+
+#: urls.py:58
+msgid "markread/"
+msgstr ""
+
+#: urls.py:60
+msgid "nimda/"
+msgstr ""
+
+#: urls.py:62
+msgid "upload/"
+msgstr ""
+
+#: urls.py:63 urls.py:64 urls.py:65
+msgid "books/"
+msgstr ""
+
+#: urls.py:66
+msgid "search/"
+msgstr ""
+
 #: django_authopenid/forms.py:67 django_authopenid/views.py:102
 msgid "i-names are not supported"
 msgstr ""
@@ -109,7 +238,7 @@ msgstr ""
 msgid "Incorrect username."
 msgstr ""
 
-#: django_authopenid/urls.py:10
+#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699
 msgid "newquestion/"
 msgstr ""
 
@@ -137,8 +266,8 @@ msgstr ""
 msgid "sendpw/"
 msgstr ""
 
-#: django_authopenid/urls.py:29
-msgid "delete/"
+#: django_authopenid/urls.py:27
+msgid "validate/"
 msgstr ""
 
 #: django_authopenid/views.py:108
@@ -146,69 +275,69 @@ msgstr ""
 msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:417 django_authopenid/views.py:544
+#: django_authopenid/views.py:418 django_authopenid/views.py:545
 msgid "Welcome"
 msgstr "Verification Email from Q&amp;A forum"
 
-#: django_authopenid/views.py:507
+#: django_authopenid/views.py:508
 msgid "Password changed."
 msgstr ""
 
-#: django_authopenid/views.py:519 django_authopenid/views.py:524
+#: django_authopenid/views.py:520 django_authopenid/views.py:525
 msgid "your email needs to be validated"
 msgstr ""
 "Your email needs to be validated. Please see details <a "
 "id='validate_email_alert' href=\"/faq#validate\">here</a>."
 
-#: django_authopenid/views.py:681 django_authopenid/views.py:833
+#: django_authopenid/views.py:682 django_authopenid/views.py:834
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr ""
 
-#: django_authopenid/views.py:685 django_authopenid/views.py:840
+#: django_authopenid/views.py:686 django_authopenid/views.py:841
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr ""
 
-#: django_authopenid/views.py:693
+#: django_authopenid/views.py:694
 msgid "Email Changed."
 msgstr ""
 
-#: django_authopenid/views.py:768
+#: django_authopenid/views.py:769
 msgid "This OpenID is already associated with another account."
 msgstr ""
 
-#: django_authopenid/views.py:773
+#: django_authopenid/views.py:774
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr ""
 
-#: django_authopenid/views.py:843
+#: django_authopenid/views.py:844
 msgid "Account deleted."
 msgstr ""
 
-#: django_authopenid/views.py:883
+#: django_authopenid/views.py:884
 msgid "Request for new password"
 msgstr ""
 
-#: django_authopenid/views.py:896
+#: django_authopenid/views.py:897
 msgid "A new password has been sent to your email address."
 msgstr ""
 
-#: django_authopenid/views.py:926
+#: django_authopenid/views.py:927
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
 "registered."
 msgstr ""
 
-#: django_authopenid/views.py:935
+#: django_authopenid/views.py:936
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
 msgstr ""
 
-#: django_authopenid/views.py:944
+#: django_authopenid/views.py:945
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr ""
@@ -337,12 +466,8 @@ msgstr ""
 msgid "latest questions"
 msgstr ""
 
-#: forum/feed.py:19
-msgid "questions/"
-msgstr ""
-
-#: forum/forms.py:14 templates/answer_edit_tips.html:34
-#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31
+#: forum/forms.py:14 templates/answer_edit_tips.html:33
+#: templates/answer_edit_tips.html.py:37 templates/question_edit_tips.html:31
 #: templates/question_edit_tips.html:36
 msgid "title"
 msgstr ""
@@ -363,7 +488,7 @@ msgstr ""
 msgid "question content must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:61
+#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:64
 msgid "tags"
 msgstr ""
 
@@ -390,8 +515,8 @@ msgid ""
 "characters '.-_#'"
 msgstr ""
 
-#: forum/forms.py:75 templates/index.html:57 templates/question.html:199
-#: templates/question.html.py:380 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:209
+#: templates/question.html.py:395 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
 #: templates/unanswered.html.py:60
 msgid "community wiki"
@@ -445,40 +570,44 @@ msgstr ""
 msgid "this email has already been registered, please use another one"
 msgstr ""
 
-#: forum/models.py:238
+#: forum/models.py:246
 #, python-format
 msgid "%(author)s modified the question"
 msgstr ""
 
-#: forum/models.py:242
+#: forum/models.py:250
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr ""
 
-#: forum/models.py:247
+#: forum/models.py:255
 #, python-format
 msgid "%(people)s commented the question"
 msgstr ""
 
-#: forum/models.py:252
+#: forum/models.py:260
 #, python-format
 msgid "%(people)s commented answers"
 msgstr ""
 
-#: forum/models.py:254
+#: forum/models.py:262
 #, python-format
-msgid "%(people)s commented the answer"
+msgid "%(people)s commented an answer"
 msgstr ""
 
-#: forum/models.py:433 templates/badges.html:52
+#: forum/models.py:306 forum/models.py:418
+msgid "revisions"
+msgstr ""
+
+#: forum/models.py:441 templates/badges.html:51
 msgid "gold"
 msgstr ""
 
-#: forum/models.py:434 templates/badges.html:60
+#: forum/models.py:442 templates/badges.html:59
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:435 templates/badges.html:67
+#: forum/models.py:443 templates/badges.html:66
 msgid "bronze"
 msgstr ""
 
@@ -566,31 +695,27 @@ msgstr ""
 msgid "profile - user preferences"
 msgstr ""
 
-#: forum/views.py:304
-msgid "/account/"
-msgstr ""
-
-#: forum/views.py:943
+#: forum/views.py:947
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr ""
 "Your subscription is saved, but email address %(email)s needs to be "
 "validated, please see <a href='/faq#validate'>more details here</a>"
 
-#: forum/views.py:1853
+#: forum/views.py:1860
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr ""
 
-#: forum/views.py:1855
+#: forum/views.py:1862
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1857
+#: forum/views.py:1864
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1859
+#: forum/views.py:1866
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -600,16 +725,16 @@ msgstr ""
 msgid "updates from website"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168
-#: templates/header.html:33
+#: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
+#: templates/header.html:35
 msgid "badges"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:140 forum/templatetags/extra_tags.py:167
+#: forum/templatetags/extra_tags.py:144 forum/templatetags/extra_tags.py:171
 msgid "reputation points"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:221
+#: forum/templatetags/extra_tags.py:225
 msgid " ago"
 msgstr ""
 
@@ -684,13 +809,13 @@ msgid "Edit answer"
 msgstr ""
 
 #: templates/answer_edit.html:24 templates/answer_edit.html.py:27
-#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40
-#: templates/question.html.py:43 templates/question_edit.html:27
+#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:43
+#: templates/question.html.py:46 templates/question_edit.html:27
 msgid "hide preview"
 msgstr ""
 
 #: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:43 templates/question_edit.html:27
+#: templates/question.html:46 templates/question_edit.html:27
 msgid "show preview"
 msgstr ""
 
@@ -710,22 +835,22 @@ msgid "select revision"
 msgstr ""
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:452 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "Toggle the real time Markdown editor preview"
 msgstr ""
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:452 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr ""
 
-#: templates/answer_edit.html:73 templates/question_edit.html:119
-#: templates/question_retag.html:75
+#: templates/answer_edit.html:71 templates/question_edit.html:115
+#: templates/question_retag.html:73
 msgid "Save edit"
 msgstr ""
 
-#: templates/answer_edit.html:74 templates/close.html:29
-#: templates/question_edit.html:120 templates/question_retag.html:76
+#: templates/answer_edit.html:72 templates/close.html:29
+#: templates/question_edit.html:116 templates/question_retag.html:74
 #: templates/reopen.html:30 templates/user_edit.html:83
 #: templates/authopenid/changeemail.html:34
 msgid "Cancel"
@@ -755,40 +880,40 @@ msgstr ""
 msgid "see frequently asked questions"
 msgstr ""
 
-#: templates/answer_edit_tips.html:25 templates/question_edit_tips.html:22
+#: templates/answer_edit_tips.html:24 templates/question_edit_tips.html:22
 msgid "Markdown tips"
 msgstr "Markdown basics"
 
-#: templates/answer_edit_tips.html:28 templates/question_edit_tips.html:25
+#: templates/answer_edit_tips.html:27 templates/question_edit_tips.html:25
 msgid "*italic* or __italic__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:31 templates/question_edit_tips.html:28
+#: templates/answer_edit_tips.html:30 templates/question_edit_tips.html:28
 msgid "**bold** or __bold__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:34 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html:33 templates/question_edit_tips.html:31
 msgid "link"
 msgstr ""
 
-#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:38
+#: templates/answer_edit_tips.html:33 templates/answer_edit_tips.html.py:37
 #: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36
 msgid "text"
 msgstr ""
 
-#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:37 templates/question_edit_tips.html:36
 msgid "image"
 msgstr ""
 
-#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40
+#: templates/answer_edit_tips.html:41 templates/question_edit_tips.html:40
 msgid "numbered list:"
 msgstr ""
 
-#: templates/answer_edit_tips.html:47 templates/question_edit_tips.html:45
+#: templates/answer_edit_tips.html:46 templates/question_edit_tips.html:45
 msgid "basic HTML tags are also supported"
 msgstr ""
 
-#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48
+#: templates/answer_edit_tips.html:49 templates/question_edit_tips.html:48
 msgid "learn more about Markdown"
 msgstr ""
 
@@ -816,15 +941,15 @@ msgstr ""
 "your question now and validate email after that. Your question will saved as "
 "pending meanwhile. "
 
-#: templates/ask.html:108
+#: templates/ask.html:107
 msgid "(required)"
 msgstr ""
 
-#: templates/ask.html:115
+#: templates/ask.html:114
 msgid "Login/signup to post your question"
 msgstr "Login/Signup to Post"
 
-#: templates/ask.html:117
+#: templates/ask.html:116
 msgid "Ask your question"
 msgstr "Ask Your Question"
 
@@ -840,7 +965,7 @@ msgstr ""
 msgid "Badges summary"
 msgstr ""
 
-#: templates/badges.html:17 templates/user_stats.html:113
+#: templates/badges.html:17 templates/user_stats.html:115
 msgid "Badges"
 msgstr ""
 
@@ -862,27 +987,27 @@ msgstr ""
 "a></strong> - what kinds of badges would you like to see and suggest the "
 "activity for which those badges might be awarded."
 
-#: templates/badges.html:49
+#: templates/badges.html:48
 msgid "Community badges"
 msgstr "Badge levels"
 
-#: templates/badges.html:55
+#: templates/badges.html:54
 msgid "gold badge description"
 msgstr ""
 "Gold badge is the highest award in this community. To obtain it have to show "
 "profound knowledge and ability in addition to your active participation."
 
-#: templates/badges.html:63
+#: templates/badges.html:62
 msgid "silver badge description"
 msgstr ""
 "Obtaining silver badge requires significant patience. If you have received "
 "one, that means you have greatly contributed to this community."
 
-#: templates/badges.html:66
+#: templates/badges.html:65
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: templates/badges.html:70
+#: templates/badges.html:69
 msgid "bronze badge description"
 msgstr ""
 "If you are an active participant in this community, you will be recognized "
@@ -968,11 +1093,10 @@ msgstr ""
 msgid "views"
 msgstr ""
 
-#: templates/book.html:125 templates/index.html:69 templates/question.html:115
-#: templates/question.html.py:486 templates/questions.html:84
-#: templates/questions.html.py:156 templates/tags.html:47
-#: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52
+#: templates/book.html:125 templates/index.html:69 templates/question.html:499
+#: templates/questions.html:84 templates/questions.html.py:156
+#: templates/tags.html:49 templates/unanswered.html:75
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "using tags"
 msgstr ""
 
@@ -980,7 +1104,7 @@ msgstr ""
 msgid "subscribe to book RSS feed"
 msgstr ""
 
-#: templates/book.html:147 templates/index.html:116
+#: templates/book.html:147 templates/index.html:118
 msgid "subscribe to the questions feed"
 msgstr ""
 
@@ -1036,10 +1160,6 @@ msgstr ""
 msgid "What should I avoid in my answers?"
 msgstr ""
 
-#: templates/faq.html:28 templates/faq.html.py:132
-msgid "site title"
-msgstr ""
-
 #: templates/faq.html:28
 msgid ""
 "is a Q&A site, not a discussion group. Therefore - please avoid having "
@@ -1081,61 +1201,72 @@ msgstr ""
 "rough measure of the community trust to him/her. Various moderation tasks "
 "are gradually assigned to the users based on those points."
 
-#: templates/faq.html:59 templates/user_votes.html:14
+#: templates/faq.html:42
+msgid ""
+"For example, if you ask an interesting question or give a helpful answer, "
+"your input will be upvoted. On the other hand if the answer is misleading - "
+"it will be downvoted. Each vote in favor will generate <strong>10</strong> "
+"points, each vote against will subtract <strong>2</strong> points. There is "
+"a limit of <strong>200</strong> points that can be accumulated per question "
+"or answer. The table below explains reputation point requirements for each "
+"type of moderation task."
+msgstr ""
+
+#: templates/faq.html:53 templates/user_votes.html:14
 msgid "upvote"
 msgstr ""
 
-#: templates/faq.html:63
+#: templates/faq.html:57
 msgid "use tags"
 msgstr ""
 
-#: templates/faq.html:68
+#: templates/faq.html:62
 msgid "add comments"
 msgstr ""
 
-#: templates/faq.html:72 templates/user_votes.html:16
+#: templates/faq.html:66 templates/user_votes.html:16
 msgid "downvote"
 msgstr ""
 
-#: templates/faq.html:75
+#: templates/faq.html:69
 msgid "open and close own questions"
 msgstr ""
 
-#: templates/faq.html:79
+#: templates/faq.html:73
 msgid "retag questions"
 msgstr ""
 
-#: templates/faq.html:83
+#: templates/faq.html:77
 msgid "edit community wiki questions"
 msgstr ""
 
-#: templates/faq.html:87
+#: templates/faq.html:81
 msgid "edit any answer"
 msgstr ""
 
-#: templates/faq.html:91
+#: templates/faq.html:85
 msgid "open any closed question"
 msgstr ""
 
-#: templates/faq.html:95
+#: templates/faq.html:89
 msgid "delete any comment"
 msgstr ""
 
-#: templates/faq.html:99
+#: templates/faq.html:93
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 
-#: templates/faq.html:106
+#: templates/faq.html:100
 msgid "how to validate email title"
 msgstr "How to validate email and why?"
 
-#: templates/faq.html:108
+#: templates/faq.html:102
 msgid "how to validate email info"
 msgstr ""
 "<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
 "\"bigger strong\">How?</span> If you have just set or changed your email "
-"address - <strong>check your email and click the included link</strong>."
-"<br/>The link contains a key generated specifically for you. You can also "
+"address - <strong>check your email and click the included link</strong>.<br/"
+">The link contains a key generated specifically for you. You can also "
 "<button style='display:inline' type='submit'><strong>get a new key</strong></"
 "button> and check your email again.</p></form><span class=\"bigger strong"
 "\">Why?</span> Email validation is required to make sure that <strong>only "
@@ -1145,11 +1276,11 @@ msgstr ""
 "- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
 "personal image.</p>"
 
-#: templates/faq.html:112
+#: templates/faq.html:106
 msgid "what is gravatar"
 msgstr "What is gravatar?"
 
-#: templates/faq.html:113
+#: templates/faq.html:107
 msgid "gravatar faq info"
 msgstr ""
 "<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</"
@@ -1160,54 +1291,54 @@ msgstr ""
 "your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</"
 "strong></a>"
 
-#: templates/faq.html:116
+#: templates/faq.html:110
 msgid "To register, do I need to create new password?"
 msgstr ""
 
-#: templates/faq.html:117
+#: templates/faq.html:111
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
 msgstr ""
 
-#: templates/faq.html:118
+#: templates/faq.html:112
 msgid "Login now!"
 msgstr ""
 
-#: templates/faq.html:123
+#: templates/faq.html:117
 msgid "Why other people can edit my questions/answers?"
 msgstr ""
 
-#: templates/faq.html:124
+#: templates/faq.html:118
 msgid "Goal of this site is..."
 msgstr ""
 
-#: templates/faq.html:124
+#: templates/faq.html:118
 msgid ""
 "So questions and answers can be edited like wiki pages by experienced users "
 "of this site and this improves the overall quality of the knowledge base "
 "content."
 msgstr ""
 
-#: templates/faq.html:125
+#: templates/faq.html:119
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 
-#: templates/faq.html:129
+#: templates/faq.html:123
 msgid "Still have questions?"
 msgstr ""
 
-#: templates/faq.html:130
+#: templates/faq.html:124
 msgid "Please ask your question, help make our community better!"
 msgstr ""
 "Please <a href=\"/questions/ask\">ask</a> your question, help make our "
 "community better!"
 
-#: templates/faq.html:132 templates/header.html:29 templates/header.html.py:60
+#: templates/faq.html:126 templates/header.html:29 templates/header.html.py:63
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:132 templates/index.html:121
+#: templates/faq.html:126 templates/index.html:123
 msgid "."
 msgstr ""
 
@@ -1216,6 +1347,7 @@ msgid "about"
 msgstr ""
 
 #: templates/footer.html:8 templates/header.html:15 templates/index.html:84
+#: templates/question_edit_tips.html:16
 msgid "faq"
 msgstr ""
 
@@ -1251,27 +1383,27 @@ msgstr ""
 msgid "back to home page"
 msgstr ""
 
-#: templates/header.html:31 templates/header.html.py:62
+#: templates/header.html:31 templates/header.html.py:65
 msgid "users"
 msgstr ""
 
-#: templates/header.html:32
+#: templates/header.html:33
 msgid "books"
 msgstr ""
 
-#: templates/header.html:34
+#: templates/header.html:36
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:38
+#: templates/header.html:40
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:42
+#: templates/header.html:44
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:57
+#: templates/header.html:59
 msgid "search"
 msgstr ""
 
@@ -1317,11 +1449,10 @@ msgstr ""
 msgid "answers"
 msgstr ""
 
-#: templates/index.html:69 templates/question.html:115
-#: templates/question.html.py:486 templates/questions.html:84
-#: templates/questions.html.py:156 templates/tags.html:47
-#: templates/unanswered.html:75 templates/unanswered.html.py:109
-#: templates/users_questions.html:52
+#: templates/index.html:69 templates/question.html:499
+#: templates/questions.html:84 templates/questions.html.py:156
+#: templates/tags.html:49 templates/unanswered.html:75
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr ""
 
@@ -1333,48 +1464,48 @@ msgstr ""
 msgid "Recent tags"
 msgstr ""
 
-#: templates/index.html:94
+#: templates/index.html:94 templates/question.html:125
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
-#: templates/index.html:97 templates/index.html.py:121
+#: templates/index.html:97 templates/index.html.py:123
 msgid "popular tags"
 msgstr "tags"
 
-#: templates/index.html:101
+#: templates/index.html:102
 msgid "Recent awards"
 msgstr "Recent badges"
 
-#: templates/index.html:107
+#: templates/index.html:108
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:112
+#: templates/index.html:113
 msgid "all awards"
 msgstr "all badges"
 
-#: templates/index.html:116
+#: templates/index.html:118
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "complete list of questions"
 msgstr "list of all questions"
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "or"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "Please help us answer"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "list of unanswered questions"
 msgstr "unanswered questions"
 
@@ -1460,187 +1591,189 @@ msgstr ""
 msgid "how privacy policies can be changed"
 msgstr ""
 
-#: templates/question.html:69 templates/question.html.py:81
+#: templates/question.html:72 templates/question.html.py:73
+#: templates/question.html:85 templates/question.html.py:87
 msgid "i like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:71 templates/question.html.py:83
-#: templates/question.html:276
+#: templates/question.html:75 templates/question.html.py:89
+#: templates/question.html:289
 msgid "current number of votes"
 msgstr ""
 
-#: templates/question.html:76 templates/question.html.py:87
+#: templates/question.html:80 templates/question.html.py:81
+#: templates/question.html:94 templates/question.html.py:95
 msgid "i dont like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:93
+#: templates/question.html:100 templates/question.html.py:101
 msgid "mark this question as favorite (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:99
+#: templates/question.html:107 templates/question.html.py:108
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 
-#: templates/question.html:124 templates/question.html.py:307
+#: templates/question.html:134 templates/question.html.py:322
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:128 templates/question.html.py:317
+#: templates/question.html:138 templates/question.html.py:332
 msgid "delete"
 msgstr ""
 
-#: templates/question.html:133
+#: templates/question.html:143
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:138
+#: templates/question.html:148
 msgid "close"
 msgstr ""
 
-#: templates/question.html:144 templates/question.html.py:330
+#: templates/question.html:154 templates/question.html.py:345
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 
-#: templates/question.html:145 templates/question.html.py:331
+#: templates/question.html:155 templates/question.html.py:346
 msgid "flag offensive"
 msgstr ""
 
-#: templates/question.html:157 templates/question.html.py:340
+#: templates/question.html:167 templates/question.html.py:355
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
 msgstr ""
 
-#: templates/question.html:206 templates/question.html.py:387
+#: templates/question.html:216 templates/question.html.py:402
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
 msgstr ""
 
-#: templates/question.html:236 templates/question.html.py:414
+#: templates/question.html:246 templates/question.html.py:429
 msgid "comments"
 msgstr ""
 
-#: templates/question.html:237 templates/question.html.py:415
+#: templates/question.html:247 templates/question.html.py:430
 msgid "add comment"
 msgstr ""
 
-#: templates/question.html:250
+#: templates/question.html:260
 #, python-format
 msgid ""
 "The question has been closed for the following reason \"%(question."
 "get_close_reason_display)s\" by"
 msgstr ""
 
-#: templates/question.html:252
+#: templates/question.html:262
 #, python-format
 msgid "close date %(question.closed_at)s"
 msgstr ""
 
-#: templates/question.html:259 templates/user_stats.html:28
+#: templates/question.html:269 templates/user_stats.html:28
 msgid "Answers"
 msgstr " Answers"
 
-#: templates/question.html:261
+#: templates/question.html:271
 msgid "oldest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:261
+#: templates/question.html:271
 msgid "oldest answers"
 msgstr "oldest"
 
-#: templates/question.html:262
+#: templates/question.html:272
 msgid "newest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:262
+#: templates/question.html:272
 msgid "newest answers"
 msgstr "newest"
 
-#: templates/question.html:263
+#: templates/question.html:273
 msgid "most voted answers will be shown first"
 msgstr ""
 
-#: templates/question.html:263
+#: templates/question.html:273
 msgid "popular answers"
 msgstr "most voted"
 
-#: templates/question.html:275
+#: templates/question.html:287 templates/question.html.py:288
 msgid "i like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:281
+#: templates/question.html:294 templates/question.html.py:295
 msgid "i dont like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:287
+#: templates/question.html:300 templates/question.html.py:301
 msgid "mark this answer as favorite (click again to undo)"
 msgstr ""
 
-#: templates/question.html:292
+#: templates/question.html:306 templates/question.html.py:307
 msgid "the author of the question has selected this answer as correct"
 msgstr ""
 
-#: templates/question.html:314
+#: templates/question.html:329
 msgid "undelete"
 msgstr ""
 
-#: templates/question.html:324
+#: templates/question.html:339
 msgid "answer permanent link"
 msgstr ""
 
-#: templates/question.html:325
+#: templates/question.html:340
 msgid "permanent link"
 msgstr ""
 
-#: templates/question.html:438
+#: templates/question.html:453
 msgid "Your answer"
 msgstr ""
 
-#: templates/question.html:441
+#: templates/question.html:456
 msgid "you can answer anonymously and then login"
 msgstr ""
 "<span class='strong big'>You are now not logged in</span> but you can answer "
 "first and then login"
 
-#: templates/question.html:465
+#: templates/question.html:479
 msgid "Answer the question"
 msgstr ""
 
-#: templates/question.html:467
+#: templates/question.html:481
 msgid "Notify me daily if there are any new answers."
 msgstr ""
 
-#: templates/question.html:469
+#: templates/question.html:483
 msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr "Here logged in users can sign up for the question updates."
 
-#: templates/question.html:481
+#: templates/question.html:494
 msgid "Question tags"
 msgstr "Tags"
 
-#: templates/question.html:491
+#: templates/question.html:504
 msgid "question asked"
 msgstr "Asked"
 
-#: templates/question.html:491 templates/question.html.py:497
+#: templates/question.html:504 templates/question.html.py:510
 #: templates/user_info.html:51
 msgid "ago"
 msgstr ""
 
-#: templates/question.html:494
+#: templates/question.html:507
 msgid "question was seen"
 msgstr "Seen"
 
-#: templates/question.html:494
+#: templates/question.html:507
 msgid "times"
 msgstr ""
 
-#: templates/question.html:497
+#: templates/question.html:510
 msgid "last updated"
 msgstr "Last updated"
 
-#: templates/question.html:502
+#: templates/question.html:515
 msgid "Related questions"
 msgstr ""
 
@@ -1668,15 +1801,15 @@ msgstr ""
 msgid "up to 5 tags, less than 20 characters each"
 msgstr ""
 
-#: templates/question_retag.html:86
+#: templates/question_retag.html:82
 msgid "Why use and modify tags?"
 msgstr ""
 
-#: templates/question_retag.html:89
+#: templates/question_retag.html:85
 msgid "tags help us keep Questions organized"
 msgstr ""
 
-#: templates/question_retag.html:95
+#: templates/question_retag.html:91
 msgid "tag editors receive special awards from the community"
 msgstr ""
 
@@ -1720,8 +1853,8 @@ msgstr[0] ""
 "class=\"tag\">%(tagname)s</span>"
 msgstr[1] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged "
-"<span class=\"tag\">%(tagname)s</span>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged <span "
+"class=\"tag\">%(tagname)s</span>"
 
 #: templates/questions.html:116
 #, python-format
@@ -1787,7 +1920,7 @@ msgstr ""
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:153 templates/unanswered.html:105
+#: templates/questions.html:153 templates/unanswered.html:102
 msgid "Related tags"
 msgstr "Tags"
 
@@ -1824,35 +1957,35 @@ msgstr ""
 msgid "Revision history"
 msgstr ""
 
-#: templates/tags.html:6 templates/tags.html.py:29
+#: templates/tags.html:6 templates/tags.html.py:30
 msgid "Tag list"
 msgstr ""
 
-#: templates/tags.html:31
+#: templates/tags.html:32
 msgid "sorted alphabetically"
 msgstr ""
 
-#: templates/tags.html:31
+#: templates/tags.html:32
 msgid "by name"
 msgstr ""
 
-#: templates/tags.html:32
+#: templates/tags.html:33
 msgid "sorted by frequency of tag use"
 msgstr ""
 
-#: templates/tags.html:32
+#: templates/tags.html:33
 msgid "by popularity"
 msgstr ""
 
-#: templates/tags.html:38
+#: templates/tags.html:39
 msgid "All tags matching query"
 msgstr ""
 
-#: templates/tags.html:38
+#: templates/tags.html:39
 msgid "all tags - make this empty in english"
 msgstr ""
 
-#: templates/tags.html:41
+#: templates/tags.html:42
 msgid "Nothing found"
 msgstr ""
 
@@ -1864,12 +1997,8 @@ msgstr ""
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<span class=\"questions-count\">%(num_q)s</span><br/><strong>unanswered</strong> "
-"questions"
-
-#: templates/unanswered.html:99
-msgid "Have a total of"
-msgstr ""
+"<span class=\"questions-count\">%(num_q)s</span><br/> questions with "
+"<strong>no accepted answers</strong>"
 
 #: templates/user_edit.html:6
 msgid "Edit user profile"
@@ -1939,61 +2068,61 @@ msgstr ""
 msgid "Connect with Twitter"
 msgstr ""
 
-#: templates/user_preferences.html:12
+#: templates/user_preferences.html:13
 msgid "Twitter account name:"
 msgstr ""
 
-#: templates/user_preferences.html:14
+#: templates/user_preferences.html:15
 msgid "Twitter password:"
 msgstr ""
 
-#: templates/user_preferences.html:16
+#: templates/user_preferences.html:17
 msgid "Send my Questions to Twitter"
 msgstr ""
 
-#: templates/user_preferences.html:17
+#: templates/user_preferences.html:18
 msgid "Send my Answers to Twitter"
 msgstr ""
 
-#: templates/user_preferences.html:18
+#: templates/user_preferences.html:19
 msgid "Save"
 msgstr ""
 
-#: templates/user_stats.html:15
+#: templates/user_stats.html:16
 msgid "User questions"
 msgstr ""
 
-#: templates/user_stats.html:37
+#: templates/user_stats.html:38
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:37
+#: templates/user_stats.html:38
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:43
+#: templates/user_stats.html:46
 #, python-format
-msgid "the answer has been commented %(answered_question.comment_count)s times"
-msgstr ""
+msgid "the answer has been commented %(comment_count)s times"
+msgstr "(%(comment_count)s comment(s))"
 
-#: templates/user_stats.html:56
+#: templates/user_stats.html:60
 msgid "votes total"
 msgstr "Votes"
 
-#: templates/user_stats.html:65
+#: templates/user_stats.html:69
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:70
+#: templates/user_stats.html:74
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:84
+#: templates/user_stats.html:87
 msgid "Tags"
 msgstr ""
 
-#: templates/user_stats.html:94
+#: templates/user_stats.html:97
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
@@ -2078,7 +2207,7 @@ msgstr ""
 "anyone, must be valid)"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:138
+#: templates/authopenid/signin.html:136
 msgid "Password"
 msgstr ""
 
@@ -2207,7 +2336,7 @@ msgid "This account already exists, please use another."
 msgstr ""
 
 #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/signin.html:121
+#: templates/authopenid/signin.html:120
 msgid "Sorry, looks like we have some errors:"
 msgstr ""
 
@@ -2241,7 +2370,7 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:140
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138
 msgid "Forgot your password?"
 msgstr ""
 
@@ -2432,8 +2561,9 @@ msgid "Click to sign in through any of these services."
 msgstr ""
 "<p><span class=\"big strong\">We accept <a href=\"http://openid.net"
 "\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new "
-"password - log in through any of the services below.</font></p><p><span class=\"big "
-"strong\">1. Select the login service by clicking one of the icons</span></p>"
+"password - log in through any of the services below.</font></p><p><span "
+"class=\"big strong\">1. Select the login service by clicking one of the "
+"icons</span></p>"
 
 #: templates/authopenid/signin.html:103
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
@@ -2451,7 +2581,7 @@ msgstr ""
 "\"http://openid.net\">OpenID</a> web address</span><br/>(or choose specific "
 "provider by clicking on one of the icons above)"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
 msgid "Login"
 msgstr ""
 
@@ -2461,45 +2591,45 @@ msgstr ""
 "You can log in either through one of these services or traditionally - using "
 "local username/password."
 
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:134
 msgid "Use login name and password"
 msgstr ""
 
-#: templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:135
 msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:141
+#: templates/authopenid/signin.html:139
 msgid "Create new account"
 msgstr ""
 
-#: templates/authopenid/signin.html:150
+#: templates/authopenid/signin.html:148
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:154
+#: templates/authopenid/signin.html:151
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:157
+#: templates/authopenid/signin.html:154
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:160
+#: templates/authopenid/signin.html:157
 msgid "openid is widely adopted"
 msgstr ""
 "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
 "enabled."
 
-#: templates/authopenid/signin.html:163
+#: templates/authopenid/signin.html:160
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:167
+#: templates/authopenid/signin.html:165
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:168
+#: templates/authopenid/signin.html:166
 msgid "Get OpenID"
 msgstr ""
 
@@ -2533,11 +2663,11 @@ msgstr ""
 msgid "back to login"
 msgstr ""
 
-#: templates/authopenid/signup.html:48
+#: templates/authopenid/signup.html:46
 msgid "Register with your OpenID"
 msgstr ""
 
-#: templates/authopenid/signup.html:51
+#: templates/authopenid/signup.html:49
 msgid "Login with your OpenID"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..fc7ebe14
Binary files /dev/null and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 16ccc51a..b528fcf2 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:39-0300\n"
+"POT-Creation-Date: 2009-08-12 15:53+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,7 @@ msgstr "cuenta/"
 #: settings.py:12 urls.py:26 django_authopenid/urls.py:9
 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11
 #: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699
+#: templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -57,7 +58,7 @@ msgstr "códigodeprivacidad/"
 msgid "logout/"
 msgstr "cerrarsesion/"
 
-#: urls.py:34 urls.py:35 urls.py:36 urls.py:48
+#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
 msgid "answers/"
 msgstr "respuestas/"
 
@@ -75,7 +76,7 @@ msgstr "revisiones/"
 
 #: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
 #: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
-#: forum/views.py:1416
+#: forum/models.py:306 forum/views.py:1416
 msgid "questions/"
 msgstr "preguntas/"
 
@@ -268,9 +269,8 @@ msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
 #: django_authopenid/urls.py:27
-#, fuzzy
 msgid "validate/"
-msgstr "Cambiar dirección email"
+msgstr ""
 
 #: django_authopenid/views.py:108
 #, python-format
@@ -383,9 +383,6 @@ msgid "question"
 msgstr "pregunta"
 
 #: forum/const.py:57 templates/book.html:110
-#: templates/book.html.BASE.30295.html:110
-#: templates/book.html.LOCAL.30295.html:110
-#: templates/book.html.REMOTE.30295.html:110
 msgid "answer"
 msgstr "respuesta"
 
@@ -495,7 +492,7 @@ msgstr "contenido"
 msgid "question content must be > 10 characters"
 msgstr "el contenido de la pregunta debe ser al menos de 10 caracteres"
 
-#: forum/forms.py:45 templates/header.html:34 templates/header.html.py:63
+#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:64
 msgid "tags"
 msgstr "etiquetas"
 
@@ -530,7 +527,6 @@ msgstr ""
 #: templates/question.html.py:395 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
 #: templates/unanswered.html.py:60
-#, fuzzy
 msgid "community wiki"
 msgstr "wiki de comunidad"
 
@@ -587,9 +583,8 @@ msgid "this email has already been registered, please use another one"
 msgstr "este email ya ha sido registrado, por favor use otro"
 
 #: forum/models.py:246
-#, fuzzy, python-format
 msgid "%(author)s modified the question"
-msgstr "%(author) modificó la pregunta"
+msgstr "%(author)s modificó la pregunta"
 
 #: forum/models.py:250
 #, python-format
@@ -607,10 +602,14 @@ msgid "%(people)s commented answers"
 msgstr "%(people)s comentaron la respuesta"
 
 #: forum/models.py:262
-#, fuzzy, python-format
+#, python-format
 msgid "%(people)s commented an answer"
 msgstr "%(people)s comentaron la respuesta"
 
+#: forum/models.py:306 forum/models.py:418
+msgid "revisions"
+msgstr "revisiones/"
+
 #: forum/models.py:441 templates/badges.html:51
 msgid "gold"
 msgstr "oro"
@@ -739,7 +738,7 @@ msgid "updates from website"
 msgstr "actualizaciones del sitio"
 
 #: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
-#: templates/header.html:37
+#: templates/header.html:35
 msgid "badges"
 msgstr "distinciones"
 
@@ -893,7 +892,6 @@ msgid "be clear and concise"
 msgstr "ser claro y conciso"
 
 #: templates/answer_edit_tips.html:19 templates/question_edit_tips.html:16
-#, fuzzy
 msgid "see frequently asked questions"
 msgstr "ver preguntas frecuentes"
 
@@ -982,7 +980,7 @@ msgstr "Usuarios han sido galardonados con distinciones:"
 msgid "Badges summary"
 msgstr "Resumen de distinciones"
 
-#: templates/badges.html:17 templates/user_stats.html:114
+#: templates/badges.html:17 templates/user_stats.html:115
 msgid "Badges"
 msgstr "Distinciones"
 
@@ -1026,152 +1024,98 @@ msgstr ""
 "Si eres un usuario activo de esta comunidad, recibirás esta distinción - de "
 "todas maneras es un honor especial."
 
-#: templates/book.html:7 templates/book.html.BASE.30295.html:7
-#: templates/book.html.LOCAL.30295.html:7
-#: templates/book.html.REMOTE.30295.html:7
+#: templates/book.html:7
 msgid "reading channel"
 msgstr "canal de lectura"
 
-#: templates/book.html:26 templates/book.html.BASE.30295.html:26
-#: templates/book.html.LOCAL.30295.html:26
-#: templates/book.html.REMOTE.30295.html:26
+#: templates/book.html:26
 msgid "[author]"
 msgstr "[autor]"
 
-#: templates/book.html:30 templates/book.html.BASE.30295.html:30
-#: templates/book.html.LOCAL.30295.html:30
-#: templates/book.html.REMOTE.30295.html:30
+#: templates/book.html:30
 msgid "[publisher]"
 msgstr "[editorial]"
 
-#: templates/book.html:34 templates/book.html.BASE.30295.html:34
-#: templates/book.html.LOCAL.30295.html:34
-#: templates/book.html.REMOTE.30295.html:34
+#: templates/book.html:34
 msgid "[publication date]"
 msgstr "[fecha de publicación]"
 
-#: templates/book.html:38 templates/book.html.BASE.30295.html:38
-#: templates/book.html.LOCAL.30295.html:38
-#: templates/book.html.REMOTE.30295.html:38
+#: templates/book.html:38
 msgid "[price]"
 msgstr "[precio]"
 
-#: templates/book.html:39 templates/book.html.BASE.30295.html:39
-#: templates/book.html.LOCAL.30295.html:39
-#: templates/book.html.REMOTE.30295.html:39
+#: templates/book.html:39
 msgid "currency unit"
 msgstr "unidad de moneda"
 
-#: templates/book.html:42 templates/book.html.BASE.30295.html:42
-#: templates/book.html.LOCAL.30295.html:42
-#: templates/book.html.REMOTE.30295.html:42
+#: templates/book.html:42
 msgid "[pages]"
 msgstr "[páginas]"
 
-#: templates/book.html:43 templates/book.html.BASE.30295.html:43
-#: templates/book.html.LOCAL.30295.html:43
-#: templates/book.html.REMOTE.30295.html:43
+#: templates/book.html:43
 msgid "pages abbreviation"
 msgstr "abreviación de páginas"
 
-#: templates/book.html:46 templates/book.html.BASE.30295.html:46
-#: templates/book.html.LOCAL.30295.html:46
-#: templates/book.html.REMOTE.30295.html:46
+#: templates/book.html:46
 msgid "[tags]"
 msgstr "[etiquetas]"
 
-#: templates/book.html:56 templates/book.html.BASE.30295.html:56
-#: templates/book.html.LOCAL.30295.html:56
-#: templates/book.html.REMOTE.30295.html:56
+#: templates/book.html:56
 msgid "author blog"
 msgstr "blog del autor"
 
-#: templates/book.html:62 templates/book.html.BASE.30295.html:62
-#: templates/book.html.LOCAL.30295.html:62
-#: templates/book.html.REMOTE.30295.html:62
+#: templates/book.html:62
 msgid "book directory"
 msgstr "directorio del libro"
 
-#: templates/book.html:66 templates/book.html.BASE.30295.html:66
-#: templates/book.html.LOCAL.30295.html:66
-#: templates/book.html.REMOTE.30295.html:66
+#: templates/book.html:66
 msgid "buy online"
 msgstr "comprar en-linea"
 
-#: templates/book.html:79 templates/book.html.BASE.30295.html:79
-#: templates/book.html.LOCAL.30295.html:79
-#: templates/book.html.REMOTE.30295.html:79
+#: templates/book.html:79
 msgid "reader questions"
 msgstr "pregunta de lector"
 
-#: templates/book.html:82 templates/book.html.BASE.30295.html:82
-#: templates/book.html.LOCAL.30295.html:82
-#: templates/book.html.REMOTE.30295.html:82
+#: templates/book.html:82
 msgid "ask the author"
 msgstr "preguntar al autor"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/book.html.BASE.30295.html:88
-#: templates/book.html.BASE.30295.html:93
-#: templates/book.html.LOCAL.30295.html:88
-#: templates/book.html.LOCAL.30295.html:93
-#: templates/book.html.REMOTE.30295.html:88
-#: templates/book.html.REMOTE.30295.html:93 templates/users_questions.html:17
+#: templates/users_questions.html:17
 msgid "this question was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/book.html.BASE.30295.html:88
-#: templates/book.html.BASE.30295.html:93
-#: templates/book.html.LOCAL.30295.html:88
-#: templates/book.html.LOCAL.30295.html:93
-#: templates/book.html.REMOTE.30295.html:88
-#: templates/book.html.REMOTE.30295.html:93 templates/users_questions.html:11
-#: templates/users_questions.html.py:17
+#: templates/users_questions.html:11 templates/users_questions.html.py:17
 msgid "number of times"
 msgstr "numero de veces"
 
-#: templates/book.html:105 templates/book.html.BASE.30295.html:105
-#: templates/book.html.LOCAL.30295.html:105
-#: templates/book.html.REMOTE.30295.html:105 templates/index.html:48
-#: templates/questions.html:46 templates/unanswered.html:37
-#: templates/users_questions.html:30
+#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
+#: templates/unanswered.html:37 templates/users_questions.html:30
 msgid "votes"
 msgstr "votos"
 
-#: templates/book.html:108 templates/book.html.BASE.30295.html:108
-#: templates/book.html.LOCAL.30295.html:108
-#: templates/book.html.REMOTE.30295.html:108
+#: templates/book.html:108
 msgid "the answer has been accepted to be correct"
 msgstr "la respuesta ha sido aceptada como correcta"
 
-#: templates/book.html:115 templates/book.html.BASE.30295.html:115
-#: templates/book.html.LOCAL.30295.html:115
-#: templates/book.html.REMOTE.30295.html:115 templates/index.html:49
-#: templates/questions.html:47 templates/unanswered.html:38
-#: templates/users_questions.html:40
+#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
+#: templates/unanswered.html:38 templates/users_questions.html:40
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/book.html.BASE.30295.html:125
-#: templates/book.html.LOCAL.30295.html:125
-#: templates/book.html.REMOTE.30295.html:125 templates/index.html:69
-#: templates/question.html:125 templates/question.html.py:499
+#: templates/book.html:125 templates/index.html:69 templates/question.html:499
 #: templates/questions.html:84 templates/questions.html.py:156
 #: templates/tags.html:49 templates/unanswered.html:75
 #: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "using tags"
 msgstr "usando etiquetas"
 
-#: templates/book.html:147 templates/book.html.BASE.30295.html:147
-#: templates/book.html.LOCAL.30295.html:147
-#: templates/book.html.REMOTE.30295.html:147
+#: templates/book.html:147
 msgid "subscribe to book RSS feed"
 msgstr "suscribirse al RSS del libro"
 
-#: templates/book.html:147 templates/book.html.BASE.30295.html:147
-#: templates/book.html.LOCAL.30295.html:147
-#: templates/book.html.REMOTE.30295.html:147 templates/index.html:118
+#: templates/book.html:147 templates/index.html:118
 msgid "subscribe to the questions feed"
 msgstr "suscribirse al agregado de noticias"
 
@@ -1231,10 +1175,6 @@ msgstr ""
 msgid "What should I avoid in my answers?"
 msgstr "¿Que debo evitar en mis respuestas?"
 
-#: templates/faq.html:28 templates/faq.html.py:126
-msgid "site title"
-msgstr "Preguntalo.com.uy"
-
 #: templates/faq.html:28
 msgid ""
 "is a Q&A site, not a discussion group. Therefore - please avoid having "
@@ -1427,7 +1367,7 @@ msgstr "¿Aún tienes preguntas?"
 msgid "Please ask your question, help make our community better!"
 msgstr "Por favor haz tu pregunta, ¡ayudanos a mejorar nuestra comunidad!"
 
-#: templates/faq.html:126 templates/header.html:33 templates/header.html.py:62
+#: templates/faq.html:126 templates/header.html:29 templates/header.html.py:63
 msgid "questions"
 msgstr "preguntas"
 
@@ -1476,29 +1416,27 @@ msgstr "entrar"
 msgid "back to home page"
 msgstr "volver página principal"
 
-#: templates/header.html:30
-msgid "ask a question"
-msgstr "hacer una pregunta"
-
-#: templates/header.html:35 templates/header.html.py:64
+#: templates/header.html:31 templates/header.html.py:65
 msgid "users"
 msgstr "usuarios"
 
-#: templates/header.html:36
-#, fuzzy
+#: templates/header.html:33
 msgid "books"
 msgstr "libros"
 
-#: templates/header.html:38
+#: templates/header.html:36
 msgid "unanswered questions"
 msgstr "sin respuesta"
 
-#: templates/header.html:42
+#: templates/header.html:40
 msgid "my profile"
 msgstr "mi perfil"
 
-#: templates/header.html:58
-#, fuzzy
+#: templates/header.html:44
+msgid "ask a question"
+msgstr "hacer una pregunta"
+
+#: templates/header.html:59
 msgid "search"
 msgstr "buscar"
 
@@ -1511,7 +1449,6 @@ msgid "Questions"
 msgstr "Preguntas"
 
 #: templates/index.html:24
-#, fuzzy
 msgid "last updated questions"
 msgstr "ultimas preguntas actualizadas"
 
@@ -1545,11 +1482,10 @@ msgstr "todas las preguntas"
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:69 templates/question.html:125
-#: templates/question.html.py:499 templates/questions.html:84
-#: templates/questions.html.py:156 templates/tags.html:49
-#: templates/unanswered.html:75 templates/unanswered.html.py:106
-#: templates/users_questions.html:52
+#: templates/index.html:69 templates/question.html:499
+#: templates/questions.html:84 templates/questions.html.py:156
+#: templates/tags.html:49 templates/unanswered.html:75
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
@@ -1561,7 +1497,7 @@ msgstr "bienvenido a sitio"
 msgid "Recent tags"
 msgstr "Etiquetas recientes"
 
-#: templates/index.html:94
+#: templates/index.html:94 templates/question.html:125
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr "ver preguntas etiquetadas '%(tagname)s'"
@@ -1595,7 +1531,6 @@ msgid "complete list of questions"
 msgstr "lista completa de preguntas"
 
 #: templates/index.html:123
-#, fuzzy
 msgid "or"
 msgstr "ó"
 
@@ -1648,7 +1583,6 @@ msgid "next page"
 msgstr "próxima página"
 
 #: templates/privacy.html:6 templates/privacy.html.py:11
-#, fuzzy
 msgid "Privacy policy"
 msgstr "Privacidad"
 
@@ -1657,7 +1591,6 @@ msgid "general message about privacy"
 msgstr "mensaje de privacidad"
 
 #: templates/privacy.html:18
-#, fuzzy
 msgid "Site Visitors"
 msgstr "Visitantes del Sitio"
 
@@ -1777,7 +1710,7 @@ msgstr ""
 msgid "close date %(question.closed_at)s"
 msgstr "fecha de cerrada %(question.closed_at)s"
 
-#: templates/question.html:269 templates/user_stats.html:29
+#: templates/question.html:269 templates/user_stats.html:28
 msgid "Answers"
 msgstr "Respuestas"
 
@@ -1856,7 +1789,6 @@ msgstr ""
 "actualizaciones aquí."
 
 #: templates/question.html:494
-#, fuzzy
 msgid "Question tags"
 msgstr "Tags de la pregunta"
 
@@ -1866,7 +1798,6 @@ msgstr "pregunta preguntada"
 
 #: templates/question.html:504 templates/question.html.py:510
 #: templates/user_info.html:51
-#, fuzzy
 msgid "ago"
 msgstr " atras"
 
@@ -1967,7 +1898,7 @@ msgstr[1] ""
 "\t\t\t"
 
 #: templates/questions.html:116
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
@@ -2061,7 +1992,6 @@ msgstr "Re-abrir esta pregunta"
 
 #: templates/revisions_answer.html:7 templates/revisions_answer.html.py:36
 #: templates/revisions_question.html:8 templates/revisions_question.html:36
-#, fuzzy
 msgid "Revision history"
 msgstr "Historial de revisiones"
 
@@ -2109,7 +2039,6 @@ msgstr ""
 "respuesta</strong> "
 
 #: templates/user_edit.html:6
-#, fuzzy
 msgid "Edit user profile"
 msgstr "Editar perfil de usuario"
 
@@ -2134,7 +2063,6 @@ msgid "Update"
 msgstr "Actualización"
 
 #: templates/user_info.html:34
-#, fuzzy
 msgid "update profile"
 msgstr "actualizar perfil de usuario"
 
@@ -2211,35 +2139,33 @@ msgstr "la respuesta ha sido votada %(vote_count)s veces"
 msgid "this answer has been selected as correct"
 msgstr "esta respuesta ha sido seleccionada como correcta"
 
-#: templates/user_stats.html:44
-#, fuzzy, python-format
+#: templates/user_stats.html:46
+#, python-format
 msgid "the answer has been commented %(comment_count)s times"
-msgstr ""
-"la respuesta ha sido comentada %(answered_question.comment_count)s veces"
+msgstr "la respuesta ha sido comentada %(comment_count)s veces"
 
-#: templates/user_stats.html:57
+#: templates/user_stats.html:60
 msgid "votes total"
 msgstr "votos totales"
 
-#: templates/user_stats.html:66
+#: templates/user_stats.html:69
 msgid "user has voted up this many times"
 msgstr "el usuario ha votado positivo esta cantidad de veces"
 
-#: templates/user_stats.html:71
+#: templates/user_stats.html:74
 msgid "user voted down this many times"
 msgstr "el usuario voto negativo esta cantidad de veces"
 
-#: templates/user_stats.html:85
+#: templates/user_stats.html:87
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/user_stats.html:95
+#: templates/user_stats.html:97
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr "ver otras preguntas etiqueteadas '%(tag)s'"
 
 #: templates/user_tabs.html:7
-#, fuzzy
 msgid "User profile"
 msgstr "Perfil de usuario"
 
@@ -2252,7 +2178,6 @@ msgid "reputation history"
 msgstr "historial de reputación"
 
 #: templates/user_tabs.html:24
-#, fuzzy
 msgid "favorites"
 msgstr "favoritos"
 
@@ -2299,9 +2224,9 @@ msgid "Change email"
 msgstr "Cambiar dirección email"
 
 #: templates/authopenid/changeemail.html:10
-#, fuzzy, python-format
+#, python-format
 msgid "change %(email)s info"
-msgstr "Cambiar información del correo electrónico "
+msgstr "Cambiar información del correo electrónico %(email)s"
 
 #: templates/authopenid/changeemail.html:13
 #: templates/authopenid/changeopenid.html:14
@@ -2459,6 +2384,36 @@ msgstr "Registrarse"
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
+#: templates/authopenid/confirm_email.txt:2
+msgid "Thank you for registering at our Q&A forum!"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:4
+msgid "Your account details are:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:6
+#: templates/authopenid/sendpw_email.txt:7
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: templates/authopenid/confirm_email.txt:7
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr "Contraseña"
+
+#: templates/authopenid/confirm_email.txt:9
+msgid "Please sign in here:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:12
+#: templates/authopenid/email_validation.txt:14
+#: templates/authopenid/sendpw_email.txt:13
+msgid ""
+"Sincerely,\n"
+"Forum Administrator"
+msgstr ""
+
 #: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr "Cuenta: borrar cuenta"
@@ -2475,10 +2430,6 @@ msgstr ""
 msgid "Check confirm box, if you want delete your account."
 msgstr "Marca caja de confirmación, si deseas borrar tu cuenta."
 
-#: templates/authopenid/delete.html:20
-msgid "Password:"
-msgstr "Contraseña"
-
 #: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr "Estoy seguro que quiero borrar mi cuenta."
@@ -2495,6 +2446,25 @@ msgstr "(requerido por tu seguridad)"
 msgid "Delete account permanently"
 msgstr "Borrar la cuenta de forma permanente"
 
+#: templates/authopenid/email_validation.txt:2
+msgid "Greetings from the Q&A forum"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:4
+msgid "To make use of the Forum, please follow the link below:"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:8
+msgid "Following the link above will help us verify your email address."
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:10
+msgid ""
+"If you beleive that this message was sent in mistake - \n"
+"no further action is needed. Just ingore this email, we apologize\n"
+"for any inconvenience"
+msgstr ""
+
 #: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr "Enviar nueva contraseña"
@@ -2531,6 +2501,26 @@ msgstr ""
 "Nota: tu nueva contraseña solo será activada luego de que hagas click en el "
 "link de activación en el email enviado."
 
+#: templates/authopenid/sendpw_email.txt:2
+#, python-format
+msgid ""
+"Someone has requested to reset your password on %(site_url)s.\n"
+"If it were not you, it is safe to ignore this email."
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:5
+msgid "Your new account details are:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:8
+#, fuzzy
+msgid "New password:"
+msgstr "Nueva contraseña:"
+
+#: templates/authopenid/sendpw_email.txt:10
+msgid "To confirm that you wanted to reset your password please visit:"
+msgstr ""
+
 #: templates/authopenid/settings.html:30
 msgid "Give your  account a new password."
 msgstr "Crea una nueva contraseña para tu cuenta."
@@ -2692,6 +2682,9 @@ msgstr "Registrate con tu OpenID"
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
+#~ msgid "site title"
+#~ msgstr "Preguntalo.com.uy"
+
 #~ msgid "Have a total of"
 #~ msgstr "Hay un total de"
 
diff --git a/settings_local.py.dist b/settings_local.py.dist
index d6273070..48d7b567 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -44,4 +44,4 @@ EMAIL_UNIQUE = False
 APP_URL = 'http://server.com' #used by email notif system and RSS
 GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
 GOOGLE_ANALYTICS_KEY = ''
-
+BOOKS_ON = True 
diff --git a/templates/404.html b/templates/404.html
index bfb86e7d..2fa38f99 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -27,7 +27,7 @@
         <ul>
             <li>{% trans "this question or answer has been deleted;" %}</li>
             <li>{% trans "url has error - please check it;" %}</li>
-            <li>{% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} <a href="{% url faq %}"> faq</a>；</li>
+            <li>{% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} <a href="{% url faq %}"> faq</a>;</li>
             <li>{% trans "if you believe this error 404 should not have occured, please" %} 
 				<a href="{{feedback_site_url}}" target="_blank">{% trans "report this problem" %}</a></li>
             </u>
@@ -38,9 +38,9 @@
         </script>
         <script type="text/javascript" src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
         <ul>
-            <li><a href="#" id="linkPrevious">{% trans "back to previous page" %} » </li>
-            <li><a href="{% url questions %}">{% trans "see all questions" %} » </a></li>
-            <li><a href="{% url tags %}">{% trans "see all tags" %} » </a></li>
+            <li><a href="#" id="linkPrevious">{% trans "back to previous page" %} »</li>
+            <li><a href="{% url questions %}">{% trans "see all questions" %} »</a></li>
+            <li><a href="{% url tags %}">{% trans "see all tags" %} »</a></li>
         </u>
     </div>
 
diff --git a/templates/about.html b/templates/about.html
index 9a3e2101..eaf0d591 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -12,13 +12,10 @@
 </div>
 
 <div class="content">
-	<p>Preguntalo.com.uy es una herramienta social para hacer preguntas y recibir respuestas
-	de forma colectiva, incentivando a quienes aporten contenidos relevantes mediante un 
-	sistema de reputación.</p>
-	<p>Si haces una pregunta ques es votada por los usuarios como útil, recibiras
-	puntos de reputación, también si respondes una pregunta, y más puntos aún si tu respuesta
-	es aceptada como la correcta!</p>
-	<p>Si tenés alguna duda, no dudes en preguntalo! :)</p>
+	<p>edit file templates/about.html. Below are just suggestions of what can go here</p>
+	<p>what is your site for?</p>
+	<p>how does it work? what are roles of members?</p>
+	<p>is there a place to find out more about this website?</p>
 </div>
 {% endblock %}
 <!-- end template about.html -->
diff --git a/templates/content/images/logo.png b/templates/content/images/logo.png
index b5501337..640eb1da 100644
Binary files a/templates/content/images/logo.png and b/templates/content/images/logo.png differ
diff --git a/templates/content/images/originals/logo.svg b/templates/content/images/originals/logo.svg
deleted file mode 100644
index 29c53f60..00000000
--- a/templates/content/images/originals/logo.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="60"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/logo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2390"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="130.73959"
-     inkscape:cy="39.353001"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="732"
-     inkscape:window-x="0"
-     inkscape:window-y="24" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-154.28572,-485.2193)">
-    <text
-       xml:space="preserve"
-       style="font-size:35.70877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed"
-       x="154.2048"
-       y="532.07758"
-       id="text2396"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/text2424.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2398"
-         x="154.2048"
-         y="532.07758">Preguntalo</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12.09910297px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed"
-       x="303.99615"
-       y="542.42242"
-       id="text2400"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/text2424.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2402"
-         x="303.99615"
-         y="542.42242"
-         style="font-size:12.09910297px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed">.com.uy</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10.5875988px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed"
-       x="157.2961"
-       y="502.24216"
-       id="text2424"
-       inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/text2424.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan2426"
-         x="157.2961"
-         y="502.24216">Si no lo sabes ¿?#*!...</tspan></text>
-  </g>
-</svg>
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 1f992b7b..6d48198b 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -110,7 +110,7 @@ blockquote
 	margin-bottom:-3px;
 }
 #navBar {float:clear;position:relative;display:block;width:960px;}
-#navBar .nav {margin:50px 0px 0px 16px;
+#navBar .nav {margin:20px 0px 0px 16px;
 	/*letter-spacing:1px; */
 	}
 #navBar .nav a {color:#333333; background-color:#F9F7ED; 
@@ -118,14 +118,13 @@ blockquote
                 border-bottom: none;
 				padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:14px; font-weight:400; text-decoration:none;display: block;float: left;}
 #navBar .nav a:hover {text-decoration:underline}
-#navBar .nav a.on {height:24px;line-height:28px;border:1px solid green; background:green; color:#FFF; font-weight:600; text-decoration:none}
-#navBar .nav a.special {font-size:15px; color:green; font-weight:bold; text-decoration:none; border:solid 1px;}
+#navBar .nav a.on {height:24px;line-height:28px;border:1px solid #d64000; background:#B02B2C; color:#FFF; font-weight:600; text-decoration:none}
+#navBar .nav a.special {font-size:15px; color:#B02B2C; font-weight:bold; text-decoration:none; }
 #navBar .nav a.special:hover {text-decoration:underline;}
-#navBar .nav div.focus {position: absolute; top:10px;
- padding-right:0px;}
+#navBar .nav div.focus {float:right; padding-right:0px;}
 /*搜索栏*/
 #searchBar {
-    background-color:green;/*#e9b96e;*/
+    background-color:#9db2b1;/*#e9b96e;*/
     padding:5px 0 0 0;} /* #B02B2C */
 #searchBar .content { }
 #searchBar .searchInput {font-size:13px; height:18px; width:400px;}
@@ -746,7 +745,7 @@ background-color: #97ff97;
 }
 
 /*用户资料页面*/
-.count {font-family:Arial;font-size:200%;font-weight:700;color:#777}
+.count {font-family:Arial;font-size:24px;font-weight:700;color:#777}
 .scoreNumber{font-family:Arial;font-size:35px;font-weight:800;color:#777;line-height:40px;
 	/*letter-spacing:0px*/
 	}
diff --git a/templates/faq.html b/templates/faq.html
index ffbc2ed7..aec37a56 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -25,7 +25,7 @@
     
         <div>
             <h3 class="subtitle">{% trans "What should I avoid in my answers?" %}</h3>
-            <p>{% trans "site title" %} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %}</p>
+            <p>{{ settings.APP_TITLE }} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %}</p>
         </div>
     
         <div>
@@ -123,7 +123,7 @@
             <h3 class="subtitle">{% trans "Still have questions?" %}</h3>
             <p>{% trans "Please ask your question, help make our community better!" %} 
             <!--
-            <a href="{% url tags %}faq" class="big">{% trans "site title" %} {% trans "questions" %}</a>{% trans "." %}
+            <a href="{% url tags %}faq" class="big">{{ settings.APP_TITLE }} {% trans "questions" %}</a>{% trans "." %}
             -->
             </p>
         </div>
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" />
diff --git a/templates/index.html b/templates/index.html
index b358c384..104b24d0 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -21,9 +21,9 @@
 <div class="tabBar">
     <div class="headQuestions">{% trans "Questions" %}</div>
     <div class="tabsA">
-    	 <a id="latest" href="?sort=latest" title="{% trans "last updated questions" %}" >{% trans "newest" %}</a>
-        <a id="hottest" href="?sort=hottest" title="{% trans "hottest questions" %}" >{% trans "hottest" %}</a>
-        <a id="mostvoted" href="?sort=mostvoted" title="{% trans "most voted questions" %}" >{% trans "most voted" %}</a>
+    	 <a id="latest" href="{% url questions %}?sort=latest" title="{% trans "last updated questions" %}" >{% trans "newest" %}</a>
+        <a id="hottest" href="{% url questions %}?sort=hottest" title="{% trans "hottest questions" %}" >{% trans "hottest" %}</a>
+        <a id="mostvoted" href="{% url questions %}?sort=mostvoted" title="{% trans "most voted questions" %}" >{% trans "most voted" %}</a>
         <a id="all" href="{% url questions %}" title="{% trans "all questions" %}" >{% trans "all questions" %}</a>
     </div>
 </div>
@@ -93,7 +93,7 @@
             <a rel="tag" 
 				title="{% blocktrans with tag.name as tagname %}see questions tagged '{{tagname}}'{% endblocktrans %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
         {% endfor %}
-        </p>
+        </div>
         <div class="more"><a href="{% url tags %}">{% trans "popular tags" %} »</a> </div>
     </div>
 </div>
diff --git a/templates/question.html b/templates/question.html
index 0e1b8cb2..13d283ed 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -122,7 +122,7 @@
                             <div id="question-tags" class="tags" >
                                 {% for tag in question.tagname_list %}
                                     <a href="{% url forum.views.tag tag|urlencode %}" class="post-tag" 
-										title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>
+										title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
                                 {% endfor %}
                             </div>
                             <div id="question-controls" style="clear:both;">
diff --git a/templates/user_stats.html b/templates/user_stats.html
index 7313fac3..07578cb7 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -7,85 +7,51 @@
 		{% block usercontent %}
 	
         <a name="questions"></a>
-        <table>
-            <tr>
-                <td>
-                    <div style="text-align: right;" class="count">{{questions|length}}</div>
-                </td>
-                <td>
-                    <h2>{% trans "User questions" %}</h2>
-                </td>
-            </tr>
-        </table>
+        <h2><span class="count">{{questions|length}}</span> {% trans "User questions" %}</h2>
 		{% include "users_questions.html" %}
-        <p>&nbsp;</p>
         <a name="answers"></a>
-        <table>
-            <tr>
-                <td>
-                    <div style="text-align: right;" class="count">{{answered_questions|length}}</div>
-                </td>
-                <td >
-                    <h2>{% trans "Answers" %}</h2>
-                </td>
-            </tr>
-        </table>
+        <h2><span class="count">{{answered_questions|length}}</span> {% trans "Answers" %}</h2>
         <div class="user-stats-table">
             {% for answered_question in answered_questions %}
             <div class="answer-summary">
-                <a title="{{answered_question.summary}}" href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
-                    <div class="answer-votes {% if answered_question.accepted %}answered-accepted{% endif %}" 
-						title="{% blocktrans with answered_question.vote_count as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %}&#13;{% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
+                <a title="{{answered_question.summary|collapse}}" 
+                    href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
+                    <span class="answer-votes {% if answered_question.accepted %}answered-accepted{% endif %}" 
+						title="{% blocktrans with answered_question.vote_count as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %} {% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
                         {{ answered_question.vote_count }}
-                    </div>
+                    </span>
                 </a>
                 <div class="answer-link">
-                    <a href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> {% if answered_question.comment_count %}<span 
-					title="{% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %}
+                    <a href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> 
+                    {% if answered_question.comment_count %}
+                    <span>
+				    {% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %}
+                    </span> 
+                    {% endif %}
                 </div>
             </div>
             {% endfor %}
         </div>
-        <p>&nbsp;</p>
         <a name="votes"></a>
-        <table>
-            <tr>
-                <td>
-                    <div style="text-align: right;" class="count">{{total_votes}}</div>
-                </td>
-                <td >
-                    <h2>{% trans "votes total" %}</h2>                    
-                </td>
-            </tr>
-        </table>
+        <h2><span class="count">{{total_votes}}</span> {% trans "Votes" %}</h2>
         <div class="user-stats-table">
-            <table height="50px">
+            <table>
                 <tr>
                     <td width="60">
-                        <img style="cursor: default;" align="absmiddle" src="/content/images/vote-arrow-up-on.png"/>
+                        <img style="cursor: default;" src="/content/images/vote-arrow-up-on.png" alt="{% trans "thumb up" %}" />
                             <span title="{% trans "user has voted up this many times" %}" class="vote-count">{{up_votes}}</span>
 
                     </td>
                     <td width="60">
-                        <img style="cursor: default;" align="absmiddle" src="/content/images/vote-arrow-down-on.png"/>
+                        <img style="cursor: default;" src="/content/images/vote-arrow-down-on.png" alt="{% trans "thumb down" %}" />
                             <span title="{% trans "user voted down this many times" %}" class="vote-count">{{down_votes}}</span>
 
                     </td>
                 </tr>
             </table>
         </div>
-        <p>&nbsp;</p>
         <a name="tags"></a>
-        <table>
-            <tr>
-                <td>
-                    <div style="text-align: right;" class="count">{{tags|length}}</div>
-                </td>
-                <td >
-                    <h2>{% trans "Tags" %}</h2>
-                </td>
-            </tr>
-        </table>
+        <h2><span class="count">{{tags|length}}</span> {% trans "Tags" %}</h2>
         <div class="user-stats-table">
             <table class="tags">
                 <tr>
@@ -103,24 +69,14 @@
                 </tr>
             </table>
         </div>
-        <p>&nbsp;</p>
         <a name="badges"></a>
-        <table>
-            <tr>
-                <td>
-                    <div style="text-align: right;" class="count">{{total_awards}}</div>
-                </td>
-                <td >
-                    <h2>{% trans "Badges" %}</h2>
-                </td>
-            </tr>
-        </table>
+        <h2><span class="count">{{total_awards}}</span> {% trans "Badges" %}</h2>
         <div class="user-stats-table">
             <table>
                 <tr>
                     <td width="180" style="line-height:35px">
                         {% for award in awards %}
-                            <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> × {{ award.count|intcomma }}</span><br/>
+                            <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> &#x2715; {{ award.count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"6" %}
                                 </td>
                                 <td width="180" style="line-height:35px">
diff --git a/templates/user_tabs.html b/templates/user_tabs.html
index 96cc5aca..cb7e1d2f 100644
--- a/templates/user_tabs.html
+++ b/templates/user_tabs.html
@@ -20,7 +20,7 @@
 			title="{% trans "user vote record" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=votes">{% trans "casted votes" %}</a>
         {% endif %}
         <a id="favorites" {% ifequal tab_name "favorites" %}class="on"{% endifequal %} 
-			title="{% trans "questions that user selected as his/her favorite" 
+			title="{% trans "questions that user selected as his/her favorite" %}"
 			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
         {% if request.user|can_view_user_preferences:view_user %}
         <a id="preferences" {% ifequal tab_name "preferences" %}class="on"{% endifequal %} 
diff --git a/templates/users_questions.html b/templates/users_questions.html
index dd818ddb..9907885e 100644
--- a/templates/users_questions.html
+++ b/templates/users_questions.html
@@ -9,13 +9,15 @@
             {% if question.favorited_myself %}
                 <div class="favorites-count">
                     <img title="{% trans "this questions was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" 
-						src="/content/images/vote-favorite-on.png">
+                        alt="{% trans "thumb-up on" %}"
+						src="/content/images/vote-favorite-on.png"/>
                     <div><b>{{question.favourite_count|intcomma}}</b></div>
                 </div>
             {% else %}
                 <div class="favorites-count-off">
                     <img title="{% trans "this question was selected as favorite" %}{{question.favourite_count}} {% trans "number of times" %}" 
-						src="/content/images/vote-favorite-off.png">
+                        alt="{% trans "thumb-up off" %}"
+						src="/content/images/vote-favorite-off.png"/>
                     <div><b>{{question.favourite_count|intcomma}}</b></div>
                 </div>
             {% endif %}
@@ -24,22 +26,22 @@
         {% endif %}
     <div id="question-summary-{{question.id}}" class="question-summary narrow">
         <a style="text-decoration: none;" href="{% url questions %}{{question.id}}/{{question.get_question_title}}">
-            <div class="stats">
-                <div class="votes">
-                    <div class="vote-count-post">{{question.vote_count|intcomma}}</div> 
+            <span class="stats">
+                <span class="votes">
+                    <span class="vote-count-post">{{question.vote_count|intcomma}}</span> 
                     {% trans "votes" %}
                   
-                </div>
-                <div title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
-                    <div class="answer-count-post">{{question.answer_count|intcomma}}</div>
+                </span>
+                <span title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
+                    <span class="answer-count-post">{{question.answer_count|intcomma}}</span>
                     {% trans "answers" %}
              
-                </div>
-                <div class="views">
-                     <div class="views-count-post">{{question.view_count|cnprog_intword|safe}}</div>
+                </span>
+                <span class="views">
+                     <span class="views-count-post">{{question.view_count|cnprog_intword|safe}}</span>
 					 {% trans "views" %}
-                </div>
-            </div>
+                </span>
+            </span>
         </a>
         <div class="summary">
             <h3>
@@ -60,7 +62,7 @@
             </div>
         </div>
     </div>
-    <br clear="both"/>
+    <br clear="all"/>
     {% endfor %}
 </div>
 <!-- end users_questions.html -->
-- 
cgit v1.2.3-1-g7c22


From ac3233d4f09d71abf086820863c6854d19c05677 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 12 Aug 2009 15:48:15 -0400
Subject: Added Adolfo's canonical url link fix

---
 django_authopenid/views.py | 2 --
 templates/question.html    | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/django_authopenid/views.py b/django_authopenid/views.py
index d055396b..218a31a2 100644
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -555,8 +555,6 @@ def send_new_email_key(user,nomessage=False):
     import random
     random.seed()
     user.email_key = '%032x' % random.getrandbits(128) 
-    print len(user.email_key)
-    print user.email_key
     user.save()
     _send_email_key(user)
     if nomessage==False:
diff --git a/templates/question.html b/templates/question.html
index 13d283ed..66713342 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -8,7 +8,7 @@
 {% block forejs %}
         <meta name="description" content="{{question.summary}}" />
         <meta name="keywords" content="{{question.tagname_meta_generator}}" />
-        <link rel="canonical" href="{{question.get_absolute_url}}"/>
+        <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}"/>
         {% if not question.closed and request.user.is_authenticated %}
         <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
         <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
-- 
cgit v1.2.3-1-g7c22


From c928d679ca8513a0d5a64bcd2831fd85bb396bb9 Mon Sep 17 00:00:00 2001
From: Mike Chen <chagel@gmail.com>
Date: Fri, 14 Aug 2009 00:01:51 +0800
Subject: temporary fix for 1.1 aggregation compatible issue

---
 forum/views.py | 30 +++++++++++++++++++++---------
 settings.py    |  7 ++++---
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/forum/views.py b/forum/views.py
index 6ef7bd6d..e47b9111 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1125,15 +1125,27 @@ def user_stats(request, user_id, user_view):
     votes_today = Vote.objects.get_votes_count_today_from_user(user)
     votes_total = VOTE_RULES['scope_votes_per_user_per_day']
     tags = user.created_tags.all().order_by('-used_count')[:50]
-    awards = Award.objects.extra(
-        select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
-        tables=['award', 'badge'],
-        order_by=['-awarded_at'],
-        where=['user_id=%s AND badge_id=badge.id'],
-        params=[user.id]
-    ).values('id', 'count', 'name', 'description', 'type')
-    total_awards = awards.count()
-    awards.query.group_by = ['badge_id']
+    if settings.DJANGO_VERSION < 1.1:
+        awards = Award.objects.extra(
+            select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
+            tables=['award', 'badge'],
+            order_by=['-awarded_at'],
+            where=['user_id=%s AND badge_id=badge.id'],
+            params=[user.id]
+        ).values('id', 'count', 'name', 'description', 'type')
+        total_awards = awards.count()
+        awards.query.group_by = ['badge_id']
+    else:
+        awards = Award.objects.extra(
+            select={'id': 'badge.id', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
+            tables=['award', 'badge'],
+            order_by=['-awarded_at'],
+            where=['user_id=%s AND badge_id=badge.id'],
+            params=[user.id]
+        ).values('id', 'name', 'description', 'type')
+        total_awards = awards.count()
+        from django.db.models import Count
+        awards = awards.annotate(count = Count('badge__id'))
 
     return render_to_response(user_view.template_file,{
         "tab_name" : user_view.id,
diff --git a/settings.py b/settings.py
index ce8c9d89..aa991898 100644
--- a/settings.py
+++ b/settings.py
@@ -37,7 +37,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.transaction.TransactionMiddleware',
     #'django.middleware.sqlprint.SqlPrintingMiddleware',
     #'middleware.pagesize.QuestionsPageSizeMiddleware',
-    #'debug_toolbar.middleware.DebugToolbarMiddleware',
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -73,8 +73,9 @@ INSTALLED_APPS = (
     'django.contrib.humanize',
     'forum',
     'django_authopenid',
-    #'debug_toolbar' ,
+    'debug_toolbar' ,
 )
-
+import django
+DJANGO_VERSION = django.get_version()
 # User settings
 from settings_local import *
\ No newline at end of file
-- 
cgit v1.2.3-1-g7c22


From f15cb4dc7d9284a24f75dc8b56248916140ceb09 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Thu, 13 Aug 2009 13:16:46 -0400
Subject: added temp Awards aggregation fix, and fixed url in views.py

---
 forum/views.py | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/forum/views.py b/forum/views.py
index 89d0cbfd..d663a4cb 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -16,6 +16,7 @@ from django.core import serializers
 from django.db import transaction
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext as _
+from django.template.defaultfilters import slugify
 
 from utils.html import sanitize_html
 from markdown2 import Markdown
@@ -1129,15 +1130,27 @@ def user_stats(request, user_id, user_view):
     votes_today = Vote.objects.get_votes_count_today_from_user(user)
     votes_total = VOTE_RULES['scope_votes_per_user_per_day']
     tags = user.created_tags.all().order_by('-used_count')[:50]
-    awards = Award.objects.extra(
-        select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
-        tables=['award', 'badge'],
-        order_by=['-awarded_at'],
-        where=['user_id=%s AND badge_id=badge.id'],
-        params=[user.id]
-    ).values('id', 'count', 'name', 'description', 'type')
-    total_awards = awards.count()
-    awards.query.group_by = ['badge_id']
+    if settings.DJANGO_VERSION < 1.1:
+        awards = Award.objects.extra(
+            select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
+            tables=['award', 'badge'],
+            order_by=['-awarded_at'],
+            where=['user_id=%s AND badge_id=badge.id'],
+            params=[user.id]
+        ).values('id', 'count', 'name', 'description', 'type')
+        total_awards = awards.count()
+        awards.query.group_by = ['badge_id']
+    else:
+        awards = Award.objects.extra(
+            select={'id': 'badge.id', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
+            tables=['award', 'badge'],
+            order_by=['-awarded_at'],
+            where=['user_id=%s AND badge_id=badge.id'],
+            params=[user.id]
+        ).values('id', 'name', 'description', 'type')
+        total_awards = awards.count()
+        from django.db.models import Count
+        awards = awards.annotate(count = Count('badge__id'))
 
     return render_to_response(user_view.template_file,{
         "tab_name" : user_view.id,
@@ -1170,10 +1183,11 @@ def user_recent(request, user_id, user_view):
             self.type_id = type
             self.title = title
             self.summary = summary
+            slug_title = slugify(title)
             if int(answer_id) > 0:
-                self.title_link = u'/questions/%s/%s#%s' %(question_id, title, answer_id)
+                self.title_link = u'/%s%s/%s#%s' %(_('questions/'),question_id, slug_title, answer_id)
             else:
-                self.title_link = u'/questions/%s/%s' %(question_id, title)
+                self.title_link = u'/%s%s/%s' %(_('questions/'),question_id, slug_title)
 
     class AwardEvent:
         def __init__(self, time, type, id):
-- 
cgit v1.2.3-1-g7c22


From d773e8fa5a777d36242ed0777fcc25fe7a4231b7 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sun, 16 Aug 2009 20:17:23 -0600
Subject: fixing error on import in forum/views to work with django version <
 1.1

---
 forum/views.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/forum/views.py b/forum/views.py
index d663a4cb..ce722118 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1149,8 +1149,12 @@ def user_stats(request, user_id, user_view):
             params=[user.id]
         ).values('id', 'name', 'description', 'type')
         total_awards = awards.count()
-        from django.db.models import Count
-        awards = awards.annotate(count = Count('badge__id'))
+        #fixed to work with Django version < 1.1
+        try:
+            from django.db.models import Count
+            awards = awards.annotate(count = Count('badge__id'))
+        except:
+            pass
 
     return render_to_response(user_view.template_file,{
         "tab_name" : user_view.id,
-- 
cgit v1.2.3-1-g7c22


From d5449b465875ff31a28681cf961c18ba94835c15 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Mon, 17 Aug 2009 09:56:13 -0600
Subject: fixing question template bug for closed questions

---
 locale/es/LC_MESSAGES/django.mo | Bin 49734 -> 49490 bytes
 locale/es/LC_MESSAGES/django.po | 207 ++++++++++++++++++----------------------
 templates/question.html         |   4 +-
 3 files changed, 94 insertions(+), 117 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index bdd1b3b2..5f7daea0 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b7324b7f..e9e607fe 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,22 +2,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-12 15:53+0000\n"
-"PO-Revision-Date: 2009-08-16 17:05-0600\n"
+"POT-Creation-Date: 2009-08-17 15:55+0000\n"
+"PO-Revision-Date: 2009-08-17 09:55-0600\n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698
+#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699
 msgid "account/"
 msgstr "cuenta/"
 
 #: settings.py:12 urls.py:26 django_authopenid/urls.py:9
 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11
-#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699
-#: templates/authopenid/confirm_email.txt:10
+#: django_authopenid/urls.py:13 forum/views.py:305 forum/views.py:700
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -76,7 +75,8 @@ msgstr "revisiones/"
 
 #: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
 #: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
-#: forum/models.py:306 forum/views.py:1416
+#: forum/models.py:306 forum/views.py:1192 forum/views.py:1194
+#: forum/views.py:1434
 msgid "questions/"
 msgstr "preguntas/"
 
@@ -112,12 +112,12 @@ msgstr "borrar/"
 msgid "question/"
 msgstr "pregunta/"
 
-#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
+#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2031
 msgid "tags/"
 msgstr "etiquetas/"
 
-#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997
-#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015
+#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998
+#: forum/views.py:1436 forum/views.py:1769 forum/views.py:2033
 msgid "users/"
 msgstr "usuarios/"
 
@@ -240,7 +240,7 @@ msgstr "la nueva contraseña no coincide"
 msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
-#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699
+#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700
 msgid "newquestion/"
 msgstr "nuevapregunta/"
 
@@ -583,6 +583,7 @@ msgid "this email has already been registered, please use another one"
 msgstr "este email ya ha sido registrado, por favor use otro"
 
 #: forum/models.py:246
+#, python-format
 msgid "%(author)s modified the question"
 msgstr "%(author)s modificó la pregunta"
 
@@ -706,27 +707,27 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:947
+#: forum/views.py:948
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr "subscripción guardada, %(email)s necesita validación"
 
-#: forum/views.py:1860
+#: forum/views.py:1878
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr "para subir imagenes debes tener más de 60 puntos de reputación"
 
-#: forum/views.py:1862
+#: forum/views.py:1880
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', "
 "'tiff'"
 
-#: forum/views.py:1864
+#: forum/views.py:1882
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1866
+#: forum/views.py:1884
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -980,7 +981,7 @@ msgstr "Usuarios han sido galardonados con distinciones:"
 msgid "Badges summary"
 msgstr "Resumen de distinciones"
 
-#: templates/badges.html:17 templates/user_stats.html:115
+#: templates/badges.html:17 templates/user_stats.html:73
 msgid "Badges"
 msgstr "Distinciones"
 
@@ -1081,17 +1082,17 @@ msgid "ask the author"
 msgstr "preguntar al autor"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:17
+#: templates/users_questions.html:18
 msgid "this question was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:11 templates/users_questions.html.py:17
+#: templates/users_questions.html:11 templates/users_questions.html.py:18
 msgid "number of times"
 msgstr "numero de veces"
 
 #: templates/book.html:105 templates/index.html:48 templates/questions.html:46
-#: templates/unanswered.html:37 templates/users_questions.html:30
+#: templates/unanswered.html:37 templates/users_questions.html:32
 msgid "votes"
 msgstr "votos"
 
@@ -1100,14 +1101,14 @@ msgid "the answer has been accepted to be correct"
 msgstr "la respuesta ha sido aceptada como correcta"
 
 #: templates/book.html:115 templates/index.html:49 templates/questions.html:47
-#: templates/unanswered.html:38 templates/users_questions.html:40
+#: templates/unanswered.html:38 templates/users_questions.html:42
 msgid "views"
 msgstr "vistas"
 
 #: templates/book.html:125 templates/index.html:69 templates/question.html:499
 #: templates/questions.html:84 templates/questions.html.py:156
 #: templates/tags.html:49 templates/unanswered.html:75
-#: templates/unanswered.html.py:106 templates/users_questions.html:52
+#: templates/unanswered.html.py:106 templates/users_questions.html:54
 msgid "using tags"
 msgstr "usando etiquetas"
 
@@ -1478,14 +1479,14 @@ msgid "all questions"
 msgstr "todas las preguntas"
 
 #: templates/index.html:47 templates/questions.html:45
-#: templates/unanswered.html:36 templates/users_questions.html:35
+#: templates/unanswered.html:36 templates/users_questions.html:37
 msgid "answers"
 msgstr "respuestas"
 
 #: templates/index.html:69 templates/question.html:499
 #: templates/questions.html:84 templates/questions.html.py:156
 #: templates/tags.html:49 templates/unanswered.html:75
-#: templates/unanswered.html.py:106 templates/users_questions.html:52
+#: templates/unanswered.html.py:106 templates/users_questions.html:54
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
@@ -1697,20 +1698,19 @@ msgid "add comment"
 msgstr "agregar comentario"
 
 #: templates/question.html:260
-#, python-format
-msgid ""
-"The question has been closed for the following reason \"%(question."
-"get_close_reason_display)s\" by"
-msgstr ""
-"La pregunta ha sido cerrada por el siguiente motivo \"%(question."
-"get_close_reason_display)s\" por"
+msgid "The question has been closed for the following reason"
+msgstr "La pregunta fue cerrada por el siguiente motivo "
+
+#: templates/question.html:260
+msgid "by"
+msgstr "por"
 
 #: templates/question.html:262
-#, python-format
-msgid "close date %(question.closed_at)s"
-msgstr "fecha de cerrada %(question.closed_at)s"
+#, fuzzy
+msgid "close date "
+msgstr "[cerrada]"
 
-#: templates/question.html:269 templates/user_stats.html:28
+#: templates/question.html:269 templates/user_stats.html:13
 msgid "Answers"
 msgstr "Respuestas"
 
@@ -2126,41 +2126,50 @@ msgstr "Enviar mis respuestas a Twitter"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/user_stats.html:16
+#: templates/user_stats.html:10
 msgid "User questions"
 msgstr "Preguntas del usuario"
 
-#: templates/user_stats.html:38
+#: templates/user_stats.html:20
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr "la respuesta ha sido votada %(vote_count)s veces"
 
-#: templates/user_stats.html:38
+#: templates/user_stats.html:20
 msgid "this answer has been selected as correct"
 msgstr "esta respuesta ha sido seleccionada como correcta"
 
-#: templates/user_stats.html:46
+#: templates/user_stats.html:28
 #, python-format
 msgid "the answer has been commented %(comment_count)s times"
 msgstr "la respuesta ha sido comentada %(comment_count)s veces"
 
-#: templates/user_stats.html:60
-msgid "votes total"
-msgstr "votos totales"
+#: templates/user_stats.html:36
+#, fuzzy
+msgid "Votes"
+msgstr "votos"
+
+#: templates/user_stats.html:41
+msgid "thumb up"
+msgstr ""
 
-#: templates/user_stats.html:69
+#: templates/user_stats.html:42
 msgid "user has voted up this many times"
 msgstr "el usuario ha votado positivo esta cantidad de veces"
 
-#: templates/user_stats.html:74
+#: templates/user_stats.html:46
+msgid "thumb down"
+msgstr ""
+
+#: templates/user_stats.html:47
 msgid "user voted down this many times"
 msgstr "el usuario voto negativo esta cantidad de veces"
 
-#: templates/user_stats.html:87
+#: templates/user_stats.html:54
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/user_stats.html:97
+#: templates/user_stats.html:61
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr "ver otras preguntas etiqueteadas '%(tag)s'"
@@ -2177,6 +2186,11 @@ msgstr "gráfica de la reputación del usuario"
 msgid "reputation history"
 msgstr "historial de reputación"
 
+#: templates/user_tabs.html:23
+#, fuzzy
+msgid "questions that user selected as his/her favorite"
+msgstr "esta pregunta ha sido seleccionada como favorita"
+
 #: templates/user_tabs.html:24
 msgid "favorites"
 msgstr "favoritos"
@@ -2214,7 +2228,15 @@ msgstr "Nada encontrado."
 msgid "this questions was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
-#: templates/users_questions.html:33
+#: templates/users_questions.html:12
+msgid "thumb-up on"
+msgstr ""
+
+#: templates/users_questions.html:19
+msgid "thumb-up off"
+msgstr ""
+
+#: templates/users_questions.html:35
 msgid "this answer has been accepted to be correct"
 msgstr "esta respuesta ha sido aceptada como correcta"
 
@@ -2384,36 +2406,6 @@ msgstr "Registrarse"
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: templates/authopenid/confirm_email.txt:2
-msgid "Thank you for registering at our Q&A forum!"
-msgstr ""
-
-#: templates/authopenid/confirm_email.txt:4
-msgid "Your account details are:"
-msgstr ""
-
-#: templates/authopenid/confirm_email.txt:6
-#: templates/authopenid/sendpw_email.txt:7
-msgid "Username:"
-msgstr "Nombre de usuario:"
-
-#: templates/authopenid/confirm_email.txt:7
-#: templates/authopenid/delete.html:20
-msgid "Password:"
-msgstr "Contraseña"
-
-#: templates/authopenid/confirm_email.txt:9
-msgid "Please sign in here:"
-msgstr ""
-
-#: templates/authopenid/confirm_email.txt:12
-#: templates/authopenid/email_validation.txt:14
-#: templates/authopenid/sendpw_email.txt:13
-msgid ""
-"Sincerely,\n"
-"Forum Administrator"
-msgstr ""
-
 #: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr "Cuenta: borrar cuenta"
@@ -2430,6 +2422,10 @@ msgstr ""
 msgid "Check confirm box, if you want delete your account."
 msgstr "Marca caja de confirmación, si deseas borrar tu cuenta."
 
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr "Contraseña"
+
 #: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr "Estoy seguro que quiero borrar mi cuenta."
@@ -2446,25 +2442,6 @@ msgstr "(requerido por tu seguridad)"
 msgid "Delete account permanently"
 msgstr "Borrar la cuenta de forma permanente"
 
-#: templates/authopenid/email_validation.txt:2
-msgid "Greetings from the Q&A forum"
-msgstr ""
-
-#: templates/authopenid/email_validation.txt:4
-msgid "To make use of the Forum, please follow the link below:"
-msgstr ""
-
-#: templates/authopenid/email_validation.txt:8
-msgid "Following the link above will help us verify your email address."
-msgstr ""
-
-#: templates/authopenid/email_validation.txt:10
-msgid ""
-"If you beleive that this message was sent in mistake - \n"
-"no further action is needed. Just ingore this email, we apologize\n"
-"for any inconvenience"
-msgstr ""
-
 #: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr "Enviar nueva contraseña"
@@ -2501,26 +2478,6 @@ msgstr ""
 "Nota: tu nueva contraseña solo será activada luego de que hagas click en el "
 "link de activación en el email enviado."
 
-#: templates/authopenid/sendpw_email.txt:2
-#, python-format
-msgid ""
-"Someone has requested to reset your password on %(site_url)s.\n"
-"If it were not you, it is safe to ignore this email."
-msgstr ""
-
-#: templates/authopenid/sendpw_email.txt:5
-msgid "Your new account details are:"
-msgstr ""
-
-#: templates/authopenid/sendpw_email.txt:8
-#, fuzzy
-msgid "New password:"
-msgstr "Nueva contraseña:"
-
-#: templates/authopenid/sendpw_email.txt:10
-msgid "To confirm that you wanted to reset your password please visit:"
-msgstr ""
-
 #: templates/authopenid/settings.html:30
 msgid "Give your  account a new password."
 msgstr "Crea una nueva contraseña para tu cuenta."
@@ -2682,6 +2639,26 @@ msgstr "Registrate con tu OpenID"
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
+#~ msgid ""
+#~ "The question has been closed for the following reason \"%(question."
+#~ "get_close_reason_display)s\" by"
+#~ msgstr ""
+#~ "La pregunta ha sido cerrada por el siguiente motivo \"%(question."
+#~ "get_close_reason_display)s\" por"
+
+#~ msgid "close date %(question.closed_at)s"
+#~ msgstr "fecha de cerrada %(question.closed_at)s"
+
+#~ msgid "votes total"
+#~ msgstr "votos totales"
+
+#~ msgid "Username:"
+#~ msgstr "Nombre de usuario:"
+
+#, fuzzy
+#~ msgid "New password:"
+#~ msgstr "Nueva contraseña:"
+
 #~ msgid "site title"
 #~ msgstr "Preguntalo.com.uy"
 
diff --git a/templates/question.html b/templates/question.html
index 66713342..7f1ab3a5 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -257,9 +257,9 @@
             </table>
             {% if question.closed %}
             <div class="question-status" style="margin-bottom:15px">
-            <h3>{% blocktrans %}The question has been closed for the following reason "{{ question.get_close_reason_display }}" by{% endblocktrans %} 
+                <h3>{% trans "The question has been closed for the following reason" %} "{{ question.get_close_reason_display }}" {% trans "by"%} 
 			<a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> 
-			{% blocktrans %}close date {{question.closed_at}}{% endblocktrans %}</h3>
+			{% blocktrans %}close date {% endblocktrans %}{{question.closed_at|date:"d-m-Y H:i"}}</h3>
             </div>
             {% endif %}
             
-- 
cgit v1.2.3-1-g7c22


From 90dffc13c16494bca294bb2eef2353f970509cad Mon Sep 17 00:00:00 2001
From: Mike Chen <chagel@gmail.com>
Date: Wed, 19 Aug 2009 22:02:52 +0800
Subject: fix django_authopenid register bug

---
 django_authopenid/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/django_authopenid/views.py b/django_authopenid/views.py
index 1cb8928b..1d072852 100644
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -367,7 +367,7 @@ def register(request):
     return render('authopenid/complete.html', {
         'form1': form1,
         'form2': form2,
-        'provider':providers[provider_name],
+        'provider':provider_logo,
         'nickname': nickname,
         'email': email
     }, context_instance=RequestContext(request))
-- 
cgit v1.2.3-1-g7c22


From 3a4b6ad43221abc0e0ff345d9368c3348b312128 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 19 Aug 2009 21:30:15 -0400
Subject: added Adolfos mods, django_authopeid bug, unified traditional and
 OpenID login

---
 django_authopenid/urls.py                          |  12 +-
 django_authopenid/views.py                         |  23 +-
 forum/managers.py                                  |   2 +-
 forum/views.py                                     |   8 +-
 locale/en/LC_MESSAGES/django.mo                    | Bin 14334 -> 15146 bytes
 locale/en/LC_MESSAGES/django.po                    | 229 ++++++++------
 locale/es/LC_MESSAGES/django.mo                    | Bin 49490 -> 49819 bytes
 locale/es/LC_MESSAGES/django.po                    | 346 +++++++++++----------
 templates/authopenid/sendpw.html                   |   2 +-
 templates/authopenid/settings.html                 |   2 +-
 templates/authopenid/signin.html                   |  79 ++---
 .../content/jquery-openid/images/local-login.png   | Bin 0 -> 2522 bytes
 .../content/jquery-openid/images/openidico16.png   | Bin 0 -> 554 bytes
 templates/content/jquery-openid/jquery.openid.js   |  19 ++
 templates/content/jquery-openid/openid.css         |  16 +
 templates/content/style/style.css                  |   4 +-
 templates/footer.html                              |   2 +-
 templates/question.html                            |   4 +-
 18 files changed, 427 insertions(+), 321 deletions(-)
 create mode 100644 templates/content/jquery-openid/images/local-login.png
 create mode 100644 templates/content/jquery-openid/images/openidico16.png

diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py
index 9c0887d8..f5d7a72f 100644
--- a/django_authopenid/urls.py
+++ b/django_authopenid/urls.py
@@ -12,17 +12,15 @@ urlpatterns = patterns('django_authopenid.views',
     url(r'^%s$' % _('signout/'), 'signout', name='user_signout'),
     url(r'^%s%s$' % (_('signin/'), _('complete/')), 'complete_signin', 
         name='user_complete_signin'),
-    url(r'^%s$' % _('register/'), 'register', name='user_register'),
+    #url(r'^%s$' % _('register/'), 'register', name='user_register'),
     url(r'^%s$' % _('signup/'), 'signup', name='user_signup'),
     #disable current sendpw function
-    url(r'^%s$' % _('sendpw/'), 'signin', name='user_sendpw'),
-    #url(r'^%s$' % _('sendpw/'), 'sendpw', name='user_sendpw'),
-    #url(r'^%s%s$' % (_('password/'), _('confirm/')), 'confirmchangepw', 
-    #    name='user_confirmchangepw'),
+    url(r'^%s$' % _('sendpw/'), 'sendpw', name='user_sendpw'),
+    url(r'^%s%s$' % (_('password/'), _('confirm/')), 'confirmchangepw', name='user_confirmchangepw'),
 
     # manage account settings
-    #url(r'^$', _('account_settings'), name='user_account_settings'),
-    #url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'),
+    url(r'^$', _('account_settings'), name='user_account_settings'),
+    url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'),
     url(r'^%s$' % _('email/'), 'changeemail', name='user_changeemail',kwargs = {'action':'change'}),
     url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_changeemail',kwargs = {'action':'validate'}),
     #url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'),
diff --git a/django_authopenid/views.py b/django_authopenid/views.py
index 218a31a2..65d579f4 100644
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -175,9 +175,18 @@ def signin(request,newquestion=False,newanswer=False):
     form_auth = OpenidAuthForm(initial={'next':next})
     
     if request.POST:   
-        
-        if 'bsignin' in request.POST.keys() or 'openid_username' in request.POST.keys():
 
+        if 'blogin' in request.POST.keys():
+            # perform normal django authentification
+            form_auth = OpenidAuthForm(request.POST)
+            if form_auth.is_valid():
+                user_ = form_auth.get_user()
+                login(request, user_)
+                next = clean_next(form_auth.cleaned_data.get('next'))
+                print 'next stop is "%s"' % next
+                return HttpResponseRedirect(next)
+
+        elif 'bsignin' in request.POST.keys() or 'openid_username' in request.POST.keys():
             form_signin = OpenidSigninForm(request.POST)
             if form_signin.is_valid():
                 next = clean_next(form_signin.cleaned_data.get('next'))
@@ -193,14 +202,6 @@ def signin(request,newquestion=False,newanswer=False):
                         on_failure=signin_failure, 
                         sreg_request=sreg_req)
 
-        elif 'blogin' in request.POST.keys():
-            # perform normal django authentification
-            form_auth = OpenidAuthForm(request.POST)
-            if form_auth.is_valid():
-                user_ = form_auth.get_user()
-                login(request, user_)
-                next = clean_next(form_auth.cleaned_data.get('next'))
-                return HttpResponseRedirect(next)
 
     question = None
     if newquestion == True:
@@ -368,7 +369,7 @@ def register(request):
     return render('authopenid/complete.html', {
         'form1': form1,
         'form2': form2,
-        'provider':providers[provider_name],
+        'provider':provider_logo,
         'nickname': nickname,
         'email': email
     }, context_instance=RequestContext(request))
diff --git a/forum/managers.py b/forum/managers.py
index 2e3e4186..6ae0ed99 100644
--- a/forum/managers.py
+++ b/forum/managers.py
@@ -20,7 +20,7 @@ class QuestionManager(models.Manager):
         return questions
     
     def get_unanswered_questions(self, orderby):
-        questions = self.filter(deleted=False, answer_count=0).order_by(orderby)
+        questions = self.filter(deleted=False, answer_accepted=False).order_by(orderby)
         return questions
     
     def get_questions(self, orderby):
diff --git a/forum/views.py b/forum/views.py
index ce722118..d663a4cb 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1149,12 +1149,8 @@ def user_stats(request, user_id, user_view):
             params=[user.id]
         ).values('id', 'name', 'description', 'type')
         total_awards = awards.count()
-        #fixed to work with Django version < 1.1
-        try:
-            from django.db.models import Count
-            awards = awards.annotate(count = Count('badge__id'))
-        except:
-            pass
+        from django.db.models import Count
+        awards = awards.annotate(count = Count('badge__id'))
 
     return render_to_response(user_view.template_file,{
         "tab_name" : user_view.id,
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 447afac4..cd8de560 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index ff280947..b5e5c549 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-12 15:41+0000\n"
+"POT-Creation-Date: 2009-08-19 00:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698
+#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699
 msgid "account/"
 msgstr ""
 
 #: settings.py:12 urls.py:26 django_authopenid/urls.py:9
 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11
-#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699
+#: django_authopenid/urls.py:13 forum/views.py:305 forum/views.py:700
 #: templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr ""
@@ -82,7 +82,8 @@ msgstr ""
 
 #: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
 #: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
-#: forum/models.py:306 forum/views.py:1416
+#: forum/models.py:306 forum/views.py:1188 forum/views.py:1190
+#: forum/views.py:1430
 msgid "questions/"
 msgstr ""
 
@@ -118,12 +119,12 @@ msgstr ""
 msgid "question/"
 msgstr ""
 
-#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
+#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2027
 msgid "tags/"
 msgstr ""
 
-#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997
-#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015
+#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998
+#: forum/views.py:1432 forum/views.py:1765 forum/views.py:2029
 msgid "users/"
 msgstr ""
 
@@ -238,7 +239,7 @@ msgstr ""
 msgid "Incorrect username."
 msgstr ""
 
-#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699
+#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700
 msgid "newquestion/"
 msgstr ""
 
@@ -695,27 +696,27 @@ msgstr ""
 msgid "profile - user preferences"
 msgstr ""
 
-#: forum/views.py:947
+#: forum/views.py:948
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr ""
 "Your subscription is saved, but email address %(email)s needs to be "
 "validated, please see <a href='/faq#validate'>more details here</a>"
 
-#: forum/views.py:1860
+#: forum/views.py:1874
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr ""
 
-#: forum/views.py:1862
+#: forum/views.py:1876
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1864
+#: forum/views.py:1878
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1866
+#: forum/views.py:1880
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -723,7 +724,7 @@ msgstr ""
 
 #: forum/management/commands/send_email_alerts.py:35
 msgid "updates from website"
-msgstr ""
+msgstr "Q&amp;A forum update"
 
 #: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
 #: templates/header.html:35
@@ -937,7 +938,7 @@ msgid "must have valid %(email)s to post"
 msgstr ""
 "<span class='strong big'>Looks like your email address, %(email)s has not "
 "yet been validated.</span> To post messages you must verify your email, "
-"please see <a href='/faq#validate'>more details here</a>.<br/>You can submit "
+"please see <a href='/faq#validate'>more details here</a>.<br>You can submit "
 "your question now and validate email after that. Your question will saved as "
 "pending meanwhile. "
 
@@ -965,7 +966,7 @@ msgstr ""
 msgid "Badges summary"
 msgstr ""
 
-#: templates/badges.html:17 templates/user_stats.html:115
+#: templates/badges.html:17 templates/user_stats.html:73
 msgid "Badges"
 msgstr ""
 
@@ -1070,17 +1071,17 @@ msgid "ask the author"
 msgstr ""
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:17
+#: templates/users_questions.html:18
 msgid "this question was selected as favorite"
 msgstr ""
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:11 templates/users_questions.html.py:17
+#: templates/users_questions.html:11 templates/users_questions.html.py:18
 msgid "number of times"
 msgstr ""
 
 #: templates/book.html:105 templates/index.html:48 templates/questions.html:46
-#: templates/unanswered.html:37 templates/users_questions.html:30
+#: templates/unanswered.html:37 templates/users_questions.html:32
 msgid "votes"
 msgstr ""
 
@@ -1089,14 +1090,14 @@ msgid "the answer has been accepted to be correct"
 msgstr ""
 
 #: templates/book.html:115 templates/index.html:49 templates/questions.html:47
-#: templates/unanswered.html:38 templates/users_questions.html:40
+#: templates/unanswered.html:38 templates/users_questions.html:42
 msgid "views"
 msgstr ""
 
 #: templates/book.html:125 templates/index.html:69 templates/question.html:499
 #: templates/questions.html:84 templates/questions.html.py:156
 #: templates/tags.html:49 templates/unanswered.html:75
-#: templates/unanswered.html.py:106 templates/users_questions.html:52
+#: templates/unanswered.html.py:106 templates/users_questions.html:54
 msgid "using tags"
 msgstr ""
 
@@ -1265,13 +1266,13 @@ msgid "how to validate email info"
 msgstr ""
 "<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
 "\"bigger strong\">How?</span> If you have just set or changed your email "
-"address - <strong>check your email and click the included link</strong>.<br/"
-">The link contains a key generated specifically for you. You can also "
+"address - <strong>check your email and click the included link</strong>."
+"<br>The link contains a key generated specifically for you. You can also "
 "<button style='display:inline' type='submit'><strong>get a new key</strong></"
 "button> and check your email again.</p></form><span class=\"bigger strong"
 "\">Why?</span> Email validation is required to make sure that <strong>only "
 "you can post messages</strong> on your behalf and to <strong>minimize spam</"
-"strong> posts.<br/>With email you can <strong>subscribe for updates</strong> "
+"strong> posts.<br>With email you can <strong>subscribe for updates</strong> "
 "on the most interesting questions. Also, when you sign up for the first time "
 "- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
 "personal image.</p>"
@@ -1342,35 +1343,35 @@ msgstr ""
 msgid "."
 msgstr ""
 
-#: templates/footer.html:7 templates/header.html:14 templates/index.html:83
+#: templates/footer.html:8 templates/header.html:14 templates/index.html:83
 msgid "about"
 msgstr ""
 
-#: templates/footer.html:8 templates/header.html:15 templates/index.html:84
+#: templates/footer.html:9 templates/header.html:15 templates/index.html:84
 #: templates/question_edit_tips.html:16
 msgid "faq"
 msgstr ""
 
-#: templates/footer.html:9
+#: templates/footer.html:10
+msgid "wiki"
+msgstr ""
+
+#: templates/footer.html:11
 msgid "blog"
 msgstr ""
 
-#: templates/footer.html:10
+#: templates/footer.html:12
 msgid "contact us"
 msgstr ""
 
-#: templates/footer.html:11
+#: templates/footer.html:13
 msgid "privacy policy"
 msgstr ""
 
-#: templates/footer.html:12
+#: templates/footer.html:14
 msgid "give feedback"
 msgstr ""
 
-#: templates/footer.html:18
-msgid "current revision"
-msgstr ""
-
 #: templates/header.html:10
 msgid "logout"
 msgstr ""
@@ -1518,6 +1519,9 @@ msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
+"Clicking <strong>Logout</strong> will log you out from the Q&amp;A forum.</"
+"p><p>If you wish to sign off completely - please make sure to log out from "
+"your OpenID provider."
 
 #: templates/logout.html:21
 msgid "Logout now"
@@ -1670,7 +1674,7 @@ msgstr ""
 msgid "close date %(question.closed_at)s"
 msgstr ""
 
-#: templates/question.html:269 templates/user_stats.html:28
+#: templates/question.html:269 templates/user_stats.html:13
 msgid "Answers"
 msgstr " Answers"
 
@@ -1849,12 +1853,12 @@ msgid_plural ""
 "\t\t\t"
 msgstr[0] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>question tagged <span "
-"class=\"tag\">%(tagname)s</span>"
+"<div class=\"questions-count\">%(q_num)s</div><p>question tagged</p><p><span "
+"class=\"tag\">%(tagname)s</span></p>"
 msgstr[1] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged <span "
-"class=\"tag\">%(tagname)s</span>"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
+"class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
 
 #: templates/questions.html:116
 #, python-format
@@ -1868,12 +1872,14 @@ msgid_plural ""
 "\t\t\t\t"
 msgstr[0] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>question with title "
-"containing <span class=\"darkred strong\">%(searchtitle)s</span>"
+"<div class=\"questions-count\">%(q_num)s</div><p>question with title "
+"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
+"p>"
 msgstr[1] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>questions with title "
-"containing <span class=\"darkred strong\">%(searchtitle)s</span></strong>"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions with title "
+"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
+"p>"
 
 #: templates/questions.html:122
 #, python-format
@@ -1887,10 +1893,10 @@ msgid_plural ""
 "\t\t\t\t"
 msgstr[0] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>question"
+"<div class=\"questions-count\">%(q_num)s</div><p>question</p>"
 msgstr[1] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>questions"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
 
 #: templates/questions.html:131
 msgid "latest questions info"
@@ -1997,8 +2003,8 @@ msgstr ""
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<span class=\"questions-count\">%(num_q)s</span><br/> questions with "
-"<strong>no accepted answers</strong>"
+"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
+"questions"
 
 #: templates/user_edit.html:6
 msgid "Edit user profile"
@@ -2088,41 +2094,49 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/user_stats.html:16
+#: templates/user_stats.html:10
 msgid "User questions"
 msgstr ""
 
-#: templates/user_stats.html:38
+#: templates/user_stats.html:20
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:38
+#: templates/user_stats.html:20
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:46
+#: templates/user_stats.html:28
 #, python-format
 msgid "the answer has been commented %(comment_count)s times"
-msgstr "(%(comment_count)s comment(s))"
+msgstr ""
 
-#: templates/user_stats.html:60
-msgid "votes total"
-msgstr "Votes"
+#: templates/user_stats.html:36
+msgid "Votes"
+msgstr ""
+
+#: templates/user_stats.html:41
+msgid "thumb up"
+msgstr ""
 
-#: templates/user_stats.html:69
+#: templates/user_stats.html:42
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:74
+#: templates/user_stats.html:46
+msgid "thumb down"
+msgstr ""
+
+#: templates/user_stats.html:47
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:87
+#: templates/user_stats.html:54
 msgid "Tags"
 msgstr ""
 
-#: templates/user_stats.html:97
+#: templates/user_stats.html:61
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
@@ -2139,6 +2153,10 @@ msgstr ""
 msgid "reputation history"
 msgstr ""
 
+#: templates/user_tabs.html:23
+msgid "questions that user selected as his/her favorite"
+msgstr ""
+
 #: templates/user_tabs.html:24
 msgid "favorites"
 msgstr ""
@@ -2176,7 +2194,15 @@ msgstr ""
 msgid "this questions was selected as favorite"
 msgstr ""
 
-#: templates/users_questions.html:33
+#: templates/users_questions.html:12
+msgid "thumb-up on"
+msgstr ""
+
+#: templates/users_questions.html:19
+msgid "thumb-up off"
+msgstr ""
+
+#: templates/users_questions.html:35
 msgid "this answer has been accepted to be correct"
 msgstr ""
 
@@ -2207,7 +2233,7 @@ msgstr ""
 "anyone, must be valid)"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:154
 msgid "Password"
 msgstr ""
 
@@ -2219,6 +2245,12 @@ msgstr ""
 #, python-format
 msgid "validate %(email)s info"
 msgstr ""
+"<span class=\"strong big\">An email with a validation link has been sent to %"
+"(email)s.</span> Please <strong>follow the emailed link</strong> with your "
+"web browser. Email validation is necessary to help insure the proper use of "
+"email on <span class=\"orange\">Q&amp;A</span> forum. If you would like "
+"to use <strong>another email</strong>, please <a href=\"/email/change/"
+"\"><strong>change it again</strong></a>."
 
 #: templates/authopenid/changeemail.html:50
 msgid "Email not changed"
@@ -2324,7 +2356,7 @@ msgstr "New user signup"
 #, python-format
 msgid "register new %(provider)s account info"
 msgstr ""
-"<span class=\"big strong\">You are here for the first time with your %"
+"<p><span class=\"big strong\">You are here for the first time with your %"
 "(provider)s login.</span> Please create your <strong>screen name</strong> "
 "and save your <strong>email</strong> address. Saved email address will let "
 "you <strong>subscribe for the updates</strong> on the most interesting "
@@ -2336,7 +2368,7 @@ msgid "This account already exists, please use another."
 msgstr ""
 
 #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/signin.html:120
+#: templates/authopenid/signin.html:138
 msgid "Sorry, looks like we have some errors:"
 msgstr ""
 
@@ -2362,7 +2394,7 @@ msgstr ""
 msgid "user name"
 msgstr ""
 
-#: templates/authopenid/complete.html:58
+#: templates/authopenid/complete.html:58 templates/authopenid/signin.html:128
 msgid "password"
 msgstr ""
 
@@ -2370,13 +2402,13 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:156
 msgid "Forgot your password?"
 msgstr ""
 
 #: templates/authopenid/confirm_email.txt:2
 msgid "Thank you for registering at our Q&A forum!"
-msgstr "Thank you for registering at our Q&amp;A forum!"
+msgstr ""
 
 #: templates/authopenid/confirm_email.txt:4
 msgid "Your account details are:"
@@ -2559,77 +2591,87 @@ msgstr ""
 #: templates/authopenid/signin.html:40
 msgid "Click to sign in through any of these services."
 msgstr ""
-"<p><span class=\"big strong\">We accept <a href=\"http://openid.net"
-"\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new "
-"password - log in through any of the services below.</font></p><p><span "
-"class=\"big strong\">1. Select the login service by clicking one of the "
-"icons</span></p>"
+"<p><span class=\"big strong\">Please select your favorite login method below.</span>"
+"</p><p><font color=\"gray\">External login services use <a "
+"href=\"http://openid.net\"><b>OpenID</b></a> technology that increases "
+"security of your online identity and makes login process simpler. First option "
+"requires login name and password.</font></p>"
 
-#: templates/authopenid/signin.html:103
+#: templates/authopenid/signin.html:113
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
 msgstr ""
-"<span class=\"big strong\">2. Enter your <span id=\"enter_your_what"
-"\">Provider user name</span></span><br/>(or select another OpenID provider "
-"above)"
+"<span class=\"big strong\">Enter your <span id=\"enter_your_what\">Provider "
+"user name</span></span><br><span class='grey'>(or select another login method above)</span>"
 
-#: templates/authopenid/signin.html:110
+#: templates/authopenid/signin.html:120
 msgid ""
 "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
 "web address"
 msgstr ""
-"<span class=\"big strong\">2. Enter your <a class=\"openid_logo\" href="
-"\"http://openid.net\">OpenID</a> web address</span><br/>(or choose specific "
-"provider by clicking on one of the icons above)"
+"<span class=\"big strong\">Enter your <a class=\"openid_logo\" href=\"http://"
+"openid.net\">OpenID</a> web address</span><br><span class='grey'>(or choose another login "
+"method above)</span>"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:122 templates/authopenid/signin.html:130
+#: templates/authopenid/signin.html:155
 msgid "Login"
 msgstr ""
 
-#: templates/authopenid/signin.html:116
+#: templates/authopenid/signin.html:125
+msgid "Enter your login name and password"
+msgstr ""
+"<span class='big strong'>Enter your forum login and password</span><br/>"
+"<span class='grey'>(or select your OpenID provider above)</span>"
+
+#: templates/authopenid/signin.html:126
+msgid "login name"
+msgstr ""
+
+#: templates/authopenid/signin.html:134
 msgid "we support two login modes"
 msgstr ""
 "You can log in either through one of these services or traditionally - using "
 "local username/password."
 
-#: templates/authopenid/signin.html:134
+#: templates/authopenid/signin.html:152
 msgid "Use login name and password"
 msgstr ""
 
-#: templates/authopenid/signin.html:135
+#: templates/authopenid/signin.html:153
 msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:139
+#: templates/authopenid/signin.html:157
 msgid "Create new account"
 msgstr ""
 
-#: templates/authopenid/signin.html:148
+#: templates/authopenid/signin.html:166
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:151
+#: templates/authopenid/signin.html:169
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:154
+#: templates/authopenid/signin.html:172
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:157
+#: templates/authopenid/signin.html:175
 msgid "openid is widely adopted"
 msgstr ""
 "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
 "enabled."
 
-#: templates/authopenid/signin.html:160
+#: templates/authopenid/signin.html:178
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:165
+#: templates/authopenid/signin.html:183
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:184
 msgid "Get OpenID"
 msgstr ""
 
@@ -2671,11 +2713,6 @@ msgstr ""
 msgid "Login with your OpenID"
 msgstr ""
 
-#~ msgid "what is this website"
-#~ msgstr ""
-#~ "This is a collaboratively edited question and answer site for the "
-#~ "Magnetic Resonance specialists."
-
 #
 #~ msgid "editing tips"
 #~ msgstr "Tips"
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 5f7daea0..91639ba1 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index e9e607fe..d7655dd7 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,21 +2,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-17 15:55+0000\n"
-"PO-Revision-Date: 2009-08-17 09:55-0600\n"
+"POT-Creation-Date: 2009-08-17 16:44+0000\n"
+"PO-Revision-Date: 2009-08-17 10:04-0600\n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699
+#: settings.py:12 urls.py:25 forum/views.py:310 forum/views.py:705
 msgid "account/"
 msgstr "cuenta/"
 
 #: settings.py:12 urls.py:26 django_authopenid/urls.py:9
 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11
-#: django_authopenid/urls.py:13 forum/views.py:305 forum/views.py:700
+#: django_authopenid/urls.py:13 forum/views.py:310 forum/views.py:706
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -24,128 +24,132 @@ msgstr "ingresar/"
 msgid "upfiles/"
 msgstr "archivossubidos/"
 
-#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26
+#: urls.py:27 django_authopenid/urls.py:16
+msgid "signup/"
+msgstr "registrarse/"
+
+#: urls.py:28 urls.py:29 urls.py:30 django_authopenid/urls.py:26
 #: django_authopenid/urls.py:27
 msgid "email/"
 msgstr "email/"
 
-#: urls.py:27
+#: urls.py:28
 msgid "change/"
 msgstr "cambiar/"
 
-#: urls.py:28
+#: urls.py:29
 msgid "sendkey/"
 msgstr "enviarclave/"
 
-#: urls.py:29
+#: urls.py:30
 msgid "verify/"
 msgstr "verificar/"
 
-#: urls.py:30
+#: urls.py:31
 msgid "about/"
 msgstr "acercadenosotros/"
 
-#: urls.py:31
+#: urls.py:32
 msgid "faq/"
 msgstr "preguntasfrecuentes/"
 
-#: urls.py:32
+#: urls.py:33
 msgid "privacy/"
 msgstr "códigodeprivacidad/"
 
-#: urls.py:33
+#: urls.py:34
 msgid "logout/"
 msgstr "cerrarsesion/"
 
-#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
+#: urls.py:35 urls.py:36 urls.py:37 urls.py:49 forum/models.py:425
 msgid "answers/"
 msgstr "respuestas/"
 
-#: urls.py:34 urls.py:46
+#: urls.py:35 urls.py:47
 msgid "comments/"
 msgstr "comentarios/"
 
-#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
+#: urls.py:36 urls.py:41 urls.py:55 templates/user_info.html:34
 msgid "edit/"
 msgstr "editar/"
 
-#: urls.py:36 urls.py:45
+#: urls.py:37 urls.py:46
 msgid "revisions/"
 msgstr "revisiones/"
 
-#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
-#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
-#: forum/models.py:306 forum/views.py:1192 forum/views.py:1194
-#: forum/views.py:1434
+#: urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 urls.py:43
+#: urls.py:44 urls.py:45 urls.py:46 urls.py:47 urls.py:48 forum/feed.py:19
+#: forum/models.py:313 forum/views.py:1232 forum/views.py:1234
+#: forum/views.py:1474
 msgid "questions/"
 msgstr "preguntas/"
 
-#: urls.py:38 urls.py:64
+#: urls.py:39 urls.py:65
 msgid "ask/"
 msgstr "preguntar/"
 
-#: urls.py:39
+#: urls.py:40
 msgid "unanswered/"
 msgstr "sinrespuesta/"
 
-#: urls.py:41
+#: urls.py:42
 msgid "close/"
 msgstr "cerrar/"
 
-#: urls.py:42
+#: urls.py:43
 msgid "reopen/"
 msgstr "reabrir/"
 
-#: urls.py:43
+#: urls.py:44
 msgid "answer/"
 msgstr "respuesta/"
 
-#: urls.py:44
+#: urls.py:45
 msgid "vote/"
 msgstr "votar/"
 
-#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
+#: urls.py:48 urls.py:49 django_authopenid/urls.py:29
 msgid "delete/"
 msgstr "borrar/"
 
-#: urls.py:50
+#: urls.py:51
 msgid "question/"
 msgstr "pregunta/"
 
-#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2031
+#: urls.py:52 urls.py:53 forum/views.py:747 forum/views.py:2071
 msgid "tags/"
 msgstr "etiquetas/"
 
-#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998
-#: forum/views.py:1436 forum/views.py:1769 forum/views.py:2033
+#: urls.py:54 urls.py:55 urls.py:56 forum/views.py:1034 forum/views.py:1038
+#: forum/views.py:1476 forum/views.py:1809 forum/views.py:2073
 msgid "users/"
 msgstr "usuarios/"
 
-#: urls.py:56 urls.py:57
+#: urls.py:57 urls.py:58
 msgid "badges/"
 msgstr "distinciones/"
 
-#: urls.py:58
+#: urls.py:59
 msgid "messages/"
 msgstr "mensajes/"
 
-#: urls.py:58
+#: urls.py:59
 msgid "markread/"
 msgstr "marcarleido/"
 
-#: urls.py:60
+#: urls.py:61
 msgid "nimda/"
 msgstr "administrador/"
 
-#: urls.py:62
+#: urls.py:63
 msgid "upload/"
 msgstr "subir/"
 
-#: urls.py:63 urls.py:64 urls.py:65
+#: urls.py:64 urls.py:65 urls.py:66
 msgid "books/"
 msgstr "libros/"
 
-#: urls.py:66
+#: urls.py:67
 msgid "search/"
 msgstr "buscar/"
 
@@ -240,7 +244,7 @@ msgstr "la nueva contraseña no coincide"
 msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
-#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700
+#: django_authopenid/urls.py:10 forum/views.py:310 forum/views.py:706
 msgid "newquestion/"
 msgstr "nuevapregunta/"
 
@@ -260,14 +264,19 @@ msgstr "completado/"
 msgid "register/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:16
-msgid "signup/"
-msgstr "registrarse/"
-
-#: django_authopenid/urls.py:18
+#: django_authopenid/urls.py:19
 msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
+#: django_authopenid/urls.py:20
+#, fuzzy
+msgid "password/"
+msgstr "contraseña"
+
+#: django_authopenid/urls.py:20
+msgid "confirm/"
+msgstr ""
+
 #: django_authopenid/urls.py:27
 msgid "validate/"
 msgstr ""
@@ -523,8 +532,8 @@ msgstr ""
 "por favor use solo los siguientes caracteres en los nombres de etiquetas: "
 "letras 'a-z', números y caracteres '.-_#'"
 
-#: forum/forms.py:75 templates/index.html:57 templates/question.html:209
-#: templates/question.html.py:395 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:210
+#: templates/question.html.py:396 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
 #: templates/unanswered.html.py:60
 msgid "community wiki"
@@ -550,76 +559,84 @@ msgstr ""
 "ingresa un breve resumen de tu revisión (ej. error ortográfico, gramática, "
 "mejoras de estilo. Este campo es opcional."
 
-#: forum/forms.py:175
+#: forum/forms.py:98 forum/forms.py:159
+msgid "please choice a category"
+msgstr "por favor escoja una categoría"
+
+#: forum/forms.py:99 forum/forms.py:160
+msgid "Category"
+msgstr "Categoría"
+
+#: forum/forms.py:180
 msgid "this email does not have to be linked to gravatar"
 msgstr "este email no tiene porque estar asociado a un Gravatar"
 
-#: forum/forms.py:176
+#: forum/forms.py:181
 msgid "Real name"
 msgstr "Nombre real"
 
-#: forum/forms.py:177
+#: forum/forms.py:182
 msgid "Website"
 msgstr "Sitio Web"
 
-#: forum/forms.py:178
+#: forum/forms.py:183
 msgid "Location"
 msgstr "Ubicación"
 
-#: forum/forms.py:179
+#: forum/forms.py:184
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: forum/forms.py:179
+#: forum/forms.py:184
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD"
 
-#: forum/forms.py:180 templates/authopenid/settings.html:21
+#: forum/forms.py:185 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr "Perfil"
 
-#: forum/forms.py:207 forum/forms.py:208
+#: forum/forms.py:212 forum/forms.py:213
 msgid "this email has already been registered, please use another one"
 msgstr "este email ya ha sido registrado, por favor use otro"
 
-#: forum/models.py:246
+#: forum/models.py:253
 #, python-format
 msgid "%(author)s modified the question"
 msgstr "%(author)s modificó la pregunta"
 
-#: forum/models.py:250
+#: forum/models.py:257
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr "%(people)s publicaron %(new_answer_count)s nuevas respuestas"
 
-#: forum/models.py:255
+#: forum/models.py:262
 #, python-format
 msgid "%(people)s commented the question"
 msgstr "%(people)s comentarion la pregunta"
 
-#: forum/models.py:260
+#: forum/models.py:267
 #, python-format
 msgid "%(people)s commented answers"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:262
+#: forum/models.py:269
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:306 forum/models.py:418
+#: forum/models.py:313 forum/models.py:425
 msgid "revisions"
 msgstr "revisiones/"
 
-#: forum/models.py:441 templates/badges.html:51
+#: forum/models.py:448 templates/badges.html:51
 msgid "gold"
 msgstr "oro"
 
-#: forum/models.py:442 templates/badges.html:59
+#: forum/models.py:449 templates/badges.html:59
 msgid "silver"
 msgstr "plata"
 
-#: forum/models.py:443 templates/badges.html:66
+#: forum/models.py:450 templates/badges.html:66
 msgid "bronze"
 msgstr "bronce"
 
@@ -707,27 +724,27 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:948
+#: forum/views.py:988
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr "subscripción guardada, %(email)s necesita validación"
 
-#: forum/views.py:1878
+#: forum/views.py:1918
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr "para subir imagenes debes tener más de 60 puntos de reputación"
 
-#: forum/views.py:1880
+#: forum/views.py:1920
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', "
 "'tiff'"
 
-#: forum/views.py:1882
+#: forum/views.py:1922
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1884
+#: forum/views.py:1924
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -851,22 +868,22 @@ msgid "select revision"
 msgstr "seleccionar revisión"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:467 templates/question_edit.html:91
+#: templates/question.html:468 templates/question_edit.html:91
 msgid "Toggle the real time Markdown editor preview"
 msgstr "Activar la visualización en tiempo real de Markdown"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:467 templates/question_edit.html:91
+#: templates/question.html:468 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr "Activar previsualización"
 
-#: templates/answer_edit.html:71 templates/question_edit.html:115
+#: templates/answer_edit.html:71 templates/question_edit.html:121
 #: templates/question_retag.html:73
 msgid "Save edit"
 msgstr "Guardar la edición"
 
 #: templates/answer_edit.html:72 templates/close.html:29
-#: templates/question_edit.html:116 templates/question_retag.html:74
+#: templates/question_edit.html:122 templates/question_retag.html:74
 #: templates/reopen.html:30 templates/user_edit.html:83
 #: templates/authopenid/changeemail.html:34
 msgid "Cancel"
@@ -957,15 +974,16 @@ msgstr ""
 "a>. <br/> Puedes enviar tu pregunta ahora y validar tu email luego. Tu "
 "pregunta será guardada mientras tanto y publicada cuando valides tu email."
 
-#: templates/ask.html:107
+#: templates/ask.html:107 templates/ask.html.py:114
+#: templates/question_edit.html:117
 msgid "(required)"
 msgstr "(requerido)"
 
-#: templates/ask.html:114
+#: templates/ask.html:121
 msgid "Login/signup to post your question"
 msgstr "Iniciar sesión/registrarse para publicar su pregunta"
 
-#: templates/ask.html:116
+#: templates/ask.html:123
 msgid "Ask your question"
 msgstr "Haz tu pregunta"
 
@@ -1105,8 +1123,8 @@ msgstr "la respuesta ha sido aceptada como correcta"
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/index.html:69 templates/question.html:499
-#: templates/questions.html:84 templates/questions.html.py:156
+#: templates/book.html:125 templates/index.html:69 templates/question.html:500
+#: templates/questions.html:84 templates/questions.html.py:157
 #: templates/tags.html:49 templates/unanswered.html:75
 #: templates/unanswered.html.py:106 templates/users_questions.html:54
 msgid "using tags"
@@ -1120,6 +1138,23 @@ msgstr "suscribirse al RSS del libro"
 msgid "subscribe to the questions feed"
 msgstr "suscribirse al agregado de noticias"
 
+#: templates/categories.html:6 templates/categories.html.py:29
+msgid "Category list"
+msgstr "Lista de Categorías"
+
+#: templates/categories.html:34 templates/tags.html:42
+msgid "Nothing found"
+msgstr "Nada encontrado"
+
+#: templates/categories.html:40
+#, fuzzy
+msgid "see questions that matches"
+msgstr "ver preguntas etiquetadas"
+
+#: templates/categories.html:40
+msgid "category "
+msgstr "categoría"
+
 #: templates/close.html:6 templates/close.html.py:16
 msgid "Close question"
 msgstr "Cerrar pregunta"
@@ -1483,8 +1518,8 @@ msgstr "todas las preguntas"
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:69 templates/question.html:499
-#: templates/questions.html:84 templates/questions.html.py:156
+#: templates/index.html:69 templates/question.html:500
+#: templates/questions.html:84 templates/questions.html.py:157
 #: templates/tags.html:49 templates/unanswered.html:75
 #: templates/unanswered.html.py:106 templates/users_questions.html:54
 msgid "see questions tagged"
@@ -1633,7 +1668,7 @@ msgid "i like this post (click again to cancel)"
 msgstr "Me gusta esta entrada (clickear devuelta para cancelar)"
 
 #: templates/question.html:75 templates/question.html.py:89
-#: templates/question.html:289
+#: templates/question.html:290
 msgid "current number of votes"
 msgstr "número actual de votos"
 
@@ -1652,168 +1687,171 @@ msgstr ""
 "remover marca de favorito a esta pregunta (clickear devuelta para volver a "
 "marcar)"
 
-#: templates/question.html:134 templates/question.html.py:322
+#: templates/question.html:128 templates/questions.html:87
+msgid "Category: "
+msgstr "Categoría: "
+
+#: templates/question.html:135 templates/question.html.py:323
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
 msgstr "editar"
 
-#: templates/question.html:138 templates/question.html.py:332
+#: templates/question.html:139 templates/question.html.py:333
 msgid "delete"
 msgstr "borrar"
 
-#: templates/question.html:143
+#: templates/question.html:144
 msgid "reopen"
 msgstr "re-abrir"
 
-#: templates/question.html:148
+#: templates/question.html:149
 msgid "close"
 msgstr "cerrar"
 
-#: templates/question.html:154 templates/question.html.py:345
+#: templates/question.html:155 templates/question.html.py:346
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 "reportar como ofensivo (ej. contiene spam, publicidad, texto malicioso, etc.)"
 
-#: templates/question.html:155 templates/question.html.py:346
+#: templates/question.html:156 templates/question.html.py:347
 msgid "flag offensive"
 msgstr "marcar como ofensivo"
 
-#: templates/question.html:167 templates/question.html.py:355
+#: templates/question.html:168 templates/question.html.py:356
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
 msgstr "actualizado"
 
-#: templates/question.html:216 templates/question.html.py:402
+#: templates/question.html:217 templates/question.html.py:403
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
 msgstr "preguntado"
 
-#: templates/question.html:246 templates/question.html.py:429
+#: templates/question.html:247 templates/question.html.py:430
 msgid "comments"
 msgstr "comentarios"
 
-#: templates/question.html:247 templates/question.html.py:430
+#: templates/question.html:248 templates/question.html.py:431
 msgid "add comment"
 msgstr "agregar comentario"
 
-#: templates/question.html:260
+#: templates/question.html:261
 msgid "The question has been closed for the following reason"
 msgstr "La pregunta fue cerrada por el siguiente motivo "
 
-#: templates/question.html:260
+#: templates/question.html:261
 msgid "by"
 msgstr "por"
 
-#: templates/question.html:262
-#, fuzzy
+#: templates/question.html:263
 msgid "close date "
-msgstr "[cerrada]"
+msgstr "fecha de cierre"
 
-#: templates/question.html:269 templates/user_stats.html:13
+#: templates/question.html:270 templates/user_stats.html:13
 msgid "Answers"
 msgstr "Respuestas"
 
-#: templates/question.html:271
+#: templates/question.html:272
 msgid "oldest answers will be shown first"
 msgstr "la respuesta mas vieja será mostrada primero"
 
-#: templates/question.html:271
+#: templates/question.html:272
 msgid "oldest answers"
 msgstr "pregunta más vieja"
 
-#: templates/question.html:272
+#: templates/question.html:273
 msgid "newest answers will be shown first"
 msgstr "preguntas más nuevas serán mostradas primero"
 
-#: templates/question.html:272
+#: templates/question.html:273
 msgid "newest answers"
 msgstr "más nuevas"
 
-#: templates/question.html:273
+#: templates/question.html:274
 msgid "most voted answers will be shown first"
 msgstr "las preguntas más votadas serán mostradas primero"
 
-#: templates/question.html:273
+#: templates/question.html:274
 msgid "popular answers"
 msgstr "respuestas populares"
 
-#: templates/question.html:287 templates/question.html.py:288
+#: templates/question.html:288 templates/question.html.py:289
 msgid "i like this answer (click again to cancel)"
 msgstr "me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:294 templates/question.html.py:295
+#: templates/question.html:295 templates/question.html.py:296
 msgid "i dont like this answer (click again to cancel)"
 msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:300 templates/question.html.py:301
+#: templates/question.html:301 templates/question.html.py:302
 msgid "mark this answer as favorite (click again to undo)"
 msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)"
 
-#: templates/question.html:306 templates/question.html.py:307
+#: templates/question.html:307 templates/question.html.py:308
 msgid "the author of the question has selected this answer as correct"
 msgstr "el autor de esta pregunta ha seleccionado esta respuesta como correcta"
 
-#: templates/question.html:329
+#: templates/question.html:330
 msgid "undelete"
 msgstr "deshacer eliminar"
 
-#: templates/question.html:339
+#: templates/question.html:340
 msgid "answer permanent link"
 msgstr "enlace permanente a respuesta"
 
-#: templates/question.html:340
+#: templates/question.html:341
 msgid "permanent link"
 msgstr "enlace permanente"
 
-#: templates/question.html:453
+#: templates/question.html:454
 msgid "Your answer"
 msgstr "Tu respuesta"
 
-#: templates/question.html:456
+#: templates/question.html:457
 msgid "you can answer anonymously and then login"
 msgstr "puedes responder de forma anónima y luego ingresar"
 
-#: templates/question.html:479
+#: templates/question.html:480
 msgid "Answer the question"
 msgstr "Responde la pregunta"
 
-#: templates/question.html:481
+#: templates/question.html:482
 msgid "Notify me daily if there are any new answers."
 msgstr "Notificarme diariamente si hay nuevas respuestas."
 
-#: templates/question.html:483
+#: templates/question.html:484
 msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr ""
 "una vez que hayas ingresado podrás suscribirte a cualquiera de las "
 "actualizaciones aquí."
 
-#: templates/question.html:494
+#: templates/question.html:495
 msgid "Question tags"
 msgstr "Tags de la pregunta"
 
-#: templates/question.html:504
+#: templates/question.html:505
 msgid "question asked"
 msgstr "pregunta preguntada"
 
-#: templates/question.html:504 templates/question.html.py:510
+#: templates/question.html:505 templates/question.html.py:511
 #: templates/user_info.html:51
 msgid "ago"
 msgstr " atras"
 
-#: templates/question.html:507
+#: templates/question.html:508
 msgid "question was seen"
 msgstr "la pregunta fue vista"
 
-#: templates/question.html:507
+#: templates/question.html:508
 msgid "times"
 msgstr "veces"
 
-#: templates/question.html:510
+#: templates/question.html:511
 msgid "last updated"
 msgstr "última vez actualizada"
 
-#: templates/question.html:515
+#: templates/question.html:516
 msgid "Related questions"
 msgstr "Preguntas relacionadas"
 
@@ -1878,7 +1916,7 @@ msgstr "preguntas actualizadas más recientemente"
 msgid "active"
 msgstr "actividad"
 
-#: templates/questions.html:109
+#: templates/questions.html:110
 #, python-format
 msgid ""
 "\n"
@@ -1897,7 +1935,7 @@ msgstr[1] ""
 "\t\t\ttiene un total de %(q_num)s preguntas etiquetadas con %(tagname)s\n"
 "\t\t\t"
 
-#: templates/questions.html:116
+#: templates/questions.html:117
 #, python-format
 msgid ""
 "\n"
@@ -1916,7 +1954,7 @@ msgstr[1] ""
 "\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n"
 "\t\t\t"
 
-#: templates/questions.html:122
+#: templates/questions.html:123
 #, fuzzy, python-format
 msgid ""
 "\n"
@@ -1929,36 +1967,36 @@ msgid_plural ""
 msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
 msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
 
-#: templates/questions.html:131
+#: templates/questions.html:132
 msgid "latest questions info"
 msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/questions.html:135
+#: templates/questions.html:136
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 "Las preguntas estan ordenadas por <strong>fecha de último update</strong>."
 
-#: templates/questions.html:136
+#: templates/questions.html:137
 msgid "Most recently answered ones are shown first."
 msgstr "Las más recientemente respondidas son mostradas primero."
 
-#: templates/questions.html:140
+#: templates/questions.html:141
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Preguntas ordenadas por <strong>número de respuestas</strong>."
 
-#: templates/questions.html:141
+#: templates/questions.html:142
 msgid "Most answered questions are shown first."
 msgstr "Preguntas más respondidas aparecen primero."
 
-#: templates/questions.html:145
+#: templates/questions.html:146
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>."
 
-#: templates/questions.html:146
+#: templates/questions.html:147
 msgid "Most voted questions are shown first."
 msgstr "Las preguntas más votadas son mostradas primero."
 
-#: templates/questions.html:153 templates/unanswered.html:102
+#: templates/questions.html:154 templates/unanswered.html:102
 msgid "Related tags"
 msgstr "Etiquetas relacionadas"
 
@@ -2023,10 +2061,6 @@ msgstr "Todas las etiquetas que coincidan con la busqueda"
 msgid "all tags - make this empty in english"
 msgstr "todas las tags"
 
-#: templates/tags.html:42
-msgid "Nothing found"
-msgstr "Nada encontrado"
-
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
 msgid "Unanswered questions"
 msgstr "Preguntas sin respuesta"
@@ -2262,7 +2296,7 @@ msgid "Your new Email"
 msgstr "Tu nuevo Email"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:137
 msgid "Password"
 msgstr "Contraseña"
 
@@ -2370,7 +2404,7 @@ msgid "This account already exists, please use another."
 msgstr "Esta cuenta ya existe, por favor usar otra."
 
 #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/signin.html:120
+#: templates/authopenid/sendpw.html:16 templates/authopenid/signin.html:121
 msgid "Sorry, looks like we have some errors:"
 msgstr "Ups, parece que hay errores:"
 
@@ -2402,7 +2436,7 @@ msgstr "contraseña"
 msgid "Register"
 msgstr "Registrarse"
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:139
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
@@ -2546,7 +2580,7 @@ msgstr ""
 "Ingresa tu dirección (URL) de <a class=\"openid_logo\" href=\"http://openid."
 "net\">OpenID</a>"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:138
 msgid "Login"
 msgstr "Ingresar"
 
@@ -2554,48 +2588,48 @@ msgstr "Ingresar"
 msgid "we support two login modes"
 msgstr "soportamos dos tipos de ingreso"
 
-#: templates/authopenid/signin.html:134
+#: templates/authopenid/signin.html:135
 msgid "Use login name and password"
 msgstr "Nombre de usuario y contraseña"
 
-#: templates/authopenid/signin.html:135
+#: templates/authopenid/signin.html:136
 msgid "Login name"
 msgstr "Nombre de usuario"
 
-#: templates/authopenid/signin.html:139
+#: templates/authopenid/signin.html:140
 msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-#: templates/authopenid/signin.html:148
+#: templates/authopenid/signin.html:149
 msgid "Why use OpenID?"
 msgstr "¿Porqué usar OpenID?"
 
-#: templates/authopenid/signin.html:151
+#: templates/authopenid/signin.html:152
 msgid "with openid it is easier"
 msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña."
 
-#: templates/authopenid/signin.html:154
+#: templates/authopenid/signin.html:155
 msgid "reuse openid"
 msgstr ""
 "Puedes de forma segura re-usar el mismo nombre de usuario para todos los "
 "sitios que acepten OpenID."
 
-#: templates/authopenid/signin.html:157
+#: templates/authopenid/signin.html:158
 msgid "openid is widely adopted"
 msgstr ""
 "OpenID es extensamente usado. Hay más de 160,000,000 cuentas de OpenID en "
 "uso en el mundo. Mas de 10,000 sitios aceptan OpenID."
 
-#: templates/authopenid/signin.html:160
+#: templates/authopenid/signin.html:161
 msgid "openid is supported open standard"
 msgstr ""
 "OpenID es basado en un standard abierto, apoyado por muchas organizaciones."
 
-#: templates/authopenid/signin.html:165
+#: templates/authopenid/signin.html:166
 msgid "Find out more"
 msgstr "Averigua más"
 
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:167
 msgid "Get OpenID"
 msgstr "Adquiere una OpenID"
 
@@ -2639,15 +2673,9 @@ msgstr "Registrate con tu OpenID"
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
-#~ msgid ""
-#~ "The question has been closed for the following reason \"%(question."
-#~ "get_close_reason_display)s\" by"
-#~ msgstr ""
-#~ "La pregunta ha sido cerrada por el siguiente motivo \"%(question."
-#~ "get_close_reason_display)s\" por"
-
-#~ msgid "close date %(question.closed_at)s"
-#~ msgstr "fecha de cerrada %(question.closed_at)s"
+#, fuzzy
+#~ msgid "complete list of quesionts"
+#~ msgstr "lista completa de preguntas"
 
 #~ msgid "votes total"
 #~ msgstr "votos totales"
diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
index 383723ca..37091261 100644
--- a/templates/authopenid/sendpw.html
+++ b/templates/authopenid/sendpw.html
@@ -13,7 +13,7 @@
 {% trans "Please enter your username below and new password will be sent to your registered e-mail" %}
 </div>
 {% if form.errors %}
-<p class="errors"><span class="big">{% "Sorry, looks like we have some errors:" %}</span><br/>
+<p class="errors"><span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
 	{% if form.username.errors %} 
 		<span class="error">{{ form.username.errors|join:", " }}</span>
 	{% endif %}
diff --git a/templates/authopenid/settings.html b/templates/authopenid/settings.html
index a373324e..ecc16c72 100644
--- a/templates/authopenid/settings.html
+++ b/templates/authopenid/settings.html
@@ -31,7 +31,7 @@
         <dt>» <a href="{% url user_changeemail %}">{% trans "Change email " %}</a></dt>
         <dd>{% trans "Add or update the email address associated with your account." %}</dd>
         {% if is_openid %}
-        <dt>» <a href="{% url user_changeopenid %}">{% trans "Change OpenID %}</a></dt>
+        <dt>» <a href="{% url user_changeopenid %}">{% trans "Change OpenID" %}</a></dt>
         <dd>{% trans "Change openid associated to your account" %}</dd>
         {% endif %}
         
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index 8601f6ee..60aa5e5d 100644
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -37,14 +37,16 @@
                 {% endblocktrans %}
             </div>
         {% endif %}
-		<div style="width:600px;float:left;margin-bottom:5px;">{% trans "Click to sign in through any of these services." %}</div>
 			<form id="openid_form" name="openid_form" class="openid" method="post" action="{% url user_signin %}"> 
+		      <div style="width:600px;float:left;margin-bottom:5px;">
+                {% trans "Click to sign in through any of these services." %}
+              </div>
 			  <ul class="providers"> 
-			  <li class="openid" title="OpenID">
-				  <div class="logo_box openid_box">
-						<img src="/content/jquery-openid/images/openid.gif" alt="icon" /> 
+			  <li class="local" title="Local login">
+				  <div class="logo_box local_login_box">
+						<img src="/content/jquery-openid/images/local-login.png" alt="icon" /> 
 				  </div>
-			  <span><strong>http://{your-openid-url}</strong></span>
+			  <span></span>
 			  </li> 
 			  <li class="direct" title="Google"> 
 			  	<div class="logo_box google_box">
@@ -61,7 +63,17 @@
 					<img src="/content/jquery-openid/images/aol.gif" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
 				</div>
 			  </li>
-			  <li class="username first_tiny_li" title="MyOpenID user name"> 
+			  <!--<li class="openid" title="OpenID">
+				  <div class="logo_box openid_box">
+						<img src="/content/jquery-openid/images/openid.gif" alt="icon" /> 
+				  </div>
+			  <span><strong>http://{your-openid-url}</strong></span>
+			  </li>-->
+			  <li class="openid first_tiny_li" title="OpenID URL"> 
+					<img src="/content/jquery-openid/images/openidico16.png" alt="icon" />
+					<span>http://{your-openid-url}</span>
+		      </li> 
+			  <li class="username" title="MyOpenID user name"> 
 					<img src="/content/jquery-openid/images/myopenid-2.png" alt="icon" />
 					<span>http://<strong>username</strong>.myopenid.com/</span>
 		      </li> 
@@ -111,36 +123,33 @@
 				  <div><p><input id="openid_url" type="text" value="http://" name="openid_url" /> 
 				  <input id="bsignin" name="bsignin" type="submit" value="{% trans "Login" %}" /></p></div> 
 			  </fieldset> 
+              <fieldset id='local_login_fs'>
+				  <p>{% trans 'Enter your login name and password' %}</p> 
+                        {% if form1.errors %}
+                        <p class="errors">
+                            <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
+                            <ul class="error-list">
+                                {% if form1.username.errors %} 
+                                <li><span class="error">{{ form1.username.errors|join:", " }}</span></li>
+                                {% endif %}
+                                {% if form1.password.errors %} 
+                                <li><span class="error">{{ form1.password.errors|join:", " }}</span></li>
+                                {% endif %}
+                            </ul>
+                        </p>
+                        {% endif %}
+				  <div><label for="username">{% trans "Login name" %}</label>
+                            {{form1.username}}<br/>
+                  <label for="password">{% trans "Password" %}</label>
+                            {{form1.password}}<br/>
+                  <p id="local_login_buttons">
+				  <input id="blogin" name="blogin" type="submit" value="{% trans "Login" %}" />
+                  <a href="{% url user_signup %}">{% trans "Create account" %}</a><br/>
+                  <a href="{% url user_sendpw %}">{% trans "I forgot my password" %}</a>
+                  </p>
+                  </div>
+              </fieldset>
 			</form>
-<div class="login">
-        <p style="display:none">{% trans "we support two login modes" %}</p>
-    <div style="display:none">
-        {% if form1.errors %}
-        <p class="errors">
-            <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
-            <ul class="error-list">
-                {% if form1.username.errors %} 
-                <li><span class="error">{{ form1.username.errors|join:", " }}</span></li>
-                {% endif %}
-                {% if form1.password.errors %} 
-                <li><span class="error">{{ form1.password.errors|join:", " }}</span></li>
-                {% endif %}
-            </ul>
-        </p>
-        {% endif %}
-        <form name="fauth" action="{% url user_signin %}" method="post">
-            {{ form1.next }}
-        	<fieldset class="fieldset" >
-        		<legend class="big">{% trans "Use login name and password" %}</legend>
-        		<div class="form-row"><label for="id_username">{% trans "Login name" %}:</label><br />{{ form1.username }}</div>
-        		<div class="form-row"><label for="id_password">{% trans "Password" %}:</label><br />{{ form1.password }}</div>
-               <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"/> 
-			   <a href="">{% trans "Forgot your password?" %}</a> 
-			   <a href="">{% trans "Create new account" %}</a></div>
-        	</fieldset>	
-        </form>
-    </div>
-</div>	
 {% endblock %}
 
 {% block sidebar %}
diff --git a/templates/content/jquery-openid/images/local-login.png b/templates/content/jquery-openid/images/local-login.png
new file mode 100644
index 00000000..258cedac
Binary files /dev/null and b/templates/content/jquery-openid/images/local-login.png differ
diff --git a/templates/content/jquery-openid/images/openidico16.png b/templates/content/jquery-openid/images/openidico16.png
new file mode 100644
index 00000000..ad718ac5
Binary files /dev/null and b/templates/content/jquery-openid/images/openidico16.png differ
diff --git a/templates/content/jquery-openid/jquery.openid.js b/templates/content/jquery-openid/jquery.openid.js
index eec29ab2..6486fd39 100644
--- a/templates/content/jquery-openid/jquery.openid.js
+++ b/templates/content/jquery-openid/jquery.openid.js
@@ -13,6 +13,7 @@ $.fn.openid = function() {
   var $end = $this.find('p:has(input[name=openid_username])>span:eq(1)');
 
   //needed for special effects only
+  var $localfs = $this.find('fieldset:has(input[name=username])');
   var $usrfs = $this.find('fieldset:has(input[name=openid_username])');
   var $idfs = $this.find('fieldset:has(input[name=openid_url])');
 
@@ -33,11 +34,23 @@ $.fn.openid = function() {
     return true;
 
   };
+  var local = function() {
+    var $li = $(this);
+    $li.parent().find('li').removeClass('highlight');
+    $li.addClass('highlight');
+    $usrfs.hide();
+    $idfs.hide();
+    $localfs.show();
+    $this.unbind('submit').submit(submitid);
+    return false;
+  };
+
   var direct = function() {
     var $li = $(this);
     $li.parent().find('li').removeClass('highlight');
     $li.addClass('highlight');
     $usrfs.fadeOut('slow');
+    $localfs.fadeOut('slow');
     $idfs.fadeOut('slow');
     $id.val($this.find("li.highlight span").text());
     setTimeout(function(){$('#bsignin').click()},1000);
@@ -49,6 +62,7 @@ $.fn.openid = function() {
     $li.parent().find('li').removeClass('highlight');
     $li.addClass('highlight');
     $usrfs.hide();
+    $localfs.hide();
     $idfs.show();
     $id.focus();
     $this.unbind('submit').submit(submitid);
@@ -60,6 +74,7 @@ $.fn.openid = function() {
     $li.parent().find('li').removeClass('highlight');
     $li.addClass('highlight');
     $idfs.hide();
+    $localfs.hide();
     $usrfs.show();
     $this.find('#enter_your_what').text($li.attr("title"));
     $front.text($li.find("span").text().split("username")[0]);
@@ -69,6 +84,7 @@ $.fn.openid = function() {
     return false;
   };
 
+  $this.find('li.local').click(local);
   $this.find('li.direct').click(direct);
   $this.find('li.openid').click(openid);
   $this.find('li.username').click(username);
@@ -84,6 +100,9 @@ $.fn.openid = function() {
   });
   $this.find('li span').hide();
   $this.find('li').css('line-height', 0).css('cursor', 'pointer');
+  $usrfs.hide();
+  $idfs.hide();
+  $localfs.hide();
   $this.find('li:eq(0)').click();
 
   return this;
diff --git a/templates/content/jquery-openid/openid.css b/templates/content/jquery-openid/openid.css
index 6c59192f..2ec8adf4 100644
--- a/templates/content/jquery-openid/openid.css
+++ b/templates/content/jquery-openid/openid.css
@@ -6,6 +6,7 @@ img {border-style:none;}
 .aol_box img {margin-top:6px;}
 .yahoo_box img {margin-top:13px;}
 .google_box img {margin-top:6px;}
+.local_login_box img {margin-top:9px;}
 
 form.openid ul{ margin:0;padding:0;text-align:center; list-style-type:none; display:block;}
 form.openid ul li {float:left; padding:4px;} 
@@ -20,7 +21,22 @@ form.openid ul li.highlight { -moz-border-radius:4px; -webkit-border-radius:4px;
 form.openid fieldset div {-moz-border-radius:4px; -webkit-border-radius:4px; 
                           background: #DCDCDC;
 						  padding:10px;display:inline-block}
+form.openid p {margin-bottom:4px;}
 form.openid fieldset div p {padding:0px;margin:0px;}
+form.openid label {
+    display:inline-block;
+    font-weight:normal;
+    width:6em;
+    text-align:right;
+}
+#local_login_fs div {
+    padding-bottom:4px;
+}
+#local_login_buttons {
+    text-align:center;
+    line-height:1.8em;
+    margin-top:3px;
+}
 /*form.openid input[type='submit'] {margin-left:1em;}*/
 #openid_username {background:#ffffa0;}
 #openid_url {background:#ffffa0;}
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 6d48198b..0fb96c7f 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -1093,7 +1093,9 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p
 	color:#d64000;
 	font-weight:bold;
 }
-
+.grey {
+    color:#808080;
+}
 .about div {
     padding:10px 5px 10px 5px;
     border-top:1px dashed #aaaaaa;
diff --git a/templates/footer.html b/templates/footer.html
index 9e877b42..7eb0205e 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 <!-- 页面底部开始： -->
     <div id="ground">
-        <div class="footerLinks" >
+       <div class="footerLinks" >
             <a href="{% url about %}">{% trans "about" %}</a><span class="link-separator"> |</span>
             <a href="{% url faq %}">{% trans "faq" %}</a><span class="link-separator"> |</span>
             <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
diff --git a/templates/question.html b/templates/question.html
index 7f1ab3a5..c9446076 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -9,7 +9,7 @@
         <meta name="description" content="{{question.summary}}" />
         <meta name="keywords" content="{{question.tagname_meta_generator}}" />
         <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}"/>
-        {% if not question.closed and request.user.is_authenticated %}
+        {% if not question.closed %}
         <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
         <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
         <script type='text/javascript' src='/content/js/wmd/wmd.js'></script>
@@ -259,7 +259,7 @@
             <div class="question-status" style="margin-bottom:15px">
                 <h3>{% trans "The question has been closed for the following reason" %} "{{ question.get_close_reason_display }}" {% trans "by"%} 
 			<a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> 
-			{% blocktrans %}close date {% endblocktrans %}{{question.closed_at|date:"d-m-Y H:i"}}</h3>
+			{% blocktrans %}close date {% endblocktrans %} {{question.closed_at|date:"d-m-Y H:i"}}</h3>
             </div>
             {% endif %}
             
-- 
cgit v1.2.3-1-g7c22


From 0b725addffa936ffb2cfa0be2d8d85f784661ee7 Mon Sep 17 00:00:00 2001
From: Mike Chen <chagel@gmail.com>
Date: Sun, 23 Aug 2009 23:08:15 +0800
Subject: update user_reputation for Django aggregation changes

---
 forum/views.py | 1673 ++++++++++++++++++++++++++++----------------------------
 settings.py    |    4 +-
 2 files changed, 846 insertions(+), 831 deletions(-)

diff --git a/forum/views.py b/forum/views.py
index e47b9111..0d2b3ca2 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1,32 +1,35 @@
 # encoding:utf-8
-import os.path
-import time, datetime, calendar, random
-import logging
-from urllib import quote, unquote
+import calendar
 from django.conf import settings
-from django.core.files.storage import default_storage
-from django.shortcuts import render_to_response, get_object_or_404
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseRedirect, HttpResponse,Http404
-from django.core.paginator import Paginator, EmptyPage, InvalidPage
+from django.contrib.contenttypes.models import ContentType
+from django.core.files.storage import default_storage
+from django.core.paginator import EmptyPage
+from django.core.paginator import InvalidPage
+from django.core.paginator import Paginator
+from django.http import Http404
+from django.http import HttpResponse
+from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404
+from django.shortcuts import render_to_response
 from django.template import RequestContext
-from django.utils.html import *
 from django.utils import simplejson
-from django.core import serializers
-from django.db import transaction
-from django.contrib.contenttypes.models import ContentType
+from django.utils.html import *
 from django.utils.translation import ugettext as _
-
-from utils.html import sanitize_html
 from markdown2 import Markdown
-#from lxml.html.diff import htmldiff
+import os.path
+import random
+import time
+
+import datetime
+from forum import auth
+from forum.auth import *
+from forum.const import *
 from forum.diff import textDiff as htmldiff
 from forum.forms import *
 from forum.models import *
-from forum.auth import *
-from forum.const import *
 from forum.user import *
-from forum import auth
+from utils.html import sanitize_html
 
 # used in index page
 INDEX_PAGE_SIZE = 20
@@ -46,7 +49,7 @@ answer_type = ContentType.objects.get_for_model(Answer)
 comment_type = ContentType.objects.get_for_model(Comment)
 question_revision_type = ContentType.objects.get_for_model(QuestionRevision)
 answer_revision_type = ContentType.objects.get_for_model(AnswerRevision)
-repute_type =ContentType.objects.get_for_model(Repute)
+repute_type = ContentType.objects.get_for_model(Repute)
 question_type_id = question_type.id
 answer_type_id = answer_type.id
 comment_type_id = comment_type.id
@@ -57,7 +60,7 @@ def _get_tags_cache_json():
     tags = Tag.objects.filter(deleted=False).all()
     tags_list = []
     for tag in tags:
-        dic = {'n': tag.name, 'c': tag.used_count }
+        dic = {'n': tag.name, 'c': tag.used_count}
         tags_list.append(dic)
     tags = simplejson.dumps(tags_list)
     return tags
@@ -65,11 +68,11 @@ def _get_tags_cache_json():
 def index(request):
     view_id = request.GET.get('sort', None)
     view_dic = {
-             "latest":"-last_activity_at",
-             "hottest":"-answer_count",
-             "mostvoted":"-score",
-             "trans": "-last_activity_at"
-             }
+        "latest":"-last_activity_at",
+        "hottest":"-answer_count",
+        "mostvoted":"-score",
+        "trans": "-last_activity_at"
+        }
     try:
         orderby = view_dic[view_id]
     except KeyError:
@@ -87,11 +90,11 @@ def index(request):
     awards = Award.objects.get_recent_awards()
 
     return render_to_response('index.html', {
-        "questions" : questions,
-        "tab_id" : view_id,
-        "tags" : tags,
-        "awards" : awards[:INDEX_AWARD_SIZE],
-        }, context_instance=RequestContext(request))
+                              "questions": questions,
+                              "tab_id": view_id,
+                              "tags": tags,
+                              "awards": awards[:INDEX_AWARD_SIZE],
+                              }, context_instance=RequestContext(request))
 
 def about(request):
     return render_to_response('about.html', context_instance=RequestContext(request))
@@ -115,14 +118,14 @@ def questions(request, tagname=None, unanswered=False):
     # Set flag to False by default. If it is equal to True, then need to be saved.
     pagesize_changed = False
     # get pagesize from session, if failed then get default value
-    pagesize = request.session.get("pagesize",10)
+    pagesize = request.session.get("pagesize", 10)
     try:
         page = int(request.GET.get('page', '1'))
     except ValueError:
         page = 1
 
     view_id = request.GET.get('sort', None)
-    view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
+    view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score"}
     try:
         orderby = view_dic[view_id]
     except KeyError:
@@ -150,38 +153,38 @@ def questions(request, tagname=None, unanswered=False):
     else:
         related_tags = None
     return render_to_response(template_file, {
-        "questions" : questions,
-        "tab_id" : view_id,
-        "questions_count" : objects_list.count,
-        "tags" : related_tags,
-        "searchtag" : tagname,
-        "is_unanswered" : unanswered,
-        "context" : {
-            'is_paginated' : True,
-            'pages': objects_list.num_pages,
-            'page': page,
-            'has_previous': questions.has_previous(),
-            'has_next': questions.has_next(),
-            'previous': questions.previous_page_number(),
-            'next': questions.next_page_number(),
-            'base_url' : request.path + '?sort=%s&' % view_id,
-            'pagesize' : pagesize
-        }}, context_instance=RequestContext(request))
-
-def create_new_answer( question=None, author=None,\
-            added_at=None, wiki=False,\
-            text='', email_notify=False):
+                              "questions": questions,
+                              "tab_id": view_id,
+                              "questions_count": objects_list.count,
+                              "tags": related_tags,
+                              "searchtag": tagname,
+                              "is_unanswered": unanswered,
+                              "context": {
+                              'is_paginated': True,
+                              'pages': objects_list.num_pages,
+                              'page': page,
+                              'has_previous': questions.has_previous(),
+                              'has_next': questions.has_next(),
+                              'previous': questions.previous_page_number(),
+                              'next': questions.next_page_number(),
+                              'base_url': request.path + '?sort=%s&' % view_id,
+                              'pagesize': pagesize
+                              }}, context_instance=RequestContext(request))
+
+def create_new_answer(question=None, author=None, \
+                      added_at=None, wiki=False, \
+                      text='', email_notify=False):
 
     html = sanitize_html(markdowner.convert(text))
 
     #create answer
     answer = Answer(
-        question = question,
-        author = author,
-        added_at = added_at,
-        wiki = wiki,
-        html = html
-    )
+                    question=question,
+                    author=author,
+                    added_at=added_at,
+                    wiki=wiki,
+                    html=html
+                    )
     if answer.wiki:
         answer.last_edited_by = answer.author
         answer.last_edited_at = added_at 
@@ -197,47 +200,47 @@ def create_new_answer( question=None, author=None,\
 
     #update revision
     AnswerRevision.objects.create(
-        answer     = answer,
-        revision   = 1,
-        author     = author,
-        revised_at = added_at,
-        summary    = CONST['default_version'],
-        text       = text
-    )
+                                  answer=answer,
+                                  revision=1,
+                                  author=author,
+                                  revised_at=added_at,
+                                  summary=CONST['default_version'],
+                                  text=text
+                                  )
 
     #set notification/delete
     if email_notify:
         try:
-            EmailFeed.objects.get(feed_id = question.id, subscriber_id = author.id, feed_content_type=question_type)
+            EmailFeed.objects.get(feed_id=question.id, subscriber_id=author.id, feed_content_type=question_type)
         except EmailFeed.DoesNotExist:
-            feed = EmailFeed(content = question, subscriber = author)
+            feed = EmailFeed(content=question, subscriber=author)
             feed.save()
     else:
         #not sure if this is necessary. ajax should take care of this...
         try:
-            feed = Email.objects.get(feed_id = question.id, subscriber_id = author.id, feed_content_type=question_type)
+            feed = Email.objects.get(feed_id=question.id, subscriber_id=author.id, feed_content_type=question_type)
             feed.delete()
         except:
             pass
 
-def create_new_question(title=None,author=None,added_at=None,
-                        wiki=False,tagnames=None,summary=None,
+def create_new_question(title=None, author=None, added_at=None,
+                        wiki=False, tagnames=None, summary=None,
                         text=None):
     """this is not a view
     and maybe should become one of the methods on Question object?
     """
     html = sanitize_html(markdowner.convert(text))
     question = Question(
-        title            = title,
-        author           = author, 
-        added_at         = added_at,
-        last_activity_at = added_at,
-        last_activity_by = author,
-        wiki             = wiki,
-        tagnames         = tagnames,
-        html             = html,
-        summary          = summary 
-    )
+                        title=title,
+                        author=author,
+                        added_at=added_at,
+                        last_activity_at=added_at,
+                        last_activity_by=author,
+                        wiki=wiki,
+                        tagnames=tagnames,
+                        html=html,
+                        summary=summary
+                        )
     if question.wiki:
         question.last_edited_by = question.author
         question.last_edited_at = added_at
@@ -247,15 +250,15 @@ def create_new_question(title=None,author=None,added_at=None,
 
     # create the first revision
     QuestionRevision.objects.create(
-        question   = question,
-        revision   = 1,
-        title      = question.title,
-        author     = author,
-        revised_at = added_at,
-        tagnames   = question.tagnames,
-        summary    = CONST['default_version'],
-        text       = text
-    )
+                                    question=question,
+                                    revision=1,
+                                    title=question.title,
+                                    author=author,
+                                    revised_at=added_at,
+                                    tagnames=question.tagnames,
+                                    summary=CONST['default_version'],
+                                    text=text
+                                    )
     return question
 
 #TODO: allow anynomus user to ask question by providing email and username.
@@ -277,39 +280,39 @@ def ask(request):
                 author = request.user 
 
                 question = create_new_question(
-                    title            = title,
-                    author           = author, 
-                    added_at         = added_at,
-                    wiki             = wiki,
-                    tagnames         = tagnames,
-                    summary          = summary,
-                    text = text
-                )
+                                               title=title,
+                                               author=author,
+                                               added_at=added_at,
+                                               wiki=wiki,
+                                               tagnames=tagnames,
+                                               summary=summary,
+                                               text=text
+                                               )
 
                 return HttpResponseRedirect(question.get_absolute_url())
             else:
                 request.session.flush()
                 session_key = request.session.session_key
                 question = AnonymousQuestion(
-                    session_key = session_key,
-                    title       = title,
-                    tagnames = tagnames,
-                    wiki = wiki,
-                    text = text,
-                    summary = summary,
-                    added_at = added_at,
-					ip_addr = request.META['REMOTE_ADDR'],
-                )
+                                             session_key=session_key,
+                                             title=title,
+                                             tagnames=tagnames,
+                                             wiki=wiki,
+                                             text=text,
+                                             summary=summary,
+                                             added_at=added_at,
+                                             ip_addr=request.META['REMOTE_ADDR'],
+                                             )
                 question.save()
-                return HttpResponseRedirect('%s%s%s' % ( _('/account/'),_('signin/'),('newquestion/')))
+                return HttpResponseRedirect('%s%s%s' % (_('/account/'), _('signin/'), ('newquestion/')))
     else:
         form = AskForm()
 
     tags = _get_tags_cache_json()
     return render_to_response('ask.html', {
-        'form' : form,
-        'tags' : tags,
-        }, context_instance=RequestContext(request))
+                              'form': form,
+                              'tags': tags,
+                              }, context_instance=RequestContext(request))
 
 def question(request, id):
     try:
@@ -317,7 +320,7 @@ def question(request, id):
     except ValueError:
         page = 1
     view_id = request.GET.get('sort', 'votes')
-    view_dic = {"latest":"-added_at", "oldest":"added_at", "votes":"-score" }
+    view_dic = {"latest":"-added_at", "oldest":"added_at", "votes":"-score"}
     try:
         orderby = view_dic[view_id]
     except KeyError:
@@ -327,7 +330,7 @@ def question(request, id):
     question = get_object_or_404(Question, id=id)
     if question.deleted and not can_view_deleted_post(request.user, question):
         raise Http404
-    answer_form = AnswerForm(question,request.user)
+    answer_form = AnswerForm(question, request.user)
     answers = Answer.objects.get_answers_from_question(question, request.user)
     answers = answers.select_related(depth=1)
 
@@ -362,28 +365,28 @@ def question(request, id):
     # update view count
     Question.objects.update_view_count(question)
     return render_to_response('question.html', {
-        "question" : question,
-        "question_vote" : question_vote,
-        "question_comment_count":question.comments.count(),
-        "answer" : answer_form,
-        "answers" : page_objects.object_list,
-        "user_answer_votes": user_answer_votes,
-        "tags" : question.tags.all(),
-        "tab_id" : view_id,
-        "favorited" : favorited,
-        "similar_questions" : Question.objects.get_similar_questions(question),
-        "context" : {
-            'is_paginated' : True,
-            'pages': objects_list.num_pages,
-            'page': page,
-            'has_previous': page_objects.has_previous(),
-            'has_next': page_objects.has_next(),
-            'previous': page_objects.previous_page_number(),
-            'next': page_objects.next_page_number(),
-            'base_url' : request.path + '?sort=%s&' % view_id,
-            'extend_url' : "#sort-top"
-        }
-        }, context_instance=RequestContext(request))
+                              "question": question,
+                              "question_vote": question_vote,
+                              "question_comment_count":question.comments.count(),
+                              "answer": answer_form,
+                              "answers": page_objects.object_list,
+                              "user_answer_votes": user_answer_votes,
+                              "tags": question.tags.all(),
+                              "tab_id": view_id,
+                              "favorited": favorited,
+                              "similar_questions": Question.objects.get_similar_questions(question),
+                              "context": {
+                              'is_paginated': True,
+                              'pages': objects_list.num_pages,
+                              'page': page,
+                              'has_previous': page_objects.has_previous(),
+                              'has_next': page_objects.has_next(),
+                              'previous': page_objects.previous_page_number(),
+                              'next': page_objects.next_page_number(),
+                              'base_url': request.path + '?sort=%s&' % view_id,
+                              'extend_url': "#sort-top"
+                              }
+                              }, context_instance=RequestContext(request))
 
 @login_required
 def close(request, id):
@@ -403,9 +406,9 @@ def close(request, id):
     else:
         form = CloseForm()
         return render_to_response('close.html', {
-            'form' : form,
-            'question' : question,
-            }, context_instance=RequestContext(request))
+                                  'form': form,
+                                  'question': question,
+                                  }, context_instance=RequestContext(request))
 
 @login_required
 def reopen(request, id):
@@ -413,14 +416,14 @@ def reopen(request, id):
     # open question
     if not can_reopen_question(request.user, question):
         return HttpResponse('Permission denied.')
-    if request.method == 'POST' :
+    if request.method == 'POST':
         Question.objects.filter(id=question.id).update(closed=False,
-            closed_by=None, closed_at=None, close_reason=None)
+                                                       closed_by=None, closed_at=None, close_reason=None)
         return HttpResponseRedirect(question.get_absolute_url())
     else:
         return render_to_response('reopen.html', {
-            'question' : question,
-            }, context_instance=RequestContext(request))
+                                  'question': question,
+                                  }, context_instance=RequestContext(request))
 
 @login_required
 def edit_question(request, id):
@@ -443,25 +446,25 @@ def _retag_question(request, question):
                 retagged_at = datetime.datetime.now()
                 # Update the Question itself
                 Question.objects.filter(id=question.id).update(
-                    tagnames         = form.cleaned_data['tags'],
-                    last_edited_at   = retagged_at,
-                    last_edited_by   = request.user,
-                    last_activity_at = retagged_at,
-                    last_activity_by = request.user
-                )
+                                                               tagnames=form.cleaned_data['tags'],
+                                                               last_edited_at=retagged_at,
+                                                               last_edited_by=request.user,
+                                                               last_activity_at=retagged_at,
+                                                               last_activity_by=request.user
+                                                               )
                 # Update the Question's tag associations
                 tags_updated = Question.objects.update_tags(question,
-                    form.cleaned_data['tags'], request.user)
+                                                            form.cleaned_data['tags'], request.user)
                 # Create a new revision
                 QuestionRevision.objects.create(
-                    question   = question,
-                    title      = latest_revision.title,
-                    author     = request.user,
-                    revised_at = retagged_at,
-                    tagnames   = form.cleaned_data['tags'],
-                    summary    = CONST['retagged'],
-                    text       = latest_revision.text
-                )
+                                                question=question,
+                                                title=latest_revision.title,
+                                                author=request.user,
+                                                revised_at=retagged_at,
+                                                tagnames=form.cleaned_data['tags'],
+                                                summary=CONST['retagged'],
+                                                text=latest_revision.text
+                                                )
                 # send tags updated singal
                 tags_updated.send(sender=question.__class__, question=question)
 
@@ -469,10 +472,10 @@ def _retag_question(request, question):
     else:
         form = RetagQuestionForm(question)
     return render_to_response('question_retag.html', {
-        'question': question,
-        'form' : form,
-        'tags' : _get_tags_cache_json(),
-    }, context_instance=RequestContext(request))
+                              'question': question,
+                              'form': form,
+                              'tags': _get_tags_cache_json(),
+                              }, context_instance=RequestContext(request))
 
 
 def _edit_question(request, question):
@@ -485,8 +488,8 @@ def _edit_question(request, question):
             if revision_form.is_valid():
                 # Replace with those from the selected revision
                 form = EditQuestionForm(question,
-                    QuestionRevision.objects.get(question=question,
-                        revision=revision_form.cleaned_data['revision']))
+                                        QuestionRevision.objects.get(question=question,
+                                        revision=revision_form.cleaned_data['revision']))
             else:
                 form = EditQuestionForm(question, latest_revision, request.POST)
         else:
@@ -520,20 +523,20 @@ def _edit_question(request, question):
                         updated_fields['wikified_at'] = edited_at
 
                     Question.objects.filter(
-                        id=question.id).update(**updated_fields)
+                                            id=question.id).update(** updated_fields)
                     # Update the Question's tag associations
                     if tags_changed:
                         tags_updated = Question.objects.update_tags(
-                            question, form.cleaned_data['tags'], request.user)
+                                                                    question, form.cleaned_data['tags'], request.user)
                     # Create a new revision
                     revision = QuestionRevision(
-                        question   = question,
-                        title      = form.cleaned_data['title'],
-                        author     = request.user,
-                        revised_at = edited_at,
-                        tagnames   = form.cleaned_data['tags'],
-                        text       = form.cleaned_data['text'],
-                    )
+                                                question=question,
+                                                title=form.cleaned_data['title'],
+                                                author=request.user,
+                                                revised_at=edited_at,
+                                                tagnames=form.cleaned_data['tags'],
+                                                text=form.cleaned_data['text'],
+                                                )
                     if form.cleaned_data['summary']:
                         revision.summary = form.cleaned_data['summary']
                     else:
@@ -546,11 +549,11 @@ def _edit_question(request, question):
         revision_form = RevisionForm(question, latest_revision)
         form = EditQuestionForm(question, latest_revision)
     return render_to_response('question_edit.html', {
-        'question': question,
-        'revision_form': revision_form,
-        'form' : form,
-        'tags' : _get_tags_cache_json()
-    }, context_instance=RequestContext(request))
+                              'question': question,
+                              'revision_form': revision_form,
+                              'form': form,
+                              'tags': _get_tags_cache_json()
+                              }, context_instance=RequestContext(request))
 
 
 @login_required
@@ -569,8 +572,8 @@ def edit_answer(request, id):
                 if revision_form.is_valid():
                     # Replace with those from the selected revision
                     form = EditAnswerForm(answer,
-                        AnswerRevision.objects.get(answer=answer,
-                            revision=revision_form.cleaned_data['revision']))
+                                          AnswerRevision.objects.get(answer=answer,
+                                          revision=revision_form.cleaned_data['revision']))
                 else:
                     form = EditAnswerForm(answer, latest_revision, request.POST)
             else:
@@ -584,14 +587,14 @@ def edit_answer(request, id):
                             'last_edited_by': request.user,
                             'html': html,
                         }
-                        Answer.objects.filter(id=answer.id).update(**updated_fields)
+                        Answer.objects.filter(id=answer.id).update(** updated_fields)
 
                         revision = AnswerRevision(
-                            answer     = answer,
-                            author     = request.user,
-                            revised_at = edited_at,
-                            text       = form.cleaned_data['text']
-                        )
+                                                  answer=answer,
+                                                  author=request.user,
+                                                  revised_at=edited_at,
+                                                  text=form.cleaned_data['text']
+                                                  )
 
                         if form.cleaned_data['summary']:
                             revision.summary = form.cleaned_data['summary']
@@ -608,14 +611,14 @@ def edit_answer(request, id):
             revision_form = RevisionForm(answer, latest_revision)
             form = EditAnswerForm(answer, latest_revision)
         return render_to_response('answer_edit.html', {
-        'answer': answer,
-        'revision_form': revision_form,
-        'form' : form,
-    }, context_instance=RequestContext(request))
+                                  'answer': answer,
+                                  'revision_form': revision_form,
+                                  'form': form,
+                                  }, context_instance=RequestContext(request))
 
 QUESTION_REVISION_TEMPLATE = ('<h1>%(title)s</h1>\n'
-    '<div class="text">%(html)s</div>\n'
-    '<div class="tags">%(tags)s</div>')
+                              '<div class="text">%(html)s</div>\n'
+                              '<div class="tags">%(tags)s</div>')
 def question_revisions(request, id):
     post = get_object_or_404(Question, id=id)
     revisions = list(post.revisions.all())
@@ -624,7 +627,7 @@ def question_revisions(request, id):
             'title': revision.title,
             'html': sanitize_html(markdowner.convert(revision.text)),
             'tags': ' '.join(['<a class="post-tag">%s</a>' % tag
-                              for tag in revision.tagnames.split(' ')]),
+                             for tag in revision.tagnames.split(' ')]),
         }
         if i > 0:
             revisions[i - 1].diff = htmldiff(revision.html,
@@ -634,13 +637,13 @@ def question_revisions(request, id):
                 'title': revisions[0].title,
                 'html': sanitize_html(markdowner.convert(revisions[0].text)),
                 'tags': ' '.join(['<a class="post-tag">%s</a>' % tag
-                                  for tag in revisions[0].tagnames.split(' ')]),
+                                 for tag in revisions[0].tagnames.split(' ')]),
             }
             revisions[i - 1].summary = None
     return render_to_response('revisions_question.html', {
-        'post': post,
-        'revisions': revisions,
-    }, context_instance=RequestContext(request))
+                              'post': post,
+                              'revisions': revisions,
+                              }, context_instance=RequestContext(request))
 
 ANSWER_REVISION_TEMPLATE = ('<div class="text">%(html)s</div>')
 def answer_revisions(request, id):
@@ -657,9 +660,9 @@ def answer_revisions(request, id):
             revisions[i - 1].diff = revisions[i-1].text
             revisions[i - 1].summary = None
     return render_to_response('revisions_answer.html', {
-        'post': post,
-        'revisions': revisions,
-    }, context_instance=RequestContext(request))
+                              'post': post,
+                              'revisions': revisions,
+                              }, context_instance=RequestContext(request))
 
 def answer(request, id):
     question = get_object_or_404(Question, id=id)
@@ -672,25 +675,25 @@ def answer(request, id):
 
             if request.user.is_authenticated():
                 create_new_answer(
-                        question=question,
-                        author=request.user,
-                        added_at=update_time,
-                        wiki=wiki,
-                        text=text,
-                        email_notify=form.cleaned_data['email_notify']
-                    )
+                                  question=question,
+                                  author=request.user,
+                                  added_at=update_time,
+                                  wiki=wiki,
+                                  text=text,
+                                  email_notify=form.cleaned_data['email_notify']
+                                  )
             else:
                 request.session.flush()
                 html = sanitize_html(markdowner.convert(text))
                 summary = strip_tags(html)[:120]
                 anon = AnonymousAnswer(
-                    question = question,
-                    wiki = wiki,
-                    text = text,
-                    summary = summary,
-                    session_key = request.session.session_key,
-                    ip_addr = request.META['REMOTE_ADDR'],
-                    )
+                                       question=question,
+                                       wiki=wiki,
+                                       text=text,
+                                       summary=summary,
+                                       session_key=request.session.session_key,
+                                       ip_addr=request.META['REMOTE_ADDR'],
+                                       )
                 anon.save()
                 return HttpResponseRedirect('/account/signin/newanswer')
 
@@ -721,22 +724,22 @@ def tags(request):
         tags = objects_list.page(objects_list.num_pages)
 
     return render_to_response('tags.html', {
-        "tags" : tags,
-        "stag" : stag,
-        "tab_id" : sortby,
-        "keywords" : stag,
-        "context" : {
-            'is_paginated' : is_paginated,
-            'pages': objects_list.num_pages,
-            'page': page,
-            'has_previous': tags.has_previous(),
-            'has_next': tags.has_next(),
-            'previous': tags.previous_page_number(),
-            'next': tags.next_page_number(),
-            'base_url' : '/tags/?sort=%s&' % sortby
-        }
-
-        }, context_instance=RequestContext(request))
+                              "tags": tags,
+                              "stag": stag,
+                              "tab_id": sortby,
+                              "keywords": stag,
+                              "context": {
+                              'is_paginated': is_paginated,
+                              'pages': objects_list.num_pages,
+                              'page': page,
+                              'has_previous': tags.has_previous(),
+                              'has_next': tags.has_next(),
+                              'previous': tags.previous_page_number(),
+                              'next': tags.next_page_number(),
+                              'base_url': '/tags/?sort=%s&' % sortby
+                              }
+
+                              }, context_instance=RequestContext(request))
 
 def tag(request, tag):
     return questions(request, tagname=tag)
@@ -782,9 +785,9 @@ def vote(request, id):
     response_data = {
         "allowed": 1,
         "success": 1,
-        "status" : 0,
-        "count"  : 0,
-        "message" : ''
+        "status": 0,
+        "count": 0,
+        "message": ''
     }
 
     def can_vote(vote_score, user):
@@ -935,9 +938,9 @@ def vote(request, id):
                 user = request.user
                 if user.is_authenticated():
                     try:
-                        EmailFeed.objects.get(feed_id=question.id,subscriber_id=user.id,feed_content_type=question_type)
+                        EmailFeed.objects.get(feed_id=question.id, subscriber_id=user.id, feed_content_type=question_type)
                     except EmailFeed.DoesNotExist:
-                        feed = EmailFeed(subscriber=user,content=question)
+                        feed = EmailFeed(subscriber=user, content=question)
                         feed.save()
                         if settings.EMAIL_VALIDATION == 'on' and user.email_isvalid == False:
                             response_data['message'] = _('subscription saved, %(email)s needs validation') % {'email':user.email}
@@ -951,7 +954,7 @@ def vote(request, id):
                 user = request.user
                 if user.is_authenticated():
                     try:
-                        feed = EmailFeed.objects.get(feed_id=question.id,subscriber_id=user.id)
+                        feed = EmailFeed.objects.get(feed_id=question.id, subscriber_id=user.id)
                         feed.delete()
                     except EmailFeed.DoesNotExist:
                         pass
@@ -970,7 +973,7 @@ def vote(request, id):
 def users(request):
     is_paginated = True
     sortby = request.GET.get('sort', 'reputation')
-    suser = request.REQUEST.get('q',  "")
+    suser = request.REQUEST.get('q', "")
     try:
         page = int(request.GET.get('page', '1'))
     except ValueError:
@@ -998,22 +1001,22 @@ def users(request):
         users = objects_list.page(objects_list.num_pages)
 
     return render_to_response('users.html', {
-        "users" : users,
-        "suser" : suser,
-        "keywords" : suser,
-        "tab_id" : sortby,
-        "context" : {
-            'is_paginated' : is_paginated,
-            'pages': objects_list.num_pages,
-            'page': page,
-            'has_previous': users.has_previous(),
-            'has_next': users.has_next(),
-            'previous': users.previous_page_number(),
-            'next': users.next_page_number(),
-            'base_url' : base_url
-        }
-
-        }, context_instance=RequestContext(request))
+                              "users": users,
+                              "suser": suser,
+                              "keywords": suser,
+                              "tab_id": sortby,
+                              "context": {
+                              'is_paginated': is_paginated,
+                              'pages': objects_list.num_pages,
+                              'page': page,
+                              'has_previous': users.has_previous(),
+                              'has_next': users.has_next(),
+                              'previous': users.previous_page_number(),
+                              'next': users.next_page_number(),
+                              'base_url': base_url
+                              }
+
+                              }, context_instance=RequestContext(request))
 
 def user(request, id):
     sort = request.GET.get('sort', 'stats')
@@ -1052,117 +1055,118 @@ def edit_user(request, id):
     else:
         form = EditUserForm(user)
     return render_to_response('user_edit.html', {
-        'form' : form,
-    }, context_instance=RequestContext(request))
+                              'form': form,
+                              }, context_instance=RequestContext(request))
 
 def user_stats(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
     questions = Question.objects.extra(
-        select={
-            'vote_count' : 'question.score',
-            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s AND f.question_id = question.id',
-            'la_user_id' : 'auth_user.id',
-            'la_username' : 'auth_user.username',
-            'la_user_gold' : 'auth_user.gold',
-            'la_user_silver' : 'auth_user.silver',
-            'la_user_bronze' : 'auth_user.bronze',
-            'la_user_reputation' : 'auth_user.reputation'
-            },
-        select_params=[user_id],
-        tables=['question', 'auth_user'],
-        where=['question.deleted = 0 AND question.author_id=%s AND question.last_activity_by_id = auth_user.id'],
-        params=[user_id],
-        order_by=['-vote_count', '-last_activity_at']
-    ).values('vote_count',
-             'favorited_myself',
-             'id',
-             'title',
-             'author_id',
-             'added_at',
-             'answer_accepted',
-             'answer_count',
-             'comment_count',
-             'view_count',
-             'favourite_count',
-             'summary',
-             'tagnames',
-             'vote_up_count',
-             'vote_down_count',
-             'last_activity_at',
-             'la_user_id',
-             'la_username',
-             'la_user_gold',
-             'la_user_silver',
-             'la_user_bronze',
-             'la_user_reputation')[:100]
+                                       select={
+                                       'vote_count': 'question.score',
+                                       'favorited_myself': 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s AND f.question_id = question.id',
+                                       'la_user_id': 'auth_user.id',
+                                       'la_username': 'auth_user.username',
+                                       'la_user_gold': 'auth_user.gold',
+                                       'la_user_silver': 'auth_user.silver',
+                                       'la_user_bronze': 'auth_user.bronze',
+                                       'la_user_reputation': 'auth_user.reputation'
+                                       },
+                                       select_params=[user_id],
+                                       tables=['question', 'auth_user'],
+                                       where=['question.deleted = 0 AND question.author_id=%s AND question.last_activity_by_id = auth_user.id'],
+                                       params=[user_id],
+                                       order_by=['-vote_count', '-last_activity_at']
+                                       ).values('vote_count',
+        'favorited_myself',
+        'id',
+        'title',
+        'author_id',
+        'added_at',
+        'answer_accepted',
+        'answer_count',
+        'comment_count',
+        'view_count',
+        'favourite_count',
+        'summary',
+        'tagnames',
+        'vote_up_count',
+        'vote_down_count',
+        'last_activity_at',
+        'la_user_id',
+        'la_username',
+        'la_user_gold',
+        'la_user_silver',
+        'la_user_bronze',
+        'la_user_reputation')[:100]
 
     answered_questions = Question.objects.extra(
-        select={
-            'vote_up_count' : 'answer.vote_up_count',
-            'vote_down_count' : 'answer.vote_down_count',
-            'answer_id' : 'answer.id',
-            'accepted' : 'answer.accepted',
-            'vote_count' : 'answer.score',
-            'comment_count' : 'answer.comment_count'
-            },
-        tables=['question', 'answer'],
-        where=['answer.deleted=0 AND answer.author_id=%s AND answer.question_id=question.id'],
-        params=[user_id],
-        order_by=['-vote_count', '-answer_id'],
-        select_params=[user_id]
-    ).distinct().values('comment_count',
-                        'id',
-                        'answer_id',
-                        'title',
-                        'author_id',
-                        'accepted',
-                        'vote_count',
-                        'answer_count',
-                        'vote_up_count',
-                        'vote_down_count')[:100]
+                                                select={
+                                                'vote_up_count': 'answer.vote_up_count',
+                                                'vote_down_count': 'answer.vote_down_count',
+                                                'answer_id': 'answer.id',
+                                                'accepted': 'answer.accepted',
+                                                'vote_count': 'answer.score',
+                                                'comment_count': 'answer.comment_count'
+                                                },
+                                                tables=['question', 'answer'],
+                                                where=['answer.deleted=0 AND answer.author_id=%s AND answer.question_id=question.id'],
+                                                params=[user_id],
+                                                order_by=['-vote_count', '-answer_id'],
+                                                select_params=[user_id]
+                                                ).distinct().values('comment_count',
+                   'id',
+                   'answer_id',
+                   'title',
+                   'author_id',
+                   'accepted',
+                   'vote_count',
+                   'answer_count',
+                   'vote_up_count',
+                   'vote_down_count')[:100]
     up_votes = Vote.objects.get_up_vote_count_from_user(user)
     down_votes = Vote.objects.get_down_vote_count_from_user(user)
     votes_today = Vote.objects.get_votes_count_today_from_user(user)
     votes_total = VOTE_RULES['scope_votes_per_user_per_day']
     tags = user.created_tags.all().order_by('-used_count')[:50]
-    if settings.DJANGO_VERSION < 1.1:
+    try:
+        from django.db.models import Count
         awards = Award.objects.extra(
-            select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
-            tables=['award', 'badge'],
-            order_by=['-awarded_at'],
-            where=['user_id=%s AND badge_id=badge.id'],
-            params=[user.id]
-        ).values('id', 'count', 'name', 'description', 'type')
+                                     select={'id': 'badge.id', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
+                                     tables=['award', 'badge'],
+                                     order_by=['-awarded_at'],
+                                     where=['user_id=%s AND badge_id=badge.id'],
+                                     params=[user.id]
+                                     ).values('id', 'name', 'description', 'type')
         total_awards = awards.count()
-        awards.query.group_by = ['badge_id']
-    else:
+        awards = awards.annotate(count=Count('badge__id'))
+    except ImportError:
         awards = Award.objects.extra(
-            select={'id': 'badge.id', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
-            tables=['award', 'badge'],
-            order_by=['-awarded_at'],
-            where=['user_id=%s AND badge_id=badge.id'],
-            params=[user.id]
-        ).values('id', 'name', 'description', 'type')
+                                     select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
+                                     tables=['award', 'badge'],
+                                     order_by=['-awarded_at'],
+                                     where=['user_id=%s AND badge_id=badge.id'],
+                                     params=[user.id]
+                                     ).values('id', 'count', 'name', 'description', 'type')
         total_awards = awards.count()
-        from django.db.models import Count
-        awards = awards.annotate(count = Count('badge__id'))
-
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "questions" : questions,
-        "answered_questions" : answered_questions,
-        "up_votes" : up_votes,
-        "down_votes" : down_votes,
-        "total_votes": up_votes + down_votes,
-        "votes_today_left": votes_total-votes_today,
-        "votes_total_per_day": votes_total,
-        "tags" : tags,
-        "awards": awards,
-        "total_awards" : total_awards,
-    }, context_instance=RequestContext(request))
+        awards.query.group_by = ['badge_id']
+
+
+    return render_to_response(user_view.template_file, {
+                              "tab_name": user_view.id,
+                              "tab_description": user_view.tab_description,
+                              "page_title": user_view.page_title,
+                              "view_user": user,
+                              "questions": questions,
+                              "answered_questions": answered_questions,
+                              "up_votes": up_votes,
+                              "down_votes": down_votes,
+                              "total_votes": up_votes + down_votes,
+                              "votes_today_left": votes_total-votes_today,
+                              "votes_total_per_day": votes_total,
+                              "tags": tags,
+                              "awards": awards,
+                              "total_awards": total_awards,
+                              }, context_instance=RequestContext(request))
 
 def user_recent(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
@@ -1178,8 +1182,8 @@ def user_recent(request, user_id, user_view):
             self.type_id = type
             self.title = title
             self.summary = summary
-            self.title_link = u'/questions/%s/%s#%s' %(question_id, title, answer_id)\
-                if int(answer_id) > 0 else u'/questions/%s/%s' %(question_id, title)
+            self.title_link = u'/questions/%s/%s#%s' % (question_id, title, answer_id)\
+                if int(answer_id) > 0 else u'/questions/%s/%s' % (question_id, title)
     class AwardEvent:
         def __init__(self, time, type, id):
             self.time = time
@@ -1190,225 +1194,225 @@ def user_recent(request, user_id, user_view):
     activities = []
     # ask questions
     questions = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'active_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = ' +
-            'question.id AND activity.user_id = %s AND activity.activity_type = %s'],
-        params=[question_type_id, user_id, TYPE_ACTIVITY_ASK_QUESTION],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'active_at',
-            'activity_type'
-            )
+                                       select={
+                                       'title': 'question.title',
+                                       'question_id': 'question.id',
+                                       'active_at': 'activity.active_at',
+                                       'activity_type': 'activity.activity_type'
+                                       },
+                                       tables=['activity', 'question'],
+                                       where=['activity.content_type_id = %s AND activity.object_id = ' +
+                                       'question.id AND activity.user_id = %s AND activity.activity_type = %s'],
+                                       params=[question_type_id, user_id, TYPE_ACTIVITY_ASK_QUESTION],
+                                       order_by=['-activity.active_at']
+                                       ).values(
+        'title',
+        'question_id',
+        'active_at',
+        'activity_type'
+        )
     if len(questions) > 0:
         questions = [(Event(q['active_at'], q['activity_type'], q['title'], '', '0', \
-            q['question_id'])) for q in questions]
+                      q['question_id'])) for q in questions]
         activities.extend(questions)
 
     # answers
     answers = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'active_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'answer', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' + 
-            'answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
-        params=[answer_type_id, user_id, TYPE_ACTIVITY_ANSWER],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'active_at',
-            'activity_type'
-            )
+                                     select={
+                                     'title': 'question.title',
+                                     'question_id': 'question.id',
+                                     'answer_id': 'answer.id',
+                                     'active_at': 'activity.active_at',
+                                     'activity_type': 'activity.activity_type'
+                                     },
+                                     tables=['activity', 'answer', 'question'],
+                                     where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' +
+                                     'answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
+                                     params=[answer_type_id, user_id, TYPE_ACTIVITY_ANSWER],
+                                     order_by=['-activity.active_at']
+                                     ).values(
+        'title',
+        'question_id',
+        'answer_id',
+        'active_at',
+        'activity_type'
+        )
     if len(answers) > 0:
         answers = [(Event(q['active_at'], q['activity_type'], q['title'], '', q['answer_id'], \
-            q['question_id'])) for q in answers]
+                    q['question_id'])) for q in answers]
         activities.extend(answers)
 
     # question comments
     comments = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'comment.object_id',
-            'added_at' : 'comment.added_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'question', 'comment'],
-
-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
-            'activity.user_id = comment.user_id AND comment.object_id=question.id AND '+
-            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
-        params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],
-        order_by=['-comment.added_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'activity_type'
-            )
+                                      select={
+                                      'title': 'question.title',
+                                      'question_id': 'comment.object_id',
+                                      'added_at': 'comment.added_at',
+                                      'activity_type': 'activity.activity_type'
+                                      },
+                                      tables=['activity', 'question', 'comment'],
+
+                                      where=['activity.content_type_id = %s AND activity.object_id = comment.id AND ' +
+                                      'activity.user_id = comment.user_id AND comment.object_id=question.id AND ' +
+                                      'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
+                                      params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],
+                                      order_by=['-comment.added_at']
+                                      ).values(
+        'title',
+        'question_id',
+        'added_at',
+        'activity_type'
+        )
 
     if len(comments) > 0:
         comments = [(Event(q['added_at'], q['activity_type'], q['title'], '', '0', \
-            q['question_id'])) for q in comments]
+                     q['question_id'])) for q in comments]
         activities.extend(comments)
 
     # answer comments
     comments = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'comment.added_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'question', 'answer', 'comment'],
-
-        where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
-            'activity.user_id = comment.user_id AND comment.object_id=answer.id AND '+
-            'comment.content_type_id=%s AND question.id = answer.question_id AND '+
-            'activity.user_id = %s AND activity.activity_type=%s'],
-        params=[comment_type_id, answer_type_id, user_id, TYPE_ACTIVITY_COMMENT_ANSWER],
-        order_by=['-comment.added_at']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'added_at',
-            'activity_type'
-            )
+                                      select={
+                                      'title': 'question.title',
+                                      'question_id': 'question.id',
+                                      'answer_id': 'answer.id',
+                                      'added_at': 'comment.added_at',
+                                      'activity_type': 'activity.activity_type'
+                                      },
+                                      tables=['activity', 'question', 'answer', 'comment'],
+
+                                      where=['activity.content_type_id = %s AND activity.object_id = comment.id AND ' +
+                                      'activity.user_id = comment.user_id AND comment.object_id=answer.id AND ' +
+                                      'comment.content_type_id=%s AND question.id = answer.question_id AND ' +
+                                      'activity.user_id = %s AND activity.activity_type=%s'],
+                                      params=[comment_type_id, answer_type_id, user_id, TYPE_ACTIVITY_COMMENT_ANSWER],
+                                      order_by=['-comment.added_at']
+                                      ).values(
+        'title',
+        'question_id',
+        'answer_id',
+        'added_at',
+        'activity_type'
+        )
 
     if len(comments) > 0:
         comments = [(Event(q['added_at'], q['activity_type'], q['title'], '', q['answer_id'], \
-            q['question_id'])) for q in comments]
+                     q['question_id'])) for q in comments]
         activities.extend(comments)
 
     # question revisions
     revisions = Activity.objects.extra(
-        select={
-            'title' : 'question_revision.title',
-            'question_id' : 'question_revision.question_id',
-            'added_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type',
-            'summary' : 'question_revision.summary'
-            },
-        tables=['activity', 'question_revision'],
-        where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND '+
-            'activity.user_id = question_revision.author_id AND activity.user_id = %s AND '+
-            'activity.activity_type=%s'],
-        params=[question_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_QUESTION],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'activity_type',
-            'summary'
-            )
+                                       select={
+                                       'title': 'question_revision.title',
+                                       'question_id': 'question_revision.question_id',
+                                       'added_at': 'activity.active_at',
+                                       'activity_type': 'activity.activity_type',
+                                       'summary': 'question_revision.summary'
+                                       },
+                                       tables=['activity', 'question_revision'],
+                                       where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND ' +
+                                       'activity.user_id = question_revision.author_id AND activity.user_id = %s AND ' +
+                                       'activity.activity_type=%s'],
+                                       params=[question_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_QUESTION],
+                                       order_by=['-activity.active_at']
+                                       ).values(
+        'title',
+        'question_id',
+        'added_at',
+        'activity_type',
+        'summary'
+        )
 
     if len(revisions) > 0:
         revisions = [(Event(q['added_at'], q['activity_type'], q['title'], q['summary'], '0', \
-            q['question_id'])) for q in revisions]
+                      q['question_id'])) for q in revisions]
         activities.extend(revisions)
 
     # answer revisions
     revisions = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type',
-            'summary' : 'answer_revision.summary'
-            },
-        tables=['activity', 'answer_revision', 'question', 'answer'],
-
-        where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND '+
-            'activity.user_id = answer_revision.author_id AND activity.user_id = %s AND '+
-            'answer_revision.answer_id=answer.id AND answer.question_id = question.id AND '+
-            'activity.activity_type=%s'],
-        params=[answer_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_ANSWER],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'answer_id',
-            'activity_type',
-            'summary'
-            )
+                                       select={
+                                       'title': 'question.title',
+                                       'question_id': 'question.id',
+                                       'answer_id': 'answer.id',
+                                       'added_at': 'activity.active_at',
+                                       'activity_type': 'activity.activity_type',
+                                       'summary': 'answer_revision.summary'
+                                       },
+                                       tables=['activity', 'answer_revision', 'question', 'answer'],
+
+                                       where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND ' +
+                                       'activity.user_id = answer_revision.author_id AND activity.user_id = %s AND ' +
+                                       'answer_revision.answer_id=answer.id AND answer.question_id = question.id AND ' +
+                                       'activity.activity_type=%s'],
+                                       params=[answer_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_ANSWER],
+                                       order_by=['-activity.active_at']
+                                       ).values(
+        'title',
+        'question_id',
+        'added_at',
+        'answer_id',
+        'activity_type',
+        'summary'
+        )
 
     if len(revisions) > 0:
         revisions = [(Event(q['added_at'], q['activity_type'], q['title'], q['summary'], \
-            q['answer_id'], q['question_id'])) for q in revisions]
+                      q['answer_id'], q['question_id'])) for q in revisions]
         activities.extend(revisions)
 
     # accepted answers
     accept_answers = Activity.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'added_at' : 'activity.active_at',
-            'activity_type' : 'activity.activity_type',
-            },
-        tables=['activity', 'answer', 'question'],
-        where=['activity.content_type_id = %s AND activity.object_id = answer.id AND '+
-            'activity.user_id = question.author_id AND activity.user_id = %s AND '+
-            'answer.question_id=question.id AND activity.activity_type=%s'],
-        params=[answer_type_id, user_id, TYPE_ACTIVITY_MARK_ANSWER],
-        order_by=['-activity.active_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'activity_type',
-            )
+                                            select={
+                                            'title': 'question.title',
+                                            'question_id': 'question.id',
+                                            'added_at': 'activity.active_at',
+                                            'activity_type': 'activity.activity_type',
+                                            },
+                                            tables=['activity', 'answer', 'question'],
+                                            where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' +
+                                            'activity.user_id = question.author_id AND activity.user_id = %s AND ' +
+                                            'answer.question_id=question.id AND activity.activity_type=%s'],
+                                            params=[answer_type_id, user_id, TYPE_ACTIVITY_MARK_ANSWER],
+                                            order_by=['-activity.active_at']
+                                            ).values(
+        'title',
+        'question_id',
+        'added_at',
+        'activity_type',
+        )
     if len(accept_answers) > 0:
         accept_answers = [(Event(q['added_at'], q['activity_type'], q['title'], '', '0', \
-            q['question_id'])) for q in accept_answers]
+                           q['question_id'])) for q in accept_answers]
         activities.extend(accept_answers)
     #award history
     awards = Activity.objects.extra(
-        select={
-            'badge_id' : 'badge.id',
-            'awarded_at': 'award.awarded_at',
-            'activity_type' : 'activity.activity_type'
-            },
-        tables=['activity', 'award', 'badge'],
-        where=['activity.user_id = award.user_id AND activity.user_id = %s AND '+
-            'award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
-        params=[user_id, TYPE_ACTIVITY_PRIZE],
-        order_by=['-activity.active_at']
-    ).values(
-            'badge_id',
-            'awarded_at',
-            'activity_type'
-            )
+                                    select={
+                                    'badge_id': 'badge.id',
+                                    'awarded_at': 'award.awarded_at',
+                                    'activity_type': 'activity.activity_type'
+                                    },
+                                    tables=['activity', 'award', 'badge'],
+                                    where=['activity.user_id = award.user_id AND activity.user_id = %s AND ' +
+                                    'award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
+                                    params=[user_id, TYPE_ACTIVITY_PRIZE],
+                                    order_by=['-activity.active_at']
+                                    ).values(
+        'badge_id',
+        'awarded_at',
+        'activity_type'
+        )
     if len(awards) > 0:
         awards = [(AwardEvent(q['awarded_at'], q['activity_type'], q['badge_id'])) for q in awards]
         activities.extend(awards)
 
-    activities.sort(lambda x,y: cmp(y.time, x.time))
+    activities.sort(lambda x, y: cmp(y.time, x.time))
 
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "activities" : activities[:user_view.data_size]
-    }, context_instance=RequestContext(request))
+    return render_to_response(user_view.template_file, {
+                              "tab_name": user_view.id,
+                              "tab_description": user_view.tab_description,
+                              "page_title": user_view.page_title,
+                              "view_user": user,
+                              "activities": activities[:user_view.data_size]
+                              }, context_instance=RequestContext(request))
 
 def user_responses(request, user_id, user_view):
     """
@@ -1430,139 +1434,139 @@ def user_responses(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
     responses = []
     answers = Answer.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'answer.added_at',
-            'html' : 'answer.html',
-            'username' : 'auth_user.username',
-            'user_id' : 'auth_user.id'
-            },
-        select_params=[user_id],
-        tables=['answer', 'question', 'auth_user'],
-        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
-            'question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
-        params=[user_id, user_id],
-        order_by=['-answer.id']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'added_at',
-            'html',
-            'username',
-            'user_id'
-            )
+                                   select={
+                                   'title': 'question.title',
+                                   'question_id': 'question.id',
+                                   'answer_id': 'answer.id',
+                                   'added_at': 'answer.added_at',
+                                   'html': 'answer.html',
+                                   'username': 'auth_user.username',
+                                   'user_id': 'auth_user.id'
+                                   },
+                                   select_params=[user_id],
+                                   tables=['answer', 'question', 'auth_user'],
+                                   where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND ' +
+                                   'question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
+                                   params=[user_id, user_id],
+                                   order_by=['-answer.id']
+                                   ).values(
+        'title',
+        'question_id',
+        'answer_id',
+        'added_at',
+        'html',
+        'username',
+        'user_id'
+        )
     if len(answers) > 0:
         answers = [(Response(TYPE_RESPONSE['QUESTION_ANSWERED'], a['title'], a['question_id'],
-        a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
+                    a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
         responses.extend(answers)
 
 
     # question comments
     comments = Comment.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'comment.object_id',
-            'added_at' : 'comment.added_at',
-            'comment' : 'comment.comment',
-            'username' : 'auth_user.username',
-            'user_id' : 'auth_user.id'
-            },
-        tables=['question', 'auth_user', 'comment'],
-        where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND '+
-            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
-        params=[user_id, question_type_id, user_id],
-        order_by=['-comment.added_at']
-    ).values(
-            'title',
-            'question_id',
-            'added_at',
-            'comment',
-            'username',
-            'user_id'
-            )
+                                     select={
+                                     'title': 'question.title',
+                                     'question_id': 'comment.object_id',
+                                     'added_at': 'comment.added_at',
+                                     'comment': 'comment.comment',
+                                     'username': 'auth_user.username',
+                                     'user_id': 'auth_user.id'
+                                     },
+                                     tables=['question', 'auth_user', 'comment'],
+                                     where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND ' +
+                                     'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
+                                     params=[user_id, question_type_id, user_id],
+                                     order_by=['-comment.added_at']
+                                     ).values(
+        'title',
+        'question_id',
+        'added_at',
+        'comment',
+        'username',
+        'user_id'
+        )
 
     if len(comments) > 0:
         comments = [(Response(TYPE_RESPONSE['QUESTION_COMMENTED'], c['title'], c['question_id'],
-            '', c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
+                     '', c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
         responses.extend(comments)
 
     # answer comments
     comments = Comment.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'comment.added_at',
-            'comment' : 'comment.comment',
-            'username' : 'auth_user.username',
-            'user_id' : 'auth_user.id'
-            },
-        tables=['answer', 'auth_user', 'comment', 'question'],
-        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND '+
-            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id '+
-            'AND question.id = answer.question_id'],
-        params=[user_id, answer_type_id, user_id],
-        order_by=['-comment.added_at']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'added_at',
-            'comment',
-            'username',
-            'user_id'
-            )
+                                     select={
+                                     'title': 'question.title',
+                                     'question_id': 'question.id',
+                                     'answer_id': 'answer.id',
+                                     'added_at': 'comment.added_at',
+                                     'comment': 'comment.comment',
+                                     'username': 'auth_user.username',
+                                     'user_id': 'auth_user.id'
+                                     },
+                                     tables=['answer', 'auth_user', 'comment', 'question'],
+                                     where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND ' +
+                                     'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id ' +
+                                     'AND question.id = answer.question_id'],
+                                     params=[user_id, answer_type_id, user_id],
+                                     order_by=['-comment.added_at']
+                                     ).values(
+        'title',
+        'question_id',
+        'answer_id',
+        'added_at',
+        'comment',
+        'username',
+        'user_id'
+        )
 
     if len(comments) > 0:
         comments = [(Response(TYPE_RESPONSE['ANSWER_COMMENTED'], c['title'], c['question_id'],
-        c['answer_id'], c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
+                     c['answer_id'], c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
         responses.extend(comments)
 
     # answer has been accepted
     answers = Answer.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'added_at' : 'answer.accepted_at',
-            'html' : 'answer.html',
-            'username' : 'auth_user.username',
-            'user_id' : 'auth_user.id'
-            },
-        select_params=[user_id],
-        tables=['answer', 'question', 'auth_user'],
-        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
-            'answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
-        params=[user_id],
-        order_by=['-answer.id']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'added_at',
-            'html',
-            'username',
-            'user_id'
-            )
+                                   select={
+                                   'title': 'question.title',
+                                   'question_id': 'question.id',
+                                   'answer_id': 'answer.id',
+                                   'added_at': 'answer.accepted_at',
+                                   'html': 'answer.html',
+                                   'username': 'auth_user.username',
+                                   'user_id': 'auth_user.id'
+                                   },
+                                   select_params=[user_id],
+                                   tables=['answer', 'question', 'auth_user'],
+                                   where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND ' +
+                                   'answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
+                                   params=[user_id],
+                                   order_by=['-answer.id']
+                                   ).values(
+        'title',
+        'question_id',
+        'answer_id',
+        'added_at',
+        'html',
+        'username',
+        'user_id'
+        )
     if len(answers) > 0:
         answers = [(Response(TYPE_RESPONSE['ANSWER_ACCEPTED'], a['title'], a['question_id'],
-            a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
+                    a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
         responses.extend(answers)
 
     # sort posts by time
-    responses.sort(lambda x,y: cmp(y.time, x.time))
+    responses.sort(lambda x, y: cmp(y.time, x.time))
 
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "responses" : responses[:user_view.data_size],
+    return render_to_response(user_view.template_file, {
+                              "tab_name": user_view.id,
+                              "tab_description": user_view.tab_description,
+                              "page_title": user_view.page_title,
+                              "view_user": user,
+                              "responses": responses[:user_view.data_size],
 
-    }, context_instance=RequestContext(request))
+                              }, context_instance=RequestContext(request))
 
 def user_votes(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
@@ -1570,74 +1574,85 @@ def user_votes(request, user_id, user_view):
         raise Http404
     votes = []
     question_votes = Vote.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 0,
-            'voted_at' : 'vote.voted_at',
-            'vote' : 'vote',
-            },
-        select_params=[user_id],
-        tables=['vote', 'question', 'auth_user'],
-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id '+
-            'AND vote.user_id=auth_user.id'],
-        params=[question_type_id, user_id],
-        order_by=['-vote.id']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'voted_at',
-            'vote',
-            )
+                                        select={
+                                        'title': 'question.title',
+                                        'question_id': 'question.id',
+                                        'answer_id': 0,
+                                        'voted_at': 'vote.voted_at',
+                                        'vote': 'vote',
+                                        },
+                                        select_params=[user_id],
+                                        tables=['vote', 'question', 'auth_user'],
+                                        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id ' +
+                                        'AND vote.user_id=auth_user.id'],
+                                        params=[question_type_id, user_id],
+                                        order_by=['-vote.id']
+                                        ).values(
+        'title',
+        'question_id',
+        'answer_id',
+        'voted_at',
+        'vote',
+        )
     if(len(question_votes) > 0):
         votes.extend(question_votes)
 
     answer_votes = Vote.objects.extra(
-        select={
-            'title' : 'question.title',
-            'question_id' : 'question.id',
-            'answer_id' : 'answer.id',
-            'voted_at' : 'vote.voted_at',
-            'vote' : 'vote',
-            },
-        select_params=[user_id],
-        tables=['vote', 'answer', 'question', 'auth_user'],
-        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id '+
-            'AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
-        params=[answer_type_id, user_id],
-        order_by=['-vote.id']
-    ).values(
-            'title',
-            'question_id',
-            'answer_id',
-            'voted_at',
-            'vote',
-            )
+                                      select={
+                                      'title': 'question.title',
+                                      'question_id': 'question.id',
+                                      'answer_id': 'answer.id',
+                                      'voted_at': 'vote.voted_at',
+                                      'vote': 'vote',
+                                      },
+                                      select_params=[user_id],
+                                      tables=['vote', 'answer', 'question', 'auth_user'],
+                                      where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id ' +
+                                      'AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
+                                      params=[answer_type_id, user_id],
+                                      order_by=['-vote.id']
+                                      ).values(
+        'title',
+        'question_id',
+        'answer_id',
+        'voted_at',
+        'vote',
+        )
     if(len(answer_votes) > 0):
         votes.extend(answer_votes)
-    votes.sort(lambda x,y: cmp(y['voted_at'], x['voted_at']))
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "votes" : votes[:user_view.data_size]
+    votes.sort(lambda x, y: cmp(y['voted_at'], x['voted_at']))
+    return render_to_response(user_view.template_file, {
+                              "tab_name": user_view.id,
+                              "tab_description": user_view.tab_description,
+                              "page_title": user_view.page_title,
+                              "view_user": user,
+                              "votes": votes[:user_view.data_size]
 
-    }, context_instance=RequestContext(request))
+                              }, context_instance=RequestContext(request))
 
 def user_reputation(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
-    reputation = Repute.objects.extra(
-        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 
-            'title': 'question.title'},
-        tables=['repute', 'question'],
-        order_by=['-reputed_at'],
-        where=['user_id=%s AND question_id=question.id'],
-        params=[user.id]
-    ).values('positive', 'negative', 'question_id', 'title', 'reputed_at', 'reputation')
-
-    reputation.query.group_by = ['question_id']
+    try:
+        from django.db.models import Sum
+        reputation = Repute.objects.extra(
+                                          select={'question_id':'question_id',
+                                          'title': 'question.title'},
+                                          tables=['repute', 'question'],
+                                          order_by=['-reputed_at'],
+                                          where=['user_id=%s AND question_id=question.id'],
+                                          params=[user.id]
+                                          ).values('question_id', 'title', 'reputed_at', 'reputation')
+        reputation = reputation.annotate(positive=Sum("positive"), negative=Sum("negative"))
+    except ImportError:
+        reputation = Repute.objects.extra(
+                                          select={'positive':'sum(positive)', 'negative':'sum(negative)', 'question_id':'question_id',
+                                          'title': 'question.title'},
+                                          tables=['repute', 'question'],
+                                          order_by=['-reputed_at'],
+                                          where=['user_id=%s AND question_id=question.id'],
+                                          params=[user.id]
+                                          ).values('positive', 'negative', 'question_id', 'title', 'reputed_at', 'reputation')
+        reputation.query.group_by = ['question_id']
 
     rep_list = []
     for rep in Repute.objects.filter(user=user).order_by('reputed_at'):
@@ -1646,74 +1661,74 @@ def user_reputation(request, user_id, user_view):
     reps = ','.join(rep_list)
     reps = '[%s]' % reps
 
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "reputation" : reputation,
-        "reps" : reps
-    }, context_instance=RequestContext(request))
+    return render_to_response(user_view.template_file, {
+                              "tab_name": user_view.id,
+                              "tab_description": user_view.tab_description,
+                              "page_title": user_view.page_title,
+                              "view_user": user,
+                              "reputation": reputation,
+                              "reps": reps
+                              }, context_instance=RequestContext(request))
 
 def user_favorites(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
     questions = Question.objects.extra(
-        select={
-            'vote_count' : 'question.vote_up_count + question.vote_down_count',
-            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s '+
-                'AND f.question_id = question.id',
-            'la_user_id' : 'auth_user.id',
-            'la_username' : 'auth_user.username',
-            'la_user_gold' : 'auth_user.gold',
-            'la_user_silver' : 'auth_user.silver',
-            'la_user_bronze' : 'auth_user.bronze',
-            'la_user_reputation' : 'auth_user.reputation'
-            },
-        select_params=[user_id],
-        tables=['question', 'auth_user', 'favorite_question'],
-        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id '+
-            'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
-        params=[user_id],
-        order_by=['-vote_count', '-question.id']
-    ).values('vote_count',
-             'favorited_myself',
-             'id',
-             'title',
-             'author_id',
-             'added_at',
-             'answer_accepted',
-             'answer_count',
-             'comment_count',
-             'view_count',
-             'favourite_count',
-             'summary',
-             'tagnames',
-             'vote_up_count',
-             'vote_down_count',
-             'last_activity_at',
-             'la_user_id',
-             'la_username',
-             'la_user_gold',
-             'la_user_silver',
-             'la_user_bronze',
-             'la_user_reputation')
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "questions" : questions[:user_view.data_size],
-        "view_user" : user
-    }, context_instance=RequestContext(request))
+                                       select={
+                                       'vote_count': 'question.vote_up_count + question.vote_down_count',
+                                       'favorited_myself': 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s ' +
+                                       'AND f.question_id = question.id',
+                                       'la_user_id': 'auth_user.id',
+                                       'la_username': 'auth_user.username',
+                                       'la_user_gold': 'auth_user.gold',
+                                       'la_user_silver': 'auth_user.silver',
+                                       'la_user_bronze': 'auth_user.bronze',
+                                       'la_user_reputation': 'auth_user.reputation'
+                                       },
+                                       select_params=[user_id],
+                                       tables=['question', 'auth_user', 'favorite_question'],
+                                       where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id ' +
+                                       'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
+                                       params=[user_id],
+                                       order_by=['-vote_count', '-question.id']
+                                       ).values('vote_count',
+        'favorited_myself',
+        'id',
+        'title',
+        'author_id',
+        'added_at',
+        'answer_accepted',
+        'answer_count',
+        'comment_count',
+        'view_count',
+        'favourite_count',
+        'summary',
+        'tagnames',
+        'vote_up_count',
+        'vote_down_count',
+        'last_activity_at',
+        'la_user_id',
+        'la_username',
+        'la_user_gold',
+        'la_user_silver',
+        'la_user_bronze',
+        'la_user_reputation')
+    return render_to_response(user_view.template_file, {
+                              "tab_name": user_view.id,
+                              "tab_description": user_view.tab_description,
+                              "page_title": user_view.page_title,
+                              "questions": questions[:user_view.data_size],
+                              "view_user": user
+                              }, context_instance=RequestContext(request))
 
 
 def user_preferences(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-    }, context_instance=RequestContext(request))
+    return render_to_response(user_view.template_file, {
+                              "tab_name": user_view.id,
+                              "tab_description": user_view.tab_description,
+                              "page_title": user_view.page_title,
+                              "view_user": user,
+                              }, context_instance=RequestContext(request))
 
 def question_comments(request, id):
     question = get_object_or_404(Question, id=id)
@@ -1748,14 +1763,14 @@ def __generate_comments_json(obj, type, user):
         if user != None and auth.can_delete_comment(user, comment):
             #/posts/392845/comments/219852/delete
             delete_url = "/" + type + "s/%s/comments/%s/delete/" % (obj.id, comment.id)
-        json_comments.append({"id" : comment.id,
-            "object_id" : obj.id,
-            "add_date" : comment.added_at.strftime('%Y-%m-%d'),
-            "text" : comment.comment,
-            "user_display_name" : comment_user.username,
-            "user_url" : "/users/%s/%s" % (comment_user.id, comment_user.username),
-            "delete_url" : delete_url
-        })
+        json_comments.append({"id": comment.id,
+                             "object_id": obj.id,
+                             "add_date": comment.added_at.strftime('%Y-%m-%d'),
+                             "text": comment.comment,
+                             "user_display_name": comment_user.username,
+                             "user_url": "/users/%s/%s" % (comment_user.id, comment_user.username),
+                             "delete_url": delete_url
+                             })
 
     data = simplejson.dumps(json_comments)
     return HttpResponse(data, mimetype="application/json")
@@ -1785,8 +1800,8 @@ def delete_answer_comment(request, answer_id, comment_id):
 def logout(request):
     url = request.GET.get('next')
     return render_to_response('logout.html', {
-        'next' : url,
-    }, context_instance=RequestContext(request))
+                              'next': url,
+                              }, context_instance=RequestContext(request))
 
 def badges(request):
     badges = Badge.objects.all().order_by('type')
@@ -1796,28 +1811,28 @@ def badges(request):
         my_badges.query.group_by = ['badge_id']
 
     return render_to_response('badges.html', {
-        'badges' : badges,
-        'mybadges' : my_badges,
-    }, context_instance=RequestContext(request))
+                              'badges': badges,
+                              'mybadges': my_badges,
+                              }, context_instance=RequestContext(request))
 
 def badge(request, id):
     badge = get_object_or_404(Badge, id=id)
     awards = Award.objects.extra(
-        select={'id': 'auth_user.id', 
-                'name': 'auth_user.username', 
-                'rep':'auth_user.reputation', 
-                'gold': 'auth_user.gold', 
-                'silver': 'auth_user.silver', 
-                'bronze': 'auth_user.bronze'},
-        tables=['award', 'auth_user'],
-        where=['badge_id=%s AND user_id=auth_user.id'],
-        params=[id]
-    ).values('id').distinct()
+                                 select={'id': 'auth_user.id',
+                                 'name': 'auth_user.username',
+                                 'rep':'auth_user.reputation',
+                                 'gold': 'auth_user.gold',
+                                 'silver': 'auth_user.silver',
+                                 'bronze': 'auth_user.bronze'},
+                                 tables=['award', 'auth_user'],
+                                 where=['badge_id=%s AND user_id=auth_user.id'],
+                                 params=[id]
+                                 ).values('id').distinct()
 
     return render_to_response('badge.html', {
-        'awards' : awards,
-        'badge' : badge,
-    }, context_instance=RequestContext(request))
+                              'awards': awards,
+                              'badge': badge,
+                              }, context_instance=RequestContext(request))
 
 def read_message(request):
     if request.method == "POST":
@@ -1850,7 +1865,7 @@ def upload(request):
             raise FileTypeNotAllow
 
         # genetate new file name
-        new_file_name = str(time.time()).replace('.', str(random.randint(0,100000))) + file_name_suffix
+        new_file_name = str(time.time()).replace('.', str(random.randint(0, 100000))) + file_name_suffix
         # use default storage to store file
         default_storage.save(new_file_name, f)
         # check file size
@@ -1886,7 +1901,7 @@ def book(request, short_name, unanswered=False):
     """
     books = Book.objects.extra(where=['short_name = %s'], params=[short_name])
     match_count = len(books)
-    if match_count == 0 :
+    if match_count == 0:
         raise Http404
     else:
         # the book info
@@ -1908,7 +1923,7 @@ def book(request, short_name, unanswered=False):
             page = 1
 
         view_id = request.GET.get('sort', None)
-        view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
+        view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score"}
         try:
             orderby = view_dic[view_id]
         except KeyError:
@@ -1929,22 +1944,22 @@ def book(request, short_name, unanswered=False):
         questions = objects_list.page(page)
 
         return render_to_response('book.html', {
-            "book" : book,
-            "author_info" : author_info,
-            "author_rss" : author_rss,
-            "questions" : questions,
-            "context" : {
-                'is_paginated' : True,
-                'pages': objects_list.num_pages,
-                'page': page,
-                'has_previous': questions.has_previous(),
-                'has_next': questions.has_next(),
-                'previous': questions.previous_page_number(),
-                'next': questions.next_page_number(),
-                'base_url' : request.path + '?sort=%s&' % view_id,
-                'pagesize' : user_page_size
-            }
-        }, context_instance=RequestContext(request))
+                                  "book": book,
+                                  "author_info": author_info,
+                                  "author_rss": author_rss,
+                                  "questions": questions,
+                                  "context": {
+                                  'is_paginated': True,
+                                  'pages': objects_list.num_pages,
+                                  'page': page,
+                                  'has_previous': questions.has_previous(),
+                                  'has_next': questions.has_next(),
+                                  'previous': questions.previous_page_number(),
+                                  'next': questions.next_page_number(),
+                                  'base_url': request.path + '?sort=%s&' % view_id,
+                                  'pagesize': user_page_size
+                                  }
+                                  }, context_instance=RequestContext(request))
 
 @login_required
 def ask_book(request, short_name):
@@ -1954,16 +1969,16 @@ def ask_book(request, short_name):
             added_at = datetime.datetime.now()
             html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
             question = Question(
-                title            = strip_tags(form.cleaned_data['title']),
-                author           = request.user,
-                added_at         = added_at,
-                last_activity_at = added_at,
-                last_activity_by = request.user,
-                wiki             = form.cleaned_data['wiki'],
-                tagnames         = form.cleaned_data['tags'].strip(),
-                html             = html,
-                summary          = strip_tags(html)[:120]
-            )
+                                title=strip_tags(form.cleaned_data['title']),
+                                author=request.user,
+                                added_at=added_at,
+                                last_activity_at=added_at,
+                                last_activity_by=request.user,
+                                wiki=form.cleaned_data['wiki'],
+                                tagnames=form.cleaned_data['tags'].strip(),
+                                html=html,
+                                summary=strip_tags(html)[:120]
+                                )
             if question.wiki:
                 question.last_edited_by = question.author
                 question.last_edited_at = added_at
@@ -1973,15 +1988,15 @@ def ask_book(request, short_name):
 
             # create the first revision
             QuestionRevision.objects.create(
-                question   = question,
-                revision   = 1,
-                title      = question.title,
-                author     = request.user,
-                revised_at = added_at,
-                tagnames   = question.tagnames,
-                summary    = CONST['default_version'],
-                text       = form.cleaned_data['text']
-            )
+                                            question=question,
+                                            revision=1,
+                                            title=question.title,
+                                            author=request.user,
+                                            revised_at=added_at,
+                                            tagnames=question.tagnames,
+                                            summary=CONST['default_version'],
+                                            text=form.cleaned_data['text']
+                                            )
             
             books = Book.objects.extra(where=['short_name = %s'], params=[short_name])
             match_count = len(books)
@@ -1996,9 +2011,9 @@ def ask_book(request, short_name):
 
     tags = _get_tags_cache_json()
     return render_to_response('ask.html', {
-        'form' : form,
-        'tags' : tags,
-        }, context_instance=RequestContext(request))
+                              'form': form,
+                              'tags': tags,
+                              }, context_instance=RequestContext(request))
 
 def search(request):
     """
@@ -2049,7 +2064,7 @@ def search(request):
                     user.save()
 
             view_id = request.GET.get('sort', None)
-            view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
+            view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score"}
             try:
                 orderby = view_dic[view_id]
             except KeyError:
@@ -2072,25 +2087,25 @@ def search(request):
                         related_tags.append(tag)
 
             return render_to_response(template_file, {
-                "questions" : questions,
-                "tab_id" : view_id,
-                "questions_count" : objects_list.count,
-                "tags" : related_tags,
-                "searchtag" : None,
-                "searchtitle" : keywords,
-                "keywords" : keywords,
-                "is_unanswered" : False,
-                "context" : {
-                    'is_paginated' : True,
-                    'pages': objects_list.num_pages,
-                    'page': page,
-                    'has_previous': questions.has_previous(),
-                    'has_next': questions.has_next(),
-                    'previous': questions.previous_page_number(),
-                    'next': questions.next_page_number(),
-                    'base_url' : request.path + '?t=question&q=%s&sort=%s&' % (keywords, view_id),
-                    'pagesize' : pagesize
-                }}, context_instance=RequestContext(request))
+                                      "questions": questions,
+                                      "tab_id": view_id,
+                                      "questions_count": objects_list.count,
+                                      "tags": related_tags,
+                                      "searchtag": None,
+                                      "searchtitle": keywords,
+                                      "keywords": keywords,
+                                      "is_unanswered": False,
+                                      "context": {
+                                      'is_paginated': True,
+                                      'pages': objects_list.num_pages,
+                                      'page': page,
+                                      'has_previous': questions.has_previous(),
+                                      'has_next': questions.has_next(),
+                                      'previous': questions.previous_page_number(),
+                                      'next': questions.next_page_number(),
+                                      'base_url': request.path + '?t=question&q=%s&sort=%s&' % (keywords, view_id),
+                                      'pagesize': pagesize
+                                      }}, context_instance=RequestContext(request))
  
     else:
         raise Http404
diff --git a/settings.py b/settings.py
index aa991898..7a70ae72 100644
--- a/settings.py
+++ b/settings.py
@@ -37,7 +37,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.transaction.TransactionMiddleware',
     #'django.middleware.sqlprint.SqlPrintingMiddleware',
     #'middleware.pagesize.QuestionsPageSizeMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
+    #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -73,7 +73,7 @@ INSTALLED_APPS = (
     'django.contrib.humanize',
     'forum',
     'django_authopenid',
-    'debug_toolbar' ,
+    #'debug_toolbar' ,
 )
 import django
 DJANGO_VERSION = django.get_version()
-- 
cgit v1.2.3-1-g7c22


From 65fb7bb5a961342b051566b1488fae20792d90b3 Mon Sep 17 00:00:00 2001
From: Mike Chen <chagel@gmail.com>
Date: Mon, 24 Aug 2009 00:16:18 +0800
Subject: fix tags sort bug

---
 forum/views.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/forum/views.py b/forum/views.py
index 0d2b3ca2..dc38bcdf 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -710,14 +710,14 @@ def tags(request):
 
     if request.method == "GET":
         stag = request.GET.get("q", "").strip()
-        if stag is not None:
+        if len(stag) > 0:
             objects_list = Paginator(Tag.objects.filter(deleted=False).exclude(used_count=0).extra(where=['name like %s'], params=['%' + stag + '%']), DEFAULT_PAGE_SIZE)
         else:
-            if sortby == "name":
-                objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("name"), DEFAULT_PAGE_SIZE)
+            if sortby == "used":
+                sortby = "-used_count"
             else:
-                objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-used_count"), DEFAULT_PAGE_SIZE)
-
+                sortby = "name"
+            objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by(sortby), DEFAULT_PAGE_SIZE)
     try:
         tags = objects_list.page(page)
     except (EmptyPage, InvalidPage):
-- 
cgit v1.2.3-1-g7c22


From e8f1aef3636a2b9ef10d2d2bc4a768503a3e0d07 Mon Sep 17 00:00:00 2001
From: sailingcai <sailingcai@gmail.com>
Date: Mon, 12 Oct 2009 22:49:12 +0800
Subject: 1. adjust logo css, remove margin-bottom 2. add urlquote in
 get_absolute_url 3. enable QuestionsPageSizeMiddleware middleware 4. remove
 unused code

---
 forum/models.py                   | 7 ++++---
 forum/views.py                    | 2 --
 settings.py                       | 2 +-
 templates/content/style/style.css | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/forum/models.py b/forum/models.py
index 255eb21f..a6326fa9 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -3,6 +3,7 @@ import datetime
 import hashlib
 from urllib import quote_plus, urlencode
 from django.db import models
+from django.utils.http import urlquote  as django_urlquote
 from django.utils.html import strip_tags
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
@@ -180,7 +181,7 @@ class Question(models.Model):
         return [name for name in self.tagnames.split(u' ')]
 
     def get_absolute_url(self):
-        return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-'))
+        return '%s%s' % (reverse('question', args=[self.id]), django_urlquote(self.title.replace(' ', '-')))
 
     def has_favorite_by_user(self, user):
         if not user.is_authenticated():
@@ -384,7 +385,7 @@ class Answer(models.Model):
         return self.question.title
 
     def get_absolute_url(self):
-        return '%s%s#%s' % (reverse('question', args=[self.question.id]), self.question.title, self.id)
+        return '%s%s#%s' % (reverse('question', args=[self.question.id]), django_urlquote(self.question.title), self.id)
 
     class Meta:
         db_table = u'answer'
@@ -535,7 +536,7 @@ class Book(models.Model):
     questions = models.ManyToManyField(Question, related_name='book', db_table='book_question')
     
     def get_absolute_url(self):
-        return '%s' % reverse('book', args=[self.short_name])
+        return '%s' % reverse('book', args=[django_urlquote(self.short_name)])
         
     def __unicode__(self):
         return self.title
diff --git a/forum/views.py b/forum/views.py
index dc38bcdf..377e7e8b 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -115,8 +115,6 @@ def questions(request, tagname=None, unanswered=False):
     # template file
     # "questions.html" or "unanswered.html"
     template_file = "questions.html"
-    # Set flag to False by default. If it is equal to True, then need to be saved.
-    pagesize_changed = False
     # get pagesize from session, if failed then get default value
     pagesize = request.session.get("pagesize", 10)
     try:
diff --git a/settings.py b/settings.py
index 7a70ae72..78df6859 100644
--- a/settings.py
+++ b/settings.py
@@ -36,7 +36,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
     #'django.middleware.sqlprint.SqlPrintingMiddleware',
-    #'middleware.pagesize.QuestionsPageSizeMiddleware',
+    'middleware.pagesize.QuestionsPageSizeMiddleware',
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index fa20b014..7ccf1af3 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -108,7 +108,6 @@ blockquote
 		margin-left:20px;text-decoration:underline; font-size:12px; color:#333333;}
 #logo {
 	padding: 5px 0px 0px 0px;
-	margin-bottom:-3px;
 }
 #navBar {float:clear;position:relative;display:block;width:960px;}
 #navBar .nav {margin:20px 0px 0px 16px;
-- 
cgit v1.2.3-1-g7c22


From 68050eb048190c0b924c8c0612540c405dcd5ea6 Mon Sep 17 00:00:00 2001
From: sailingcai <sailingcai@gmail.com>
Date: Mon, 12 Oct 2009 22:58:32 +0800
Subject: 1. trim question title

---
 forum/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forum/views.py b/forum/views.py
index 377e7e8b..08f665f8 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -267,7 +267,7 @@ def ask(request):
         if form.is_valid():
 
             added_at = datetime.datetime.now()
-            title = strip_tags(form.cleaned_data['title'])
+            title = strip_tags(form.cleaned_data['title']).strip()
             wiki = form.cleaned_data['wiki']
             tagnames = form.cleaned_data['tags'].strip()
             text = form.cleaned_data['text']
-- 
cgit v1.2.3-1-g7c22


From 0a6e82562c5c910cef4711e30a04ef866b805e32 Mon Sep 17 00:00:00 2001
From: sailingcai <sailingcai@gmail.com>
Date: Tue, 13 Oct 2009 23:05:39 +0800
Subject: 1. refactor get_answers_from_question 2. refactor order_by for
 answers

---
 forum/managers.py | 17 +++++++++++------
 forum/views.py    |  6 +-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/forum/managers.py b/forum/managers.py
index 2e3e4186..aa155415 100644
--- a/forum/managers.py
+++ b/forum/managers.py
@@ -165,17 +165,22 @@ class TagManager(models.Manager):
 
 class AnswerManager(models.Manager):
     GET_ANSWERS_FROM_USER_QUESTIONS = u'SELECT answer.* FROM answer INNER JOIN question ON answer.question_id = question.id WHERE question.author_id =%s AND answer.author_id <> %s'
-    def get_answers_from_question(self, question, user=None):
+    def get_answers_from_question(self, question, user=None, other_orderby = None):
         """
         Retrieves visibile answers for the given question. Delete answers
         are only visibile to the person who deleted them.
-        """
-       
+        """   
         if user is None or not user.is_authenticated():
-            return self.filter(question=question, deleted=False)
+            q = self.filter(question=question, deleted=False)
+        else:
+            q = self.filter(Q(question=question),
+                            Q(deleted=False) | Q(deleted_by=user))
+        if other_orderby is None:
+            q = q.order_by("-accepted")
         else:
-            return self.filter(Q(question=question),
-                               Q(deleted=False) | Q(deleted_by=user))
+            q = q.order_by("-accepted", other_orderby)
+
+        return q
                                
     def get_answers_from_questions(self, user_id):
         """
diff --git a/forum/views.py b/forum/views.py
index 08f665f8..5e53644f 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -329,7 +329,7 @@ def question(request, id):
     if question.deleted and not can_view_deleted_post(request.user, question):
         raise Http404
     answer_form = AnswerForm(question, request.user)
-    answers = Answer.objects.get_answers_from_question(question, request.user)
+    answers = Answer.objects.get_answers_from_question(question, request.user, orderby)
     answers = answers.select_related(depth=1)
 
     favorited = question.has_favorite_by_user(request.user)
@@ -346,10 +346,6 @@ def question(request, id):
                 vote_value = 1
             user_answer_votes[answer.id] = vote_value
 
-
-    if answers is not None:
-        answers = answers.order_by("-accepted", orderby)
-
     filtered_answers = []
     for answer in answers:
         if answer.deleted == True:
-- 
cgit v1.2.3-1-g7c22


From e02cd69de6b6c534792ba12b1ac10e01e04318c2 Mon Sep 17 00:00:00 2001
From: sailingcai <sailingcai@gmail.com>
Date: Wed, 14 Oct 2009 00:27:59 +0800
Subject: 1. Optimize get votes in answers

---
 forum/models.py | 12 +++++++++++-
 forum/views.py  |  9 ++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/forum/models.py b/forum/models.py
index a6326fa9..b6722ae7 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -209,7 +209,17 @@ class Question(models.Model):
 
     def get_latest_revision(self):
         return self.revisions.all()[0]
-
+    
+    def get_user_votes_in_answers(self, user):
+        content_type = ContentType.objects.get_for_model(Answer)
+        query_set = Vote.objects.extra(
+            tables = ['question', 'answer'],
+            where = ['question.id = answer.question_id AND question.id = %s AND vote.object_id = answer.id AND vote.content_type_id = %s AND vote.user_id = %s'],
+            params = [self.id, content_type.id, user.id]
+        )
+        
+        return query_set
+        
     def get_update_summary(self,last_reported_at=None,recipient_email=''):
         edited = False 
         if self.last_edited_at and self.last_edited_at > last_reported_at:
diff --git a/forum/views.py b/forum/views.py
index 5e53644f..cfadaa48 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -338,14 +338,13 @@ def question(request, id):
         question_vote = question_vote[0]
 
     user_answer_votes = {}
-    for answer in answers:
-        vote = answer.get_user_vote(request.user)
-        if vote is not None and not user_answer_votes.has_key(answer.id):
+    for vote in question.get_user_votes_in_answers(request.user):
+        if not user_answer_votes.has_key(vote.object_id):
             vote_value = -1
             if vote.is_upvote():
                 vote_value = 1
-            user_answer_votes[answer.id] = vote_value
-
+            user_answer_votes[vote.object_id] = vote_value      
+    
     filtered_answers = []
     for answer in answers:
         if answer.deleted == True:
-- 
cgit v1.2.3-1-g7c22


From b1085dec13052fa9ff64b53ed292f1ad61064cac Mon Sep 17 00:00:00 2001
From: sailingcai <sailingcai@gmail.com>
Date: Wed, 14 Oct 2009 23:11:41 +0800
Subject: 1. update var setting in blocktrans

---
 templates/user_stats.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/user_stats.html b/templates/user_stats.html
index 432a5b34..c324ff48 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -40,7 +40,7 @@
                 </a>
                 <div class="answer-link">
                     <a href="/questions/{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> {% if answered_question.comment_count %}<span 
-					title="{% blocktrans %}the answer has been commented {{ answered_question.comment_count }} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %}
+					title="{% blocktrans with answered_question.comment_count as count %}the answer has been commented {{count}} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %}
                 </div>
             </div>
             {% endfor %}
-- 
cgit v1.2.3-1-g7c22


From 18f1a07afed3208ef4424305da8c6b1a34cf3aed Mon Sep 17 00:00:00 2001
From: Mike Chen <mike@vm-ubuntu.(none)>
Date: Thu, 15 Oct 2009 00:27:04 +0800
Subject: update INSTALL_

---
 .gitignore |  2 ++
 INSTALL    | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 05a341b0..975f2e73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 *.swp
 nbproject
 settings_local.py
+log
+*.log
diff --git a/INSTALL b/INSTALL
index 35683147..0c5e76dc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,9 +1,16 @@
 PRE-REQUIREMENTS:
 -----------------------------------------------
-1. Python2.5, MySQL, Django v1.0+
+0. We recommend you to use python-setuptools to install pre-requirement libraries.
+If you haven't installed it, please try to install it first.
+e.g, sudo apt-get install python-setuptools
+
+1. Python2.5/2.6, MySQL, Django v1.0/1.1
+Make sure mysql for python provider has been installed.
+sudo easy_install mysql-python
 
 2. Python-openid v2.2
 http://openidenabled.com/python-openid/
+sudo easy_install python-openid
 
 3. django-authopenid(Included in project already)
 http://code.google.com/p/django-authopenid/
@@ -11,21 +18,29 @@ http://code.google.com/p/django-authopenid/
 4. html5lib
 http://code.google.com/p/html5lib/
 Used for HTML sanitizer
+sudo easy_install html5lib
 
 5. Markdown2
 http://code.google.com/p/python-markdown2/
+sudo easy_install markdown2
 
 6. Django Debug Toolbar
 http://github.com/robhudson/django-debug-toolbar/tree/master
 
 INSTALL STEPS:
 -----------------------------------------------
+0. Make sure you have all above python libraries installed.
+
 1. Copy settings_local.py.dist to settings_local.py and 
 update all your settings. Check settings.py and update 
 it as well if necessory.
 
 2. Prepare your database by using the same database/account 
 configuration from above.
+e.g,
+create database cnprog DEFAULT CHARACTER SET UTF8 COLLATE utf8_general_ci;
+grant all on cnprog.* to 'cnprog'@'localhost';
+And then run "python manage.py syncdb" to synchronize your database.
 
 3. Run "python manager.py runserver" to startup django 
 development environment.
-- 
cgit v1.2.3-1-g7c22


From 7e4f1d542e00b4d3121da6ae5524e95867f2371b Mon Sep 17 00:00:00 2001
From: root <root@u15356270.onlinehome-server.com>
Date: Fri, 13 Nov 2009 20:18:55 -0500
Subject: better comments, email subscriptions, corrected view counter, some
 ie7 issues, wiki optional with settings.WIKI_ON, site can be mounted on
 arbitrary url prefix, english language improvements, added feedback form,
 versioned css and js files to force browser cache reload when
 settings.RESOURCE_REVISION is incremented , other fixes

---
 cnprog.wsgi                                        |    7 +-
 context.py                                         |    3 +
 django_authopenid/external_login.py                |  103 +
 django_authopenid/forms.py                         |  462 ++---
 django_authopenid/models.py                        |    5 +
 django_authopenid/urls.py                          |   15 +-
 django_authopenid/util.py                          |    7 +-
 django_authopenid/views.py                         |  345 ++--
 drop-all-tables.sh                                 |    4 +-
 drop-all.sql                                       |   39 +
 forum/auth.py                                      |   92 +-
 forum/const.py                                     |    2 +-
 forum/forms.py                                     |  145 +-
 forum/management/commands/send_email_alerts.py     |  139 +-
 forum/management/commands/subscribe_everyone.py    |   31 +
 forum/managers.py                                  |   11 +-
 forum/models.py                                    |  141 +-
 forum/templatetags/extra_filters.py                |    9 +-
 forum/templatetags/extra_tags.py                   |  126 +-
 forum/templatetags/smart_if.py                     |  401 ++++
 forum/urls.py                                      |   72 +
 forum/user.py                                      |   12 +-
 forum/views.py                                     |  362 ++--
 junk.py                                            |    3 +
 locale/en/LC_MESSAGES/django.mo                    |  Bin 15146 -> 25611 bytes
 locale/en/LC_MESSAGES/django.po                    | 2067 ++++++++++++--------
 locale/es/LC_MESSAGES/django.mo                    |  Bin 49819 -> 49713 bytes
 locale/es/LC_MESSAGES/django.po                    |  497 +++--
 middleware/anon_user.py                            |   26 +
 middleware/cancel.py                               |   15 +
 middleware/pagesize.py                             |    6 +-
 migration                                          |    7 +
 session_messages/.svn/all-wcprops                  |   23 +
 session_messages/.svn/dir-prop-base                |    6 +
 session_messages/.svn/entries                      |   64 +
 session_messages/.svn/format                       |    1 +
 .../.svn/text-base/__init__.py.svn-base            |   36 +
 .../.svn/text-base/context_processors.py.svn-base  |   48 +
 session_messages/.svn/text-base/models.py.svn-base |    3 +
 session_messages/__init__.py                       |   37 +
 session_messages/context_processors.py             |   48 +
 session_messages/models.py                         |    3 +
 settings.py                                        |   25 +-
 settings_local.py.dist                             |   55 +-
 sql_scripts/091111_upgrade_evgeny.sql              |    1 +
 tables.sql                                         |  440 +++++
 templates/404.html                                 |    2 +-
 templates/about.html                               |   25 +
 templates/answer_edit.html                         |   13 +-
 templates/answer_edit_tips.html                    |    8 +-
 templates/ask.html                                 |   19 +-
 templates/authopenid/changeemail.html              |   45 +-
 templates/authopenid/changeopenid.html             |    2 +-
 templates/authopenid/changepw.html                 |   33 +-
 templates/authopenid/complete.html                 |   82 +-
 templates/authopenid/confirm_email.txt             |    2 +-
 templates/authopenid/delete.html                   |    3 +-
 .../authopenid/external_legacy_login_info.html     |   16 +
 templates/authopenid/sendpw.html                   |   30 +-
 templates/authopenid/sendpw_email.txt              |   11 +-
 templates/authopenid/settings.html                 |    2 +-
 templates/authopenid/signin.html                   |   70 +-
 templates/authopenid/signup.html                   |   59 +-
 templates/badges.html                              |    6 +-
 templates/base.html                                |   17 +-
 templates/base_content.html                        |   17 +-
 templates/book.html                                |    6 +-
 templates/content/images/blue-up-arrow-h18px.png   |  Bin 0 -> 593 bytes
 templates/content/images/cnprog_logo_200_56.gif    |  Bin 2114 -> 0 bytes
 templates/content/images/gray-up-arrow-h18px.png   |  Bin 0 -> 383 bytes
 templates/content/images/logo.gif                  |  Bin 0 -> 2114 bytes
 templates/content/images/logo.png                  |  Bin 3631 -> 1902 bytes
 templates/content/jquery-openid/jquery.openid.js   |    8 +-
 templates/content/jquery-openid/openid.css         |   36 +-
 templates/content/js/com.cnprog.admin.js           |   13 +
 templates/content/js/com.cnprog.i18n.js            |   31 +-
 templates/content/js/com.cnprog.post.js            |  314 +--
 templates/content/js/com.cnprog.utils.js           |    7 +-
 templates/content/js/jquery.form.js                |  654 +++++++
 templates/content/js/wmd/wmd.js                    |    2 +-
 templates/content/style/default.css                |   27 +-
 templates/content/style/jquery.autocomplete.css    |    2 +-
 templates/content/style/style.css                  |  469 ++++-
 templates/edit_user_email_feeds_form.html          |    4 +
 templates/faq.html                                 |    6 +-
 templates/feedback.html                            |   55 +
 templates/feedback_email.txt                       |   19 +
 templates/footer.html                              |   52 +-
 templates/header.html                              |   28 +-
 templates/index.html                               |   60 +-
 templates/logout.html                              |    1 -
 templates/post_contributor_info.html               |   55 +
 templates/question.html                            |  587 +++---
 templates/question_edit.html                       |   15 +-
 templates/question_edit_tips.html                  |    9 +-
 templates/question_retag.html                      |   13 +-
 templates/question_summary_list_roll.html          |   55 +
 templates/questions.html                           |   45 +-
 templates/revisions_answer.html                    |   41 +-
 templates/revisions_question.html                  |   41 +-
 templates/tags.html                                |    2 +-
 templates/unanswered.html                          |   66 +-
 templates/upfiles/1245715031297631.png             |  Bin 3863 -> 0 bytes
 templates/upfiles/12457157052552259.png            |  Bin 3863 -> 0 bytes
 templates/user.html                                |   30 +-
 templates/user_edit.html                           |    4 +-
 templates/user_email_subscriptions.html            |   23 +
 templates/user_favorites.html                      |    1 -
 templates/user_info.html                           |   42 +-
 templates/user_preferences.html                    |   24 -
 templates/user_recent.html                         |    1 -
 templates/user_reputation.html                     |    4 +-
 templates/user_stats.html                          |   70 +-
 templates/user_tabs.html                           |    6 +-
 templates/user_votes.html                          |    4 +-
 templates/users.html                               |    8 +-
 templates/users_questions.html                     |   34 +-
 urls.py                                            |   65 +-
 user_messages/__init__.py                          |   36 +
 user_messages/context_processors.py                |   52 +
 user_messages/models.py                            |    3 +
 121 files changed, 6802 insertions(+), 2734 deletions(-)
 create mode 100644 django_authopenid/external_login.py
 create mode 100644 drop-all.sql
 create mode 100644 forum/management/commands/subscribe_everyone.py
 create mode 100644 forum/templatetags/smart_if.py
 create mode 100644 forum/urls.py
 create mode 100644 junk.py
 create mode 100644 middleware/anon_user.py
 create mode 100644 middleware/cancel.py
 create mode 100644 migration
 create mode 100644 session_messages/.svn/all-wcprops
 create mode 100644 session_messages/.svn/dir-prop-base
 create mode 100644 session_messages/.svn/entries
 create mode 100644 session_messages/.svn/format
 create mode 100644 session_messages/.svn/text-base/__init__.py.svn-base
 create mode 100644 session_messages/.svn/text-base/context_processors.py.svn-base
 create mode 100644 session_messages/.svn/text-base/models.py.svn-base
 create mode 100644 session_messages/__init__.py
 create mode 100644 session_messages/context_processors.py
 create mode 100644 session_messages/models.py
 create mode 100644 sql_scripts/091111_upgrade_evgeny.sql
 create mode 100644 tables.sql
 create mode 100644 templates/authopenid/external_legacy_login_info.html
 create mode 100644 templates/content/images/blue-up-arrow-h18px.png
 delete mode 100644 templates/content/images/cnprog_logo_200_56.gif
 create mode 100644 templates/content/images/gray-up-arrow-h18px.png
 create mode 100644 templates/content/images/logo.gif
 create mode 100644 templates/content/js/com.cnprog.admin.js
 create mode 100644 templates/content/js/jquery.form.js
 create mode 100644 templates/edit_user_email_feeds_form.html
 create mode 100644 templates/feedback.html
 create mode 100644 templates/feedback_email.txt
 create mode 100644 templates/post_contributor_info.html
 create mode 100644 templates/question_summary_list_roll.html
 delete mode 100755 templates/upfiles/1245715031297631.png
 delete mode 100755 templates/upfiles/12457157052552259.png
 create mode 100644 templates/user_email_subscriptions.html
 delete mode 100644 templates/user_preferences.html
 create mode 100644 user_messages/__init__.py
 create mode 100644 user_messages/context_processors.py
 create mode 100644 user_messages/models.py

diff --git a/cnprog.wsgi b/cnprog.wsgi
index a1bd8039..a3d332f2 100644
--- a/cnprog.wsgi
+++ b/cnprog.wsgi
@@ -1,8 +1,7 @@
 import os
 import sys
-
-sys.path.append('/var/www/vhosts')
-os.environ['DJANGO_SETTINGS_MODULE'] = 'cnprog.settings'
-
+sys.path.append('/var/www/vhosts/default/htdocs')
+sys.path.append('/var/www/vhosts/default/htdocs/forum')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'forum.settings'
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/context.py b/context.py
index 3da69f7b..680d1c3c 100644
--- a/context.py
+++ b/context.py
@@ -11,6 +11,9 @@ def application_settings(context):
         'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE,
         'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY,
         'BOOKS_ON':settings.BOOKS_ON,
+        'WIKI_ON':settings.WIKI_ON,
+        'USE_EXTERNAL_LEGACY_LOGIN':settings.USE_EXTERNAL_LEGACY_LOGIN,
+        'RESOURCE_REVISION':settings.RESOURCE_REVISION,
         }
     return {'settings':my_settings}
 
diff --git a/django_authopenid/external_login.py b/django_authopenid/external_login.py
new file mode 100644
index 00000000..bd49c009
--- /dev/null
+++ b/django_authopenid/external_login.py
@@ -0,0 +1,103 @@
+#this file contains stub functions that can be extended to support
+#connect legacy login with external site
+import settings
+from django_authopenid.models import ExternalLoginData
+import httplib
+import urllib
+import Cookie
+import cookielib
+from django import forms
+import xml.dom.minidom as xml
+import logging
+
+def login(request,user):
+    """performs the additional external login operation
+    """
+    pass
+
+def set_login_cookies(response,user):
+    #should be unique value by design
+    try:
+        eld = ExternalLoginData.objects.get(user=user)
+
+        data = eld.external_session_data
+        dom = xml.parseString(data)
+        login_response = dom.getElementsByTagName('login')[0]
+        userid = login_response.getAttribute('lguserid') 
+        username = login_response.getAttribute('lgusername')
+        token = login_response.getAttribute('lgtoken')
+        prefix = login_response.getAttribute('cookieprefix').decode('utf-8')
+        sessionid = login_response.getAttribute('sessionid')
+
+        c = {}
+        c[prefix + 'UserName'] = username
+        c[prefix + 'UserID'] = userid
+        c[prefix + 'Token'] = token
+        c[prefix + '_session'] = sessionid
+
+        #custom code that copies cookies from external site
+        #not sure how to set paths and domain of cookies here
+        for key in c:
+            if c[key]:
+                response.set_cookie(str(key),value=str(c[key]))
+    except ExternalLoginData.DoesNotExist:
+        #this must be an OpenID login
+        pass
+
+#function to perform external logout, if needed
+def logout(request):
+    pass
+
+#should raise User.DoesNotExist or pass
+def clean_username(username):
+    return username
+
+def check_password(username,password):
+    """connects to external site and submits username/password pair
+    return True or False depending on correctness of login
+    saves remote unique id and remote session data in table ExternalLoginData
+    may raise forms.ValidationError
+    """
+    host = settings.EXTERNAL_LEGACY_LOGIN_HOST
+    port = settings.EXTERNAL_LEGACY_LOGIN_PORT
+    ext_site = httplib.HTTPConnection(host,port)
+
+    #custom code. this one does authentication through
+    #MediaWiki API
+    params = urllib.urlencode({'action':'login','format':'xml',
+            'lgname':username,'lgpassword':password})
+    headers = {"Content-type": "application/x-www-form-urlencoded",
+                'User-Agent':"User-Agent':'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.7) Gecko/2009021910 Firefox/3.0.7",
+              "Accept": "text/xml"}
+    ext_site.request("POST","/wiki/api.php",params,headers)
+    response = ext_site.getresponse()
+    if response.status != 200:
+        raise forms.ValidationError('error ' + response.status + ' ' + response.reason)
+    data = response.read().strip()
+    ext_site.close()
+
+    dom = xml.parseString(data)
+    login = dom.getElementsByTagName('login')[0]
+    result = login.getAttribute('result')
+    
+    if result == 'Success':
+        username = login.getAttribute('lgusername')
+        try:
+            eld = ExternalLoginData.objects.get(external_username=username)
+        except ExternalLoginData.DoesNotExist:
+            eld = ExternalLoginData()
+        eld.external_username = username
+        eld.external_session_data = data
+        eld.save()
+        return True 
+    else:
+        error = login.getAttribute('details')
+        raise forms.ValidationError(error)
+    return False 
+
+def createuser(username,email,password):
+    pass
+
+#retrieve email address
+def get_email(username,password):
+    return ''
diff --git a/django_authopenid/forms.py b/django_authopenid/forms.py
index 690a781f..d4482751 100644
--- a/django_authopenid/forms.py
+++ b/django_authopenid/forms.py
@@ -35,8 +35,10 @@ from django.contrib.auth.models import User
 from django.contrib.auth import authenticate
 from django.utils.translation import ugettext as _
 from django.conf import settings
-
+import external_login
+import types
 import re
+from django.utils.safestring import mark_safe
 
 
 # needed for some linux distributions like debian
@@ -46,16 +48,110 @@ except ImportError:
     from yadis import xri
     
 from django_authopenid.util import clean_next
+from django_authopenid.models import ExternalLoginData
+
+__all__ = ['OpenidSigninForm', 'ClassicLoginForm', 'OpenidVerifyForm',
+        'OpenidRegisterForm', 'ClassicRegisterForm', 'ChangePasswordForm',
+        'ChangeEmailForm', 'EmailPasswordForm', 'DeleteForm',
+        'ChangeOpenidForm']
 
-__all__ = ['OpenidSigninForm', 'OpenidAuthForm', 'OpenidVerifyForm',
-        'OpenidRegisterForm', 'RegistrationForm', 'ChangepwForm',
-        'ChangeemailForm', 'EmailPasswordForm', 'DeleteForm',
-        'ChangeOpenidForm', 'ChangeEmailForm', 'ChangepwForm']
+class NextUrlField(forms.CharField):
+    def __init__(self):
+        super(NextUrlField,self).__init__(max_length = 255,widget = forms.HiddenInput(),required = False)
+    def clean(self,value):
+        return clean_next(value)
+
+attrs_dict = { 'class': 'required login' }
+
+class UserNameField(forms.CharField):
+    username_re = re.compile(r'^[\w ]+$')
+    RESERVED_NAMES = (u'fuck', u'shit', u'ass', u'sex', u'add',
+                       u'edit', u'save', u'delete', u'manage', u'update', 'remove', 'new')
+    def __init__(self,must_exist=False,skip_clean=False,label=_('choose a username'),**kw):
+        self.must_exist = must_exist
+        self.skip_clean = skip_clean
+        super(UserNameField,self).__init__(max_length=30,
+                widget=forms.TextInput(attrs=attrs_dict),
+                label=label,
+                error_messages={'required':_('user name is required'),
+                                'taken':_('sorry, this name is taken, please choose another'),
+                                'forbidden':_('sorry, this name is not allowed, please choose another'),
+                                'missing':_('sorry, there is no user with this name'),
+                                'multiple-taken':_('sorry, we have a serious error - user name is taken by several users'),
+                                'invalid':_('user name can only consist of letters, empty space and underscore'),
+                            },
+                **kw
+                )
+
+    def clean(self,username):
+        """ validate username """
+        username = super(UserNameField,self).clean(username.strip())
+        if self.skip_clean == True:
+            return username
+        if not username_re.search(username):
+            raise forms.ValidationError(self.error_messages['invalid'])
+        if username in self.RESERVED_NAMES:
+            raise forms.ValidationError(self.error_messages['forbidden'])
+        try:
+            user = User.objects.get(
+                    username__exact = username
+            )
+            if user:
+                if self.must_exist:
+                    return username
+                else:
+                    raise forms.ValidationError(self.error_messages['taken'])
+        except User.DoesNotExist:
+            if self.must_exist:
+                raise forms.ValidationError(self.error_messages['missing'])
+            else:
+                return username
+        except User.MultipleObjectsReturned:
+            raise forms.ValidationError(self.error_messages['multiple-taken'])
+
+class UserEmailField(forms.EmailField):
+    def __init__(self,skip_clean=False,**kw):
+        self.skip_clean = skip_clean
+        super(UserEmailField,self).__init__(widget=forms.TextInput(attrs=dict(attrs_dict,
+            maxlength=200)), label=mark_safe(_('your email address')),
+            error_messages={'required':_('email address is required'),
+                            'invalid':_('please enter a valid email address'),
+                            'taken':_('this email is already used by someone else, please choose another'),
+                            },
+            **kw
+            )
+
+    def clean(self,email):
+        """ validate if email exist in database
+        from legacy register
+        return: raise error if it exist """
+        email = super(UserEmailField,self).clean(email.strip())
+        if self.skip_clean:
+            return email
+        if settings.EMAIL_UNIQUE == True:
+            try:
+                user = User.objects.get(email = email)
+                raise forms.ValidationError(self.error_messsages['taken'])
+            except User.DoesNotExist:
+                return email
+            except User.MultipleObjectsReturned:
+                raise forms.ValidationError(self.error_messages['taken'])
+        else:
+            return email 
+
+def clean_nonempty_field_method(self,field):
+    value = None
+    if field in self.cleaned_data:
+        value = str(self.cleaned_data[field]).strip()
+        if value == '':
+            value = None
+    self.cleaned_data[field] = value
+    return value 
 
 class OpenidSigninForm(forms.Form):
     """ signin form """
     openid_url = forms.CharField(max_length=255, widget=forms.widgets.TextInput(attrs={'class': 'openid-login-input', 'size':80}))
-    next = forms.CharField(max_length=255, widget=forms.HiddenInput(), required=False)
+    next = NextUrlField()
 
     def clean_openid_url(self):
         """ test if openid is accepted """
@@ -67,76 +163,98 @@ class OpenidSigninForm(forms.Form):
                 raise forms.ValidationError(_('i-names are not supported'))
             return self.cleaned_data['openid_url']
 
-    def clean_next(self):
-        """ validate next """
-        if 'next' in self.cleaned_data and self.cleaned_data['next'] != "":
-            self.cleaned_data['next'] = clean_next(self.cleaned_data['next'])
-            return self.cleaned_data['next']
-
-
-attrs_dict = { 'class': 'required login' }
-username_re = re.compile(r'^\w+$')
-RESERVED_NAMES = (u'fuck', u'shit', u'ass', u'sex', u'add',
-                   u'edit', u'save', u'delete', u'manage', u'update', 'remove', 'new')
-
-class OpenidAuthForm(forms.Form):
+class ClassicLoginForm(forms.Form):
     """ legacy account signin form """
-    next = forms.CharField(max_length=255, widget=forms.HiddenInput(), 
-            required=False)
-    username = forms.CharField(max_length=30,  
-            widget=forms.widgets.TextInput(attrs=attrs_dict))
+    next = NextUrlField()
+    username = UserNameField(required=False,skip_clean=True)
     password = forms.CharField(max_length=128, 
-            widget=forms.widgets.PasswordInput(attrs=attrs_dict))
-       
+            widget=forms.widgets.PasswordInput(attrs=attrs_dict), required=False)
+
     def __init__(self, data=None, files=None, auto_id='id_%s',
             prefix=None, initial=None): 
-        super(OpenidAuthForm, self).__init__(data, files, auto_id,
+        super(ClassicLoginForm, self).__init__(data, files, auto_id,
                 prefix, initial)
         self.user_cache = None
-            
+
+    clean_nonempty_field = clean_nonempty_field_method
+
     def clean_username(self):
-        """ validate username and test if it exists."""
-        if 'username' in self.cleaned_data and \
-                'openid_url' not in self.cleaned_data:
-            if not username_re.search(self.cleaned_data['username']):
-                raise forms.ValidationError(_("Usernames can only contain \
-                    letters, numbers and underscores"))
-            try:
-                user = User.objects.get(
-                        username__exact = self.cleaned_data['username']
-                )
-            except User.DoesNotExist:
-                raise forms.ValidationError(_("This username does not exist \
-                    in our database. Please choose another."))
-            except User.MultipleObjectsReturned:
-                raise forms.ValidationError(u'There is already more than one \
-                    account registered with that username. Please try \
-                    another.')
-            return self.cleaned_data['username']
+        return self.clean_nonempty_field('username')
 
     def clean_password(self):
-        """" test if password is valid for this username """
-        if 'username' in self.cleaned_data and \
-                'password' in self.cleaned_data:
-            self.user_cache =  authenticate(
-                    username=self.cleaned_data['username'], 
-                    password=self.cleaned_data['password']
-            )
+        return self.clean_nonempty_field('password')
+
+    def clean(self):
+        """ 
+        this clean function actuall cleans username and password
+
+        test if password is valid for this username 
+        this is really the "authenticate" function
+        also openid_auth is not an authentication backend
+        since it's written in a way that does not comply with
+        the Django convention
+        """
+
+        error_list = []
+        username = self.cleaned_data['username']
+        password = self.cleaned_data['password']
+
+        self.user_cache = None
+        if username and password: 
+
+            if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+                pw_ok = False
+                try:
+                    pw_ok = external_login.check_password(username,password)
+                except forms.ValidationError, e:
+                    error_list.extend(e.messages)
+                if pw_ok:
+                    external_user = ExternalLoginData.objects.get(external_username=username)
+                    if external_user.user == None:
+                        return self.cleaned_data
+                    user = external_user.user
+                    openid_logins = user.userassociation_set.all()
+                    
+                    if len(openid_logins) > 0:
+                        msg1 = _('Account with this name already exists on the forum')
+                        msg2 = _('can\'t have two logins to the same account yet, sorry.')
+                        error_list.append(msg1)
+                        error_list.append(msg2)
+                        self._errors['__all__'] = forms.util.ErrorList(error_list)
+                        return self.cleaned_data
+                    else:
+                        #synchronize password with external login
+                        user.set_password(password)
+                        user.save()
+                        #this auth will always succeed
+                        self.user_cache = authenticate(username=user.username,\
+                                                        password=password)
+                else:
+                    #keep self.user_cache == None
+                    #nothing to do, error message will be set below
+                    pass
+            else:
+                self.user_cache = authenticate(username=username, password=password)
+
             if self.user_cache is None:
-                raise forms.ValidationError(_("Please enter a valid \
-                    username and password. Note that both fields are \
-                    case-sensitive."))
+                del self.cleaned_data['username']
+                del self.cleaned_data['password']
+                error_list.insert(0,(_("Please enter valid username and password "
+                                    "(both are case-sensitive).")))
             elif self.user_cache.is_active == False:
-                raise forms.ValidationError(_("This account is inactive."))
-            return self.cleaned_data['password']
+                error_list.append(_("This account is inactive."))
+            if len(error_list) > 0:
+                error_list.insert(0,_('Login failed.'))
+        elif password == None and username == None:
+            error_list.append(_('Please enter username and password'))
+        elif password == None:
+            error_list.append(_('Please enter your password'))
+        elif username == None:
+            error_list.append(_('Please enter user name'))
+        if len(error_list) > 0:
+            self._errors['__all__'] = forms.util.ErrorList(error_list)
+        return self.cleaned_data
 
-    def clean_next(self):
-        """ validate next url """
-        if 'next' in self.cleaned_data and \
-                self.cleaned_data['next'] != "":
-            self.cleaned_data['next'] = clean_next(self.cleaned_data['next'])
-            return self.cleaned_data['next']
-            
     def get_user(self):
         """ get authenticated user """
         return self.user_cache
@@ -144,56 +262,14 @@ class OpenidAuthForm(forms.Form):
 
 class OpenidRegisterForm(forms.Form):
     """ openid signin form """
-    next = forms.CharField(max_length=255, widget=forms.HiddenInput(), 
-            required=False)
-    username = forms.CharField(max_length=30, 
-            widget=forms.widgets.TextInput(attrs=attrs_dict))
-    email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict, 
-        maxlength=200)), label=u'Email address')
-    
-    def clean_username(self):
-        """ test if username is valid and exist in database """
-        if 'username' in self.cleaned_data:
-            if not username_re.search(self.cleaned_data['username']):
-                raise forms.ValidationError(_('invalid user name'))
-            if self.cleaned_data['username'] in RESERVED_NAMES:
-                raise forms.ValidationError(_('sorry, this name can not be used, please try another'))
-            if len(self.cleaned_data['username']) < settings.MIN_USERNAME_LENGTH:
-                raise forms.ValidationError(_('username too short'))
-            try:
-                user = User.objects.get(
-                        username__exact = self.cleaned_data['username']
-                        )
-            except User.DoesNotExist:
-                return self.cleaned_data['username']
-            except User.MultipleObjectsReturned:
-                raise forms.ValidationError(_('this name is already in use - please try anoter'))
-            raise forms.ValidationError(_('this name is already in use - please try anoter'))
-            
-    def clean_email(self):
-        """Optionally, for security reason one unique email in database"""
-        if 'email' in self.cleaned_data:
-            if settings.EMAIL_UNIQUE == True:
-                    try:
-                        user = User.objects.get(email = self.cleaned_data['email'])
-                    except User.DoesNotExist:
-                        return self.cleaned_data['email']
-                    except User.MultipleObjectsReturned:
-                        raise forms.ValidationError(u'There is already more than one \
-                            account registered with that e-mail address. Please try \
-                            another.')
-                    raise forms.ValidationError(_("This email is already \
-                        registered in our database. Please choose another."))
-            else:
-                return self.cleaned_data['email']
-        #what if not???
-    
+    next = NextUrlField()
+    username = UserNameField()
+    email = UserEmailField()
+
 class OpenidVerifyForm(forms.Form):
     """ openid verify form (associate an openid with an account) """
-    next = forms.CharField(max_length=255, widget = forms.HiddenInput(), 
-            required=False)
-    username = forms.CharField(max_length=30, 
-            widget=forms.widgets.TextInput(attrs=attrs_dict))
+    next = NextUrlField()
+    username = UserNameField(must_exist=True)
     password = forms.CharField(max_length=128, 
             widget=forms.widgets.PasswordInput(attrs=attrs_dict))
     
@@ -203,24 +279,6 @@ class OpenidVerifyForm(forms.Form):
                 prefix, initial)
         self.user_cache = None
 
-    def clean_username(self):
-        """ validate username """
-        if 'username' in self.cleaned_data:
-            if not username_re.search(self.cleaned_data['username']):
-                raise forms.ValidationError(_('invalid user name'))
-            try:
-                user = User.objects.get(
-                        username__exact = self.cleaned_data['username']
-                )
-            except User.DoesNotExist:
-                raise forms.ValidationError(_("This username don't exist. \
-                        Please choose another."))
-            except User.MultipleObjectsReturned:
-                raise forms.ValidationError(u'Somehow, that username is in \
-                    use for multiple accounts. Please contact us to get this \
-                    problem resolved.')
-            return self.cleaned_data['username']
-            
     def clean_password(self):
         """ test if password is valid for this user """
         if 'username' in self.cleaned_data and \
@@ -236,7 +294,7 @@ class OpenidVerifyForm(forms.Form):
             elif self.user_cache.is_active == False:
                 raise forms.ValidationError(_("This account is inactive."))
             return self.cleaned_data['password']
-            
+
     def get_user(self):
         """ get authenticated user """
         return self.user_cache
@@ -245,88 +303,54 @@ class OpenidVerifyForm(forms.Form):
 attrs_dict = { 'class': 'required' }
 username_re = re.compile(r'^[\w ]+$')
 
-class RegistrationForm(forms.Form):
+class ClassicRegisterForm(forms.Form):
     """ legacy registration form """
 
-    next = forms.CharField(max_length=255, widget=forms.HiddenInput(), 
-            required=False)
-    username = forms.CharField(max_length=30,
-            widget=forms.TextInput(attrs=attrs_dict),
-            label=_('choose a username'))
-    email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict,
-            maxlength=200)), label=_('your email address'))
+    next = NextUrlField()
+    username = UserNameField()
+    email = UserEmailField()
     password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
-            label=_('choose password'))
+            label=_('choose password'),
+            error_messages={'required':_('password is required')},
+            )
     password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
-            label=_('retype password'))
-
-    def clean_username(self):
-        """
-        Validates that the username is alphanumeric and is not already
-        in use.
-        
-        """
-        if 'username' in self.cleaned_data:
-            if not username_re.search(self.cleaned_data['username']):
-                raise forms.ValidationError(u'Usernames can only contain \
-                        letters, numbers and underscores')
-            try:
-                user = User.objects.get(
-                        username__exact = self.cleaned_data['username']
-                )
-
-            except User.DoesNotExist:
-                return self.cleaned_data['username']
-            except User.MultipleObjectsReturned:
-                raise forms.ValidationError(u'Somehow, that username is in \
-                    use for multiple accounts. Please contact us to get this \
-                    problem resolved.')
-            raise forms.ValidationError(u'This username is already taken. \
-                    Please choose another.')
-
-    def clean_email(self):
-        """ validate if email exist in database
-        :return: raise error if it exist """
-        if 'email' in self.cleaned_data:
-            if settings.EMAIL_UNIQUE == True:
-                try:
-                    user = User.objects.get(email = self.cleaned_data['email'])
-                except User.DoesNotExist:
-                    return self.cleaned_data['email']
-                except User.MultipleObjectsReturned:
-                    raise forms.ValidationError(u'There is already more than one \
-                        account registered with that e-mail address. Please try \
-                        another.')
-                raise forms.ValidationError(u'This email is already registered \
-                        in our database. Please choose another.')
-            else:
-                return self.cleaned_data['email']
-        #what if not?
+            label=mark_safe(_('retype password')),
+            error_messages={'required':_('please, retype your password'),
+                            'nomatch':_('sorry, entered passwords did not match, please try again')},
+            required=False
+            )
     
     def clean_password2(self):
         """
         Validates that the two password inputs match.
         
         """
-        if 'password1' in self.cleaned_data and \
-                'password2' in self.cleaned_data and \
-                self.cleaned_data['password1'] == \
+        self.cleaned_data['password2'] = self.cleaned_data.get('password2','')
+        if self.cleaned_data['password2'] == '':
+            del self.cleaned_data['password2']
+            raise forms.ValidationError(self.fields['password2'].error_messages['required'])
+        if 'password1' in self.cleaned_data \
+                and self.cleaned_data['password1'] == \
                 self.cleaned_data['password2']:
             return self.cleaned_data['password2']
-        raise forms.ValidationError(u'You must type the same password each \
-                time')
+        else:
+            del self.cleaned_data['password2']
+            del self.cleaned_data['password1']
+            raise forms.ValidationError(self.fields['password2'].error_messages['nomatch'])
 
-
-class ChangepwForm(forms.Form):
+class ChangePasswordForm(forms.Form):
     """ change password form """
-    oldpw = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict))
-    password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict))
-    password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict))
+    oldpw = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
+                label=mark_safe(_('Current password')))
+    password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
+                label=mark_safe(_('New password')))
+    password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
+                label=mark_safe(_('Retype new password')))
 
     def __init__(self, data=None, user=None, *args, **kwargs):
         if user is None:
             raise TypeError("Keyword argument 'user' must be supplied")
-        super(ChangepwForm, self).__init__(data, *args, **kwargs)
+        super(ChangePasswordForm, self).__init__(data, *args, **kwargs)
         self.user = user
 
     def clean_oldpw(self):
@@ -347,49 +371,35 @@ class ChangepwForm(forms.Form):
         raise forms.ValidationError(_("new passwords do not match"))
         
         
-class ChangeemailForm(forms.Form):
+class ChangeEmailForm(forms.Form):
     """ change email form """
-    email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict, 
-        maxlength=200)), label=u'Email address')
-    password = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict))
+    email = UserEmailField(skip_clean=True)
 
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, \
             initial=None, user=None):
-        if user is None:
-            raise TypeError("Keyword argument 'user' must be supplied")
-        super(ChangeemailForm, self).__init__(data, files, auto_id, 
+        super(ChangeEmailForm, self).__init__(data, files, auto_id, 
                 prefix, initial)
-        self.test_openid = False
         self.user = user
-        
-        
+
     def clean_email(self):
         """ check if email don't exist """
         if 'email' in self.cleaned_data:
             if settings.EMAIL_UNIQUE == True:
-                if self.user.email != self.cleaned_data['email']:
-                    try:
-                        user = User.objects.get(email = self.cleaned_data['email'])
-                    except User.DoesNotExist:
+                try:
+                    user = User.objects.get(email = self.cleaned_data['email'])
+                    if self.user and self.user == user:   
                         return self.cleaned_data['email']
-                    except User.MultipleObjectsReturned:
-                        raise forms.ValidationError(u'There is already more than one \
-                            account registered with that e-mail address. Please try \
-                            another.')
-                    raise forms.ValidationError(u'This email is already registered \
-                        in our database. Please choose another.')
+                except User.DoesNotExist:
+                    return self.cleaned_data['email']
+                except User.MultipleObjectsReturned:
+                    raise forms.ValidationError(u'There is already more than one \
+                        account registered with that e-mail address. Please try \
+                        another.')
+                raise forms.ValidationError(u'This email is already registered \
+                    in our database. Please choose another.')
             else:
                 return self.cleaned_data['email']
-        #what if not?
         
-
-    def clean_password(self):
-        """ check if we have to test a legacy account or not """
-        if 'password' in self.cleaned_data:
-            if not self.user.check_password(self.cleaned_data['password']):
-                self.test_openid = True
-        return self.cleaned_data['password']
-                
 class ChangeopenidForm(forms.Form):
     """ change openid form """
     openid_url = forms.CharField(max_length=255,
@@ -422,8 +432,7 @@ class DeleteForm(forms.Form):
 
 class EmailPasswordForm(forms.Form):
     """ send new password form """
-    username = forms.CharField(max_length=30,
-            widget=forms.TextInput(attrs={'class': "required" }))
+    username = UserNameField(skip_clean=True,label=mark_safe(_('Your user name (<i>required</i>)')))
 
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, 
             initial=None):
@@ -431,7 +440,6 @@ class EmailPasswordForm(forms.Form):
                 prefix, initial)
         self.user_cache = None
 
-
     def clean_username(self):
         """ get user for this username """
         if 'username' in self.cleaned_data:
diff --git a/django_authopenid/models.py b/django_authopenid/models.py
index e6fb8111..7b2e1c02 100644
--- a/django_authopenid/models.py
+++ b/django_authopenid/models.py
@@ -69,3 +69,8 @@ class UserPasswordQueue(models.Model):
 
     def __unicode__(self):
         return self.user.username
+
+class ExternalLoginData(models.Model):
+    external_username = models.CharField(max_length=40, unique=True, null=False)
+    external_session_data = models.TextField()
+    user = models.ForeignKey(User, null=True)
diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py
index f5d7a72f..112cbbe1 100644
--- a/django_authopenid/urls.py
+++ b/django_authopenid/urls.py
@@ -7,12 +7,13 @@ urlpatterns = patterns('django_authopenid.views',
     url(r'^yadis.xrdf$', 'xrdf', name='yadis_xrdf'),
      # manage account registration
     url(r'^%s$' % _('signin/'), 'signin', name='user_signin'),
-    url(r'^%s%s$' % (_('signin/'),_('newquestion/')), 'signin', kwargs = {'newquestion':True}),
-    url(r'^%s%s$' % (_('signin/'),_('newanswer/')), 'signin', kwargs = {'newanswer':True}),
+    url(r'^%s%s$' % (_('signin/'),_('newquestion/')), 'signin', kwargs = {'newquestion':True}, name='user_signin_new_question'),
+    url(r'^%s%s$' % (_('signin/'),_('newanswer/')), 'signin', kwargs = {'newanswer':True}, name='user_signin_new_answer'),
     url(r'^%s$' % _('signout/'), 'signout', name='user_signout'),
     url(r'^%s%s$' % (_('signin/'), _('complete/')), 'complete_signin', 
         name='user_complete_signin'),
-    #url(r'^%s$' % _('register/'), 'register', name='user_register'),
+    url('^%s$' % _('external-login/'),'external_legacy_login_info', name='user_external_legacy_login_issues'),
+    url(r'^%s$' % _('register/'), 'register', name='user_register'),
     url(r'^%s$' % _('signup/'), 'signup', name='user_signup'),
     #disable current sendpw function
     url(r'^%s$' % _('sendpw/'), 'sendpw', name='user_sendpw'),
@@ -21,8 +22,10 @@ urlpatterns = patterns('django_authopenid.views',
     # manage account settings
     url(r'^$', _('account_settings'), name='user_account_settings'),
     url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'),
-    url(r'^%s$' % _('email/'), 'changeemail', name='user_changeemail',kwargs = {'action':'change'}),
-    url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_changeemail',kwargs = {'action':'validate'}),
-    #url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'),
+    url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_validateemail',kwargs = {'action':'validate'}),
+    url(r'^%s%s$' % (_('email/'), _('change/')), 'changeemail', name='user_changeemail'),
+    url(r'^%s%s$' % (_('email/'), _('sendkey/')), 'send_email_key', name='send_email_key'),
+    url(r'^%s%s(?P<id>\d+)/(?P<key>[\dabcdef]{32})/$' % (_('email/'), _('verify/')), 'verifyemail', name='user_verifyemail'),
+    url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'),
     url(r'^%s$' % _('delete/'), 'delete', name='user_delete'),
 )
diff --git a/django_authopenid/util.py b/django_authopenid/util.py
index 54c1246b..edb6808e 100644
--- a/django_authopenid/util.py
+++ b/django_authopenid/util.py
@@ -7,7 +7,7 @@ import openid.store
 from django.db.models.query import Q
 from django.conf import settings
 from django.http import str_to_unicode
-
+from django.core.urlresolvers import reverse
 
 # needed for some linux distributions like debian
 try:
@@ -22,7 +22,7 @@ from models import Association, Nonce
 
 __all__ = ['OpenID', 'DjangoOpenIDStore', 'from_openid_response', 'clean_next']
 
-DEFAULT_NEXT = getattr(settings, 'OPENID_REDIRECT_NEXT', '/')
+DEFAULT_NEXT = '/' + getattr(settings, 'FORUM_SCRIPT_ALIAS')
 def clean_next(next):
     if next is None:
         return DEFAULT_NEXT
@@ -32,6 +32,9 @@ def clean_next(next):
         return next
     return DEFAULT_NEXT
 
+def get_next_url(request):
+    return clean_next(request.REQUEST.get('next'))
+
 class OpenID:
     def __init__(self, openid_, issued, attrs=None, sreg_=None):
         self.openid = openid_
diff --git a/django_authopenid/views.py b/django_authopenid/views.py
index 65d579f4..feb6b58f 100644
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -30,19 +30,20 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from django.http import HttpResponseRedirect, get_host, Http404
+from django.http import HttpResponseRedirect, get_host, Http404, \
+                         HttpResponseServerError
 from django.shortcuts import render_to_response as render
 from django.template import RequestContext, loader, Context
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.contrib.auth import logout #for login I've added wrapper below - called login
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth import authenticate
 from django.core.urlresolvers import reverse
 from django.utils.encoding import smart_unicode
 from django.utils.html import escape
 from django.utils.translation import ugettext as _
-from django.contrib.sites.models import Site
 from django.utils.http import urlquote_plus
+from django.utils.safestring import mark_safe
 from django.core.mail import send_mail
 from django.views.defaults import server_error
 
@@ -60,15 +61,24 @@ import re
 import urllib
 
 
-from django_authopenid.util import OpenID, DjangoOpenIDStore, from_openid_response, clean_next
-from django_authopenid.models import UserAssociation, UserPasswordQueue
-from django_authopenid.forms import OpenidSigninForm, OpenidAuthForm, OpenidRegisterForm, \
-        OpenidVerifyForm, RegistrationForm, ChangepwForm, ChangeemailForm, \
+from forum.forms import EditUserEmailFeedsForm
+from django_authopenid.util import OpenID, DjangoOpenIDStore, from_openid_response, get_next_url 
+from django_authopenid.models import UserAssociation, UserPasswordQueue, ExternalLoginData
+from django_authopenid.forms import OpenidSigninForm, ClassicLoginForm, OpenidRegisterForm, \
+        OpenidVerifyForm, ClassicRegisterForm, ChangePasswordForm, ChangeEmailForm, \
         ChangeopenidForm, DeleteForm, EmailPasswordForm
+import external_login
+import logging
 
 def login(request,user):
     from django.contrib.auth import login as _login
     from forum.models import user_logged_in #custom signal
+
+    print 'in login call'
+
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        external_login.login(request,user)
+
     #1) get old session key
     session_key = request.session.session_key
     #2) login and get new session key
@@ -76,6 +86,12 @@ def login(request,user):
     #3) send signal with old session key as argument
     user_logged_in.send(user=user,session_key=session_key,sender=None)
 
+def logout(request):
+    from django.contrib.auth import logout as _logout#for login I've added wrapper below - called login
+    _logout(request)
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        external_login.logout(request)
+
 def get_url_host(request):
     if request.is_secure():
         protocol = 'https'
@@ -138,7 +154,7 @@ def complete(request, on_success=None, on_failure=None, return_to=None):
 def default_on_success(request, identity_url, openid_response):
     """ default action on openid signin success """
     request.session['openid'] = from_openid_response(openid_response)
-    return HttpResponseRedirect(clean_next(request.GET.get('next')))
+    return HttpResponseRedirect(get_next_url(request))
 
 def default_on_failure(request, message):
     """ default failure action on signin """
@@ -152,16 +168,15 @@ def not_authenticated(func):
     he is already logged."""
     def decorated(request, *args, **kwargs):
         if request.user.is_authenticated():
-            next = request.GET.get("next", "/")
-            return HttpResponseRedirect(next)
+            return HttpResponseRedirect(get_next_url(request))
         return func(request, *args, **kwargs)
     return decorated
 
 @not_authenticated
 def signin(request,newquestion=False,newanswer=False):
     """
-    signin page. It manage the legacy authentification (user/password) 
-    and authentification with openid.
+    signin page. It manages the legacy authentification (user/password) 
+    and openid authentification
 
     url: /signin/
     
@@ -169,27 +184,112 @@ def signin(request,newquestion=False,newanswer=False):
     """
     request.encoding = 'UTF-8'
     on_failure = signin_failure
-    next = clean_next(request.GET.get('next'))
-
+    email_feeds_form = EditUserEmailFeedsForm()
+    next = get_next_url(request)
     form_signin = OpenidSigninForm(initial={'next':next})
-    form_auth = OpenidAuthForm(initial={'next':next})
+    form_auth = ClassicLoginForm(initial={'next':next})
     
     if request.POST:   
-
+        #'blogin' - password login
         if 'blogin' in request.POST.keys():
-            # perform normal django authentification
-            form_auth = OpenidAuthForm(request.POST)
+            form_auth = ClassicLoginForm(request.POST)
             if form_auth.is_valid():
-                user_ = form_auth.get_user()
-                login(request, user_)
-                next = clean_next(form_auth.cleaned_data.get('next'))
-                print 'next stop is "%s"' % next
-                return HttpResponseRedirect(next)
+                #have login and password and need to login through external website
+                if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+                    username = form_auth.cleaned_data['username']
+                    password = form_auth.cleaned_data['password']
+                    next = form_auth.cleaned_data['next']
+                    if form_auth.get_user() == None:
+                        #need to create internal user
+
+                        #1) save login and password temporarily in session
+                        request.session['external_username'] = username
+                        request.session['external_password'] = password
+
+                        #2) see if username clashes with some existing user
+                        #if so, we have to prompt the user to pick a different name
+                        username_taken = User.is_username_taken(username)
+                        #try:
+                        #    User.objects.get(username=username)
+                        #    username_taken = True
+                        #except User.DoesNotExist:
+                        #    username_taken = False
+
+                        #3) try to extract user email from external service
+                        email = external_login.get_email(username,password)
+
+                        email_feeds_form = EditUserEmailFeedsForm()
+                        form_data = {'username':username,'email':email,'next':next}
+                        form = OpenidRegisterForm(initial=form_data)
+                        template_data = {'form1':form,'username':username,\
+                                        'email_feeds_form':email_feeds_form,\
+                                        'provider':mark_safe(settings.EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME),\
+                                        'login_type':'legacy',\
+                                        'gravatar_faq_url':reverse('faq') + '#gravatar',\
+                                        'external_login_name_is_taken':username_taken}
+                        return render('authopenid/complete.html',template_data,\
+                                context_instance=RequestContext(request))
+                    else:
+                        #user existed, external password is ok
+                        user = form_auth.get_user()
+                        login(request,user)
+                        response = HttpResponseRedirect(get_next_url(request))
+                        external_login.set_login_cookies(response,user)
+                        return response
+                else:
+                    #regular password authentication
+                    user = form_auth.get_user()
+                    login(request, user)
+                    return HttpResponseRedirect(get_next_url(request))
+
+        elif 'bnewaccount' in request.POST.keys():
+            #register externally logged in password user with a new local account
+            if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+                form = OpenidRegisterForm(request.POST) 
+                email_feeds_form = EditUserEmailFeedsForm(request.POST)
+                form1_is_valid = form.is_valid()
+                form2_is_valid = email_feeds_form.is_valid()
+                if form1_is_valid and form2_is_valid:
+                    #create the user
+                    username = form.cleaned_data['username']
+                    password = request.session.get('external_password',None)
+                    email = form.cleaned_data['email']
+                    print 'got email addr %s' % email
+                    if password and username:
+                        User.objects.create_user(username,email,password)
+                        user = authenticate(username=username,password=password)
+                        external_username = request.session['external_username']
+                        eld = ExternalLoginData.objects.get(external_username=external_username)
+                        eld.user = user
+                        eld.save()
+                        login(request,user)
+                        email_feeds_form.save(user)
+                        del request.session['external_username']
+                        del request.session['external_password']
+                        return HttpResponseRedirect(reverse('index'))
+                    else:
+                        if password:
+                            del request.session['external_username']
+                        if username:
+                            del request.session['external_password']
+                        return HttpResponseServerError()
+                else:
+                    username = request.POST.get('username',None)
+                    provider = mark_safe(settings.EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME)
+                    username_taken = User.is_username_taken(username)
+                    data = {'login_type':'legacy','form1':form,'username':username,\
+                        'email_feeds_form':email_feeds_form,'provider':provider,\
+                        'gravatar_faq_url':reverse('faq') + '#gravatar',\
+                        'external_login_name_is_taken':username_taken}
+                    return render('authopenid/complete.html',data,
+                            context_instance=RequestContext(request))
+            else:
+                raise Http404
 
         elif 'bsignin' in request.POST.keys() or 'openid_username' in request.POST.keys():
             form_signin = OpenidSigninForm(request.POST)
             if form_signin.is_valid():
-                next = clean_next(form_signin.cleaned_data.get('next'))
+                next = form_signin.cleaned_data['next']
                 sreg_req = sreg.SRegRequest(optional=['nickname', 'email'])
                 redirect_to = "%s%s?%s" % (
                         get_url_host(request),
@@ -203,6 +303,7 @@ def signin(request,newquestion=False,newanswer=False):
                         sreg_request=sreg_req)
 
 
+    #if request is GET
     question = None
     if newquestion == True:
         from forum.models import AnonymousQuestion as AQ
@@ -232,7 +333,6 @@ def complete_signin(request):
     return complete(request, signin_success, signin_failure,
             get_url_host(request) + reverse('user_complete_signin'))
 
-
 def signin_success(request, identity_url, openid_response):
     """
     openid signin success.
@@ -256,8 +356,7 @@ def signin_success(request, identity_url, openid_response):
         user_.backend = "django.contrib.auth.backends.ModelBackend"
         login(request, user_)
         
-    next = clean_next(request.GET.get('next'))
-    return HttpResponseRedirect(next)
+    return HttpResponseRedirect(get_next_url(request))
 
 def is_association_exist(openid_url):
     """ test if an openid is already in database """
@@ -284,15 +383,13 @@ def register(request):
     template : authopenid/complete.html
     """
 
-    is_redirect = False
-    next = clean_next(request.GET.get('next'))
     openid_ = request.session.get('openid', None)
+    next = get_next_url(request)
     if not openid_:
-        return HttpResponseRedirect(reverse('user_signin') + next)
+        return HttpResponseRedirect(reverse('user_signin') + '?next=%s' % next)
 
     nickname = openid_.sreg.get('nickname', '')
     email = openid_.sreg.get('email', '')
-    
     form1 = OpenidRegisterForm(initial={
         'next': next,
         'username': nickname,
@@ -302,19 +399,22 @@ def register(request):
         'next': next,
         'username': nickname,
     })
+    email_feeds_form = EditUserEmailFeedsForm()
 
     user_ = None
+    is_redirect = False
     if request.POST:
-        just_completed = False
         if 'bnewaccount' in request.POST.keys():
             form1 = OpenidRegisterForm(request.POST)
-            if form1.is_valid():
-                next = clean_next(form1.cleaned_data.get('next'))
+            email_feeds_form = EditUserEmailFeedsForm(request.POST)
+            if form1.is_valid() and email_feeds_form.is_valid():
+                next = form1.cleaned_data['next']
                 is_redirect = True
                 tmp_pwd = User.objects.make_random_password()
                 user_ = User.objects.create_user(form1.cleaned_data['username'],
                          form1.cleaned_data['email'], tmp_pwd)
-                
+
+                user_.set_unusable_password()
                 # make association with openid
                 uassoc = UserAssociation(openid_url=str(openid_),
                         user_id=user_.id)
@@ -323,11 +423,12 @@ def register(request):
                 # login 
                 user_.backend = "django.contrib.auth.backends.ModelBackend"
                 login(request, user_)
+                email_feeds_form.save(user_)
         elif 'bverify' in request.POST.keys():
             form2 = OpenidVerifyForm(request.POST)
             if form2.is_valid():
                 is_redirect = True
-                next = clean_next(form2.cleaned_data.get('next'))
+                next = form2.cleaned_data['next']
                 user_ = form2.get_user()
 
                 uassoc = UserAssociation(openid_url=str(openid_),
@@ -339,15 +440,16 @@ def register(request):
         #this needs to be a function call becase this is also done
         #if user just logged in and did not need to create the new account
         
-        if user_ != None and settings.EMAIL_VALIDATION == 'on':
-            send_new_email_key(user_,nomessage=True)
-            output = validation_email_sent(request)
-            set_email_validation_message(user_) #message set after generating view
-            return output
-        elif user_.is_authenticated():
-            return HttpResponseRedirect('/')
-        else:
-            raise server_error('')
+        if user_ != None:
+            if settings.EMAIL_VALIDATION == 'on':
+                send_new_email_key(user_,nomessage=True)
+                output = validation_email_sent(request)
+                set_email_validation_message(user_) #message set after generating view
+                return output
+            if user_.is_authenticated():
+                return HttpResponseRedirect(reverse('index'))
+            else:
+                raise Exception('openid login failed')#should not ever get here
     
     openid_str = str(openid_)
     bits = openid_str.split('/')
@@ -369,9 +471,12 @@ def register(request):
     return render('authopenid/complete.html', {
         'form1': form1,
         'form2': form2,
-        'provider':provider_logo,
-        'nickname': nickname,
-        'email': email
+        'email_feeds_form': email_feeds_form,
+        'provider':mark_safe(provider_logo),
+        'username': nickname,
+        'email': email,
+        'login_type':'openid',
+        'gravatar_faq_url':reverse('faq') + '#gravatar',
     }, context_instance=RequestContext(request))
 
 def signin_failure(request, message):
@@ -380,9 +485,9 @@ def signin_failure(request, message):
 
     template : "authopenid/signin.html"
     """
-    next = clean_next(request.GET.get('next'))
+    next = get_next_url(request)
     form_signin = OpenidSigninForm(initial={'next': next})
-    form_auth = OpenidAuthForm(initial={'next': next})
+    form_auth = ClassicLoginForm(initial={'next': next})
 
     return render('authopenid/signin.html', {
         'msg': message,
@@ -399,42 +504,52 @@ def signup(request):
 
     templates: authopenid/signup.html, authopenid/confirm_email.txt
     """
-    action_signin = reverse('user_signin')
-    next = clean_next(request.GET.get('next'))
-    form = RegistrationForm(initial={'next':next})
-    form_signin = OpenidSigninForm(initial={'next':next})
-    
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
+    next = get_next_url(request)
     if request.POST:
-        form = RegistrationForm(request.POST)
-        if form.is_valid():
-            next = clean_next(form.cleaned_data.get('next'))
-            user_ = User.objects.create_user( form.cleaned_data['username'],
-                    form.cleaned_data['email'], form.cleaned_data['password1'])
+        form = ClassicRegisterForm(request.POST)
+        email_feeds_form = EditUserEmailFeedsForm(request.POST)
+
+        #validation outside if to remember form values
+        form1_is_valid = form.is_valid()
+        form2_is_valid = email_feeds_form.is_valid()
+        if form1_is_valid and form2_is_valid:
+            next = form.cleaned_data['next']
+            username = form.cleaned_data['username']
+            password = form.cleaned_data['password1']
+            email = form.cleaned_data['email']
+
+            user_ = User.objects.create_user( username,email,password )
+            if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+                external_login.create_user(username,email,password)
            
             user_.backend = "django.contrib.auth.backends.ModelBackend"
             login(request, user_)
+            email_feeds_form.save(user_)
             
             # send email
-            current_domain = Site.objects.get_current().domain
-            subject = _("Welcome")
+            subject = _("Welcome email subject line")
             message_template = loader.get_template(
                     'authopenid/confirm_email.txt'
             )
             message_context = Context({ 
-                'site_url': 'http://%s/' % current_domain,
-                'username': form.cleaned_data['username'],
-                'password': form.cleaned_data['password1'] 
+                'signup_url': settings.APP_URL + reverse('user_signin'),
+                'username': username,
+                'password': password,
             })
             message = message_template.render(message_context)
             send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, 
                     [user_.email])
-            
             return HttpResponseRedirect(next)
-    
+    else:
+        form = ClassicRegisterForm(initial={'next':next})
+        email_feeds_form = EditUserEmailFeedsForm()
     return render('authopenid/signup.html', {
-        'form': form,
-        'form2': form_signin,
+        'form': form, 
+        'email_feeds_form': email_feeds_form 
         }, context_instance=RequestContext(request))
+    #what if request is not posted?
 
 @login_required
 def signout(request):
@@ -447,10 +562,8 @@ def signout(request):
         del request.session['openid']
     except KeyError:
         pass
-    next = clean_next(request.GET.get('next'))
     logout(request)
-    
-    return HttpResponseRedirect(next)
+    return HttpResponseRedirect(get_next_url(request))
     
 def xrdf(request):
     url_host = get_url_host(request)
@@ -498,11 +611,16 @@ def changepw(request):
     url : /changepw/
     template: authopenid/changepw.html
     """
-    
     user_ = request.user
+
+    if user_.has_usable_password():
+        if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+            return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
+    else:
+        raise Http404
     
     if request.POST:
-        form = ChangepwForm(request.POST, user=user_)
+        form = ChangePasswordForm(request.POST, user=user_)
         if form.is_valid():
             user_.set_password(form.cleaned_data['password1'])
             user_.save()
@@ -512,18 +630,20 @@ def changepw(request):
                     urlquote_plus(msg))
             return HttpResponseRedirect(redirect)
     else:
-        form = ChangepwForm(user=user_)
+        form = ChangePasswordForm(user=user_)
 
     return render('authopenid/changepw.html', {'form': form },
                                 context_instance=RequestContext(request))
 
 def find_email_validation_messages(user):
-    msg_text = _('your email needs to be validated')
+    msg_text = _('your email needs to be validated see %(details_url)s') \
+        % {'details_url':reverse('faq') + '#validate'}
     return user.message_set.filter(message__exact=msg_text)
 
 def set_email_validation_message(user):
     messages = find_email_validation_messages(user)
-    msg_text = _('your email needs to be validated')
+    msg_text = _('your email needs to be validated see %(details_url)s') \
+        % {'details_url':reverse('faq') + '#validate'}
     if len(messages) == 0:
         user.message_set.create(message=msg_text)
 
@@ -543,11 +663,11 @@ def _send_email_key(user):
     """private function. sends email containing validation key
     to user's email address
     """
-    subject = _("Welcome")
+    subject = _("Email verification subject line")
     message_template = loader.get_template('authopenid/email_validation.txt')
     import settings
     message_context = Context({
-    'validation_link': '%s/email/verify/%d/%s/' % (settings.APP_URL ,user.id,user.email_key)
+    'validation_link': settings.APP_URL + reverse('user_verifyemail', kwargs={'id':user.id,'key':user.email_key})
     })
     message = message_template.render(message_context)
     send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user.email])
@@ -583,7 +703,7 @@ def send_email_key(request):
                               context_instance=RequestContext(request)
                               )
         else:
-            _send_email_key(request.user)
+            send_new_email_key(request.user)
             return validation_email_sent(request)
     else:
         raise Http404
@@ -592,10 +712,11 @@ def send_email_key(request):
 #internal server view used as return value by other views
 def validation_email_sent(request):
     return render('authopenid/changeemail.html',
-                    { 'email': request.user.email, 'action_type': 'validate', }, 
+                    { 'email': request.user.email, 
+                    'change_email_url': reverse('user_changeemail'),
+                    'action_type': 'validate', }, 
                      context_instance=RequestContext(request))
 
-
 def verifyemail(request,id=None,key=None):
     """
     view that is shown when user clicks email validation link
@@ -614,53 +735,49 @@ def verifyemail(request,id=None,key=None):
     raise Http404
 
 @login_required
-def changeemail(request):
+def changeemail(request, action='change'):
     """ 
-    changeemail view. It require password or openid to allow change.
+    changeemail view. requires openid with request type GET
 
     url: /email/*
 
     template : authopenid/changeemail.html
     """
-    msg = request.GET.get('msg', '')
+    msg = request.GET.get('msg', None)
     extension_args = {}
     user_ = request.user
 
-    redirect_to = get_url_host(request) + reverse('user_changeemail')
-    action = 'change'
-
     if request.POST:
-        form = ChangeemailForm(request.POST, user=user_)
+        if 'cancel' in request.POST:
+            msg = _('your email was not changed')
+            request.user.message_set.create(message=msg)
+            return HttpResponseRedirect(get_next_url(request))
+        form = ChangeEmailForm(request.POST, user=user_)
         if form.is_valid():
-            if not form.test_openid:
-                new_email = form.cleaned_data['email']
-                if new_email != user_.email:
-                    if settings.EMAIL_VALIDATION == 'on':
-                        action = 'validate'
-                    else:
-                        action = 'done_novalidate'
-                    set_new_email(user_, new_email,nomessage=True)
+            new_email = form.cleaned_data['email']
+            if new_email != user_.email:
+                if settings.EMAIL_VALIDATION == 'on':
+                    action = 'validate'
                 else:
-                    action = 'keep'
+                    action = 'done_novalidate'
+                set_new_email(user_, new_email,nomessage=True)
             else:
-                #what does this branch do?
-                return server_error('')
-                request.session['new_email'] = form.cleaned_data['email']
-                return ask_openid(request, form.cleaned_data['password'], 
-                        redirect_to, on_failure=emailopenid_failure)    
+                action = 'keep'
 
     elif not request.POST and 'openid.mode' in request.GET:
+        redirect_to = get_url_host(request) + reverse('user_changeemail')
         return complete(request, emailopenid_success, 
                 emailopenid_failure, redirect_to) 
     else:
-        form = ChangeemailForm(initial={'email': user_.email},
+        form = ChangeEmailForm(initial={'email': user_.email},
                 user=user_)
-
     
     output = render('authopenid/changeemail.html', {
         'form': form,
         'email': user_.email,
         'action_type': action,
+        'gravatar_faq_url': reverse('faq') + '#gravatar',
+        'change_email_url': reverse('user_changeemail'),
         'msg': msg 
         }, context_instance=RequestContext(request))
 
@@ -669,7 +786,6 @@ def changeemail(request):
 
     return output
 
-
 def emailopenid_success(request, identity_url, openid_response):
     openid_ = from_openid_response(openid_response)
 
@@ -843,7 +959,7 @@ def deleteopenid_success(request, identity_url, openid_response):
                     identity_url))
     
     msg = _("Account deleted.") 
-    redirect = "/?msg=%s" % (urlquote_plus(msg))
+    redirect = reverse('index') + u"/?msg=%s" % (urlquote_plus(msg))
     return HttpResponseRedirect(redirect)
     
 
@@ -851,6 +967,8 @@ def deleteopenid_failure(request, message):
     redirect_to = "%s?msg=%s" % (reverse('user_delete'), urlquote_plus(message))
     return HttpResponseRedirect(redirect_to)
 
+def external_legacy_login_info(request):
+    return render('authopenid/external_legacy_login_info.html', context_instance=RequestContext(request))
 
 def sendpw(request):
     """
@@ -862,6 +980,8 @@ def sendpw(request):
 
     templates :  authopenid/sendpw_email.txt, authopenid/sendpw.html
     """
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
 
     msg = request.GET.get('msg','')
     if request.POST:
@@ -881,21 +1001,20 @@ def sendpw(request):
             uqueue.confirm_key = confirm_key
             uqueue.save()
             # send email 
-            current_domain = Site.objects.get_current().domain
             subject = _("Request for new password")
             message_template = loader.get_template(
                     'authopenid/sendpw_email.txt')
+            key_link = settings.APP_URL + reverse('user_confirmchangepw') + '?key=' + confirm_key
             message_context = Context({ 
-                'site_url': 'http://%s' % current_domain,
-                'confirm_key': confirm_key,
+                'site_url': settings.APP_URL + reverse('index'),
+                'key_link': key_link,
                 'username': form.user_cache.username,
                 'password': new_pw,
-                'url_confirm': reverse('user_confirmchangepw'),
             })
             message = message_template.render(message_context)
             send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, 
                     [form.user_cache.email])
-            msg = _("A new password has been sent to your email address.")
+            msg = _("A new password and the activation link were sent to your email address.")
     else:
         form = EmailPasswordForm()
         
@@ -918,7 +1037,7 @@ def confirmchangepw(request):
     """
     confirm_key = request.GET.get('key', '')
     if not confirm_key:
-        return HttpResponseRedirect('/')
+        return HttpResponseRedirect(reverse('index'))
 
     try:
         uqueue = UserPasswordQueue.objects.get(
diff --git a/drop-all-tables.sh b/drop-all-tables.sh
index 87783b77..1e55cb1f 100644
--- a/drop-all-tables.sh
+++ b/drop-all-tables.sh
@@ -1,4 +1,4 @@
-mysql_username='cnprog'
-mysql_database='cnprog'
+mysql_username=''
+mysql_database=''
 mysqldump -u $mysql_username -p --add-drop-table --no-data $mysql_database | grep ^DROP 
 #| mysql -u[USERNAME] -p[PASSWORD] [DATABASE]
diff --git a/drop-all.sql b/drop-all.sql
new file mode 100644
index 00000000..52feb337
--- /dev/null
+++ b/drop-all.sql
@@ -0,0 +1,39 @@
+DROP TABLE IF EXISTS `activity`;
+DROP TABLE IF EXISTS `answer`;
+DROP TABLE IF EXISTS `answer_revision`;
+DROP TABLE IF EXISTS `auth_group`;
+DROP TABLE IF EXISTS `auth_group_permissions`;
+DROP TABLE IF EXISTS `auth_message`;
+DROP TABLE IF EXISTS `auth_permission`;
+DROP TABLE IF EXISTS `auth_user`;
+DROP TABLE IF EXISTS `auth_user_groups`;
+DROP TABLE IF EXISTS `auth_user_user_permissions`;
+DROP TABLE IF EXISTS `award`;
+DROP TABLE IF EXISTS `badge`;
+DROP TABLE IF EXISTS `book`;
+DROP TABLE IF EXISTS `book_author_info`;
+DROP TABLE IF EXISTS `book_author_rss`;
+DROP TABLE IF EXISTS `book_question`;
+DROP TABLE IF EXISTS `comment`;
+DROP TABLE IF EXISTS `django_admin_log`;
+DROP TABLE IF EXISTS `django_authopenid_association`;
+DROP TABLE IF EXISTS `django_authopenid_externallogindata`;
+DROP TABLE IF EXISTS `django_authopenid_nonce`;
+DROP TABLE IF EXISTS `django_authopenid_userassociation`;
+DROP TABLE IF EXISTS `django_authopenid_userpasswordqueue`;
+DROP TABLE IF EXISTS `django_content_type`;
+DROP TABLE IF EXISTS `django_session`;
+DROP TABLE IF EXISTS `django_site`;
+DROP TABLE IF EXISTS `favorite_question`;
+DROP TABLE IF EXISTS `flagged_item`;
+DROP TABLE IF EXISTS `forum_anonymousanswer`;
+DROP TABLE IF EXISTS `forum_anonymousemail`;
+DROP TABLE IF EXISTS `forum_anonymousquestion`;
+DROP TABLE IF EXISTS `forum_emailfeed`;
+DROP TABLE IF EXISTS `forum_emailfeedsetting`;
+DROP TABLE IF EXISTS `question`;
+DROP TABLE IF EXISTS `question_revision`;
+DROP TABLE IF EXISTS `question_tags`;
+DROP TABLE IF EXISTS `repute`;
+DROP TABLE IF EXISTS `tag`;
+DROP TABLE IF EXISTS `vote`;
diff --git a/forum/auth.py b/forum/auth.py
index 776746e8..1569482f 100644
--- a/forum/auth.py
+++ b/forum/auth.py
@@ -6,18 +6,20 @@ and superuser status.
 """
 import datetime
 from django.contrib.contenttypes.models import ContentType
+from django.utils.translation import ugettext as _
 from django.db import transaction
 from models import Repute
 from models import Question
 from models import Answer
 from const import TYPE_REPUTATION
+import logging
 question_type = ContentType.objects.get_for_model(Question)
 answer_type = ContentType.objects.get_for_model(Answer)
 
 VOTE_UP                   = 15
 FLAG_OFFENSIVE            = 15
 POST_IMAGES               = 15
-LEAVE_COMMENTS            = 50
+LEAVE_COMMENTS            = 50 
 UPLOAD_FILES              = 60
 VOTE_DOWN                 = 100
 CLOSE_OWN_QUESTIONS       = 250
@@ -58,6 +60,9 @@ REPUTATION_RULES = {
     'lose_by_upvote_canceled'             : -10,
 }
 
+def can_moderate_users(user):
+    return user.is_superuser
+
 def can_vote_up(user):
     """Determines if a User can vote Questions and Answers up."""
     return user.is_authenticated() and (
@@ -70,11 +75,18 @@ def can_flag_offensive(user):
         user.reputation >= FLAG_OFFENSIVE or
         user.is_superuser)
 
-def can_add_comments(user):
+def can_add_comments(user,subject):
     """Determines if a User can add comments to Questions and Answers."""
-    return user.is_authenticated() and (
-        user.reputation >= LEAVE_COMMENTS or
-        user.is_superuser)
+    if user.is_authenticated():
+        if user.id == subject.author.id:
+            return True
+        if user.reputation >= LEAVE_COMMENTS:
+            return True
+        if user.is_superuser:
+            return True
+        if isinstance(subject,Answer) and subject.question.author.id == user.id:
+            return True
+    return False
 
 def can_vote_down(user):
     """Determines if a User can vote Questions and Answers down."""
@@ -139,8 +151,21 @@ def can_reopen_question(user, question):
         user.reputation >= REOPEN_OWN_QUESTIONS) or user.is_superuser
 
 def can_delete_post(user, post):
-    return (user.is_authenticated() and
-        user.id == post.author_id) or user.is_superuser
+    if user.is_superuser:
+        return True
+    elif user.is_authenticated() and user == post.author:
+        if isinstance(post,Answer):
+            return True
+        elif isinstance(post,Question):
+            answers = post.answers.all()
+            for answer in answers:
+                if user != answer.author and answer.deleted == False:
+                    return False
+            return True
+        else:
+            return False
+    else:
+        return False
 
 def can_view_deleted_post(user, post):
     return user.is_superuser
@@ -422,15 +447,20 @@ def onDownVotedCanceled(vote, post, user):
 
 def onDeleteCanceled(post, user):
     post.deleted = False
-    post.deleted_by = None
-    post.deleted_at = None
+    post.deleted_by = None 
+    post.deleted_at = None 
     post.save()
-    for tag in list(post.tags.all()):
-        if tag.used_count == 1 and tag.deleted:
-            tag.deleted = False
-            tag.deleted_by = None
-            tag.deleted_at = None
-            tag.save()
+    logging.debug('now restoring something')
+    if isinstance(post,Answer):
+        logging.debug('updated answer count on undelete, have %d' % post.question.answer_count)
+        Question.objects.update_answer_count(post.question)
+    elif isinstance(post,Question):
+        for tag in list(post.tags.all()):
+            if tag.used_count == 1 and tag.deleted:
+                tag.deleted = False
+                tag.deleted_by = None
+                tag.deleted_at = None 
+                tag.save()
 
 def onDeleted(post, user):
     post.deleted = True
@@ -438,9 +468,31 @@ def onDeleted(post, user):
     post.deleted_at = datetime.datetime.now()
     post.save()
 
-    for tag in list(post.tags.all()):
-        if tag.used_count == 1:
-            tag.deleted = True
-            tag.deleted_by = user
-            tag.deleted_at = datetime.datetime.now()
+    if isinstance(post, Question):
+        for tag in list(post.tags.all()):
+            if tag.used_count == 1:
+                tag.deleted = True
+                tag.deleted_by = user
+                tag.deleted_at = datetime.datetime.now()
+            else:
+                tag.used_count = tag.used_count - 1 
             tag.save()
+
+        answers = post.answers.all()
+        if user == post.author:
+            if len(answers) > 0:
+                msg = _('Your question and all of it\'s answers have been deleted')
+            else:
+                msg = _('Your question has been deleted')
+        else:
+            if len(answers) > 0:
+                msg = _('The question and all of it\'s answers have been deleted')
+            else:
+                msg = _('The question has been deleted')
+        user.message_set.create(message=msg)
+        logging.debug('posted a message %s' % msg)
+        for answer in answers:
+            onDeleted(answer, user)
+    elif isinstance(post, Answer):
+        Question.objects.update_answer_count(post.question)
+        logging.debug('updated answer count to %d' % post.question.answer_count)
diff --git a/forum/const.py b/forum/const.py
index f6649cc4..9b9230c0 100644
--- a/forum/const.py
+++ b/forum/const.py
@@ -6,7 +6,7 @@ For reasons that models, views can't have unicode text in this project, all unic
 """
 CLOSE_REASONS = (
     (1, _('duplicate question')),
-    (2, _('question if off-topic or not relevant')),
+    (2, _('question is off-topic or not relevant')),
     (3, _('too subjective and argumentative')),
     (4, _('is not an answer to the question')),
     (5, _('the question is answered, right answer was accepted')),
diff --git a/forum/forms.py b/forum/forms.py
index 59d0d620..5b181d48 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -4,6 +4,8 @@ from django import forms
 from models import *
 from const import *
 from django.utils.translation import ugettext as _
+from django_authopenid.forms import NextUrlField
+import settings
 
 class TitleField(forms.CharField):
     def __init__(self, *args, **kwargs):
@@ -47,26 +49,28 @@ class TagNamesField(forms.CharField):
         self.help_text = _('Tags are short keywords, with no spaces within. Up to five tags can be used.')
         self.initial = ''
 
-	def clean(self, value):
-		value = super(TagNamesField, self).clean(value)
-		data = value.strip()
-		if len(data) < 1:
-			raise forms.ValidationError(_('tags are required'))
-		list = data.split(' ')
-		list_temp = []
-		if len(list) > 5:
-			raise forms.ValidationError(_('please use 5 tags or less'))
-		for tag in list:
-			if len(tag) > 20:
-				raise forms.ValidationError(_('tags must be shorter than 20 characters'))
-			#take tag regex from settings
-			tagname_re = re.compile(r'[a-z0-9]+')
-			if not tagname_re.match(tag):
-				raise forms.ValidationError(_('please use following characters in tags: letters \'a-z\', numbers, and characters \'.-_#\''))
-			# only keep one same tag
-			if tag not in list_temp and len(tag.strip()) > 0:
-				list_temp.append(tag)
-		return u' '.join(list_temp)
+    def clean(self, value):
+        value = super(TagNamesField, self).clean(value)
+        data = value.strip()
+        if len(data) < 1:
+            raise forms.ValidationError(_('tags are required'))
+
+        split_re = re.compile(r'[ ,]+')
+        list = split_re.split(data)
+        list_temp = []
+        if len(list) > 5:
+            raise forms.ValidationError(_('please use 5 tags or less'))
+        for tag in list:
+            if len(tag) > 20:
+                raise forms.ValidationError(_('tags must be shorter than 20 characters'))
+            #take tag regex from settings
+            tagname_re = re.compile(r'[a-z0-9]+')
+            if not tagname_re.match(tag):
+                raise forms.ValidationError(_('please use following characters in tags: letters \'a-z\', numbers, and characters \'.-_#\''))
+            # only keep one same tag
+            if tag not in list_temp and len(tag.strip()) > 0:
+                list_temp.append(tag)
+        return u' '.join(list_temp)
 
 class WikiField(forms.BooleanField):
     def __init__(self, *args, **kwargs):
@@ -74,11 +78,14 @@ class WikiField(forms.BooleanField):
         self.required = False
         self.label  = _('community wiki')
         self.help_text = _('if you choose community wiki option, the question and answer do not generate points and name of author will not be shown')
+    def clean(self,value):
+        return value and settings.WIKI_ON
 
 class EmailNotifyField(forms.BooleanField):
     def __init__(self, *args, **kwargs):
         super(EmailNotifyField, self).__init__(*args, **kwargs)
         self.required = False
+        self.widget.attrs['class'] = 'nomargin'
 
 class SummaryField(forms.CharField):
     def __init__(self, *args, **kwargs):
@@ -89,6 +96,25 @@ class SummaryField(forms.CharField):
         self.label  = _('update summary:')
         self.help_text = _('enter a brief summary of your revision (e.g. fixed spelling, grammar, improved style, this field is optional)')
 
+class ModerateUserForm(forms.ModelForm):
+    is_approved = forms.BooleanField(label=_("Automatically accept user's contributions for the email updates"),
+                                     required=False)
+
+    def clean_is_approved(self):
+        if 'is_approved' not in self.cleaned_data:
+            self.cleaned_data['is_approved'] = False
+        return self.cleaned_data['is_approved']
+
+    class Meta:
+        model = User
+        fields = ('is_approved',)
+
+class FeedbackForm(forms.Form):
+    name = forms.CharField(label=_('Your name:'), required=False)
+    email = forms.EmailField(label=_('Email (not shared with anyone):'), required=False)
+    message = forms.CharField(label=_('Your message:'), max_length=800,widget=forms.Textarea(attrs={'cols':60}))
+    next = NextUrlField()
+
 class AskForm(forms.Form):
     title  = TitleField()
     text   = EditorField()
@@ -109,16 +135,12 @@ class AnswerForm(forms.Form):
     def __init__(self, question, user, *args, **kwargs):
         super(AnswerForm, self).__init__(*args, **kwargs)
         self.fields['email_notify'].widget.attrs['id'] = 'question-subscribe-updates';
-        if question.wiki:
+        if question.wiki and settings.WIKI_ON:
             self.fields['wiki'].initial = True
         if user.is_authenticated():
-            try:
-                feed = EmailFeed.objects.get(feed_id=question.id, subscriber_id=user.id)
-                if feed.subscriber == user and feed.content == question:
-                    self.fields['email_notify'].initial = True
-                    return
-            except EmailFeed.DoesNotExist:
-                pass
+            if user in question.followed_by.all():
+                self.fields['email_notify'].initial = True
+                return
         self.fields['email_notify'].initial = False
 
 
@@ -207,3 +229,70 @@ class EditUserForm(forms.Form):
                         raise forms.ValidationError(_('this email has already been registered, please use another one'))
                     raise forms.ValidationError(_('this email has already been registered, please use another one'))
         return self.cleaned_data['email']
+
+class EditUserEmailFeedsForm(forms.Form):
+    WN = (('w',_('weekly')),('n',_('no email')))
+    DWN = (('d',_('daily')),('w',_('weekly')),('n',_('no email')))
+    FORM_TO_MODEL_MAP = {
+                'all_questions':'q_all',
+                'asked_by_me':'q_ask',
+                'answered_by_me':'q_ans',
+                'individually_selected':'q_sel',
+                }
+    NO_EMAIL_INITIAL = {
+                'all_questions':'n',
+                'asked_by_me':'n',
+                'answered_by_me':'n',
+                'individually_selected':'n',
+                }
+    all_questions = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Entire forum'),)
+    asked_by_me = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Asked by me'))
+    answered_by_me = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Answered by me'))
+    individually_selected = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Individually selected'))
+
+    def set_initial_values(self,user=None):
+        KEY_MAP = dict([(v,k) for k,v in self.FORM_TO_MODEL_MAP.iteritems()])
+        if user != None:
+            settings = EmailFeedSetting.objects.filter(subscriber=user) 
+            initial_values = {}
+            for setting in settings:
+                feed_type = setting.feed_type
+                form_field = KEY_MAP[feed_type]
+                frequency = setting.frequency
+                initial_values[form_field] = frequency
+            self.initial = initial_values
+        return self
+
+    def reset(self):
+        self.cleaned_data['all_questions'] = 'n'
+        self.cleaned_data['asked_by_me'] = 'n'
+        self.cleaned_data['answered_by_me'] = 'n'
+        self.cleaned_data['individually_selected'] = 'n'
+        self.initial = self.NO_EMAIL_INITIAL
+        return self
+
+    def save(self,user):
+        changed = False
+        for form_field, feed_type in self.FORM_TO_MODEL_MAP.items():
+            s, created = EmailFeedSetting.objects.get_or_create(subscriber=user,\
+                                                    feed_type=feed_type)
+            new_value = self.cleaned_data[form_field]
+            if s.frequency != new_value:
+                s.frequency = self.cleaned_data[form_field]
+                s.save()
+                changed = True
+            else:
+                if created:
+                    s.save()
+            if form_field == 'individually_selected':
+                feed_type = ContentType.objects.get_for_model(Question)
+                user.followed_questions.clear()
+        return changed
diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index 3c37aaa3..a25e4343 100644
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -1,9 +1,11 @@
 from django.core.management.base import NoArgsCommand
 from django.db import connection
+from django.db.models import Q, F
 from forum.models import *
-import collections
 from django.core.mail import EmailMessage
 from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext
+import datetime
 import settings
 
 class Command(NoArgsCommand):
@@ -15,27 +17,116 @@ class Command(NoArgsCommand):
         finally:
             connection.close()
 
+    def get_updated_questions_for_user(self,user):
+        q_sel = []
+        q_ask = []
+        q_ans = []
+        q_all = []
+        now = datetime.datetime.now()
+        Q_set1 = Question.objects.exclude(
+                                        last_activity_by=user,
+                                  ).exclude(
+                                        last_activity_at__lt=user.date_joined
+                                  ).filter(
+                                        Q(viewed__who=user,viewed__when__lt=F('last_activity_at')) | \
+                                        ~Q(viewed__who=user)
+                                  ).exclude(
+                                        deleted=True
+                                  ).exclude(
+                                        closed=True
+                                  )
+        user_feeds = EmailFeedSetting.objects.filter(subscriber=user).exclude(frequency='n')
+        for feed in user_feeds:
+            cutoff_time = now - EmailFeedSetting.DELTA_TABLE[feed.frequency]
+            if feed.reported_at == None or feed.reported_at <= cutoff_time:
+                Q_set = Q_set1.exclude(last_activity_at__gt=cutoff_time)
+                feed.reported_at = now
+                feed.save()#may not actually report anything, depending on filters below
+                if feed.feed_type == 'q_sel':
+                    q_sel = Q_set.filter(followed_by=user)
+                    q_sel.cutoff_time = cutoff_time
+                elif feed.feed_type == 'q_ask':
+                    q_ask = Q_set.filter(author=user)
+                    q_ask.cutoff_time = cutoff_time
+                elif feed.feed_type == 'q_ans':
+                    q_ans = Q_set.filter(answers__author=user)
+                    q_ans.cutoff_time = cutoff_time
+                elif feed.feed_type == 'q_all':
+                    q_all = Q_set
+                    q_all.cutoff_time = cutoff_time
+        #build list in this order
+        q_tbl = {} 
+        def extend_question_list(src, dst):
+            if isinstance(src,list):
+                return
+            cutoff_time = src.cutoff_time
+            for q in src:
+                if q in dst:
+                    if cutoff_time < dst[q]:
+                        dst[q] = cutoff_time
+                else:
+                    dst[q] = cutoff_time
+
+        extend_question_list(q_sel, q_tbl)
+        extend_question_list(q_ask, q_tbl)
+        extend_question_list(q_ans, q_tbl)
+        extend_question_list(q_all, q_tbl)
+
+        ctype = ContentType.objects.get_for_model(Question)
+        out = {}
+        for q, cutoff_time in q_tbl.items():
+            #todo use Activity, but first start keeping more Activity records
+            #act = Activity.objects.filter(content_type=ctype, object_id=q.id)
+            #get info on question edits, answer edits, comments
+            out[q] = {}
+            q_rev = QuestionRevision.objects.filter(question=q,revised_at__lt=cutoff_time)
+            q_rev = q_rev.exclude(author=user)
+            out[q]['q_rev'] = len(q_rev)
+            if len(q_rev) > 0 and q.added_at == q_rev[0].revised_at:
+                out[q]['q_rev'] = 0
+                out[q]['new_q'] = True
+            else:
+                out[q]['new_q'] = False
+                
+            new_ans = Answer.objects.filter(question=q,added_at__lt=cutoff_time)
+            new_ans = new_ans.exclude(author=user)
+            out[q]['new_ans'] = len(new_ans)
+            ans_rev = AnswerRevision.objects.filter(answer__question=q,revised_at__lt=cutoff_time)
+            ans_rev = ans_rev.exclude(author=user)
+            out[q]['ans_rev'] = len(ans_rev)
+        return out 
+
+    def __act_count(self,string,number,output):
+        if number > 0:
+            output.append(_(string) % {'num':number})
+
     def send_email_alerts(self):
-        report_time = datetime.datetime.now()
-        feeds = EmailFeed.objects.all()
-        user_ctype = ContentType.objects.get_for_model(User)
-
-        #lists of update messages keyed by email address
-        update_collection = collections.defaultdict(list) 
-        for feed in feeds:
-            update_summary = feed.get_update_summary()
-            if update_summary != None:
-                email = feed.get_email()
-                update_collection[email].append(update_summary)
-                feed.reported_at = report_time
-                feed.save()
-
-        for email, updates in update_collection.items():
-            text = '\n'.join(updates)
-            subject = _('updates from website')
-            print 'sent %s to %s' % (updates,email)
-            msg = EmailMessage(subject, text, settings.DEFAULT_FROM_EMAIL, [email])
-            msg.content_subtype = 'html'
-            msg.send()
-
-            
+
+        for user in User.objects.all():
+            q_list = self.get_updated_questions_for_user(user)
+            num_q = len(q_list)
+            if num_q > 0:
+                url_prefix = settings.APP_URL
+                subject = _('email update message subject')
+                text = ungettext('%(name)s, this is an update message header for a question', 
+                            '%(name)s, this is an update message header for %(num)d questions',num_q) \
+                                % {'num':num_q, 'name':user.username}
+
+                text += '<ul>'
+                for q, act in q_list.items():
+                    act_list = []
+                    if act['new_q']:
+                        act_list.append(_('new question'))
+                    self.__act_count('%(num)d rev', act['q_rev'],act_list)
+                    self.__act_count('%(num)d ans', act['new_ans'],act_list)
+                    self.__act_count('%(num)d ans rev',act['ans_rev'],act_list)
+                    act_token = ', '.join(act_list)
+                    text += '<li><a href="%s?sort=latest">%s</a> <font color="#777777">(%s)</font></li>' \
+                                % (url_prefix + q.get_absolute_url(), q.title, act_token)
+                text += '</ul>'
+                link = url_prefix + user.get_profile_url() + '?sort=email_subscriptions'
+                text += _('go to %(link)s to change frequency of email updates or %(email)s administrator') \
+                                % {'link':link, 'email':settings.ADMINS[0][1]}
+                msg = EmailMessage(subject, text, settings.DEFAULT_FROM_EMAIL, [user.email])
+                msg.content_subtype = 'html'
+                msg.send()
diff --git a/forum/management/commands/subscribe_everyone.py b/forum/management/commands/subscribe_everyone.py
new file mode 100644
index 00000000..3f8da9ec
--- /dev/null
+++ b/forum/management/commands/subscribe_everyone.py
@@ -0,0 +1,31 @@
+from django.core.management.base import NoArgsCommand
+from django.db import connection
+from django.db.models import Q, F
+from forum.models import *
+from django.core.mail import EmailMessage
+from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext
+import datetime
+import settings
+
+class Command(NoArgsCommand):
+    def handle_noargs(self,**options):
+        try:
+            self.subscribe_everyone()
+        except Exception, e:
+            print e
+        finally:
+            connection.close()
+
+    def subscribe_everyone(self):
+
+        feed_type_info = EmailFeedSetting.FEED_TYPES
+        for user in User.objects.all():
+            for feed_type in feed_type_info:
+                try:
+                    feed_setting = EmailFeedSetting.objects.get(subscriber=user,feed_type = feed_type[0])
+                except EmailFeedSetting.DoesNotExist:
+                    feed_setting = EmailFeedSetting(subscriber=user,feed_type=feed_type[0])
+                feed_setting.frequency = 'w'
+                feed_setting.reported_at = None
+                feed_setting.save()
diff --git a/forum/managers.py b/forum/managers.py
index 6ae0ed99..795d382e 100644
--- a/forum/managers.py
+++ b/forum/managers.py
@@ -70,7 +70,7 @@ class QuestionManager(models.Manager):
         # although we have imported all classes from models on top.
         from forum.models import Answer
         self.filter(id=question.id).update(
-            answer_count=Answer.objects.get_answers_from_question(question).count())
+            answer_count=Answer.objects.get_answers_from_question(question).filter(deleted=False).count())
     
     def update_view_count(self, question):
         """
@@ -93,11 +93,11 @@ class QuestionManager(models.Manager):
         """
         #print datetime.datetime.now()
         from forum.models import Question
-        questions = list(Question.objects.filter(tagnames = question.tagnames).all())
+        questions = list(Question.objects.filter(tagnames = question.tagnames, deleted=False).all())
 
         tags_list = question.tags.all()
         for tag in tags_list:
-            extend_questions = Question.objects.filter(tags__id = tag.id)[:50]
+            extend_questions = Question.objects.filter(tags__id = tag.id, deleted=False)[:50]
             for item in extend_questions:
                 if item not in questions and len(questions) < 10:
                     questions.append(item)
@@ -110,10 +110,11 @@ class TagManager(models.Manager):
         'UPDATE tag '
         'SET used_count = ('
             'SELECT COUNT(*) FROM question_tags '
-            'WHERE tag_id = tag.id'
+            'INNER JOIN question ON question_id=question.id '
+            'WHERE tag_id = tag.id AND question.deleted=0'
         ') '
         'WHERE id IN (%s)')
-    
+
     def get_valid_tags(self, page_size):
       from forum.models import Tag
       tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:page_size]
diff --git a/forum/models.py b/forum/models.py
index f647ba12..39058bea 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -2,7 +2,7 @@
 import datetime
 import hashlib
 from urllib import quote_plus, urlencode
-from django.db import models
+from django.db import models, IntegrityError
 from django.utils.html import strip_tags
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
@@ -11,33 +11,61 @@ from django.contrib.contenttypes.models import ContentType
 from django.template.defaultfilters import slugify
 from django.db.models.signals import post_delete, post_save, pre_save
 from django.utils.translation import ugettext as _
+from django.utils.safestring import mark_safe
 import django.dispatch
 import settings
 
 from forum.managers import *
 from const import *
 
-class EmailFeed(models.Model):
-    #subscription key for unsubscribe by visiting emailed link
-    key = models.CharField(max_length=32)
-    #generic relation with feed content (i.e. question or tags)
-    feed_content_type = models.ForeignKey(ContentType,related_name='content_emailfeed')
-    feed_id = models.PositiveIntegerField()
-    content = generic.GenericForeignKey('feed_content_type','feed_id')
-    #generic relation with owner - either nameless email or User
-    subscriber_content_type = models.ForeignKey(ContentType,related_name='subscriber_emailfeed')
-    subscriber_id = models.PositiveIntegerField()
-    subscriber = generic.GenericForeignKey('subscriber_content_type','subscriber_id')
-    added_at = models.DateTimeField(default=datetime.datetime.now)
-    reported_at = models.DateTimeField(default=datetime.datetime.now)
-
-    #getter functions rely on implementations of similar functions in content
-    #of subscriber objects
-    def get_update_summary(self):
-        return self.content.get_update_summary(last_reported_at = self.reported_at,recipient_email = self.get_email())
-
-    def get_email(self):
-        return self.subscriber.email
+def get_object_comments(self):
+    comments = self.comments.all().order_by('id')
+    return comments
+
+def post_get_last_update_info(self):
+        when = self.added_at
+        who = self.author
+        if self.last_edited_at and self.last_edited_at > when:
+            when = self.last_edited_at
+            who = self.last_edited_by
+        comments = self.comments.all()
+        if len(comments) > 0:
+            for c in comments:
+                if c.added_at > when:
+                    when = c.added_at
+                    who = c.user
+        return when, who
+
+class EmailFeedSetting(models.Model):
+    DELTA_TABLE = {
+        'w':datetime.timedelta(7),
+        'd':datetime.timedelta(1),
+        'n':datetime.timedelta(-1),
+    }
+    FEED_TYPES = (
+                    ('q_all',_('Entire forum')),
+                    ('q_ask',_('Questions that I asked')),
+                    ('q_ans',_('Questions that I answered')),
+                    ('q_sel',_('Individually selected questions')),
+                    )
+    UPDATE_FREQUENCY = (
+                    ('w',_('Weekly')),
+                    ('d',_('Daily')),
+                    ('n',_('No email')),
+                   )
+    subscriber = models.ForeignKey(User)
+    feed_type = models.CharField(max_length=16,choices=FEED_TYPES)
+    frequency = models.CharField(max_length=8,choices=UPDATE_FREQUENCY,default='n')
+    added_at = models.DateTimeField(auto_now_add=True)
+    reported_at = models.DateTimeField(null=True)
+
+    def save(self,*args,**kwargs):
+        type = self.feed_type
+        subscriber = self.subscriber
+        similar = self.__class__.objects.filter(feed_type=type,subscriber=subscriber).exclude(pk=self.id)
+        if len(similar) > 0:
+            raise IntegrityError('email feed setting already exists')
+        super(EmailFeedSetting,self).save(*args,**kwargs)
 
 class Tag(models.Model):
     name       = models.CharField(max_length=255, unique=True)
@@ -45,7 +73,6 @@ class Tag(models.Model):
     deleted         = models.BooleanField(default=False)
     deleted_at      = models.DateTimeField(null=True, blank=True)
     deleted_by      = models.ForeignKey(User, null=True, blank=True, related_name='deleted_tags')
-    email_feeds     = generic.GenericRelation(EmailFeed)
     # Denormalised data
     used_count = models.PositiveIntegerField(default=0)
 
@@ -136,6 +163,7 @@ class Question(models.Model):
     locked          = models.BooleanField(default=False)
     locked_by       = models.ForeignKey(User, null=True, blank=True, related_name='locked_questions')
     locked_at       = models.DateTimeField(null=True, blank=True)
+    followed_by     = models.ManyToManyField(User, related_name='followed_questions')
     # Denormalised data
     score                = models.IntegerField(default=0)
     vote_up_count        = models.IntegerField(default=0)
@@ -155,7 +183,6 @@ class Question(models.Model):
     comments             = generic.GenericRelation(Comment)
     votes                = generic.GenericRelation(Vote)
     flagged_items        = generic.GenericRelation(FlaggedItem)
-    email_feeds          = generic.GenericRelation(EmailFeed)
 
     objects = QuestionManager()
 
@@ -212,6 +239,22 @@ class Question(models.Model):
     def get_latest_revision(self):
         return self.revisions.all()[0]
 
+    get_comments = get_object_comments
+
+    def get_last_update_info(self):
+
+        when, who = post_get_last_update_info(self)
+
+        answers = self.answers.all()
+        if len(answers) > 0:
+            for a in answers:
+                a_when, a_who = a.get_last_update_info()
+                if a_when > when:
+                    when = a_when
+                    who = a_who
+
+        return when, who
+
     def get_update_summary(self,last_reported_at=None,recipient_email=''):
         edited = False 
         if self.last_edited_at and self.last_edited_at > last_reported_at:
@@ -240,7 +283,7 @@ class Question(models.Model):
                     answer_comments.append(comment)
 
         #create the report
-        if edited or comments or new_answers or modified_answers or answer_comments:
+        if edited or new_answers or modified_answers or answer_comments:
             out = [] 
             if edited:
                 out.append(_('%(author)s modified the question') % {'author':self.last_edited_by.username})
@@ -274,6 +317,11 @@ class Question(models.Model):
     class Meta:
         db_table = u'question'
 
+class QuestionView(models.Model):
+    question = models.ForeignKey(Question, related_name='viewed')
+    who = models.ForeignKey(User, related_name='question_views')
+    when = models.DateTimeField()
+
 class FavoriteQuestion(models.Model):
     """A favorite Question of a User."""
     question      = models.ForeignKey(Question)
@@ -303,7 +351,8 @@ class QuestionRevision(models.Model):
         return self.question.title
 
     def get_absolute_url(self):
-        return '/%s%s/%s' % (_('questions/'),self.question.id,_('revisions'))
+        print 'in QuestionRevision.get_absolute_url()'
+        return reverse('question_revisions', args=[self.question.id])
 
     def save(self, **kwargs):
         """Looks up the next available revision number."""
@@ -383,6 +432,9 @@ class Answer(models.Model):
 
     objects = AnswerManager()
 
+    get_comments = get_object_comments
+    get_last_update_info = post_get_last_update_info
+
     def get_user_vote(self, user):
         votes = self.votes.filter(user=user)
         if votes.count() > 0:
@@ -397,7 +449,7 @@ class Answer(models.Model):
         return self.question.title
 
     def get_absolute_url(self):
-        return '%s%s#%s' % (reverse('question', args=[self.question.id]), self.question.title, self.id)
+        return '%s%s#%s' % (reverse('question', args=[self.question.id]), slugify(self.question.title), self.id)
 
     class Meta:
         db_table = u'answer'
@@ -415,7 +467,7 @@ class AnswerRevision(models.Model):
     text       = models.TextField()
 
     def get_absolute_url(self):
-        return '/%s%s/%s' % (_('answers/'),self.answer.id,_('revisions'))
+        return reverse('answer_revisions', kwargs={'id':self.answer.id})
 
     def get_question_title(self):
         return self.answer.question.title
@@ -538,7 +590,7 @@ class Book(models.Model):
     questions = models.ManyToManyField(Question, related_name='book', db_table='book_question')
     
     def get_absolute_url(self):
-        return '%s' % reverse('book', args=[self.short_name])
+        return reverse('book', args=[self.short_name])
         
     def __unicode__(self):
         return self.title
@@ -577,7 +629,6 @@ class AnonymousEmail(models.Model):
     key = models.CharField(max_length=32)
     email = models.EmailField(null=False,unique=True)
     isvalid = models.BooleanField(default=False)
-    feeds = generic.GenericRelation(EmailFeed)
 
 # User extend properties
 QUESTIONS_PER_PAGE_CHOICES = (
@@ -586,11 +637,30 @@ QUESTIONS_PER_PAGE_CHOICES = (
    (50, u'50'),
 )
 
+def user_is_username_taken(cls,username):
+    try:
+        cls.objects.get(username=username)
+        return True
+    except cls.MultipleObjectsReturned:
+        return True
+    except cls.DoesNotExist:
+        return False
+
+def user_get_q_sel_email_feed_frequency(self):
+    print 'looking for frequency for user %s' % self
+    try:
+        feed_setting = EmailFeedSetting.objects.get(subscriber=self,feed_type='q_sel')
+    except Exception, e:
+        print 'have error %s' % e.message
+        raise e
+    print 'have freq=%s' % feed_setting.frequency
+    return feed_setting.frequency
+
+User.add_to_class('is_approved', models.BooleanField(default=False))
 User.add_to_class('email_isvalid', models.BooleanField(default=False))
 User.add_to_class('email_key', models.CharField(max_length=32, null=True))
 User.add_to_class('reputation', models.PositiveIntegerField(default=1))
 User.add_to_class('gravatar', models.CharField(max_length=32))
-User.add_to_class('email_feeds', generic.GenericRelation(EmailFeed))
 User.add_to_class('favorite_questions',
                   models.ManyToManyField(Question, through=FavoriteQuestion,
                                          related_name='favorited_by'))
@@ -608,6 +678,8 @@ User.add_to_class('website', models.URLField(max_length=200, blank=True))
 User.add_to_class('location', models.CharField(max_length=100, blank=True))
 User.add_to_class('date_of_birth', models.DateField(null=True, blank=True))
 User.add_to_class('about', models.TextField(blank=True))
+User.add_to_class('is_username_taken',classmethod(user_is_username_taken))
+User.add_to_class('get_q_sel_email_feed_frequency',user_get_q_sel_email_feed_frequency)
 
 # custom signal
 tags_updated = django.dispatch.Signal(providing_args=["question"])
@@ -630,7 +702,14 @@ def delete_messages(self):
 def get_profile_url(self):
     """Returns the URL for this User's profile."""
     return '%s%s/' % (reverse('user', args=[self.id]), slugify(self.username))
+
+def get_profile_link(self):
+    profile_link = u'<a href="%s">%s</a>' % (self.get_profile_url(),self.username)
+    logging.debug('in get profile link %s' % profile_link)
+    return mark_safe(profile_link)
+
 User.add_to_class('get_profile_url', get_profile_url)
+User.add_to_class('get_profile_link', get_profile_link)
 User.add_to_class('get_messages', get_messages)
 User.add_to_class('delete_messages', delete_messages)
 
diff --git a/forum/templatetags/extra_filters.py b/forum/templatetags/extra_filters.py
index d8b8e61f..3644fdc3 100644
--- a/forum/templatetags/extra_filters.py
+++ b/forum/templatetags/extra_filters.py
@@ -1,5 +1,6 @@
 from django import template
 from forum import auth
+import logging
 
 register = template.Library()
 
@@ -8,6 +9,10 @@ register = template.Library()
 def collapse(input):
     return ' '.join(input.split())
 
+@register.filter
+def can_moderate_users(user):
+    return auth.can_moderate_users(user)
+
 @register.filter
 def can_vote_up(user):
     return auth.can_vote_up(user)
@@ -17,8 +22,8 @@ def can_flag_offensive(user):
     return auth.can_flag_offensive(user)
 
 @register.filter
-def can_add_comments(user):
-    return auth.can_add_comments(user)
+def can_add_comments(user,subject):
+    return auth.can_add_comments(user,subject)
 
 @register.filter
 def can_vote_down(user):
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index 06a2d27c..8bd0e128 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -1,4 +1,5 @@
 import time
+import os
 import datetime
 import math
 import re
@@ -6,13 +7,15 @@ import logging
 from django import template
 from django.utils.encoding import smart_unicode
 from django.utils.safestring import mark_safe
-from django.utils.timesince import timesince
 from forum.const import *
+from forum.models import Question, Answer, QuestionRevision, AnswerRevision
 from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext
+from django.conf import settings
 
 register = template.Library()
 
-GRAVATAR_TEMPLATE = ('<img width="%(size)s" height="%(size)s" '
+GRAVATAR_TEMPLATE = ('<img class="gravatar" width="%(size)s" height="%(size)s" '
                      'src="http://www.gravatar.com/avatar/%(gravatar_hash)s'
                      '?s=%(size)s&amp;d=identicon&amp;r=PG" '
                      'alt="%(username)s\'s gravatar image" />')
@@ -115,6 +118,23 @@ def cnprog_pagesize(context):
             "pagesize" : context["pagesize"],
             "is_paginated": context["is_paginated"]
         }
+
+@register.inclusion_tag("post_contributor_info.html")
+def post_contributor_info(post,contributor_type='original_author'):
+    """contributor_type: original_author|last_updater
+    """
+    if isinstance(post,Question):
+        post_type = 'question'
+    elif isinstance(post,Answer):
+        post_type = 'answer'
+    elif isinstance(post,AnswerRevision) or isinstance(post,QuestionRevision):
+        post_type = 'revision'
+    return {
+        'post':post,
+        'post_type':post_type,
+        'wiki_on':settings.WIKI_ON,
+        'contributor_type':contributor_type
+    }
         
 @register.simple_tag
 def get_score_badge(user):
@@ -216,20 +236,31 @@ def convert2tagname_list(question):
 
 @register.simple_tag
 def diff_date(date, limen=2):
-    current_time = datetime.datetime(*time.localtime()[0:6])
-    diff = current_time - date
-    diff_days = diff.days
-    if diff_days > limen:
-        return date
+    now = datetime.datetime.now()#datetime(*time.localtime()[0:6])#???
+    diff = now - date
+    days = diff.days
+    hours = int(diff.seconds/3600)
+    minutes = int(diff.seconds/60)
+
+    if days > 2:
+        if date.year == now.year:
+            return date.strftime(_("%b %d at %H:%M"))
+        else:
+            return date.strftime(_("%b %d '%y at %H:%M"))
+    elif days == 2:
+        return _('2 days ago')
+    elif days == 1:
+        return _('yesterday')
+    elif minutes > 60:
+        return ungettext('%(hr)d hour ago','%(hr)d hours ago',hours) % {'hr':hours}
     else:
-        return timesince(date) + _(' ago')
-        
+        return ungettext('%(min)d min ago','%(min)d mins ago',minutes) % {'min':minutes}
+
 @register.simple_tag
 def get_latest_changed_timestamp():
     try:
         from time import localtime, strftime
         from os import path
-        from django.conf import settings
         root = settings.SITE_SRC_ROOT
         dir = (
             root,
@@ -242,3 +273,78 @@ def get_latest_changed_timestamp():
     except:
         timestr = ''
     return timestr
+
+@register.simple_tag
+def href(url):
+    url = '///' + settings.FORUM_SCRIPT_ALIAS + '/' + url
+    return os.path.normpath(url) + '?v=%d' % settings.RESOURCE_REVISION
+
+class ItemSeparatorNode(template.Node):
+    def __init__(self,separator):
+        sep = separator.strip()
+        if sep[0] == sep[-1] and sep[0] in ('\'','"'):
+            sep = sep[1:-1]
+        else:
+            raise template.TemplateSyntaxError('separator in joinitems tag must be quoted')
+        self.content = sep
+    def render(self,context):
+        return self.content
+
+class JoinItemListNode(template.Node):
+    def __init__(self,separator=ItemSeparatorNode("''"), items=()):
+        self.separator = separator
+        self.items = items
+    def render(self,context):
+        out = []
+        empty_re = re.compile(r'^\s*$')
+        for item in self.items:
+            bit = item.render(context)
+            if not empty_re.search(bit):
+                out.append(bit)
+        return self.separator.render(context).join(out)
+
+@register.tag(name="joinitems")
+def joinitems(parser,token):
+    try:
+        tagname,junk,sep_token = token.split_contents()
+    except ValueError:
+        raise template.TemplateSyntaxError("joinitems tag requires 'using \"separator html\"' parameters")
+    if junk == 'using':
+        sep_node = ItemSeparatorNode(sep_token)
+    else:
+        raise template.TemplateSyntaxError("joinitems tag requires 'using \"separator html\"' parameters")
+    nodelist = []
+    while True:
+        nodelist.append(parser.parse(('separator','endjoinitems')))
+        next = parser.next_token()
+        if next.contents == 'endjoinitems':
+            break
+
+    return JoinItemListNode(separator=sep_node,items=nodelist)
+
+class BlockResourceNode(template.Node):
+    def __init__(self,nodelist):
+        self.items = nodelist 
+    def render(self,context):
+        out = '///' + settings.FORUM_SCRIPT_ALIAS
+        if self.items:
+            out += '/'     
+        for item in self.items:
+            bit = item.render(context)
+            out += bit
+        out = out.replace(' ','')
+        return os.path.normpath(out) + '?v=%d' % settings.RESOURCE_REVISION
+
+@register.tag(name='blockresource')
+def blockresource(parser,token):
+    try:
+        tagname = token.split_contents()
+    except ValueError:
+        raise template.TemplateSyntaxError("blockresource tag does not use arguments")
+    nodelist = []
+    while True:
+        nodelist.append(parser.parse(('endblockresource')))
+        next = parser.next_token()
+        if next.contents == 'endblockresource':
+            break
+    return BlockResourceNode(nodelist)
diff --git a/forum/templatetags/smart_if.py b/forum/templatetags/smart_if.py
new file mode 100644
index 00000000..a8fc1944
--- /dev/null
+++ b/forum/templatetags/smart_if.py
@@ -0,0 +1,401 @@
+"""
+A smarter {% if %} tag for django templates.
+
+While retaining current Django functionality, it also handles equality,
+greater than and less than operators. Some common case examples::
+
+    {% if articles|length >= 5 %}...{% endif %}
+    {% if "ifnotequal tag" != "beautiful" %}...{% endif %}
+"""
+import unittest
+from django import template
+
+
+register = template.Library()
+
+
+#==============================================================================
+# Calculation objects
+#==============================================================================
+
+class BaseCalc(object):
+    def __init__(self, var1, var2=None, negate=False):
+        self.var1 = var1
+        self.var2 = var2
+        self.negate = negate
+
+    def resolve(self, context):
+        try:
+            var1, var2 = self.resolve_vars(context)
+            outcome = self.calculate(var1, var2)
+        except:
+            outcome = False
+        if self.negate:
+            return not outcome
+        return outcome
+
+    def resolve_vars(self, context):
+        var2 = self.var2 and self.var2.resolve(context)
+        return self.var1.resolve(context), var2
+
+    def calculate(self, var1, var2):
+        raise NotImplementedError()
+
+
+class Or(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 or var2
+
+
+class And(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 and var2
+
+
+class Equals(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 == var2
+
+
+class Greater(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 > var2
+
+
+class GreaterOrEqual(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 >= var2
+
+
+class In(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 in var2
+
+
+#==============================================================================
+# Tests
+#==============================================================================
+
+class TestVar(object):
+    """
+    A basic self-resolvable object similar to a Django template variable. Used
+    to assist with tests.
+    """
+    def __init__(self, value):
+        self.value = value
+
+    def resolve(self, context):
+        return self.value
+
+
+class SmartIfTests(unittest.TestCase):
+    def setUp(self):
+        self.true = TestVar(True)
+        self.false = TestVar(False)
+        self.high = TestVar(9000)
+        self.low = TestVar(1)
+
+    def assertCalc(self, calc, context=None):
+        """
+        Test a calculation is True, also checking the inverse "negate" case.
+        """
+        context = context or {}
+        self.assert_(calc.resolve(context))
+        calc.negate = not calc.negate
+        self.assertFalse(calc.resolve(context))
+
+    def assertCalcFalse(self, calc, context=None):
+        """
+        Test a calculation is False, also checking the inverse "negate" case.
+        """
+        context = context or {}
+        self.assertFalse(calc.resolve(context))
+        calc.negate = not calc.negate
+        self.assert_(calc.resolve(context))
+
+    def test_or(self):
+        self.assertCalc(Or(self.true))
+        self.assertCalcFalse(Or(self.false))
+        self.assertCalc(Or(self.true, self.true))
+        self.assertCalc(Or(self.true, self.false))
+        self.assertCalc(Or(self.false, self.true))
+        self.assertCalcFalse(Or(self.false, self.false))
+
+    def test_and(self):
+        self.assertCalc(And(self.true, self.true))
+        self.assertCalcFalse(And(self.true, self.false))
+        self.assertCalcFalse(And(self.false, self.true))
+        self.assertCalcFalse(And(self.false, self.false))
+
+    def test_equals(self):
+        self.assertCalc(Equals(self.low, self.low))
+        self.assertCalcFalse(Equals(self.low, self.high))
+
+    def test_greater(self):
+        self.assertCalc(Greater(self.high, self.low))
+        self.assertCalcFalse(Greater(self.low, self.low))
+        self.assertCalcFalse(Greater(self.low, self.high))
+
+    def test_greater_or_equal(self):
+        self.assertCalc(GreaterOrEqual(self.high, self.low))
+        self.assertCalc(GreaterOrEqual(self.low, self.low))
+        self.assertCalcFalse(GreaterOrEqual(self.low, self.high))
+
+    def test_in(self):
+        list_ = TestVar([1,2,3])
+        invalid_list = TestVar(None)
+        self.assertCalc(In(self.low, list_))
+        self.assertCalcFalse(In(self.low, invalid_list))
+
+    def test_parse_bits(self):
+        var = IfParser([True]).parse()
+        self.assert_(var.resolve({}))
+        var = IfParser([False]).parse()
+        self.assertFalse(var.resolve({}))
+
+        var = IfParser([False, 'or', True]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([False, 'and', True]).parse()
+        self.assertFalse(var.resolve({}))
+
+        var = IfParser(['not', False, 'and', 'not', False]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser(['not', 'not', True]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([1, '=', 1]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([1, 'not', '=', 1]).parse()
+        self.assertFalse(var.resolve({}))
+
+        var = IfParser([1, 'not', 'not', '=', 1]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([1, '!=', 1]).parse()
+        self.assertFalse(var.resolve({}))
+
+        var = IfParser([3, '>', 2]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([1, '<', 2]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([2, 'not', 'in', [2, 3]]).parse()
+        self.assertFalse(var.resolve({}))
+
+        var = IfParser([1, 'or', 1, '=', 2]).parse()
+        self.assert_(var.resolve({}))
+
+    def test_boolean(self):
+        var = IfParser([True, 'and', True, 'and', True]).parse()
+        self.assert_(var.resolve({}))
+        var = IfParser([False, 'or', False, 'or', True]).parse()
+        self.assert_(var.resolve({}))
+        var = IfParser([True, 'and', False, 'or', True]).parse()
+        self.assert_(var.resolve({}))
+        var = IfParser([False, 'or', True, 'and', True]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([True, 'and', True, 'and', False]).parse()
+        self.assertFalse(var.resolve({}))
+        var = IfParser([False, 'or', False, 'or', False]).parse()
+        self.assertFalse(var.resolve({}))
+        var = IfParser([False, 'or', True, 'and', False]).parse()
+        self.assertFalse(var.resolve({}))
+        var = IfParser([False, 'and', True, 'or', False]).parse()
+        self.assertFalse(var.resolve({}))
+
+    def test_invalid(self):
+        self.assertRaises(ValueError, IfParser(['not']).parse)
+        self.assertRaises(ValueError, IfParser(['==']).parse)
+        self.assertRaises(ValueError, IfParser([1, 'in']).parse)
+        self.assertRaises(ValueError, IfParser([1, '>', 'in']).parse)
+        self.assertRaises(ValueError, IfParser([1, '==', 'not', 'not']).parse)
+        self.assertRaises(ValueError, IfParser([1, 2]).parse)
+
+
+OPERATORS = {
+    '=': (Equals, True),
+    '==': (Equals, True),
+    '!=': (Equals, False),
+    '>': (Greater, True),
+    '>=': (GreaterOrEqual, True),
+    '<=': (Greater, False),
+    '<': (GreaterOrEqual, False),
+    'or': (Or, True),
+    'and': (And, True),
+    'in': (In, True),
+}
+BOOL_OPERATORS = ('or', 'and')
+
+
+class IfParser(object):
+    error_class = ValueError
+
+    def __init__(self, tokens):
+        self.tokens = tokens
+
+    def _get_tokens(self):
+        return self._tokens
+
+    def _set_tokens(self, tokens):
+        self._tokens = tokens
+        self.len = len(tokens)
+        self.pos = 0
+
+    tokens = property(_get_tokens, _set_tokens)
+
+    def parse(self):
+        if self.at_end():
+            raise self.error_class('No variables provided.')
+        var1 = self.get_bool_var()
+        while not self.at_end():
+            op, negate = self.get_operator()
+            var2 = self.get_bool_var()
+            var1 = op(var1, var2, negate=negate)
+        return var1
+
+    def get_token(self, eof_message=None, lookahead=False):
+        negate = True
+        token = None
+        pos = self.pos
+        while token is None or token == 'not':
+            if pos >= self.len:
+                if eof_message is None:
+                    raise self.error_class()
+                raise self.error_class(eof_message)
+            token = self.tokens[pos]
+            negate = not negate
+            pos += 1
+        if not lookahead:
+            self.pos = pos
+        return token, negate
+
+    def at_end(self):
+        return self.pos >= self.len
+
+    def create_var(self, value):
+        return TestVar(value)
+
+    def get_bool_var(self):
+        """
+        Returns either a variable by itself or a non-boolean operation (such as
+        ``x == 0`` or ``x < 0``).
+
+        This is needed to keep correct precedence for boolean operations (i.e.
+        ``x or x == 0`` should be ``x or (x == 0)``, not ``(x or x) == 0``).
+        """
+        var = self.get_var()
+        if not self.at_end():
+            op_token = self.get_token(lookahead=True)[0]
+            if isinstance(op_token, basestring) and (op_token not in
+                                                     BOOL_OPERATORS):
+                op, negate = self.get_operator()
+                return op(var, self.get_var(), negate=negate)
+        return var
+
+    def get_var(self):
+        token, negate = self.get_token('Reached end of statement, still '
+                                       'expecting a variable.')
+        if isinstance(token, basestring) and token in OPERATORS:
+            raise self.error_class('Expected variable, got operator (%s).' %
+                                   token)
+        var = self.create_var(token)
+        if negate:
+            return Or(var, negate=True)
+        return var
+
+    def get_operator(self):
+        token, negate = self.get_token('Reached end of statement, still '
+                                       'expecting an operator.')
+        if not isinstance(token, basestring) or token not in OPERATORS:
+            raise self.error_class('%s is not a valid operator.' % token)
+        if self.at_end():
+            raise self.error_class('No variable provided after "%s".' % token)
+        op, true = OPERATORS[token]
+        if not true:
+            negate = not negate
+        return op, negate
+
+
+#==============================================================================
+# Actual templatetag code.
+#==============================================================================
+
+class TemplateIfParser(IfParser):
+    error_class = template.TemplateSyntaxError
+
+    def __init__(self, parser, *args, **kwargs):
+        self.template_parser = parser
+        return super(TemplateIfParser, self).__init__(*args, **kwargs)
+
+    def create_var(self, value):
+        return self.template_parser.compile_filter(value)
+
+
+class SmartIfNode(template.Node):
+    def __init__(self, var, nodelist_true, nodelist_false=None):
+        self.nodelist_true, self.nodelist_false = nodelist_true, nodelist_false
+        self.var = var
+
+    def render(self, context):
+        if self.var.resolve(context):
+            return self.nodelist_true.render(context)
+        if self.nodelist_false:
+            return self.nodelist_false.render(context)
+        return ''
+
+    def __repr__(self):
+        return "<Smart If node>"
+
+    def __iter__(self):
+        for node in self.nodelist_true:
+            yield node
+        if self.nodelist_false:
+            for node in self.nodelist_false:
+                yield node
+
+    def get_nodes_by_type(self, nodetype):
+        nodes = []
+        if isinstance(self, nodetype):
+            nodes.append(self)
+        nodes.extend(self.nodelist_true.get_nodes_by_type(nodetype))
+        if self.nodelist_false:
+            nodes.extend(self.nodelist_false.get_nodes_by_type(nodetype))
+        return nodes
+
+
+@register.tag('if')
+def smart_if(parser, token):
+    """
+    A smarter {% if %} tag for django templates.
+
+    While retaining current Django functionality, it also handles equality,
+    greater than and less than operators. Some common case examples::
+
+        {% if articles|length >= 5 %}...{% endif %}
+        {% if "ifnotequal tag" != "beautiful" %}...{% endif %}
+
+    Arguments and operators _must_ have a space between them, so
+    ``{% if 1>2 %}`` is not a valid smart if tag.
+
+    All supported operators are: ``or``, ``and``, ``in``, ``=`` (or ``==``),
+    ``!=``, ``>``, ``>=``, ``<`` and ``<=``.
+    """
+    bits = token.split_contents()[1:]
+    var = TemplateIfParser(parser, bits).parse()
+    nodelist_true = parser.parse(('else', 'endif'))
+    token = parser.next_token()
+    if token.contents == 'else':
+        nodelist_false = parser.parse(('endif',))
+        parser.delete_first_token()
+    else:
+        nodelist_false = None
+    return SmartIfNode(var, nodelist_true, nodelist_false)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/forum/urls.py b/forum/urls.py
new file mode 100644
index 00000000..a08fe716
--- /dev/null
+++ b/forum/urls.py
@@ -0,0 +1,72 @@
+import os.path
+from django.conf.urls.defaults import *
+from django.contrib import admin
+from forum import views as app
+from forum.feed import RssLastestQuestionsFeed
+from django.utils.translation import ugettext as _
+
+admin.autodiscover()
+feeds = {
+    'rss': RssLastestQuestionsFeed
+}
+
+APP_PATH = os.path.dirname(os.path.dirname(__file__))
+urlpatterns = patterns('',
+    url(r'^$', app.index, name='index'),
+    (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.ico'}),
+    (r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.gif'}),
+    (r'^content/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': os.path.join(APP_PATH, 'templates/content').replace('\\','/')}
+    ),
+    (r'^%s(?P<path>.*)$' % _('upfiles/'), 'django.views.static.serve',
+        {'document_root': os.path.join(APP_PATH, 'templates/upfiles').replace('\\','/')}
+    ),
+    (r'^%s/$' % _('signin/'), 'django_authopenid.views.signin'),
+    url(r'^%s$' % _('about/'), app.about, name='about'),
+    url(r'^%s$' % _('faq/'), app.faq, name='faq'),
+    url(r'^%s$' % _('privacy/'), app.privacy, name='privacy'),
+    url(r'^%s$' % _('logout/'), app.logout, name='logout'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('comments/')), app.answer_comments, name='answer_comments'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('edit/')), app.edit_answer, name='edit_answer'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('revisions/')), app.answer_revisions, name='answer_revisions'),
+    url(r'^%s$' % _('questions/'), app.questions, name='questions'),
+    url(r'^%s%s$' % (_('questions/'), _('ask/')), app.ask, name='ask'),
+    url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.unanswered, name='unanswered'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('edit/')), app.edit_question, name='edit_question'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('close/')), app.close, name='close'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('reopen/')), app.reopen, name='reopen'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('answer/')), app.answer, name='answer'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('vote/')), app.vote, name='vote'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('revisions/')), app.question_revisions, name='question_revisions'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('comments/')), app.question_comments, name='question_comments'),
+
+    url(r'^%s(?P<object_id>\d+)/%s(?P<comment_id>\d+)/%s$' % (_('questions/'), _('comments/'),_('delete/')), \
+                                                app.delete_comment, kwargs={'commented_object_type':'question'},\
+                                                name='delete_question_comment'),
+
+    url(r'^%s(?P<object_id>\d+)/%s(?P<comment_id>\d+)/%s$' % (_('answers/'), _('comments/'),_('delete/')), \
+                                                app.delete_comment, kwargs={'commented_object_type':'answer'}, \
+                                                name='delete_answer_comment'), \
+    #place general question item in the end of other operations
+    url(r'^%s(?P<id>\d+)//*' % _('question/'), app.question, name='question'),
+    url(r'^%s$' % _('tags/'), app.tags, name='tags'),
+    url(r'^%s(?P<tag>[^/]+)/$' % _('tags/'), app.tag),
+    url(r'^%s$' % _('users/'),app.users, name='users'),
+    url(r'^%s(?P<id>\d+)/$' % _('moderate-user/'), app.moderate_user, name='moderate_user'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('users/'), _('edit/')), app.edit_user, name='edit_user'),
+    url(r'^%s(?P<id>\d+)//*' % _('users/'), app.user, name='user'),
+    url(r'^%s$' % _('badges/'),app.badges, name='badges'),
+    url(r'^%s(?P<id>\d+)//*' % _('badges/'), app.badge, name='badge'),
+    url(r'^%s%s$' % (_('messages/'), _('markread/')),app.read_message, name='read_message'),
+    # (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')),
+    (r'^%s(.*)' % _('nimda/'), admin.site.root),
+    url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
+    (r'^%s$' % _('upload/'), app.upload),
+    url(r'^%s$' % _('books/'), app.books, name='books'),
+    url(r'^%s%s(?P<short_name>[^/]+)/$' % (_('books/'), _('ask/')), app.ask_book, name='ask_book'),
+    url(r'^%s(?P<short_name>[^/]+)/$' % _('books/'), app.book, name='book'),
+    url(r'^%s$' % _('search/'), app.search, name='search'),
+    url(r'^%s$' % _('feedback/'), app.feedback, name='feedback'),
+    (r'^%s' % _('account/'), include('django_authopenid.urls')),
+    (r'^i18n/', include('django.conf.urls.i18n')),
+)
diff --git a/forum/user.py b/forum/user.py
index 41811db9..40bf6a89 100644
--- a/forum/user.py
+++ b/forum/user.py
@@ -64,11 +64,11 @@ USER_TEMPLATE_VIEWS = (
         data_size = 50
     ),
     UserView(
-        id = 'preferences',
-        tab_title = _('preferences'),
-        tab_description = _('user preference settings'),
-        page_title = _('profile - user preferences'),
-        view_name = 'user_preferences',
-        template_file = 'user_preferences.html'
+        id = 'email_subscriptions',
+        tab_title = _('email subscriptions'),
+        tab_description = _('email subscription settings'),
+        page_title = _('profile - email subscriptions'),
+        view_name = 'user_email_subscriptions',
+        template_file = 'user_email_subscriptions.html'
     )
 )
diff --git a/forum/views.py b/forum/views.py
index d663a4cb..e4ccaa16 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -7,16 +7,18 @@ from django.conf import settings
 from django.core.files.storage import default_storage
 from django.shortcuts import render_to_response, get_object_or_404
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseRedirect, HttpResponse,Http404
+from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden, Http404
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
-from django.template import RequestContext
+from django.template import RequestContext, loader
 from django.utils.html import *
 from django.utils import simplejson
 from django.core import serializers
+from django.core.mail import mail_admins
 from django.db import transaction
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext as _
 from django.template.defaultfilters import slugify
+from django.core.exceptions import PermissionDenied
 
 from utils.html import sanitize_html
 from markdown2 import Markdown
@@ -28,6 +30,7 @@ from forum.auth import *
 from forum.const import *
 from forum.user import *
 from forum import auth
+from django_authopenid.util import get_next_url
 
 # used in index page
 INDEX_PAGE_SIZE = 20
@@ -63,24 +66,28 @@ def _get_tags_cache_json():
     tags = simplejson.dumps(tags_list)
     return tags
 
+def _get_and_remember_questions_sort_method(request, view_dic, default):
+    if default not in view_dic:
+        raise Exception('default value must be in view_dic')
+
+    q_sort_method = request.REQUEST.get('sort', None)
+    if q_sort_method == None:
+        q_sort_method = request.session.get('questions_sort_method', default)
+
+    if q_sort_method not in view_dic:
+        q_sort_method = default
+    request.session['questions_sort_method'] = q_sort_method
+    return q_sort_method, view_dic[q_sort_method]
+
 def index(request):
-    view_id = request.GET.get('sort', None)
     view_dic = {
              "latest":"-last_activity_at",
              "hottest":"-answer_count",
              "mostvoted":"-score",
-             "trans": "-last_activity_at"
              }
-    try:
-        orderby = view_dic[view_id]
-    except KeyError:
-        view_id = "latest"
-        orderby = "-last_activity_at"
-    # group questions by author_id of 28,29
-    if view_id == 'trans':
-        questions = Question.objects.get_translation_questions(orderby, INDEX_PAGE_SIZE)
-    else:
-        questions = Question.objects.get_questions_by_pagesize(orderby, INDEX_PAGE_SIZE)
+    view_id, orderby = _get_and_remember_questions_sort_method(request, view_dic, 'latest')
+
+    questions = Question.objects.get_questions_by_pagesize(orderby, INDEX_PAGE_SIZE)
     # RISK - inner join queries
     questions = questions.select_related()
     tags = Tag.objects.get_valid_tags(INDEX_TAGS_SIZE)
@@ -98,7 +105,34 @@ def about(request):
     return render_to_response('about.html', context_instance=RequestContext(request))
 
 def faq(request):
-    return render_to_response('faq.html', context_instance=RequestContext(request))
+    data = {
+        'gravatar_faq_url': reverse('faq') + '#gravatar',
+        'send_email_key_url': reverse('send_email_key'),
+        'ask_question_url': reverse('ask'),
+    }
+    return render_to_response('faq.html', data, context_instance=RequestContext(request))
+
+def feedback(request):
+    data = {}
+    form = None
+    if request.method == "POST":
+        form = FeedbackForm(request.POST)
+        if form.is_valid():
+            if not request.user.is_authenticated:
+                data['email'] = form.cleaned_data.get('email',None)
+            data['message'] = form.cleaned_data['message']
+            data['name'] = form.cleaned_data.get('name',None)
+            message = render_to_response('feedback_email.txt',data,context_instance=RequestContext(request))
+            mail_admins(_('Q&A forum feedback'), message)
+            msg = _('Thanks for the feedback!')
+            request.user.message_set.create(message=msg)
+            return HttpResponseRedirect(get_next_url(request))
+    else:
+        form = FeedbackForm(initial={'next':get_next_url(request)})
+
+    data['form'] = form
+    return render_to_response('feedback.html', data, context_instance=RequestContext(request))
+feedback.CANCEL_MESSAGE=_('We look forward to hearing your feedback! Please, give it next time :)')
 
 def privacy(request):
     return render_to_response('privacy.html', context_instance=RequestContext(request))
@@ -122,13 +156,8 @@ def questions(request, tagname=None, unanswered=False):
     except ValueError:
         page = 1
 
-    view_id = request.GET.get('sort', None)
     view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
-    try:
-        orderby = view_dic[view_id]
-    except KeyError:
-        view_id = "latest"
-        orderby = "-added_at"
+    view_id, orderby = _get_and_remember_questions_sort_method(request,view_dic,'latest')
 
     # check if request is from tagged questions
     if tagname is not None:
@@ -208,16 +237,12 @@ def create_new_answer( question=None, author=None,\
 
     #set notification/delete
     if email_notify:
-        try:
-            EmailFeed.objects.get(feed_id = question.id, subscriber_id = author.id, feed_content_type=question_type)
-        except EmailFeed.DoesNotExist:
-            feed = EmailFeed(content = question, subscriber = author)
-            feed.save()
+        if author not in question.followed_by.all():
+            question.followed_by.add(author)
     else:
         #not sure if this is necessary. ajax should take care of this...
         try:
-            feed = Email.objects.get(feed_id = question.id, subscriber_id = author.id, feed_content_type=question_type)
-            feed.delete()
+            question.followed_by.remove(author)
         except:
             pass
 
@@ -267,7 +292,7 @@ def ask(request):
         if form.is_valid():
 
             added_at = datetime.datetime.now()
-            title = strip_tags(form.cleaned_data['title'])
+            title = strip_tags(form.cleaned_data['title'].strip())
             wiki = form.cleaned_data['wiki']
             tagnames = form.cleaned_data['tags'].strip()
             text = form.cleaned_data['text']
@@ -302,7 +327,7 @@ def ask(request):
 					ip_addr = request.META['REMOTE_ADDR'],
                 )
                 question.save()
-                return HttpResponseRedirect('/%s%s%s' % ( _('account/'),_('signin/'),_('newquestion/')))
+                return HttpResponseRedirect(reverse('user_signin_new_question'))
     else:
         form = AskForm()
 
@@ -310,6 +335,7 @@ def ask(request):
     return render_to_response('ask.html', {
         'form' : form,
         'tags' : tags,
+        'email_validation_faq_url':reverse('faq') + '#validate',
         }, context_instance=RequestContext(request))
 
 def question(request, id):
@@ -317,13 +343,26 @@ def question(request, id):
         page = int(request.GET.get('page', '1'))
     except ValueError:
         page = 1
-    view_id = request.GET.get('sort', 'votes')
+
+    view_id = request.GET.get('sort', None)
     view_dic = {"latest":"-added_at", "oldest":"added_at", "votes":"-score" }
     try:
         orderby = view_dic[view_id]
     except KeyError:
-        view_id = "votes"
-        orderby = "-score"
+        qsm = request.session.get('questions_sort_method',None)
+        if qsm in ('mostvoted','latest'):
+            logging.debug('loaded from session ' + qsm)
+            if qsm == 'mostvoted':
+                view_id = 'votes'
+                orderby = '-score'
+            else:
+                view_id = 'latest'
+                orderby = '-added_at'
+        else:
+            view_id = "votes"
+            orderby = "-score"
+
+    logging.debug('view_id=' + str(view_id))
 
     question = get_object_or_404(Question, id=id)
     if question.deleted and not can_view_deleted_post(request.user, question):
@@ -349,7 +388,6 @@ def question(request, id):
                 vote_value = 1
             user_answer_votes[answer.id] = vote_value
 
-
     if answers is not None:
         answers = answers.order_by("-accepted", orderby)
 
@@ -363,8 +401,38 @@ def question(request, id):
 
     objects_list = Paginator(filtered_answers, ANSWERS_PAGE_SIZE)
     page_objects = objects_list.page(page)
-    # update view count
-    Question.objects.update_view_count(question)
+
+    #todo: merge view counts per user and per session
+    #1) view count per session
+    update_view_count = False
+    if 'question_view_times' not in request.session:
+        request.session['question_view_times'] = {}
+
+    last_seen = request.session['question_view_times'].get(question.id,None)
+    updated_when, updated_who = question.get_last_update_info()
+
+    if updated_who != request.user:
+        if last_seen:
+            if last_seen < updated_when:
+                update_view_count = True 
+        else:
+            update_view_count = True
+
+    request.session['question_view_times'][question.id] = datetime.datetime.now()
+
+    if update_view_count:
+        question.view_count += 1
+        question.save()
+
+    #2) question view count per user
+    if request.user.is_authenticated():
+        try:
+            question_view = QuestionView.objects.get(who=request.user, question=question)
+        except QuestionView.DoesNotExist:
+            question_view = QuestionView(who=request.user, question=question)
+        question_view.when = datetime.datetime.now()
+        question_view.save()
+
     return render_to_response('question.html', {
         "question" : question,
         "question_vote" : question_vote,
@@ -623,6 +691,7 @@ QUESTION_REVISION_TEMPLATE = ('<h1>%(title)s</h1>\n'
 def question_revisions(request, id):
     post = get_object_or_404(Question, id=id)
     revisions = list(post.revisions.all())
+    revisions.reverse()
     for i, revision in enumerate(revisions):
         revision.html = QUESTION_REVISION_TEMPLATE % {
             'title': revision.title,
@@ -631,16 +700,15 @@ def question_revisions(request, id):
                               for tag in revision.tagnames.split(' ')]),
         }
         if i > 0:
-            revisions[i - 1].diff = htmldiff(revision.html,
-                                             revisions[i - 1].html)
+            revisions[i].diff = htmldiff(revisions[i-1].html, revision.html)
         else:
-            revisions[i - 1].diff = QUESTION_REVISION_TEMPLATE % {
+            revisions[i].diff = QUESTION_REVISION_TEMPLATE % {
                 'title': revisions[0].title,
                 'html': sanitize_html(markdowner.convert(revisions[0].text)),
                 'tags': ' '.join(['<a class="post-tag">%s</a>' % tag
                                   for tag in revisions[0].tagnames.split(' ')]),
             }
-            revisions[i - 1].summary = None
+            revisions[i].summary = _('initial version') 
     return render_to_response('revisions_question.html', {
         'post': post,
         'revisions': revisions,
@@ -650,16 +718,16 @@ ANSWER_REVISION_TEMPLATE = ('<div class="text">%(html)s</div>')
 def answer_revisions(request, id):
     post = get_object_or_404(Answer, id=id)
     revisions = list(post.revisions.all())
+    revisions.reverse()
     for i, revision in enumerate(revisions):
         revision.html = ANSWER_REVISION_TEMPLATE % {
             'html': sanitize_html(markdowner.convert(revision.text))
         }
         if i > 0:
-            revisions[i - 1].diff = htmldiff(revision.html,
-                                             revisions[i - 1].html)
+            revisions[i].diff = htmldiff(revisions[i-1].html, revision.html)
         else:
-            revisions[i - 1].diff = revisions[i-1].text
-            revisions[i - 1].summary = None
+            revisions[i].diff = revisions[i].text
+            revisions[i].summary = _('initial version')
     return render_to_response('revisions_answer.html', {
         'post': post,
         'revisions': revisions,
@@ -696,8 +764,7 @@ def answer(request, id):
                     ip_addr = request.META['REMOTE_ADDR'],
                     )
                 anon.save()
-                return HttpResponseRedirect('/%s%s%s' % ( _('account/'),
-                    _('signin/'),_('newquestion/')))
+                return HttpResponseRedirect(reverse('user_signin_new_answer'))
 
     return HttpResponseRedirect(question.get_absolute_url())
 
@@ -712,7 +779,7 @@ def tags(request):
 
     if request.method == "GET":
         stag = request.GET.get("q", "").strip()
-        if stag is not None:
+        if stag != '':
             objects_list = Paginator(Tag.objects.filter(deleted=False).exclude(used_count=0).extra(where=['name like %s'], params=['%' + stag + '%']), DEFAULT_PAGE_SIZE)
         else:
             if sortby == "name":
@@ -738,7 +805,7 @@ def tags(request):
             'has_next': tags.has_next(),
             'previous': tags.previous_page_number(),
             'next': tags.next_page_number(),
-            'base_url' : '/%s?sort=%s&' % (_('tags/'), sortby)
+            'base_url' : reverse('tags') + '?sort=%s&' % sortby
         }
 
         }, context_instance=RequestContext(request))
@@ -930,7 +997,8 @@ def vote(request, id):
 
                 if not can_delete_post(request.user, post):
                     response_data['allowed'] = -2
-                elif post.deleted:
+                elif post.deleted == True:
+                    logging.debug('debug restoring post in view')
                     onDeleteCanceled(post, request.user)
                     response_data['status'] = 1
                 else:
@@ -939,13 +1007,19 @@ def vote(request, id):
             elif vote_type == '11':#subscribe q updates
                 user = request.user
                 if user.is_authenticated():
-                    try:
-                        EmailFeed.objects.get(feed_id=question.id,subscriber_id=user.id,feed_content_type=question_type)
-                    except EmailFeed.DoesNotExist:
-                        feed = EmailFeed(subscriber=user,content=question)
-                        feed.save()
+                    if user not in question.followed_by.all():
+                        question.followed_by.add(user)
                         if settings.EMAIL_VALIDATION == 'on' and user.email_isvalid == False:
-                            response_data['message'] = _('subscription saved, %(email)s needs validation') % {'email':user.email}
+                            response_data['message'] = \
+                                    _('subscription saved, %(email)s needs validation, see %(details_url)s') \
+                                    % {'email':user.email,'details_url':reverse('faq') + '#validate'}
+                    feed_setting = EmailFeedSetting.objects.get(subscriber=user,feed_type='q_sel')
+                    if feed_setting.frequency == 'n':
+                        feed_setting.frequency = 'd'
+                        feed_setting.save()
+                        if 'message' in response_data:
+                            response_data['message'] += '<br/>'
+                        response_data['message'] = _('email update frequency has been set to daily')
                     #response_data['status'] = 1
                     #responst_data['allowed'] = 1
                 else:
@@ -955,12 +1029,8 @@ def vote(request, id):
             elif vote_type == '12':#unsubscribe q updates
                 user = request.user
                 if user.is_authenticated():
-                    try:
-                        feed = EmailFeed.objects.get(feed_id=question.id,subscriber_id=user.id)
-                        feed.delete()
-                    except EmailFeed.DoesNotExist:
-                        pass
-                    
+                    if user in question.followed_by.all():
+                        question.followed_by.remove(user)
         else:
             response_data['success'] = 0
             response_data['message'] = u'Request mode is not supported. Please try again.'
@@ -991,11 +1061,11 @@ def users(request):
         # default
         else:
             objects_list = Paginator(User.objects.all().order_by('-reputation'), USERS_PAGE_SIZE)
-        base_url = '/%s?sort=%s&' % (_('users/'), sortby)
+        base_url = reverse('users') + '?sort=%s&' % sortby
     else:
         sortby = "reputation"
         objects_list = Paginator(User.objects.extra(where=['username like %s'], params=['%' + suser + '%']).order_by('-reputation'), USERS_PAGE_SIZE)
-        base_url = '/%s?name=%s&sort=%s&' % (_('users/'), suser, sortby)
+        base_url = reverse('users') + '?name=%s&sort=%s&' % (suser, sortby)
 
     try:
         users = objects_list.page(page)
@@ -1027,6 +1097,26 @@ def user(request, id):
     func = getattr(views, user_view.view_name)
     return func(request, id, user_view)
 
+@login_required
+def moderate_user(request, id):
+    """ajax handler of user moderation
+    """
+    if not auth.can_moderate_users(request.user) or request.method != 'POST':
+        raise Http404
+    if not request.is_ajax():
+        return HttpResponseForbidden(mimetype="application/json")
+
+    user = get_object_or_404(User, id=id)
+    form = ModerateUserForm(request.POST, instance=user)
+
+    if form.is_valid():
+        form.save()
+        logging.debug('data saved')
+        response = HttpResponse(simplejson.dumps(''), mimetype="application/json")
+    else:
+        response = HttpResponseForbidden(mimetype="application/json")
+    return response
+
 @login_required
 def edit_user(request, id):
     user = get_object_or_404(User, id=id)
@@ -1058,6 +1148,7 @@ def edit_user(request, id):
         form = EditUserForm(user)
     return render_to_response('user_edit.html', {
         'form' : form,
+        'gravatar_faq_url' : reverse('faq') + '#gravatar',
     }, context_instance=RequestContext(request))
 
 def user_stats(request, user_id, user_view):
@@ -1111,7 +1202,7 @@ def user_stats(request, user_id, user_view):
             'comment_count' : 'answer.comment_count'
             },
         tables=['question', 'answer'],
-        where=['answer.deleted=0 AND answer.author_id=%s AND answer.question_id=question.id'],
+        where=['answer.deleted=0 AND question.deleted=0 AND answer.author_id=%s AND answer.question_id=question.id'],
         params=[user_id],
         order_by=['-vote_count', '-answer_id'],
         select_params=[user_id]
@@ -1152,7 +1243,13 @@ def user_stats(request, user_id, user_view):
         from django.db.models import Count
         awards = awards.annotate(count = Count('badge__id'))
 
+    if auth.can_moderate_users(request.user):
+        moderate_user_form = ModerateUserForm(instance=user)
+    else:
+        moderate_user_form = None
+
     return render_to_response(user_view.template_file,{
+        'moderate_user_form': moderate_user_form,
         "tab_name" : user_view.id,
         "tab_description" : user_view.tab_description,
         "page_title" : user_view.page_title,
@@ -1184,10 +1281,9 @@ def user_recent(request, user_id, user_view):
             self.title = title
             self.summary = summary
             slug_title = slugify(title)
+            self.title_link = reverse('question', kwargs={'id':question_id}) + u'%s' % slug_title
             if int(answer_id) > 0:
-                self.title_link = u'/%s%s/%s#%s' %(_('questions/'),question_id, slug_title, answer_id)
-            else:
-                self.title_link = u'/%s%s/%s' %(_('questions/'),question_id, slug_title)
+                self.title_link += '#%s' % answer_id
 
     class AwardEvent:
         def __init__(self, time, type, id):
@@ -1207,7 +1303,7 @@ def user_recent(request, user_id, user_view):
             },
         tables=['activity', 'question'],
         where=['activity.content_type_id = %s AND activity.object_id = ' +
-            'question.id AND activity.user_id = %s AND activity.activity_type = %s'],
+            'question.id AND question.deleted=0 AND activity.user_id = %s AND activity.activity_type = %s'],
         params=[question_type_id, user_id, TYPE_ACTIVITY_ASK_QUESTION],
         order_by=['-activity.active_at']
     ).values(
@@ -1232,7 +1328,8 @@ def user_recent(request, user_id, user_view):
             },
         tables=['activity', 'answer', 'question'],
         where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' + 
-            'answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
+            'answer.question_id=question.id AND answer.deleted=0 AND activity.user_id=%s AND '+ 
+            'activity.activity_type=%s AND question.deleted=0'],
         params=[answer_type_id, user_id, TYPE_ACTIVITY_ANSWER],
         order_by=['-activity.active_at']
     ).values(
@@ -1259,7 +1356,8 @@ def user_recent(request, user_id, user_view):
 
         where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
             'activity.user_id = comment.user_id AND comment.object_id=question.id AND '+
-            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
+            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s AND ' +
+            'question.deleted=0'],
         params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],
         order_by=['-comment.added_at']
     ).values(
@@ -1288,7 +1386,8 @@ def user_recent(request, user_id, user_view):
         where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
             'activity.user_id = comment.user_id AND comment.object_id=answer.id AND '+
             'comment.content_type_id=%s AND question.id = answer.question_id AND '+
-            'activity.user_id = %s AND activity.activity_type=%s'],
+            'activity.user_id = %s AND activity.activity_type=%s AND '+
+            'answer.deleted=0 AND question.deleted=0'],
         params=[comment_type_id, answer_type_id, user_id, TYPE_ACTIVITY_COMMENT_ANSWER],
         order_by=['-comment.added_at']
     ).values(
@@ -1313,8 +1412,9 @@ def user_recent(request, user_id, user_view):
             'activity_type' : 'activity.activity_type',
             'summary' : 'question_revision.summary'
             },
-        tables=['activity', 'question_revision'],
+        tables=['activity', 'question_revision', 'question'],
         where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND '+
+            'question_revision.id=question.id AND question.deleted=0 AND '+
             'activity.user_id = question_revision.author_id AND activity.user_id = %s AND '+
             'activity.activity_type=%s'],
         params=[question_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_QUESTION],
@@ -1347,6 +1447,7 @@ def user_recent(request, user_id, user_view):
         where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND '+
             'activity.user_id = answer_revision.author_id AND activity.user_id = %s AND '+
             'answer_revision.answer_id=answer.id AND answer.question_id = question.id AND '+
+            'question.deleted=0 AND answer.deleted=0 AND '+
             'activity.activity_type=%s'],
         params=[answer_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_ANSWER],
         order_by=['-activity.active_at']
@@ -1375,6 +1476,7 @@ def user_recent(request, user_id, user_view):
         tables=['activity', 'answer', 'question'],
         where=['activity.content_type_id = %s AND activity.object_id = answer.id AND '+
             'activity.user_id = question.author_id AND activity.user_id = %s AND '+
+            'answer.deleted=0 AND question.deleted=0 AND '+
             'answer.question_id=question.id AND activity.activity_type=%s'],
         params=[answer_type_id, user_id, TYPE_ACTIVITY_MARK_ANSWER],
         order_by=['-activity.active_at']
@@ -1427,9 +1529,9 @@ def user_responses(request, user_id, user_view):
         def __init__(self, type, title, question_id, answer_id, time, username, user_id, content):
             self.type = type
             self.title = title
-            self.titlelink = u'/%s%s/%s#%s' % (_('questions/'), question_id, title, answer_id)
+            self.titlelink = reverse('questions') + u'%s/%s#%s' % (question_id, title, answer_id)
             self.time = time
-            self.userlink = u'/%s%s/%s/' % (_('users/'), user_id, username)
+            self.userlink = reverse('users') + u'%s/%s/' % (user_id, username)
             self.username = username
             self.content = u'%s ...' % strip_tags(content)[:300]
 
@@ -1715,86 +1817,110 @@ def user_favorites(request, user_id, user_view):
     }, context_instance=RequestContext(request))
 
 
-def user_preferences(request, user_id, user_view):
+def user_email_subscriptions(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
+    if request.method == 'POST':
+        form = EditUserEmailFeedsForm(request.POST)
+        if form.is_valid():
+            if 'save' in request.POST:
+                saved = form.save(user)
+                if saved:
+                    action_status = _('changes saved')
+            elif 'stop_email' in request.POST:
+                saved = form.reset().save(user)
+                initial_values = EditUserEmailFeedsForm.NO_EMAIL_INITIAL
+                form = EditUserEmailFeedsForm(initial=initial_values)
+                if saved:
+                    action_status = _('email updates canceled')
+            if not saved:
+                action_status = None
+    else:
+        form = EditUserEmailFeedsForm()
+        form.set_initial_values(user)
+        action_status = None
     return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
+        'tab_name':user_view.id,
+        'tab_description':user_view.tab_description,
+        'page_title':user_view.page_title,
+        'view_user':user,
+        'email_feeds_form':form,
+        'action_status':action_status,
     }, context_instance=RequestContext(request))
 
 def question_comments(request, id):
     question = get_object_or_404(Question, id=id)
     user = request.user
-    return __comments(request, question, 'question', user)
+    return __comments(request, question, 'question')
 
 def answer_comments(request, id):
     answer = get_object_or_404(Answer, id=id)
     user = request.user
-    return __comments(request, answer, 'answer', user)
+    return __comments(request, answer, 'answer')
 
-def __comments(request, obj, type, user):
+def __comments(request, obj, type):
     # only support get comments by ajax now
+    user = request.user
     if request.is_ajax():
         if request.method == "GET":
-            return __generate_comments_json(obj, type, user)
+            response = __generate_comments_json(obj, type, user)
         elif request.method == "POST":
-            comment_data = request.POST.get('comment')
-            comment = Comment(content_object=obj, comment=comment_data, user=request.user)
-            comment.save()
-            obj.comment_count = obj.comment_count + 1
-            obj.save()
-            return __generate_comments_json(obj, type, user)
+            if auth.can_add_comments(user,obj):
+                comment_data = request.POST.get('comment')
+                comment = Comment(content_object=obj, comment=comment_data, user=request.user)
+                comment.save()
+                obj.comment_count = obj.comment_count + 1
+                obj.save()
+                response = __generate_comments_json(obj, type, user)
+            else:
+                response = HttpResponseForbidden(mimetype="application/json")
+        return response
 
 def __generate_comments_json(obj, type, user):
-    comments = obj.comments.all().order_by('-id')
+    comments = obj.comments.all().order_by('id')
     # {"Id":6,"PostId":38589,"CreationDate":"an hour ago","Text":"hello there!","UserDisplayName":"Jarrod Dixon","UserUrl":"/users/3/jarrod-dixon","DeleteUrl":null}
     json_comments = []
+    from forum.templatetags.extra_tags import diff_date
     for comment in comments:
         comment_user = comment.user
         delete_url = ""
         if user != None and auth.can_delete_comment(user, comment):
             #/posts/392845/comments/219852/delete
-            delete_url = "/" + type + "s/%s/comments/%s/delete/" % (obj.id, comment.id)
+            #todo translate this url
+            delete_url = reverse(index) + type + "s/%s/comments/%s/delete/" % (obj.id, comment.id)
         json_comments.append({"id" : comment.id,
             "object_id" : obj.id,
-            "add_date" : comment.added_at.strftime('%Y-%m-%d'),
+            "comment_age" : diff_date(comment.added_at),
             "text" : comment.comment,
             "user_display_name" : comment_user.username,
-            "user_url" : "/%s%s/%s" % (_('users/'), comment_user.id, comment_user.username),
+            "user_url" : comment_user.get_profile_url(),
             "delete_url" : delete_url
         })
 
     data = simplejson.dumps(json_comments)
     return HttpResponse(data, mimetype="application/json")
 
-def delete_question_comment(request, question_id, comment_id):
-    if request.is_ajax():
-        question = get_object_or_404(Question, id=question_id)
-        comment = get_object_or_404(Comment, id=comment_id)
-
-        question.comments.remove(comment)
-        question.comment_count = question.comment_count - 1
-        question.save()
-        user = request.user
-        return __generate_comments_json(question, 'question', user)
+def delete_comment(request, object_id='', comment_id='', commented_object_type=None):
+    response = None
+    commented_object = None
+    if commented_object_type == 'question':
+        commented_object = Question
+    elif commented_object_type == 'answer':
+        commented_object = Answer
 
-def delete_answer_comment(request, answer_id, comment_id):
     if request.is_ajax():
-        answer = get_object_or_404(Answer, id=answer_id)
         comment = get_object_or_404(Comment, id=comment_id)
-
-        answer.comments.remove(comment)
-        answer.comment_count = answer.comment_count - 1
-        answer.save()
-        user = request.user
-        return __generate_comments_json(answer, 'answer', user)
+        if auth.can_delete_comment(request.user, comment):
+            obj = get_object_or_404(commented_object, id=object_id)
+            obj.comments.remove(comment)
+            obj.comment_count = obj.comment_count - 1
+            obj.save()
+            user = request.user
+            return __generate_comments_json(obj, commented_object_type, user)
+    raise PermissionDenied()
 
 def logout(request):
-    url = request.GET.get('next')
     return render_to_response('logout.html', {
-        'next' : url,
+        'next' : get_next_url(request),
     }, context_instance=RequestContext(request))
 
 def badges(request):
@@ -1807,6 +1933,7 @@ def badges(request):
     return render_to_response('badges.html', {
         'badges' : badges,
         'mybadges' : my_badges,
+        'feedback_faq_url' : reverse('feedback'),
     }, context_instance=RequestContext(request))
 
 def badge(request, id):
@@ -1882,7 +2009,7 @@ def upload(request):
     return HttpResponse(result, mimetype="application/xml")
 
 def books(request):
-    return HttpResponseRedirect("/books/mysql-zhaoyang")
+    return HttpResponseRedirect(reverse('books') + '/mysql-zhaoyang')
     
 def book(request, short_name, unanswered=False):
     """
@@ -2007,6 +2134,7 @@ def ask_book(request, short_name):
     return render_to_response('ask.html', {
         'form' : form,
         'tags' : tags,
+        'email_validation_faq_url': reverse('faq') + '#validate',
         }, context_instance=RequestContext(request))
 
 def search(request):
@@ -2022,11 +2150,11 @@ def search(request):
         except ValueError:
             page = 1
         if keywords is None:
-            return HttpResponseRedirect('/')
+            return HttpResponseRedirect(reverse(index))
         if search_type == 'tag':
-            return HttpResponseRedirect('/%s?q=%s&page=%s' % (_('tags/'), keywords.strip(), page))
+            return HttpResponseRedirect(reverse('tags') + '?q=%s&page=%s' % (keywords.strip(), page))
         elif search_type == "user":
-            return HttpResponseRedirect('/%s?q=%s&page=%s' % (_('users/'), keywords.strip(), page))
+            return HttpResponseRedirect(reverse('users') + '?q=%s&page=%s' % (keywords.strip(), page))
         elif search_type == "question":
             
             template_file = "questions.html"
diff --git a/junk.py b/junk.py
new file mode 100644
index 00000000..c6c03d27
--- /dev/null
+++ b/junk.py
@@ -0,0 +1,3 @@
+import os
+
+print os.path.normpath('/haha//haha')
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index cd8de560..502c1075 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index b5e5c549..18eb61b1 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 00:41+0000\n"
+"POT-Creation-Date: 2009-11-10 19:00-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,339 +16,315 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699
-msgid "account/"
-msgstr ""
-
-#: settings.py:12 urls.py:26 django_authopenid/urls.py:9
-#: django_authopenid/urls.py:10 django_authopenid/urls.py:11
-#: django_authopenid/urls.py:13 forum/views.py:305 forum/views.py:700
-#: templates/authopenid/confirm_email.txt:10
-msgid "signin/"
-msgstr ""
-
-#: urls.py:22
-msgid "upfiles/"
-msgstr ""
-
-#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26
-#: django_authopenid/urls.py:27
-msgid "email/"
-msgstr ""
-
-#: urls.py:27
-msgid "change/"
-msgstr ""
-
-#: urls.py:28
-msgid "sendkey/"
-msgstr ""
-
-#: urls.py:29
-msgid "verify/"
-msgstr ""
-
-#: urls.py:30
-msgid "about/"
-msgstr ""
-
-#: urls.py:31
-msgid "faq/"
-msgstr ""
+#: django_authopenid/forms.py:70
+msgid "choose a username"
+msgstr "Choose screen name"
 
-#: urls.py:32
-msgid "privacy/"
+#: django_authopenid/forms.py:76
+msgid "user name is required"
 msgstr ""
 
-#: urls.py:33
-msgid "logout/"
+#: django_authopenid/forms.py:77
+msgid "sorry, this name is taken, please choose another"
 msgstr ""
 
-#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
-msgid "answers/"
+#: django_authopenid/forms.py:78
+msgid "sorry, this name is not allowed, please choose another"
 msgstr ""
 
-#: urls.py:34 urls.py:46
-msgid "comments/"
+#: django_authopenid/forms.py:79
+msgid "sorry, there is no user with this name"
 msgstr ""
 
-#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
-msgid "edit/"
+#: django_authopenid/forms.py:80
+msgid "sorry, we have a serious error - user name is taken by several users"
 msgstr ""
 
-#: urls.py:36 urls.py:45
-msgid "revisions/"
+#: django_authopenid/forms.py:81
+msgid "user name can only consist of letters, empty space and underscore"
 msgstr ""
 
-#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
-#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
-#: forum/models.py:306 forum/views.py:1188 forum/views.py:1190
-#: forum/views.py:1430
-msgid "questions/"
-msgstr ""
+#: django_authopenid/forms.py:116
+msgid "your email address"
+msgstr "Your email <i>(never shared)</i>"
 
-#: urls.py:38 urls.py:64
-msgid "ask/"
+#: django_authopenid/forms.py:117
+msgid "email address is required"
 msgstr ""
 
-#: urls.py:39
-msgid "unanswered/"
+#: django_authopenid/forms.py:118
+msgid "please enter a valid email address"
 msgstr ""
 
-#: urls.py:41
-msgid "close/"
+#: django_authopenid/forms.py:119
+msgid "this email is already used by someone else, please choose another"
 msgstr ""
 
-#: urls.py:42
-msgid "reopen/"
+#: django_authopenid/forms.py:163 django_authopenid/views.py:117
+msgid "i-names are not supported"
 msgstr ""
 
-#: urls.py:43
-msgid "answer/"
+#: django_authopenid/forms.py:239
+msgid "Please enter valid username and password (both are case-sensitive)."
 msgstr ""
 
-#: urls.py:44
-msgid "vote/"
+#: django_authopenid/forms.py:242 django_authopenid/forms.py:292
+msgid "This account is inactive."
 msgstr ""
 
-#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
-msgid "delete/"
+#: django_authopenid/forms.py:244
+msgid "Login failed."
 msgstr ""
 
-#: urls.py:50
-msgid "question/"
+#: django_authopenid/forms.py:246
+msgid "Please enter username and password"
 msgstr ""
 
-#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2027
-msgid "tags/"
+#: django_authopenid/forms.py:248
+msgid "Please enter your password"
 msgstr ""
 
-#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998
-#: forum/views.py:1432 forum/views.py:1765 forum/views.py:2029
-msgid "users/"
+#: django_authopenid/forms.py:250
+msgid "Please enter user name"
 msgstr ""
 
-#: urls.py:56 urls.py:57
-msgid "badges/"
+#: django_authopenid/forms.py:288
+msgid ""
+"Please enter a valid                     username and password. Note that "
+"both fields are                     case-sensitive."
 msgstr ""
 
-#: urls.py:58
-msgid "messages/"
-msgstr ""
+#: django_authopenid/forms.py:310
+msgid "choose password"
+msgstr "Password"
 
-#: urls.py:58
-msgid "markread/"
+#: django_authopenid/forms.py:311
+msgid "password is required"
 msgstr ""
 
-#: urls.py:60
-msgid "nimda/"
-msgstr ""
+#: django_authopenid/forms.py:314
+msgid "retype password"
+msgstr "Password <i>(please retype)</i>"
 
-#: urls.py:62
-msgid "upload/"
+#: django_authopenid/forms.py:315
+msgid "please, retype your password"
 msgstr ""
 
-#: urls.py:63 urls.py:64 urls.py:65
-msgid "books/"
+#: django_authopenid/forms.py:316
+msgid "sorry, entered passwords did not match, please try again"
 msgstr ""
 
-#: urls.py:66
-msgid "search/"
+#: django_authopenid/forms.py:341
+msgid "Current password"
 msgstr ""
 
-#: django_authopenid/forms.py:67 django_authopenid/views.py:102
-msgid "i-names are not supported"
+#: django_authopenid/forms.py:343
+msgid "New password"
 msgstr ""
 
-#: django_authopenid/forms.py:102
-msgid ""
-"Usernames can only contain                     letters, numbers and "
-"underscores"
+#: django_authopenid/forms.py:345
+msgid "Retype new password"
 msgstr ""
 
-#: django_authopenid/forms.py:109
+#: django_authopenid/forms.py:356
 msgid ""
-"This username does not exist                     in our database. Please "
-"choose another."
+"Old password is incorrect.                     Please enter the correct "
+"password."
 msgstr ""
 
-#: django_authopenid/forms.py:126 django_authopenid/forms.py:233
-msgid ""
-"Please enter a valid                     username and password. Note that "
-"both fields are                     case-sensitive."
+#: django_authopenid/forms.py:368
+msgid "new passwords do not match"
 msgstr ""
 
-#: django_authopenid/forms.py:130 django_authopenid/forms.py:237
-msgid "This account is inactive."
+#: django_authopenid/forms.py:432
+msgid "Your user name (<i>required</i>)"
 msgstr ""
 
-#: django_authopenid/forms.py:158 django_authopenid/forms.py:210
-msgid "invalid user name"
-msgstr "User names can contain letters, underscore and empty space."
-
-#: django_authopenid/forms.py:160
-msgid "sorry, this name can not be used, please try another"
-msgstr ""
+#: django_authopenid/forms.py:447
+msgid "Incorrect username."
+msgstr "sorry, there is no such user name"
 
-#: django_authopenid/forms.py:162
-msgid "username too short"
+#: django_authopenid/urls.py:9 django_authopenid/urls.py:10
+#: django_authopenid/urls.py:11 django_authopenid/urls.py:13 forum/urls.py:24
+msgid "signin/"
 msgstr ""
 
-#: django_authopenid/forms.py:170 django_authopenid/forms.py:171
-msgid "this name is already in use - please try anoter"
+#: django_authopenid/urls.py:10
+msgid "newquestion/"
 msgstr ""
 
-#: django_authopenid/forms.py:185
-msgid ""
-"This email is already                         registered in our database. "
-"Please choose another."
+#: django_authopenid/urls.py:11
+msgid "newanswer/"
 msgstr ""
 
-#: django_authopenid/forms.py:216
-msgid ""
-"This username don't exist.                         Please choose another."
+#: django_authopenid/urls.py:12
+msgid "signout/"
 msgstr ""
 
-#: django_authopenid/forms.py:255
-msgid "choose a username"
+#: django_authopenid/urls.py:13
+msgid "complete/"
 msgstr ""
 
-#: django_authopenid/forms.py:257 templates/authopenid/signup.html:38
-msgid "your email address"
-msgstr ""
+#: django_authopenid/urls.py:15
+msgid "external-login/"
+msgstr "using-nmr-wiki-login-and-password/"
 
-#: django_authopenid/forms.py:259 templates/authopenid/signup.html:39
-msgid "choose password"
+#: django_authopenid/urls.py:16
+msgid "register/"
 msgstr ""
 
-#: django_authopenid/forms.py:261 templates/authopenid/signup.html:40
-msgid "retype password"
+#: django_authopenid/urls.py:17
+msgid "signup/"
 msgstr ""
 
-#: django_authopenid/forms.py:335
-msgid ""
-"Old password is incorrect.                     Please enter the correct "
-"password."
+#: django_authopenid/urls.py:19
+msgid "sendpw/"
 msgstr ""
 
-#: django_authopenid/forms.py:347
-msgid "new passwords do not match"
+#: django_authopenid/urls.py:20 django_authopenid/urls.py:24
+msgid "password/"
 msgstr ""
 
-#: django_authopenid/forms.py:442
-msgid "Incorrect username."
+#: django_authopenid/urls.py:20
+msgid "confirm/"
 msgstr ""
 
-#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700
-msgid "newquestion/"
+#: django_authopenid/urls.py:23
+msgid "account_settings"
 msgstr ""
 
-#: django_authopenid/urls.py:11
-msgid "newanswer/"
+#: django_authopenid/urls.py:25 django_authopenid/urls.py:26
+#: django_authopenid/urls.py:27 django_authopenid/urls.py:28
+msgid "email/"
 msgstr ""
 
-#: django_authopenid/urls.py:12
-msgid "signout/"
+#: django_authopenid/urls.py:25
+msgid "validate/"
 msgstr ""
 
-#: django_authopenid/urls.py:13
-msgid "complete/"
+#: django_authopenid/urls.py:26
+msgid "change/"
 msgstr ""
 
-#: django_authopenid/urls.py:15
-msgid "register/"
+#: django_authopenid/urls.py:27
+msgid "sendkey/"
 msgstr ""
 
-#: django_authopenid/urls.py:16
-msgid "signup/"
+#: django_authopenid/urls.py:28
+msgid "verify/"
 msgstr ""
 
-#: django_authopenid/urls.py:18
-msgid "sendpw/"
+#: django_authopenid/urls.py:29
+msgid "openid/"
 msgstr ""
 
-#: django_authopenid/urls.py:27
-msgid "validate/"
+#: django_authopenid/urls.py:30 forum/urls.py:43 forum/urls.py:47
+msgid "delete/"
 msgstr ""
 
-#: django_authopenid/views.py:108
+#: django_authopenid/views.py:123
 #, python-format
 msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:418 django_authopenid/views.py:545
-msgid "Welcome"
-msgstr "Verification Email from Q&amp;A forum"
+#: django_authopenid/views.py:531
+msgid "Welcome email subject line"
+msgstr "Welcome to the Q&A forum"
 
-#: django_authopenid/views.py:508
+#: django_authopenid/views.py:626
 msgid "Password changed."
 msgstr ""
 
-#: django_authopenid/views.py:520 django_authopenid/views.py:525
-msgid "your email needs to be validated"
+#: django_authopenid/views.py:638 django_authopenid/views.py:644
+#, python-format
+msgid "your email needs to be validated see %(details_url)s"
 msgstr ""
 "Your email needs to be validated. Please see details <a "
-"id='validate_email_alert' href=\"/faq#validate\">here</a>."
+"id='validate_email_alert' href='%(details_url)s'>here</a>."
+
+#: django_authopenid/views.py:665
+msgid "Email verification subject line"
+msgstr "Verification Email from Q&A forum"
+
+#: django_authopenid/views.py:751
+msgid "your email was not changed"
+msgstr ""
 
-#: django_authopenid/views.py:682 django_authopenid/views.py:834
+#: django_authopenid/views.py:798 django_authopenid/views.py:950
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr ""
 
-#: django_authopenid/views.py:686 django_authopenid/views.py:841
+#: django_authopenid/views.py:802 django_authopenid/views.py:957
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr ""
 
-#: django_authopenid/views.py:694
+#: django_authopenid/views.py:810
 msgid "Email Changed."
 msgstr ""
 
-#: django_authopenid/views.py:769
+#: django_authopenid/views.py:885
 msgid "This OpenID is already associated with another account."
 msgstr ""
 
-#: django_authopenid/views.py:774
+#: django_authopenid/views.py:890
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr ""
 
-#: django_authopenid/views.py:844
+#: django_authopenid/views.py:960
 msgid "Account deleted."
 msgstr ""
 
-#: django_authopenid/views.py:884
+#: django_authopenid/views.py:1003
 msgid "Request for new password"
 msgstr ""
 
-#: django_authopenid/views.py:897
-msgid "A new password has been sent to your email address."
+#: django_authopenid/views.py:1016
+msgid "A new password and the activation link were sent to your email address."
 msgstr ""
 
-#: django_authopenid/views.py:927
+#: django_authopenid/views.py:1046
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
 "registered."
 msgstr ""
 
-#: django_authopenid/views.py:936
+#: django_authopenid/views.py:1055
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
 msgstr ""
 
-#: django_authopenid/views.py:945
+#: django_authopenid/views.py:1064
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr ""
 
+#: forum/auth.py:484
+msgid "Your question and all of it's answers have been deleted"
+msgstr ""
+
+#: forum/auth.py:486
+msgid "Your question has been deleted"
+msgstr ""
+
+#: forum/auth.py:489
+msgid "The question and all of it's answers have been deleted"
+msgstr ""
+
+#: forum/auth.py:491
+msgid "The question has been deleted"
+msgstr ""
+
 #: forum/const.py:8
 msgid "duplicate question"
 msgstr ""
 
 #: forum/const.py:9
-msgid "question if off-topic or not relevant"
+msgid "question is off-topic or not relevant"
 msgstr ""
 
 #: forum/const.py:10
@@ -467,151 +443,336 @@ msgstr ""
 msgid "latest questions"
 msgstr ""
 
-#: forum/forms.py:14 templates/answer_edit_tips.html:33
-#: templates/answer_edit_tips.html.py:37 templates/question_edit_tips.html:31
-#: templates/question_edit_tips.html:36
+#: forum/feed.py:19 forum/urls.py:32 forum/urls.py:33 forum/urls.py:34
+#: forum/urls.py:35 forum/urls.py:36 forum/urls.py:37 forum/urls.py:38
+#: forum/urls.py:39 forum/urls.py:40 forum/urls.py:41 forum/urls.py:43
+msgid "questions/"
+msgstr ""
+
+#: forum/forms.py:16 templates/answer_edit_tips.html:35
+#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:32
+#: templates/question_edit_tips.html:37
 msgid "title"
 msgstr ""
 
-#: forum/forms.py:15
+#: forum/forms.py:17
 msgid "please enter a descriptive title for your question"
 msgstr ""
 
-#: forum/forms.py:20
+#: forum/forms.py:22
 msgid "title must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:29
+#: forum/forms.py:31
 msgid "content"
 msgstr ""
 
-#: forum/forms.py:35
+#: forum/forms.py:37
 msgid "question content must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:64
+#: forum/forms.py:47 templates/header.html:29 templates/header.html.py:63
 msgid "tags"
 msgstr ""
 
-#: forum/forms.py:47
+#: forum/forms.py:49
 msgid ""
 "Tags are short keywords, with no spaces within. Up to five tags can be used."
 msgstr ""
 
-#: forum/forms.py:54 templates/question_retag.html:38
+#: forum/forms.py:56 templates/question_retag.html:39
 msgid "tags are required"
 msgstr ""
 
-#: forum/forms.py:58
+#: forum/forms.py:62
 msgid "please use 5 tags or less"
 msgstr ""
 
-#: forum/forms.py:61
+#: forum/forms.py:65
 msgid "tags must be shorter than 20 characters"
 msgstr ""
 
-#: forum/forms.py:65
+#: forum/forms.py:69
 msgid ""
 "please use following characters in tags: letters 'a-z', numbers, and "
 "characters '.-_#'"
 msgstr ""
 
-#: forum/forms.py:75 templates/index.html:57 templates/question.html:209
-#: templates/question.html.py:395 templates/questions.html:58
-#: templates/questions.html.py:70 templates/unanswered.html:48
-#: templates/unanswered.html.py:60
+#: forum/forms.py:79 templates/index.html:59 templates/index.html.py:71
+#: templates/post_contributor_info.html:7
+#: templates/question_summary_list_roll.html:26
+#: templates/question_summary_list_roll.html:38 templates/questions.html:59
+#: templates/questions.html.py:71 templates/unanswered.html:51
+#: templates/unanswered.html.py:63
 msgid "community wiki"
 msgstr ""
 
-#: forum/forms.py:76
+#: forum/forms.py:80
 msgid ""
 "if you choose community wiki option, the question and answer do not generate "
 "points and name of author will not be shown"
 msgstr ""
 
-#: forum/forms.py:89
+#: forum/forms.py:96
 msgid "update summary:"
 msgstr ""
 
-#: forum/forms.py:90
+#: forum/forms.py:97
 msgid ""
 "enter a brief summary of your revision (e.g. fixed spelling, grammar, "
 "improved style, this field is optional)"
 msgstr ""
 
-#: forum/forms.py:175
+#: forum/forms.py:100
+msgid "Automatically accept user's contributions for the email updates"
+msgstr ""
+
+#: forum/forms.py:113
+msgid "Your name:"
+msgstr ""
+
+#: forum/forms.py:114
+msgid "Email (not shared with anyone):"
+msgstr ""
+
+#: forum/forms.py:115
+msgid "Your message:"
+msgstr ""
+
+#: forum/forms.py:197
 msgid "this email does not have to be linked to gravatar"
 msgstr ""
 
-#: forum/forms.py:176
+#: forum/forms.py:198
 msgid "Real name"
 msgstr ""
 
-#: forum/forms.py:177
+#: forum/forms.py:199
 msgid "Website"
 msgstr ""
 
-#: forum/forms.py:178
+#: forum/forms.py:200
 msgid "Location"
 msgstr ""
 
-#: forum/forms.py:179
+#: forum/forms.py:201
 msgid "Date of birth"
 msgstr ""
 
-#: forum/forms.py:179
+#: forum/forms.py:201
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr ""
 
-#: forum/forms.py:180 templates/authopenid/settings.html:21
+#: forum/forms.py:202 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr ""
 
-#: forum/forms.py:207 forum/forms.py:208
+#: forum/forms.py:229 forum/forms.py:230
 msgid "this email has already been registered, please use another one"
 msgstr ""
 
-#: forum/models.py:246
+#: forum/forms.py:234 forum/forms.py:235
+msgid "weekly"
+msgstr ""
+
+#: forum/forms.py:234 forum/forms.py:235
+msgid "no email"
+msgstr ""
+
+#: forum/forms.py:235
+msgid "daily"
+msgstr ""
+
+#: forum/forms.py:250 forum/models.py:46
+msgid "Entire forum"
+msgstr ""
+
+#: forum/forms.py:253
+msgid "Asked by me"
+msgstr ""
+
+#: forum/forms.py:256
+msgid "Answered by me"
+msgstr ""
+
+#: forum/forms.py:259
+msgid "Individually selected"
+msgstr ""
+
+#: forum/models.py:47
+msgid "Questions that I asked"
+msgstr ""
+
+#: forum/models.py:48
+msgid "Questions that I answered"
+msgstr ""
+
+#: forum/models.py:49
+msgid "Individually selected questions"
+msgstr ""
+
+#: forum/models.py:52
+msgid "Weekly"
+msgstr ""
+
+#: forum/models.py:53
+msgid "Daily"
+msgstr ""
+
+#: forum/models.py:54
+msgid "No email"
+msgstr ""
+
+#: forum/models.py:289
 #, python-format
 msgid "%(author)s modified the question"
 msgstr ""
 
-#: forum/models.py:250
+#: forum/models.py:293
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr ""
 
-#: forum/models.py:255
+#: forum/models.py:298
 #, python-format
 msgid "%(people)s commented the question"
 msgstr ""
 
-#: forum/models.py:260
+#: forum/models.py:303
 #, python-format
 msgid "%(people)s commented answers"
 msgstr ""
 
-#: forum/models.py:262
+#: forum/models.py:305
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr ""
 
-#: forum/models.py:306 forum/models.py:418
-msgid "revisions"
-msgstr ""
-
-#: forum/models.py:441 templates/badges.html:51
+#: forum/models.py:493 templates/badges.html:53
 msgid "gold"
 msgstr ""
 
-#: forum/models.py:442 templates/badges.html:59
+#: forum/models.py:494 templates/badges.html:61
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:443 templates/badges.html:66
+#: forum/models.py:495 templates/badges.html:68
 msgid "bronze"
 msgstr ""
 
+#: forum/urls.py:21
+msgid "upfiles/"
+msgstr ""
+
+#: forum/urls.py:25
+msgid "about/"
+msgstr ""
+
+#: forum/urls.py:26
+msgid "faq/"
+msgstr ""
+
+#: forum/urls.py:27
+msgid "privacy/"
+msgstr ""
+
+#: forum/urls.py:28
+msgid "logout/"
+msgstr ""
+
+#: forum/urls.py:29 forum/urls.py:30 forum/urls.py:31 forum/urls.py:47
+msgid "answers/"
+msgstr ""
+
+#: forum/urls.py:29 forum/urls.py:41 forum/urls.py:43 forum/urls.py:47
+msgid "comments/"
+msgstr ""
+
+#: forum/urls.py:30 forum/urls.py:35 forum/urls.py:56
+#: templates/user_info.html:45
+msgid "edit/"
+msgstr ""
+
+#: forum/urls.py:31 forum/urls.py:40
+msgid "revisions/"
+msgstr ""
+
+#: forum/urls.py:33 forum/urls.py:66
+msgid "ask/"
+msgstr ""
+
+#: forum/urls.py:34
+msgid "unanswered/"
+msgstr ""
+
+#: forum/urls.py:36
+msgid "close/"
+msgstr ""
+
+#: forum/urls.py:37
+msgid "reopen/"
+msgstr ""
+
+#: forum/urls.py:38
+msgid "answer/"
+msgstr ""
+
+#: forum/urls.py:39
+msgid "vote/"
+msgstr ""
+
+#: forum/urls.py:51
+msgid "question/"
+msgstr ""
+
+#: forum/urls.py:52 forum/urls.py:53
+msgid "tags/"
+msgstr ""
+
+#: forum/urls.py:54 forum/urls.py:56 forum/urls.py:57
+msgid "users/"
+msgstr ""
+
+#: forum/urls.py:55
+msgid "moderate-user/"
+msgstr ""
+
+#: forum/urls.py:58 forum/urls.py:59
+msgid "badges/"
+msgstr ""
+
+#: forum/urls.py:60
+msgid "messages/"
+msgstr ""
+
+#: forum/urls.py:60
+msgid "markread/"
+msgstr ""
+
+#: forum/urls.py:62
+msgid "nimda/"
+msgstr ""
+
+#: forum/urls.py:64
+msgid "upload/"
+msgstr ""
+
+#: forum/urls.py:65 forum/urls.py:66 forum/urls.py:67
+msgid "books/"
+msgstr ""
+
+#: forum/urls.py:68
+msgid "search/"
+msgstr ""
+
+#: forum/urls.py:69
+msgid "feedback/"
+msgstr ""
+
+#: forum/urls.py:70
+msgid "account/"
+msgstr ""
+
 #: forum/user.py:16 templates/user_tabs.html:7
 msgid "overview"
 msgstr ""
@@ -648,17 +809,17 @@ msgstr ""
 msgid "profile - responses"
 msgstr ""
 
-#: forum/user.py:42 templates/user_info.html:23 templates/users.html:26
+#: forum/user.py:42 templates/user_info.html:22 templates/users.html:26
 msgid "reputation"
-msgstr ""
+msgstr "karma"
 
 #: forum/user.py:43
 msgid "user reputation in the community"
-msgstr ""
+msgstr "user karma"
 
 #: forum/user.py:44
 msgid "profile - user reputation"
-msgstr ""
+msgstr "Profile - User's Karma"
 
 #: forum/user.py:50
 msgid "favorite questions"
@@ -684,61 +845,130 @@ msgstr ""
 msgid "profile - votes"
 msgstr ""
 
-#: forum/user.py:68
-msgid "preferences"
+#: forum/user.py:68 templates/user_tabs.html:28
+msgid "email subscriptions"
 msgstr ""
 
 #: forum/user.py:69 templates/user_tabs.html:27
-msgid "user preference settings"
+msgid "email subscription settings"
 msgstr ""
 
 #: forum/user.py:70
-msgid "profile - user preferences"
+msgid "profile - email subscriptions"
 msgstr ""
 
-#: forum/views.py:948
+#: forum/views.py:126
+msgid "Q&A forum feedback"
+msgstr ""
+
+#: forum/views.py:127
+msgid "Thanks for the feedback!"
+msgstr ""
+
+#: forum/views.py:135
+msgid "We look forward to hearing your feedback! Please, give it next time :)"
+msgstr ""
+
+#: forum/views.py:1014
 #, python-format
-msgid "subscription saved, %(email)s needs validation"
+msgid "subscription saved, %(email)s needs validation, see %(details_url)s"
 msgstr ""
 "Your subscription is saved, but email address %(email)s needs to be "
-"validated, please see <a href='/faq#validate'>more details here</a>"
+"validated, please see <a href='%(details_url)s'>more details here</a>"
 
-#: forum/views.py:1874
-msgid "uploading images is limited to users with >60 reputation points"
+#: forum/views.py:1022
+msgid "email update frequency has been set to daily"
 msgstr ""
 
-#: forum/views.py:1876
+#: forum/views.py:1826
+msgid "changes saved"
+msgstr ""
+
+#: forum/views.py:1832
+msgid "email updates canceled"
+msgstr ""
+
+#: forum/views.py:1999
+msgid "uploading images is limited to users with >60 reputation points"
+msgstr "sorry, file uploading requires karma >60"
+
+#: forum/views.py:2001
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1878
+#: forum/views.py:2003
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1880
+#: forum/views.py:2005
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
 msgstr ""
 
-#: forum/management/commands/send_email_alerts.py:35
-msgid "updates from website"
-msgstr "Q&amp;A forum update"
+#: forum/management/commands/send_email_alerts.py:71
+msgid "email update message subject"
+msgstr "news from Q&A forum"
 
-#: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
-#: templates/header.html:35
+#: forum/management/commands/send_email_alerts.py:72
+#, python-format
+msgid "%(name)s, this is an update message header for a question"
+msgid_plural "%(name)s, this is an update message header for %(num)d questions"
+msgstr[0] "<p>Dear %(name)s,</p></p>The following question has been updated on the Q&A forum:</p>"
+msgstr[1] "<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on the Q&A forum:</p>"
+
+#: forum/management/commands/send_email_alerts.py:81
+#, python-format
+msgid ""
+"go to %(link)s to change frequency of email updates or %(email)s "
+"administrator"
+msgstr ""
+"<p>Please remember that you can always <a href='%(link)s'>adjust</a> frequency of the "
+"email updates or turn them off entirely.<br/>If you believe that this message "
+"was sent in an error, please email about it the forum administrator at %(email)"
+"s.</p>"
+"<p>Sincerely,</p><p>Your friendly Q&A forum server.</p>"
+
+#: forum/templatetags/extra_tags.py:160 forum/templatetags/extra_tags.py:189
+#: templates/header.html:34
 msgid "badges"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:144 forum/templatetags/extra_tags.py:171
+#: forum/templatetags/extra_tags.py:161 forum/templatetags/extra_tags.py:188
 msgid "reputation points"
+msgstr "karma"
+
+#: forum/templatetags/extra_tags.py:244
+msgid "%b %d at %H:%M"
+msgstr ""
+
+#: forum/templatetags/extra_tags.py:246
+msgid "%b %d '%y at %H:%M"
+msgstr ""
+
+#: forum/templatetags/extra_tags.py:248
+msgid "2 days ago"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:225
-msgid " ago"
+#: forum/templatetags/extra_tags.py:250
+msgid "yesterday"
 msgstr ""
 
+#: forum/templatetags/extra_tags.py:252
+#, python-format
+msgid "%(hr)d hour ago"
+msgid_plural "%(hr)d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: forum/templatetags/extra_tags.py:254
+#, python-format
+msgid "%(min)d min ago"
+msgid_plural "%(min)d mins ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/404.html:24
 msgid "Sorry, could not find the page you requested."
 msgstr ""
@@ -805,55 +1035,55 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: templates/answer_edit.html:4 templates/answer_edit.html.py:47
+#: templates/answer_edit.html:5 templates/answer_edit.html.py:48
 msgid "Edit answer"
 msgstr ""
 
-#: templates/answer_edit.html:24 templates/answer_edit.html.py:27
-#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:43
-#: templates/question.html.py:46 templates/question_edit.html:27
+#: templates/answer_edit.html:25 templates/answer_edit.html.py:28
+#: templates/ask.html:26 templates/ask.html.py:29 templates/question.html:45
+#: templates/question.html.py:48 templates/question_edit.html:28
 msgid "hide preview"
 msgstr ""
 
-#: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:46 templates/question_edit.html:27
+#: templates/answer_edit.html:28 templates/ask.html:29
+#: templates/question.html:48 templates/question_edit.html:28
 msgid "show preview"
 msgstr ""
 
-#: templates/answer_edit.html:47 templates/question_edit.html:65
-#: templates/question_retag.html:52 templates/revisions_answer.html:36
+#: templates/answer_edit.html:48 templates/question_edit.html:66
+#: templates/question_retag.html:53 templates/revisions_answer.html:36
 #: templates/revisions_question.html:36
 msgid "back"
 msgstr ""
 
-#: templates/answer_edit.html:52 templates/question_edit.html:70
-#: templates/revisions_answer.html:47 templates/revisions_question.html:47
+#: templates/answer_edit.html:53 templates/question_edit.html:71
+#: templates/revisions_answer.html:50 templates/revisions_question.html:50
 msgid "revision"
 msgstr ""
 
-#: templates/answer_edit.html:55 templates/question_edit.html:74
+#: templates/answer_edit.html:56 templates/question_edit.html:75
 msgid "select revision"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:467 templates/question_edit.html:91
+#: templates/answer_edit.html:63 templates/ask.html:97
+#: templates/question.html:434 templates/question_edit.html:92
 msgid "Toggle the real time Markdown editor preview"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:467 templates/question_edit.html:91
+#: templates/answer_edit.html:63 templates/ask.html:97
+#: templates/question.html:435 templates/question_edit.html:92
 msgid "toggle preview"
 msgstr ""
 
-#: templates/answer_edit.html:71 templates/question_edit.html:115
-#: templates/question_retag.html:73
+#: templates/answer_edit.html:72 templates/question_edit.html:118
+#: templates/question_retag.html:74
 msgid "Save edit"
 msgstr ""
 
-#: templates/answer_edit.html:72 templates/close.html:29
-#: templates/question_edit.html:116 templates/question_retag.html:74
-#: templates/reopen.html:30 templates/user_edit.html:83
-#: templates/authopenid/changeemail.html:34
+#: templates/answer_edit.html:73 templates/close.html:29
+#: templates/feedback.html:50 templates/question_edit.html:119
+#: templates/question_retag.html:75 templates/reopen.html:30
+#: templates/user_edit.html:83 templates/authopenid/changeemail.html:40
 msgid "Cancel"
 msgstr ""
 
@@ -877,80 +1107,82 @@ msgstr ""
 msgid "be clear and concise"
 msgstr ""
 
-#: templates/answer_edit_tips.html:19 templates/question_edit_tips.html:16
+#: templates/answer_edit_tips.html:20 templates/question_edit_tips.html:17
 msgid "see frequently asked questions"
 msgstr ""
 
-#: templates/answer_edit_tips.html:24 templates/question_edit_tips.html:22
+#: templates/answer_edit_tips.html:26 templates/question_edit_tips.html:23
 msgid "Markdown tips"
 msgstr "Markdown basics"
 
-#: templates/answer_edit_tips.html:27 templates/question_edit_tips.html:25
+#: templates/answer_edit_tips.html:29 templates/question_edit_tips.html:26
 msgid "*italic* or __italic__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:30 templates/question_edit_tips.html:28
+#: templates/answer_edit_tips.html:32 templates/question_edit_tips.html:29
 msgid "**bold** or __bold__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:33 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html:35 templates/question_edit_tips.html:32
 msgid "link"
 msgstr ""
 
-#: templates/answer_edit_tips.html:33 templates/answer_edit_tips.html.py:37
-#: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:35 templates/answer_edit_tips.html.py:39
+#: templates/question_edit_tips.html:32 templates/question_edit_tips.html:37
 msgid "text"
 msgstr ""
 
-#: templates/answer_edit_tips.html:37 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:37
 msgid "image"
 msgstr ""
 
-#: templates/answer_edit_tips.html:41 templates/question_edit_tips.html:40
+#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:41
 msgid "numbered list:"
 msgstr ""
 
-#: templates/answer_edit_tips.html:46 templates/question_edit_tips.html:45
+#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:46
 msgid "basic HTML tags are also supported"
 msgstr ""
 
-#: templates/answer_edit_tips.html:49 templates/question_edit_tips.html:48
+#: templates/answer_edit_tips.html:52 templates/question_edit_tips.html:50
 msgid "learn more about Markdown"
 msgstr ""
 
-#: templates/ask.html:4 templates/ask.html.py:60
+#: templates/ask.html:5 templates/ask.html.py:61
 msgid "Ask a question"
 msgstr ""
 
-#: templates/ask.html:67
+#: templates/ask.html:68
 msgid "login to post question info"
 msgstr ""
 "<span class=\"strong big\">You are welcome to start submitting your question "
-"anonymously</span>  - you are currently not logged in. When you post your "
-"question, you will be redirected to the login/signup page. Your question "
-"will be saved meanwhile  and will be posted when you log in. Login/signup "
-"process is very simple. Login takes about 30 seconds, initial signup takes a "
-"minute or less."
+"anonymously</span>. When you submit the post, you will be redirected to the "
+"login/signup page. Your question will be saved in the current session and "
+"will be published after you log in. Login/signup process is very simple. "
+"Login takes about 30 seconds, initial signup takes a minute or less."
 
-#: templates/ask.html:73
+#: templates/ask.html:74
 #, python-format
-msgid "must have valid %(email)s to post"
+msgid ""
+"must have valid %(email)s to post, \n"
+"                            see %(email_validation_faq_url)s\n"
+"                            "
 msgstr ""
 "<span class='strong big'>Looks like your email address, %(email)s has not "
 "yet been validated.</span> To post messages you must verify your email, "
-"please see <a href='/faq#validate'>more details here</a>.<br>You can submit "
-"your question now and validate email after that. Your question will saved as "
-"pending meanwhile. "
+"please see <a href='%(email_validation_faq_url)s'>more details here</a>."
+"<br>You can submit your question now and validate email after that. Your "
+"question will saved as pending meanwhile. "
 
-#: templates/ask.html:107
+#: templates/ask.html:112
 msgid "(required)"
 msgstr ""
 
-#: templates/ask.html:114
+#: templates/ask.html:119
 msgid "Login/signup to post your question"
 msgstr "Login/Signup to Post"
 
-#: templates/ask.html:116
+#: templates/ask.html:121
 msgid "Ask your question"
 msgstr "Ask Your Question"
 
@@ -966,7 +1198,7 @@ msgstr ""
 msgid "Badges summary"
 msgstr ""
 
-#: templates/badges.html:17 templates/user_stats.html:73
+#: templates/badges.html:17
 msgid "Badges"
 msgstr ""
 
@@ -977,38 +1209,41 @@ msgstr ""
 "Q&amp;A community will be recognized with the variety of badges."
 
 #: templates/badges.html:22
+#, python-format
 msgid ""
-"Below is the list of available badges and number of times each type of badge "
-"has been awarded."
+"Below is the list of available badges and number \n"
+"    of times each type of badge has been awarded. Give us feedback at %"
+"(feedback_faq_url)s.\n"
+"    "
 msgstr ""
 "Currently badges differ only by their level: <strong>gold</strong>, "
 "<strong>silver</strong> and <strong>bronze</strong> (their meanings are "
 "described on the right). In the future there will be many types of badges at "
-"each level. <strong>Please give us your <a href=\"/faq#feedback\">feedback</"
-"a></strong> - what kinds of badges would you like to see and suggest the "
-"activity for which those badges might be awarded."
+"each level. <strong>Please give us your <a href='%(feedback_faq_url)"
+"s'>feedback</a></strong> - what kinds of badges would you like to see and "
+"suggest the activity for which those badges might be awarded."
 
-#: templates/badges.html:48
+#: templates/badges.html:50
 msgid "Community badges"
 msgstr "Badge levels"
 
-#: templates/badges.html:54
+#: templates/badges.html:56
 msgid "gold badge description"
 msgstr ""
 "Gold badge is the highest award in this community. To obtain it have to show "
 "profound knowledge and ability in addition to your active participation."
 
-#: templates/badges.html:62
+#: templates/badges.html:64
 msgid "silver badge description"
 msgstr ""
 "Obtaining silver badge requires significant patience. If you have received "
 "one, that means you have greatly contributed to this community."
 
-#: templates/badges.html:65
+#: templates/badges.html:67
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: templates/badges.html:69
+#: templates/badges.html:71
 msgid "bronze badge description"
 msgstr ""
 "If you are an active participant in this community, you will be recognized "
@@ -1080,8 +1315,9 @@ msgstr ""
 msgid "number of times"
 msgstr ""
 
-#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
-#: templates/unanswered.html:37 templates/users_questions.html:32
+#: templates/book.html:105 templates/index.html:47
+#: templates/question_summary_list_roll.html:14 templates/questions.html:47
+#: templates/unanswered.html:39 templates/users_questions.html:32
 msgid "votes"
 msgstr ""
 
@@ -1089,15 +1325,17 @@ msgstr ""
 msgid "the answer has been accepted to be correct"
 msgstr ""
 
-#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
-#: templates/unanswered.html:38 templates/users_questions.html:42
+#: templates/book.html:115 templates/index.html:48
+#: templates/question_summary_list_roll.html:15 templates/questions.html:48
+#: templates/unanswered.html:40 templates/users_questions.html:40
 msgid "views"
 msgstr ""
 
-#: templates/book.html:125 templates/index.html:69 templates/question.html:499
-#: templates/questions.html:84 templates/questions.html.py:156
-#: templates/tags.html:49 templates/unanswered.html:75
-#: templates/unanswered.html.py:106 templates/users_questions.html:54
+#: templates/book.html:125 templates/index.html:103
+#: templates/question.html:480 templates/question_summary_list_roll.html:52
+#: templates/questions.html:103 templates/questions.html.py:171
+#: templates/tags.html:49 templates/unanswered.html:95
+#: templates/unanswered.html.py:122 templates/users_questions.html:52
 msgid "using tags"
 msgstr ""
 
@@ -1105,7 +1343,7 @@ msgstr ""
 msgid "subscribe to book RSS feed"
 msgstr ""
 
-#: templates/book.html:147 templates/index.html:118
+#: templates/book.html:147 templates/index.html:152
 msgid "subscribe to the questions feed"
 msgstr ""
 
@@ -1189,16 +1427,18 @@ msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
 msgstr ""
+"Karma system allows users to earn rights to perform a variety of moderation "
+"tasks"
 
 #: templates/faq.html:40
 msgid "How does reputation system work?"
-msgstr ""
+msgstr "How does karma system work?"
 
 #: templates/faq.html:41
 msgid "Rep system summary"
 msgstr ""
 "When a question or answer is upvoted, the user who posted them will gain "
-"some points, which are called \"reputation points\". These points serve as a "
+"some points, which are called \"karma points\". These points serve as a "
 "rough measure of the community trust to him/her. Various moderation tasks "
 "are gradually assigned to the users based on those points."
 
@@ -1237,51 +1477,53 @@ msgstr ""
 msgid "retag questions"
 msgstr ""
 
-#: templates/faq.html:77
+#: templates/faq.html:78
 msgid "edit community wiki questions"
 msgstr ""
 
-#: templates/faq.html:81
+#: templates/faq.html:83
 msgid "edit any answer"
 msgstr ""
 
-#: templates/faq.html:85
+#: templates/faq.html:87
 msgid "open any closed question"
 msgstr ""
 
-#: templates/faq.html:89
+#: templates/faq.html:91
 msgid "delete any comment"
 msgstr ""
 
-#: templates/faq.html:93
+#: templates/faq.html:95
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 
-#: templates/faq.html:100
+#: templates/faq.html:102
 msgid "how to validate email title"
 msgstr "How to validate email and why?"
 
-#: templates/faq.html:102
-msgid "how to validate email info"
-msgstr ""
-"<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
-"\"bigger strong\">How?</span> If you have just set or changed your email "
-"address - <strong>check your email and click the included link</strong>."
-"<br>The link contains a key generated specifically for you. You can also "
-"<button style='display:inline' type='submit'><strong>get a new key</strong></"
-"button> and check your email again.</p></form><span class=\"bigger strong"
-"\">Why?</span> Email validation is required to make sure that <strong>only "
-"you can post messages</strong> on your behalf and to <strong>minimize spam</"
-"strong> posts.<br>With email you can <strong>subscribe for updates</strong> "
-"on the most interesting questions. Also, when you sign up for the first time "
-"- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
-"personal image.</p>"
-
-#: templates/faq.html:106
+#: templates/faq.html:104
+#, python-format
+msgid ""
+"how to validate email info with %(send_email_key_url)s %(gravatar_faq_url)s"
+msgstr ""
+"<form style='margin:0;padding:0;' action='%(send_email_key_url)s'><p><span "
+"class=\"bigger strong\">How?</span> If you have just set or changed your "
+"email address - <strong>check your email and click the included link</"
+"strong>.<br>The link contains a key generated specifically for you. You can "
+"also <button style='display:inline' type='submit'><strong>get a new key</"
+"strong></button> and check your email again.</p></form><span class=\"bigger "
+"strong\">Why?</span> Email validation is required to make sure that "
+"<strong>only you can post messages</strong> on your behalf and to "
+"<strong>minimize spam</strong> posts.<br>With email you can "
+"<strong>subscribe for updates</strong> on the most interesting questions. "
+"Also, when you sign up for the first time - create a unique <a href='%"
+"(gravatar_faq_url)s'><strong>gravatar</strong></a> personal image.</p>"
+
+#: templates/faq.html:108
 msgid "what is gravatar"
 msgstr "What is gravatar?"
 
-#: templates/faq.html:107
+#: templates/faq.html:109
 msgid "gravatar faq info"
 msgstr ""
 "<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</"
@@ -1292,63 +1534,124 @@ msgstr ""
 "your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</"
 "strong></a>"
 
-#: templates/faq.html:110
+#: templates/faq.html:112
 msgid "To register, do I need to create new password?"
 msgstr ""
 
-#: templates/faq.html:111
+#: templates/faq.html:113
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
 msgstr ""
 
-#: templates/faq.html:112
+#: templates/faq.html:114
 msgid "Login now!"
 msgstr ""
 
-#: templates/faq.html:117
+#: templates/faq.html:119
 msgid "Why other people can edit my questions/answers?"
 msgstr ""
 
-#: templates/faq.html:118
+#: templates/faq.html:120
 msgid "Goal of this site is..."
 msgstr ""
 
-#: templates/faq.html:118
+#: templates/faq.html:120
 msgid ""
 "So questions and answers can be edited like wiki pages by experienced users "
 "of this site and this improves the overall quality of the knowledge base "
 "content."
 msgstr ""
 
-#: templates/faq.html:119
+#: templates/faq.html:121
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 
-#: templates/faq.html:123
+#: templates/faq.html:125
 msgid "Still have questions?"
 msgstr ""
 
-#: templates/faq.html:124
-msgid "Please ask your question, help make our community better!"
+#: templates/faq.html:126
+#, python-format
+msgid ""
+"Please ask your question at %(ask_question_url)s, help make our community "
+"better!"
 msgstr ""
-"Please <a href=\"/questions/ask\">ask</a> your question, help make our "
+"Please <a href='%(ask_question_url)s'>ask</a> your question, help make our "
 "community better!"
 
-#: templates/faq.html:126 templates/header.html:29 templates/header.html.py:63
+#: templates/faq.html:128 templates/header.html:28 templates/header.html.py:62
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:126 templates/index.html:123
+#: templates/faq.html:128 templates/index.html:157
 msgid "."
 msgstr ""
 
-#: templates/footer.html:8 templates/header.html:14 templates/index.html:83
+#: templates/feedback.html:6
+msgid "Feedback"
+msgstr ""
+
+#: templates/feedback.html:11
+msgid "Give us your feedback!"
+msgstr ""
+
+#: templates/feedback.html:17
+#, python-format
+msgid ""
+"\n"
+"            <span class='big strong'>Dear %(user_name)s</span>, we look "
+"forward to hearing your feedback. \n"
+"            Please type and send us your message below.\n"
+"            "
+msgstr ""
+
+#: templates/feedback.html:24
+msgid ""
+"\n"
+"            <span class='big strong'>Dear visitor</span>, we look forward to "
+"hearing your feedback.\n"
+"            Please type and send us your message below.\n"
+"            "
+msgstr ""
+
+#: templates/feedback.html:41
+msgid "(this field is required)"
+msgstr ""
+
+#: templates/feedback.html:49
+msgid "Send Feedback"
+msgstr ""
+
+#: templates/feedback_email.txt:3
+#, python-format
+msgid ""
+"\n"
+"Hello, this is a %(site_title)s forum feedback message\n"
+msgstr ""
+
+#: templates/feedback_email.txt:9
+msgid "Sender is"
+msgstr ""
+
+#: templates/feedback_email.txt:11 templates/feedback_email.txt.py:14
+msgid "email"
+msgstr ""
+
+#: templates/feedback_email.txt:13
+msgid "anonymous"
+msgstr ""
+
+#: templates/feedback_email.txt:19
+msgid "Message body:"
+msgstr ""
+
+#: templates/footer.html:8 templates/header.html:14 templates/index.html:117
 msgid "about"
 msgstr ""
 
-#: templates/footer.html:9 templates/header.html:15 templates/index.html:84
-#: templates/question_edit_tips.html:16
+#: templates/footer.html:9 templates/header.html:15 templates/index.html:118
+#: templates/question_edit_tips.html:17
 msgid "faq"
 msgstr ""
 
@@ -1368,162 +1671,176 @@ msgstr ""
 msgid "privacy policy"
 msgstr ""
 
-#: templates/footer.html:14
+#: templates/footer.html:22
 msgid "give feedback"
 msgstr ""
 
-#: templates/header.html:10
+#: templates/header.html:9
 msgid "logout"
 msgstr ""
 
-#: templates/header.html:12 templates/authopenid/signup.html:41
+#: templates/header.html:11
 msgid "login"
 msgstr ""
 
-#: templates/header.html:23
+#: templates/header.html:22
 msgid "back to home page"
 msgstr ""
 
-#: templates/header.html:31 templates/header.html.py:65
+#: templates/header.html:30 templates/header.html.py:64
 msgid "users"
 msgstr ""
 
-#: templates/header.html:33
+#: templates/header.html:32
 msgid "books"
 msgstr ""
 
-#: templates/header.html:36
+#: templates/header.html:35
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:40
+#: templates/header.html:39
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:44
+#: templates/header.html:43
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:59
+#: templates/header.html:58
 msgid "search"
 msgstr ""
 
-#: templates/index.html:7
+#: templates/index.html:8
 msgid "Home"
 msgstr ""
 
-#: templates/index.html:22 templates/questions.html:7
+#: templates/index.html:23 templates/questions.html:8
 msgid "Questions"
 msgstr ""
 
-#: templates/index.html:24
+#: templates/index.html:25
 msgid "last updated questions"
 msgstr ""
 
-#: templates/index.html:24 templates/questions.html:25
-#: templates/unanswered.html:20
+#: templates/index.html:25 templates/questions.html:26
+#: templates/unanswered.html:21
 msgid "newest"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "hottest questions"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "hottest"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:27 templates/questions.html:29
 msgid "most voted questions"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:27 templates/questions.html:29
 msgid "most voted"
 msgstr ""
 
-#: templates/index.html:27
+#: templates/index.html:28
 msgid "all questions"
 msgstr ""
 
-#: templates/index.html:47 templates/questions.html:45
-#: templates/unanswered.html:36 templates/users_questions.html:35
+#: templates/index.html:46 templates/question_summary_list_roll.html:13
+#: templates/questions.html:46 templates/unanswered.html:38
+#: templates/users_questions.html:36
 msgid "answers"
 msgstr ""
 
-#: templates/index.html:69 templates/question.html:499
-#: templates/questions.html:84 templates/questions.html.py:156
-#: templates/tags.html:49 templates/unanswered.html:75
-#: templates/unanswered.html.py:106 templates/users_questions.html:52
+#: templates/index.html:78 templates/index.html.py:92
+#: templates/questions.html:78 templates/questions.html.py:92
+#: templates/unanswered.html:70 templates/unanswered.html.py:84
+msgid "Posted:"
+msgstr ""
+
+#: templates/index.html:81 templates/index.html.py:86
+#: templates/questions.html:81 templates/questions.html.py:86
+#: templates/unanswered.html:73 templates/unanswered.html.py:78
+msgid "Updated:"
+msgstr ""
+
+#: templates/index.html:103 templates/question.html:480
+#: templates/question_summary_list_roll.html:52 templates/questions.html:103
+#: templates/questions.html.py:171 templates/tags.html:49
+#: templates/unanswered.html:95 templates/unanswered.html.py:122
+#: templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr ""
 
-#: templates/index.html:80
+#: templates/index.html:114
 msgid "welcome to website"
-msgstr ""
+msgstr "Welcome to Q&amp;A forum"
 
-#: templates/index.html:89
+#: templates/index.html:123
 msgid "Recent tags"
 msgstr ""
 
-#: templates/index.html:94 templates/question.html:125
+#: templates/index.html:128 templates/question.html:135
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
-#: templates/index.html:97 templates/index.html.py:123
+#: templates/index.html:131 templates/index.html.py:157
 msgid "popular tags"
 msgstr "tags"
 
-#: templates/index.html:102
+#: templates/index.html:136
 msgid "Recent awards"
 msgstr "Recent badges"
 
-#: templates/index.html:108
+#: templates/index.html:142
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:113
+#: templates/index.html:147
 msgid "all awards"
 msgstr "all badges"
 
-#: templates/index.html:118
+#: templates/index.html:152
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "complete list of questions"
 msgstr "list of all questions"
 
-#: templates/index.html:123
+#: templates/index.html:157 templates/authopenid/signup.html:18
 msgid "or"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "Please help us answer"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "list of unanswered questions"
 msgstr "unanswered questions"
 
-#: templates/logout.html:6 templates/logout.html.py:17
+#: templates/logout.html:6 templates/logout.html.py:16
 msgid "Logout"
 msgstr ""
 
-#: templates/logout.html:20
+#: templates/logout.html:19
 msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
-"Clicking <strong>Logout</strong> will log you out from the Q&amp;A forum.</"
-"p><p>If you wish to sign off completely - please make sure to log out from "
-"your OpenID provider."
+"Clicking <strong>Logout</strong> will log you out from the forum"
+"but will not sign you off from your OpenID provider.</p><p>If you wish to sign off "
+"completely - please make sure to log out from your OpenID provider as well."
 
-#: templates/logout.html:21
+#: templates/logout.html:20
 msgid "Logout now"
 msgstr "Logout Now"
 
@@ -1551,6 +1868,33 @@ msgstr ""
 msgid "next page"
 msgstr ""
 
+#: templates/post_contributor_info.html:9
+#, python-format
+msgid ""
+"\n"
+"                one revision\n"
+"            "
+msgid_plural ""
+"\n"
+"                %(rev_count)s revisions\n"
+"            "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/post_contributor_info.html:19 templates/revisions_answer.html:66
+#: templates/revisions_question.html:66
+msgid "asked"
+msgstr ""
+
+#: templates/post_contributor_info.html:21
+msgid "answered"
+msgstr ""
+
+#: templates/post_contributor_info.html:37 templates/revisions_answer.html:68
+#: templates/revisions_question.html:68
+msgid "updated"
+msgstr ""
+
 #: templates/privacy.html:6 templates/privacy.html.py:11
 msgid "Privacy policy"
 msgstr ""
@@ -1558,6 +1902,10 @@ msgstr ""
 #: templates/privacy.html:15
 msgid "general message about privacy"
 msgstr ""
+"Respecting users privacy is an important core principle "
+"of this Q&amp;A forum. "
+"Information on this page details how this forum protects your privacy, "
+"and what type of information is collected."
 
 #: templates/privacy.html:18
 msgid "Site Visitors"
@@ -1566,6 +1914,9 @@ msgstr ""
 #: templates/privacy.html:20
 msgid "what technical information is collected about visitors"
 msgstr ""
+"Information on question views, revisions of questions and answers - both times "
+"and content are recorded for each user in order to correctly count number of views, "
+"maintain data integrity and report relevant updates."
 
 #: templates/privacy.html:23
 msgid "Personal Information"
@@ -1574,6 +1925,9 @@ msgstr ""
 #: templates/privacy.html:25
 msgid "details on personal information policies"
 msgstr ""
+"Members of this community may choose to display personally identifiable information "
+"in their profiles. Forum will never display such information "
+"without a request from the user."
 
 #: templates/privacy.html:28
 msgid "Other Services"
@@ -1582,10 +1936,15 @@ msgstr ""
 #: templates/privacy.html:30
 msgid "details on sharing data with third parties"
 msgstr ""
+"None of the data that is not openly shown on the forum by the choice of the user "
+"is shared with any third party."
 
 #: templates/privacy.html:35
 msgid "cookie policy details"
 msgstr ""
+"Forum software relies on the internet cookie technology to "
+"keep track of user sessions. Cookies must be enabled "
+"in your browser so that forum can work for you."
 
 #: templates/privacy.html:37
 msgid "Policy Changes"
@@ -1594,194 +1953,305 @@ msgstr ""
 #: templates/privacy.html:38
 msgid "how privacy policies can be changed"
 msgstr ""
+"These policies may be adjusted to improve protection of "
+"user's privacy. Whenever such changes occur, users will be "
+"notified via the internal messaging system. "
 
-#: templates/question.html:72 templates/question.html.py:73
-#: templates/question.html:85 templates/question.html.py:87
+#: templates/question.html:77 templates/question.html.py:78
+#: templates/question.html:94 templates/question.html.py:96
 msgid "i like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:75 templates/question.html.py:89
-#: templates/question.html:289
+#: templates/question.html:80 templates/question.html.py:98
+#: templates/question.html:257
 msgid "current number of votes"
 msgstr ""
 
-#: templates/question.html:80 templates/question.html.py:81
-#: templates/question.html:94 templates/question.html.py:95
+#: templates/question.html:89 templates/question.html.py:90
+#: templates/question.html:103 templates/question.html.py:104
 msgid "i dont like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:100 templates/question.html.py:101
+#: templates/question.html:109 templates/question.html.py:110
 msgid "mark this question as favorite (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:107 templates/question.html.py:108
+#: templates/question.html:116 templates/question.html.py:117
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 
-#: templates/question.html:134 templates/question.html.py:322
-#: templates/revisions_answer.html:53 templates/revisions_question.html:53
+#: templates/question.html:140 templates/question.html.py:294
+#: templates/revisions_answer.html:56 templates/revisions_question.html:56
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:138 templates/question.html.py:332
+#: templates/question.html:144 templates/question.html.py:301
 msgid "delete"
 msgstr ""
 
-#: templates/question.html:143
+#: templates/question.html:149
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:148
+#: templates/question.html:153
 msgid "close"
 msgstr ""
 
-#: templates/question.html:154 templates/question.html.py:345
+#: templates/question.html:159 templates/question.html.py:308
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 
-#: templates/question.html:155 templates/question.html.py:346
+#: templates/question.html:160 templates/question.html.py:309
 msgid "flag offensive"
 msgstr ""
 
-#: templates/question.html:167 templates/question.html.py:355
-#: templates/revisions_answer.html:65 templates/revisions_question.html:65
-msgid "updated"
+#: templates/question.html:182 templates/question.html.py:331
+msgid "delete this comment"
 msgstr ""
 
-#: templates/question.html:216 templates/question.html.py:402
-#: templates/revisions_answer.html:63 templates/revisions_question.html:63
-msgid "asked"
-msgstr ""
+#: templates/question.html:193 templates/question.html.py:342
+msgid "add comment"
+msgstr "post a comment"
 
-#: templates/question.html:246 templates/question.html.py:429
-msgid "comments"
-msgstr ""
+#: templates/question.html:197
+#, python-format
+msgid ""
+"\n"
+"                                            see <strong>one</strong> more \n"
+"                                            "
+msgid_plural ""
+"\n"
+"                                            see <strong>%(counter)s</strong> "
+"more\n"
+"                                            "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:247 templates/question.html.py:430
-msgid "add comment"
-msgstr ""
+#: templates/question.html:203
+#, python-format
+msgid ""
+"\n"
+"                                            see <strong>one</strong> more "
+"comment\n"
+"                                            "
+msgid_plural ""
+"\n"
+"                                            see <strong>%(counter)s</strong> "
+"more comments\n"
+"                                            "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:260
+#: templates/question.html:219
 #, python-format
 msgid ""
-"The question has been closed for the following reason \"%(question."
-"get_close_reason_display)s\" by"
+"The question has been closed for the following reason \"%(close_reason)s\" by"
 msgstr ""
 
-#: templates/question.html:262
+#: templates/question.html:221
 #, python-format
-msgid "close date %(question.closed_at)s"
+msgid "close date %(closed_at)s"
 msgstr ""
 
-#: templates/question.html:269 templates/user_stats.html:13
-msgid "Answers"
-msgstr " Answers"
+#: templates/question.html:229
+#, python-format
+msgid ""
+"\n"
+"                    One Answer:\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    %(counter)s Answers:\n"
+"                    "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:271
+#: templates/question.html:237
 msgid "oldest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:271
+#: templates/question.html:237
 msgid "oldest answers"
 msgstr "oldest"
 
-#: templates/question.html:272
+#: templates/question.html:239
 msgid "newest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:272
+#: templates/question.html:239
 msgid "newest answers"
 msgstr "newest"
 
-#: templates/question.html:273
+#: templates/question.html:241
 msgid "most voted answers will be shown first"
 msgstr ""
 
-#: templates/question.html:273
+#: templates/question.html:241
 msgid "popular answers"
 msgstr "most voted"
 
-#: templates/question.html:287 templates/question.html.py:288
+#: templates/question.html:255 templates/question.html.py:256
 msgid "i like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:294 templates/question.html.py:295
+#: templates/question.html:262 templates/question.html.py:263
 msgid "i dont like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:300 templates/question.html.py:301
+#: templates/question.html:268 templates/question.html.py:269
 msgid "mark this answer as favorite (click again to undo)"
 msgstr ""
 
-#: templates/question.html:306 templates/question.html.py:307
+#: templates/question.html:274 templates/question.html.py:275
 msgid "the author of the question has selected this answer as correct"
 msgstr ""
 
-#: templates/question.html:329
+#: templates/question.html:288
+msgid "answer permanent link"
+msgstr ""
+
+#: templates/question.html:289
+msgid "permanent link"
+msgstr "link"
+
+#: templates/question.html:301
 msgid "undelete"
 msgstr ""
 
-#: templates/question.html:339
-msgid "answer permanent link"
+#: templates/question.html:346
+#, python-format
+msgid ""
+"\n"
+"                                                        see <strong>one</"
+"strong> more \n"
+"                                                        "
+msgid_plural ""
+"\n"
+"                                                        see <strong>%"
+"(counter)s</strong> more\n"
+"                                                        "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/question.html:352
+#, python-format
+msgid ""
+"\n"
+"                                                        see <strong>one</"
+"strong> more comment\n"
+"                                                        "
+msgid_plural ""
+"\n"
+"                                                        see <strong>%"
+"(counter)s</strong> more comments\n"
+"                                                        "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/question.html:378 templates/question.html.py:381
+msgid "Notify me once a day when there are any new answers"
 msgstr ""
+"<strong>Notify me</strong> once a day by email when there are any new "
+"answers or updates"
 
-#: templates/question.html:340
-msgid "permanent link"
+#: templates/question.html:384
+msgid "Notify me weekly when there are any new answers"
+msgstr ""
+"<strong>Notify me</strong> weekly when there are any new answers or updates"
+
+#: templates/question.html:389
+#, python-format
+msgid ""
+"\n"
+"                You can always adjust frequency of email updates from your %"
+"(profile_url)s\n"
+"                "
+msgstr ""
+"\n"
+"(note: you can always <a href='%(profile_url)s?"
+"sort=email_subscriptions'>adjust frequency</a> of email updates)"
+
+#: templates/question.html:396
+msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr ""
+"<span class='strong'>Here</span> (once you log in) you will be able to sign "
+"up for the periodic email updates about this question."
 
-#: templates/question.html:453
+#: templates/question.html:407
 msgid "Your answer"
 msgstr ""
 
-#: templates/question.html:456
+#: templates/question.html:409
+msgid "Be the first one to answer this question!"
+msgstr ""
+
+#: templates/question.html:415
 msgid "you can answer anonymously and then login"
 msgstr ""
-"<span class='strong big'>You are now not logged in</span> but you can answer "
-"first and then login"
+"<span class='strong big'>Please start posting your answer anonymously</span> "
+"- your answer will be saved within the current session and published after "
+"you log in or create a new account. Please try to give a <strong>substantial "
+"answer</strong>, for discussions, <strong>please use comments</strong> and "
+"<strong>please do remember to vote</strong> (after you log in)!"
 
-#: templates/question.html:479
-msgid "Answer the question"
+#: templates/question.html:419
+msgid "answer your own question only to give an answer"
 msgstr ""
+"<span class='big strong'>You are welcome to answer your own question</span>, "
+"but please make sure to give an <strong>answer</strong>. Remember that you "
+"can always <strong>revise your original question</strong>. Please "
+"<strong>use comments for discussions</strong>  and <strong>please don't "
+"forget to vote :)</strong> for the answers that you liked (or perhaps did "
+"not like)! "
 
-#: templates/question.html:481
-msgid "Notify me daily if there are any new answers."
+#: templates/question.html:421
+msgid "please only give an answer, no discussions"
 msgstr ""
+"<span class='big strong'>Please try to give a substantial answer</span>. If "
+"you wanted to comment on the question or answer, just <strong>use the "
+"commenting tool</strong>. Please remember that you can always <strong>revise "
+"your answers</strong> - no need to answer the same question twice. Also, "
+"please <strong>don't forget to vote</strong> - it really helps to select the "
+"best questions and answers!"
 
-#: templates/question.html:483
-msgid "once you sign in you will be able to subscribe for any updates here"
-msgstr "Here logged in users can sign up for the question updates."
+#: templates/question.html:457
+msgid "Login/Signup to Post Your Answer"
+msgstr ""
+
+#: templates/question.html:460
+msgid "Answer Your Own Question"
+msgstr ""
+
+#: templates/question.html:462
+msgid "Answer the question"
+msgstr "Post Your Answer"
 
-#: templates/question.html:494
+#: templates/question.html:475
 msgid "Question tags"
 msgstr "Tags"
 
-#: templates/question.html:504
+#: templates/question.html:485
 msgid "question asked"
 msgstr "Asked"
 
-#: templates/question.html:504 templates/question.html.py:510
-#: templates/user_info.html:51
-msgid "ago"
-msgstr ""
-
-#: templates/question.html:507
+#: templates/question.html:488
 msgid "question was seen"
 msgstr "Seen"
 
-#: templates/question.html:507
+#: templates/question.html:488
 msgid "times"
 msgstr ""
 
-#: templates/question.html:510
+#: templates/question.html:491
 msgid "last updated"
 msgstr "Last updated"
 
-#: templates/question.html:515
+#: templates/question.html:496
 msgid "Related questions"
 msgstr ""
 
-#: templates/question_edit.html:4 templates/question_edit.html.py:65
+#: templates/question_edit.html:5 templates/question_edit.html.py:66
 msgid "Edit question"
 msgstr ""
 
@@ -1791,57 +2261,57 @@ msgstr "Tips"
 
 #: templates/question_edit_tips.html:7
 msgid "please ask a relevant question"
-msgstr ""
+msgstr "ask a question relevant to the CNPROG community"
 
 #: templates/question_edit_tips.html:10
 msgid "please try provide enough details"
 msgstr "provide enough details"
 
-#: templates/question_retag.html:3 templates/question_retag.html.py:52
+#: templates/question_retag.html:4 templates/question_retag.html.py:53
 msgid "Change tags"
 msgstr ""
 
-#: templates/question_retag.html:39
+#: templates/question_retag.html:40
 msgid "up to 5 tags, less than 20 characters each"
 msgstr ""
 
-#: templates/question_retag.html:82
+#: templates/question_retag.html:83
 msgid "Why use and modify tags?"
 msgstr ""
 
-#: templates/question_retag.html:85
+#: templates/question_retag.html:86
 msgid "tags help us keep Questions organized"
 msgstr ""
 
-#: templates/question_retag.html:91
+#: templates/question_retag.html:94
 msgid "tag editors receive special awards from the community"
 msgstr ""
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "Found by tags"
 msgstr "Tagged questions"
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "Found by title"
 msgstr ""
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "All questions"
 msgstr ""
 
-#: templates/questions.html:25 templates/unanswered.html:20
+#: templates/questions.html:26 templates/unanswered.html:21
 msgid "most recently asked questions"
 msgstr ""
 
-#: templates/questions.html:26
+#: templates/questions.html:27
 msgid "most recently updated questions"
 msgstr ""
 
-#: templates/questions.html:26
+#: templates/questions.html:27
 msgid "active"
 msgstr ""
 
-#: templates/questions.html:109
+#: templates/questions.html:126
 #, python-format
 msgid ""
 "\n"
@@ -1860,7 +2330,7 @@ msgstr[1] ""
 "<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
 "class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
 
-#: templates/questions.html:116
+#: templates/questions.html:133
 #, python-format
 msgid ""
 "\n"
@@ -1881,7 +2351,7 @@ msgstr[1] ""
 "containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
 "p>"
 
-#: templates/questions.html:122
+#: templates/questions.html:139
 #, python-format
 msgid ""
 "\n"
@@ -1898,35 +2368,35 @@ msgstr[1] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
 
-#: templates/questions.html:131
+#: templates/questions.html:148
 msgid "latest questions info"
 msgstr "<strong>Newest</strong> questions are shown first."
 
-#: templates/questions.html:135
+#: templates/questions.html:152
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 
-#: templates/questions.html:136
+#: templates/questions.html:153
 msgid "Most recently answered ones are shown first."
 msgstr "<strong>Most recently answered</strong> questions are shown first."
 
-#: templates/questions.html:140
+#: templates/questions.html:157
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Questions sorted by the <strong>number of answers</strong>."
 
-#: templates/questions.html:141
+#: templates/questions.html:158
 msgid "Most answered questions are shown first."
 msgstr " "
 
-#: templates/questions.html:145
+#: templates/questions.html:162
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr ""
 
-#: templates/questions.html:146
+#: templates/questions.html:163
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:153 templates/unanswered.html:102
+#: templates/questions.html:168 templates/unanswered.html:118
 msgid "Related tags"
 msgstr "Tags"
 
@@ -1963,6 +2433,10 @@ msgstr ""
 msgid "Revision history"
 msgstr ""
 
+#: templates/revisions_answer.html:48 templates/revisions_question.html:48
+msgid "click to hide/show revision"
+msgstr ""
+
 #: templates/tags.html:6 templates/tags.html.py:30
 msgid "Tag list"
 msgstr ""
@@ -1995,16 +2469,16 @@ msgstr ""
 msgid "Nothing found"
 msgstr ""
 
-#: templates/unanswered.html:7 templates/unanswered.html.py:18
+#: templates/unanswered.html:8 templates/unanswered.html.py:19
 msgid "Unanswered questions"
 msgstr ""
 
-#: templates/unanswered.html:97
+#: templates/unanswered.html:114
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
-"questions"
+"<div class=\"questions-count\">%(num_q)s</div>questions <strong>without "
+"accepted answers</strong>"
 
 #: templates/user_edit.html:6
 msgid "Edit user profile"
@@ -2019,139 +2493,202 @@ msgid "image associated with your email address"
 msgstr ""
 
 #: templates/user_edit.html:31
-msgid "avatar"
-msgstr "<a href='/faq#gravatar'>gravatar</a>"
+#, python-format
+msgid "avatar, see %(gravatar_faq_url)s"
+msgstr "<a href='%(gravatar_faq_url)s'>gravatar</a>"
 
-#: templates/user_edit.html:36 templates/user_info.html:31
+#: templates/user_edit.html:36 templates/user_info.html:56
 msgid "Registered user"
 msgstr ""
 
-#: templates/user_edit.html:82
+#: templates/user_edit.html:82 templates/user_email_subscriptions.html:17
 msgid "Update"
 msgstr ""
 
-#: templates/user_info.html:34
+#: templates/user_email_subscriptions.html:8
+msgid "Email subscription settings"
+msgstr ""
+
+#: templates/user_email_subscriptions.html:9
+msgid "email subscription settings info"
+msgstr ""
+"<span class='big strong'>Adjust frequency of email updates.</span> Receive "
+"updates on interesting questions by email, <strong><br/>help the community</"
+"strong> by answering questions of your colleagues. If you do not wish to "
+"receive emails - select 'no email' on all items below.<br/>Updates are only "
+"sent when there is any new activity on selected items."
+
+#: templates/user_email_subscriptions.html:18
+msgid "Stop sending email"
+msgstr "Stop Email"
+
+#: templates/user_info.html:32
+msgid "Moderate this user"
+msgstr ""
+
+#: templates/user_info.html:45
 msgid "update profile"
 msgstr ""
 
-#: templates/user_info.html:40
+#: templates/user_info.html:60
 msgid "real name"
 msgstr ""
 
-#: templates/user_info.html:45
+#: templates/user_info.html:65
 msgid "member for"
-msgstr ""
+msgstr "member since"
 
-#: templates/user_info.html:50
+#: templates/user_info.html:70
 msgid "last seen"
 msgstr ""
 
-#: templates/user_info.html:56
+#: templates/user_info.html:76
 msgid "user website"
 msgstr ""
 
-#: templates/user_info.html:62
+#: templates/user_info.html:82
 msgid "location"
 msgstr ""
 
-#: templates/user_info.html:69
+#: templates/user_info.html:89
 msgid "age"
 msgstr ""
 
-#: templates/user_info.html:70
+#: templates/user_info.html:90
 msgid "age unit"
 msgstr "years old"
 
-#: templates/user_info.html:76
+#: templates/user_info.html:96
 msgid "todays unused votes"
 msgstr ""
 
-#: templates/user_info.html:77
+#: templates/user_info.html:97
 msgid "votes left"
 msgstr ""
 
-#: templates/user_preferences.html:10
-msgid "Connect with Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:13
-msgid "Twitter account name:"
-msgstr ""
-
-#: templates/user_preferences.html:15
-msgid "Twitter password:"
-msgstr ""
-
-#: templates/user_preferences.html:17
-msgid "Send my Questions to Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:18
-msgid "Send my Answers to Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:19
-msgid "Save"
-msgstr ""
+#: templates/user_stats.html:12
+#, python-format
+msgid ""
+"\n"
+"                <span class=\"count\">1</span> Question\n"
+"                "
+msgid_plural ""
+"\n"
+"                <span class=\"count\">%(counter)s</span> Questions\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:10
-msgid "User questions"
-msgstr ""
+#: templates/user_stats.html:23
+#, python-format
+msgid ""
+"\n"
+"                <span class=\"count\">1</span> Answer\n"
+"                "
+msgid_plural ""
+"\n"
+"                <span class=\"count\">%(counter)s</span> Answers\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:36
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:36
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:28
+#: templates/user_stats.html:46
 #, python-format
-msgid "the answer has been commented %(comment_count)s times"
-msgstr ""
+msgid ""
+"\n"
+"                    (one comment)\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    the answer has been commented %(comment_count)s times\n"
+"                    "
+msgstr[0] ""
+"\n"
+"(one comment)"
+msgstr[1] ""
+"\n"
+"(%(comment_count)s comments)"
 
-#: templates/user_stats.html:36
-msgid "Votes"
-msgstr ""
+#: templates/user_stats.html:61
+#, python-format
+msgid ""
+"\n"
+"                    <span class=\"count\">1</span> Vote\n"
+"                "
+msgid_plural ""
+"\n"
+"                    <span class=\"count\">%(cnt)s</span> Votes\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:41
+#: templates/user_stats.html:72
 msgid "thumb up"
 msgstr ""
 
-#: templates/user_stats.html:42
+#: templates/user_stats.html:73
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:46
+#: templates/user_stats.html:77
 msgid "thumb down"
 msgstr ""
 
-#: templates/user_stats.html:47
+#: templates/user_stats.html:78
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:54
-msgid "Tags"
-msgstr ""
+#: templates/user_stats.html:87
+#, python-format
+msgid ""
+"\n"
+"                    <span class=\"count\">1</span> Tag\n"
+"                "
+msgid_plural ""
+"\n"
+"                    <span class=\"count\">%(counter)s</span> Tags\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:61
+#: templates/user_stats.html:100
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
 
+#: templates/user_stats.html:114
+#, python-format
+msgid ""
+"\n"
+"            <span class=\"count\">1</span> Badge\n"
+"            "
+msgid_plural ""
+"\n"
+"            <span class=\"count\">%(counter)s</span> Badges\n"
+"            "
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/user_tabs.html:7
 msgid "User profile"
 msgstr ""
 
 #: templates/user_tabs.html:16
 msgid "graph of user reputation"
-msgstr ""
+msgstr "Graph of user karma"
 
 #: templates/user_tabs.html:17
 msgid "reputation history"
-msgstr ""
+msgstr "karma history"
 
 #: templates/user_tabs.html:23
 msgid "questions that user selected as his/her favorite"
@@ -2161,10 +2698,6 @@ msgstr ""
 msgid "favorites"
 msgstr ""
 
-#: templates/user_tabs.html:28
-msgid "settings"
-msgstr ""
-
 #: templates/users.html:6 templates/users.html.py:24
 msgid "Users"
 msgstr ""
@@ -2202,16 +2735,21 @@ msgstr ""
 msgid "thumb-up off"
 msgstr ""
 
-#: templates/users_questions.html:35
+#: templates/users_questions.html:34
 msgid "this answer has been accepted to be correct"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:7
-#: templates/authopenid/changeemail.html:33
+#: templates/authopenid/changeemail.html:3
+#: templates/authopenid/changeemail.html:9
+#: templates/authopenid/changeemail.html:38
 msgid "Change email"
 msgstr "Change Email"
 
-#: templates/authopenid/changeemail.html:10
+#: templates/authopenid/changeemail.html:11
+msgid "Save your email address"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:16
 #, python-format
 msgid "change %(email)s info"
 msgstr ""
@@ -2219,57 +2757,66 @@ msgstr ""
 "you'd like to use another email for <strong>update subscriptions</strong>."
 "<br>Currently you are using <strong>%(email)s</strong>"
 
-#: templates/authopenid/changeemail.html:13
-#: templates/authopenid/changeopenid.html:14
-#: templates/authopenid/changepw.html:19 templates/authopenid/delete.html:15
-#: templates/authopenid/delete.html:25
-msgid "Please correct errors below:"
+#: templates/authopenid/changeemail.html:18
+#, python-format
+msgid "here is why email is required, see %(gravatar_faq_url)s"
 msgstr ""
+"<span class='strong big'>Please enter your email address in the box below.</"
+"span> Valid email address is required on this Q&amp;"
+"A forum. If you like, you can <strong>receive updates</strong> on "
+"interesting questions or entire forum via email. Also, your email is used to "
+"create a unique <a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a> "
+"image for your account. Email addresses are never shown or otherwise shared "
+"with anybody else."
 
-#: templates/authopenid/changeemail.html:30
+#: templates/authopenid/changeemail.html:31
 msgid "Your new Email"
 msgstr ""
 "<strong>Your new Email:</strong> (will <strong>not</strong> be shown to "
 "anyone, must be valid)"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:154
-msgid "Password"
+msgid "Your Email"
 msgstr ""
+"<strong>Your Email</strong> (<i>must be valid, never shown to others</i>)"
 
-#: templates/authopenid/changeemail.html:42
+#: templates/authopenid/changeemail.html:38
+msgid "Save Email"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:49
 msgid "Validate email"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:45
+#: templates/authopenid/changeemail.html:52
 #, python-format
-msgid "validate %(email)s info"
+msgid "validate %(email)s info or go to %(change_email_url)s"
 msgstr ""
 "<span class=\"strong big\">An email with a validation link has been sent to %"
 "(email)s.</span> Please <strong>follow the emailed link</strong> with your "
 "web browser. Email validation is necessary to help insure the proper use of "
-"email on <span class=\"orange\">Q&amp;A</span> forum. If you would like "
-"to use <strong>another email</strong>, please <a href=\"/email/change/"
-"\"><strong>change it again</strong></a>."
+"email on <span class=\"orange\">Q&amp;A</span>. If you would like "
+"to use <strong>another email</strong>, please <a href='%(change_email_url)"
+"s'><strong>change it again</strong></a>."
 
-#: templates/authopenid/changeemail.html:50
+#: templates/authopenid/changeemail.html:57
 msgid "Email not changed"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:53
+#: templates/authopenid/changeemail.html:60
 #, python-format
-msgid "old %(email)s kept"
+msgid "old %(email)s kept, if you like go to %(change_email_url)s"
 msgstr ""
 "<span class=\"strong big\">Your email address %(email)s has not been changed."
 "</span> If you decide to change it later - you can always do it by editing "
-"it in your user profile or by using the <a href=\"/email/change/"
-"\"><strong>previous form</strong></a> again."
+"it in your user profile or by using the <a href='%(change_email_url)"
+"s'><strong>previous form</strong></a> again."
 
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:65
 msgid "Email changed"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:68
 #, python-format
 msgid "your current %(email)s can be used for this"
 msgstr ""
@@ -2278,11 +2825,11 @@ msgstr ""
 "Email notifications are sent once a day or less frequently - only when there "
 "are any news."
 
-#: templates/authopenid/changeemail.html:66
+#: templates/authopenid/changeemail.html:73
 msgid "Email verified"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:69
+#: templates/authopenid/changeemail.html:76
 msgid "thanks for verifying email"
 msgstr ""
 "<span class=\"big strong\">Thank you for verifying your email!</span> Now "
@@ -2291,11 +2838,11 @@ msgstr ""
 "updates</strong> - then will be notified about changes <strong>once a day</"
 "strong> or less frequently."
 
-#: templates/authopenid/changeemail.html:74
+#: templates/authopenid/changeemail.html:81
 msgid "email key not sent"
 msgstr "Validation email not sent"
 
-#: templates/authopenid/changeemail.html:77
+#: templates/authopenid/changeemail.html:84
 #, python-format
 msgid "email key not sent %(email)s change email here %(change_link)s"
 msgstr ""
@@ -2303,6 +2850,12 @@ msgstr ""
 "validated before</span> so the new key was not sent. You can <a href='%"
 "(change_link)s'>change</a> email used for update subscriptions if necessary."
 
+#: templates/authopenid/changeopenid.html:4
+#: templates/authopenid/changeopenid.html:30
+#: templates/authopenid/settings.html:34
+msgid "Change OpenID"
+msgstr ""
+
 #: templates/authopenid/changeopenid.html:8
 msgid "Account: change OpenID URL"
 msgstr ""
@@ -2312,97 +2865,129 @@ msgid ""
 "This is where you can change your OpenID URL. Make sure you remember it!"
 msgstr ""
 
+#: templates/authopenid/changeopenid.html:14
+#: templates/authopenid/delete.html:14 templates/authopenid/delete.html:24
+msgid "Please correct errors below:"
+msgstr ""
+
 #: templates/authopenid/changeopenid.html:29
 msgid "OpenID URL:"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:30
-msgid "Change OpenID"
+#: templates/authopenid/changepw.html:5 templates/authopenid/changepw.html:14
+#: templates/authopenid/settings.html:29
+msgid "Change password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:14
+#: templates/authopenid/changepw.html:7
 msgid "Account: change password"
-msgstr ""
+msgstr "Change your password"
 
-#: templates/authopenid/changepw.html:17
+#: templates/authopenid/changepw.html:8
 msgid "This is where you can change your password. Make sure you remember it!"
 msgstr ""
+"<span class='strong'>To change your password</span> please fill out and "
+"submit this form"
 
-#: templates/authopenid/changepw.html:27
-msgid "Current password"
-msgstr ""
-
-#: templates/authopenid/changepw.html:28
-msgid "New password"
-msgstr ""
-
-#: templates/authopenid/changepw.html:29
-msgid "New password again"
-msgstr ""
-
-#: templates/authopenid/changepw.html:30 templates/authopenid/settings.html:29
-msgid "Change password"
-msgstr ""
-
-#: templates/authopenid/complete.html:5
+#: templates/authopenid/complete.html:19
 msgid "Connect your OpenID with this site"
 msgstr "New user signup"
 
-#: templates/authopenid/complete.html:8
+#: templates/authopenid/complete.html:22
 msgid "Connect your OpenID with your account on this site"
 msgstr "New user signup"
 
-#: templates/authopenid/complete.html:12
+#: templates/authopenid/complete.html:27
 #, python-format
-msgid "register new %(provider)s account info"
+msgid "register new %(provider)s account info, see %(gravatar_faq_url)s"
 msgstr ""
 "<p><span class=\"big strong\">You are here for the first time with your %"
 "(provider)s login.</span> Please create your <strong>screen name</strong> "
 "and save your <strong>email</strong> address. Saved email address will let "
 "you <strong>subscribe for the updates</strong> on the most interesting "
 "questions and will be used to create and retrieve your unique avatar image - "
-"<a href='/faq#gravatar'><strong>gravatar</strong></a>."
+"<a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>"
 
-#: templates/authopenid/complete.html:14
+#: templates/authopenid/complete.html:31
+#, python-format
+msgid ""
+"%(username)s already exists, choose another name for \n"
+"                            %(provider)s. Email is required too, see %"
+"(gravatar_faq_url)s\n"
+"                        "
+msgstr ""
+"<p><span class='strong big'>Oops... looks like screen name %(username)s is "
+"already used in another account.</span></p><p>Please choose another screen name "
+"to use with your %(provider)s login. Also, a valid email address is "
+"required on the <span class='orange'>Q&amp;A</span> forum. Your "
+"email is used to create a unique <a href='%(gravatar_faq_url)"
+"s'><strong>gravatar</strong></a> image for your account. If you like, "
+"you can <strong>receive updates</strong> on the interesting questions or "
+"entire forum by email. Email addresses are never shown or otherwise shared "
+"with anybody else.</p>"
+
+#: templates/authopenid/complete.html:35
+#, python-format
+msgid ""
+"register new external %(provider)s account info, see %(gravatar_faq_url)s"
+msgstr ""
+"<p><span class=\"big strong\">You are here for the first time with your %"
+"(provider)s login.</span></p><p>You can either keep your <strong>screen "
+"name</strong> the same as your %(provider)s login name  or choose some other "
+"nickname.</p><p>Also, please save a valid <strong>email</strong> address. "
+"With the email you can <strong>subscribe for the updates</strong> on the "
+"most interesting questions. Email address is also used to create and "
+"retrieve your unique avatar image - <a href='%(gravatar_faq_url)"
+"s'><strong>gravatar</strong></a>.</p>"
+
+#: templates/authopenid/complete.html:40
 msgid "This account already exists, please use another."
 msgstr ""
 
-#: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/signin.html:138
+#: templates/authopenid/complete.html:55
 msgid "Sorry, looks like we have some errors:"
 msgstr ""
 
-#: templates/authopenid/complete.html:47
+#: templates/authopenid/complete.html:76
 msgid "Screen name label"
 msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)"
 
-#: templates/authopenid/complete.html:48
+#: templates/authopenid/complete.html:83
 msgid "Email address label"
 msgstr ""
 "<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with "
 "anyone, must be valid</i>)"
 
-#: templates/authopenid/complete.html:49
+#: templates/authopenid/complete.html:89 templates/authopenid/signup.html:15
+msgid "receive updates motivational blurb"
+msgstr ""
+"<strong>Receive forum updates by email</strong> - this will help our "
+"community grow and become more useful.<br/>By default "
+"<span class='orange'>Q&amp;A</span> forum sends up to <strong>one "
+"email digest per week</strong>  - only when there is anything new.<br/>If "
+"you like, please adjust this now or any time later from your user account."
+
+#: templates/authopenid/complete.html:91
 msgid "create account"
 msgstr "Signup"
 
-#: templates/authopenid/complete.html:56
+#: templates/authopenid/complete.html:100
 msgid "Existing account"
 msgstr ""
 
-#: templates/authopenid/complete.html:57
+#: templates/authopenid/complete.html:101
 msgid "user name"
 msgstr ""
 
-#: templates/authopenid/complete.html:58 templates/authopenid/signin.html:128
+#: templates/authopenid/complete.html:102
 msgid "password"
 msgstr ""
 
-#: templates/authopenid/complete.html:61
+#: templates/authopenid/complete.html:107
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:156
+#: templates/authopenid/complete.html:108 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr ""
 
@@ -2415,12 +3000,11 @@ msgid "Your account details are:"
 msgstr ""
 
 #: templates/authopenid/confirm_email.txt:6
-#: templates/authopenid/sendpw_email.txt:7
 msgid "Username:"
 msgstr ""
 
 #: templates/authopenid/confirm_email.txt:7
-#: templates/authopenid/delete.html:20
+#: templates/authopenid/delete.html:19
 msgid "Password:"
 msgstr ""
 
@@ -2430,45 +3014,51 @@ msgstr ""
 
 #: templates/authopenid/confirm_email.txt:12
 #: templates/authopenid/email_validation.txt:14
-#: templates/authopenid/sendpw_email.txt:13
+#: templates/authopenid/sendpw_email.txt:8
 msgid ""
 "Sincerely,\n"
 "Forum Administrator"
 msgstr ""
+"Sincerely,\n"
+"Q&A Forum Administrator"
+
+#: templates/authopenid/delete.html:4 templates/authopenid/settings.html:38
+msgid "Delete account"
+msgstr ""
 
-#: templates/authopenid/delete.html:9
+#: templates/authopenid/delete.html:8
 msgid "Account: delete account"
 msgstr ""
 
-#: templates/authopenid/delete.html:13
+#: templates/authopenid/delete.html:12
 msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
 msgstr ""
 
-#: templates/authopenid/delete.html:17
+#: templates/authopenid/delete.html:16
 msgid "Check confirm box, if you want delete your account."
 msgstr ""
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:31
 msgid "I am sure I want to delete my account."
 msgstr ""
 
-#: templates/authopenid/delete.html:33
+#: templates/authopenid/delete.html:32
 msgid "Password/OpenID URL"
 msgstr ""
 
-#: templates/authopenid/delete.html:33
+#: templates/authopenid/delete.html:32
 msgid "(required for your security)"
 msgstr ""
 
-#: templates/authopenid/delete.html:35
+#: templates/authopenid/delete.html:34
 msgid "Delete account permanently"
 msgstr ""
 
 #: templates/authopenid/email_validation.txt:2
 msgid "Greetings from the Q&A forum"
-msgstr "Greetings from the Q&amp;A forum"
+msgstr ""
 
 #: templates/authopenid/email_validation.txt:4
 msgid "To make use of the Forum, please follow the link below:"
@@ -2485,38 +3075,33 @@ msgid ""
 "for any inconvenience"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
-msgid "Send new password"
-msgstr ""
-
-#: templates/authopenid/sendpw.html:12
-msgid "Lost your password? No problem - here you can reset it."
+#: templates/authopenid/external_legacy_login_info.html:4
+#: templates/authopenid/external_legacy_login_info.html:7
+msgid "Traditional login information"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:13
-msgid ""
-"Please enter your username below and new password will be sent to your "
-"registered e-mail"
-msgstr ""
+#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:7
+msgid "Send new password"
+msgstr "Recover password"
 
-#: templates/authopenid/sendpw.html:28
-msgid "User name"
+#: templates/authopenid/sendpw.html:10
+msgid "password recovery information"
 msgstr ""
+"<span class='big strong'>Forgot you password? No problems - just get a new "
+"one!</span><br/>Please follow the following steps:<br/>&bull; submit your "
+"user name below and check your email<br/>&bull; <strong>follow the "
+"activation link</strong> for the new password - sent to you by email and "
+"login with the suggested password<br/>&bull; at this you might want to "
+"change your password to something you can remember better"
 
-#: templates/authopenid/sendpw.html:30
+#: templates/authopenid/sendpw.html:21
 msgid "Reset password"
-msgstr ""
+msgstr "Send me a new password"
 
-#: templates/authopenid/sendpw.html:30
+#: templates/authopenid/sendpw.html:22
 msgid "return to login"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:33
-msgid ""
-"Note: your new password will be activated only after you click the "
-"activation link in the email message"
-msgstr ""
-
 #: templates/authopenid/sendpw_email.txt:2
 #, python-format
 msgid ""
@@ -2525,15 +3110,18 @@ msgid ""
 msgstr ""
 
 #: templates/authopenid/sendpw_email.txt:5
-msgid "Your new account details are:"
-msgstr ""
-
-#: templates/authopenid/sendpw_email.txt:8
-msgid "New password:"
+#, python-format
+msgid ""
+"email explanation how to use new %(password)s for %(username)s\n"
+"with the %(key_link)s"
 msgstr ""
+"To change your password, please follow these steps:\n"
+"* visit this link: %(key_link)s\n"
+"* login with user name %(username)s and password %(password)s\n"
+"* go to your user profile and set the password to something you can remember"
 
-#: templates/authopenid/sendpw_email.txt:10
-msgid "To confirm that you wanted to reset your password please visit:"
+#: templates/authopenid/settings.html:4
+msgid "Account functions"
 msgstr ""
 
 #: templates/authopenid/settings.html:30
@@ -2552,15 +3140,11 @@ msgstr ""
 msgid "Change openid associated to your account"
 msgstr ""
 
-#: templates/authopenid/settings.html:38
-msgid "Delete account"
-msgstr ""
-
 #: templates/authopenid/settings.html:39
 msgid "Erase your username and all your data from website"
 msgstr ""
 
-#: templates/authopenid/signin.html:4 templates/authopenid/signin.html:21
+#: templates/authopenid/signin.html:5 templates/authopenid/signin.html:21
 msgid "User login"
 msgstr "User login"
 
@@ -2588,148 +3172,105 @@ msgstr ""
 "strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
 "posted once you log in.</span>"
 
-#: templates/authopenid/signin.html:40
+#: templates/authopenid/signin.html:42
 msgid "Click to sign in through any of these services."
 msgstr ""
-"<p><span class=\"big strong\">Please select your favorite login method below.</span>"
-"</p><p><font color=\"gray\">External login services use <a "
-"href=\"http://openid.net\"><b>OpenID</b></a> technology that increases "
-"security of your online identity and makes login process simpler. First option "
-"requires login name and password.</font></p>"
+"<p><span class=\"big strong\">Please select your favorite login method below."
+"</span></p><p><font color=\"gray\">External login services use <a href="
+"\"http://openid.net\"><b>OpenID</b></a> technology, where your password "
+"always stays confidential between you and your login provider and you don't "
+"have to remember another one. CNPROG option requires your login name and "
+"password entered here.</font></p>"
 
-#: templates/authopenid/signin.html:113
+#: templates/authopenid/signin.html:117
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
 msgstr ""
-"<span class=\"big strong\">Enter your <span id=\"enter_your_what\">Provider "
-"user name</span></span><br><span class='grey'>(or select another login method above)</span>"
+"<span class=\"big strong\">Enter your </span><span id=\"enter_your_what\" "
+"class='big strong'>Provider user name</span><br/><span class='grey'>(or "
+"select another login method above)</span>"
 
-#: templates/authopenid/signin.html:120
+#: templates/authopenid/signin.html:124
 msgid ""
 "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
 "web address"
 msgstr ""
 "<span class=\"big strong\">Enter your <a class=\"openid_logo\" href=\"http://"
-"openid.net\">OpenID</a> web address</span><br><span class='grey'>(or choose another login "
-"method above)</span>"
+"openid.net\">OpenID</a> web address</span><br/><span class='grey'>(or choose "
+"another login method above)</span>"
 
-#: templates/authopenid/signin.html:122 templates/authopenid/signin.html:130
-#: templates/authopenid/signin.html:155
+#: templates/authopenid/signin.html:126 templates/authopenid/signin.html:138
 msgid "Login"
 msgstr ""
 
-#: templates/authopenid/signin.html:125
+#: templates/authopenid/signin.html:129
 msgid "Enter your login name and password"
 msgstr ""
-"<span class='big strong'>Enter your forum login and password</span><br/>"
-"<span class='grey'>(or select your OpenID provider above)</span>"
-
-#: templates/authopenid/signin.html:126
-msgid "login name"
-msgstr ""
-
-#: templates/authopenid/signin.html:134
-msgid "we support two login modes"
-msgstr ""
-"You can log in either through one of these services or traditionally - using "
-"local username/password."
+"<span class='big strong'>Enter your CNPROG login and password</span><br/"
+"><span class='grey'>(or select your OpenID provider above)</span>"
 
-#: templates/authopenid/signin.html:152
-msgid "Use login name and password"
+#: templates/authopenid/signin.html:133
+msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:153
-msgid "Login name"
+#: templates/authopenid/signin.html:135
+msgid "Password"
 msgstr ""
 
-#: templates/authopenid/signin.html:157
-msgid "Create new account"
+#: templates/authopenid/signin.html:139
+msgid "Create account"
 msgstr ""
 
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:149
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:169
+#: templates/authopenid/signin.html:152
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:172
+#: templates/authopenid/signin.html:155
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:175
+#: templates/authopenid/signin.html:158
 msgid "openid is widely adopted"
 msgstr ""
 "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
 "enabled."
 
-#: templates/authopenid/signin.html:178
+#: templates/authopenid/signin.html:161
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:183
+#: templates/authopenid/signin.html:166
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:184
+#: templates/authopenid/signin.html:167
 msgid "Get OpenID"
 msgstr ""
 
-#: templates/authopenid/signup.html:4 templates/authopenid/signup.html.py:8
+#: templates/authopenid/signup.html:4
 msgid "Signup"
 msgstr ""
 
-#: templates/authopenid/signup.html:12
-msgid ""
-"We support two types of user registration: conventional username/password, "
-"and"
+#: templates/authopenid/signup.html:8
+msgid "Create login name and password"
 msgstr ""
 
-#: templates/authopenid/signup.html:12
-msgid "the OpenID method"
+#: templates/authopenid/signup.html:10
+msgid "Traditional signup info"
 msgstr ""
+"<span class='strong big'>If you prefer, create your forum login name and "
+"password here. However</span>, please keep in mind that we also support "
+"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can "
+"simply reuse your external login (e.g. Gmail or AOL) without ever sharing "
+"your login details with anyone and having to remember yet another password."
 
 #: templates/authopenid/signup.html:17
-msgid "Sorry, looks like we have some errors"
-msgstr ""
-
-#: templates/authopenid/signup.html:35
-msgid "Conventional registration"
-msgstr ""
-
-#: templates/authopenid/signup.html:36
-msgid "choose a user name"
-msgstr ""
-
-#: templates/authopenid/signup.html:42
-msgid "back to login"
+msgid "Create Account"
 msgstr ""
 
-#: templates/authopenid/signup.html:46
-msgid "Register with your OpenID"
+#: templates/authopenid/signup.html:19
+msgid "return to OpenID login"
 msgstr ""
-
-#: templates/authopenid/signup.html:49
-msgid "Login with your OpenID"
-msgstr ""
-
-#
-#~ msgid "editing tips"
-#~ msgstr "Tips"
-
-#~ msgid "Newest questions shown first."
-#~ msgstr ""
-#~ "Questions are sorted by <strong>entry date</strong>.Newest questions "
-#~ "shown first."
-
-#~ msgid ""
-#~ "please use space to separate tags (this enables autocomplete feature)"
-#~ msgstr "please use space to separate tags (uses autocomplete utility)"
-
-#~ msgid "select openid provider"
-#~ msgstr "1) Please select your id service provider."
-
-#~ msgid "verify openid link and login"
-#~ msgstr ""
-#~ "2) Please verify the OpenID URL (type your login name over {username}, if "
-#~ "present) and then log in."
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 91639ba1..fc7ebe14 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index d7655dd7..b528fcf2 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,21 +2,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-17 16:44+0000\n"
-"PO-Revision-Date: 2009-08-17 10:04-0600\n"
+"POT-Creation-Date: 2009-08-12 15:53+0000\n"
+"PO-Revision-Date: \n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:310 forum/views.py:705
+#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698
 msgid "account/"
 msgstr "cuenta/"
 
 #: settings.py:12 urls.py:26 django_authopenid/urls.py:9
 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11
-#: django_authopenid/urls.py:13 forum/views.py:310 forum/views.py:706
+#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699
+#: templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -24,132 +25,127 @@ msgstr "ingresar/"
 msgid "upfiles/"
 msgstr "archivossubidos/"
 
-#: urls.py:27 django_authopenid/urls.py:16
-msgid "signup/"
-msgstr "registrarse/"
-
-#: urls.py:28 urls.py:29 urls.py:30 django_authopenid/urls.py:26
+#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26
 #: django_authopenid/urls.py:27
 msgid "email/"
 msgstr "email/"
 
-#: urls.py:28
+#: urls.py:27
 msgid "change/"
 msgstr "cambiar/"
 
-#: urls.py:29
+#: urls.py:28
 msgid "sendkey/"
 msgstr "enviarclave/"
 
-#: urls.py:30
+#: urls.py:29
 msgid "verify/"
 msgstr "verificar/"
 
-#: urls.py:31
+#: urls.py:30
 msgid "about/"
 msgstr "acercadenosotros/"
 
-#: urls.py:32
+#: urls.py:31
 msgid "faq/"
 msgstr "preguntasfrecuentes/"
 
-#: urls.py:33
+#: urls.py:32
 msgid "privacy/"
 msgstr "códigodeprivacidad/"
 
-#: urls.py:34
+#: urls.py:33
 msgid "logout/"
 msgstr "cerrarsesion/"
 
-#: urls.py:35 urls.py:36 urls.py:37 urls.py:49 forum/models.py:425
+#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
 msgid "answers/"
 msgstr "respuestas/"
 
-#: urls.py:35 urls.py:47
+#: urls.py:34 urls.py:46
 msgid "comments/"
 msgstr "comentarios/"
 
-#: urls.py:36 urls.py:41 urls.py:55 templates/user_info.html:34
+#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
 msgid "edit/"
 msgstr "editar/"
 
-#: urls.py:37 urls.py:46
+#: urls.py:36 urls.py:45
 msgid "revisions/"
 msgstr "revisiones/"
 
-#: urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 urls.py:43
-#: urls.py:44 urls.py:45 urls.py:46 urls.py:47 urls.py:48 forum/feed.py:19
-#: forum/models.py:313 forum/views.py:1232 forum/views.py:1234
-#: forum/views.py:1474
+#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
+#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
+#: forum/models.py:306 forum/views.py:1416
 msgid "questions/"
 msgstr "preguntas/"
 
-#: urls.py:39 urls.py:65
+#: urls.py:38 urls.py:64
 msgid "ask/"
 msgstr "preguntar/"
 
-#: urls.py:40
+#: urls.py:39
 msgid "unanswered/"
 msgstr "sinrespuesta/"
 
-#: urls.py:42
+#: urls.py:41
 msgid "close/"
 msgstr "cerrar/"
 
-#: urls.py:43
+#: urls.py:42
 msgid "reopen/"
 msgstr "reabrir/"
 
-#: urls.py:44
+#: urls.py:43
 msgid "answer/"
 msgstr "respuesta/"
 
-#: urls.py:45
+#: urls.py:44
 msgid "vote/"
 msgstr "votar/"
 
-#: urls.py:48 urls.py:49 django_authopenid/urls.py:29
+#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
 msgid "delete/"
 msgstr "borrar/"
 
-#: urls.py:51
+#: urls.py:50
 msgid "question/"
 msgstr "pregunta/"
 
-#: urls.py:52 urls.py:53 forum/views.py:747 forum/views.py:2071
+#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
 msgid "tags/"
 msgstr "etiquetas/"
 
-#: urls.py:54 urls.py:55 urls.py:56 forum/views.py:1034 forum/views.py:1038
-#: forum/views.py:1476 forum/views.py:1809 forum/views.py:2073
+#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997
+#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015
 msgid "users/"
 msgstr "usuarios/"
 
-#: urls.py:57 urls.py:58
+#: urls.py:56 urls.py:57
 msgid "badges/"
 msgstr "distinciones/"
 
-#: urls.py:59
+#: urls.py:58
 msgid "messages/"
 msgstr "mensajes/"
 
-#: urls.py:59
+#: urls.py:58
 msgid "markread/"
 msgstr "marcarleido/"
 
-#: urls.py:61
+#: urls.py:60
 msgid "nimda/"
 msgstr "administrador/"
 
-#: urls.py:63
+#: urls.py:62
 msgid "upload/"
 msgstr "subir/"
 
-#: urls.py:64 urls.py:65 urls.py:66
+#: urls.py:63 urls.py:64 urls.py:65
 msgid "books/"
 msgstr "libros/"
 
-#: urls.py:67
+#: urls.py:66
 msgid "search/"
 msgstr "buscar/"
 
@@ -244,7 +240,7 @@ msgstr "la nueva contraseña no coincide"
 msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
-#: django_authopenid/urls.py:10 forum/views.py:310 forum/views.py:706
+#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699
 msgid "newquestion/"
 msgstr "nuevapregunta/"
 
@@ -264,19 +260,14 @@ msgstr "completado/"
 msgid "register/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:19
+#: django_authopenid/urls.py:16
+msgid "signup/"
+msgstr "registrarse/"
+
+#: django_authopenid/urls.py:18
 msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
-#: django_authopenid/urls.py:20
-#, fuzzy
-msgid "password/"
-msgstr "contraseña"
-
-#: django_authopenid/urls.py:20
-msgid "confirm/"
-msgstr ""
-
 #: django_authopenid/urls.py:27
 msgid "validate/"
 msgstr ""
@@ -532,8 +523,8 @@ msgstr ""
 "por favor use solo los siguientes caracteres en los nombres de etiquetas: "
 "letras 'a-z', números y caracteres '.-_#'"
 
-#: forum/forms.py:75 templates/index.html:57 templates/question.html:210
-#: templates/question.html.py:396 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:209
+#: templates/question.html.py:395 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
 #: templates/unanswered.html.py:60
 msgid "community wiki"
@@ -559,84 +550,75 @@ msgstr ""
 "ingresa un breve resumen de tu revisión (ej. error ortográfico, gramática, "
 "mejoras de estilo. Este campo es opcional."
 
-#: forum/forms.py:98 forum/forms.py:159
-msgid "please choice a category"
-msgstr "por favor escoja una categoría"
-
-#: forum/forms.py:99 forum/forms.py:160
-msgid "Category"
-msgstr "Categoría"
-
-#: forum/forms.py:180
+#: forum/forms.py:175
 msgid "this email does not have to be linked to gravatar"
 msgstr "este email no tiene porque estar asociado a un Gravatar"
 
-#: forum/forms.py:181
+#: forum/forms.py:176
 msgid "Real name"
 msgstr "Nombre real"
 
-#: forum/forms.py:182
+#: forum/forms.py:177
 msgid "Website"
 msgstr "Sitio Web"
 
-#: forum/forms.py:183
+#: forum/forms.py:178
 msgid "Location"
 msgstr "Ubicación"
 
-#: forum/forms.py:184
+#: forum/forms.py:179
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: forum/forms.py:184
+#: forum/forms.py:179
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD"
 
-#: forum/forms.py:185 templates/authopenid/settings.html:21
+#: forum/forms.py:180 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr "Perfil"
 
-#: forum/forms.py:212 forum/forms.py:213
+#: forum/forms.py:207 forum/forms.py:208
 msgid "this email has already been registered, please use another one"
 msgstr "este email ya ha sido registrado, por favor use otro"
 
-#: forum/models.py:253
-#, python-format
+#: forum/models.py:246
 msgid "%(author)s modified the question"
 msgstr "%(author)s modificó la pregunta"
 
-#: forum/models.py:257
+#: forum/models.py:250
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr "%(people)s publicaron %(new_answer_count)s nuevas respuestas"
 
-#: forum/models.py:262
+#: forum/models.py:255
 #, python-format
 msgid "%(people)s commented the question"
 msgstr "%(people)s comentarion la pregunta"
 
-#: forum/models.py:267
+#: forum/models.py:260
 #, python-format
 msgid "%(people)s commented answers"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:269
+#: forum/models.py:262
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:313 forum/models.py:425
+#: forum/models.py:306 forum/models.py:418
 msgid "revisions"
 msgstr "revisiones/"
 
-#: forum/models.py:448 templates/badges.html:51
+#: forum/models.py:441 templates/badges.html:51
 msgid "gold"
 msgstr "oro"
 
-#: forum/models.py:449 templates/badges.html:59
+#: forum/models.py:442 templates/badges.html:59
 msgid "silver"
 msgstr "plata"
 
-#: forum/models.py:450 templates/badges.html:66
+#: forum/models.py:443 templates/badges.html:66
 msgid "bronze"
 msgstr "bronce"
 
@@ -724,27 +706,27 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:988
+#: forum/views.py:947
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr "subscripción guardada, %(email)s necesita validación"
 
-#: forum/views.py:1918
+#: forum/views.py:1860
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr "para subir imagenes debes tener más de 60 puntos de reputación"
 
-#: forum/views.py:1920
+#: forum/views.py:1862
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', "
 "'tiff'"
 
-#: forum/views.py:1922
+#: forum/views.py:1864
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1924
+#: forum/views.py:1866
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -868,22 +850,22 @@ msgid "select revision"
 msgstr "seleccionar revisión"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:468 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "Toggle the real time Markdown editor preview"
 msgstr "Activar la visualización en tiempo real de Markdown"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:468 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr "Activar previsualización"
 
-#: templates/answer_edit.html:71 templates/question_edit.html:121
+#: templates/answer_edit.html:71 templates/question_edit.html:115
 #: templates/question_retag.html:73
 msgid "Save edit"
 msgstr "Guardar la edición"
 
 #: templates/answer_edit.html:72 templates/close.html:29
-#: templates/question_edit.html:122 templates/question_retag.html:74
+#: templates/question_edit.html:116 templates/question_retag.html:74
 #: templates/reopen.html:30 templates/user_edit.html:83
 #: templates/authopenid/changeemail.html:34
 msgid "Cancel"
@@ -974,16 +956,15 @@ msgstr ""
 "a>. <br/> Puedes enviar tu pregunta ahora y validar tu email luego. Tu "
 "pregunta será guardada mientras tanto y publicada cuando valides tu email."
 
-#: templates/ask.html:107 templates/ask.html.py:114
-#: templates/question_edit.html:117
+#: templates/ask.html:107
 msgid "(required)"
 msgstr "(requerido)"
 
-#: templates/ask.html:121
+#: templates/ask.html:114
 msgid "Login/signup to post your question"
 msgstr "Iniciar sesión/registrarse para publicar su pregunta"
 
-#: templates/ask.html:123
+#: templates/ask.html:116
 msgid "Ask your question"
 msgstr "Haz tu pregunta"
 
@@ -999,7 +980,7 @@ msgstr "Usuarios han sido galardonados con distinciones:"
 msgid "Badges summary"
 msgstr "Resumen de distinciones"
 
-#: templates/badges.html:17 templates/user_stats.html:73
+#: templates/badges.html:17 templates/user_stats.html:115
 msgid "Badges"
 msgstr "Distinciones"
 
@@ -1100,17 +1081,17 @@ msgid "ask the author"
 msgstr "preguntar al autor"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:18
+#: templates/users_questions.html:17
 msgid "this question was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:11 templates/users_questions.html.py:18
+#: templates/users_questions.html:11 templates/users_questions.html.py:17
 msgid "number of times"
 msgstr "numero de veces"
 
 #: templates/book.html:105 templates/index.html:48 templates/questions.html:46
-#: templates/unanswered.html:37 templates/users_questions.html:32
+#: templates/unanswered.html:37 templates/users_questions.html:30
 msgid "votes"
 msgstr "votos"
 
@@ -1119,14 +1100,14 @@ msgid "the answer has been accepted to be correct"
 msgstr "la respuesta ha sido aceptada como correcta"
 
 #: templates/book.html:115 templates/index.html:49 templates/questions.html:47
-#: templates/unanswered.html:38 templates/users_questions.html:42
+#: templates/unanswered.html:38 templates/users_questions.html:40
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/index.html:69 templates/question.html:500
-#: templates/questions.html:84 templates/questions.html.py:157
+#: templates/book.html:125 templates/index.html:69 templates/question.html:499
+#: templates/questions.html:84 templates/questions.html.py:156
 #: templates/tags.html:49 templates/unanswered.html:75
-#: templates/unanswered.html.py:106 templates/users_questions.html:54
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "using tags"
 msgstr "usando etiquetas"
 
@@ -1138,23 +1119,6 @@ msgstr "suscribirse al RSS del libro"
 msgid "subscribe to the questions feed"
 msgstr "suscribirse al agregado de noticias"
 
-#: templates/categories.html:6 templates/categories.html.py:29
-msgid "Category list"
-msgstr "Lista de Categorías"
-
-#: templates/categories.html:34 templates/tags.html:42
-msgid "Nothing found"
-msgstr "Nada encontrado"
-
-#: templates/categories.html:40
-#, fuzzy
-msgid "see questions that matches"
-msgstr "ver preguntas etiquetadas"
-
-#: templates/categories.html:40
-msgid "category "
-msgstr "categoría"
-
 #: templates/close.html:6 templates/close.html.py:16
 msgid "Close question"
 msgstr "Cerrar pregunta"
@@ -1514,14 +1478,14 @@ msgid "all questions"
 msgstr "todas las preguntas"
 
 #: templates/index.html:47 templates/questions.html:45
-#: templates/unanswered.html:36 templates/users_questions.html:37
+#: templates/unanswered.html:36 templates/users_questions.html:35
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:69 templates/question.html:500
-#: templates/questions.html:84 templates/questions.html.py:157
+#: templates/index.html:69 templates/question.html:499
+#: templates/questions.html:84 templates/questions.html.py:156
 #: templates/tags.html:49 templates/unanswered.html:75
-#: templates/unanswered.html.py:106 templates/users_questions.html:54
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
@@ -1668,7 +1632,7 @@ msgid "i like this post (click again to cancel)"
 msgstr "Me gusta esta entrada (clickear devuelta para cancelar)"
 
 #: templates/question.html:75 templates/question.html.py:89
-#: templates/question.html:290
+#: templates/question.html:289
 msgid "current number of votes"
 msgstr "número actual de votos"
 
@@ -1687,171 +1651,169 @@ msgstr ""
 "remover marca de favorito a esta pregunta (clickear devuelta para volver a "
 "marcar)"
 
-#: templates/question.html:128 templates/questions.html:87
-msgid "Category: "
-msgstr "Categoría: "
-
-#: templates/question.html:135 templates/question.html.py:323
+#: templates/question.html:134 templates/question.html.py:322
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
 msgstr "editar"
 
-#: templates/question.html:139 templates/question.html.py:333
+#: templates/question.html:138 templates/question.html.py:332
 msgid "delete"
 msgstr "borrar"
 
-#: templates/question.html:144
+#: templates/question.html:143
 msgid "reopen"
 msgstr "re-abrir"
 
-#: templates/question.html:149
+#: templates/question.html:148
 msgid "close"
 msgstr "cerrar"
 
-#: templates/question.html:155 templates/question.html.py:346
+#: templates/question.html:154 templates/question.html.py:345
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 "reportar como ofensivo (ej. contiene spam, publicidad, texto malicioso, etc.)"
 
-#: templates/question.html:156 templates/question.html.py:347
+#: templates/question.html:155 templates/question.html.py:346
 msgid "flag offensive"
 msgstr "marcar como ofensivo"
 
-#: templates/question.html:168 templates/question.html.py:356
+#: templates/question.html:167 templates/question.html.py:355
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
 msgstr "actualizado"
 
-#: templates/question.html:217 templates/question.html.py:403
+#: templates/question.html:216 templates/question.html.py:402
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
 msgstr "preguntado"
 
-#: templates/question.html:247 templates/question.html.py:430
+#: templates/question.html:246 templates/question.html.py:429
 msgid "comments"
 msgstr "comentarios"
 
-#: templates/question.html:248 templates/question.html.py:431
+#: templates/question.html:247 templates/question.html.py:430
 msgid "add comment"
 msgstr "agregar comentario"
 
-#: templates/question.html:261
-msgid "The question has been closed for the following reason"
-msgstr "La pregunta fue cerrada por el siguiente motivo "
-
-#: templates/question.html:261
-msgid "by"
-msgstr "por"
+#: templates/question.html:260
+#, python-format
+msgid ""
+"The question has been closed for the following reason \"%(question."
+"get_close_reason_display)s\" by"
+msgstr ""
+"La pregunta ha sido cerrada por el siguiente motivo \"%(question."
+"get_close_reason_display)s\" por"
 
-#: templates/question.html:263
-msgid "close date "
-msgstr "fecha de cierre"
+#: templates/question.html:262
+#, python-format
+msgid "close date %(question.closed_at)s"
+msgstr "fecha de cerrada %(question.closed_at)s"
 
-#: templates/question.html:270 templates/user_stats.html:13
+#: templates/question.html:269 templates/user_stats.html:28
 msgid "Answers"
 msgstr "Respuestas"
 
-#: templates/question.html:272
+#: templates/question.html:271
 msgid "oldest answers will be shown first"
 msgstr "la respuesta mas vieja será mostrada primero"
 
-#: templates/question.html:272
+#: templates/question.html:271
 msgid "oldest answers"
 msgstr "pregunta más vieja"
 
-#: templates/question.html:273
+#: templates/question.html:272
 msgid "newest answers will be shown first"
 msgstr "preguntas más nuevas serán mostradas primero"
 
-#: templates/question.html:273
+#: templates/question.html:272
 msgid "newest answers"
 msgstr "más nuevas"
 
-#: templates/question.html:274
+#: templates/question.html:273
 msgid "most voted answers will be shown first"
 msgstr "las preguntas más votadas serán mostradas primero"
 
-#: templates/question.html:274
+#: templates/question.html:273
 msgid "popular answers"
 msgstr "respuestas populares"
 
-#: templates/question.html:288 templates/question.html.py:289
+#: templates/question.html:287 templates/question.html.py:288
 msgid "i like this answer (click again to cancel)"
 msgstr "me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:295 templates/question.html.py:296
+#: templates/question.html:294 templates/question.html.py:295
 msgid "i dont like this answer (click again to cancel)"
 msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:301 templates/question.html.py:302
+#: templates/question.html:300 templates/question.html.py:301
 msgid "mark this answer as favorite (click again to undo)"
 msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)"
 
-#: templates/question.html:307 templates/question.html.py:308
+#: templates/question.html:306 templates/question.html.py:307
 msgid "the author of the question has selected this answer as correct"
 msgstr "el autor de esta pregunta ha seleccionado esta respuesta como correcta"
 
-#: templates/question.html:330
+#: templates/question.html:329
 msgid "undelete"
 msgstr "deshacer eliminar"
 
-#: templates/question.html:340
+#: templates/question.html:339
 msgid "answer permanent link"
 msgstr "enlace permanente a respuesta"
 
-#: templates/question.html:341
+#: templates/question.html:340
 msgid "permanent link"
 msgstr "enlace permanente"
 
-#: templates/question.html:454
+#: templates/question.html:453
 msgid "Your answer"
 msgstr "Tu respuesta"
 
-#: templates/question.html:457
+#: templates/question.html:456
 msgid "you can answer anonymously and then login"
 msgstr "puedes responder de forma anónima y luego ingresar"
 
-#: templates/question.html:480
+#: templates/question.html:479
 msgid "Answer the question"
 msgstr "Responde la pregunta"
 
-#: templates/question.html:482
+#: templates/question.html:481
 msgid "Notify me daily if there are any new answers."
 msgstr "Notificarme diariamente si hay nuevas respuestas."
 
-#: templates/question.html:484
+#: templates/question.html:483
 msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr ""
 "una vez que hayas ingresado podrás suscribirte a cualquiera de las "
 "actualizaciones aquí."
 
-#: templates/question.html:495
+#: templates/question.html:494
 msgid "Question tags"
 msgstr "Tags de la pregunta"
 
-#: templates/question.html:505
+#: templates/question.html:504
 msgid "question asked"
 msgstr "pregunta preguntada"
 
-#: templates/question.html:505 templates/question.html.py:511
+#: templates/question.html:504 templates/question.html.py:510
 #: templates/user_info.html:51
 msgid "ago"
 msgstr " atras"
 
-#: templates/question.html:508
+#: templates/question.html:507
 msgid "question was seen"
 msgstr "la pregunta fue vista"
 
-#: templates/question.html:508
+#: templates/question.html:507
 msgid "times"
 msgstr "veces"
 
-#: templates/question.html:511
+#: templates/question.html:510
 msgid "last updated"
 msgstr "última vez actualizada"
 
-#: templates/question.html:516
+#: templates/question.html:515
 msgid "Related questions"
 msgstr "Preguntas relacionadas"
 
@@ -1916,7 +1878,7 @@ msgstr "preguntas actualizadas más recientemente"
 msgid "active"
 msgstr "actividad"
 
-#: templates/questions.html:110
+#: templates/questions.html:109
 #, python-format
 msgid ""
 "\n"
@@ -1935,7 +1897,7 @@ msgstr[1] ""
 "\t\t\ttiene un total de %(q_num)s preguntas etiquetadas con %(tagname)s\n"
 "\t\t\t"
 
-#: templates/questions.html:117
+#: templates/questions.html:116
 #, python-format
 msgid ""
 "\n"
@@ -1954,7 +1916,7 @@ msgstr[1] ""
 "\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n"
 "\t\t\t"
 
-#: templates/questions.html:123
+#: templates/questions.html:122
 #, fuzzy, python-format
 msgid ""
 "\n"
@@ -1967,36 +1929,36 @@ msgid_plural ""
 msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
 msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
 
-#: templates/questions.html:132
+#: templates/questions.html:131
 msgid "latest questions info"
 msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/questions.html:136
+#: templates/questions.html:135
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 "Las preguntas estan ordenadas por <strong>fecha de último update</strong>."
 
-#: templates/questions.html:137
+#: templates/questions.html:136
 msgid "Most recently answered ones are shown first."
 msgstr "Las más recientemente respondidas son mostradas primero."
 
-#: templates/questions.html:141
+#: templates/questions.html:140
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Preguntas ordenadas por <strong>número de respuestas</strong>."
 
-#: templates/questions.html:142
+#: templates/questions.html:141
 msgid "Most answered questions are shown first."
 msgstr "Preguntas más respondidas aparecen primero."
 
-#: templates/questions.html:146
+#: templates/questions.html:145
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>."
 
-#: templates/questions.html:147
+#: templates/questions.html:146
 msgid "Most voted questions are shown first."
 msgstr "Las preguntas más votadas son mostradas primero."
 
-#: templates/questions.html:154 templates/unanswered.html:102
+#: templates/questions.html:153 templates/unanswered.html:102
 msgid "Related tags"
 msgstr "Etiquetas relacionadas"
 
@@ -2061,6 +2023,10 @@ msgstr "Todas las etiquetas que coincidan con la busqueda"
 msgid "all tags - make this empty in english"
 msgstr "todas las tags"
 
+#: templates/tags.html:42
+msgid "Nothing found"
+msgstr "Nada encontrado"
+
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
 msgid "Unanswered questions"
 msgstr "Preguntas sin respuesta"
@@ -2160,50 +2126,41 @@ msgstr "Enviar mis respuestas a Twitter"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/user_stats.html:10
+#: templates/user_stats.html:16
 msgid "User questions"
 msgstr "Preguntas del usuario"
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:38
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr "la respuesta ha sido votada %(vote_count)s veces"
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:38
 msgid "this answer has been selected as correct"
 msgstr "esta respuesta ha sido seleccionada como correcta"
 
-#: templates/user_stats.html:28
+#: templates/user_stats.html:46
 #, python-format
 msgid "the answer has been commented %(comment_count)s times"
 msgstr "la respuesta ha sido comentada %(comment_count)s veces"
 
-#: templates/user_stats.html:36
-#, fuzzy
-msgid "Votes"
-msgstr "votos"
-
-#: templates/user_stats.html:41
-msgid "thumb up"
-msgstr ""
+#: templates/user_stats.html:60
+msgid "votes total"
+msgstr "votos totales"
 
-#: templates/user_stats.html:42
+#: templates/user_stats.html:69
 msgid "user has voted up this many times"
 msgstr "el usuario ha votado positivo esta cantidad de veces"
 
-#: templates/user_stats.html:46
-msgid "thumb down"
-msgstr ""
-
-#: templates/user_stats.html:47
+#: templates/user_stats.html:74
 msgid "user voted down this many times"
 msgstr "el usuario voto negativo esta cantidad de veces"
 
-#: templates/user_stats.html:54
+#: templates/user_stats.html:87
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/user_stats.html:61
+#: templates/user_stats.html:97
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr "ver otras preguntas etiqueteadas '%(tag)s'"
@@ -2220,11 +2177,6 @@ msgstr "gráfica de la reputación del usuario"
 msgid "reputation history"
 msgstr "historial de reputación"
 
-#: templates/user_tabs.html:23
-#, fuzzy
-msgid "questions that user selected as his/her favorite"
-msgstr "esta pregunta ha sido seleccionada como favorita"
-
 #: templates/user_tabs.html:24
 msgid "favorites"
 msgstr "favoritos"
@@ -2262,15 +2214,7 @@ msgstr "Nada encontrado."
 msgid "this questions was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
-#: templates/users_questions.html:12
-msgid "thumb-up on"
-msgstr ""
-
-#: templates/users_questions.html:19
-msgid "thumb-up off"
-msgstr ""
-
-#: templates/users_questions.html:35
+#: templates/users_questions.html:33
 msgid "this answer has been accepted to be correct"
 msgstr "esta respuesta ha sido aceptada como correcta"
 
@@ -2296,7 +2240,7 @@ msgid "Your new Email"
 msgstr "Tu nuevo Email"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:136
 msgid "Password"
 msgstr "Contraseña"
 
@@ -2404,7 +2348,7 @@ msgid "This account already exists, please use another."
 msgstr "Esta cuenta ya existe, por favor usar otra."
 
 #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/sendpw.html:16 templates/authopenid/signin.html:121
+#: templates/authopenid/signin.html:120
 msgid "Sorry, looks like we have some errors:"
 msgstr "Ups, parece que hay errores:"
 
@@ -2436,10 +2380,40 @@ msgstr "contraseña"
 msgid "Register"
 msgstr "Registrarse"
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:139
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
+#: templates/authopenid/confirm_email.txt:2
+msgid "Thank you for registering at our Q&A forum!"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:4
+msgid "Your account details are:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:6
+#: templates/authopenid/sendpw_email.txt:7
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: templates/authopenid/confirm_email.txt:7
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr "Contraseña"
+
+#: templates/authopenid/confirm_email.txt:9
+msgid "Please sign in here:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:12
+#: templates/authopenid/email_validation.txt:14
+#: templates/authopenid/sendpw_email.txt:13
+msgid ""
+"Sincerely,\n"
+"Forum Administrator"
+msgstr ""
+
 #: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr "Cuenta: borrar cuenta"
@@ -2456,10 +2430,6 @@ msgstr ""
 msgid "Check confirm box, if you want delete your account."
 msgstr "Marca caja de confirmación, si deseas borrar tu cuenta."
 
-#: templates/authopenid/delete.html:20
-msgid "Password:"
-msgstr "Contraseña"
-
 #: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr "Estoy seguro que quiero borrar mi cuenta."
@@ -2476,6 +2446,25 @@ msgstr "(requerido por tu seguridad)"
 msgid "Delete account permanently"
 msgstr "Borrar la cuenta de forma permanente"
 
+#: templates/authopenid/email_validation.txt:2
+msgid "Greetings from the Q&A forum"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:4
+msgid "To make use of the Forum, please follow the link below:"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:8
+msgid "Following the link above will help us verify your email address."
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:10
+msgid ""
+"If you beleive that this message was sent in mistake - \n"
+"no further action is needed. Just ingore this email, we apologize\n"
+"for any inconvenience"
+msgstr ""
+
 #: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr "Enviar nueva contraseña"
@@ -2512,6 +2501,26 @@ msgstr ""
 "Nota: tu nueva contraseña solo será activada luego de que hagas click en el "
 "link de activación en el email enviado."
 
+#: templates/authopenid/sendpw_email.txt:2
+#, python-format
+msgid ""
+"Someone has requested to reset your password on %(site_url)s.\n"
+"If it were not you, it is safe to ignore this email."
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:5
+msgid "Your new account details are:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:8
+#, fuzzy
+msgid "New password:"
+msgstr "Nueva contraseña:"
+
+#: templates/authopenid/sendpw_email.txt:10
+msgid "To confirm that you wanted to reset your password please visit:"
+msgstr ""
+
 #: templates/authopenid/settings.html:30
 msgid "Give your  account a new password."
 msgstr "Crea una nueva contraseña para tu cuenta."
@@ -2580,7 +2589,7 @@ msgstr ""
 "Ingresa tu dirección (URL) de <a class=\"openid_logo\" href=\"http://openid."
 "net\">OpenID</a>"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:138
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
 msgid "Login"
 msgstr "Ingresar"
 
@@ -2588,48 +2597,48 @@ msgstr "Ingresar"
 msgid "we support two login modes"
 msgstr "soportamos dos tipos de ingreso"
 
-#: templates/authopenid/signin.html:135
+#: templates/authopenid/signin.html:134
 msgid "Use login name and password"
 msgstr "Nombre de usuario y contraseña"
 
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:135
 msgid "Login name"
 msgstr "Nombre de usuario"
 
-#: templates/authopenid/signin.html:140
+#: templates/authopenid/signin.html:139
 msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-#: templates/authopenid/signin.html:149
+#: templates/authopenid/signin.html:148
 msgid "Why use OpenID?"
 msgstr "¿Porqué usar OpenID?"
 
-#: templates/authopenid/signin.html:152
+#: templates/authopenid/signin.html:151
 msgid "with openid it is easier"
 msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña."
 
-#: templates/authopenid/signin.html:155
+#: templates/authopenid/signin.html:154
 msgid "reuse openid"
 msgstr ""
 "Puedes de forma segura re-usar el mismo nombre de usuario para todos los "
 "sitios que acepten OpenID."
 
-#: templates/authopenid/signin.html:158
+#: templates/authopenid/signin.html:157
 msgid "openid is widely adopted"
 msgstr ""
 "OpenID es extensamente usado. Hay más de 160,000,000 cuentas de OpenID en "
 "uso en el mundo. Mas de 10,000 sitios aceptan OpenID."
 
-#: templates/authopenid/signin.html:161
+#: templates/authopenid/signin.html:160
 msgid "openid is supported open standard"
 msgstr ""
 "OpenID es basado en un standard abierto, apoyado por muchas organizaciones."
 
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:165
 msgid "Find out more"
 msgstr "Averigua más"
 
-#: templates/authopenid/signin.html:167
+#: templates/authopenid/signin.html:166
 msgid "Get OpenID"
 msgstr "Adquiere una OpenID"
 
@@ -2673,20 +2682,6 @@ msgstr "Registrate con tu OpenID"
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
-#, fuzzy
-#~ msgid "complete list of quesionts"
-#~ msgstr "lista completa de preguntas"
-
-#~ msgid "votes total"
-#~ msgstr "votos totales"
-
-#~ msgid "Username:"
-#~ msgstr "Nombre de usuario:"
-
-#, fuzzy
-#~ msgid "New password:"
-#~ msgstr "Nueva contraseña:"
-
 #~ msgid "site title"
 #~ msgstr "Preguntalo.com.uy"
 
diff --git a/middleware/anon_user.py b/middleware/anon_user.py
new file mode 100644
index 00000000..c7ff05bc
--- /dev/null
+++ b/middleware/anon_user.py
@@ -0,0 +1,26 @@
+from django.http import HttpResponseRedirect
+from django_authopenid.util import get_next_url
+from user_messages import create_message, get_and_delete_messages
+import logging
+
+class AnonymousMessageManager(object):
+    def __init__(self,request):
+        self.request = request
+    def create(self,message=''):
+        create_message(self.request,message)  
+    def get_and_delete(self):
+        messages = get_and_delete_messages(self.request)
+        return messages
+
+def dummy_deepcopy(*arg):
+    """this is necessary to prevent deepcopy() on anonymous user object
+    that now contains reference to request, which cannot be deepcopied
+    """
+    return None
+
+class ConnectToSessionMessagesMiddleware(object):
+    def process_request(self, request):
+        if not request.user.is_authenticated():
+            request.user.__deepcopy__ = dummy_deepcopy #plug on deepcopy which may be called by django db "driver"
+            request.user.message_set = AnonymousMessageManager(request) #here request is linked to anon user
+            request.user.get_and_delete_messages = request.user.message_set.get_and_delete
diff --git a/middleware/cancel.py b/middleware/cancel.py
new file mode 100644
index 00000000..f03ff35e
--- /dev/null
+++ b/middleware/cancel.py
@@ -0,0 +1,15 @@
+from django.http import HttpResponseRedirect
+from django_authopenid.util import get_next_url
+import logging
+class CancelActionMiddleware(object):
+    def process_view(self, request, view_func, view_args, view_kwargs):
+        if 'cancel' in request.REQUEST:
+            #todo use session messages for the anonymous users
+            try:
+                msg = getattr(view_func,'CANCEL_MESSAGE')
+            except AttributeError:
+                msg = 'action canceled'
+            request.user.message_set.create(message=msg)
+            return HttpResponseRedirect(get_next_url(request))
+        else:
+            return None
diff --git a/middleware/pagesize.py b/middleware/pagesize.py
index bb6c7aa3..f6e6fcfd 100644
--- a/middleware/pagesize.py
+++ b/middleware/pagesize.py
@@ -26,4 +26,8 @@ class QuestionsPageSizeMiddleware(object):
                 user.questions_per_page = pagesize
                 user.save()
         # put pagesize into session
-        request.session["pagesize"] = pagesize
\ No newline at end of file
+        request.session["pagesize"] = pagesize
+
+    def process_exception(self,request,exception):
+        import logging
+        logging.debug('have exception %s' % str(exception))
diff --git a/migration b/migration
new file mode 100644
index 00000000..eb5dffa1
--- /dev/null
+++ b/migration
@@ -0,0 +1,7 @@
+cp cnprog-current/templates/content/style/style.css  test/templates/content/style/
+cp cnprog-current/templates/footer.html  test/templates/
+cp cnprog-current/templates/content/images/logo.png test/templates/content/images
+cp cnprog-current/locale/en/LC_MESSAGES/django.po test/locale/en/LC_MESSAGES/
+python manage.py makemessages -l en -e html,py,txt
+#fix fuzzy messages
+python manage.py compilemessages
diff --git a/session_messages/.svn/all-wcprops b/session_messages/.svn/all-wcprops
new file mode 100644
index 00000000..2a15b353
--- /dev/null
+++ b/session_messages/.svn/all-wcprops
@@ -0,0 +1,23 @@
+K 25
+svn:wc:ra_dav:version-url
+V 38
+/svn/!svn/ver/5/trunk/session_messages
+END
+__init__.py
+K 25
+svn:wc:ra_dav:version-url
+V 50
+/svn/!svn/ver/5/trunk/session_messages/__init__.py
+END
+models.py
+K 25
+svn:wc:ra_dav:version-url
+V 48
+/svn/!svn/ver/2/trunk/session_messages/models.py
+END
+context_processors.py
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/2/trunk/session_messages/context_processors.py
+END
diff --git a/session_messages/.svn/dir-prop-base b/session_messages/.svn/dir-prop-base
new file mode 100644
index 00000000..4cc643b7
--- /dev/null
+++ b/session_messages/.svn/dir-prop-base
@@ -0,0 +1,6 @@
+K 10
+svn:ignore
+V 6
+*.pyc
+
+END
diff --git a/session_messages/.svn/entries b/session_messages/.svn/entries
new file mode 100644
index 00000000..67c0db8a
--- /dev/null
+++ b/session_messages/.svn/entries
@@ -0,0 +1,64 @@
+8
+
+dir
+5
+http://django-session-messages.googlecode.com/svn/trunk/session_messages
+http://django-session-messages.googlecode.com/svn
+
+
+
+2009-03-10T23:30:03.043791Z
+5
+carl.j.meyer
+has-props
+
+svn:special svn:externals svn:needs-lock
+
+
+
+
+
+
+
+
+
+
+
+b8288d2d-7354-0410-af5b-714f73743f4b
+
+__init__.py
+file
+
+
+
+
+2009-10-25T23:36:02.000000Z
+89aa0f71c9973e4889e5fad0b4771a34
+2009-03-10T23:30:03.043791Z
+5
+carl.j.meyer
+
+models.py
+file
+
+
+
+
+2009-10-25T23:36:02.000000Z
+c5b4f274dbb06bc66a14f0c18c9115cd
+2008-08-14T23:13:23.180432Z
+2
+carl.j.meyer
+
+context_processors.py
+file
+
+
+
+
+2009-10-25T23:36:02.000000Z
+24779c7e504d3f7f1918fdf3fe8096bc
+2008-08-14T23:13:23.180432Z
+2
+carl.j.meyer
+
diff --git a/session_messages/.svn/format b/session_messages/.svn/format
new file mode 100644
index 00000000..45a4fb75
--- /dev/null
+++ b/session_messages/.svn/format
@@ -0,0 +1 @@
+8
diff --git a/session_messages/.svn/text-base/__init__.py.svn-base b/session_messages/.svn/text-base/__init__.py.svn-base
new file mode 100644
index 00000000..0136c888
--- /dev/null
+++ b/session_messages/.svn/text-base/__init__.py.svn-base
@@ -0,0 +1,36 @@
+"""
+Lightweight session-based messaging system.
+
+Time-stamp: <2009-03-10 19:22:29 carljm __init__.py>
+
+"""
+VERSION = (0, 1, 'pre')
+
+def create_message (request, message):
+    """
+    Create a message in the current session.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+    
+    try:
+        request.session['messages'].append(message)
+    except KeyError:
+        request.session['messages'] = [message]
+
+def get_and_delete_messages (request, include_auth=False):
+    """
+    Get and delete all messages for current session.
+
+    Optionally also fetches user messages from django.contrib.auth.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+
+    messages = request.session.pop('messages', [])
+
+    if include_auth and request.user.is_authenticated():
+        messages.extend(request.user.get_and_delete_messages())
+    
+    return messages
+
diff --git a/session_messages/.svn/text-base/context_processors.py.svn-base b/session_messages/.svn/text-base/context_processors.py.svn-base
new file mode 100644
index 00000000..df9840fd
--- /dev/null
+++ b/session_messages/.svn/text-base/context_processors.py.svn-base
@@ -0,0 +1,48 @@
+"""
+Context processor for lightweight session messages.
+
+Time-stamp: <2008-07-19 23:16:19 carljm context_processors.py>
+
+"""
+from django.utils.encoding import StrAndUnicode
+
+from session_messages import get_and_delete_messages
+
+def session_messages (request):
+    """
+    Returns session messages for the current session.
+
+    """
+    return { 'session_messages': LazyMessages(request) }
+
+class LazyMessages (StrAndUnicode):
+    """
+    Lazy message container, so messages aren't actually retrieved from
+    session and deleted until the template asks for them.
+
+    """
+    def __init__(self, request):
+        self.request = request
+
+    def __iter__(self):
+        return iter(self.messages)
+
+    def __len__(self):
+        return len(self.messages)
+
+    def __nonzero__(self):
+        return bool(self.messages)
+
+    def __unicode__(self):
+        return unicode(self.messages)
+
+    def __getitem__(self, *args, **kwargs):
+        return self.messages.__getitem__(*args, **kwargs)
+
+    def _get_messages(self):
+        if hasattr(self, '_messages'):
+            return self._messages
+        self._messages = get_and_delete_messages(self.request)
+        return self._messages
+    messages = property(_get_messages)
+    
diff --git a/session_messages/.svn/text-base/models.py.svn-base b/session_messages/.svn/text-base/models.py.svn-base
new file mode 100644
index 00000000..b67ead6d
--- /dev/null
+++ b/session_messages/.svn/text-base/models.py.svn-base
@@ -0,0 +1,3 @@
+"""
+blank models.py
+"""
diff --git a/session_messages/__init__.py b/session_messages/__init__.py
new file mode 100644
index 00000000..4dd10a6b
--- /dev/null
+++ b/session_messages/__init__.py
@@ -0,0 +1,37 @@
+"""
+Lightweight session-based messaging system.
+
+Time-stamp: <2009-03-10 19:22:29 carljm __init__.py>
+
+"""
+VERSION = (0, 1, 'pre')
+
+def create_message (request, message):
+    """
+    Create a message in the current session.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+    
+    try:
+        request.session['messages'].append(message)
+    except KeyError:
+        request.session['messages'] = [message]
+
+def get_and_delete_messages (request, include_auth=False):
+    """
+    Get and delete all messages for current session.
+
+    Optionally also fetches user messages from django.contrib.auth.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+
+    messages = request.session.pop('messages', [])
+    import logging
+
+    if include_auth and request.user.is_authenticated():
+        messages.extend(request.user.get_and_delete_messages())
+    
+    return messages
+
diff --git a/session_messages/context_processors.py b/session_messages/context_processors.py
new file mode 100644
index 00000000..df9840fd
--- /dev/null
+++ b/session_messages/context_processors.py
@@ -0,0 +1,48 @@
+"""
+Context processor for lightweight session messages.
+
+Time-stamp: <2008-07-19 23:16:19 carljm context_processors.py>
+
+"""
+from django.utils.encoding import StrAndUnicode
+
+from session_messages import get_and_delete_messages
+
+def session_messages (request):
+    """
+    Returns session messages for the current session.
+
+    """
+    return { 'session_messages': LazyMessages(request) }
+
+class LazyMessages (StrAndUnicode):
+    """
+    Lazy message container, so messages aren't actually retrieved from
+    session and deleted until the template asks for them.
+
+    """
+    def __init__(self, request):
+        self.request = request
+
+    def __iter__(self):
+        return iter(self.messages)
+
+    def __len__(self):
+        return len(self.messages)
+
+    def __nonzero__(self):
+        return bool(self.messages)
+
+    def __unicode__(self):
+        return unicode(self.messages)
+
+    def __getitem__(self, *args, **kwargs):
+        return self.messages.__getitem__(*args, **kwargs)
+
+    def _get_messages(self):
+        if hasattr(self, '_messages'):
+            return self._messages
+        self._messages = get_and_delete_messages(self.request)
+        return self._messages
+    messages = property(_get_messages)
+    
diff --git a/session_messages/models.py b/session_messages/models.py
new file mode 100644
index 00000000..b67ead6d
--- /dev/null
+++ b/session_messages/models.py
@@ -0,0 +1,3 @@
+"""
+blank models.py
+"""
diff --git a/settings.py b/settings.py
index fcfdb548..daada933 100644
--- a/settings.py
+++ b/settings.py
@@ -1,25 +1,23 @@
 # encoding:utf-8
 # Django settings for lanai project.
 import os.path
+import sys
+sys.path.insert(0,'/home/fadeev/incoming/Django-1.1.1')
 
 #DEBUG SETTINGS
-DEBUG = True
+DEBUG = False 
 TEMPLATE_DEBUG = DEBUG
-INTERNAL_IPS = ('127.0.0.1',)
-
-#for OpenID auth
-ugettext = lambda s: s
-LOGIN_URL = '/%s%s' % (ugettext('account/'), ugettext('signin/'))
+INTERNAL_IPS = ('127.0.0.1','128.200.203.33')
 
 #EMAIL AND ADMINS
 ADMINS = (
-    ('CNProg team', 'team@cnprog.com'),
+    ('Evgeny Fadeev', 'evgeny.fadeev@gmail.com'),
 )
 MANAGERS = ADMINS
 
 SITE_ID = 1
 
-ADMIN_MEDIA_PREFIX = '/admin/media/'
+ADMIN_MEDIA_PREFIX = '/forum/admin/media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
@@ -36,16 +34,18 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
     #'django.middleware.sqlprint.SqlPrintingMiddleware',
-    #'middleware.pagesize.QuestionsPageSizeMiddleware',
+    'middleware.anon_user.ConnectToSessionMessagesMiddleware',
+    'middleware.pagesize.QuestionsPageSizeMiddleware',
+    'middleware.cancel.CancelActionMiddleware',
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
-    'context.auth_processor',
     'context.application_settings',
     #'django.core.context_processors.i18n',
-    'django.core.context_processors.auth' #this is required for admin
+    'user_messages.context_processors.user_messages',#must be before auth
+    'django.core.context_processors.auth', #this is required for admin
 )
 
 ROOT_URLCONF = 'urls'
@@ -73,7 +73,8 @@ INSTALLED_APPS = (
     'django.contrib.humanize',
     'forum',
     'django_authopenid',
-    'debug_toolbar' ,
+    #'debug_toolbar' ,
+    'user_messages',
 )
 
 # User settings
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 48d7b567..e43522ef 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -1,5 +1,6 @@
 # encoding:utf-8
 import os.path
+from django.utils.translation import ugettext as _
 
 SITE_SRC_ROOT = os.path.dirname(__file__) 
 LOG_FILENAME = 'django.lanai.log'
@@ -8,40 +9,60 @@ LOG_FILENAME = 'django.lanai.log'
 import logging
 logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
 
-DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
-DATABASE_ENGINE = ''  #mysql, etc
+DATABASE_ENGINE = 'mysql'  #mysql, etc
 
 #Moved from settings.py for better organization. (please check it up to clean up settings.py)
 
 #email server settings
 SERVER_EMAIL = ''
-DEFAULT_FROM_EMAIL = 'team@cnprog.com'
+DEFAULT_FROM_EMAIL = ''
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
-EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
-EMAIL_HOST='smtp.gmail.com'
-EMAIL_PORT='587'
-EMAIL_USE_TLS=True
+EMAIL_SUBJECT_PREFIX = '[CNPROG] '
+EMAIL_HOST='cnprog.com'
+EMAIL_PORT='25'
+EMAIL_USE_TLS=False
 
 #LOCALIZATIONS
-TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
-# LANGUAGE_CODE = 'en-us'
+TIME_ZONE = 'America/Tijuana'
 
 #OTHER SETTINGS
-APP_TITLE = u'CNProg.com 程序员问答社区'
-APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
-APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
-APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
-APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
+APP_TITLE = u'CNPROG Q&A Forum'
+APP_KEYWORDS = u'CNPROG,forum,community'
+APP_DESCRIPTION = u'Ask and answer questions.'
+APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
+APP_COPYRIGHT = 'Copyright CNPROG, 2009. Some rights reserved under creative commons license.'
+
+###########################
+#
+#   this will allow running your forum with url like http://site.com/forum
+#
+#   FORUM_SCRIPT_ALIAS = 'forum/'
+#
+#   also make sure to set '/':'/forum' in file templates/content/js/com.cnprog.i18n.js
+#   this is necessary to make client scripts work in this configuration
+#
+FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
 
 USE_I18N = True
 LANGUAGE_CODE = 'en'
-EMAIL_VALIDATION = 'off'
+EMAIL_VALIDATION = 'off' #string - on|off
 MIN_USERNAME_LENGTH = 1
 EMAIL_UNIQUE = False
-APP_URL = 'http://server.com' #used by email notif system and RSS
+APP_URL = 'http://cnprog.com' #used by email notif system and RSS
 GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
 GOOGLE_ANALYTICS_KEY = ''
-BOOKS_ON = True 
+BOOKS_ON = False 
+WIKI_ON = True 
+USE_EXTERNAL_LEGACY_LOGIN = True 
+EXTERNAL_LEGACY_LOGIN_HOST = 'login.cnprog.com'
+EXTERNAL_LEGACY_LOGIN_PORT = 80
+EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">CNPROG</span>'
+FEEDBACK_SITE_URL = None #None or url
+LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
+
+DJANGO_VERSION = 1.1
+RESOURCE_REVISION=4
diff --git a/sql_scripts/091111_upgrade_evgeny.sql b/sql_scripts/091111_upgrade_evgeny.sql
new file mode 100644
index 00000000..cb76ec3c
--- /dev/null
+++ b/sql_scripts/091111_upgrade_evgeny.sql
@@ -0,0 +1 @@
+ALTER TABLE `auth_user` add column is_approved tinyint(1) not NULL;
diff --git a/tables.sql b/tables.sql
new file mode 100644
index 00000000..6034c08c
--- /dev/null
+++ b/tables.sql
@@ -0,0 +1,440 @@
+BEGIN;
+CREATE TABLE `forum_emailfeedsetting` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `subscriber_id` integer NOT NULL,
+    `feed_type` varchar(16) NOT NULL,
+    `frequency` varchar(8) NOT NULL,
+    `added_at` datetime NOT NULL,
+    `reported_at` datetime NULL
+)
+;
+ALTER TABLE `forum_emailfeedsetting` ADD CONSTRAINT subscriber_id_refs_id_6fee6730cc813af8 FOREIGN KEY (`subscriber_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `tag` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `name` varchar(255) NOT NULL UNIQUE,
+    `created_by_id` integer NOT NULL,
+    `deleted` bool NOT NULL,
+    `deleted_at` datetime NULL,
+    `deleted_by_id` integer NULL,
+    `used_count` integer UNSIGNED NOT NULL
+)
+;
+ALTER TABLE `tag` ADD CONSTRAINT created_by_id_refs_id_6ae4d97547205d6d FOREIGN KEY (`created_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `tag` ADD CONSTRAINT deleted_by_id_refs_id_6ae4d97547205d6d FOREIGN KEY (`deleted_by_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `comment` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `content_type_id` integer NOT NULL,
+    `object_id` integer UNSIGNED NOT NULL,
+    `user_id` integer NOT NULL,
+    `comment` varchar(300) NOT NULL,
+    `added_at` datetime NOT NULL
+)
+;
+ALTER TABLE `comment` ADD CONSTRAINT content_type_id_refs_id_89a4b13ec5a7994 FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+ALTER TABLE `comment` ADD CONSTRAINT user_id_refs_id_5ba842626be725e8 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `vote` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `content_type_id` integer NOT NULL,
+    `object_id` integer UNSIGNED NOT NULL,
+    `user_id` integer NOT NULL,
+    `vote` smallint NOT NULL,
+    `voted_at` datetime NOT NULL,
+    UNIQUE (`content_type_id`, `object_id`, `user_id`)
+)
+;
+ALTER TABLE `vote` ADD CONSTRAINT content_type_id_refs_id_77dc6ffafedbbec FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+ALTER TABLE `vote` ADD CONSTRAINT user_id_refs_id_3ce5b20589f5b210 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `flagged_item` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `content_type_id` integer NOT NULL,
+    `object_id` integer UNSIGNED NOT NULL,
+    `user_id` integer NOT NULL,
+    `flagged_at` datetime NOT NULL,
+    UNIQUE (`content_type_id`, `object_id`, `user_id`)
+)
+;
+ALTER TABLE `flagged_item` ADD CONSTRAINT content_type_id_refs_id_261d26c8891bb28c FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+ALTER TABLE `flagged_item` ADD CONSTRAINT user_id_refs_id_92ae9d35e3c608 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `question` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `title` varchar(300) NOT NULL,
+    `author_id` integer NOT NULL,
+    `added_at` datetime NOT NULL,
+    `wiki` bool NOT NULL,
+    `wikified_at` datetime NULL,
+    `answer_accepted` bool NOT NULL,
+    `closed` bool NOT NULL,
+    `closed_by_id` integer NULL,
+    `closed_at` datetime NULL,
+    `close_reason` smallint NULL,
+    `deleted` bool NOT NULL,
+    `deleted_at` datetime NULL,
+    `deleted_by_id` integer NULL,
+    `locked` bool NOT NULL,
+    `locked_by_id` integer NULL,
+    `locked_at` datetime NULL,
+    `score` integer NOT NULL,
+    `vote_up_count` integer NOT NULL,
+    `vote_down_count` integer NOT NULL,
+    `answer_count` integer UNSIGNED NOT NULL,
+    `comment_count` integer UNSIGNED NOT NULL,
+    `view_count` integer UNSIGNED NOT NULL,
+    `offensive_flag_count` smallint NOT NULL,
+    `favourite_count` integer UNSIGNED NOT NULL,
+    `last_edited_at` datetime NULL,
+    `last_edited_by_id` integer NULL,
+    `last_activity_at` datetime NOT NULL,
+    `last_activity_by_id` integer NOT NULL,
+    `tagnames` varchar(125) NOT NULL,
+    `summary` varchar(180) NOT NULL,
+    `html` longtext NOT NULL
+)
+;
+ALTER TABLE `question` ADD CONSTRAINT author_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `question` ADD CONSTRAINT closed_by_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`closed_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `question` ADD CONSTRAINT deleted_by_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`deleted_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `question` ADD CONSTRAINT locked_by_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`locked_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `question` ADD CONSTRAINT last_edited_by_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`last_edited_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `question` ADD CONSTRAINT last_activity_by_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`last_activity_by_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `forum_questionview` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `who_id` integer NOT NULL,
+    `when` datetime NOT NULL
+)
+;
+ALTER TABLE `forum_questionview` ADD CONSTRAINT question_id_refs_id_fe63ebce6b3cbac FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `forum_questionview` ADD CONSTRAINT who_id_refs_id_293b67239e957c53 FOREIGN KEY (`who_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `favorite_question` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `user_id` integer NOT NULL,
+    `added_at` datetime NOT NULL
+)
+;
+ALTER TABLE `favorite_question` ADD CONSTRAINT question_id_refs_id_2cafd2f21ebe1cc3 FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `favorite_question` ADD CONSTRAINT user_id_refs_id_1632ce11ad7ac7de FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `question_revision` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `revision` integer UNSIGNED NOT NULL,
+    `title` varchar(300) NOT NULL,
+    `author_id` integer NOT NULL,
+    `revised_at` datetime NOT NULL,
+    `tagnames` varchar(125) NOT NULL,
+    `summary` varchar(300) NOT NULL,
+    `text` longtext NOT NULL
+)
+;
+ALTER TABLE `question_revision` ADD CONSTRAINT question_id_refs_id_61316ec87bef5296 FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `question_revision` ADD CONSTRAINT author_id_refs_id_79de7cc0b077fdb1 FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `forum_anonymousanswer` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `session_key` varchar(40) NOT NULL,
+    `wiki` bool NOT NULL,
+    `added_at` datetime NOT NULL,
+    `ip_addr` char(15) NOT NULL,
+    `author_id` integer NULL,
+    `text` longtext NOT NULL,
+    `summary` varchar(180) NOT NULL
+)
+;
+ALTER TABLE `forum_anonymousanswer` ADD CONSTRAINT question_id_refs_id_17dd6b2f4cc171c7 FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `forum_anonymousanswer` ADD CONSTRAINT author_id_refs_id_3ac41be013fb542e FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `forum_anonymousquestion` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `title` varchar(300) NOT NULL,
+    `session_key` varchar(40) NOT NULL,
+    `text` longtext NOT NULL,
+    `summary` varchar(180) NOT NULL,
+    `tagnames` varchar(125) NOT NULL,
+    `wiki` bool NOT NULL,
+    `added_at` datetime NOT NULL,
+    `ip_addr` char(15) NOT NULL,
+    `author_id` integer NULL
+)
+;
+ALTER TABLE `forum_anonymousquestion` ADD CONSTRAINT author_id_refs_id_2a673297511a98a FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `answer` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `author_id` integer NOT NULL,
+    `added_at` datetime NOT NULL,
+    `wiki` bool NOT NULL,
+    `wikified_at` datetime NULL,
+    `accepted` bool NOT NULL,
+    `accepted_at` datetime NULL,
+    `deleted` bool NOT NULL,
+    `deleted_by_id` integer NULL,
+    `locked` bool NOT NULL,
+    `locked_by_id` integer NULL,
+    `locked_at` datetime NULL,
+    `score` integer NOT NULL,
+    `vote_up_count` integer NOT NULL,
+    `vote_down_count` integer NOT NULL,
+    `comment_count` integer UNSIGNED NOT NULL,
+    `offensive_flag_count` smallint NOT NULL,
+    `last_edited_at` datetime NULL,
+    `last_edited_by_id` integer NULL,
+    `html` longtext NOT NULL
+)
+;
+ALTER TABLE `answer` ADD CONSTRAINT question_id_refs_id_2300e0297d6550c9 FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `answer` ADD CONSTRAINT author_id_refs_id_6573e62f192b0170 FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `answer` ADD CONSTRAINT deleted_by_id_refs_id_6573e62f192b0170 FOREIGN KEY (`deleted_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `answer` ADD CONSTRAINT locked_by_id_refs_id_6573e62f192b0170 FOREIGN KEY (`locked_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `answer` ADD CONSTRAINT last_edited_by_id_refs_id_6573e62f192b0170 FOREIGN KEY (`last_edited_by_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `answer_revision` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `answer_id` integer NOT NULL,
+    `revision` integer UNSIGNED NOT NULL,
+    `author_id` integer NOT NULL,
+    `revised_at` datetime NOT NULL,
+    `summary` varchar(300) NOT NULL,
+    `text` longtext NOT NULL
+)
+;
+ALTER TABLE `answer_revision` ADD CONSTRAINT answer_id_refs_id_47145eaebe77d8fe FOREIGN KEY (`answer_id`) REFERENCES `answer` (`id`);
+ALTER TABLE `answer_revision` ADD CONSTRAINT author_id_refs_id_2c17693c3ccc055f FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `badge` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `name` varchar(50) NOT NULL,
+    `type` smallint NOT NULL,
+    `slug` varchar(50) NOT NULL,
+    `description` varchar(300) NOT NULL,
+    `multiple` bool NOT NULL,
+    `awarded_count` integer UNSIGNED NOT NULL,
+    UNIQUE (`name`, `type`)
+)
+;
+CREATE TABLE `award` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `badge_id` integer NOT NULL,
+    `content_type_id` integer NOT NULL,
+    `object_id` integer UNSIGNED NOT NULL,
+    `awarded_at` datetime NOT NULL,
+    `notified` bool NOT NULL
+)
+;
+ALTER TABLE `award` ADD CONSTRAINT user_id_refs_id_5d197ea32d83e9b6 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `award` ADD CONSTRAINT badge_id_refs_id_4237a025651af0e1 FOREIGN KEY (`badge_id`) REFERENCES `badge` (`id`);
+ALTER TABLE `award` ADD CONSTRAINT content_type_id_refs_id_72f17e2d83bbde26 FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+CREATE TABLE `repute` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `positive` smallint NOT NULL,
+    `negative` smallint NOT NULL,
+    `question_id` integer NOT NULL,
+    `reputed_at` datetime NOT NULL,
+    `reputation_type` smallint NOT NULL,
+    `reputation` integer NOT NULL
+)
+;
+ALTER TABLE `repute` ADD CONSTRAINT user_id_refs_id_fcf719405a426cd FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `repute` ADD CONSTRAINT question_id_refs_id_4749166abeb39c4e FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+CREATE TABLE `activity` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `activity_type` smallint NOT NULL,
+    `active_at` datetime NOT NULL,
+    `content_type_id` integer NOT NULL,
+    `object_id` integer UNSIGNED NOT NULL,
+    `is_auditted` bool NOT NULL
+)
+;
+ALTER TABLE `activity` ADD CONSTRAINT user_id_refs_id_6015206347c8583f FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `activity` ADD CONSTRAINT content_type_id_refs_id_78877d15efa8edfd FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+CREATE TABLE `book` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `title` varchar(255) NOT NULL,
+    `short_name` varchar(255) NOT NULL,
+    `author` varchar(255) NOT NULL,
+    `price` numeric(6, 2) NOT NULL,
+    `pages` smallint NOT NULL,
+    `published_at` datetime NOT NULL,
+    `publication` varchar(255) NOT NULL,
+    `cover_img` varchar(255) NOT NULL,
+    `tagnames` varchar(125) NOT NULL,
+    `added_at` datetime NOT NULL,
+    `last_edited_at` datetime NOT NULL
+)
+;
+ALTER TABLE `book` ADD CONSTRAINT user_id_refs_id_607b4cfdf0283c8d FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `book_author_info` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `book_id` integer NOT NULL,
+    `blog_url` varchar(255) NOT NULL,
+    `added_at` datetime NOT NULL,
+    `last_edited_at` datetime NOT NULL
+)
+;
+ALTER TABLE `book_author_info` ADD CONSTRAINT user_id_refs_id_3781e2a5fbe1cfda FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `book_author_info` ADD CONSTRAINT book_id_refs_id_688c8f047c49bbf8 FOREIGN KEY (`book_id`) REFERENCES `book` (`id`);
+CREATE TABLE `book_author_rss` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `book_id` integer NOT NULL,
+    `title` varchar(255) NOT NULL,
+    `url` varchar(255) NOT NULL,
+    `rss_created_at` datetime NOT NULL,
+    `added_at` datetime NOT NULL
+)
+;
+ALTER TABLE `book_author_rss` ADD CONSTRAINT user_id_refs_id_1fd25dcf3596f741 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `book_author_rss` ADD CONSTRAINT book_id_refs_id_f64066171717121 FOREIGN KEY (`book_id`) REFERENCES `book` (`id`);
+CREATE TABLE `forum_anonymousemail` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `key` varchar(32) NOT NULL,
+    `email` varchar(75) NOT NULL UNIQUE,
+    `isvalid` bool NOT NULL
+)
+;
+CREATE TABLE `question_tags` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `tag_id` integer NOT NULL,
+    UNIQUE (`question_id`, `tag_id`)
+)
+;
+ALTER TABLE `question_tags` ADD CONSTRAINT question_id_refs_id_35d758e3d99eb83a FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `question_tags` ADD CONSTRAINT tag_id_refs_id_3b0ddddfbc0346ad FOREIGN KEY (`tag_id`) REFERENCES `tag` (`id`);
+CREATE TABLE `question_followed_by` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `user_id` integer NOT NULL,
+    UNIQUE (`question_id`, `user_id`)
+)
+;
+ALTER TABLE `question_followed_by` ADD CONSTRAINT question_id_refs_id_6ea9c52125c22aae FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `question_followed_by` ADD CONSTRAINT user_id_refs_id_49cca2976d30712d FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `book_question` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `book_id` integer NOT NULL,
+    `question_id` integer NOT NULL,
+    UNIQUE (`book_id`, `question_id`)
+)
+;
+ALTER TABLE `book_question` ADD CONSTRAINT book_id_refs_id_535ac8946a43c4d1 FOREIGN KEY (`book_id`) REFERENCES `book` (`id`);
+ALTER TABLE `book_question` ADD CONSTRAINT question_id_refs_id_372b7e81c7aff6d8 FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+CREATE TABLE `django_authopenid_nonce` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `server_url` varchar(255) NOT NULL,
+    `timestamp` integer NOT NULL,
+    `salt` varchar(40) NOT NULL
+)
+;
+CREATE TABLE `django_authopenid_association` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `server_url` longtext NOT NULL,
+    `handle` varchar(255) NOT NULL,
+    `secret` longtext NOT NULL,
+    `issued` integer NOT NULL,
+    `lifetime` integer NOT NULL,
+    `assoc_type` longtext NOT NULL
+)
+;
+CREATE TABLE `django_authopenid_userassociation` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `openid_url` varchar(255) NOT NULL,
+    `user_id` integer NOT NULL UNIQUE
+)
+;
+ALTER TABLE `django_authopenid_userassociation` ADD CONSTRAINT user_id_refs_id_f63a9e7163d208d FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `django_authopenid_userpasswordqueue` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL UNIQUE,
+    `new_password` varchar(30) NOT NULL,
+    `confirm_key` varchar(40) NOT NULL
+)
+;
+ALTER TABLE `django_authopenid_userpasswordqueue` ADD CONSTRAINT user_id_refs_id_7f488ca76bcaaa4 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `django_authopenid_externallogindata` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `external_username` varchar(40) NOT NULL UNIQUE,
+    `external_session_data` longtext NOT NULL,
+    `user_id` integer NULL
+)
+;
+ALTER TABLE `django_authopenid_externallogindata` ADD CONSTRAINT user_id_refs_id_462c0ee2c3e5e139 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `auth_permission` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `name` varchar(50) NOT NULL,
+    `content_type_id` integer NOT NULL,
+    `codename` varchar(100) NOT NULL,
+    UNIQUE (`content_type_id`, `codename`)
+)
+;
+ALTER TABLE `auth_permission` ADD CONSTRAINT content_type_id_refs_id_6bc81a32728de91f FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+CREATE TABLE `auth_group` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `name` varchar(80) NOT NULL UNIQUE
+)
+;
+CREATE TABLE `auth_user` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `username` varchar(30) NOT NULL UNIQUE,
+    `first_name` varchar(30) NOT NULL,
+    `last_name` varchar(30) NOT NULL,
+    `email` varchar(75) NOT NULL,
+    `password` varchar(128) NOT NULL,
+    `is_staff` bool NOT NULL,
+    `is_active` bool NOT NULL,
+    `is_superuser` bool NOT NULL,
+    `last_login` datetime NOT NULL,
+    `date_joined` datetime NOT NULL,
+    `is_approved` bool NOT NULL,
+    `email_isvalid` bool NOT NULL,
+    `email_key` varchar(32) NULL,
+    `reputation` integer UNSIGNED NOT NULL,
+    `gravatar` varchar(32) NOT NULL,
+    `gold` smallint NOT NULL,
+    `silver` smallint NOT NULL,
+    `bronze` smallint NOT NULL,
+    `questions_per_page` smallint NOT NULL,
+    `last_seen` datetime NOT NULL,
+    `real_name` varchar(100) NOT NULL,
+    `website` varchar(200) NOT NULL,
+    `location` varchar(100) NOT NULL,
+    `date_of_birth` date NULL,
+    `about` longtext NOT NULL
+)
+;
+CREATE TABLE `auth_message` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `message` longtext NOT NULL
+)
+;
+ALTER TABLE `auth_message` ADD CONSTRAINT user_id_refs_id_7837edc69af0b65a FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `auth_group_permissions` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `group_id` integer NOT NULL,
+    `permission_id` integer NOT NULL,
+    UNIQUE (`group_id`, `permission_id`)
+)
+;
+ALTER TABLE `auth_group_permissions` ADD CONSTRAINT group_id_refs_id_2ccea4c93cea63fe FOREIGN KEY (`group_id`) REFERENCES `auth_group` (`id`);
+ALTER TABLE `auth_group_permissions` ADD CONSTRAINT permission_id_refs_id_4de83ca7792de1 FOREIGN KEY (`permission_id`) REFERENCES `auth_permission` (`id`);
+CREATE TABLE `auth_user_groups` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `group_id` integer NOT NULL,
+    UNIQUE (`user_id`, `group_id`)
+)
+;
+ALTER TABLE `auth_user_groups` ADD CONSTRAINT user_id_refs_id_1993cb70831107f1 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `auth_user_groups` ADD CONSTRAINT group_id_refs_id_321a8efef0ee9890 FOREIGN KEY (`group_id`) REFERENCES `auth_group` (`id`);
+CREATE TABLE `auth_user_user_permissions` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `permission_id` integer NOT NULL,
+    UNIQUE (`user_id`, `permission_id`)
+)
+;
+ALTER TABLE `auth_user_user_permissions` ADD CONSTRAINT user_id_refs_id_166738bf2045483 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `auth_user_user_permissions` ADD CONSTRAINT permission_id_refs_id_6d7fb3c2067e79cb FOREIGN KEY (`permission_id`) REFERENCES `auth_permission` (`id`);
+COMMIT;
diff --git a/templates/404.html b/templates/404.html
index 2fa38f99..227de3ae 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -33,7 +33,7 @@
             </u>
         </div>
         <script type="text/javascript">
-            var GOOG_FIXURL_LANG = 'zh-cn';
+            var GOOG_FIXURL_LANG = '{{settings.LANGUAGE_CODE}}';
             var GOOG_FIXURL_SITE = '{{site_url}}';
         </script>
         <script type="text/javascript" src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
diff --git a/templates/about.html b/templates/about.html
index eaf0d591..6d5f3060 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -12,10 +12,35 @@
 </div>
 
 <div class="content">
+    <!-- default text
 	<p>edit file templates/about.html. Below are just suggestions of what can go here</p>
 	<p>what is your site for?</p>
 	<p>how does it work? what are roles of members?</p>
 	<p>is there a place to find out more about this website?</p>
+    -->
+    <p>{% blocktrans %}<strong>CNPROG <span class="orange">Q&amp;A</span></strong> is a collaboratively edited question
+            and answer site created for the <strong>CNPROG</strong> community.
+    {% endblocktrans %}
+    </p>
+    <p>{% blocktrans %}Here you can <strong>ask</strong> and <strong>answer</strong> questions, <strong>comment</strong>
+    and <strong>vote</strong> for the questions of others and their answers. Both questions and answers
+    <strong>can be revised</strong> and improved. Questions can be <strong>tagged</strong> with
+    the relevant keywords to simplify future access and organize the accumulated material.{% endblocktrans %}
+    </p>
+
+    <p>{% blocktrans %}This <span class="orange">Q&amp;A</span> site is moderated by its members, hopefully - including yourself!
+    Moderation rights are gradually assigned to the site users based on the accumulated <strong>"reputation"</strong>
+    points. These points are added to the users account when others vote for his/her questions or answers.
+    These points (very) roughly reflect the level of trust of the community.{% endblocktrans %}
+    </p>
+    <p>{% blocktrans %}No points are necessary to ask or answer the questions - so please -
+    <strong><a href="{% url user_signin %}">join us!</a></strong>{% endblocktrans %}
+    </p>
+    <p>
+        {% blocktrans %}
+            If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
+        {% endblocktrans %}
+    </p>
 </div>
 {% endblock %}
 <!-- end template about.html -->
diff --git a/templates/answer_edit.html b/templates/answer_edit.html
index 8baa7c1e..cd247a3c 100644
--- a/templates/answer_edit.html
+++ b/templates/answer_edit.html
@@ -1,14 +1,15 @@
 {% extends "base.html" %}
 <!-- template answer_edit.html -->
 {% load i18n %}
+{% load extra_tags %}
 {% block title %}{% spaceless %}{% trans "Edit answer" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/wmd.js'></script>
-        <link rel="stylesheet" type="text/css" href="/content/js/wmd/wmd.css" />
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/showdown.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/wmd.js" %}'></script>
+        <link rel="stylesheet" type="text/css" href="{% href "/content/js/wmd/wmd.css" %}" />
         <script type="text/javascript">
         
         $().ready(function(){
diff --git a/templates/answer_edit_tips.html b/templates/answer_edit_tips.html
index 33e4e242..c390da06 100644
--- a/templates/answer_edit_tips.html
+++ b/templates/answer_edit_tips.html
@@ -16,7 +16,9 @@
 				{% trans "be clear and concise" %}
             </li>
         </ul>
-         <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
+        <p class='info-box-follow-up-links'>
+            <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}">faq »</a>
+        </p>
     </div>
 </div>
 
@@ -46,6 +48,8 @@
 			{% trans "basic HTML tags are also supported" %}
         </li>
     </ul>
-    <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank" style="float:right;position:relative">{% trans "learn more about Markdown" %} »</a>
+    <p class='info-box-follow-up-links'>
+        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans "learn more about Markdown" %} »</a>
+    </p>
 </div>
 <!-- end template answer_edit_tips.html -->
diff --git a/templates/ask.html b/templates/ask.html
index 9e86a5a0..30d43ee0 100644
--- a/templates/ask.html
+++ b/templates/ask.html
@@ -1,14 +1,15 @@
 {% extends "base.html" %}
 <!-- template ask.html -->
 {% load i18n %}
+{% load extra_tags %}
 {% block title %}{% spaceless %}{% trans "Ask a question" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/wmd.js'></script>
-        <link rel="stylesheet" type="text/css" href="/content/js/wmd/wmd.css" />
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/showdown.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/wmd.js" %}'></script>
+        <link rel="stylesheet" type="text/css" href="{% href "/content/js/wmd/wmd.css" %}" />
         <script type="text/javascript">
         $().ready(function(){
             //set current module button style
@@ -70,7 +71,9 @@
                 {% ifequal settings.EMAIL_VALIDATION 'on' %}
                     {% if not request.user.email_isvalid %}
                         <div class="message">
-                            {% blocktrans with request.user.email as email %}must have valid {{email}} to post{% endblocktrans %}
+                            {% blocktrans with request.user.email as email %}must have valid {{email}} to post, 
+                            see {{email_validation_faq_url}}
+                            {% endblocktrans %}
                         </div>
                     {% endif %}
                 {% endifequal %}
@@ -93,9 +96,11 @@
                             <td>
                                 <span id="pre-collapse" title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
                             </td>
+                            {% if settings.WIKI_ON %}
                             <td style="text-align:right;">
                                 {{ form.wiki }} <span style="font-weight:normal;cursor:help" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>
                             </td>
+                            {% endif %}
                         </tr>
 
                     </table>
diff --git a/templates/authopenid/changeemail.html b/templates/authopenid/changeemail.html
index 09857d17..94d1881c 100644
--- a/templates/authopenid/changeemail.html
+++ b/templates/authopenid/changeemail.html
@@ -1,37 +1,44 @@
 {% extends "base_content.html" %}
 {% load i18n %}
+{% block title %}{% spaceless %}{% trans "Change email" %}{% endspaceless %}{% endblock %}
 {% block content %}
 <!-- changeemail.html action_type={{action_type}}-->
 {% ifequal action_type "change" %}
     <div id="main-bar" class="headNormal">
-        {% trans "Change email" %}
+        {% if user.email %}
+            {% trans "Change email" %}
+        {% else %}
+            {% trans "Save your email address" %}
+        {% endif %}
     </div>
     <p class="message">
-    {% blocktrans %}change {{email}} info{% endblocktrans %}
-    </p>
-    {% if form.errors %}
-    <p class="errors">{% trans "Please correct errors below:" %}<br />
-        {% if form.email.errors %} 
-            <span class="error">{{ form.email.errors|join:", " }}</span>
-        {% endif %}
-        {% if form.password.errors %} 
-            <span class="error">{{ form.password.errors|join:", " }}</span>
+        {% if user.email %}
+            {% blocktrans %}change {{email}} info{% endblocktrans %}
+        {% else %}
+            {% blocktrans %}here is why email is required, see {{gravatar_faq_url}}{% endblocktrans %}
         {% endif %}
     </p>
-    {% endif %}
-
     {% if msg %}
-    <p class="errors">{{ msg }}</p>
+    <p class="error">{{ msg }}</p>
     {% endif %}
 
     <div class="aligned">
         <form action="." method="post" accept-charset="utf-8">
-
-            <div class="form-row"><label for="id_email">{% trans "Your new Email" %}</label><br/>{{ form.email }}</div>
-            <!--<div class="form-row"><label for="id_password">{% trans "Password" %}</label>{{ form.password }}</div>-->
+            {% if next %}
+                <input type="hidden" name="next" value="{{next}}"/>
+            {% endif %}
+            <div class="form-row-vertical">
+                <label for="id_email">{% if user.email %}{% trans "Your new Email" %}{% else %}{% trans "Your Email" %}{% endif %}</label>
+                {% if form.email.errors %}
+                <p class="error">{{form.email.errors|join:", "}}</p>
+                {% endif %}
+                {{ form.email }}
+            </div>
             <div class="submit-row">
-                <input class="submit" type="submit" name="change_email" value="{% trans "Change email" %}">
+                <input class="submit" type="submit" name="change_email" value="{% if user.email %}{% trans "Change email" %}{% else %}{% trans "Save Email" %}{% endif %}">
+                {% if user.email %}
                 <input class="submit" type="submit" name="cancel" value="{% trans "Cancel" %}">
+                {% endif %}
             </div>
 
         </form>
@@ -42,7 +49,7 @@
         {% trans "Validate email" %}
     </div>
     <p class="message">
-        {% blocktrans %}validate {{email}} info{% endblocktrans %}
+        {% blocktrans %}validate {{email}} info or go to {{change_email_url}}{% endblocktrans %}
     </p>
 {% endifequal %}
 {% ifequal action_type "keep" %}
@@ -50,7 +57,7 @@
         {% trans "Email not changed" %}
     </div>
     <p class="message">
-        {% blocktrans %}old {{email}} kept{% endblocktrans %}
+        {% blocktrans %}old {{email}} kept, if you like go to {{change_email_url}}{% endblocktrans %}
     </p>
 {% endifequal %}
 {% ifequal action_type "done_novalidate" %}
diff --git a/templates/authopenid/changeopenid.html b/templates/authopenid/changeopenid.html
index 9b5a196a..d01788fb 100644
--- a/templates/authopenid/changeopenid.html
+++ b/templates/authopenid/changeopenid.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 <!-- changeopenid.html -->
 {% load i18n %}
-
+{% block title %}{% spaceless %}{% trans "Change OpenID" %}{% endspaceless %}{% endblock %}
 {% block content %}
 <div id="main-bar" class="">
     <h3>
diff --git a/templates/authopenid/changepw.html b/templates/authopenid/changepw.html
index 0e90b172..8b059544 100644
--- a/templates/authopenid/changepw.html
+++ b/templates/authopenid/changepw.html
@@ -1,34 +1,17 @@
 {% extends "base.html" %}
 <!-- changepw.html -->
 {% load i18n %}
-
-{% block head %}
-		
-{% endblock %}
-
-
-
+{% block head %}{% endblock %}
+{% block title %}{% spaceless %}{% trans "Change password" %}{% endspaceless %}{% endblock %}
 {% block content %}
-<div id="main-bar" class="">
-    <h3>
-        {% trans "Account: change password" %}
-    </h3>
-</div>
-<p>{% blocktrans %}This is where you can change your password. Make sure you remember it!{% endblocktrans %}</p>
-{% if form.errors %}
-<p class="errors">{% trans "Please correct errors below:" %}<br />
-{{ form.errors }}
-</p>
-{% endif %}
-
+<div class="headNormal">{% trans "Account: change password" %}</div>
+<p class="message">{% blocktrans %}This is where you can change your password. Make sure you remember it!{% endblocktrans %}</p>
 <div class="aligned">
 	<form action="." method="post" accept-charset="utf-8">
-
-		<div id="form-row"><label for="id_oldpw">{% trans "Current password" %}</label>{{ form.oldpw }}</div>
-		<div id="form-row"><label for="id_password1">{% trans "New password" %}</label>{{ form.password1 }}</div>
-		<div id="form-row"><label for="id_password2">{% trans "New password again" %}</label>{{ form.password2 }}</div>
-        <p><input type="submit" value="{% trans "Change password" %}"></p>
-
+        <ul id="changepw-form" class="form-horizontal-rows">
+        {{form.as_ul}}
+        </ul>
+        <div class="submit-row"><input type="submit" class="submit" value="{% trans "Change password" %}" /></div>
 	</form>
 	</div>
 {% endblock %}
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index f29b7670..9a94c3c4 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -1,5 +1,19 @@
 {% extends "base_content.html" %}
 <!-- complete.html -->
+{% comment %}
+views calling this template: 
+* django_authopenid.views.register with login_type='openid'
+* django_authopenid.views.signin - with login_type='legacy'
+
+parameters:
+* provider 
+* login_type openid|legacy
+* username (same as screen name or username in the models, and nickname in openid sreg)
+* form1 - OpenidRegisterForm
+* form2 - OpenidVerifyForm not clear what this form is supposed to do, not used for legacy
+* email_feeds_form forum.forms.EditUserEmailFeedsForm
+* openid_username_exists
+{% endcomment %}
 {% load i18n %}
 {% block head %}{% endblock %}
 {% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %}
@@ -9,25 +23,34 @@
     </div>      
 	<div id="completetxt" >
         <div class="message">
-            {% blocktrans %}register new {{provider}} account info{% endblocktrans %}
+            {% ifequal login_type 'openid' %}
+                {% blocktrans %}register new {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %}
+            {% else %}
+                {% ifequal login_type 'legacy' %}
+                    {% if external_login_name_is_taken %}
+                        {% blocktrans %}{{username}} already exists, choose another name for 
+                            {{provider}}. Email is required too, see {{gravatar_faq_url}}
+                        {% endblocktrans %} 
+                    {% else %}
+                        {% blocktrans %}register new external {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %}
+                    {% endif %}
+                {% endifequal %}
+            {% endifequal %}
         </div>
     	<p style="display:none">{% trans "This account already exists, please use another." %}</p>
 	</div>
 
 	{% if form1.errors %}
-	<div class="errors">
-        <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
-        <ul class="error-list">
-		{% if form1.username.errors %} 
-			<li><span class="error">{{ form1.username.errors|join:", " }}</span></li>
-		{% endif %}
-		{% if form1.email.errors %} 
-			<li><span class="error">{{ form1.email.errors|join:", " }}</span></li>
-		{% endif %}
+        <ul class="errorlist">
+        {% if form1.non_field_errors %}
+            {% for error in form1.non_field_errors %}
+                <li>{{error}}</li>
+            {% endfor %}
+        {% endif %}
         </ul>
-	</div>
 	{% endif %}
-	{% if form2.errors %}
+    {% comment %}
+	{% if form2.errors %}<!--form2 is dysfunctional so commented out -->
 	<div class="errors">
         <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
         <ul class="error-list">
@@ -40,29 +63,54 @@
        </ul>
 	</div>
 	{% endif %}
+    {% endcomment %}
 
 	<div class="login">
+        {% ifequal login_type 'openid' %}
         <form name="fregister" action="{% url user_register %}" method="POST">
-            {{ form.next }}
-            <div class="form-row"><label for="id_username">{% trans "Screen name label" %}</label><br/>{{ form1.username }}</div>
-            <div class="form-row"><label for="id_email">{% trans "Email address label" %}</label><br/>{{ form1.email }}</div>
+        {% else %}
+        <form name="fregister" action="{% url user_signin %}" method="POST">
+        {% endifequal %}
+            {{ form1.next }}
+            <div class="form-row-vertical">
+                <label for="id_username">{% trans "Screen name label" %}</label>
+                {% if form1.username.errors %} 
+                    <p class="error">{{ form1.username.errors|join:", " }}</p>
+                {% endif %}
+                {{ form1.username }}
+            </div>
+            <div class="form-row-vertical margin-bottom">
+                <label for="id_email">{% trans "Email address label" %}</label>
+                {% if form1.email.errors %} 
+                    <p class="error">{{ form1.email.errors|join:", " }}</p>
+                {% endif %}
+                {{ form1.email }}
+            </div>
+            <p class='nomargin'>{% trans "receive updates motivational blurb" %}</p>
+            {% include "edit_user_email_feeds_form.html" %}
             <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div>
 		</form>
 	</div>
+    {% comment %}<!-- this form associates openID with an existing password-protected account, not yet functional -->
+    {% if form2 %}
 	<div class="login" style="display:none">
         <form name="fverify" action="{% url user_register %}" method="POST">
-            {{ form.next }}
+            {{ form2.next }}
 			<fieldset style="padding:10px">
 				<legend class="big">{% trans "Existing account" %}</legend>
 				<div class="form-row"><label for="id_username">{% trans "user name" %}</label><br/>{{ form2.username }}</div>
 				<div class="form-row"><label for="id_passwordl">{% trans "password" %}</label><br/>{{ form2.password }}</div>
+                <p><span class='big strong'>(Optional) receive updates by email</span> - only sent when there are any.</p>
+                {% include "edit_user_email_feeds_form.html" %}
 				<!--todo double check translation from chinese 确认 = "Register" -->
 				<div class="submit-row">
 					<input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"/> 
-					<a href="">{% trans "Forgot your password?" %}</a>
+					<a href="{% url user_sendpw %}">{% trans "Forgot your password?" %}</a>
 				</div>
 			</fieldset>
 		</form>
 	</div>
+    {% endif %}
+    {% endcomment %}
 {% endblock %}
 <!-- end complete.html -->
diff --git a/templates/authopenid/confirm_email.txt b/templates/authopenid/confirm_email.txt
index 202db0fc..3a01f146 100644
--- a/templates/authopenid/confirm_email.txt
+++ b/templates/authopenid/confirm_email.txt
@@ -7,7 +7,7 @@
 {% trans "Password:" %} {{ password }}
 
 {% trans "Please sign in here:" %}
-{{ site_url }}{% trans "signin/" %}
+{{signup_url}}
 
 {% blocktrans %}Sincerely,
 Forum Administrator{% endblocktrans %}
diff --git a/templates/authopenid/delete.html b/templates/authopenid/delete.html
index d39bc962..0f9f1c60 100644
--- a/templates/authopenid/delete.html
+++ b/templates/authopenid/delete.html
@@ -1,8 +1,7 @@
 {% extends "base.html" %}
 <!-- delete.html -->
 {% load i18n %}
-
-
+{% block title %}{% spaceless %}{% trans "Delete account" %}{% endspaceless %}{% endblock %}
 {% block content %}
 <div id="main-bar" class="">
     <h3>
diff --git a/templates/authopenid/external_legacy_login_info.html b/templates/authopenid/external_legacy_login_info.html
new file mode 100644
index 00000000..e2f4713e
--- /dev/null
+++ b/templates/authopenid/external_legacy_login_info.html
@@ -0,0 +1,16 @@
+{% extends "base_content.html" %}
+<!--customize this template-->
+{% load i18n %}
+{% block title %}{% spaceless %}{% trans "Traditional login information" %}{% endspaceless %}{% endblock %}
+{% block content %}
+<div class="headNormal">
+    {% trans "Traditional login information" %}
+</div>
+{% spaceless %}
+<div class="message">
+fill in template templates/authopenid/external_legacy_login_info.html
+and explain how to change password, recover password, etc.
+<!--add info about your external login site here-->
+</div>
+{% endspaceless %}
+{% endblock %}
diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
index 37091261..6241c811 100644
--- a/templates/authopenid/sendpw.html
+++ b/templates/authopenid/sendpw.html
@@ -2,35 +2,25 @@
 <!-- sendpw.html -->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %}
-
 {% block content %}
-<div id="main-bar" class="">
-    <h3>{% trans "Send new password" %}</h3>
-
-</div>
-<div class="paragraph">
-{% trans "Lost your password? No problem - here you can reset it." %}<br/>
-{% trans "Please enter your username below and new password will be sent to your registered e-mail" %}
+<div class="headNormal">
+    {% trans "Send new password" %}
 </div>
-{% if form.errors %}
-<p class="errors"><span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
-	{% if form.username.errors %} 
-		<span class="error">{{ form.username.errors|join:", " }}</span>
-	{% endif %}
+<p class="message">
+{% trans "password recovery information" %}
 </p>
-{% endif %}
 {% if msg %}
-    <div class="paragraph error">{{ msg }}</div>
+    <p class="action-status"><span>{{msg}}</span><p>
 {% endif %}
 
 <div class="aligned">
 	<form action="." method="post" accept-charset="utf-8">
-		<div id="form-row"><label for="id_username">{% trans "User name" %}:</label>{{ form.username }}</div>
-
-        <p style="padding-top:10px"><input type="submit" value="{% trans "Reset password" %}"> <a href="{% url user_signin %}">{% trans "return to login" %}</a></p>
-
+        <ul id="emailpw-form" class="form-horizontal-rows">
+            {{form.as_ul}}
+        </ul>
+        <p style="padding-top:10px"><input type="submit" class="submit" value="{% trans "Reset password" %}" /> 
+        <a href="{% url user_signin %}"><span class="strong">{% trans "return to login" %}</span></a></p>
 	</form>
-    <span class="darkred">{% trans "Note: your new password will be activated only after you click the activation link in the email message" %}</span>
 </div>
 {% endblock %}
 <!-- end sendpw.html -->
diff --git a/templates/authopenid/sendpw_email.txt b/templates/authopenid/sendpw_email.txt
index 2024061c..f044ca45 100644
--- a/templates/authopenid/sendpw_email.txt
+++ b/templates/authopenid/sendpw_email.txt
@@ -1,14 +1,9 @@
 {% load i18n %}
-{% blocktrans %}Someone has requested to reset your password on {{ site_url }}.
+{% blocktrans%}Someone has requested to reset your password on {{site_url}}.
 If it were not you, it is safe to ignore this email.{% endblocktrans %}
 
-{% trans "Your new account details are:" %}
-
-{% trans "Username:" %} {{ username }}
-{% trans "New password:" %} {{ password }}
-
-{% trans "To confirm that you wanted to reset your password please visit:" %}
-{{ site_url }}{{ url_confirm }}?key={{ confirm_key }}
+{% blocktrans %}email explanation how to use new {{password}} for {{username}}
+with the {{key_link}}{% endblocktrans %}
 
 {% blocktrans %}Sincerely,
 Forum Administrator{% endblocktrans %}
diff --git a/templates/authopenid/settings.html b/templates/authopenid/settings.html
index ecc16c72..66ea5953 100644
--- a/templates/authopenid/settings.html
+++ b/templates/authopenid/settings.html
@@ -1,7 +1,7 @@
 {% extends "base_content.html" %}
 <!-- settings.html -->
 {% load i18n %}
-
+{% block title %}{% spaceless %}{% trans "Account functions" %}{% endspaceless %}{% endblock %}
 {% block head %}
 <style type="text/css" media="screen">
     h4 {font-size:12pt;}
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index 60aa5e5d..1363661e 100644
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -1,13 +1,13 @@
 {% extends "base.html" %}
 <!-- signin.html -->
 {% load i18n %}
+{% load extra_tags %}
 {% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-	<!--<script type="text/javascript" src="/content/js/jquery.openid.js?"></script>-->
-    <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
+    <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="/content/jquery-openid/openid.css"/>
-	<script type="text/javascript" src="/content/jquery-openid/jquery.openid.js"></script>
+	<link rel="stylesheet" type="text/css" media="screen" href="{% href "/content/jquery-openid/openid.css" %}"/>
+	<script type="text/javascript" src="{% href "/content/jquery-openid/jquery.openid.js" %}"></script>
 	<script type="text/javascript">  $().ready( function() { $("form.openid:eq(0)").openid(); })</script>
 	<!--<script type="text/javascript">
 	$().ready(function(){
@@ -44,25 +44,27 @@
 			  <ul class="providers"> 
 			  <li class="local" title="Local login">
 				  <div class="logo_box local_login_box">
-						<img src="/content/jquery-openid/images/local-login.png" alt="icon" /> 
+						<img src="{% href "/content/jquery-openid/images/local-login.png" %}" alt="your icon here" /> 
 				  </div>
 			  <span></span>
 			  </li> 
 			  <li class="direct" title="Google"> 
 			  	<div class="logo_box google_box">
-					<img src="/content/jquery-openid/images/google.gif" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
+					<img src="{% href "/content/jquery-openid/images/google.gif" %}" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
 				</div>
 		 	  </li>
 			  <li class="direct" title="Yahoo"> 
 			  	<div class="logo_box yahoo_box">
-					<img src="/content/jquery-openid/images/yahoo.gif" alt="icon" /><span>http://yahoo.com/</span>
+					<img src="{% href "/content/jquery-openid/images/yahoo.gif" %}" alt="icon" /><span>http://yahoo.com/</span>
 				</div>
 			  </li>
 			  <li class="username" title="AOL screen name"> 
 			  	<div class="logo_box aol_box">
-					<img src="/content/jquery-openid/images/aol.gif" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
+					<img src="{% href "/content/jquery-openid/images/aol.gif" %}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
 				</div>
 			  </li>
+              </ul>
+			  <ul class="providers"> 
 			  <!--<li class="openid" title="OpenID">
 				  <div class="logo_box openid_box">
 						<img src="/content/jquery-openid/images/openid.gif" alt="icon" /> 
@@ -70,43 +72,43 @@
 			  <span><strong>http://{your-openid-url}</strong></span>
 			  </li>-->
 			  <li class="openid first_tiny_li" title="OpenID URL"> 
-					<img src="/content/jquery-openid/images/openidico16.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/openidico16.png" %}" alt="icon" />
 					<span>http://{your-openid-url}</span>
 		      </li> 
 			  <li class="username" title="MyOpenID user name"> 
-					<img src="/content/jquery-openid/images/myopenid-2.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/myopenid-2.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.myopenid.com/</span>
 		      </li> 
 			  <li class="username" title="Flickr user name"> 
-					<img src="/content/jquery-openid/images/flickr.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/flickr.png" %}" alt="icon" />
 					<span>http://flickr.com/<strong>username</strong>/</span>
 			  </li> 
 			  <li class="username" title="Technorati user name"> 
-					<img src="/content/jquery-openid/images/technorati-1.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/technorati-1.png" %}" alt="icon" />
 					<span>http://technorati.com/people/technorati/<strong>username</strong>/</span>
 			  </li> 
 			  <li class="username" title="Wordpress blog name"> 
-					<img src="/content/jquery-openid/images/wordpress.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/wordpress.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.wordpress.com</span>
               </li> 
 			  <li class="username" title="Blogger blog name"> 
-					<img src="/content/jquery-openid/images/blogger-1.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/blogger-1.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.blogspot.com/</span>
 			  </li> 
 			  <li class="username" title="LiveJournal blog name"> 
-					<img src="/content/jquery-openid/images/livejournal-1.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/livejournal-1.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.livejournal.com</span>
 			  </li> 
 			  <li class="username" title="ClaimID user name"> 
-					<img src="/content/jquery-openid/images/claimid-0.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/claimid-0.png" %}" alt="icon" />
 					<span>http://claimid.com/<strong>username</strong></span>
 			  </li> 
 			  <li class="username" title="Vidoop user name"> 
-					<img src="/content/jquery-openid/images/vidoop.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/vidoop.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.myvidoop.com/</span>
 			  </li> 
 			  <li class="username" title="Verisign user name"> 
-					<img src="/content/jquery-openid/images/verisign-2.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/verisign-2.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.pip.verisignlabs.com/</span>
 			  </li> 
 			  </ul>
@@ -125,27 +127,17 @@
 			  </fieldset> 
               <fieldset id='local_login_fs'>
 				  <p>{% trans 'Enter your login name and password' %}</p> 
-                        {% if form1.errors %}
-                        <p class="errors">
-                            <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
-                            <ul class="error-list">
-                                {% if form1.username.errors %} 
-                                <li><span class="error">{{ form1.username.errors|join:", " }}</span></li>
-                                {% endif %}
-                                {% if form1.password.errors %} 
-                                <li><span class="error">{{ form1.password.errors|join:", " }}</span></li>
-                                {% endif %}
-                            </ul>
-                        </p>
-                        {% endif %}
-				  <div><label for="username">{% trans "Login name" %}</label>
-                            {{form1.username}}<br/>
-                  <label for="password">{% trans "Password" %}</label>
-                            {{form1.password}}<br/>
+                  {% if form1.errors %}
+                    {{form1.non_field_errors.as_ul}}
+                  {% endif %}
+				  <div><p class="login"><label for="id_username">{% trans "Login name" %}</label>
+                            {{form1.username}}</p>
+                  <p class="login"><label for="id_password">{% trans "Password" %}</label>
+                            {{form1.password}}</p>
                   <p id="local_login_buttons">
 				  <input id="blogin" name="blogin" type="submit" value="{% trans "Login" %}" />
                   <a href="{% url user_signup %}">{% trans "Create account" %}</a><br/>
-                  <a href="{% url user_sendpw %}">{% trans "I forgot my password" %}</a>
+                  <a href="{% url user_sendpw %}">{% trans "Forgot your password?" %}</a>
                   </p>
                   </div>
               </fieldset>
@@ -170,9 +162,9 @@
         </li>
         
     </ul>
-    <p>
-    <a href="http://openid.net/what/" target="_blank" style="float:right;position:relative">{% trans "Find out more" %} »</a><br/>
-    <a href="http://openid.net/get/" target="_blank" style="float:right;position:relative">{% trans "Get OpenID" %} »</a>
+    <p class="info-box-follow-up-links">
+        <a href="http://openid.net/what/" target="_blank">{% trans "Find out more" %} »</a><br/>
+        <a href="http://openid.net/get/" target="_blank">{% trans "Get OpenID" %} »</a>
     </p>
 </div>
 {% endblock%}
diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html
index 5e405d3f..45dfb51b 100644
--- a/templates/authopenid/signup.html
+++ b/templates/authopenid/signup.html
@@ -1,53 +1,22 @@
-{% extends "base.html" %}
+{% extends "base_content.html" %}
 <!--signup.html-->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %}
 
 {% block content %}
-<div id="main-bar" class="">
-    <h3 >{% trans "Signup" %}</h3>
-
-</div>
-<div class="jointxt">
-    <p>{% trans "We support two types of user registration: conventional username/password, and" %} <a href="{% url user_signin %}">{% trans "the OpenID method" %}</a>.</p>
-
-    {% if form.errors %}
-    
-    <p class="errors">
-        <span class="big">{% trans "Sorry, looks like we have some errors" %}</span><br/>
-        <ul class="error-list">
-        {% if form.username.errors %} 
-        <li><span class="error">{{ form.username.errors|join:", " }}</span></li>
-        {% endif %}
-        {% if form.email.errors %} 
-        <li><span class="error">{{ form.email.errors|join:", " }}</span></li>
-        {% endif %}
-        {% if form.password2.errors %} 
-        <li><span class="error">{{ form.password2.errors|join:", " }}
-        </span></li>
-        {% endif %}
-        </ul>
-    </p>
-    {% endif %}
+<div class="headNormal">
+    {% trans "Create login name and password" %}
 </div>
-    <form action="{% url user_signup %}" method="post" accept-charset="utf-8">
-        <fieldset class="fieldset">
-        <legend class="big">{% trans "Conventional registration" %}</legend>	
-            <div class="form-row"><label for="id_username">{% trans "choose a user name" %}:</label><br/>{{ form.username }}</div>
-
-            <div class="form-row"><label for="id_email">{% trans "your email address" %}:</label><br/>{{ form.email }}</div>
-            <div class="form-row"><label for="id_password1">{% trans "choose password" %}:</label><br />{{ form.password1 }}</div>
-            <div class="form-row"><label for="id_password2">{% trans "retype password" %}:</label><br/>{{ form.password2 }}</div>
-            <div class="submit-row"><input type="submit" class="submit" value="{% trans "login" %}" > 
-			<a href="{% url user_signin %}">{% trans "back to login" %}</a></div>
-        </fieldset>
-    </form>
-    <div style="display:none">
-    <h2 class="signup">{% trans "Register with your OpenID" %}</h2>
-    <form name="fopenid" action="{% url user_signin %}" method="post">
-        <div class="form-row">{{ form2.openid_url }}</div>
-        <div class="submit-row "><input name="bsignin" class="submit" type="submit" value="{% trans "Login with your OpenID" %}"></div>
-    </form>
-    </div>
+<p class="message">{% trans "Traditional signup info" %}</p>
+<form action="{% url user_signup %}" method="post" accept-charset="utf-8">
+    <ul class="form-horizontal-rows">
+    {{form.as_ul}}
+    </ul>
+    <p style="margin:10px 0px 0px 3px;">{% trans "receive updates motivational blurb" %}</p>
+    {% include "edit_user_email_feeds_form.html" %}
+    <div class="submit-row"><input type="submit" class="submit" value="{% trans "Create Account" %}" /> 
+    <strong>{% trans "or" %}
+    <a href="{% url user_signin %}">{% trans "return to OpenID login" %}</a></strong></div>
+</form>
 {% endblock %}
 <!--end signup.html-->
diff --git a/templates/badges.html b/templates/badges.html
index 4a1ba091..1902a3b0 100644
--- a/templates/badges.html
+++ b/templates/badges.html
@@ -19,7 +19,9 @@
 <div class="badges" id="main-body" style="width:100%">
     <p>
 	{% trans "Community gives you awards for your questions, answers and votes." %}<br/>
-	{% trans "Below is the list of available badges and number of times each type of badge has been awarded." %}
+	{% blocktrans %}Below is the list of available badges and number 
+    of times each type of badge has been awarded. Give us feedback at {{feedback_faq_url}}.
+    {% endblocktrans %}
     </p>
     <div id="medalList">
         {% for badge in badges %}
@@ -32,7 +34,7 @@
             {% endfor %}
             </div>
             <div style="float:left;width:180px;">
-                <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a><strong> &#x2715; {{ badge.awarded_count|intcomma }}</strong>
+                <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a><strong> &#215; {{ badge.awarded_count|intcomma }}</strong>
             </div>
             <p style="float:left;width:350px;">
                 {{ badge.description }}
diff --git a/templates/base.html b/templates/base.html
index 0f568f73..2b933c4a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!-- template base.html -->
 {% load extra_filters %}
+{% load extra_tags %}
 {% load i18n %}
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
@@ -12,16 +13,16 @@
         {% if settings.GOOGLE_SITEMAP_CODE %}
         <meta name="verify-v1" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
         {% endif %}
-        <link rel="shortcut icon" href="/content/images/favicon.ico" />
-        <link href="/content/style/style.css" rel="stylesheet" type="text/css" />
+        <link rel="shortcut icon" href="{% href "/content/images/favicon.ico" %}" />
+        <link href="{% href "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
         <script src="http://www.google.com/jsapi" type="text/javascript"></script>
         <script type="text/javascript">google.load("jquery", "1.2.6");</script>
 		<script type="text/javascript">
 			var i18nLang = '{{settings.LANGUAGE_CODE}}';
 		</script>
-        <script type='text/javascript' src='/content/js/com.cnprog.i18n.js'></script>
-		<script type='text/javascript' src='/content/js/jquery.i18n.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.utils.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script>
+		<script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.utils.js" %}'></script>
         <!--<script type="text/javascript">
         var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
         document.write(unescape("%3Cscript src='" + uservoiceJsHost + "/javascripts/widgets/tab.js' type='text/javascript'%3E%3C/script%3E"))
@@ -39,7 +40,7 @@
         })
         </script>-->
 		<!-- todo move this to settings -->
-        {% if messages %}
+        {% if user_messages %}
         <style type="text/css">
             body { margin-top:2.4em; }
         </style>
@@ -57,8 +58,8 @@
     <body>
         <div class="notify" style="display:none">
             {% autoescape off %}
-                {% if messages %}
-                    {% for message in messages %}
+                {% if user_messages %}
+                    {% for message in user_messages %}
                           <p class="darkred">{{ message }}<p>
                     {% endfor %}
                 {% endif %}
diff --git a/templates/base_content.html b/templates/base_content.html
index a05198f5..52cc6134 100644
--- a/templates/base_content.html
+++ b/templates/base_content.html
@@ -1,13 +1,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!-- base_content.html -->
 {% load i18n %}
+{% load extra_tags %}
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <meta name="verify-v1" content="{{ settings.GOOGLE_SITEMAP_CODE }}" />
-        <link rel="shortcut icon" href="/content/images/favicon.ico" />
-        <link href="/content/style/style.css" rel="stylesheet" type="text/css" />
+        <link rel="shortcut icon" href="{% href "/content/images/favicon.ico" %}" />
+        <link href="{% href "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
 		 {% spaceless %}
         {% block forestyle %}{% endblock %}
         {% endspaceless %}
@@ -16,9 +17,9 @@
 		<script type="text/javascript">
 			var i18nLang = '{{ settings.LANGUAGE_CODE }}';
 		</script>
-        <script type='text/javascript' src='/content/js/com.cnprog.i18n.js'></script>
-	    <script type='text/javascript' src='/content/js/jquery.i18n.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.utils.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script>
+	    <script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.utils.js" %}'></script>
 
        <!-- <script type="text/javascript">
         var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
@@ -39,7 +40,7 @@
         </script>-->
 		<!-- todo move this to settings-->
 
-        {% if messages %}
+        {% if user_messages %}
         <style type="text/css">
             body { margin-top:2.4em; }
         </style>
@@ -58,8 +59,8 @@
     <body>
         <div class="notify" style="display:none">
             {% autoescape off %}
-                {% if messages %}
-                    {% for message in messages %}
+                {% if user_messages %}
+                    {% for message in user_messages %}
                           <p class="darkred">{{ message }}<p>
                     {% endfor %}
                 {% endif %}
diff --git a/templates/book.html b/templates/book.html
index cc6fc77b..e83268e4 100644
--- a/templates/book.html
+++ b/templates/book.html
@@ -85,12 +85,12 @@
                 {% if question.favourite_count %}
                     {% if question.favorited_myself %}
                         <div class="favorites-count">
-                            <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="/content/images/vote-favorite-on.png">
+                            <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="{% href "/content/images/vote-favorite-on.png" %}">
                             <div><b>{{question.favourite_count|intcomma}}</b></div>
                         </div>
                     {% else %}
                         <div class="favorites-count-off">
-                            <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="/content/images/vote-favorite-off.png">
+                            <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="{% href "/content/images/vote-favorite-off.png" %}">
                             <div><b>{{question.favourite_count|intcomma}}</b></div>
                         </div>
                     {% endif %}
@@ -144,7 +144,7 @@
                         </div>
                         <div class="bookFeed">
                             <div id="feeds">
-                                <a href="/feeds/rss" title="{% trans "subscribe to book RSS feed" %}">{% trans "subscribe to the questions feed" %}</a>
+                                <a href="{% href "/feeds/rss" %} " title="{% trans "subscribe to book RSS feed" %}">{% trans "subscribe to the questions feed" %}</a>
                             </div>
                         </div>
 
diff --git a/templates/content/images/blue-up-arrow-h18px.png b/templates/content/images/blue-up-arrow-h18px.png
new file mode 100644
index 00000000..e1f29e86
Binary files /dev/null and b/templates/content/images/blue-up-arrow-h18px.png differ
diff --git a/templates/content/images/cnprog_logo_200_56.gif b/templates/content/images/cnprog_logo_200_56.gif
deleted file mode 100644
index ab690de2..00000000
Binary files a/templates/content/images/cnprog_logo_200_56.gif and /dev/null differ
diff --git a/templates/content/images/gray-up-arrow-h18px.png b/templates/content/images/gray-up-arrow-h18px.png
new file mode 100644
index 00000000..78767445
Binary files /dev/null and b/templates/content/images/gray-up-arrow-h18px.png differ
diff --git a/templates/content/images/logo.gif b/templates/content/images/logo.gif
new file mode 100644
index 00000000..ab690de2
Binary files /dev/null and b/templates/content/images/logo.gif differ
diff --git a/templates/content/images/logo.png b/templates/content/images/logo.png
index 640eb1da..b53732e3 100644
Binary files a/templates/content/images/logo.png and b/templates/content/images/logo.png differ
diff --git a/templates/content/jquery-openid/jquery.openid.js b/templates/content/jquery-openid/jquery.openid.js
index 6486fd39..763af2c6 100644
--- a/templates/content/jquery-openid/jquery.openid.js
+++ b/templates/content/jquery-openid/jquery.openid.js
@@ -36,7 +36,7 @@ $.fn.openid = function() {
   };
   var local = function() {
     var $li = $(this);
-    $li.parent().find('li').removeClass('highlight');
+    $('#openid_form .providers li').removeClass('highlight');
     $li.addClass('highlight');
     $usrfs.hide();
     $idfs.hide();
@@ -47,7 +47,7 @@ $.fn.openid = function() {
 
   var direct = function() {
     var $li = $(this);
-    $li.parent().find('li').removeClass('highlight');
+    $('#openid_form .providers li').removeClass('highlight');
     $li.addClass('highlight');
     $usrfs.fadeOut('slow');
     $localfs.fadeOut('slow');
@@ -59,7 +59,7 @@ $.fn.openid = function() {
 
   var openid = function() {
     var $li = $(this);
-    $li.parent().find('li').removeClass('highlight');
+    $('#openid_form .providers li').removeClass('highlight');
     $li.addClass('highlight');
     $usrfs.hide();
     $localfs.hide();
@@ -71,7 +71,7 @@ $.fn.openid = function() {
 
   var username = function() {
     var $li = $(this);
-    $li.parent().find('li').removeClass('highlight');
+    $('#openid_form .providers li').removeClass('highlight');
     $li.addClass('highlight');
     $idfs.hide();
     $localfs.hide();
diff --git a/templates/content/jquery-openid/openid.css b/templates/content/jquery-openid/openid.css
index 2ec8adf4..88960b56 100644
--- a/templates/content/jquery-openid/openid.css
+++ b/templates/content/jquery-openid/openid.css
@@ -1,28 +1,35 @@
-fieldset {border-style:none;}
+fieldset { border-style:none; }
 img {border-style:none;}
 
-.logo_box {display:inline-block;width:90px;height:40px;background:white;border:1px solid #dddddd;}
+.logo_box {display:inline-block;float:left;width:90px;height:40px;background:white;border:1px solid #dddddd;}
 .openid_box img {margin-top:6px;}
 .aol_box img {margin-top:6px;}
 .yahoo_box img {margin-top:13px;}
 .google_box img {margin-top:6px;}
-.local_login_box img {margin-top:9px;}
+.local_login_box img {margin-top:2px;margin-left:-3px;}
 
 form.openid ul{ margin:0;padding:0;text-align:center; list-style-type:none; display:block;}
-form.openid ul li {float:left; padding:4px;} 
+form.openid ul li {float:left; padding:4px;display:inline-block;} 
+form.openid ul li div {display:inline-block;} 
 form.openid ul li span {padding:0 1em 0 3px}
 form.openid ul li.first_tiny_li {clear:left;}
 form.openid fieldset {clear:both;padding:10px 0px 0px 0px;}
 form.openid div+fieldset {display:none}
-form.openid label {display:block; font-weight:bold; margin-bottom:.5em}
+form.openid label {display:block; font-weight:bold;}
 input[name=openid_username] {width:8em}
 input[name=openid_identifier] {width:18em}
 form.openid ul li.highlight { -moz-border-radius:4px; -webkit-border-radius:4px; background-color: #FD6}
-form.openid fieldset div {-moz-border-radius:4px; -webkit-border-radius:4px; 
-                          background: #DCDCDC;
-						  padding:10px;display:inline-block}
+form.openid fieldset div {
+    -moz-border-radius:4px; 
+    -webkit-border-radius:4px; 
+    background: #DCDCDC;
+    padding:10px;
+    display:inline-block;
+    float:left;
+}
 form.openid p {margin-bottom:4px;}
 form.openid fieldset div p {padding:0px;margin:0px;}
+form.openid fieldset div p.login {padding:0px;margin:0 0 10px 0;}
 form.openid label {
     display:inline-block;
     font-weight:normal;
@@ -47,3 +54,16 @@ background: url(images/openidico.png) no-repeat;
 
 #openid_login {float:left; width:30%; margin:2em 1em; text-align:center}
 #openid_login div{margin-top:0.5em}
+
+form.openid ul.errorlist {
+    border: none;
+    list-style-position:inside;
+    list-style-type: disc;
+    margin-bottom:5px;
+}
+form.openid ul.errorlist li {
+    text-align: left;
+    margin: 5px;
+    float: none;
+    color:blue;
+}
diff --git a/templates/content/js/com.cnprog.admin.js b/templates/content/js/com.cnprog.admin.js
new file mode 100644
index 00000000..73b5768f
--- /dev/null
+++ b/templates/content/js/com.cnprog.admin.js
@@ -0,0 +1,13 @@
+$().ready( function(){
+    var options = {
+                   success: function(a,b){$('.admin #action_status').html($.i18n._('changes saved'));},
+                   dataType:'json',
+                   timeout:5000,
+                   url: $.i18n._('/') + $.i18n._('moderate-user/') + viewUserID +  '/'
+                    };
+    var form = $('.admin #moderate_user_form').ajaxForm(options);
+    var box = $('.admin input#id_is_approved').click(function(){ 
+        $('.admin #action_status').html($.i18n._('sending data...'));
+        form.ajaxSubmit(options);
+    });
+});
diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index 6ba8b59d..d2356abc 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -20,7 +20,7 @@ var i18nZh = {
 	'post recovered':"操作成功！该帖子已被恢复。",
 	'post deleted':"操作成功！该帖子已删除。",
 	'add comment':'添加评论',
-	'community reputation points':'社区积分',
+	'community karma points':'社区积分',
 	'to comment, need':'评论需要',
 	'delete this comment':'删除此评论',
 	'hide comments':"隐藏评论",
@@ -53,27 +53,29 @@ var i18nZh = {
 	'redo':'重做',
 	'enter image url':'<b>输入图片地址</b></p><p>示例：<br />http://www.example.com/image.jpg   \"我的截图\"',
 	'enter url':'<b>输入Web地址</b></p><p>示例：<br />http://www.cnprog.com/   \"我的网站\"</p>"',
-	'upload image':'或者上传本地图片：',
+	'upload image':'或者上传本地图片：'
 };
 
 var i18nEn = {
-    '>15 points requried to upvote':'>15 points requried to upvote ',
+    '/':'/',
+	'need >15 points to report spam':'need >15 points to report spam ',
+    '>15 points requried to upvote':'>15 points required to upvote ',
 	'tags cannot be empty':'please enter at least one tag',
-	'anonymous users cannot vote':'anonymous users cannot vote ',
-	'anonymous users cannot select favorite questions':'anonymous users cannot select favorite questions ',
-	'to comment, need': 'to comment, need reputation ',
+	'anonymous users cannot vote':'sorry, anonymous users cannot vote ',
+	'anonymous users cannot select favorite questions':'sorry, anonymous users cannot select favorite questions ',
+	'to comment, need': '(to comment other people\'s posts, karma ',
 	'please see':'please see ',
-	'community reputation points':' ',
+	'community karma points':' or more is necessary) - ',
 	'upload image':'Upload image:',
 	'enter image url':'enter URL of the image, e.g. http://www.example.com/image.jpg \"image title\"',
 	'enter url':'enter Web address, e.g. http://www.example.com \"page title\"',
 	'daily vote cap exhausted':'sorry, you\'ve used up todays vote cap',
-	'cannot pick own answer as best':'cannot accept own answer',
-	'cannot revoke old vote':'older votes cannot be revoked',
+	'cannot pick own answer as best':'sorry, you cannot accept your own answer',
+	'cannot revoke old vote':'sorry, older votes cannot be revoked',
 	'please confirm offensive':'are you sure this post is offensive, contains spam, advertising, malicious remarks, etc.?',
-	'flag offensive cap exhausted':'sorry, you\'ve used up todays cap of flagging offensive messages',
+	'flag offensive cap exhausted':'sorry, you\'ve used up todays cap of flagging offensive messages ',
 	'confirm delete':'are you sure you want to delete this?',
-	'anonymous users cannot delete/undelete':'anonymous users cannot delete or undelete posts',
+	'anonymous users cannot delete/undelete':'sorry, anonymous users cannot delete or undelete posts',
 	'post recovered':'your post is now restored!',
 	'post deleted':'your post has been deleted',
 	'confirm delete comment':'do you really want to delete this comment?',
@@ -82,6 +84,9 @@ var i18nEn = {
 	'content minchars': 'please enter more than {0} characters',
 	'title minchars':"please enter at least {0} characters",
 	'characters':'characters left',
+    'cannot vote for own posts':'sorry, you cannot vote for your own posts',
+    'cannot flag message as offensive twice':'cannot flag message as offensive twice ',
+	'>100 points required to downvote':'>100 points required to downvote '
 };
 
 var i18nEs = {
@@ -106,7 +111,7 @@ var i18nEs = {
 	'post recovered':"publicación recuperada",
 	'post deleted':"publicación borrada。",
 	'add comment':'agregar comentario',
-	'community reputation points':'reputación comunitaria',
+	'community karma points':'reputación comunitaria',
 	'to comment, need':'para comentar, necesita reputación',
 	'delete this comment':'borrar este comentario',
 	'hide comments':"ocultar comentarios",
@@ -141,7 +146,7 @@ var i18nEs = {
 	'enter url':'introduzca direcciones web, ejemplo：<br />http://www.cnprog.com/   \"titulo del enlace\"</p>"',
 	'upload image':'cargar imagen：',
 	'questions/' : 'preguntas/',
-	'vote/' : 'votar/',
+	'vote/' : 'votar/'
 };
 
 var i18n = {
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index aa6c51b6..58db9b33 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -52,31 +52,25 @@ var Vote = function(){
     
     var acceptAnonymousMessage = $.i18n._('insufficient privilege');
     var acceptOwnAnswerMessage = $.i18n._('cannot pick own answer as best');
-    var favoriteAnonymousMessage = $.i18n._('anonymous users cannot select favorite questions') 
-					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
-					+ $.i18n._('please login') + "</a>";
-    var voteAnonymousMessage = $.i18n._('anonymous users cannot vote') 
-					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
+
+    var pleaseLogin = "<a href='" + $.i18n._("/") + $.i18n._("account/") + $.i18n._("signin/")
+                    + "?next=" + $.i18n._("/") + $.i18n._("questions/") + "{{QuestionID}}'>"
 					+ $.i18n._('please login') + "</a>";
-    var upVoteRequiredScoreMessage = $.i18n._('>15 points requried to upvote') 
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var downVoteRequiredScoreMessage = $.i18n._('>100 points requried to downvote')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+
+    var pleaseSeeFAQ = $.i18n._('please see') + "<a href='" + $.i18n._("/") + $.i18n._("faq/") + "'>faq</a>";
+
+    var favoriteAnonymousMessage = $.i18n._('anonymous users cannot select favorite questions') 
+    var voteAnonymousMessage = $.i18n._('anonymous users cannot vote') + pleaseLogin;
+    var upVoteRequiredScoreMessage = $.i18n._('>15 points requried to upvote') + pleaseSeeFAQ;
+    var downVoteRequiredScoreMessage = $.i18n._('>100 points required to downvote') + pleaseSeeFAQ;
     var voteOwnDeniedMessage = $.i18n._('cannot vote for own posts');
-    var voteRequiredMoreVotes = $.i18n._('daily vote cap exhausted')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var voteDenyCancelMessage = $.i18n._('cannot revoke old vote')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+    var voteRequiredMoreVotes = $.i18n._('daily vote cap exhausted') + pleaseSeeFAQ;
+    var voteDenyCancelMessage = $.i18n._('cannot revoke old vote') + pleaseSeeFAQ;
     var offensiveConfirmation = $.i18n._('please confirm offensive');
-    var offensiveAnonymousMessage = $.i18n._('anonymous users cannot flag offensive posts')
-					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
-					+ $.i18n._('please login') + "</a>";
-    var offensiveTwiceMessage = $.i18n._('cannot flag message as offensive twice')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var offensiveNoFlagsLeftMessage = $.i18n._('flag offensive cap exhausted')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var offensiveNoPermissionMessage = $.i18n._('need >15 points to report spam')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+    var offensiveAnonymousMessage = $.i18n._('anonymous users cannot flag offensive posts') + pleaseLogin;
+    var offensiveTwiceMessage = $.i18n._('cannot flag message as offensive twice') + pleaseSeeFAQ;
+    var offensiveNoFlagsLeftMessage = $.i18n._('flag offensive cap exhausted') + pleaseSeeFAQ;
+    var offensiveNoPermissionMessage = $.i18n._('need >15 points to report spam') + pleaseSeeFAQ;
     var removeConfirmation = $.i18n._('confirm delete');
     var removeAnonymousMessage = $.i18n._('anonymous users cannot delete/undelete');
     var recoveredMessage = $.i18n._('post recovered');
@@ -94,7 +88,7 @@ var Vote = function(){
         removeQuestion: 9,
         removeAnswer:10,
         questionSubscribeUpdates:11,
-        questionUnsubscribeUpdates:12,
+        questionUnsubscribeUpdates:12
     };
 
     var getFavoriteButton = function(){
@@ -131,7 +125,7 @@ var Vote = function(){
     };
     
     var getOffensiveQuestionFlag = function(){
-        var offensiveQuestionFlag = 'table[id=question-table] span[class='+ offensiveClassFlag +']';
+        var offensiveQuestionFlag = '#question-table span[class='+ offensiveClassFlag +']';
         return $(offensiveQuestionFlag);
     };
     
@@ -157,17 +151,17 @@ var Vote = function(){
     var setVoteImage = function(voteType, undo, object){
         var flag = undo ? "" : "-on";
         var arrow = (voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote) ? "up" : "down";
-        object.attr("src", "/content/images/vote-arrow-"+ arrow + flag +".png");
+        object.attr("src", $.i18n._("/") + "content/images/vote-arrow-"+ arrow + flag +".png");
         
         // if undo voting, then undo the pair of arrows.
         if(undo){
             if(voteType == VoteType.questionUpVote || voteType == VoteType.questionDownVote){
-                $(getQuestionVoteUpButton()).attr("src", "/content/images/vote-arrow-up.png");
-                $(getQuestionVoteDownButton()).attr("src", "/content/images/vote-arrow-down.png");
+                $(getQuestionVoteUpButton()).attr("src", $.i18n._("/") + "content/images/vote-arrow-up.png");
+                $(getQuestionVoteDownButton()).attr("src", $.i18n._("/") + "content/images/vote-arrow-down.png");
             }
             else{
-                $(getAnswerVoteUpButton(postId)).attr("src", "/content/images/vote-arrow-up.png");
-                $(getAnswerVoteDownButton(postId)).attr("src", "/content/images/vote-arrow-down.png");
+                $(getAnswerVoteUpButton(postId)).attr("src", $.i18n._("/") + "content/images/vote-arrow-up.png");
+                $(getAnswerVoteDownButton(postId)).attr("src", $.i18n._("/") + "content/images/vote-arrow-down.png");
             }
         }
     };
@@ -182,42 +176,42 @@ var Vote = function(){
         if(questionAuthorId == currentUserId){
             var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']';
             $(acceptedButtons).unbind('click').click(function(event){
-               Vote.accept($(event.target))
+               Vote.accept($(event.target));
             });
         }
         // set favorite question
         var favoriteButton = getFavoriteButton();
         favoriteButton.unbind('click').click(function(event){
-           Vote.favorite($(event.target))
+           Vote.favorite($(event.target));
         });
     
         // question vote up
         var questionVoteUpButton = getQuestionVoteUpButton();
         questionVoteUpButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.questionUpVote)
+           Vote.vote($(event.target), VoteType.questionUpVote);
         });
     
         var questionVoteDownButton = getQuestionVoteDownButton();
         questionVoteDownButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.questionDownVote)
+           Vote.vote($(event.target), VoteType.questionDownVote);
         });
     
         var answerVoteUpButton = getAnswerVoteUpButtons();
         answerVoteUpButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.answerUpVote)
+           Vote.vote($(event.target), VoteType.answerUpVote);
         });
         
         var answerVoteDownButton = getAnswerVoteDownButtons();
         answerVoteDownButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.answerDownVote)
+           Vote.vote($(event.target), VoteType.answerDownVote);
         });
     
         getOffensiveQuestionFlag().unbind('click').click(function(event){
-           Vote.offensive(this, VoteType.offensiveQuestion)
+           Vote.offensive(this, VoteType.offensiveQuestion);
         });
     
         getOffensiveAnswerFlags().unbind('click').click(function(event){
-           Vote.offensive(this, VoteType.offensiveAnswer)
+           Vote.offensive(this, VoteType.offensiveAnswer);
         });
     
         getremoveQuestionLink().unbind('click').click(function(event){
@@ -234,7 +228,7 @@ var Vote = function(){
         });
     
         getremoveAnswersLinks().unbind('click').click(function(event){
-            Vote.remove(this, VoteType.removeAnswer)
+            Vote.remove(this, VoteType.removeAnswer);
         });
     };
     
@@ -243,14 +237,14 @@ var Vote = function(){
             type: "POST",
             cache: false,
             dataType: "json",
-            url: "/" + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"),
+            url: $.i18n._("/") + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"),
             data: { "type": voteType, "postId": postId },
             error: handleFail,
             success: function(data){callback(object, voteType, data)}});
     };
     
     var handleFail = function(xhr, msg){
-        alert("Callback invoke error: " + msg)
+        alert("Callback invoke error: " + msg);
     };
 
     // callback function for Accept Answer action
@@ -262,19 +256,19 @@ var Vote = function(){
             showMessage(object, acceptOwnAnswerMessage);
         }
         else if(data.status == "1"){
-            object.attr("src", "/content/images/vote-accepted.png");
+            object.attr("src", $.i18n._("/") + "content/images/vote-accepted.png");
             $("#"+answerContainerIdPrefix+postId).removeClass("accepted-answer");
             $("#"+commentLinkIdPrefix+postId).removeClass("comment-link-accepted");
         }
         else if(data.success == "1"){
             var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']';
-            $(acceptedButtons).attr("src", "/content/images/vote-accepted.png");
+            $(acceptedButtons).attr("src", $.i18n._("/") + "content/images/vote-accepted.png");
             var answers = ("div[id^="+answerContainerIdPrefix +"]");
             $(answers).removeClass("accepted-answer");
             var commentLinks = ("div[id^="+answerContainerIdPrefix +"] div[id^="+ commentLinkIdPrefix +"]");
             $(commentLinks).removeClass("comment-link-accepted");
             
-            object.attr("src", "/content/images/vote-accepted-on.png");
+            object.attr("src", $.i18n._("/") + "content/images/vote-accepted-on.png");
             $("#"+answerContainerIdPrefix+postId).addClass("accepted-answer");
             $("#"+commentLinkIdPrefix+postId).addClass("comment-link-accepted");
         }
@@ -288,7 +282,7 @@ var Vote = function(){
             showMessage(object, favoriteAnonymousMessage.replace("{{QuestionID}}", questionId));
         }
         else if(data.status == "1"){
-            object.attr("src", "/content/images/vote-favorite-off.png");
+            object.attr("src", $.i18n._("/") + "content/images/vote-favorite-off.png");
             var fav = getFavoriteNumber();
             fav.removeClass("my-favorite-number");
             if(data.count == 0)
@@ -296,7 +290,7 @@ var Vote = function(){
             fav.text(data.count);
         }
         else if(data.success == "1"){
-            object.attr("src", "/content/images/vote-favorite-on.png");
+            object.attr("src", $.i18n._("/") + "/content/images/vote-favorite-on.png");
             var fav = getFavoriteNumber();
             fav.text(data.count);
             fav.addClass("my-favorite-number");
@@ -310,69 +304,75 @@ var Vote = function(){
         if(data.allowed == "0" && data.success == "0"){
             showMessage(object, voteAnonymousMessage.replace("{{QuestionID}}", questionId));
         }
-        else if(data.allowed == "-3"){
+        else if (data.allowed == "-3"){
             showMessage(object, voteRequiredMoreVotes);
         }
-        else if(data.allowed == "-2"){
-            if(voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote){
+        else if (data.allowed == "-2"){
+            if (voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote){
                 showMessage(object, upVoteRequiredScoreMessage);
             }
-            else if(voteType == VoteType.questionDownVote || voteType == VoteType.answerDownVote){
+            else if (voteType == VoteType.questionDownVote || voteType == VoteType.answerDownVote){
                 showMessage(object, downVoteRequiredScoreMessage);
             }
         }
-        else if(data.allowed == "-1"){
+        else if (data.allowed == "-1"){
             showMessage(object, voteOwnDeniedMessage);
         }
-        else if(data.status == "2"){
+        else if (data.status == "2"){
             showMessage(object, voteDenyCancelMessage);
         }
-        else if(data.status == "1"){
+        else if (data.status == "1"){
             setVoteImage(voteType, true, object);
             setVoteNumber(object, data.count);
         }     
-        else if(data.success == "1"){
+        else if (data.success == "1"){
             setVoteImage(voteType, false, object);
             setVoteNumber(object, data.count);
-            if(data.message.length > 0)
+            if (data.message.length > 0){
                 showMessage(object, data.message);
+            }
         }
     };
         
     var callback_offensive = function(object, voteType, data){
         object = $(object);
-        if(data.allowed == "0" && data.success == "0"){
+        if (data.allowed == "0" && data.success == "0"){
             showMessage(object, offensiveAnonymousMessage.replace("{{QuestionID}}", questionId));
         }
-        else if(data.allowed == "-3"){
+        else if (data.allowed == "-3"){
             showMessage(object, offensiveNoFlagsLeftMessage);
         }  
-        else if(data.allowed == "-2"){
+        else if (data.allowed == "-2"){
             showMessage(object, offensiveNoPermissionMessage);
         }  
-        else if(data.status == "1"){
+        else if (data.status == "1"){
             showMessage(object, offensiveTwiceMessage);
         }  
-        else if(data.success == "1"){
+        else if (data.success == "1"){
             $(object).children('span[class=darkred]').text("("+ data.count +")");
         }
     };
         
     var callback_remove = function(object, voteType, data){
-        if(data.allowed == "0" && data.success == "0"){
+        if (data.allowed == "0" && data.success == "0"){
             showMessage(object, removeAnonymousMessage.replace("{{QuestionID}}", questionId));
         }
         else if (data.success == "1"){
-			if (removeActionType == 'delete'){
-				postNode.addClass('deleted');
-				postRemoveLink.innerHTML = $.i18n._('undelete');
-        		showMessage(object, deletedMessage);
-			}
-			else if (removeActionType == 'undelete') {
-				postNode.removeClass('deleted');
-				postRemoveLink.innerHTML = $.i18n._('delete');
-            	showMessage(object, recoveredMessage);
-			}
+            if (voteType == VoteType.removeQuestion){
+                window.location.href = $.i18n._("/") + $.i18n._("questions/");
+            }
+            else {
+                if (removeActionType == 'delete'){
+                    postNode.addClass('deleted');
+                    postRemoveLink.innerHTML = $.i18n._('undelete');
+                    showMessage(object, deletedMessage);
+                }
+                else if (removeActionType == 'undelete') {
+                    postNode.removeClass('deleted');
+                    postRemoveLink.innerHTML = $.i18n._('delete');
+                    showMessage(object, recoveredMessage);
+                }
+            }
 		}
     };
         
@@ -391,7 +391,7 @@ var Vote = function(){
         },
         
         favorite: function(object){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+            if (!currentUserId || currentUserId.toUpperCase() == "NONE"){
                 showMessage(object, favoriteAnonymousMessage.replace("{{QuestionID}}", questionId));
                 return false;
             }
@@ -399,14 +399,14 @@ var Vote = function(){
         },
             
         vote: function(object, voteType){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+            if (!currentUserId || currentUserId.toUpperCase() == "NONE"){
                 showMessage(object, voteAnonymousMessage.replace("{{QuestionID}}", questionId));
                 return false;   
             }
-            if(voteType == VoteType.answerUpVote){
+            if (voteType == VoteType.answerUpVote){
                 postId = object.attr("id").substring(imgIdPrefixAnswerVoteup.length);
             }
-            else if(voteType == VoteType.answerDownVote){
+            else if (voteType == VoteType.answerDownVote){
                 postId = object.attr("id").substring(imgIdPrefixAnswerVotedown.length);
             }
             
@@ -414,39 +414,43 @@ var Vote = function(){
         },
         
         offensive: function(object, voteType){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+            if (!currentUserId || currentUserId.toUpperCase() == "NONE"){
                 showMessage($(object), offensiveAnonymousMessage.replace("{{QuestionID}}", questionId));
                 return false;   
             }
-            if(confirm(offensiveConfirmation)){
+            if (confirm(offensiveConfirmation)){
                 postId = object.id.substr(object.id.lastIndexOf('-') + 1);
                 submit(object, voteType, callback_offensive);
             }
         },
             
         remove: function(object, voteType){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+            if (!currentUserId || currentUserId.toUpperCase() == "NONE"){
                 showMessage($(object), removeAnonymousMessage.replace("{{QuestionID}}", questionId));
                 return false;   
             }
-            if(confirm(removeConfirmation)){
-				bits = object.id.split('-');
-				postId = bits.pop();/* this seems to be used within submit! */
-				postType = bits.shift();
-
-				if (postType == 'answer'){
-					postNode = $('#answer-container-' + postId);
-					postRemoveLink = object;
-					if (postNode.hasClass('deleted')){
-						removeActionType = 'undelete';
-					}
-					else {
-						removeActionType = 'delete';
-					}
-				}
+            bits = object.id.split('-');
+            postId = bits.pop();/* this seems to be used within submit! */
+            postType = bits.shift();
+
+            var do_proceed = false; 
+            if (postType == 'answer'){
+                postNode = $('#answer-container-' + postId);
+                postRemoveLink = object;
+                if (postNode.hasClass('deleted')){
+                    removeActionType = 'undelete';
+                    do_proceed = true;
+                }
+                else {
+                    removeActionType = 'delete';
+                    do_proceed = confirm(removeConfirmation);
+                }
+            }
+            else {
+                do_proceed = confirm(removeConfirmation);
+            }
+            if (do_proceed) {
                 submit($(object), voteType, callback_remove);
-
-
             }
         }
     }
@@ -457,21 +461,24 @@ var Vote = function(){
 function createComments(type) {
     var objectType = type;
     var jDivInit = function(id) {
-        return $("#comments-" + objectType + '-' + id);
+        return $("#comments-container-" + objectType + '-' + id);
     };
 
     var appendLoaderImg = function(id) {
-        appendLoader("#comments-" + objectType + '-' + id + " div.comments");
+        appendLoader("#comments-container-" + objectType + '-' + id);
     };
 
-    var canPostComments = function(id, jDiv) {
-        var jHidden = jDiv.siblings("#can-post-comments-" + objectType + '-' + id);
+    var canPostComments = function(id) {
+        var jHidden = $("#can-post-comments-" + objectType + '-' + id);
         return jHidden.val().toLowerCase() == "true";
     };
 
-    var renderForm = function(id, jDiv) {
+    var renderForm = function(id) {
         var formId = "form-comments-" + objectType + "-" + id;
-        if (canPostComments(id, jDiv)) {
+        var jDiv = $('#comments-link-' + objectType + "-" + id).parent();
+        $(jDiv).css('background','none');
+        $(jDiv).css('padding-left',0);
+        if (canPostComments(id)) {
             if (jDiv.find("#" + formId).length == 0) {
                 var form = '<form id="' + formId + '" class="post-comments"><div>';
                 form += '<textarea name="comment" cols="60" rows="5" maxlength="300" onblur="'+ objectType +'Comments.updateTextCounter(this)" ';
@@ -490,64 +497,79 @@ function createComments(type) {
         else {
             var divId = "comments-rep-needed-" + objectType + '-' + id;
             if (jDiv.find("#" + divId).length == 0) {
-                jDiv.append('<div id="' + divId + '" style="color:red">'
+                jDiv.append('<p id="' + divId + '" class="comment">'
 					+ $.i18n._('to comment, need') + ' ' +
-					+ repNeededForComments + ' ' + $.i18n._('community reputation points')
-					+ '<a href="/faq" class="comment-user">' + $.i18n._('please see') + 'faq</a></span>');
+					+ repNeededForComments + ' ' + $.i18n._('community karma points') 
+					+ '<a href="' + $.i18n._('/') + $.i18n._('faq/') + '" class="comment-user">'
+                    + $.i18n._('please see') + 'faq</a></span></p>');
             }
         }
     };
 
     var getComments = function(id, jDiv) {
-        appendLoaderImg(id);
-        $.getJSON("/" + objectType + "s/" + id + "/comments/", function(json) { showComments(id, json); });
+        //appendLoaderImg(id);
+        $.getJSON($.i18n._("/") + objectType + "s/" + id + "/" + $.i18n._("comments/")
+                , function(json) { showComments(id, json); });
     };
 
     var showComments = function(id, json) {
         var jDiv = jDivInit(id);
 
-        jDiv = jDiv.find("div.comments");   // this div should contain any fetched comments..
-        jDiv.find("div[id^='comment-" + objectType + "-'" + "]").remove();  // clean previous calls..
-
+        //jDiv = jDiv.find("div.comments");   // this div should contain any fetched comments..
+        //jDiv.find("div[id^='comment-" + objectType + "-'" + "]").remove();  // clean previous calls..
+        jDiv.children().remove();
         removeLoader();
-
         if (json && json.length > 0) {
             for (var i = 0; i < json.length; i++)
                 renderComment(jDiv, json[i]);
-
             jDiv.children().show();
         }
     };
 
+    var renderDeleteCommentIcon = function(post_id, delete_url){
+        if (canPostComments(post_id)){
+            var html = '';
+            var img = $.i18n._("/") + "content/images/close-small.png";
+            var imgHover = $.i18n._("/") + "content/images/close-small-hover.png";
+            html += '<img class="delete-icon" onclick="' + objectType + 'Comments.deleteComment($(this), ' + post_id + ', \'' + delete_url + '\')" src="' + img;
+            html += '" onmouseover="$(this).attr(\'src\', \'' + imgHover + '\')" onmouseout="$(this).attr(\'src\', \'' + img
+            html += '\')" title="' + $.i18n._('delete this comment') + '" />';
+            return html;
+        }
+        else{
+            return '';
+        }
+    }
+
     // {"Id":6,"PostId":38589,"CreationDate":"an hour ago","Text":"hello there!","UserDisplayName":"Jarrod Dixon","UserUrl":"/users/3/jarrod-dixon","DeleteUrl":null}
     var renderComment = function(jDiv, json) {
-        var html = '<div id="comment-' + objectType + "-" + json.id + '" style="display:none">' + json.text;
-        html += json.user_url ? '&nbsp;&ndash;&nbsp;<a href="' + json.user_url + '"' : '<span';
+        var html = '<p id="comment-' + json.id + '" class="comment" style="display:none">' + json.text;
+        html += json.user_url ? ' - <a href="' + json.user_url + '"' : '<span';
         html += ' class="comment-user">' + json.user_display_name + (json.user_url ? '</a>' : '</span>');
-        html += ' <span class="comment-date">(' + json.add_date + ')</span>';
+        html += ' (' + json.comment_age + ')';
+
+        if (json.delete_url){
+            html += renderDeleteCommentIcon(json.object_id, json.delete_url);
+        }
 
         if (json.delete_url) {
-            var img = "/content/images/close-small.png";
-            var imgHover = "/content/images/close-small-hover.png";
-            html += '<img onclick="' + objectType + 'Comments.deleteComment($(this), ' + json.object_id + ', \'' + json.delete_url + '\')" src="' + img;
-            html += '" onmouseover="$(this).attr(\'src\', \'' + imgHover + '\')" onmouseout="$(this).attr(\'src\', \'' + img
-            html += '\')" title="' + $.i18n._('delete this comment') + '" />';
         }
 
-        html += '</div>';
+        html += '</p>';
 
         jDiv.append(html);
     };
 
     var postComment = function(id, formId) {
-        appendLoaderImg(id);
+        //appendLoaderImg(id);
 
         var formSelector = "#" + formId;
         var textarea = $(formSelector + " textarea");
 
+        //todo fix url translations!!!
         $.ajax({
             type: "POST",
-            url: "/" + objectType + "s/" + id + "/comments/",
+            url: $.i18n._("/") + objectType + "s/" + id + "/" + $.i18n._("comments/"),
             dataType: "json",
             data: { comment: textarea.val() },
             success: function(json) {
@@ -569,18 +591,52 @@ function createComments(type) {
 
         init: function() {
             // Setup "show comments" clicks..
-            $("a[id^='comments-link-" + objectType + "-" + "']").unbind("click").click(function() { commentsFactory[objectType].show($(this).attr("id").substr(("comments-link-" + objectType + "-").length)); });
+            $("a[id^='comments-link-" + objectType + "-" + "']").unbind("click").click(function() { 
+                commentsFactory[objectType].show($(this).attr("id").substr(("comments-link-" + objectType + "-").length)); 
+                });
+
+            var cBox = $("[id^='comments-container-" + objectType + "']");
+            cBox.each( function(i){
+                var post_id = $(this).attr('id').replace('comments-container-' + objectType + '-', '');
+                $(this).children().each(
+                    function(i){
+                        var comment_id = $(this).attr('id').replace('comment-','');
+                        var delete_url = $.i18n._('/') + objectType + 's/' + post_id + '/'
+                                        + $.i18n._('comments/') + comment_id + '/' + $.i18n._('delete/');
+                        var html = $(this).html();
+                        var CommentsClass;
+                        if (objectType == 'question'){
+                            CommentsClass = questionComments;
+                        }
+                        else if (objectType == 'answer') {
+                            CommentsClass = answerComments;
+                        }
+                        var delete_icon = $(this).find('img.delete-icon');
+                        delete_icon.click(function(){CommentsClass.deleteComment($(this),comment_id,delete_url);});
+                        delete_icon.unbind('mouseover').bind('mouseover',
+                            function(){
+                                $(this).attr('src',$.i18n._('/') + 'content/images/close-small-hover.png');
+                            }
+                        );
+                        delete_icon.unbind('mouseout').bind('mouseout',
+                            function(){
+                                $(this).attr('src',$.i18n._('/') + 'content/images/close-small.png');
+                            }
+                        );
+                    }
+                );
+            });
         },
 
         show: function(id) {
             var jDiv = jDivInit(id);
             getComments(id, jDiv);
-            renderForm(id, jDiv);
+            renderForm(id);
             jDiv.show();
-            if (canPostComments(id, jDiv)) jDiv.find("textarea").get(0).focus();
-            jDiv.siblings("a").unbind("click").click(function(){ 
-													commentsFactory[objectType].hide(id); 
-													}).text($.i18n._('hide comments'));
+
+            var link = $('#comments-link-' + objectType + '-' + id);
+            if (canPostComments(id)) link.parent().find("textarea").get(0).focus();
+            link.remove();
         },
 
         hide: function(id) {
@@ -596,9 +652,9 @@ function createComments(type) {
         deleteComment: function(jImg, id, deleteUrl) {
             if (confirm($.i18n._('confirm delete comment'))) {
                 jImg.hide();
-                appendLoaderImg(id);
                 $.post(deleteUrl, { dataNeeded: "forIIS7" }, function(json) {
-                    showComments(id, json);
+                    var par = jImg.parent();
+                    par.remove();
                 }, "json");
             }
         },
diff --git a/templates/content/js/com.cnprog.utils.js b/templates/content/js/com.cnprog.utils.js
index e271ed78..fff61759 100644
--- a/templates/content/js/com.cnprog.utils.js
+++ b/templates/content/js/com.cnprog.utils.js
@@ -23,7 +23,8 @@ var notify = function() {
         },       
         close: function(doPostback) {
             if (doPostback) {
-               $.post("/messages/markread/", { formdata: "required" });
+               $.post($.i18n._("/") + $.i18n._("messages/") + 
+                $.i18n._("markread/"), { formdata: "required" });
             }
             $(".notify").fadeOut("fast");
             $("body").css("margin-top", "0");
@@ -35,7 +36,7 @@ var notify = function() {
 
 function appendLoader(containerSelector) {
     $(containerSelector).append('<img class="ajax-loader" '
-		+'src="/content/images/indicator.gif" title="'
+		+'src="' + $.i18n._('/') + 'content/images/indicator.gif" title="'
 		+$.i18n._('loading...')
 		+'" alt="'
 		+$.i18n._('loading...')
@@ -103,7 +104,7 @@ var CPValidator = function(){
             return {
                 tags: {
                     required: " " + $.i18n._('tags cannot be empty'),
-                    maxlength: " " + $.i18n._('tablimits info'),
+                    maxlength: " " + $.i18n._('tablimits info')
                 },
                 text: {
                     required: " " + $.i18n._('content cannot be empty'),
diff --git a/templates/content/js/jquery.form.js b/templates/content/js/jquery.form.js
new file mode 100644
index 00000000..443114fd
--- /dev/null
+++ b/templates/content/js/jquery.form.js
@@ -0,0 +1,654 @@
+/*
+ * jQuery Form Plugin
+ * version: 2.33 (22-SEP-2009)
+ * @requires jQuery v1.2.6 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+;(function($) {
+
+/*
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function() {
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+			return false; // <-- important!
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+
+	if (typeof options == 'function')
+		options = { success: options };
+
+	var url = $.trim(this.attr('action'));
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+   	}
+   	url = url || window.location.href || '';
+
+	options = $.extend({
+		url:  url,
+		type: this.attr('method') || 'GET'
+	}, options || {});
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		for (var n in options.data) {
+		  if(options.data[n] instanceof Array) {
+			for (var k in options.data[n])
+			  a.push( { name: n, value: options.data[n][k] } );
+		  }
+		  else
+			 a.push( { name: n, value: options.data[n] } );
+		}
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a);
+
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else
+		options.data = q; // data is the query string for 'post'
+
+	var $form = this, callbacks = [];
+	if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
+	if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			$(options.target).html(data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success)
+		callbacks.push(options.success);
+
+	options.success = function(data, status) {
+		for (var i=0, max=callbacks.length; i < max; i++)
+			callbacks[i].apply(options, [data, status, $form]);
+	};
+
+	// are there files to upload?
+	var files = $('input:file', this).fieldValue();
+	var found = false;
+	for (var j=0; j < files.length; j++)
+		if (files[j])
+			found = true;
+
+	var multipart = false;
+//	var mp = 'multipart/form-data';
+//	multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	// options.iframe allows user to force iframe mode
+   if (options.iframe || found || multipart) {
+	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
+	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+	   if (options.closeKeepAlive)
+		   $.get(options.closeKeepAlive, fileUpload);
+	   else
+		   fileUpload();
+	   }
+   else{
+	   $.ajax(options);
+   }
+
+	// fire 'notify' event
+	this.trigger('form-submit-notify', [this, options]);
+	return this;
+
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUpload() {
+		var form = $form[0];
+
+		if ($(':input[name=submit]', form).length) {
+			alert('Error: Form elements must not be named "submit".');
+			return;
+		}
+
+		var opts = $.extend({}, $.ajaxSettings, options);
+		var s = $.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
+
+		var id = 'jqFormIO' + (new Date().getTime());
+		var $io = $('<iframe id="' + id + '" name="' + id + '" src="about:blank" />');
+		var io = $io[0];
+
+		$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+
+		var xhr = { // mock object
+			aborted: 0,
+			responseText: null,
+			responseXML: null,
+			status: 0,
+			statusText: 'n/a',
+			getAllResponseHeaders: function() {},
+			getResponseHeader: function() {},
+			setRequestHeader: function() {},
+			abort: function() {
+				this.aborted = 1;
+				$io.attr('src','about:blank'); // abort op in progress
+			}
+		};
+
+		var g = opts.global;
+		// trigger ajax global events so that activity/block indicators work like normal
+		if (g && ! $.active++) $.event.trigger("ajaxStart");
+		if (g) $.event.trigger("ajaxSend", [xhr, opts]);
+
+		if (s.beforeSend && s.beforeSend(xhr, s) === false) {
+			s.global && $.active--;
+			return;
+		}
+		if (xhr.aborted)
+			return;
+
+		var cbInvoked = 0;
+		var timedOut = 0;
+
+		// add submitting element to data if we know it
+		var sub = form.clk;
+		if (sub) {
+			var n = sub.name;
+			if (n && !sub.disabled) {
+				options.extraData = options.extraData || {};
+				options.extraData[n] = sub.value;
+				if (sub.type == "image") {
+					options.extraData[name+'.x'] = form.clk_x;
+					options.extraData[name+'.y'] = form.clk_y;
+				}
+			}
+		}
+
+		// take a breath so that pending repaints get some cpu time before the upload starts
+		setTimeout(function() {
+			// make sure form attrs are set
+			var t = $form.attr('target'), a = $form.attr('action');
+
+			// update form attrs in IE friendly way
+			form.setAttribute('target',id);
+			if (form.getAttribute('method') != 'POST')
+				form.setAttribute('method', 'POST');
+			if (form.getAttribute('action') != opts.url)
+				form.setAttribute('action', opts.url);
+
+			// ie borks in some cases when setting encoding
+			if (! options.skipEncodingOverride) {
+				$form.attr({
+					encoding: 'multipart/form-data',
+					enctype:  'multipart/form-data'
+				});
+			}
+
+			// support timout
+			if (opts.timeout)
+				setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
+
+			// add "extra" data to form if provided in options
+			var extraInputs = [];
+			try {
+				if (options.extraData)
+					for (var n in options.extraData)
+						extraInputs.push(
+							$('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')
+								.appendTo(form)[0]);
+
+				// add iframe to doc and submit the form
+				$io.appendTo('body');
+				io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+				form.submit();
+			}
+			finally {
+				// reset attrs and remove "extra" input elements
+				form.setAttribute('action',a);
+				t ? form.setAttribute('target', t) : $form.removeAttr('target');
+				$(extraInputs).remove();
+			}
+		}, 10);
+
+		var domCheckCount = 50;
+
+		function cb() {
+			if (cbInvoked++) return;
+
+			io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+
+			var ok = true;
+			try {
+				if (timedOut) throw 'timeout';
+				// extract the server response from the iframe
+				var data, doc;
+
+				doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+				
+				var isXml = opts.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				log('isXml='+isXml);
+				if (!isXml && (doc.body == null || doc.body.innerHTML == '')) {
+				 	if (--domCheckCount) {
+						// in some browsers (Opera) the iframe DOM is not always traversable when
+						// the onload callback fires, so we loop a bit to accommodate
+						cbInvoked = 0;
+						setTimeout(cb, 100);
+						return;
+					}
+					log('Could not access iframe DOM after 50 tries.');
+					return;
+				}
+
+				xhr.responseText = doc.body ? doc.body.innerHTML : null;
+				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+				xhr.getResponseHeader = function(header){
+					var headers = {'content-type': opts.dataType};
+					return headers[header];
+				};
+
+				if (opts.dataType == 'json' || opts.dataType == 'script') {
+					// see if user embedded response in textarea
+					var ta = doc.getElementsByTagName('textarea')[0];
+					if (ta)
+						xhr.responseText = ta.value;
+					else {
+						// account for browsers injecting pre around json response
+						var pre = doc.getElementsByTagName('pre')[0];
+						if (pre)
+							xhr.responseText = pre.innerHTML;
+					}			  
+				}
+				else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+					xhr.responseXML = toXml(xhr.responseText);
+				}
+				data = $.httpData(xhr, opts.dataType);
+			}
+			catch(e){
+				ok = false;
+				$.handleError(opts, xhr, 'error', e);
+			}
+
+			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+			if (ok) {
+				opts.success(data, 'success');
+				if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
+			}
+			if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
+			if (g && ! --$.active) $.event.trigger("ajaxStop");
+			if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
+
+			// clean up
+			setTimeout(function() {
+				$io.remove();
+				xhr.responseXML = null;
+			}, 100);
+		};
+
+		function toXml(s, doc) {
+			if (window.ActiveXObject) {
+				doc = new ActiveXObject('Microsoft.XMLDOM');
+				doc.async = 'false';
+				doc.loadXML(s);
+			}
+			else
+				doc = (new DOMParser()).parseFromString(s, 'text/xml');
+			return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
+		};
+	};
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *	is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *	used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function() {
+		$(this).ajaxSubmit(options);
+		return false;
+	}).bind('click.form-plugin', function(e) {
+		var $el = $(e.target);
+		if (!($el.is(":submit,input:image"))) {
+			return;
+		}
+		var form = this;
+		form.clk = e.target;
+		if (e.target.type == 'image') {
+			if (e.offsetX != undefined) {
+				form.clk_x = e.offsetX;
+				form.clk_y = e.offsetY;
+			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+				var offset = $el.offset();
+				form.clk_x = e.pageX - offset.left;
+				form.clk_y = e.pageY - offset.top;
+			} else {
+				form.clk_x = e.pageX - e.target.offsetLeft;
+				form.clk_y = e.pageY - e.target.offsetTop;
+			}
+		}
+		// clear form vars
+		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 10);
+	});
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+	return this.unbind('submit.form-plugin click.form-plugin');
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+	var a = [];
+	if (this.length == 0) return a;
+
+	var form = this[0];
+	var els = semantic ? form.getElementsByTagName('*') : form.elements;
+	if (!els) return a;
+	for(var i=0, max=els.length; i < max; i++) {
+		var el = els[i];
+		var n = el.name;
+		if (!n) continue;
+
+		if (semantic && form.clk && el.type == "image") {
+			// handle image inputs on the fly when semantic == true
+			if(!el.disabled && form.clk == el) {
+				a.push({name: n, value: $(el).val()});
+				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+			}
+			continue;
+		}
+
+		var v = $.fieldValue(el, true);
+		if (v && v.constructor == Array) {
+			for(var j=0, jmax=v.length; j < jmax; j++)
+				a.push({name: n, value: v[j]});
+		}
+		else if (v !== null && typeof v != 'undefined')
+			a.push({name: n, value: v});
+	}
+
+	if (!semantic && form.clk) {
+		// input type=='image' are not found in elements array! handle it here
+		var $input = $(form.clk), input = $input[0], n = input.name;
+		if (n && !input.disabled && input.type == 'image') {
+			a.push({name: n, value: $input.val()});
+			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+		}
+	}
+	return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+	//hand off to jQuery.param for proper encoding
+	return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+	var a = [];
+	this.each(function() {
+		var n = this.name;
+		if (!n) return;
+		var v = $.fieldValue(this, successful);
+		if (v && v.constructor == Array) {
+			for (var i=0,max=v.length; i < max; i++)
+				a.push({name: n, value: v[i]});
+		}
+		else if (v !== null && typeof v != 'undefined')
+			a.push({name: this.name, value: v});
+	});
+	//hand off to jQuery.param for proper encoding
+	return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *	  <input name="A" type="text" />
+ *	  <input name="A" type="text" />
+ *	  <input name="B" type="checkbox" value="B1" />
+ *	  <input name="B" type="checkbox" value="B2"/>
+ *	  <input name="C" type="radio" value="C1" />
+ *	  <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *	   array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+	for (var val=[], i=0, max=this.length; i < max; i++) {
+		var el = this[i];
+		var v = $.fieldValue(el, successful);
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
+			continue;
+		v.constructor == Array ? $.merge(val, v) : val.push(v);
+	}
+	return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+	if (typeof successful == 'undefined') successful = true;
+
+	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+		(t == 'checkbox' || t == 'radio') && !el.checked ||
+		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+		tag == 'select' && el.selectedIndex == -1))
+			return null;
+
+	if (tag == 'select') {
+		var index = el.selectedIndex;
+		if (index < 0) return null;
+		var a = [], ops = el.options;
+		var one = (t == 'select-one');
+		var max = (one ? index+1 : ops.length);
+		for(var i=(one ? index : 0); i < max; i++) {
+			var op = ops[i];
+			if (op.selected) {
+				var v = op.value;
+				if (!v) // extra pain for IE...
+					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+				if (one) return v;
+				a.push(v);
+			}
+		}
+		return a;
+	}
+	return el.value;
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+	return this.each(function() {
+		$('input,select,textarea', this).clearFields();
+	});
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+	return this.each(function() {
+		var t = this.type, tag = this.tagName.toLowerCase();
+		if (t == 'text' || t == 'password' || tag == 'textarea')
+			this.value = '';
+		else if (t == 'checkbox' || t == 'radio')
+			this.checked = false;
+		else if (tag == 'select')
+			this.selectedIndex = -1;
+	});
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+	return this.each(function() {
+		// guard against an input with the name of 'reset'
+		// note that IE reports the reset function as an 'object'
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
+			this.reset();
+	});
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+	if (b == undefined) b = true;
+	return this.each(function() {
+		this.disabled = !b;
+	});
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+	if (select == undefined) select = true;
+	return this.each(function() {
+		var t = this.type;
+		if (t == 'checkbox' || t == 'radio')
+			this.checked = select;
+		else if (this.tagName.toLowerCase() == 'option') {
+			var $sel = $(this).parent('select');
+			if (select && $sel[0] && $sel[0].type == 'select-one') {
+				// deselect all other options
+				$sel.find('option').selected(false);
+			}
+			this.selected = select;
+		}
+	});
+};
+
+// helper fn for console logging
+// set $.fn.ajaxSubmit.debug to true to enable debug logging
+function log() {
+	if ($.fn.ajaxSubmit.debug && window.console && window.console.log)
+		window.console.log('[jquery.form] ' + Array.prototype.join.call(arguments,''));
+};
+
+})(jQuery);
diff --git a/templates/content/js/wmd/wmd.js b/templates/content/js/wmd/wmd.js
index 7b611dba..0bdc55b6 100644
--- a/templates/content/js/wmd/wmd.js
+++ b/templates/content/js/wmd/wmd.js
@@ -54,7 +54,7 @@ Attacklab.wmdBase = function(){
 	var uploadImageHTML ="<div>" + $.i18n._('upload image') + "</div>" + 
         "<input type=\"file\" name=\"file-upload\" id=\"file-upload\" size=\"26\" "+
         "onchange=\"return ajaxFileUpload($('#image-url'));\"/><br>" + 
-        "<img id=\"loading\" src=\"/content/images/indicator.gif\" style=\"display:none;\"/>";
+        "<img id=\"loading\" src=\"" + $.i18n._("/") + "content/images/indicator.gif\" style=\"display:none;\"/>";
     
 	// The default text that appears in the dialog input box when entering
 	// links.
diff --git a/templates/content/style/default.css b/templates/content/style/default.css
index 0221cc03..2bc185ad 100644
--- a/templates/content/style/default.css
+++ b/templates/content/style/default.css
@@ -7,9 +7,9 @@ Style sheet for cnprog.com
 All rights reserved. 2008 CNPROG.COM
 */
 
-@import url(/content/style/jquery.autocomplete.css);
-@import url(/content/style/openid.css);
-@import url(/content/style/prettify.css);
+@import url(content/style/jquery.autocomplete.css);
+@import url(content/style/openid.css);
+@import url(content/style/prettify.css);
 
 html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, form, label, table, caption, tbody, tfoot, thead, tr, th, td
 {
@@ -232,19 +232,19 @@ h4 {display:block;font-size:90%; font-family:Verdana;color:#ccc;}
 }
 
 #main-bar .golden{
-    background:url(/content/images/bg_title_golden.gif) no-repeat;
+    background:url(../../images/bg_title_golden.gif) no-repeat;
 }
 
 #main-bar .pink{
-    background:url(/content/images/bg_title_red.gif) no-repeat;
+    background:url(../../images/bg_title_red.gif) no-repeat;
 }
 
 #main-bar .orange{
-    background:url(/content/images/bg_title_orange.gif) no-repeat;
+    background:url(../../images/bg_title_orange.gif) no-repeat;
 }
 
 #main-bar .green{
-    background:url(/content/images/bg_title_green.gif) no-repeat;
+    background:url(../../images/bg_title_green.gif) no-repeat;
 }
 
 #tab{
@@ -906,7 +906,7 @@ h4 {display:block;font-size:90%; font-family:Verdana;color:#ccc;}
 
 /* 2 textarea resizer styles */
 div.grippie {
-    background:#EEEEEE url(/content/images/grippie.png) no-repeat scroll center 2px;
+    background:#EEEEEE url(../../images/grippie.png) no-repeat scroll center 2px;
     border-color:#DDDDDD;
     border-style:solid;
     border-width:0pt 1px 1px;
@@ -923,14 +923,14 @@ div.grippie {
 }
 
 .openid-input{
-    background:url(/content/images/openid.gif) no-repeat;
+    background:url(../../images/openid.gif) no-repeat;
     padding-left:15px;
     cursor:pointer;
 }
 
 .openid-login-input{
     background-position:center left;
-    background:url(/content/images/openid.gif) no-repeat 0% 50%;
+    background:url(../../images/openid.gif) no-repeat 0% 50%;
     padding:5px 5px 5px 15px;
     cursor:pointer;
     font-family:Trebuchet MS;
@@ -941,7 +941,7 @@ div.grippie {
 
 .openid-login-submit{
     padding:6px;
-    #padding:4px;
+    /*padding:4px;*/
     cursor:pointer;
     font-weight:bold;
     font-size:120%;
@@ -990,7 +990,6 @@ div.grippie {
 
 .item-right{
     float:left;
-
 }
 
 .vote-number{
@@ -1609,7 +1608,9 @@ div.comments {
 }
 
 div.post-comments{
-    width:585px
+    width:585px;
+    clear:both;
+    float:left;
 }
 
 form.post-comments textarea {
diff --git a/templates/content/style/jquery.autocomplete.css b/templates/content/style/jquery.autocomplete.css
index 7c3127d1..3bf2c2d9 100644
--- a/templates/content/style/jquery.autocomplete.css
+++ b/templates/content/style/jquery.autocomplete.css
@@ -36,7 +36,7 @@
 }
 
 .ac_loading {
-	background: white url('/content/images/indicator.gif') right center no-repeat;
+	background: white url(../../images/indicator.gif) right center no-repeat;
 }
 
 .ac_odd {
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 0fb96c7f..6c1d6a3f 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -1,15 +1,16 @@
-@import url(/content/style/jquery.autocomplete.css);
-@import url(/content/style/openid.css);
-@import url(/content/style/prettify.css);
+@import url(jquery.autocomplete.css);
+@import url(openid.css);
+@import url(prettify.css);
 /* 公用 */
 body{background:#FFF; font-size:12px; line-height:150%; margin:0; padding:0; color:#000; font-family: sans-serif; 
 }
 div{margin:0 auto; padding:0;}
 h1,h2,h3,h4,h5,h6,ul,li,dl,dt,dd,form,img,p{margin:0; padding:0; border:none; }
-input, select {font-family:Trebuchet MS,"segoe ui",Helvetica,"Microsoft YaHei",宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif;}
+label {vertical-align:middle;}
+hr {border:none;border-top: 1px dashed #ccccce;}
+input, select {vertical-align:middle;font-family:Trebuchet MS,"segoe ui",Helvetica,"Microsoft YaHei",宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif;}
 p{margin-bottom:13px; font-size:13px; line-height:140%;}
 a {color:#333333; text-decoration:none;}
-
 .badges a {color:#763333;text-decoration:underline;}
 a:hover {text-decoration:underline;}
 .block{width:960px; height:auto;}
@@ -49,6 +50,12 @@ ol
 	margin-bottom: 1em;
     padding-left:0px;
 }
+td ul {
+    vertical-align:middle;
+}
+li input {
+    margin: 3px 3px 4px 3px;
+}
 pre
 {
 	font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace;
@@ -113,62 +120,115 @@ blockquote
 #navBar .nav {margin:20px 0px 0px 16px;
 	/*letter-spacing:1px; */
 	}
-#navBar .nav a {color:#333333; background-color:#F9F7ED; 
-                border: 1px solid #aaaaaa;
-                border-bottom: none;
+#navBar .nav a {color:#333333; background-color:#fff0e0; 
+				/*border-left: 1px solid #eeeeec;
+				border-right: 1px solid #babdb6;
+				border-top: 1px solid #eeeeec;*/
+				border: 1px solid #888888;
+				border-bottom: none;
 				padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:14px; font-weight:400; text-decoration:none;display: block;float: left;}
 #navBar .nav a:hover {text-decoration:underline}
-#navBar .nav a.on {height:24px;line-height:28px;border:1px solid #d64000; background:#B02B2C; color:#FFF; font-weight:600; text-decoration:none}
-#navBar .nav a.special {font-size:15px; color:#B02B2C; font-weight:bold; text-decoration:none; }
+#navBar .nav a.on {height:24px;line-height:28px;
+	border-bottom: 1px solid #a40000;
+	border-right:1px solid #820000; 
+	border-top:1px solid #d40000; 
+	border-left:1px solid #d40000; 
+	/*background:#A31E39; */
+	background:#a40000;
+	color:#FFF; font-weight:600; text-decoration:none}
+#navBar .nav a.special {font-size:14px; color:#B02B2C; font-weight:bold; text-decoration:none; }
 #navBar .nav a.special:hover {text-decoration:underline;}
 #navBar .nav div.focus {float:right; padding-right:0px;}
 /*搜索栏*/
-#searchBar {
-    background-color:#9db2b1;/*#e9b96e;*/
-    padding:5px 0 0 0;} /* #B02B2C */
+#searchBar {width:958px;   
+    background-color:#888a85;/*#e9b96e;*/
+    border: 1px solid #aaaaaa;
+    padding:4px 0 0 0;} /* #B02B2C */
 #searchBar .content { }
 #searchBar .searchInput {font-size:13px; height:18px; width:400px;}
 #searchBar .searchBtn {font-size:14px; height:26px; width:80px;}
-#searchBar .options {padding-top:5px; font-size:100%;color:#EEE;
+#searchBar .options {padding:3px 0 3px 0;font-size:100%;color:#EEE;
 	/*letter-spacing:1px;*/
 	}
-#searchBar .options INPUT {margin-left:15px;}
+#searchBar .options INPUT {margin:0 3px 0 15px;}
 #searchBar .options INPUT:hover {cursor:pointer}
 
 /*问题列表*/
 #listA {float:left; background-color:#FFF;padding:0 0px 0 0px; width:100%;}
-#listA .qstA {padding:3px 5px 0 5px; margin:0 0px 10px 0px; background:url(/content/images/quest-bg.gif) repeat-x top;}
+#listA .qstA {
+    position:relative;
+    padding:3px 5px 5px 10px; 
+    border-top:1px dashed #ccccce;
+    /*border-left:1px solid #ebebbe;
+    border-right:1px solid #b4b48e;
+    border-bottom:1px solid #b4b48e;*/
+    background: white;/* #f9f7ed;*/
+    margin:10px 0 10px 0;
+    /*background:url(../images/quest-bg.gif) repeat-x top;*/
+}
 #listA .qstA thumb {float:left; }
-#listA .qstA H2 {font-size:15px; font-weight:800; margin:8px auto;padding:0px;}
-#listA .qstA H2 a {color:#663333; }
-#listA .qstA .stat {font-size:13px;letter-spacing:1px;float:right;}
+#listA .qstA H2 {font-size:14px; font-weight:800; margin:8px auto;padding:0px;}
+#listA .qstA H2 a {color:333333/*#2e3436*/;font-size:15px;}
+#listA .qstA .stat {
+    position:absolute;
+    right:0px;
+    bottom:5px;
+    font-size:12px;
+	/*letter-spacing:1px;*/
+	float:right;
+}
 #listA .qstA .stat span {margin-right:5px;}
 #listA .qstA .stat td {min-width:40px;text-align:center;}
-#listA .qstA .stat .num {font-family:arial;color:#905213; font-size:20px; font-weight:800;}
-#listA .qstA .stat .unit {color:#777;}
-#listA .qstA .from {margin-top:5px; font-size:13px;}
-#listA .qstA .from .score {font-family:arial;}
-#listA .qstA .date {margin-left:20px; color:#777;}
-#listA .qstA .wiki {color:#663333;font-size:12px;}
+#listA .qstA .stat .num {
+    font-family:sans-serif;
+    color:#a40000; 
+    /*background:#eeeeec;
+    border: 1px solid #babdb6;*/
+    margin:0px;
+    font-size:17px; 
+    font-weight:800;
+}
+#listA .qstA table {border-spacing:0px;}
+#listA .qstA table td {padding:0px;width:60px;text-align:center;}
+#listA .qstA .stat .unit {color:#777777;margin:0px}
+#listA .qstA .from {margin-top:5px; font-size:13px;color:#777777;}
+#listA .qstA .from .score {font-family:sans-serif;color:#555555;}
+#listA .qstA .date {margin-left:10px; color:#777777;}
+#listA .qstA .wiki {color:#763333;font-size:12px;}
 #listA .qstA .from a {}
 #listA .qstA .from IMG {vertical-align:middle;}
 #listA .qstA .author {font-weight:400; }
-#listA .qstA .author a{ }
+#listA .qstA .author a{color:#444444; }
 #listA .qstA .summary{margin-right:5px;}
-
+#question-table {
+    margin-bottom:10px;
+    /*border-bottom:1px solid #888a85;*/
+}
 .evenMore {font-size:14px; font-weight:800;}
 .questions-count{font-size:32px;font-family:sans-serif;font-weight:600;padding:0 0 5px 7px;color:#a40000;}
 
 /*内容块*/
-.boxA {background:#777; padding:6px; margin-bottom:8px;}
+.boxA {background:#888a85; padding:6px; margin-bottom:8px;border 1px solid #babdb6;}
 .boxA H3 {font-size:13px; font-weight:800; color:#FFF; margin:0; padding:0; margin-bottom:4px;}
 .boxA .body {border:1px solid #999; padding:8px; background:#FFF; font-size:13px;}
 .boxA .more {padding:2px; text-align:right; font-weight:800;}
-.boxB {background:#F9F7CD; padding:6px; margin-bottom:8px;}
-.boxB H3 {font-size:13px; font-weight:800; color:#000; margin:0; padding:0 0 0 15px; margin-bottom:4px; background:url(/content/images/dot-g.gif) no-repeat left center;}
-.boxB .body {border:1px solid #FFFF88; padding:8px; background:#FFF; font-size:13px; line-height:160%;}
+.boxB {background:#F9F7ED; padding:6px; margin-bottom:8px;border:solid 1px #aaaaaa;}
+.boxB H3 {font-size:13px; font-weight:800; color:#000; margin:0; padding:0 0 0 15px; margin-bottom:4px; background:url(../images/dot-g.gif) no-repeat left center;}
+.boxB .body {border:1px solid #aaaaaa; padding:8px; background:#FFF; font-size:13px; line-height:160%;}
 .boxB .more {padding:1px; text-align:right; font-weight:800;}
-.boxC {background:#F5F5F5; padding:6px; margin-bottom:8px;}
+.boxC {
+    background:#babdb6;/*f9f7ed;*/
+    padding:10px; 
+    margin-bottom:8px;
+    border-top:1px solid #eeeeec;
+    border-left:1px solid #eeeeec;
+    border-right:1px solid #a9aca5;
+    border-bottom:1px solid #babdb6;
+}
+.boxC p.info-box-follow-up-links {
+    text-align:right;
+    margin:0;
+}
 /*分页*/
 .pager {margin-top:10px; margin-bottom:16px; float:left;}
 .pagesize {margin-top:10px; margin-bottom:16px; float:right;}
@@ -257,29 +317,36 @@ blockquote
 .tag-number {font-weight:700;font-family:sans-serif;}
 
 /*奖牌*/
-a.medal  { font-size:14px; line-height:250%; font-weight:800; color:#333; text-decoration:none; background:url(/content/images/medala.gif) no-repeat; border-left:1px solid #EEE; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:4px 12px 4px 6px;}
-a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images/medala_on.gif) no-repeat; border-left:1px solid #E7E296; border-top:1px solid #E7E296; border-bottom:1px solid #D1CA3D; border-right:1px solid #D1CA3D;}
+a.medal  { font-size:14px; line-height:250%; font-weight:800; color:#333; text-decoration:none; background:url(../images/medala.gif) no-repeat; border-left:1px solid #EEE; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:4px 12px 4px 6px;}
+a:hover.medal  {color:#333; text-decoration:none; background:url(../images/medala_on.gif) no-repeat; border-left:1px solid #E7E296; border-top:1px solid #E7E296; border-bottom:1px solid #D1CA3D; border-right:1px solid #D1CA3D;}
 
 /*Tab栏*/
-.tabBar{background-color:#FFF;border-bottom: 1px solid #666;height: 30px; width: 100%;clear:both; margin-bottom:3px;}
+.tabBar{background-color:#FFF;border-bottom: 1px solid white;height: 30px; width: 100%;clear:both; margin-bottom:3px;}
 .tabsA {background-color:#FFF;float:right;position:relative;display:block;font-weight:bold;height:20px;}
 .tabsB {background-color:#FFF;float:left;position:relative;display:block;font-weight:bold;height:20px;}
-.tabsA a.on, .tabsA a.on:hover,.tabsB a.on, .tabsB a.on:hover {background: #fff;
-    color:#333;
-	border: 1px solid #777;
-    border-bottom:2px solid #FFF;
-	height: 25px;
+.tabsA a.on, .tabsA a:hover,.tabsB a.on, .tabsB a:hover {
+    background: #fff;
+    color:#a40000;
+    border-top:1px solid #babdb6;
+    border-left:1px solid #babdb6;
+    border-right:1px solid #888a85;
+    border-bottom:1px solid #888a85;
+	height: 24px;
 	line-height: 26px;
 	margin-top: 3px;
 	padding: 0px 11px 0px 11px;}
 
-.tabsA a {background: #eee;
-	border: 1px solid #eee;
-	color: #777;
+.tabsA a {
+    background: #f9f7eb;
+    border-top:1px solid #eeeeec;
+    border-left:1px solid #eeeeec;
+    border-right:1px solid #a9aca5;
+    border-bottom:1px solid #888a85;
+	color: #888a85;
 	display: block;
 	float: left;
-	height: 22px;
-	line-height: 28px;
+	height: 20px;
+	line-height: 22px;
 	margin: 5px 4px 0 0;
 	padding: 0 11px 0 11px;
 	text-decoration: none;
@@ -295,19 +362,28 @@ a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images
 	padding: 0 11px 0 11px;
 	text-decoration: none;
 }
-.tabsA a:hover, .tabsB a:hover {background: #fff;border: 1px solid #777;border-bottom:3px solid #FFF;}
+/*.tabsA a:hover, .tabsB a:hover {background: #fff;border: 1px solid #777;border-bottom:3px solid #FFF;}*/
 .headlineA {font-size:13px; border-bottom:1px solid #777; padding-bottom:2px; font-weight:800; margin-bottom:12px; text-align:right; height:30px;}
-.headQuestions {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
-.headAnswers {float:left; padding:3px; font-size:18px; font-weight:800; background:url(/content/images/ico_answers.gif) left 2px no-repeat; padding-left:24px;}
-.headTags {float:left; padding:3px; font-size:18px; font-weight:800; background:url(/content/images/ico_tags.gif) no-repeat; padding-left:24px;}
-.headUsers {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
-.headMedals {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
-.headLogin {float:left; padding:3px; font-size:15px; font-weight:800; background:url(/content/images/ico_login.gif) no-repeat; padding-left:24px;}
-.headNormal {text-align:left;padding:3px; font-size:15px; margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
-.headUser {text-align:left;padding:5px; font-size:20px; letter-spacing:1px;margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
+.headQuestions {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(../images/dot-list.gif) no-repeat left center;}
+.headAnswers {float:left; padding:3px; font-size:18px; font-weight:800; background:url(../images/ico_answers.gif) left 2px no-repeat; padding-left:24px;}
+.headTags {float:left; padding:3px; font-size:18px; font-weight:800; background:url(../images/ico_tags.gif) no-repeat; padding-left:24px;}
+.headUsers {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(../images/dot-list.gif) no-repeat left center;}
+.headMedals {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(../images/dot-list.gif) no-repeat left center;}
+.headLogin {float:left; padding:3px; font-size:15px; font-weight:800; background:url(../images/ico_login.gif) no-repeat; padding-left:24px;}
+.headNormal {
+	text-align:left;
+	padding:3px; 
+	font-size:15px; 
+	margin-bottom:12px; 
+	font-weight:bold;
+	border-bottom: 1px solid #777;
+}
+.headUser {text-align:left;padding:5px; font-size:20px; 
+	/*letter-spacing:1px;*/
+		margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
 /*RSS订阅*/
 #feeds {margin:10px 0; }
-#feeds a {background:url(/content/images/feed-icon-small.png) no-repeat 0; padding-left:18px; font-weight:700; font-size:13px; }
+#feeds a {background:url(../images/feed-icon-small.png) no-repeat 0; padding-left:18px; font-weight:700; font-size:13px; }
 
 /*问题*/
 #question {margin-bottom:30px;}
@@ -355,9 +431,9 @@ a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images
     font-weight:bold;
     color:#777;
 }
-.question-img-upvote:hover{background:url(/content/images/vote-arrow-up-on.png)}
-.question-img-downvote:hover{background:url(/content/images/vote-arrow-down-on.png)}
-.question-img-favorite:hover{background:url(/content/images/vote-favorite-on.png)}
+.question-img-upvote:hover{background:url(../images/vote-arrow-up-on.png)}
+.question-img-downvote:hover{background:url(../images/vote-arrow-down-on.png)}
+.question-img-favorite:hover{background:url(../images/vote-favorite-on.png)}
 .favorite-number{padding:0px;font-size:100%; font-family:Arial;font-weight:bold;color:#777;}
 .vote-notification
 {
@@ -405,7 +481,7 @@ a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images
     cursor:pointer;
 }
 
-.action-link a:hover{
+.action-link: a hover{
     background-color:#777;
     text-decoration:none;
     color:#fff;
@@ -425,8 +501,11 @@ div.comments {
 }
 
 div.post-comments{
+    clear:both;
+    background: url(../images/gray-up-arrow-h18px.png) no-repeat;
     width:100%;
-    margin-bottom:10px;
+    padding-left: 12px;
+    margin:3px 0 10px 0;
 }
 
 form.post-comments textarea {
@@ -442,6 +521,7 @@ form.post-comments input {
 }
 span.text-counter {
     margin-right:20px;
+    font-size:11px;
 }
 
 span.form-error {
@@ -454,13 +534,7 @@ p.form-item {
 }
 
 div.comments-container, div.comments-container-accepted, div.comments-container-owner, div.comments-container-deleted {
-    display:none;
-    margin-top:-1px;
-    padding:0 5px 5px;
-}
-
-div.comments-container, a.comments-link {
-    background-color:#EEEEEE;
+    padding:0;
 }
 
 .post-comments a {
@@ -470,7 +544,9 @@ div.comments-container, a.comments-link {
 
 a.comments-link, a.comments-link-accepted, a.comments-link-owner, a.comments-link-deleted {
     color:black;
-    padding:2px;
+    font-size:11px;
+    background: #eeeeee;
+    padding:3px;
     cursor:pointer;
 }
 
@@ -482,7 +558,7 @@ a.comments-link, a.comments-link-accepted, a.comments-link-owner, a.comments-lin
 
 a.comment-user, a.comment-user:hover {
     background-color:inherit;
-    color:#0077CC;
+    color:blue;
     padding:0;
 }
 
@@ -494,6 +570,7 @@ a.comment-user:hover {
 .answer{
     padding-top:10px;
     width: 100%;
+    border-bottom:1px solid #ccccce;
 }
 .answer-body{
     min-height:80px;
@@ -556,7 +633,7 @@ a.comment-user:hover {
 	color: #E1E818;
 }
 
-.answer-img-accept:hover{background:url(/content/images/vote-accepted-on.png)}
+.answer-img-accept:hover{background:url(../images/vote-accepted-on.png)}
 
 .deleted{
     background:#F4E7E7 none repeat scroll 0 0;
@@ -575,21 +652,44 @@ a.comment-user:hover {
 .list-item LI{list-style-type:disc; font-size:13px; line-height:20px; margin-bottom:10px;}
 /* openid styles */
 .form-row{line-height:25px;}
+table.form-as-table {
+    margin-top:5px;
+}
+table.form-as-table ul {
+    list-style-type:none;
+    display: inline;
+}
+table.form-as-table li {
+    display: inline;
+}
+table.form-as-table td {
+    text-align:right;
+}
+table.form-as-table th {
+    text-align:left;
+    font-weight:normal;
+}
+/*.form-row li label {
+    display: inline
+}*/
 .submit-row{line-height:30px;padding-top:10px;}
 .errors{line-height:20px;color:red;}
-.error{color:red;}
+.error{
+    color:darkred;
+    margin:0;
+    font-size: 10px;
+}
 .error-list li{padding:5px;}
-.login{margin-bottom:10px;}
 .fieldset{
 /*	border:solid 1px #777;*/
 	border: none;
 	margin-top:10px;
 	padding:10px;
 }
-.openid-input{background:url(/content/images/openid.gif) no-repeat;padding-left:15px;cursor:pointer;}
+.openid-input{background:url(../images/openid.gif) no-repeat;padding-left:15px;cursor:pointer;}
 .openid-login-input{
     background-position:center left;
-    background:url(/content/images/openid.gif) no-repeat 0% 50%;
+    background:url(../images/openid.gif) no-repeat 0% 50%;
     padding:5px 5px 5px 15px;
     cursor:pointer;
     font-family:Trebuchet MS;
@@ -627,7 +727,7 @@ span.form-error {
     margin-left:5px;
 }
 .title-desc{
-    color:#999;
+    color:#666666;
     font-size:90%;
 }
 
@@ -705,6 +805,8 @@ span.form-error {
 
 .revision .summary span{
     background-color:yellow;
+    padding-left:3px;
+    padding-right:3px;
     display:inline;
 }
 .revision h1{
@@ -716,6 +818,7 @@ span.form-error {
 .revision-mark{
     width:200px;
     text-align:left;
+    display:inline-block;
     font-size:90%;
     overflow:hidden;
 }
@@ -745,13 +848,13 @@ background-color: #97ff97;
 }
 
 /*用户资料页面*/
-.count {font-family:Arial;font-size:24px;font-weight:700;color:#777}
+.count {font-family:Arial;font-size:200%;font-weight:700;color:#777}
 .scoreNumber{font-family:Arial;font-size:35px;font-weight:800;color:#777;line-height:40px;
 	/*letter-spacing:0px*/
 	}
 .user-details{font-size:13px;}
 .user-about{background-color:#EEEEEE;height:200px;line-height:20px; overflow:auto;padding:10px;width:90%;}
-.user-edit-link {background:url(/content/images/edit.png) no-repeat; padding-left:20px; font-weight:600;}
+.user-edit-link {background:url(../images/edit.png) no-repeat; padding-left:20px;}
 .favorites-count-off {
     color:#919191;
     float:left;
@@ -815,7 +918,8 @@ width:950;margin-bottom:10px;
 }
 
 .narrow .summary {
-    width:620px;
+    width:600px;
+    display:inline-block;
 }
 
 .narrow .summary h3 {
@@ -824,8 +928,8 @@ width:950;margin-bottom:10px;
 }
 
 .narrow .views {
-    float:left;
     height:42px;
+    float:left;
     margin:0 7px 0 0;
     /*padding:5px 0 5px 4px;*/
 	padding: 5px;
@@ -851,11 +955,22 @@ width:950;margin-bottom:10px;
 
 .narrow .vote-count-post {
     font-weight:800;
+    display:block;
     margin:0;
     font-size: 190%; color:#555; line-height:20px;
 }
-.narrow .answer-count-post{font-weight:800;margin:0; font-size: 190%; }
-.narrow .views-count-post{font-weight:800;margin:0; font-size: 190%;}
+.narrow .answer-count-post{
+    font-weight:800;
+    display:block;
+    margin:0; 
+    font-size: 190%; 
+}
+.narrow .views-count-post{
+    font-weight:800;
+    display:block;
+    margin:0; 
+    font-size: 190%;
+}
 div.started {
     color:#999999;
     float:right;
@@ -886,6 +1001,7 @@ div.started .reputation-score {
 .narrow  .tags{float:left;}
 
 .answer-summary {
+    display:block;
     clear:both;
     padding:3px;
 }
@@ -1009,7 +1125,7 @@ div.started .reputation-score {
 a.comment {background:#EEE; color:#993300; padding:4px;}
 a.permLink {padding:2px;}
 a.offensive {color:#999;}
-ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2px; padding-left:16px; margin-bottom:4px;}
+ul.bulleta li {background:url(../images/bullet_green.gif) no-repeat 0px 2px; padding-left:16px; margin-bottom:4px;}
 .user {padding:5px; line-height:140%; width:170px;}
 .user ul {margin:0; list-style-type:none;}
 .user .thumb{clear:both;float:left; margin-right:4px; display:inline;}
@@ -1036,13 +1152,15 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p
 	/*letter-spacing:1px;*/
 	background-color:#D4D0C8;
 	height:40px;
-	border:1px solid #777;
+	border:1px solid #777777;
 /*	width:100px; */
 	font-weight:bold;
+    padding-bottom:4px;
 	font-size:120%;}
 .submit:hover{text-decoration:underline;}
 .ask-body{padding-right:10px;}
 .thousand{color:orange;}
+
 .notify
 {
 	position: fixed;
@@ -1056,11 +1174,13 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p
 	color: #444;
 	background-color: #F4A83D;
 }
+
 .notify p {
     margin-top:5px;
     margin-bottom:5px;
     font-size:16px;
 }
+
 #close-notify
 {
     position:absolute;
@@ -1117,3 +1237,186 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p
 .highlight {
     background-color:#FFF8C6;
 }
+.nomargin {
+    margin:0;
+}
+.margin-bottom {
+    margin-bottom: 10px;
+}
+.inline-block {
+    display:inline-block;
+}
+.action-status {
+    margin:0;
+    border:none;
+    text-align:center;
+    line-height:10px;
+    font-size:12px;
+    padding:0;
+}
+.action-status span {
+    padding:3px 5px 3px 5px;
+    background-color:#fff380;/* nice yellow */
+    font-weight:normal;
+    -moz-border-radius: 5px;
+    -khtml-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+.tight {
+    margin:0;
+    padding:0;
+}
+
+.list-table td {
+    vertical-align:top;
+}
+
+p.comment {
+    border-top: 1px dotted #ccccce;
+    margin:0;
+    font-size:11px;
+    color: #444444;
+    padding:5px 0 5px 0;
+}
+
+.delete-icon {
+    vertical-align:middle;
+    padding-left:3px;
+}
+/* these need to go */
+table.form-as-table .errorlist {
+    display: block;
+    margin:0;
+    padding:0 0 0 5px;
+    text-align:left;
+    font-size:10px;
+    color:darkred;
+}
+table.form-as-table input {
+    display: inline;
+    margin-left: 4px;
+}
+table.form-as-table th {
+    vertical-align:bottom; 
+    padding-bottom:4px;
+}
+.form-row-vertical {
+    margin-top: 8px;
+    display: block;
+}
+.form-row-vertical label {
+    margin-bottom:3px;
+    display:block;
+}
+/* above stuff needs to go */
+.text-align-right {
+    text-align: center;
+}
+ul.form-horizontal-rows {
+    list-style:none;
+    margin:0;
+}
+ul.form-horizontal-rows li {
+    position:relative;
+    height:40px;
+}
+ul.form-horizontal-rows label {
+    display:inline-block;
+}
+ul.form-horizontal-rows ul.errorlist {
+    list-style:none;
+    color:darkred;
+    font-size:10px;
+    line-height:10px;
+    position:absolute;
+    top:2px;
+    left:180px;
+    text-align:left;
+    margin:0;
+}
+ul.form-horizontal-rows ul.errorlist li {
+    height:10px;
+}
+ul.form-horizontal-rows label {
+    position:absolute;
+    left:0px;
+    bottom:6px;
+    margin:0px;
+    line-height: 12px;
+    font-size: 12px;
+}
+ul.form-horizontal-rows li input {
+    position:absolute;
+    bottom:0px;
+    left:180px;
+    margin:0px;
+}
+#emailpw-form li input {
+    left:170px;
+}
+#emailpw-form ul.errorlist {
+    left:170px;
+}
+#changepw-form li input {
+    left:150px;
+}
+#changepw-form ul.errorlist {
+    left:150px;
+}
+.narrow .summary {
+    float: left;
+}
+.narrow .summary .question-title {
+    font-weight: bold;
+    font-size: 120%;
+}
+.user-profile-tool-links {
+    padding-bottom:10px;
+    font-weight: bold;
+}
+.post-controls {
+    float:left;
+    font-size:11px;
+    line-height:12px;
+    min-width:200px;
+    margin-bottom:5px;
+}
+#question-controls .tags {
+    margin:0 0 3px 0;
+}
+.post-update-info-container {
+    float: right;
+    min-width:190px;
+}
+.post-update-info {
+    display:inline-block;
+    float:right;
+    width:190px;
+    margin-bottom:5px;
+}
+.post-update-info p {
+    font-size:11px;
+    line-height:15px;
+    margin:0 0 4px 0;
+    padding:0;
+}
+.post-update-info img {
+    float: left;
+    width: 32px;
+    margin: 4px 8px 0 0;
+}
+.comments-container {
+    clear:both;
+}
+.admin {
+    background-color:#fff380;/* nice yellow */
+    border: 1px solid darkred;
+    padding: 0 5px 0 5px;
+}
+.admin p {
+    margin-bottom: 3px;
+}
+.admin #action_status {
+    text-align:center;
+    font-weight:bold;
+}
diff --git a/templates/edit_user_email_feeds_form.html b/templates/edit_user_email_feeds_form.html
new file mode 100644
index 00000000..65902e7e
--- /dev/null
+++ b/templates/edit_user_email_feeds_form.html
@@ -0,0 +1,4 @@
+{% load i18n %}
+<table class='form-as-table'>
+{{email_feeds_form.as_table}}
+</table>
diff --git a/templates/faq.html b/templates/faq.html
index aec37a56..236f4f76 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -72,10 +72,12 @@
                     <td style="text-align:right;padding-right:5px"><strong>500</strong></td>
                     <td>{% trans "retag questions" %}</td>
                 </tr>
+                {% if settings.WIKI_ON %}
                 <tr>
                     <td style="text-align:right;padding-right:5px"><strong>750</strong></td>
                     <td>{% trans "edit community wiki questions" %}</td>
                 </tr>
+                {% endif %}
                 <tr>
                     <td style="text-align:right;padding-right:5px"><strong>2000</strong></td>
                     <td>{% trans "edit any answer" %}</td>
@@ -99,7 +101,7 @@
         <div>
             <a id='validate'></a><h3 class="subtitle">{% trans "how to validate email title" %}</h3>
             <!--special case here message must contain paragraphs-->
-            {% trans "how to validate email info" %}
+            {% blocktrans %}how to validate email info with {{send_email_key_url}} {{gravatar_faq_url}}{% endblocktrans %}
         </div>
         {% endifequal %}
         <div>
@@ -121,7 +123,7 @@
         </div>
         <div>
             <h3 class="subtitle">{% trans "Still have questions?" %}</h3>
-            <p>{% trans "Please ask your question, help make our community better!" %} 
+            <p>{% blocktrans %}Please ask your question at {{ask_question_url}}, help make our community better!{% endblocktrans %} 
             <!--
             <a href="{% url tags %}faq" class="big">{{ settings.APP_TITLE }} {% trans "questions" %}</a>{% trans "." %}
             -->
diff --git a/templates/feedback.html b/templates/feedback.html
new file mode 100644
index 00000000..38bb48ff
--- /dev/null
+++ b/templates/feedback.html
@@ -0,0 +1,55 @@
+{% extends "base_content.html" %}
+<!-- template about.html -->
+{% load i18n %}
+{% load extra_tags %}
+{% load humanize %}
+{% block title %}{% spaceless %}{% trans "Feedback" %}{% endspaceless %}{% endblock %}
+{% block forejs %}
+{% endblock %}
+{% block content %}
+<div class="headNormal">
+{% trans "Give us your feedback!" %}
+</div>
+<div class="content">
+    <form method="post" action="{% url feedback %}" accept-charset="utf-8">
+        {% if user.is_authenticated %}
+            <p class="message">
+            {% blocktrans with user.username as user_name %}
+            <span class='big strong'>Dear {{user_name}}</span>, we look forward to hearing your feedback. 
+            Please type and send us your message below.
+            {% endblocktrans %}
+            <p>
+        {% else %}
+            <p class="message">
+            {% blocktrans %}
+            <span class='big strong'>Dear visitor</span>, we look forward to hearing your feedback.
+            Please type and send us your message below.
+            {% endblocktrans %}
+            </p>
+            <div class="form-row"><label>{{form.name.label}}</label><br/>{{form.name}}</div>
+            <div class="form-row">
+                <label>{{form.email.label}} 
+                    {% if form.errors.email %}
+                        <span class='red'>(please enter a valid email)</span>
+                    {% endif %}
+                </label><br/>{{form.email}}
+            </div>
+        {% endif %}
+        <div class="form-row">
+            <label>{{form.message.label}}
+            {% if form.errors.message %}
+            <span class="red">{% trans "(this field is required)" %}</span>
+            </label>
+            {% endif %}
+            <br/>
+            {{form.message}}
+        </div>
+        {{form.next}}
+        <div class="submit-row">
+            <input type="submit" class="submit" value="{% trans "Send Feedback" %}"/>
+            <input type="submit" class="submit" name="cancel" value="{% trans "Cancel" %}"/>
+        </div>
+    </form>
+</div>
+{% endblock %}
+<!-- end template about.html -->
diff --git a/templates/feedback_email.txt b/templates/feedback_email.txt
new file mode 100644
index 00000000..df768180
--- /dev/null
+++ b/templates/feedback_email.txt
@@ -0,0 +1,19 @@
+{% load i18n %}
+{% spaceless %}
+{% blocktrans with settings.APP_TITLE|safe as site_title %}
+Hello, this is a {{site_title}} forum feedback message
+{% endblocktrans %}
+{% endspaceless %}
+
+{% spaceless %}
+{% trans "Sender is" %}
+{% if user.is_authenticated %}
+    {{user.username|safe}} {% trans "email" %}:{{user.email|safe}} 
+{% else %}
+    {% if name %}{{name|safe}}{% else %}{% trans "anonymous" %}{% endif %}
+    {% if email %}{% trans "email" %}:{{email|safe}}{% endif %}
+{% endif %}
+    ip:{{request.META.REMOTE_ADDR}}
+{% endspaceless %}
+
+{% trans "Message body:" %} {{message|safe}}
diff --git a/templates/footer.html b/templates/footer.html
index 7eb0205e..9d19b41e 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -3,33 +3,47 @@
 {% load i18n %}
 <!-- 页面底部开始： -->
     <div id="ground">
-       <div class="footerLinks" >
-            <a href="{% url about %}">{% trans "about" %}</a><span class="link-separator"> |</span>
-            <a href="{% url faq %}">{% trans "faq" %}</a><span class="link-separator"> |</span>
-            <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
-            <a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>
-            <a href="{% url privacy %}">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
-            <a href="{{ feedback_url }}" target="_blank">{% trans "give feedback" %}</a>
-        </div>
-	  <p style="margin-top:10px;">
-         <a href="http://code.google.com/p/cnprog/" target="_blank">
-            <img src="/content/images/djangomade124x25_grey.gif" border="0" alt="Made with Django." title="Made with Django." />
-         </a>
-         <!--<div style="font-size:90%;color:#333">{% trans "current revision" %}: R-0120-20090406</div>-->
-      </p>
-	  <p id="licenseLogo"><img src="/content/images/cc-wiki.png" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" /></p>
+		<div>
+			<div class="footerLinks" >
+				<a href="{% url about %}">{% trans "about" %}</a><span class="link-separator"> |</span>
+				<a href="{% url faq %}">{% trans "faq" %}</a><span class="link-separator"> |</span>
+				<!--<a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>-->
+				<!--<a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>-->
+				<a href="{% url privacy %}">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
+                {% spaceless %}
+				<a href=
+                    {% if settings.FEEDBACK_SITE_URL %}
+                        "{{settings.FEEDBACK_SITE_URL}}"
+                        target="_blank">
+                    {% else %}
+                        "{% url feedback %}?next={{request.path}}">
+                    {% endif %}
+                    {% trans "give feedback" %}
+                </a>
+                {% endspaceless %}
+			</div>
+		  <p>
+			 <a href="http://github.com/cnprog/CNPROG/network" target="_blank">
+				powered by cnprog platform
+				<!--<img src="{% href "/content/images/djangomade124x25_grey.gif" %}" border="0" alt="Made with Django." title="Made with Django." >-->
+			 </a>
+		  </p>
+	   </div>
+		 <div id="licenseLogo">
+		  <a href="http://creativecommons.org/licenses/by/3.0/">
+					<img src="{% href "/content/images/cc-wiki.png" %}" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" />
+		  </a>
+		 </div>
 	</div>
 	<!-- 页面底部结束： -->
-    {% if settings.GOOGLE_ANALYTICS_KEY %}
         <script type="text/javascript">
             var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
             document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
             </script>
             <script type="text/javascript">
             try {
-            var pageTracker = _gat._getTracker("{{ settings.GOOGLE_ANALYTICS_KEY }}");
+            var pageTracker = _gat._getTracker('{{ settings.GOOGLE_ANALYTICS_KEY }}');
             pageTracker._trackPageview();
             } catch(err) {}
         </script>
-    {% endif %}
-<!-- end footer.html -->
+<!-- end template footer.html -->
diff --git a/templates/header.html b/templates/header.html
index e1097802..42074763 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>
diff --git a/templates/index.html b/templates/index.html
index 104b24d0..470612b4 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,6 +4,7 @@
 {% load extra_tags %}
 {% load humanize %}
 {% load extra_filters %}
+{% load smart_if %}
 {% block title %}{% spaceless %}{% trans "Home" %}{% endspaceless %}{% endblock %}
 {% block meta %}<meta name="keywords" content="{{ settings.APP_KEYWORDS }}" />
         <meta name="description" content="{{ settings.APP_DESCRIPTION }}" />{% endblock %}
@@ -32,30 +33,31 @@
     {% for question in questions %}
     <div class="qstA">
         <h2>
-            <a href="{{ question.get_absolute_url }}" title="{{ question.summary|collapse }}...">
-            {{ question.get_question_title }}
-            </a>
+            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
         </h2>
         <div class="stat">
             <table>
-	            <tr>
+                <tr>
                     <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
                     <td><span class="num">{{ question.score|intcomma }}</span> </td>
                     <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-	            </tr>  
+                </tr>  
                 <tr>
                     <td><span class="unit">{% trans "answers" %}</span></td>
                     <td><span class="unit">{% trans "votes" %}</span></td>
                     <td><span class="unit">{% trans "views" %}</span></td>
-	            </tr> 
+                </tr> 
             </table>
         </div>
+        
         <div class="summary">
-            {{ question.summary}}...
+            {{ question.summary }}...                
         </div>
-        {% if question.wiki %}
+        
+        {% ifequal tab_id 'active'%}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
-        <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
             {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
@@ -64,6 +66,38 @@
             <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
         </div>
         {% endif %}
+        {% else %}
+        {% if question.wiki and settings.WIKI_ON %}
+        <span class="from wiki">{% trans "community wiki" %}</span>
+        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+        {% else %}
+        <div class="from">
+            {% comment %}{% gravatar question.author 24 %}{% endcomment %}
+            {% if question.last_activity_at != question.added_at %}
+                {% if question.author.id != question.last_activity_by.id %}
+                    {% trans "Posted:" %}
+                    <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                    <span class="score">{% get_score_badge question.author %} </span>
+                    / {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% else %}
+                    {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% endif %}
+            {% else %}
+                {% trans "Posted:" %}
+                <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                <span class="score">{% get_score_badge question.author %} </span>
+                <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% endif %}
+        </div>
+        {% endif %}
+        {% endifequal %}
+        
         <div class="tags">
         {% for tag in question.tagname_list %}
         <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
@@ -85,7 +119,7 @@
 	</div>
 </div>
 {% endif %}
-<div class="boxB">
+<div class="boxC">
 	<h3>{% trans "Recent tags" %}</h3>
 	<div class="body">
          <div class="tags">
@@ -98,7 +132,7 @@
     </div>
 </div>
 {% if awards %}
-<div class="boxB">
+<div class="boxC">
     <h3>{% trans "Recent awards" %}</h3>
         <div class="body">
              <ul class="badge-list">
@@ -115,12 +149,12 @@
 </div>
 {% endif %}
 <div id="feeds">
-<a href="/feeds/rss" title="{% trans "subscribe to last 30 questions by RSS" %}">{% trans "subscribe to the questions feed" %}</a>
+<a href="{% href "/feeds/rss" %}" title="{% trans "subscribe to last 30 questions by RSS" %}">{% trans "subscribe to the questions feed" %}</a>
 </div>
 {% endblock %}
 {% block tail %}
 <div style="padding:5px 0 5px 5px;">
-<span class="evenMore">{% trans "Still looking for more? See" %} <a href="{% url questions %}">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="{% url questions %}unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
+<span class="evenMore">{% trans "Still looking for more? See" %} <a href="{% url questions %}">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="{% url tags %}">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="{% url questions %}unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
 </div>
 {% endblock %}
 <!-- index.html -->
diff --git a/templates/logout.html b/templates/logout.html
index 2cd935a0..650ba044 100644
--- a/templates/logout.html
+++ b/templates/logout.html
@@ -8,7 +8,6 @@
     <script type="text/javascript">
     $().ready(function(){
         $('#btLogout').bind('click', function(){ window.location.href='{% url user_signout %}?next={{ next }}'; });
-    
     });
     </script>
 {% endblock %}
diff --git a/templates/post_contributor_info.html b/templates/post_contributor_info.html
new file mode 100644
index 00000000..9997be5f
--- /dev/null
+++ b/templates/post_contributor_info.html
@@ -0,0 +1,55 @@
+{% load i18n %}
+{% load smart_if %}
+{% load extra_tags %}
+<div class='post-update-info'>
+{% ifequal contributor_type "original_author" %}
+    {% if wiki %}
+        <p>{% trans "community wiki" %}</p>
+        <p>
+            {% blocktrans count post.revisions.all|length as rev_count %}
+                one revision
+            {% plural %}
+                {{rev_count}} revisions
+            {% endblocktrans %}
+        </p>
+        <p>{{post.author.get_profile_link}}</p>
+    {% else %}
+        <p style="line-height:12px;">
+            {% ifequal post_type "question" %}
+                {% trans "asked" %}
+            {% else %}
+                {% ifequal post_type "answer" %}
+                    {% trans "answered" %}
+                {% else %}
+                    {% trans "posted" %}
+                {% endifequal %}
+            {% endifequal %}
+            {% ifequal post_type "revision" %}
+                <strong>{% diff_date post.revised_at %}</strong>
+            {% else %}
+                <strong>{% diff_date post.added_at %}</strong>
+            {% endifequal %}
+        </p>
+        {% gravatar post.author 32 %}
+        <p>{{post.author.get_profile_link}}<br/>
+        {% get_score_badge post.author %}</p>
+    {% endif %}
+{% else %}
+    {% if post.last_edited_at %}
+        <p style="line-height:12px;">
+        {% ifequal post_type 'question' %}
+        <a href="{% url question_revisions post.id %}">
+        {% else %}
+        <a href="{% url answer_revisions post.id %}">
+        {% endifequal %}
+        {% trans "updated" %} <strong>{% diff_date post.last_edited_at %}</strong>
+        </a>
+        </p>
+        {% if post.author != post.last_edited_by or wiki %}
+            {% gravatar post.last_edited_by 32 %}
+            <p style="float:left">{{post.last_edited_by.get_profile_link}}<br/>
+            {% get_score_badge post.last_edited_by %}</p>
+        {% endif %}
+    {% endif %}
+{% endifequal %}
+</div>
diff --git a/templates/question.html b/templates/question.html
index c9446076..6929b762 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -2,21 +2,23 @@
 <!-- question.html -->
 {% load extra_tags %}
 {% load extra_filters %}
+{% load smart_if %}
 {% load humanize %}
 {% load i18n %}
 {% block title %}{% spaceless %}{{ question.get_question_title }}{% endspaceless %}{% endblock %}
 {% block forejs %}
         <meta name="description" content="{{question.summary}}" />
         <meta name="keywords" content="{{question.tagname_meta_generator}}" />
-        <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}"/>
+        <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />
         {% if not question.closed %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/wmd.js'></script>
-        <link rel="stylesheet" type="text/css" href="/content/js/wmd/wmd.css" />
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/showdown.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/wmd.js" %}'></script>
+        <link rel="stylesheet" type="text/css" href="{% href "/content/js/wmd/wmd.css" %}" />
         {% endif %}
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
+
         <script type="text/javascript">
         // define reputation needs for comments
         var repNeededForComments = 50;
@@ -61,14 +63,17 @@
 </div>
 <div id="main-body" class="">
     <div id="askform">
-        <form id="fmanswer" action="{% url answer question.id %}" method="post">
             <table style="width:100%;" id="question-table" {% if question.deleted %}class="deleted"{%endif%}>
                 <tr>
                     <td style="width:30px;vertical-align:top">
                         <div class="vote-buttons">
                             {% if question_vote %}
                             <img id="question-img-upvote-{{ question.id }}" class="question-img-upvote" 
-								src="/content/images/vote-arrow-up{% if question_vote.is_upvote %}-on{% endif %}.png" 
+                                {% if question_vote.is_upvote %}
+								    src="{% href "/content/images/vote-arrow-up-on.png" %}" 
+                                {% else %}
+								    src="{% href "/content/images/vote-arrow-up.png" %}" 
+                                {% endif %}
                                 alt="{% trans "i like this post (click again to cancel)" %}"
 								title="{% trans "i like this post (click again to cancel)" %}" />
                             <div id="question-vote-number-{{ question.id }}" class="vote-number" 
@@ -76,34 +81,38 @@
                                 {{ question.score }}
                             </div>
                             <img id="question-img-downvote-{{ question.id }}" class="question-img-downvote" 
-								src="/content/images/vote-arrow-down{% if question_vote.is_downvote %}-on{% endif %}.png" 
+                                {% if question_vote.is_downvote %}
+								    src="{% href "/content/images/vote-arrow-down-on.png" %}" 
+                                {% else %}
+								    src="{% href "/content/images/vote-arrow-down.png" %}" 
+                                {% endif %}
                                 alt="{% trans "i dont like this post (click again to cancel)" %}"
 								title="{% trans "i dont like this post (click again to cancel)" %}" />
                            
                             {% else %}
                             <img id="question-img-upvote-{{ question.id }}" class="question-img-upvote" 
                                 alt="{% trans "i like this post (click again to cancel)" %}"
-								src="/content/images/vote-arrow-up.png" 
+								src="{% href "/content/images/vote-arrow-up.png" %}" 
 								title="{% trans "i like this post (click again to cancel)" %}" />
                             <div id="question-vote-number-{{ question.id }}" class="vote-number" 
 								title="{% trans "current number of votes" %}">
                                 {{ question.score }}
                             </div>
                             <img id="question-img-downvote-{{ question.id }}" class="question-img-downvote" 
-								src="/content/images/vote-arrow-down.png" 
+								src="{% href "/content/images/vote-arrow-down.png" %}"
                                 alt="{% trans "i dont like this post (click again to cancel)" %}"
                                 title="{% trans "i dont like this post (click again to cancel)" %}" />
           
                             {% endif %}
                             {% if favorited %}
-                            <img class="question-img-favorite" src="/content/images/vote-favorite-on.png" 
+                            <img class="question-img-favorite" src="{% href "/content/images/vote-favorite-on.png" %}"
 								alt="{% trans "mark this question as favorite (click again to cancel)" %}"
 								title="{% trans "mark this question as favorite (click again to cancel)" %}" />
                             <div id="favorite-number" class="favorite-number my-favorite-number">
                                 {{ question.favourite_count }}
                             </div>
                             {% else %}
-                            <img class="question-img-favorite" src="/content/images/vote-favorite-off.png" 
+                            <img class="question-img-favorite" src="{% href "/content/images/vote-favorite-off.png" %}"
 								alt="{% trans "remove favorite mark from this question (click again to restore mark)" %}"
 								title="{% trans "remove favorite mark from this question (click again to restore mark)" %}" />
                             <div id="favorite-number" class="favorite-number">
@@ -119,137 +128,87 @@
                             <div class="question-body">
                                 {{ question.html|safe }}
                             </div>
-                            <div id="question-tags" class="tags" >
-                                {% for tag in question.tagname_list %}
-                                    <a href="{% url forum.views.tag tag|urlencode %}" class="post-tag" 
-										title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
-                                {% endfor %}
+                            <div id="question-controls" class="post-controls">
+                                <div id="question-tags" class="tags">
+                                    {% for tag in question.tagname_list %}
+                                        <a href="{% url forum.views.tag tag|urlencode %}" class="post-tag" 
+                                            title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
+                                    {% endfor %}
+                                </div>
+                                {% joinitems using '<span class="action-link-separator">|</span>' %}    
+                                    {% if request.user|can_edit_post:question %}
+                                    <span class="action-link"><a href="{% url edit_question question.id %}">{% trans 'edit' %}</a></span>
+                                    {% endif %}
+                                {% separator %}
+                                    {% if request.user|can_delete_post:question %}
+                                    <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span>
+                                    {% endif %}
+                                {% separator %}
+                                    {% if question.closed %}
+                                    {% if request.user|can_reopen_question:question %}
+                                    <span class="action-link"><a href="{% url reopen question.id %}">{% trans "reopen" %}</a></span>
+                                    {% endif %}
+                                    {% else %}
+                                    {% if request.user|can_close_question:question %}
+                                    <span class="action-link"><a href="{% url close question.id %}">{% trans "close" %}</a></span>
+                                    {% endif %}
+                                    {% endif %}
+                                {% separator %}
+                                    {% if request.user|can_flag_offensive %}
+                                    <span id="question-offensive-flag-{{ question.id }}" class="offensive-flag" 
+                                        title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">
+                                        <a>{% trans "flag offensive" %}</a>
+                                        {% if request.user|can_view_offensive_flags and question.offensive_flag_count %}
+                                        <span class="darkred">({{ question.offensive_flag_count }})</span>
+                                        {% endif %}
+                                    </span>
+                                    {% endif %}
+                                {% endjoinitems %}
                             </div>
-                            <div id="question-controls" style="clear:both;">
-                                <table width="100%">
-                                    <tr>
-                                        <td width="210px" style="vertical-align:top">
-                                            
-                                            {% if request.user|can_edit_post:question %}
-                                            <span class="action-link"><a href="{% url edit_question question.id %}">{% trans 'edit' %}</a></span>
-                                            <span class="action-link-separator">|</span>
-                                            {% endif %}
-                                            {% if request.user|can_delete_post:question %}
-                                            <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span>
-                                            <span class="action-link-separator">|</span>
-                                            {% endif %}
-                                            {% if question.closed %}
-                                            {% if request.user|can_reopen_question:question %}
-                                            <span class="action-link"><a href="{% url reopen question.id %}">{% trans "reopen" %}</a></span>
-                                            <span class="action-link-separator">|</span>
-                                            {% endif %}
-                                            {% else %}
-                                            {% if request.user|can_close_question:question %}
-                                            <span class="action-link"><a href="{% url close question.id %}">{% trans "close" %}</a></span>
-                                            <span class="action-link-separator">|</span>
-                                            {% endif %}
-                                            {% endif %}
-                                            
-                                            <span id="question-offensive-flag-{{ question.id }}" class="offensive-flag" 
-												title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">
-												<a>{% trans "flag offensive" %}</a>
-												<span class="darkred">{% if request.user|can_view_offensive_flags %}
-												{% if question.offensive_flag_count %}({{ question.offensive_flag_count }}){% endif %}{% endif %}</span>
-                                            </span>
-                                            
-                                        </td>
-                                        <td width="210px" style="vertical-align:top">
-                                            {% if question.last_edited_by %}
-                                            <div class="question-edit" >
-                                                <table width="200px" >
-                                                    <tr>
-                                                        <td colspan="2"> 
-                                                         {% trans "updated" %} <a href="{% url question_revisions question.id %}"><strong title="{{question.last_edited_at }}">{% diff_date question.last_edited_at  %}</strong></a>
-                                                        </td>
-                                                        
-                                                    </tr>
-                                                    {% if question.wiki %}
-                                                    <tr>
-                                                        <td style="width:40px;vertical-align:bottom">
-                                                        {% gravatar question.last_edited_by 32 %}
-                                                        </td>
-                                                        <td style="width:160px; vertical-align:top">
-                                                            <a href="{% url users %}{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a>
-                                                        </td>
-                                                    </tr>
-                                                    {% else %}
-                                                    {% ifequal question.last_edited_by question.author %}
-                                                    <tr>
-                                                        <td> </td>
-                                                        <td> </td>
-                                                    </tr>
-                                                    {% else %}
-                                                    <tr>
-                                                        <td style="width:40px;vertical-align:bottom">
-                                                        {% gravatar question.last_edited_by 32 %}
-                                                        </td>
-                                                        <td style="width:160px; vertical-align:top">
-                                                            <div><a href="{% url users %}{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a></div>
-                                
-                                                            <div>
-                                                            {% get_score_badge question.last_edited_by %}
-                                                            </div>
-                                                          
-                                                        </td>
-                                                    </tr>
-                                                    {% endifequal %}
-                                                    {% endif %}
-                                                </table>
-                                            </div>
-                                            {% endif %}
-                                            
-                                        </td>
-                                        <td style="vertical-align:top">
-                                            {% if question.wiki %}
-                                            <span class="wiki-category">{% trans "community wiki" %}</span>
-                                            <div style="margin-bottom:10px"></div>
-                                            {% else %}
-                                            <div  class="question-mark">
-                                                <table width="200px">
-                                                    <tr>
-                                                        <td colspan="2"> 
-                                                        {% trans "asked" %} <strong title="{{ question.added_at }}">{% diff_date question.added_at %}</strong>
-                                                        </td>
-                                                        
-                                                    </tr>
-                                                    
-                                                    <tr>
-                                                        <td style="width:40px; vertical-align:bottom">
-                                                        {% gravatar question.author 32 %}
-                                                        </td>
-                                                        <td align="left" style="width:160px;vertical-align:top">
-                                                            <div><a href="{% url users %}{{ question.author.id }}/{{ question.author }}">{{ question.author }}</a></div>
-                                                            <div>
-                                                            {% get_score_badge question.author %}
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    
-                                                </table>
-                                            </div>
-                                            {% endif %}
-                                        
-                                        </td>
-                                    </tr>
-                                </table>
-                                
+                            <div class="post-update-info-container">
+                                {% post_contributor_info question "original_author" %}
+                                {% post_contributor_info question "last_updater" %}
+                            </div>
+                            <div class="comments-container" id="comments-container-question-{{question.id}}">
+                            {% for comment in question.get_comments|slice:":5" %}
+                                <p class="comment" id="comment-{{comment.id}}">
+                                    {{comment.comment}} 
+                                    - <a class="comment-user" href="{{comment.user.get_profile_url}}">{{comment.user}}</a>
+                                    {% spaceless %}
+                                    <span class="comment-age">({% diff_date comment.added_at %})</span>
+                                    {% if request.user|can_delete_comment:comment %}
+                                        <img class="delete-icon" 
+                                            src="{% href "/content/images/close-small.png" %}"
+                                            title="{% trans "delete this comment" %}"/>
+                                    {% endif %}
+                                    {% endspaceless %}
+                                </p>
+                            {% endfor %}
                             </div>
-                            
                             <div class="post-comments" style="margin-bottom:20px">
-                                <input id="can-post-comments-question-{{question.id}}" type="hidden" value="{{ request.user|can_add_comments }}"/>
-                                <a id="comments-link-question-{{question.id}}" class="comments-link">
-								{% if question.comment_count %}{% trans "comments" %} <strong>({{question.comment_count}})</strong>
-								{% else %}{% trans "add comment" %}
-								{% endif %}</a>
-                                <div id="comments-question-{{question.id}}" class="comments-container">
-                                <div class="comments"/></div>
+                                <input id="can-post-comments-question-{{question.id}}" type="hidden" value="{{ request.user|can_add_comments:question }}"/>
+                                {% if request.user|can_add_comments:question or question.comment_count > 5 %}
+                                    <a id="comments-link-question-{{question.id}}" class="comments-link">
+                                    {% if request.user|can_add_comments:question %}
+                                        {% trans "add comment" %}
+                                    {% endif %}
+                                    {% if question.comment_count > 5 %}
+                                        {% if request.user|can_add_comments:question %}/
+                                            {% blocktrans count question.get_comments|slice:"5:"|length as counter %}
+                                            see <strong>one</strong> more 
+                                            {% plural %}
+                                            see <strong>{{counter}}</strong> more
+                                            {% endblocktrans %}
+                                        {% else %}
+                                            {% blocktrans count question.get_comments|slice:"5:"|length as counter %}
+                                            see <strong>one</strong> more comment
+                                            {% plural %}
+                                            see <strong>{{counter}}</strong> more comments
+                                            {% endblocktrans %}
+                                        {% endif %}
+                                    {% endif %}</a>
+                                {% endif %}
                             </div>
-                            
                         </div>
                         
                     </td>
@@ -257,20 +216,29 @@
             </table>
             {% if question.closed %}
             <div class="question-status" style="margin-bottom:15px">
-                <h3>{% trans "The question has been closed for the following reason" %} "{{ question.get_close_reason_display }}" {% trans "by"%} 
+            <h3>{% blocktrans with question.get_close_reason_display as close_reason %}The question has been closed for the following reason "{{ close_reason }}" by{% endblocktrans %} 
 			<a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> 
-			{% blocktrans %}close date {% endblocktrans %} {{question.closed_at|date:"d-m-Y H:i"}}</h3>
+			{% blocktrans with question.closed_at as closed_at %}close date {{closed_at}}{% endblocktrans %}</h3>
             </div>
             {% endif %}
-            
-            {% ifnotequal answers.length 0 %}
+            {% if answers %}
+                <hr/>
                 <div class="tabBar">
                     <a name="sort-top"></a>
-                    <div class="headQuestions">{{ answers|length }}{% trans "Answers" %}:</div>
+                    <div class="headQuestions">
+                    {% blocktrans count answers|length as counter %}
+                    One Answer:
+                    {% plural %}
+                    {{counter}} Answers:
+                    {% endblocktrans %}
+                    </div>
                     <div class="tabsA">
-                         <a id="oldest" href="?sort=oldest#sort-top" title="{% trans "oldest answers will be shown first" %}">{% trans "oldest answers" %}</a>
-                        <a id="latest" href="?sort=latest#sort-top" title="{% trans "newest answers will be shown first" %}">{% trans "newest answers" %}</a>
-                        <a id="votes" href="?sort=votes#sort-top" title="{% trans "most voted answers will be shown first" %}">{% trans "popular answers" %}</a>   
+                         <a id="oldest" href="{% url question question.id %}?sort=oldest#sort-top" 
+                            title="{% trans "oldest answers will be shown first" %}">{% trans "oldest answers" %}</a>
+                        <a id="latest" href="{% url question question.id %}?sort=latest#sort-top" 
+                            title="{% trans "newest answers will be shown first" %}">{% trans "newest answers" %}</a>
+                        <a id="votes" href="{% url question question.id %}?sort=votes#sort-top" 
+                            title="{% trans "most voted answers will be shown first" %}">{% trans "popular answers" %}</a>   
                     </div>
                 </div>
                 {% cnprog_paginator context %}
@@ -283,26 +251,26 @@
                                 <td style="width:30px;vertical-align:top">
                                     <div class="vote-buttons">
                                         <img id="answer-img-upvote-{{ answer.id }}" class="answer-img-upvote" 
-                                                src="/content/images/vote-arrow-up{% get_user_vote_image user_answer_votes answer.id 1 %}.png" 
+                                                src="{% blockresource %}/content/images/vote-arrow-up{% get_user_vote_image user_answer_votes answer.id 1 %}.png{% endblockresource %}" 
                                                 alt="{% trans "i like this answer (click again to cancel)" %}"
                                                 title="{% trans "i like this answer (click again to cancel)" %}"/>
                                         <div id="answer-vote-number-{{ answer.id }}" class="vote-number" title="{% trans "current number of votes" %}">
                                             {{ answer.score }}
                                         </div>
                                         <img id="answer-img-downvote-{{ answer.id }}" class="answer-img-downvote" 
-											src="/content/images/vote-arrow-down{% get_user_vote_image user_answer_votes answer.id -1 %}.png" 
+											src="{% blockresource %}/content/images/vote-arrow-down{% get_user_vote_image user_answer_votes answer.id -1 %}.png{% endblockresource %}" 
 											alt="{% trans "i dont like this answer (click again to cancel)" %}"
 											title="{% trans "i dont like this answer (click again to cancel)" %}" />
                                      
                                         {% ifequal request.user question.author  %}
                                         <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" 
-											src="/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png" 
+											src="{% blockresource %}/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockresource %}" 
 											alt="{% trans "mark this answer as favorite (click again to undo)" %}"
 											title="{% trans "mark this answer as favorite (click again to undo)" %}" />
                                         {% else %}
                                             {% if answer.accepted %}
                                             <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" 
-												src="/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png" 
+												src="{% blockresource %}/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockresource %}" 
 												alt="{% trans "the author of the question has selected this answer as correct" %}"
 												title="{% trans "the author of the question has selected this answer as correct" %}" />
                                             {% endif %}
@@ -314,124 +282,82 @@
                                         <div class="answer-body">
                                             {{ answer.html|safe }}
                                         </div>
-                                        <div class="answer-controls" style="clear:both;">
-                                            <table width="100%">
-                        	                    <tr>
-                                                    <td width="400px" style="vertical-align:top">
-                                                        {% if request.user|can_edit_post:answer %}
-                                                        <span class="action-link"><a href="{% url edit_answer answer.id %}">{% trans "edit" %}</a></span>
-                                                        <span class="action-link-separator">|</span>
-                                                        {% endif %}
-                                                        {% if request.user|can_delete_post:answer %}
-                                                        <span class="action-link">
-															<a id="answer-delete-link-{{answer.id}}">
-																{% if answer.deleted %}
-																	{% trans "undelete" %}
-																{% endif %}
-																{% if not answer.deleted %}
-																	{% trans "delete" %}
-																{% endif %}
-															</a>
-														</span>
-                                                        <span class="action-link-separator">|</span>
-                                                        {% endif %}
-                                                        <span class="linksopt">
-                                                            <a href="#{{ answer.id }}" title="{% trans "answer permanent link" %}">
-															{% trans "permanent link" %}
-                                                            </a>
-                                                        </span>
-                                                        <span class="action-link-separator">|</span>
-                                                        <span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag" 
-															title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">
-															<a>{% trans "flag offensive" %}</a>
-															<span class="darkred">{% if request.user|can_view_offensive_flags %}{% if answer.offensive_flag_count %}({{ answer.offensive_flag_count }}){% endif %}{% endif %}</span></span>
-                                                    </td>
-                        	                    	<td width="110px" style="vertical-align:top">
-                                                    {% if answer.last_edited_by %}
-                                                    <div class="question-edit" >
-                                                        <table width="200px" >
-                                                            <tr>
-                                                                <td colspan="2"> 
-                                                                 {% trans "updated" %}<a href="{% url answer_revisions answer.id %}"><strong title="{{answer.last_edited_at }}">{% diff_date answer.last_edited_at  %}</strong></a>
-                                                                </td>
-                                                            </tr>
-                                                            {% if answer.wiki %}
-                                                            <tr>
-                                                                <td width="40px" style="vertical-align:bottom">
-                                                                {% gravatar answer.last_edited_by 32 %}
-                                                                </td>
-                                                                <td style="width:160px; vertical-align:top">
-                                                                    <div><a href="{% url users %}{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
-                                                               
-                                                                </td>
-                                                            </tr>
-                                                            {% else %}
-                                                            {% ifequal answer.last_edited_by answer.author %}
-                                                            <tr>
-                                                                <td> </td>
-                                                                <td> </td>
-                                                            </tr>
-                                                            {% else %}
-                                                            <tr>
-                                                                <td width="40px" style="vertical-align:bottom">
-                                                                {% gravatar answer.last_edited_by 32 %}
-                                                                </td>
-                                                                <td style="width:160px; vertical-align:top">
-                                                                    <div><a href="{% url users %}{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
-                                                                    <div>
-                                                                    {% get_score_badge answer.last_edited_by %}
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            {% endifequal %}
-                                                            {% endif %}
-                                                        </table>
-                                                    </div>
+                                        <div class="answer-controls post-controls">
+                                            {% joinitems using '<span class="action-link-separator">|</span>' %}    
+                                                <span class="linksopt">
+                                                    <a href="#{{ answer.id }}" title="{% trans "answer permanent link" %}">
+                                                        {% trans "permanent link" %}
+                                                    </a>
+                                                </span>
+                                            {% separator %}
+                                                {% if request.user|can_edit_post:answer %}
+                                                <span class="action-link"><a href="{% url edit_answer answer.id %}">{% trans 'edit' %}</a></span>
+                                                {% endif %}
+                                            {% separator %}
+                                                {% if request.user|can_delete_post:answer %}
+                                                    {% spaceless %}
+                                                    <span class="action-link">
+                                                        <a id="answer-delete-link-{{answer.id}}">
+                                                        {% if answer.deleted %}{% trans "undelete" %}{% else %}{% trans "delete" %}{% endif %}</a>
+                                                    </span>
+                                                    {% endspaceless %}
+                                                {% endif %}
+                                            {% separator %}
+                                                {% if request.user|can_flag_offensive %}
+                                                <span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag" 
+                                                    title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">
+                                                    <a>{% trans "flag offensive" %}</a>
+                                                    {% if request.user|can_view_offensive_flags and answer.offensive_flag_count %}
+                                                    <span class="darkred">({{ answer.offensive_flag_count }})</span>
                                                     {% endif %}
-                                                    
-                                                </td>
-                                                 <td style="vertical-align:top">
-                                                    {% if answer.wiki %}
-                                                    <span class="wiki-category">{% trans "community wiki" %}</span>
-                                                    <div style="margin-bottom:10px"></div>
+                                                </span>
+                                                {% endif %}
+                                            {% endjoinitems %}
+                                        </div>
+                                        <div class="post-update-info-container">
+                                            {% post_contributor_info answer "original_author" %}
+                                            {% post_contributor_info answer "last_updater" %}
+                                        </div>
+                                        <div class="comments-container" id="comments-container-answer-{{answer.id}}">
+                                        {% for comment in answer.get_comments|slice:":5" %}
+                                            <p id="comment-{{comment.id}}" class="comment">
+                                                {{comment.comment}} 
+                                                - <a class="comment-user" href="{{comment.user.get_profile_url}}">{{comment.user}}</a>
+                                                {% spaceless %}
+                                                <span class="comment-age">({% diff_date comment.added_at %})</span>
+                                                {% if request.user|can_delete_comment:comment %}
+                                                    <img class="delete-icon" 
+                                                        src="{% href "/content/images/close-small.png" %}"
+                                                        title="{% trans "delete this comment" %}"/>
+                                                {% endif %}
+                                                {% endspaceless %}
+                                            </p>
+                                        {% endfor %}
+                                        </div>
+                                        <div class="post-comments" style="margin-bottom:20px">
+                                            <input id="can-post-comments-answer-{{answer.id}}" type="hidden" value="{{ request.user|can_add_comments:answer}}"/>
+                                            {% if request.user|can_add_comments:answer or answer.comment_count > 5 %}
+                                                <a id="comments-link-answer-{{answer.id}}" class="comments-link">
+                                                {% if request.user|can_add_comments:answer %}
+                                                    {% trans "add comment" %}
+                                                {% endif %}
+                                                {% if answer.comment_count > 5 %}
+                                                    {% if request.user|can_add_comments:answer %}/
+                                                        {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}
+                                                        see <strong>one</strong> more 
+                                                        {% plural %}
+                                                        see <strong>{{counter}}</strong> more
+                                                        {% endblocktrans %}
                                                     {% else %}
-                                                    <div  class="answer-mark">
-                                                        <table width="200px">
-                            	                            <tr>
-                                	                           	<td colspan="2"> 
-                                                                {% trans "asked" %} <strong title="{{answer.added_at}}">{% diff_date answer.added_at %}</strong>
-                                                                </td>
-                            	                            </tr>
-                            	                            <tr>
-                                                                <td width="40px" style="vertical-align:bottom">
-                                                                {% gravatar answer.author 32 %}
-                                                                </td>
-                                                                <td style="width:160px; vertical-align:top">
-                                                                    <div><a href="{% url users %}{{ answer.author.id }}/{{ answer.author.username }}">{{ answer.author }}</a></div>
-                                                                    <div>
-                                                                    {% get_score_badge answer.author %}
-                                                                    </div>
-                                                                </td>
-                            	                            </tr>
-                                                        </table>
-                                                    </div>
+                                                        {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}
+                                                        see <strong>one</strong> more comment
+                                                        {% plural %}
+                                                        see <strong>{{counter}}</strong> more comments
+                                                        {% endblocktrans %}
                                                     {% endif %}
-                                                    
-                                                 </td>
-                        	                    </tr>
-                        	                    
-                                            </table>
-                                            
-                                        </div>
-                                        <div id="comment-{{ answer.id }}" class="post-comments" >
-                                            <input id="can-post-comments-answer-{{answer.id}}" type="hidden" value="{{ request.user|can_add_comments }}"/>
-                                            <a id="comments-link-answer-{{answer.id}}" class="comments-link">
-												{% if answer.comment_count %}{% trans "comments" %} 
-												<strong>({{answer.comment_count}})</strong>{% else %}{% trans "add comment" %}{% endif %}</a>
-                                            <div id="comments-answer-{{answer.id}}" class="comments-container">
-                                            <div class="comments"/></div>
+                                                {% endif %}</a>
+                                            {% endif %}
                                         </div>
-                                        
                                     </div>
                                     
                                 </td>
@@ -442,46 +368,101 @@
                 <div class="paginator-container-left">
                     {% cnprog_paginator context %}
                 </div>
+            {% endif %}
+        <form id="fmanswer" action="{% url answer question.id %}" method="post">
+            {% if request.user.is_authenticated %}
+                <p style="padding-left:3px">
+                {{ answer.email_notify }} 
+                <label for="question-subscribe-updates">
+                {% ifequal request.user.get_q_sel_email_feed_frequency 'n' %}
+                    {% trans "Notify me once a day when there are any new answers" %}
+                {% else %}
+                    {% ifequal request.user.get_q_sel_email_feed_frequency 'd' %}
+                        {% trans "Notify me once a day when there are any new answers" %}
+                    {% else %}
+                        {% ifequal request.user.get_q_sel_email_feed_frequency 'w' %}
+                            {% trans "Notify me weekly when there are any new answers" %}
+                        {% endifequal %}
+                    {% endifequal %}
+                {% endifequal %}
+                </label>
+                {% blocktrans with request.user.get_profile_url as profile_url %}
+                You can always adjust frequency of email updates from your {{profile_url}}
+                {% endblocktrans %}
+                </p>
             {% else %}
-                <div class="line"></div>
-            {% endifnotequal %}
+                <p style="padding-left:3px">
+                    <input class="nomargin" type="checkbox" disabled="disabled" />
+                    <label>{% trans "once you sign in you will be able to subscribe for any updates here" %}</label>
+                </p>
+            {% endif %}
             <div style="clear:both">
             </div>
             
             {% if not question.closed %}
-            <div style="padding:10px 0 0 0;">
-                <div class="headNormal">{% trans "Your answer" %}:</div>
-            </div>
-            {% if not request.user.is_authenticated %}
-                <div class="message">{% trans "you can answer anonymously and then login" %}</div>
-            {% endif %}
-
-            <div id="description" class="" >
-                <div id="wmd-button-bar" class="wmd-panel"></div>
-                {{ answer.text }}
-                <div class="preview-toggle">
-                    <table width="100%">
-                        <tr>
-                            <td>
-                                <span id="pre-collapse" 
-									title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
-                            </td>
-                            <td style="text-align:right;">
-                                {{ answer.wiki }} <span style="font-weight:normal;cursor:help" title="{{answer.wiki.help_text}}">{{ answer.wiki.label_tag }} </span>
-                            </td>
-                        </tr>
-                    
-                    </table>  
+                <div style="padding:10px 0 0 0;">
+                    {% spaceless %}
+                    <div class="headNormal">
+                        {% if answers %}
+                            {% trans "Your answer" %}
+                        {% else %}
+                            {% trans "Be the first one to answer this question!" %}
+                        {% endif %}
+                    </div>
+                    {% endspaceless %}
                 </div>
-                <div id="previewer" class="wmd-preview"></div>
-                {{ answer.text.errors }}
-            </div>
-            <input type="submit" value="{% trans "Answer the question" %}" class="submit"/><span class="form-error"></span>
-                {% if request.user.is_authenticated %}
-                    {{ answer.email_notify }} <label for="question-subscribe-updates">{% trans "Notify me daily if there are any new answers." %}</label>
+                {% if not request.user.is_authenticated %}
+                    <div class="message">{% trans "you can answer anonymously and then login" %}</div>
                 {% else %}
-                    <input type="checkbox" disabled="disabled" /><label>{% trans "once you sign in you will be able to subscribe for any updates here" %}</label>
+                    <p class="message">
+                        {% ifequal request.user question.author  %}
+                            {% trans "answer your own question only to give an answer" %}
+                        {% else %}
+                            {% trans "please only give an answer, no discussions" %}
+                        {% endifequal %}
+                    </p>
                 {% endif %}
+
+                <div id="description" class="" >
+                    <div id="wmd-button-bar" class="wmd-panel"></div>
+                    {{ answer.text }}
+                    <div class="preview-toggle">
+                        <table width="100%">
+                            <tr>
+                                <td>
+                                    <span id="pre-collapse" 
+                                        title="{% trans "Toggle the real time Markdown editor preview" %}">
+                                            {% trans "toggle preview" %}
+                                    </span>
+                                </td>
+                                {% if settings.WIKI_ON %}
+                                <td style="text-align:right;">
+                                    {{ answer.wiki }} 
+                                    <span style="font-weight:normal;cursor:help" 
+                                        title="{{answer.wiki.help_text}}">
+                                            {{ answer.wiki.label_tag }} 
+                                    </span>
+                                </td>
+                                {% endif %}
+                            </tr>
+                        
+                        </table>  
+                    </div>
+                    <div id="previewer" class="wmd-preview"></div>
+                    {{ answer.text.errors }}
+                </div>
+                <p><span class="form-error"></span></p>
+                <input type="submit" 
+                    {% if user.is_anonymous %}
+                        value="{% trans "Login/Signup to Post Your Answer" %}" 
+                    {% else %}
+                        {% if user == question.author %}
+                        value="{% trans "Answer Your Own Question" %}" 
+                        {% else %}
+                        value="{% trans "Answer the question" %}" 
+                        {% endif %}
+                    {% endif %}
+                    class="submit" style="float:left"/>
             {% endif %}
         </form>
     </div>
@@ -497,17 +478,17 @@
         {% for tag in tags %}
         	<a href="{% url forum.views.tag tag.name|urlencode %}" 
 			title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" 
-			rel="tag">{{ tag.name }}</a> <span class="tag-number">&#x2715;{{ tag.used_count|intcomma }}</span><br/>
+			rel="tag">{{ tag.name }}</a> <span class="tag-number">&#215;{{ tag.used_count|intcomma }}</span><br/>
         {% endfor %}
     </p>
     <p>
-        {% trans "question asked" %}: <strong title="{{ question.added_at }}">{{ question.added_at|timesince }} {% trans "ago" %}</strong>
+        {% trans "question asked" %}: <strong title="{{ question.added_at }}">{% diff_date question.added_at %}</strong>
     </p>
     <p> 
      	{% trans "question was seen" %}: <strong>{{ question.view_count|intcomma }} {% trans "times" %}</strong>
     </p>
     <p> 
-        {% trans "last updated" %}: <strong title="{{ question.last_activity_at }}">{{ question.last_activity_at|timesince }} {% trans "ago" %}</strong>
+        {% trans "last updated" %}: <strong title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</strong>
     </p>
 </div>
 
@@ -516,7 +497,7 @@
     <div class="questions-related">
         {% for question in similar_questions %}
         <p>
-            <a href="{% url questions %}{{question.id}}/{{ question.get_question_title }}">{{ question.get_question_title }}</a>
+            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
         </p>
         {% endfor %}
     </div>
diff --git a/templates/question_edit.html b/templates/question_edit.html
index db090ca3..d6728caf 100644
--- a/templates/question_edit.html
+++ b/templates/question_edit.html
@@ -1,14 +1,15 @@
 {% extends "base.html" %}
 <!-- question_edit.html -->
 {% load i18n %}
+{% load extra_tags %}
 {% block title %}{% spaceless %}{% trans "Edit question" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/wmd.js'></script>
-        <link rel="stylesheet" type="text/css" href="/content/js/wmd/wmd.css" />
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/showdown.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/wmd.js" %}'></script>
+        <link rel="stylesheet" type="text/css" href="{% href "/content/js/wmd/wmd.css" %}" />
         <script type="text/javascript">
 		//todo move javascript out        
         $().ready(function(){
@@ -90,9 +91,11 @@
                             <td>
                                 <span id="pre-collapse" title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
                             </td>
+                            {% if settings.WIKI_ON %}
                             <td style="text-align:right;">
                                 {{ form.wiki }} <span style="color:#000;cursor:help" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>
                             </td>
+                            {% endif %}
                         </tr>
                     
                     </table>   
diff --git a/templates/question_edit_tips.html b/templates/question_edit_tips.html
index 85614595..4cabea79 100644
--- a/templates/question_edit_tips.html
+++ b/templates/question_edit_tips.html
@@ -13,8 +13,9 @@
 				{% trans "be clear and concise" %}
             </li>
         </ul>
-         <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">{% trans "faq" %} »</a>
-         <br>  
+        <p class='info-box-follow-up-links'>
+            <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}">{% trans "faq" %} »</a>
+        </p>
     </div>
 </div>
 
@@ -45,6 +46,8 @@
 			{% trans "basic HTML tags are also supported" %}
         </li>
     </ul>
-    <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank" style="float:right;position:relative">{% trans "learn more about Markdown" %} »</a>
+    <p class='info-box-follow-up-links'>
+        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans "learn more about Markdown" %} »</a>
+    </p>
 </div>
 <!-- end question_edit_tips.html -->
diff --git a/templates/question_retag.html b/templates/question_retag.html
index 66e51c8c..b7957962 100644
--- a/templates/question_retag.html
+++ b/templates/question_retag.html
@@ -1,10 +1,11 @@
 {% extends "base.html" %}
 <!-- question_retag.html -->
+{% load extra_tags %}
 {% block title %}{% spaceless %}{% trans "Change tags" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
         <script type="text/javascript">
         
         $().ready(function(){
@@ -84,14 +85,18 @@
         <li>
             {% trans "tags help us keep Questions organized" %}
         </li>
+        {% comment %}
         <li>
             修改完整问题需要用户的积分达到一定条件（比如：积分 >= 3000分，自己发布的问题除外），而用户积分达到比较低的时候，就可以修改问题的标签（比如：积分 >= 500, 这里指所有问题的标签）。
         </li>
+        {% endcomment %}
         <li>
             {% trans "tag editors receive special awards from the community" %}
         </li>
     </ul>
-    <a href="{% url faq %}" style="float:right;position:relative">faq »</a>
+    <p class='info-box-follow-up-links'>
+        <a href="{% url faq %}">faq »</a>
+    </p>
 </div>
 
 {% endblock %}
diff --git a/templates/question_summary_list_roll.html b/templates/question_summary_list_roll.html
new file mode 100644
index 00000000..7312dca9
--- /dev/null
+++ b/templates/question_summary_list_roll.html
@@ -0,0 +1,55 @@
+    <div class="qstA">
+        <h2>
+            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
+        </h2>
+        <div class="stat">
+            <table>
+                <tr>
+                    <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
+                    <td><span class="num">{{ question.score|intcomma }}</span> </td>
+                    <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
+                </tr>  
+                <tr>
+                    <td><span class="unit">{% trans "answers" %}</span></td>
+                    <td><span class="unit">{% trans "votes" %}</span></td>
+                    <td><span class="unit">{% trans "views" %}</span></td>
+                </tr> 
+            </table>
+        </div>
+        
+        <div class="summary">
+            {{ question.summary }}...                
+        </div>
+        
+        {% ifequal tab_id 'active'%}
+        {% if question.wiki and settings.WIKI_ON %}
+        <span class="from wiki">{% trans "community wiki" %}</span>
+        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+        {% else %}
+        <div class="from">
+            {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
+            <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+            <span class="score">{% get_score_badge question.last_activity_by %} </span>
+            <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+        </div>
+        {% endif %}
+        {% else %}
+        {% if question.wiki and settings.WIKI_ON %}
+        <span class="from wiki">{% trans "community wiki" %}</span>
+        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+        {% else %}
+        <div class="from">
+            {% comment %}{% gravatar question.author 24 %}{% endcomment %}
+            <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+            <span class="score">{% get_score_badge question.author %} </span>
+            <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+        </div>
+        {% endif %}
+        {% endifequal %}
+        
+        <div class="tags">
+        {% for tag in question.tagname_list %}
+        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
+        {% endfor %}
+        </div>
+    </div>
diff --git a/templates/questions.html b/templates/questions.html
index 985b4921..f298381e 100644
--- a/templates/questions.html
+++ b/templates/questions.html
@@ -4,6 +4,7 @@
 {% load i18n %}
 {% load humanize %}
 {% load extra_filters %}
+{% load smart_if %}
 {% block title %}{% spaceless %}{% trans "Questions" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
@@ -36,16 +37,16 @@
         </h2>
         <div class="stat">
             <table>
-	            <tr>
+                <tr>
                     <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
                     <td><span class="num">{{ question.score|intcomma }}</span> </td>
                     <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-	            </tr>  
+                </tr>  
                 <tr>
                     <td><span class="unit">{% trans "answers" %}</span></td>
                     <td><span class="unit">{% trans "votes" %}</span></td>
                     <td><span class="unit">{% trans "views" %}</span></td>
-	            </tr> 
+                </tr> 
             </table>
         </div>
         
@@ -54,7 +55,7 @@
         </div>
         
         {% ifequal tab_id 'active'%}
-        {% if question.wiki %}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
@@ -66,15 +67,33 @@
         </div>
         {% endif %}
         {% else %}
-        {% if question.wiki %}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
             {% comment %}{% gravatar question.author 24 %}{% endcomment %}
-            <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
-            <span class="score">{% get_score_badge question.author %} </span>
-            <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% if question.last_activity_at != question.added_at %}
+                {% if question.author.id != question.last_activity_by.id %}
+                    {% trans "Posted:" %}
+                    <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                    <span class="score">{% get_score_badge question.author %} </span>
+                    / {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% else %}
+                    {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% endif %}
+            {% else %}
+                {% trans "Posted:" %}
+                <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                <span class="score">{% get_score_badge question.author %} </span>
+                <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% endif %}
         </div>
         {% endif %}
         {% endifequal %}
@@ -87,7 +106,6 @@
     </div>
     {% endfor %}
 </div>
-
 {% endblock %}
 
 {% block tail %}
@@ -104,7 +122,6 @@
 
 {% block sidebar %}
 <div class="boxC">
-    <p>
 		{% if searchtag %}
 			{% blocktrans count questions_count as cnt with questions_count|intcomma as q_num and searchtag as tagname %}
 			have total {{q_num}} questions tagged {{tagname}}
@@ -126,7 +143,7 @@
 				{% endblocktrans %}
 			{% endif %}
 		{% endif %}
-        <br/>
+        <p>
         {% ifequal tab_id "latest" %}
 			{% trans "latest questions info" %}
         {% endifequal %}
@@ -145,16 +162,14 @@
 			{% trans "Questions are sorted by the <strong>number of votes</strong>." %}
             {% trans "Most voted questions are shown first." %}
         {% endifequal %}
-        
-        
-    </p>
+        </p>
 </div>
 <div class="boxC">
 	<h3 class="subtitle">{% trans "Related tags" %}</h3>
     <div class="tags">
         {% for tag in tags %}
             <a rel="tag" title="{% trans "see questions tagged" %}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
-            <span class="tag-number">&#x2715; {{ tag.used_count|intcomma }}</span>
+            <span class="tag-number">&#215; {{ tag.used_count|intcomma }}</span>
             <br />
         {% endfor %}
         <br />
diff --git a/templates/revisions_answer.html b/templates/revisions_answer.html
index 23606dc9..974e589c 100644
--- a/templates/revisions_answer.html
+++ b/templates/revisions_answer.html
@@ -6,8 +6,8 @@
 {% load humanize %}
 {% block title %}{% spaceless %}{% trans "Revision history" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
         <script type="text/javascript">
         //todo - take this out into .js file 
         $().ready(function(){
@@ -24,7 +24,9 @@
             var arrow = $("#rev-arrow-" + id);
             var visible = arrow.attr("src").indexOf("hide") > -1;
 
-            arrow.attr("src", "/content/images/expander-arrow-" + (visible ? "show" : "hide") + ".gif");
+            var path = $.i18n._('/') + "content/images/expander-arrow-" + 
+                        (visible ? "show" : "hide") + ".gif" + "?v={{settings.RESOURCE_REVISION}}";
+            arrow.attr("src", path);
             $("#rev-body-" + id).slideToggle("fast");
         }
         
@@ -43,11 +45,14 @@
           <div class="header-controls">
             <table width="100%">
                 <tr>
-                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" src="/content/images/expander-arrow-show.gif"></td>
+                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" 
+                                                                    src="{% href "/content/images/expander-arrow-show.gif" %}"
+                                                                    alt="{% trans "click to hide/show revision" %}"/>
+                    </td>
                     <td width="30px" style="vertical-align:middle"><span class="revision-number" title="{% trans "revision" %} {{ revision.revision }}">{{ revision.revision }}</span></td>
                     <td width="200px" style="vertical-align:middle">
                         {% if revision.summary %}
-                        <div class="summary"><span>{{ revision.summary }}<span></div>
+                        <div class="summary"><span>{{ revision.summary }}</span></div>
                         {% endif %}
                         {% if request.user|can_edit_post:post %}
                         <a href="{% url edit_answer post.id %}?revision={{ revision.revision }}">{% trans "edit" %}</a>
@@ -56,31 +61,7 @@
                     </td>
                     <td align="right">
                         <div class="revision-mark" >
-                            <table width="100%" style="text-align:left" >
-                                <tr >
-                                    <td colspan="2" style="padding:3px 0 3px 0"> 
-                                        {% ifequal revision.revision 1 %}
-                                        {% trans "asked" %} <strong title="{{ post.added_at }}">{% diff_date post.added_at  %}</strong>
-                                        {% else %}
-                                        {% trans "updated" %} <strong title="{{ post.last_edited_at }}">{% diff_date revision.revised_at  %}</strong>
-                                        {% endifequal %}
-                                    </td>
-                                    
-                                </tr>
-                                <tr>
-                                    <td width="35px" style="vertical-align:bottom; ">
-                                        {% gravatar revision.author 32 %}
-                                    </td>
-                                    <td style="width:120px; vertical-align:top">
-                                        <div style="height:18px">
-                                            <a href="{% url users %}{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
-                                        <div>
-                                        {% get_score_badge revision.author %}
-                                        </div>
-                                    </td>
-                                </tr>
-
-                            </table>
+                            {% post_contributor_info revision %}
                         </div>
                     </td>
                 </tr>
diff --git a/templates/revisions_question.html b/templates/revisions_question.html
index b76ced24..83512e4a 100644
--- a/templates/revisions_question.html
+++ b/templates/revisions_question.html
@@ -7,8 +7,8 @@
 {% load humanize %}
 {% block title %}{% spaceless %}{% trans "Revision history" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
         <script type="text/javascript">
         //todo - take this out into .js file 
         $().ready(function(){
@@ -25,7 +25,9 @@
             var arrow = $("#rev-arrow-" + id);
             var visible = arrow.attr("src").indexOf("hide") > -1;
 
-            arrow.attr("src", "/content/images/expander-arrow-" + (visible ? "show" : "hide") + ".gif");
+            var path = $.i18n._('/') + "content/images/expander-arrow-" + 
+                        (visible ? "show" : "hide") + ".gif" + "?v={{settings.RESOURCE_REVISION}}";
+            arrow.attr("src", path);
             $("#rev-body-" + id).slideToggle("fast");
         }
         </script>
@@ -43,11 +45,14 @@
           <div class="header-controls">
             <table width="100%">
                 <tr>
-                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" src="/content/images/expander-arrow-show.gif"></td>
+                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" 
+                                                                src="{% href "/content/images/expander-arrow-show.gif" %}"
+                                                                alt="{% trans "click to hide/show revision" %}"/>
+                    </td>
                     <td width="30px" style="vertical-align:middle"><span class="revision-number" title="{% trans "revision" %} {{ revision.revision }}">{{ revision.revision }}</span></td>
                     <td width="200px" style="vertical-align:middle">
                         {% if revision.summary %}
-                        <div class="summary"><span>{{ revision.summary }}<span></div>
+                        <div class="summary"><span>{{ revision.summary }}</span></div>
                         {% endif %}
                         {% if request.user|can_edit_post:post %}
                         <a href="{% url edit_question post.id %}?revision={{ revision.revision }}">{% trans "edit" %}</a>
@@ -56,31 +61,7 @@
                     </td>
                     <td align="right">
                         <div class="revision-mark" >
-                            <table width="100%" style="text-align:left" >
-                                <tr >
-                                    <td colspan="2" style="padding:3px 0 3px 0"> 
-                                        {% ifequal revision.revision 1 %}
-                                        {% trans "asked" %}<strong title="{{ post.added_at }}">{% diff_date post.added_at  %}</strong>
-                                        {% else %}
-                                        {% trans "updated" %}<strong title="{{ post.last_edited_at }}">{% diff_date revision.revised_at  %}</strong>
-                                        {% endifequal %}
-                                    </td>
-                                    
-                                </tr>
-                                <tr>
-                                    <td width="35px" style="vertical-align:bottom; ">
-                                        {% gravatar revision.author 32 %}
-                                    </td>
-                                    <td style="width:120px; vertical-align:top">
-                                        <div style="height:18px">
-                                            <a href="{% url users %}{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
-                                        <div>
-                                        {% get_score_badge revision.author %}
-                                        </div>
-                                    </td>
-                                </tr>
-
-                            </table>
+                            {% post_contributor_info revision %}
                         </div>
                     </td>
                 </tr>
diff --git a/templates/tags.html b/templates/tags.html
index f558594a..1bde187f 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -49,7 +49,7 @@
     <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">
         {{ tag }}
     </a>&nbsp;
-    <span class="tag-number">× {{ tag.used_count|intcomma }}</span>
+    <span class="tag-number">&#215; {{ tag.used_count|intcomma }}</span>
     <br/>
 
     </li>
diff --git a/templates/unanswered.html b/templates/unanswered.html
index a56d3ae3..80a23631 100644
--- a/templates/unanswered.html
+++ b/templates/unanswered.html
@@ -4,6 +4,7 @@
 {% load i18n %}
 {% load humanize %}
 {% load extra_filters %}
+{% load smart_if %}
 {% block title %}{% spaceless %}{% trans "Unanswered questions" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
@@ -17,65 +18,82 @@
 <div class="tabBar">
     <span class="headQuestions">{% trans "Unanswered questions" %}</span>
     <div class="tabsA">
-        <a id="latest" href="?sort=latest" class="on" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a> 
+        <a id="latest" href="{% url unanswered %}?sort=latest" class="on" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a> 
     </div>
 </div>
-
 <div id="listA">
     {% for question in questions.object_list %}
     <div class="qstA">
-        <h2><a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a></h2>
+        <h2>
+            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
+        </h2>
         <div class="stat">
             <table>
-	            <tr>
+                <tr>
                     <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
                     <td><span class="num">{{ question.score|intcomma }}</span> </td>
                     <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-	            </tr>  
+                </tr>  
                 <tr>
                     <td><span class="unit">{% trans "answers" %}</span></td>
                     <td><span class="unit">{% trans "votes" %}</span></td>
                     <td><span class="unit">{% trans "views" %}</span></td>
-	            </tr> 
+                </tr> 
             </table>
         </div>
+        
         <div class="summary">
             {{ question.summary }}...                
         </div>
-    
+        
         {% ifequal tab_id 'active'%}
-        {% if question.wiki %}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
-             {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
+            {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
             <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
             <span class="score">{% get_score_badge question.last_activity_by %} </span>
             <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
         </div>
         {% endif %}
         {% else %}
-        {% if question.wiki %}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
-             {% comment %}{% gravatar question.author 24 %}{% endcomment %}
-            <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
-            <span class="score">{% get_score_badge question.author %} </span>
-            <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% comment %}{% gravatar question.author 24 %}{% endcomment %}
+            {% if question.last_activity_at != question.added_at %}
+                {% if question.author.id != question.last_activity_by.id %}
+                    {% trans "Posted:" %}
+                    <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                    <span class="score">{% get_score_badge question.author %} </span>
+                    / {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% else %}
+                    {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% endif %}
+            {% else %}
+                {% trans "Posted:" %}
+                <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                <span class="score">{% get_score_badge question.author %} </span>
+                <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% endif %}
         </div>
         {% endif %}
         {% endifequal %}
         
         <div class="tags">
-			{% for tag in question.tagname_list %}
-			<a href="{% url forum.views.tag tag|urlencode %}" 
-				title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" 
-				rel="tag">{{ tag }}
-			</a>
-			{% endfor %}
+        {% for tag in question.tagname_list %}
+        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
+        {% endfor %}
         </div>
     </div>
     {% endfor %}
@@ -93,10 +111,8 @@
 
 {% block sidebar %}
 <div class="boxC">
-    <p>
-		{% blocktrans with questions_count|intcomma as num_q %}have {{num_q}} unanswered questions{% endblocktrans %}
-        <!---<p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>-->
-    </p>
+    {% blocktrans with questions_count|intcomma as num_q %}have {{num_q}} unanswered questions{% endblocktrans %}
+    <!---<p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>-->
 </div>
 <div class="boxC">
 	<h3 class="subtitle">{% trans "Related tags" %}</h3>
@@ -104,7 +120,7 @@
     <div class="tags">
         {% for tag in tags %}
             <a rel="tag" title="{% trans "see questions tagged"%}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
-            <span class="tag-number"> &#x2715; {{ tag.used_count|intcomma }}</span>
+            <span class="tag-number"> &#215; {{ tag.used_count|intcomma }}</span>
             <br/>
         {% endfor %}
         <br/>
diff --git a/templates/upfiles/1245715031297631.png b/templates/upfiles/1245715031297631.png
deleted file mode 100755
index 89a6aed4..00000000
Binary files a/templates/upfiles/1245715031297631.png and /dev/null differ
diff --git a/templates/upfiles/12457157052552259.png b/templates/upfiles/12457157052552259.png
deleted file mode 100755
index 89a6aed4..00000000
Binary files a/templates/upfiles/12457157052552259.png and /dev/null differ
diff --git a/templates/user.html b/templates/user.html
index efca80e6..6e4098e9 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -1,6 +1,7 @@
 {% extends "base_content.html" %}
 <!-- user.html -->
 {% load extra_tags %}
+{% load extra_filters %}
 {% load humanize %}
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
 {% block forestyle%}
@@ -10,17 +11,22 @@
 	</style>
 {% endblock %}
 {% block forejs %}
-        <script type="text/javascript">
-            $().ready(function(){
-                {% ifequal view_user request.user%}
-                    $("#nav_profile").attr('className',"on");
-                {% else %}
-                    $("#nav_users").attr('className',"on");
-                {% endifequal %}
-            }); 
-        </script>
-        {% block userjs %}
-        {% endblock %}
+    {% if request.user|can_moderate_users %}
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.admin.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.form.js" %}'></script>
+    {% endif %}
+    <script type="text/javascript">
+        var viewUserID = {{view_user.id}};
+        $().ready(function(){
+            {% ifequal view_user request.user%}
+                $("#nav_profile").attr('className',"on");
+            {% else %}
+                $("#nav_users").attr('className',"on");
+            {% endifequal %}
+        }); 
+    </script>
+    {% block userjs %}
+    {% endblock %}
 {% endblock %}
 {% block content %}
     <div id="mainbar-full">
@@ -28,6 +34,6 @@
         {% include "user_tabs.html" %}
         {% block usercontent %}
         {% endblock %}
-        {% include "user_footer.html" %}
+        {%comment%}{% include "user_footer.html" %}{%endcomment%}
 	</div>
 {% endblock %}<!-- end user.html -->
diff --git a/templates/user_edit.html b/templates/user_edit.html
index b49cea31..051d6537 100644
--- a/templates/user_edit.html
+++ b/templates/user_edit.html
@@ -24,11 +24,11 @@
             {% if request.user.email %}
             {% gravatar request.user 128 %}
             {% else %}
-            <img src="/content/images/nophoto.png">
+            <img src="{% href "/content/images/nophoto.png" %}">
             {% endif %}
             <div style="padding:20px 0 0 20px;font-weight:bold;font-size:150%">
                 <a href="http://www.gravatar.com/" target="_blank" 
-					title="gravatar {% trans "image associated with your email address" %}">{% trans "avatar" %}</a>
+					title="gravatar {% trans "image associated with your email address" %}">{% blocktrans %}avatar, see {{gravatar_faq_url}}{% endblocktrans %}</a>
             </div>
         </div>
         
diff --git a/templates/user_email_subscriptions.html b/templates/user_email_subscriptions.html
new file mode 100644
index 00000000..8f27bd2a
--- /dev/null
+++ b/templates/user_email_subscriptions.html
@@ -0,0 +1,23 @@
+{% extends "user.html" %}
+<!-- user_email_subscriptions.html -->
+{% load i18n %}
+{% load extra_tags %}
+{% load humanize %}
+
+{% block usercontent %}
+    <h2>{% trans "Email subscription settings" %}</h2>
+    <p class="message">{% trans "email subscription settings info" %}</p>
+    <div class='inline-block'>
+    {% if action_status %}
+    <p class="action-status"><span>{{action_status}}</span></p>
+    {% endif %}
+    <form method="POST"> 
+        {% include "edit_user_email_feeds_form.html" %}
+        <div class="submit-row text-align-right">
+            <input type="submit" class="submit" name="save" value="{% trans "Update" %}"/>
+            <input type="submit" class="submit" name="stop_email" value="{% trans "Stop sending email" %}"/>
+        </div>
+    </form>
+    </div>
+{% endblock %}
+<!-- end user_email_subscriptions.html -->
diff --git a/templates/user_favorites.html b/templates/user_favorites.html
index 185423c6..9db01e9a 100644
--- a/templates/user_favorites.html
+++ b/templates/user_favorites.html
@@ -2,7 +2,6 @@
 <!-- user_favorites.html -->
 {% load extra_tags %}
 {% load humanize %}
-
 {% block usercontent %}
 		{% include "users_questions.html" %}
 {% endblock %}
diff --git a/templates/user_info.html b/templates/user_info.html
index e56fb143..4ebcddd6 100644
--- a/templates/user_info.html
+++ b/templates/user_info.html
@@ -2,12 +2,11 @@
 {% load extra_tags %}
 {% load extra_filters %}
 {% load humanize %}
+{% load smart_if %}
 {% load i18n %}
 <div id="subheader" class="headUser">
     {{view_user.username}}
-    
 </div>
-
 <table class="user-info-table">
     <tr>
         <td width="180" style="vertical-align:middle;text-align:center;">
@@ -20,20 +19,41 @@
                 <tr>
                     <td align="center">
                         <div class="scoreNumber">{{view_user.reputation|intcomma}}</div>
-                        <p><b style="color:#777;">{% trans "reputation" %}</b></p>
+                        <p><b style="color:#777;">{% trans "karma" %}</b></p>
                     </td>
                 </tr>
             </table>
         </td>
         <td width="360" style="vertical-align: top;">
             <table class="user-details">
+                {% if view_user != request.user and request.user|can_moderate_users %}
                 <tr>
-                    <th width="130" align="left"><strong>{% trans "Registered user" %}</strong></th>
-                    <th width="230"  align="right">
-                        {% if request.user|can_view_user_edit:view_user %}
-                        <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/{% trans "edit/" %}">{% trans "update profile" %}</a></span>
-                        {% endif %}
-                    </th>
+                    <td class="admin" align="left" colspan="2">
+                        <h3>{% trans "Moderate this user" %}</h3>
+                        <form id="moderate_user_form" method="post">
+                            {{moderate_user_form.as_p}}
+                        </form>
+                        <p id="action_status"></p>
+                    </td>
+                </tr>
+                {% endif %}
+                {% if request.user|can_view_user_edit:view_user %}
+                <tr>
+                    <td class="user-profile-tool-links" align="left" colspan="2">
+                        {% joinitems using ' | ' %}
+                            {% if request.user|can_view_user_edit:view_user %}
+                            <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/{% trans "edit/" %}">{% trans "update profile" %}</a></span>
+                            {% endif %}
+                        {% separator %}
+                            {% if request.user.has_usable_password %}
+                                <a href="{% url user_changepw %}">change password</a>
+                            {% endif %}
+                        {% endjoinitems %}
+                    </td>
+                </tr>  
+                {% endif %}
+                <tr>
+                    <th colspan="2" align="left"><h3>{% trans "Registered user" %}</h3></th>
                 </tr>
                 {% if view_user.real_name %}
                 <tr>
@@ -43,12 +63,12 @@
                 {% endif %}
                 <tr>
                     <td>{% trans "member for" %}</td>
-                    <td>{{ view_user.date_joined|timesince }}</td>
+                    <td><strong>{% diff_date view_user.date_joined %}</strong></td>
                 </tr>
                 {% if view_user.last_seen %}
                 <tr>
                     <td>{% trans "last seen" %}</td>
-                    <td><strong title="{{ view_user.last_seen }}">{{ view_user.last_seen|timesince }} {% trans "ago" %}</strong></td>
+                    <td><strong title="{{ view_user.last_seen }}">{% diff_date view_user.last_seen %}</strong></td>
                 </tr>
                 {% endif %}
                 {% if view_user.website %}
diff --git a/templates/user_preferences.html b/templates/user_preferences.html
deleted file mode 100644
index 00129c28..00000000
--- a/templates/user_preferences.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends "user.html" %}
-<!-- user_preferences.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load humanize %}
-
-{% block usercontent %}
-        <div style="padding:5px;">
-        <fieldset>
-            <legend><b>{% trans "Connect with Twitter" %}</b></legend>
-            <!-- todo: form action needs to be fixed -->
-            <form name="twittersync" action="/sdfgsdlgjkhsdfljh">
-                <label for="name">{% trans "Twitter account name:" %}</label>
-                <input id="name" /><br/>
-                <label for="password">{% trans "Twitter password:" %}</label>
-                <input id="password" type="password"/><br/>
-                <input id="cbMessage" type="checkbox" />{% trans "Send my Questions to Twitter" %}<br/>
-                <input id="cbReply" type="checkbox" />{% trans "Send my Answers to Twitter" %}<br/>
-                <input type="submit" value="{% trans "Save" %}" />
-            </form>
-        </fieldset>
-        </div>
-{% endblock %}
-<!-- end user_preferences.html -->
diff --git a/templates/user_recent.html b/templates/user_recent.html
index 7f6c9c8c..b704ab25 100644
--- a/templates/user_recent.html
+++ b/templates/user_recent.html
@@ -2,7 +2,6 @@
 <!-- user_recent.html -->
 {% load extra_tags %}
 {% load humanize %}
-
 {% block usercontent %}
         <div style="padding-top:5px;font-size:13px;">
         {% for act in activities %}
diff --git a/templates/user_reputation.html b/templates/user_reputation.html
index 270bb37d..29d642fe 100644
--- a/templates/user_reputation.html
+++ b/templates/user_reputation.html
@@ -3,8 +3,8 @@
 {% load extra_tags %}
 {% load humanize %}
 {% block userjs %}
-       <script type='text/javascript' src='/content/js/excanvas.pack.js'></script>
-       <script type='text/javascript' src='/content/js/jquery.flot.pack.js'></script>
+       <script type='text/javascript' src='{% href "/content/js/excanvas.pack.js" %}'></script>
+       <script type='text/javascript' src='{% href "/content/js/jquery.flot.pack.js" %}'></script>
        
        <script type="text/javascript">
         $().ready(function(){
diff --git a/templates/user_stats.html b/templates/user_stats.html
index 07578cb7..2b7949e8 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -7,43 +7,74 @@
 		{% block usercontent %}
 	
         <a name="questions"></a>
-        <h2><span class="count">{{questions|length}}</span> {% trans "User questions" %}</h2>
+        {% spaceless %}
+            <h2>
+                {% blocktrans count questions|length as counter %}
+                <span class="count">1</span> Question
+                {% plural %}
+                <span class="count">{{counter}}</span> Questions
+                {% endblocktrans %}
+            </h2>
+        {% endspaceless %}
 		{% include "users_questions.html" %}
         <a name="answers"></a>
-        <h2><span class="count">{{answered_questions|length}}</span> {% trans "Answers" %}</h2>
+        {% spaceless %}
+            <h2>
+                {% blocktrans count answered_questions|length as counter %}
+                <span class="count">1</span> Answer
+                {% plural %}
+                <span class="count">{{counter}}</span> Answers
+                {% endblocktrans %}
+            </h2>
+        {% endspaceless %}
         <div class="user-stats-table">
             {% for answered_question in answered_questions %}
             <div class="answer-summary">
                 <a title="{{answered_question.summary|collapse}}" 
-                    href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
+                    href="{% url question answered_question.id %}{{answered_question.title|slugify}}#{{answered_question.answer_id}}">
                     <span class="answer-votes {% if answered_question.accepted %}answered-accepted{% endif %}" 
 						title="{% blocktrans with answered_question.vote_count as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %} {% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
                         {{ answered_question.vote_count }}
                     </span>
                 </a>
                 <div class="answer-link">
-                    <a href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> 
+                    {% spaceless %}
+                    <a href="{% url question answered_question.id %}{{answered_question.title|slugify}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> 
+                    {% endspaceless %}
                     {% if answered_question.comment_count %}
                     <span>
-				    {% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %}
+				    {% blocktrans count answered_question.comment_count as comment_count %}
+                    (one comment)
+                    {% plural %}
+                    the answer has been commented {{comment_count}} times
+                    {% endblocktrans %}
                     </span> 
                     {% endif %}
                 </div>
             </div>
             {% endfor %}
         </div>
+        <br/>
         <a name="votes"></a>
-        <h2><span class="count">{{total_votes}}</span> {% trans "Votes" %}</h2>
+        {% spaceless %}
+            <h2>
+                {% blocktrans count total_votes as cnt %}
+                    <span class="count">1</span> Vote
+                {% plural %}
+                    <span class="count">{{cnt}}</span> Votes
+                {% endblocktrans %}
+            </h2>
+        {% endspaceless %}
         <div class="user-stats-table">
             <table>
                 <tr>
                     <td width="60">
-                        <img style="cursor: default;" src="/content/images/vote-arrow-up-on.png" alt="{% trans "thumb up" %}" />
+                        <img style="cursor: default;" src="{% href "/content/images/vote-arrow-up-on.png" %}" alt="{% trans "thumb up" %}" />
                             <span title="{% trans "user has voted up this many times" %}" class="vote-count">{{up_votes}}</span>
 
                     </td>
                     <td width="60">
-                        <img style="cursor: default;" src="/content/images/vote-arrow-down-on.png" alt="{% trans "thumb down" %}" />
+                        <img style="cursor: default;" src="{% href "/content/images/vote-arrow-down-on.png" %}" alt="{% trans "thumb down" %}" />
                             <span title="{% trans "user voted down this many times" %}" class="vote-count">{{down_votes}}</span>
 
                     </td>
@@ -51,7 +82,15 @@
             </table>
         </div>
         <a name="tags"></a>
-        <h2><span class="count">{{tags|length}}</span> {% trans "Tags" %}</h2>
+        {% spaceless %}
+            <h2>
+                {% blocktrans count tags|length as counter %}
+                    <span class="count">1</span> Tag
+                {% plural %}
+                    <span class="count">{{counter}}</span> Tags
+                {% endblocktrans %}
+            </h2>
+        {% endspaceless %}
         <div class="user-stats-table">
             <table class="tags">
                 <tr>
@@ -59,7 +98,7 @@
                         {% for tag in tags%}
                         <a rel="tag" 
 							title="{% blocktrans %}see other questions tagged '{{ tag }}' {% endblocktrans %}" 
-							href="{% url forum.views.tag tag|urlencode %}">{{tag.name}}</a><span class="tag-number"> × {{ tag.used_count|intcomma }}</span><br/>
+							href="{% url forum.views.tag tag|urlencode %}">{{tag.name}}</a><span class="tag-number"> &#215; {{ tag.used_count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"10" %}
                                 </td>
                                 <td width="180"  valign="top">
@@ -70,7 +109,15 @@
             </table>
         </div>
         <a name="badges"></a>
-        <h2><span class="count">{{total_awards}}</span> {% trans "Badges" %}</h2>
+        {% spaceless %}
+        <h2>
+            {% blocktrans count total_awards as counter %}
+            <span class="count">1</span> Badge
+            {% plural %}
+            <span class="count">{{counter}}</span> Badges
+            {% endblocktrans %}
+        </h2>
+        {% endspaceless %}
         <div class="user-stats-table">
             <table>
                 <tr>
@@ -86,6 +133,5 @@
                 </tr>
             </table>
         </div>
-
 {% endblock %}
 <!-- end user_stats.html -->
diff --git a/templates/user_tabs.html b/templates/user_tabs.html
index cb7e1d2f..908e8430 100644
--- a/templates/user_tabs.html
+++ b/templates/user_tabs.html
@@ -23,9 +23,9 @@
 			title="{% trans "questions that user selected as his/her favorite" %}"
 			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
         {% if request.user|can_view_user_preferences:view_user %}
-        <a id="preferences" {% ifequal tab_name "preferences" %}class="on"{% endifequal %} 
-			title="{% trans "user preference settings" %}" 
-			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=preferences">{% trans "settings" %}</a>
+        <a id="email_subscriptions" {% ifequal tab_name "email_subscriptions" %}class="on"{% endifequal %} 
+			title="{% trans "email subscription settings" %}" 
+			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=email_subscriptions">{% trans "email subscriptions" %}</a>
         {% endif %}  
     </div>
 </div>
diff --git a/templates/user_votes.html b/templates/user_votes.html
index 45134ac9..4abbf46d 100644
--- a/templates/user_votes.html
+++ b/templates/user_votes.html
@@ -11,9 +11,9 @@
                 <div style="width:150px;float:left">{% diff_date vote.voted_at 3 %}</div>
                 <div style="width:30px;float:left">
                 {% ifequal vote.vote 1 %}
-                    <img src="/content/images/vote-arrow-up-on.png" title="{% trans "upvote" %}">
+                    <img src="{% href "/content/images/vote-arrow-up-on.png" %}" title="{% trans "upvote" %}">
                 {% else %}
-                    <img src="/content/images/vote-arrow-down-on.png" title="{% trans "downvote" %}">
+                    <img src="{% href "/content/images/vote-arrow-down-on.png" %}" title="{% trans "downvote" %}">
                 {% endifequal %}
                 </div>
                 <div style="float:left;overflow:hidden;width:750px">
diff --git a/templates/users.html b/templates/users.html
index 966596fc..3a59b0c0 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -23,10 +23,10 @@
 <div class="tabBar">
     <div class="headUsers">{% trans "Users" %}</div>
     <div class="tabsA">
-        <a id="sort_reputation" href="?sort=reputation" class="off" title="{% trans "reputation" %}">{% trans "reputation" %}</a>
-        <a id="sort_newest" href="?sort=newest" class="off" title="{% trans "recent" %}">{% trans "recent" %}</a>
-        <a id="sort_last" href="?sort=last" class="off" title="{% trans "oldest" %}">{% trans "oldest" %}</a>
-        <a id="sort_user" href="?sort=user" class="off" title="{% trans "by username" %}">{% trans "by username" %}</a>
+        <a id="sort_reputation" href="{% url users %}?sort=reputation" class="off" title="{% trans "reputation" %}">{% trans "reputation" %}</a>
+        <a id="sort_newest" href="{% url users %}?sort=newest" class="off" title="{% trans "recent" %}">{% trans "recent" %}</a>
+        <a id="sort_last" href="{% url users %}?sort=last" class="off" title="{% trans "oldest" %}">{% trans "oldest" %}</a>
+        <a id="sort_user" href="{% url users %}?sort=user" class="off" title="{% trans "by username" %}">{% trans "by username" %}</a>
     </div>
 </div>
 <div id="main-body" style="width:100%">
diff --git a/templates/users_questions.html b/templates/users_questions.html
index 9907885e..b445a74c 100644
--- a/templates/users_questions.html
+++ b/templates/users_questions.html
@@ -4,20 +4,20 @@
 {% load humanize %}
 {% load i18n %}
 <div class="user-stats-table">
-    {% for question in questions%}
+    {% for question in questions %}
         {% if question.favourite_count %}
             {% if question.favorited_myself %}
                 <div class="favorites-count">
                     <img title="{% trans "this questions was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" 
                         alt="{% trans "thumb-up on" %}"
-						src="/content/images/vote-favorite-on.png"/>
+						src="{% href "/content/images/vote-favorite-on.png" %}"/>
                     <div><b>{{question.favourite_count|intcomma}}</b></div>
                 </div>
             {% else %}
                 <div class="favorites-count-off">
                     <img title="{% trans "this question was selected as favorite" %}{{question.favourite_count}} {% trans "number of times" %}" 
                         alt="{% trans "thumb-up off" %}"
-						src="/content/images/vote-favorite-off.png"/>
+						src="{% href "/content/images/vote-favorite-off.png" %}"/>
                     <div><b>{{question.favourite_count|intcomma}}</b></div>
                 </div>
             {% endif %}
@@ -25,28 +25,26 @@
             <div class="favorites-empty"> </div>
         {% endif %}
     <div id="question-summary-{{question.id}}" class="question-summary narrow">
-        <a style="text-decoration: none;" href="{% url questions %}{{question.id}}/{{question.get_question_title}}">
-            <span class="stats">
-                <span class="votes">
-                    <span class="vote-count-post">{{question.vote_count|intcomma}}</span> 
+        <a style="text-decoration: none;" href="{% url question id=question.id %}{{question.title|slugify}}">
+            <div class="stats">
+                <div class="votes">
+                    <span class="vote-count-post">{{question.vote_count|intcomma}}</span>
                     {% trans "votes" %}
-                  
-                </span>
-                <span title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
+                </div >
+                <div title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
                     <span class="answer-count-post">{{question.answer_count|intcomma}}</span>
                     {% trans "answers" %}
-             
-                </span>
-                <span class="views">
+                </div>
+                <div class="views">
                      <span class="views-count-post">{{question.view_count|cnprog_intword|safe}}</span>
 					 {% trans "views" %}
-                </span>
-            </span>
+                </div>
+            </div>
         </a>
         <div class="summary">
-            <h3>
-                <a title="{{question.summary}}" href="{% url questions %}{{question.id}}/{{question.title}}">{{question.title}}</a>
-            </h3>
+            <div class="question-title">
+                <a title="{{question.summary}}" href="{% url question id=question.id %}{{question.title|slugify}}">{{question.title}}</a>
+            </div>
             <div class="tags">
                 {% convert2tagname_list question %}
                 {% for tag in question.tagnames %}
diff --git a/urls.py b/urls.py
index cce4969e..0608aaa8 100644
--- a/urls.py
+++ b/urls.py
@@ -1,68 +1,7 @@
-import os.path
 from django.conf.urls.defaults import *
-from django.contrib import admin
-from forum.views import index
-from forum import views as app
-from forum.feed import RssLastestQuestionsFeed
 from django.utils.translation import ugettext as _
+import settings
 
-admin.autodiscover()
-feeds = {
-    'rss': RssLastestQuestionsFeed
-}
-
-APP_PATH = os.path.dirname(__file__)
 urlpatterns = patterns('',
-    (r'^$', index),
-    (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.ico'}),
-    (r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.gif'}),
-    (r'^content/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': os.path.join(APP_PATH, 'templates/content').replace('\\','/')}
-    ),
-    (r'^%s(?P<path>.*)$' % _('upfiles/'), 'django.views.static.serve',
-        {'document_root': os.path.join(APP_PATH, 'templates/upfiles').replace('\\','/')}
-    ),
-    (r'^%s' % _('account/'), include('django_authopenid.urls')),
-    (r'^%s/$' % _('signin/'), 'django_authopenid.views.signin'),
-    url(r'^%s%s$' % (_('email/'), _('change/')), 'django_authopenid.views.changeemail', name='user_changeemail'),
-    url(r'^%s%s$' % (_('email/'), _('sendkey/')), 'django_authopenid.views.send_email_key'),
-    url(r'^%s%s(?P<id>\d+)/(?P<key>[\dabcdef]{32})/$' % (_('email/'), _('verify/')), 'django_authopenid.views.verifyemail', name='user_verifyemail'),
-    url(r'^%s$' % _('about/'), app.about, name='about'),
-    url(r'^%s$' % _('faq/'), app.faq, name='faq'),
-    url(r'^%s$' % _('privacy/'), app.privacy, name='privacy'),
-    url(r'^%s$' % _('logout/'), app.logout, name='logout'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('comments/')), app.answer_comments, name='answer_comments'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('edit/')), app.edit_answer, name='edit_answer'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('revisions/')), app.answer_revisions, name='answer_revisions'),
-    url(r'^%s$' % _('questions/'), app.questions, name='questions'),
-    url(r'^%s%s$' % (_('questions/'), _('ask/')), app.ask, name='ask'),
-    url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.unanswered, name='unanswered'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('edit/')), app.edit_question, name='edit_question'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('close/')), app.close, name='close'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('reopen/')), app.reopen, name='reopen'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('answer/')), app.answer, name='answer'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('vote/')), app.vote, name='vote'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('revisions/')), app.question_revisions, name='question_revisions'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('comments/')), app.question_comments, name='question_comments'),
-    url(r'^%s(?P<question_id>\d+)/%s(?P<comment_id>\d+)/%s$' % (_('questions/'), _('questions/'),_('delete/')), app.delete_question_comment, name='delete_question_comment'),
-    url(r'^%s(?P<answer_id>\d+)/%s(?P<comment_id>\d+)/%s$' % (_('answers/'), _('answers/'),_('delete/')), app.delete_answer_comment, name='delete_answer_comment'),
-    #place general question item in the end of other operations
-    url(r'^%s(?P<id>\d+)//*' % _('question/'), app.question, name='question'),
-    url(r'^%s$' % _('tags/'), app.tags, name='tags'),
-    url(r'^%s(?P<tag>[^/]+)/$' % _('tags/'), app.tag),
-    url(r'^%s$' % _('users/'),app.users, name='users'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('users/'), _('edit/')), app.edit_user, name='edit_user'),
-    url(r'^%s(?P<id>\d+)//*' % _('users/'), app.user, name='user'),
-    url(r'^%s$' % _('badges/'),app.badges, name='badges'),
-    url(r'^%s(?P<id>\d+)//*' % _('badges/'), app.badge, name='badge'),
-    url(r'^%s%s$' % (_('messages/'), _('markread/')),app.read_message, name='read_message'),
-    # (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')),
-    (r'^%s(.*)' % _('nimda/'), admin.site.root),
-    url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
-    (r'^%s$' % _('upload/'), app.upload),
-    url(r'^%s$' % _('books/'), app.books, name='books'),
-    url(r'^%s%s(?P<short_name>[^/]+)/$' % (_('books/'), _('ask/')), app.ask_book, name='ask_book'),
-    url(r'^%s(?P<short_name>[^/]+)/$' % _('books/'), app.book, name='book'),
-    url(r'^%s$' % _('search/'), app.search, name='search'),
-    (r'^i18n/', include('django.conf.urls.i18n')),
+    (r'^%s' % settings.FORUM_SCRIPT_ALIAS, include('forum.urls')),
 )
diff --git a/user_messages/__init__.py b/user_messages/__init__.py
new file mode 100644
index 00000000..0136c888
--- /dev/null
+++ b/user_messages/__init__.py
@@ -0,0 +1,36 @@
+"""
+Lightweight session-based messaging system.
+
+Time-stamp: <2009-03-10 19:22:29 carljm __init__.py>
+
+"""
+VERSION = (0, 1, 'pre')
+
+def create_message (request, message):
+    """
+    Create a message in the current session.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+    
+    try:
+        request.session['messages'].append(message)
+    except KeyError:
+        request.session['messages'] = [message]
+
+def get_and_delete_messages (request, include_auth=False):
+    """
+    Get and delete all messages for current session.
+
+    Optionally also fetches user messages from django.contrib.auth.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+
+    messages = request.session.pop('messages', [])
+
+    if include_auth and request.user.is_authenticated():
+        messages.extend(request.user.get_and_delete_messages())
+    
+    return messages
+
diff --git a/user_messages/context_processors.py b/user_messages/context_processors.py
new file mode 100644
index 00000000..894f5801
--- /dev/null
+++ b/user_messages/context_processors.py
@@ -0,0 +1,52 @@
+"""
+Context processor for lightweight session messages.
+
+Time-stamp: <2008-07-19 23:16:19 carljm context_processors.py>
+
+"""
+from django.utils.encoding import StrAndUnicode
+
+from user_messages import get_and_delete_messages
+
+def user_messages (request):
+    """
+    Returns session messages for the current session.
+
+    """
+    messages = request.user.get_and_delete_messages()
+    #if request.user.is_authenticated():
+    #else:
+    #    messages = LazyMessages(request)
+    return { 'user_messages': messages }
+
+class LazyMessages (StrAndUnicode):
+    """
+    Lazy message container, so messages aren't actually retrieved from
+    session and deleted until the template asks for them.
+
+    """
+    def __init__(self, request):
+        self.request = request
+
+    def __iter__(self):
+        return iter(self.messages)
+
+    def __len__(self):
+        return len(self.messages)
+
+    def __nonzero__(self):
+        return bool(self.messages)
+
+    def __unicode__(self):
+        return unicode(self.messages)
+
+    def __getitem__(self, *args, **kwargs):
+        return self.messages.__getitem__(*args, **kwargs)
+
+    def _get_messages(self):
+        if hasattr(self, '_messages'):
+            return self._messages
+        self._messages = get_and_delete_messages(self.request)
+        return self._messages
+    messages = property(_get_messages)
+    
diff --git a/user_messages/models.py b/user_messages/models.py
new file mode 100644
index 00000000..b67ead6d
--- /dev/null
+++ b/user_messages/models.py
@@ -0,0 +1,3 @@
+"""
+blank models.py
+"""
-- 
cgit v1.2.3-1-g7c22


From ebb0f636ae8f7db4e7a2e7470e449af3d96b15c0 Mon Sep 17 00:00:00 2001
From: root <root@u15356270.onlinehome-server.com>
Date: Fri, 13 Nov 2009 20:18:55 -0500
Subject: better comments, email subscriptions, corrected view counter, some
 ie7 issues, wiki optional with settings.WIKI_ON, site can be mounted on
 arbitrary url prefix, english language improvements, added feedback form,
 versioned css and js files to force browser cache reload when
 settings.RESOURCE_REVISION is incremented , other fixes

---
 cnprog.wsgi                                        |    7 +-
 context.py                                         |    3 +
 django_authopenid/external_login.py                |  103 +
 django_authopenid/forms.py                         |  462 ++---
 django_authopenid/models.py                        |    5 +
 django_authopenid/urls.py                          |   15 +-
 django_authopenid/util.py                          |    7 +-
 django_authopenid/views.py                         |  345 ++--
 drop-all-tables.sh                                 |    4 +-
 drop-all.sql                                       |   39 +
 forum/auth.py                                      |   92 +-
 forum/const.py                                     |    2 +-
 forum/forms.py                                     |  145 +-
 forum/management/commands/send_email_alerts.py     |  139 +-
 forum/management/commands/subscribe_everyone.py    |   31 +
 forum/managers.py                                  |   11 +-
 forum/models.py                                    |  141 +-
 forum/templatetags/extra_filters.py                |    9 +-
 forum/templatetags/extra_tags.py                   |  126 +-
 forum/templatetags/smart_if.py                     |  401 ++++
 forum/urls.py                                      |   72 +
 forum/user.py                                      |   12 +-
 forum/views.py                                     |  362 ++--
 junk.py                                            |    3 +
 locale/en/LC_MESSAGES/django.mo                    |  Bin 15146 -> 25611 bytes
 locale/en/LC_MESSAGES/django.po                    | 2067 ++++++++++++--------
 locale/es/LC_MESSAGES/django.mo                    |  Bin 49819 -> 49713 bytes
 locale/es/LC_MESSAGES/django.po                    |  497 +++--
 middleware/anon_user.py                            |   26 +
 middleware/cancel.py                               |   15 +
 middleware/pagesize.py                             |    6 +-
 migration                                          |    7 +
 session_messages/.svn/all-wcprops                  |   23 +
 session_messages/.svn/dir-prop-base                |    6 +
 session_messages/.svn/entries                      |   64 +
 session_messages/.svn/format                       |    1 +
 .../.svn/text-base/__init__.py.svn-base            |   36 +
 .../.svn/text-base/context_processors.py.svn-base  |   48 +
 session_messages/.svn/text-base/models.py.svn-base |    3 +
 session_messages/__init__.py                       |   37 +
 session_messages/context_processors.py             |   48 +
 session_messages/models.py                         |    3 +
 settings.py                                        |   25 +-
 settings_local.py.dist                             |   55 +-
 sql_scripts/091111_upgrade_evgeny.sql              |    1 +
 tables.sql                                         |  440 +++++
 templates/404.html                                 |    2 +-
 templates/about.html                               |   25 +
 templates/answer_edit.html                         |   13 +-
 templates/answer_edit_tips.html                    |    8 +-
 templates/ask.html                                 |   19 +-
 templates/authopenid/changeemail.html              |   45 +-
 templates/authopenid/changeopenid.html             |    2 +-
 templates/authopenid/changepw.html                 |   33 +-
 templates/authopenid/complete.html                 |   82 +-
 templates/authopenid/confirm_email.txt             |    2 +-
 templates/authopenid/delete.html                   |    3 +-
 .../authopenid/external_legacy_login_info.html     |   16 +
 templates/authopenid/sendpw.html                   |   30 +-
 templates/authopenid/sendpw_email.txt              |   11 +-
 templates/authopenid/settings.html                 |    2 +-
 templates/authopenid/signin.html                   |   70 +-
 templates/authopenid/signup.html                   |   59 +-
 templates/badges.html                              |    6 +-
 templates/base.html                                |   17 +-
 templates/base_content.html                        |   17 +-
 templates/book.html                                |    6 +-
 templates/content/images/blue-up-arrow-h18px.png   |  Bin 0 -> 593 bytes
 templates/content/images/cnprog_logo_200_56.gif    |  Bin 2114 -> 0 bytes
 templates/content/images/gray-up-arrow-h18px.png   |  Bin 0 -> 383 bytes
 templates/content/images/logo.gif                  |  Bin 0 -> 2114 bytes
 templates/content/images/logo.png                  |  Bin 3631 -> 1902 bytes
 templates/content/jquery-openid/jquery.openid.js   |    8 +-
 templates/content/jquery-openid/openid.css         |   36 +-
 templates/content/js/com.cnprog.admin.js           |   13 +
 templates/content/js/com.cnprog.i18n.js            |   31 +-
 templates/content/js/com.cnprog.post.js            |  314 +--
 templates/content/js/com.cnprog.utils.js           |    7 +-
 templates/content/js/jquery.form.js                |  654 +++++++
 templates/content/js/wmd/wmd.js                    |    2 +-
 templates/content/style/default.css                |   27 +-
 templates/content/style/jquery.autocomplete.css    |    2 +-
 templates/content/style/style.css                  |  469 ++++-
 templates/edit_user_email_feeds_form.html          |    4 +
 templates/faq.html                                 |    6 +-
 templates/feedback.html                            |   55 +
 templates/feedback_email.txt                       |   19 +
 templates/footer.html                              |   52 +-
 templates/header.html                              |   28 +-
 templates/index.html                               |   60 +-
 templates/logout.html                              |    1 -
 templates/post_contributor_info.html               |   55 +
 templates/question.html                            |  587 +++---
 templates/question_edit.html                       |   15 +-
 templates/question_edit_tips.html                  |    9 +-
 templates/question_retag.html                      |   13 +-
 templates/question_summary_list_roll.html          |   55 +
 templates/questions.html                           |   45 +-
 templates/revisions_answer.html                    |   41 +-
 templates/revisions_question.html                  |   41 +-
 templates/tags.html                                |    2 +-
 templates/unanswered.html                          |   66 +-
 templates/upfiles/1245715031297631.png             |  Bin 3863 -> 0 bytes
 templates/upfiles/12457157052552259.png            |  Bin 3863 -> 0 bytes
 templates/user.html                                |   30 +-
 templates/user_edit.html                           |    4 +-
 templates/user_email_subscriptions.html            |   23 +
 templates/user_favorites.html                      |    1 -
 templates/user_info.html                           |   42 +-
 templates/user_preferences.html                    |   24 -
 templates/user_recent.html                         |    1 -
 templates/user_reputation.html                     |    4 +-
 templates/user_stats.html                          |   70 +-
 templates/user_tabs.html                           |    6 +-
 templates/user_votes.html                          |    4 +-
 templates/users.html                               |    8 +-
 templates/users_questions.html                     |   34 +-
 urls.py                                            |   65 +-
 user_messages/__init__.py                          |   36 +
 user_messages/context_processors.py                |   52 +
 user_messages/models.py                            |    3 +
 121 files changed, 6802 insertions(+), 2734 deletions(-)
 create mode 100644 django_authopenid/external_login.py
 create mode 100644 drop-all.sql
 create mode 100644 forum/management/commands/subscribe_everyone.py
 create mode 100644 forum/templatetags/smart_if.py
 create mode 100644 forum/urls.py
 create mode 100644 junk.py
 create mode 100644 middleware/anon_user.py
 create mode 100644 middleware/cancel.py
 create mode 100644 migration
 create mode 100644 session_messages/.svn/all-wcprops
 create mode 100644 session_messages/.svn/dir-prop-base
 create mode 100644 session_messages/.svn/entries
 create mode 100644 session_messages/.svn/format
 create mode 100644 session_messages/.svn/text-base/__init__.py.svn-base
 create mode 100644 session_messages/.svn/text-base/context_processors.py.svn-base
 create mode 100644 session_messages/.svn/text-base/models.py.svn-base
 create mode 100644 session_messages/__init__.py
 create mode 100644 session_messages/context_processors.py
 create mode 100644 session_messages/models.py
 create mode 100644 sql_scripts/091111_upgrade_evgeny.sql
 create mode 100644 tables.sql
 create mode 100644 templates/authopenid/external_legacy_login_info.html
 create mode 100644 templates/content/images/blue-up-arrow-h18px.png
 delete mode 100644 templates/content/images/cnprog_logo_200_56.gif
 create mode 100644 templates/content/images/gray-up-arrow-h18px.png
 create mode 100644 templates/content/images/logo.gif
 create mode 100644 templates/content/js/com.cnprog.admin.js
 create mode 100644 templates/content/js/jquery.form.js
 create mode 100644 templates/edit_user_email_feeds_form.html
 create mode 100644 templates/feedback.html
 create mode 100644 templates/feedback_email.txt
 create mode 100644 templates/post_contributor_info.html
 create mode 100644 templates/question_summary_list_roll.html
 delete mode 100755 templates/upfiles/1245715031297631.png
 delete mode 100755 templates/upfiles/12457157052552259.png
 create mode 100644 templates/user_email_subscriptions.html
 delete mode 100644 templates/user_preferences.html
 create mode 100644 user_messages/__init__.py
 create mode 100644 user_messages/context_processors.py
 create mode 100644 user_messages/models.py

diff --git a/cnprog.wsgi b/cnprog.wsgi
index a1bd8039..a3d332f2 100644
--- a/cnprog.wsgi
+++ b/cnprog.wsgi
@@ -1,8 +1,7 @@
 import os
 import sys
-
-sys.path.append('/var/www/vhosts')
-os.environ['DJANGO_SETTINGS_MODULE'] = 'cnprog.settings'
-
+sys.path.append('/var/www/vhosts/default/htdocs')
+sys.path.append('/var/www/vhosts/default/htdocs/forum')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'forum.settings'
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/context.py b/context.py
index 3da69f7b..680d1c3c 100644
--- a/context.py
+++ b/context.py
@@ -11,6 +11,9 @@ def application_settings(context):
         'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE,
         'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY,
         'BOOKS_ON':settings.BOOKS_ON,
+        'WIKI_ON':settings.WIKI_ON,
+        'USE_EXTERNAL_LEGACY_LOGIN':settings.USE_EXTERNAL_LEGACY_LOGIN,
+        'RESOURCE_REVISION':settings.RESOURCE_REVISION,
         }
     return {'settings':my_settings}
 
diff --git a/django_authopenid/external_login.py b/django_authopenid/external_login.py
new file mode 100644
index 00000000..bd49c009
--- /dev/null
+++ b/django_authopenid/external_login.py
@@ -0,0 +1,103 @@
+#this file contains stub functions that can be extended to support
+#connect legacy login with external site
+import settings
+from django_authopenid.models import ExternalLoginData
+import httplib
+import urllib
+import Cookie
+import cookielib
+from django import forms
+import xml.dom.minidom as xml
+import logging
+
+def login(request,user):
+    """performs the additional external login operation
+    """
+    pass
+
+def set_login_cookies(response,user):
+    #should be unique value by design
+    try:
+        eld = ExternalLoginData.objects.get(user=user)
+
+        data = eld.external_session_data
+        dom = xml.parseString(data)
+        login_response = dom.getElementsByTagName('login')[0]
+        userid = login_response.getAttribute('lguserid') 
+        username = login_response.getAttribute('lgusername')
+        token = login_response.getAttribute('lgtoken')
+        prefix = login_response.getAttribute('cookieprefix').decode('utf-8')
+        sessionid = login_response.getAttribute('sessionid')
+
+        c = {}
+        c[prefix + 'UserName'] = username
+        c[prefix + 'UserID'] = userid
+        c[prefix + 'Token'] = token
+        c[prefix + '_session'] = sessionid
+
+        #custom code that copies cookies from external site
+        #not sure how to set paths and domain of cookies here
+        for key in c:
+            if c[key]:
+                response.set_cookie(str(key),value=str(c[key]))
+    except ExternalLoginData.DoesNotExist:
+        #this must be an OpenID login
+        pass
+
+#function to perform external logout, if needed
+def logout(request):
+    pass
+
+#should raise User.DoesNotExist or pass
+def clean_username(username):
+    return username
+
+def check_password(username,password):
+    """connects to external site and submits username/password pair
+    return True or False depending on correctness of login
+    saves remote unique id and remote session data in table ExternalLoginData
+    may raise forms.ValidationError
+    """
+    host = settings.EXTERNAL_LEGACY_LOGIN_HOST
+    port = settings.EXTERNAL_LEGACY_LOGIN_PORT
+    ext_site = httplib.HTTPConnection(host,port)
+
+    #custom code. this one does authentication through
+    #MediaWiki API
+    params = urllib.urlencode({'action':'login','format':'xml',
+            'lgname':username,'lgpassword':password})
+    headers = {"Content-type": "application/x-www-form-urlencoded",
+                'User-Agent':"User-Agent':'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.7) Gecko/2009021910 Firefox/3.0.7",
+              "Accept": "text/xml"}
+    ext_site.request("POST","/wiki/api.php",params,headers)
+    response = ext_site.getresponse()
+    if response.status != 200:
+        raise forms.ValidationError('error ' + response.status + ' ' + response.reason)
+    data = response.read().strip()
+    ext_site.close()
+
+    dom = xml.parseString(data)
+    login = dom.getElementsByTagName('login')[0]
+    result = login.getAttribute('result')
+    
+    if result == 'Success':
+        username = login.getAttribute('lgusername')
+        try:
+            eld = ExternalLoginData.objects.get(external_username=username)
+        except ExternalLoginData.DoesNotExist:
+            eld = ExternalLoginData()
+        eld.external_username = username
+        eld.external_session_data = data
+        eld.save()
+        return True 
+    else:
+        error = login.getAttribute('details')
+        raise forms.ValidationError(error)
+    return False 
+
+def createuser(username,email,password):
+    pass
+
+#retrieve email address
+def get_email(username,password):
+    return ''
diff --git a/django_authopenid/forms.py b/django_authopenid/forms.py
index 690a781f..d4482751 100644
--- a/django_authopenid/forms.py
+++ b/django_authopenid/forms.py
@@ -35,8 +35,10 @@ from django.contrib.auth.models import User
 from django.contrib.auth import authenticate
 from django.utils.translation import ugettext as _
 from django.conf import settings
-
+import external_login
+import types
 import re
+from django.utils.safestring import mark_safe
 
 
 # needed for some linux distributions like debian
@@ -46,16 +48,110 @@ except ImportError:
     from yadis import xri
     
 from django_authopenid.util import clean_next
+from django_authopenid.models import ExternalLoginData
+
+__all__ = ['OpenidSigninForm', 'ClassicLoginForm', 'OpenidVerifyForm',
+        'OpenidRegisterForm', 'ClassicRegisterForm', 'ChangePasswordForm',
+        'ChangeEmailForm', 'EmailPasswordForm', 'DeleteForm',
+        'ChangeOpenidForm']
 
-__all__ = ['OpenidSigninForm', 'OpenidAuthForm', 'OpenidVerifyForm',
-        'OpenidRegisterForm', 'RegistrationForm', 'ChangepwForm',
-        'ChangeemailForm', 'EmailPasswordForm', 'DeleteForm',
-        'ChangeOpenidForm', 'ChangeEmailForm', 'ChangepwForm']
+class NextUrlField(forms.CharField):
+    def __init__(self):
+        super(NextUrlField,self).__init__(max_length = 255,widget = forms.HiddenInput(),required = False)
+    def clean(self,value):
+        return clean_next(value)
+
+attrs_dict = { 'class': 'required login' }
+
+class UserNameField(forms.CharField):
+    username_re = re.compile(r'^[\w ]+$')
+    RESERVED_NAMES = (u'fuck', u'shit', u'ass', u'sex', u'add',
+                       u'edit', u'save', u'delete', u'manage', u'update', 'remove', 'new')
+    def __init__(self,must_exist=False,skip_clean=False,label=_('choose a username'),**kw):
+        self.must_exist = must_exist
+        self.skip_clean = skip_clean
+        super(UserNameField,self).__init__(max_length=30,
+                widget=forms.TextInput(attrs=attrs_dict),
+                label=label,
+                error_messages={'required':_('user name is required'),
+                                'taken':_('sorry, this name is taken, please choose another'),
+                                'forbidden':_('sorry, this name is not allowed, please choose another'),
+                                'missing':_('sorry, there is no user with this name'),
+                                'multiple-taken':_('sorry, we have a serious error - user name is taken by several users'),
+                                'invalid':_('user name can only consist of letters, empty space and underscore'),
+                            },
+                **kw
+                )
+
+    def clean(self,username):
+        """ validate username """
+        username = super(UserNameField,self).clean(username.strip())
+        if self.skip_clean == True:
+            return username
+        if not username_re.search(username):
+            raise forms.ValidationError(self.error_messages['invalid'])
+        if username in self.RESERVED_NAMES:
+            raise forms.ValidationError(self.error_messages['forbidden'])
+        try:
+            user = User.objects.get(
+                    username__exact = username
+            )
+            if user:
+                if self.must_exist:
+                    return username
+                else:
+                    raise forms.ValidationError(self.error_messages['taken'])
+        except User.DoesNotExist:
+            if self.must_exist:
+                raise forms.ValidationError(self.error_messages['missing'])
+            else:
+                return username
+        except User.MultipleObjectsReturned:
+            raise forms.ValidationError(self.error_messages['multiple-taken'])
+
+class UserEmailField(forms.EmailField):
+    def __init__(self,skip_clean=False,**kw):
+        self.skip_clean = skip_clean
+        super(UserEmailField,self).__init__(widget=forms.TextInput(attrs=dict(attrs_dict,
+            maxlength=200)), label=mark_safe(_('your email address')),
+            error_messages={'required':_('email address is required'),
+                            'invalid':_('please enter a valid email address'),
+                            'taken':_('this email is already used by someone else, please choose another'),
+                            },
+            **kw
+            )
+
+    def clean(self,email):
+        """ validate if email exist in database
+        from legacy register
+        return: raise error if it exist """
+        email = super(UserEmailField,self).clean(email.strip())
+        if self.skip_clean:
+            return email
+        if settings.EMAIL_UNIQUE == True:
+            try:
+                user = User.objects.get(email = email)
+                raise forms.ValidationError(self.error_messsages['taken'])
+            except User.DoesNotExist:
+                return email
+            except User.MultipleObjectsReturned:
+                raise forms.ValidationError(self.error_messages['taken'])
+        else:
+            return email 
+
+def clean_nonempty_field_method(self,field):
+    value = None
+    if field in self.cleaned_data:
+        value = str(self.cleaned_data[field]).strip()
+        if value == '':
+            value = None
+    self.cleaned_data[field] = value
+    return value 
 
 class OpenidSigninForm(forms.Form):
     """ signin form """
     openid_url = forms.CharField(max_length=255, widget=forms.widgets.TextInput(attrs={'class': 'openid-login-input', 'size':80}))
-    next = forms.CharField(max_length=255, widget=forms.HiddenInput(), required=False)
+    next = NextUrlField()
 
     def clean_openid_url(self):
         """ test if openid is accepted """
@@ -67,76 +163,98 @@ class OpenidSigninForm(forms.Form):
                 raise forms.ValidationError(_('i-names are not supported'))
             return self.cleaned_data['openid_url']
 
-    def clean_next(self):
-        """ validate next """
-        if 'next' in self.cleaned_data and self.cleaned_data['next'] != "":
-            self.cleaned_data['next'] = clean_next(self.cleaned_data['next'])
-            return self.cleaned_data['next']
-
-
-attrs_dict = { 'class': 'required login' }
-username_re = re.compile(r'^\w+$')
-RESERVED_NAMES = (u'fuck', u'shit', u'ass', u'sex', u'add',
-                   u'edit', u'save', u'delete', u'manage', u'update', 'remove', 'new')
-
-class OpenidAuthForm(forms.Form):
+class ClassicLoginForm(forms.Form):
     """ legacy account signin form """
-    next = forms.CharField(max_length=255, widget=forms.HiddenInput(), 
-            required=False)
-    username = forms.CharField(max_length=30,  
-            widget=forms.widgets.TextInput(attrs=attrs_dict))
+    next = NextUrlField()
+    username = UserNameField(required=False,skip_clean=True)
     password = forms.CharField(max_length=128, 
-            widget=forms.widgets.PasswordInput(attrs=attrs_dict))
-       
+            widget=forms.widgets.PasswordInput(attrs=attrs_dict), required=False)
+
     def __init__(self, data=None, files=None, auto_id='id_%s',
             prefix=None, initial=None): 
-        super(OpenidAuthForm, self).__init__(data, files, auto_id,
+        super(ClassicLoginForm, self).__init__(data, files, auto_id,
                 prefix, initial)
         self.user_cache = None
-            
+
+    clean_nonempty_field = clean_nonempty_field_method
+
     def clean_username(self):
-        """ validate username and test if it exists."""
-        if 'username' in self.cleaned_data and \
-                'openid_url' not in self.cleaned_data:
-            if not username_re.search(self.cleaned_data['username']):
-                raise forms.ValidationError(_("Usernames can only contain \
-                    letters, numbers and underscores"))
-            try:
-                user = User.objects.get(
-                        username__exact = self.cleaned_data['username']
-                )
-            except User.DoesNotExist:
-                raise forms.ValidationError(_("This username does not exist \
-                    in our database. Please choose another."))
-            except User.MultipleObjectsReturned:
-                raise forms.ValidationError(u'There is already more than one \
-                    account registered with that username. Please try \
-                    another.')
-            return self.cleaned_data['username']
+        return self.clean_nonempty_field('username')
 
     def clean_password(self):
-        """" test if password is valid for this username """
-        if 'username' in self.cleaned_data and \
-                'password' in self.cleaned_data:
-            self.user_cache =  authenticate(
-                    username=self.cleaned_data['username'], 
-                    password=self.cleaned_data['password']
-            )
+        return self.clean_nonempty_field('password')
+
+    def clean(self):
+        """ 
+        this clean function actuall cleans username and password
+
+        test if password is valid for this username 
+        this is really the "authenticate" function
+        also openid_auth is not an authentication backend
+        since it's written in a way that does not comply with
+        the Django convention
+        """
+
+        error_list = []
+        username = self.cleaned_data['username']
+        password = self.cleaned_data['password']
+
+        self.user_cache = None
+        if username and password: 
+
+            if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+                pw_ok = False
+                try:
+                    pw_ok = external_login.check_password(username,password)
+                except forms.ValidationError, e:
+                    error_list.extend(e.messages)
+                if pw_ok:
+                    external_user = ExternalLoginData.objects.get(external_username=username)
+                    if external_user.user == None:
+                        return self.cleaned_data
+                    user = external_user.user
+                    openid_logins = user.userassociation_set.all()
+                    
+                    if len(openid_logins) > 0:
+                        msg1 = _('Account with this name already exists on the forum')
+                        msg2 = _('can\'t have two logins to the same account yet, sorry.')
+                        error_list.append(msg1)
+                        error_list.append(msg2)
+                        self._errors['__all__'] = forms.util.ErrorList(error_list)
+                        return self.cleaned_data
+                    else:
+                        #synchronize password with external login
+                        user.set_password(password)
+                        user.save()
+                        #this auth will always succeed
+                        self.user_cache = authenticate(username=user.username,\
+                                                        password=password)
+                else:
+                    #keep self.user_cache == None
+                    #nothing to do, error message will be set below
+                    pass
+            else:
+                self.user_cache = authenticate(username=username, password=password)
+
             if self.user_cache is None:
-                raise forms.ValidationError(_("Please enter a valid \
-                    username and password. Note that both fields are \
-                    case-sensitive."))
+                del self.cleaned_data['username']
+                del self.cleaned_data['password']
+                error_list.insert(0,(_("Please enter valid username and password "
+                                    "(both are case-sensitive).")))
             elif self.user_cache.is_active == False:
-                raise forms.ValidationError(_("This account is inactive."))
-            return self.cleaned_data['password']
+                error_list.append(_("This account is inactive."))
+            if len(error_list) > 0:
+                error_list.insert(0,_('Login failed.'))
+        elif password == None and username == None:
+            error_list.append(_('Please enter username and password'))
+        elif password == None:
+            error_list.append(_('Please enter your password'))
+        elif username == None:
+            error_list.append(_('Please enter user name'))
+        if len(error_list) > 0:
+            self._errors['__all__'] = forms.util.ErrorList(error_list)
+        return self.cleaned_data
 
-    def clean_next(self):
-        """ validate next url """
-        if 'next' in self.cleaned_data and \
-                self.cleaned_data['next'] != "":
-            self.cleaned_data['next'] = clean_next(self.cleaned_data['next'])
-            return self.cleaned_data['next']
-            
     def get_user(self):
         """ get authenticated user """
         return self.user_cache
@@ -144,56 +262,14 @@ class OpenidAuthForm(forms.Form):
 
 class OpenidRegisterForm(forms.Form):
     """ openid signin form """
-    next = forms.CharField(max_length=255, widget=forms.HiddenInput(), 
-            required=False)
-    username = forms.CharField(max_length=30, 
-            widget=forms.widgets.TextInput(attrs=attrs_dict))
-    email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict, 
-        maxlength=200)), label=u'Email address')
-    
-    def clean_username(self):
-        """ test if username is valid and exist in database """
-        if 'username' in self.cleaned_data:
-            if not username_re.search(self.cleaned_data['username']):
-                raise forms.ValidationError(_('invalid user name'))
-            if self.cleaned_data['username'] in RESERVED_NAMES:
-                raise forms.ValidationError(_('sorry, this name can not be used, please try another'))
-            if len(self.cleaned_data['username']) < settings.MIN_USERNAME_LENGTH:
-                raise forms.ValidationError(_('username too short'))
-            try:
-                user = User.objects.get(
-                        username__exact = self.cleaned_data['username']
-                        )
-            except User.DoesNotExist:
-                return self.cleaned_data['username']
-            except User.MultipleObjectsReturned:
-                raise forms.ValidationError(_('this name is already in use - please try anoter'))
-            raise forms.ValidationError(_('this name is already in use - please try anoter'))
-            
-    def clean_email(self):
-        """Optionally, for security reason one unique email in database"""
-        if 'email' in self.cleaned_data:
-            if settings.EMAIL_UNIQUE == True:
-                    try:
-                        user = User.objects.get(email = self.cleaned_data['email'])
-                    except User.DoesNotExist:
-                        return self.cleaned_data['email']
-                    except User.MultipleObjectsReturned:
-                        raise forms.ValidationError(u'There is already more than one \
-                            account registered with that e-mail address. Please try \
-                            another.')
-                    raise forms.ValidationError(_("This email is already \
-                        registered in our database. Please choose another."))
-            else:
-                return self.cleaned_data['email']
-        #what if not???
-    
+    next = NextUrlField()
+    username = UserNameField()
+    email = UserEmailField()
+
 class OpenidVerifyForm(forms.Form):
     """ openid verify form (associate an openid with an account) """
-    next = forms.CharField(max_length=255, widget = forms.HiddenInput(), 
-            required=False)
-    username = forms.CharField(max_length=30, 
-            widget=forms.widgets.TextInput(attrs=attrs_dict))
+    next = NextUrlField()
+    username = UserNameField(must_exist=True)
     password = forms.CharField(max_length=128, 
             widget=forms.widgets.PasswordInput(attrs=attrs_dict))
     
@@ -203,24 +279,6 @@ class OpenidVerifyForm(forms.Form):
                 prefix, initial)
         self.user_cache = None
 
-    def clean_username(self):
-        """ validate username """
-        if 'username' in self.cleaned_data:
-            if not username_re.search(self.cleaned_data['username']):
-                raise forms.ValidationError(_('invalid user name'))
-            try:
-                user = User.objects.get(
-                        username__exact = self.cleaned_data['username']
-                )
-            except User.DoesNotExist:
-                raise forms.ValidationError(_("This username don't exist. \
-                        Please choose another."))
-            except User.MultipleObjectsReturned:
-                raise forms.ValidationError(u'Somehow, that username is in \
-                    use for multiple accounts. Please contact us to get this \
-                    problem resolved.')
-            return self.cleaned_data['username']
-            
     def clean_password(self):
         """ test if password is valid for this user """
         if 'username' in self.cleaned_data and \
@@ -236,7 +294,7 @@ class OpenidVerifyForm(forms.Form):
             elif self.user_cache.is_active == False:
                 raise forms.ValidationError(_("This account is inactive."))
             return self.cleaned_data['password']
-            
+
     def get_user(self):
         """ get authenticated user """
         return self.user_cache
@@ -245,88 +303,54 @@ class OpenidVerifyForm(forms.Form):
 attrs_dict = { 'class': 'required' }
 username_re = re.compile(r'^[\w ]+$')
 
-class RegistrationForm(forms.Form):
+class ClassicRegisterForm(forms.Form):
     """ legacy registration form """
 
-    next = forms.CharField(max_length=255, widget=forms.HiddenInput(), 
-            required=False)
-    username = forms.CharField(max_length=30,
-            widget=forms.TextInput(attrs=attrs_dict),
-            label=_('choose a username'))
-    email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict,
-            maxlength=200)), label=_('your email address'))
+    next = NextUrlField()
+    username = UserNameField()
+    email = UserEmailField()
     password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
-            label=_('choose password'))
+            label=_('choose password'),
+            error_messages={'required':_('password is required')},
+            )
     password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
-            label=_('retype password'))
-
-    def clean_username(self):
-        """
-        Validates that the username is alphanumeric and is not already
-        in use.
-        
-        """
-        if 'username' in self.cleaned_data:
-            if not username_re.search(self.cleaned_data['username']):
-                raise forms.ValidationError(u'Usernames can only contain \
-                        letters, numbers and underscores')
-            try:
-                user = User.objects.get(
-                        username__exact = self.cleaned_data['username']
-                )
-
-            except User.DoesNotExist:
-                return self.cleaned_data['username']
-            except User.MultipleObjectsReturned:
-                raise forms.ValidationError(u'Somehow, that username is in \
-                    use for multiple accounts. Please contact us to get this \
-                    problem resolved.')
-            raise forms.ValidationError(u'This username is already taken. \
-                    Please choose another.')
-
-    def clean_email(self):
-        """ validate if email exist in database
-        :return: raise error if it exist """
-        if 'email' in self.cleaned_data:
-            if settings.EMAIL_UNIQUE == True:
-                try:
-                    user = User.objects.get(email = self.cleaned_data['email'])
-                except User.DoesNotExist:
-                    return self.cleaned_data['email']
-                except User.MultipleObjectsReturned:
-                    raise forms.ValidationError(u'There is already more than one \
-                        account registered with that e-mail address. Please try \
-                        another.')
-                raise forms.ValidationError(u'This email is already registered \
-                        in our database. Please choose another.')
-            else:
-                return self.cleaned_data['email']
-        #what if not?
+            label=mark_safe(_('retype password')),
+            error_messages={'required':_('please, retype your password'),
+                            'nomatch':_('sorry, entered passwords did not match, please try again')},
+            required=False
+            )
     
     def clean_password2(self):
         """
         Validates that the two password inputs match.
         
         """
-        if 'password1' in self.cleaned_data and \
-                'password2' in self.cleaned_data and \
-                self.cleaned_data['password1'] == \
+        self.cleaned_data['password2'] = self.cleaned_data.get('password2','')
+        if self.cleaned_data['password2'] == '':
+            del self.cleaned_data['password2']
+            raise forms.ValidationError(self.fields['password2'].error_messages['required'])
+        if 'password1' in self.cleaned_data \
+                and self.cleaned_data['password1'] == \
                 self.cleaned_data['password2']:
             return self.cleaned_data['password2']
-        raise forms.ValidationError(u'You must type the same password each \
-                time')
+        else:
+            del self.cleaned_data['password2']
+            del self.cleaned_data['password1']
+            raise forms.ValidationError(self.fields['password2'].error_messages['nomatch'])
 
-
-class ChangepwForm(forms.Form):
+class ChangePasswordForm(forms.Form):
     """ change password form """
-    oldpw = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict))
-    password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict))
-    password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict))
+    oldpw = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
+                label=mark_safe(_('Current password')))
+    password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
+                label=mark_safe(_('New password')))
+    password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
+                label=mark_safe(_('Retype new password')))
 
     def __init__(self, data=None, user=None, *args, **kwargs):
         if user is None:
             raise TypeError("Keyword argument 'user' must be supplied")
-        super(ChangepwForm, self).__init__(data, *args, **kwargs)
+        super(ChangePasswordForm, self).__init__(data, *args, **kwargs)
         self.user = user
 
     def clean_oldpw(self):
@@ -347,49 +371,35 @@ class ChangepwForm(forms.Form):
         raise forms.ValidationError(_("new passwords do not match"))
         
         
-class ChangeemailForm(forms.Form):
+class ChangeEmailForm(forms.Form):
     """ change email form """
-    email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict, 
-        maxlength=200)), label=u'Email address')
-    password = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict))
+    email = UserEmailField(skip_clean=True)
 
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, \
             initial=None, user=None):
-        if user is None:
-            raise TypeError("Keyword argument 'user' must be supplied")
-        super(ChangeemailForm, self).__init__(data, files, auto_id, 
+        super(ChangeEmailForm, self).__init__(data, files, auto_id, 
                 prefix, initial)
-        self.test_openid = False
         self.user = user
-        
-        
+
     def clean_email(self):
         """ check if email don't exist """
         if 'email' in self.cleaned_data:
             if settings.EMAIL_UNIQUE == True:
-                if self.user.email != self.cleaned_data['email']:
-                    try:
-                        user = User.objects.get(email = self.cleaned_data['email'])
-                    except User.DoesNotExist:
+                try:
+                    user = User.objects.get(email = self.cleaned_data['email'])
+                    if self.user and self.user == user:   
                         return self.cleaned_data['email']
-                    except User.MultipleObjectsReturned:
-                        raise forms.ValidationError(u'There is already more than one \
-                            account registered with that e-mail address. Please try \
-                            another.')
-                    raise forms.ValidationError(u'This email is already registered \
-                        in our database. Please choose another.')
+                except User.DoesNotExist:
+                    return self.cleaned_data['email']
+                except User.MultipleObjectsReturned:
+                    raise forms.ValidationError(u'There is already more than one \
+                        account registered with that e-mail address. Please try \
+                        another.')
+                raise forms.ValidationError(u'This email is already registered \
+                    in our database. Please choose another.')
             else:
                 return self.cleaned_data['email']
-        #what if not?
         
-
-    def clean_password(self):
-        """ check if we have to test a legacy account or not """
-        if 'password' in self.cleaned_data:
-            if not self.user.check_password(self.cleaned_data['password']):
-                self.test_openid = True
-        return self.cleaned_data['password']
-                
 class ChangeopenidForm(forms.Form):
     """ change openid form """
     openid_url = forms.CharField(max_length=255,
@@ -422,8 +432,7 @@ class DeleteForm(forms.Form):
 
 class EmailPasswordForm(forms.Form):
     """ send new password form """
-    username = forms.CharField(max_length=30,
-            widget=forms.TextInput(attrs={'class': "required" }))
+    username = UserNameField(skip_clean=True,label=mark_safe(_('Your user name (<i>required</i>)')))
 
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, 
             initial=None):
@@ -431,7 +440,6 @@ class EmailPasswordForm(forms.Form):
                 prefix, initial)
         self.user_cache = None
 
-
     def clean_username(self):
         """ get user for this username """
         if 'username' in self.cleaned_data:
diff --git a/django_authopenid/models.py b/django_authopenid/models.py
index e6fb8111..7b2e1c02 100644
--- a/django_authopenid/models.py
+++ b/django_authopenid/models.py
@@ -69,3 +69,8 @@ class UserPasswordQueue(models.Model):
 
     def __unicode__(self):
         return self.user.username
+
+class ExternalLoginData(models.Model):
+    external_username = models.CharField(max_length=40, unique=True, null=False)
+    external_session_data = models.TextField()
+    user = models.ForeignKey(User, null=True)
diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py
index f5d7a72f..112cbbe1 100644
--- a/django_authopenid/urls.py
+++ b/django_authopenid/urls.py
@@ -7,12 +7,13 @@ urlpatterns = patterns('django_authopenid.views',
     url(r'^yadis.xrdf$', 'xrdf', name='yadis_xrdf'),
      # manage account registration
     url(r'^%s$' % _('signin/'), 'signin', name='user_signin'),
-    url(r'^%s%s$' % (_('signin/'),_('newquestion/')), 'signin', kwargs = {'newquestion':True}),
-    url(r'^%s%s$' % (_('signin/'),_('newanswer/')), 'signin', kwargs = {'newanswer':True}),
+    url(r'^%s%s$' % (_('signin/'),_('newquestion/')), 'signin', kwargs = {'newquestion':True}, name='user_signin_new_question'),
+    url(r'^%s%s$' % (_('signin/'),_('newanswer/')), 'signin', kwargs = {'newanswer':True}, name='user_signin_new_answer'),
     url(r'^%s$' % _('signout/'), 'signout', name='user_signout'),
     url(r'^%s%s$' % (_('signin/'), _('complete/')), 'complete_signin', 
         name='user_complete_signin'),
-    #url(r'^%s$' % _('register/'), 'register', name='user_register'),
+    url('^%s$' % _('external-login/'),'external_legacy_login_info', name='user_external_legacy_login_issues'),
+    url(r'^%s$' % _('register/'), 'register', name='user_register'),
     url(r'^%s$' % _('signup/'), 'signup', name='user_signup'),
     #disable current sendpw function
     url(r'^%s$' % _('sendpw/'), 'sendpw', name='user_sendpw'),
@@ -21,8 +22,10 @@ urlpatterns = patterns('django_authopenid.views',
     # manage account settings
     url(r'^$', _('account_settings'), name='user_account_settings'),
     url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'),
-    url(r'^%s$' % _('email/'), 'changeemail', name='user_changeemail',kwargs = {'action':'change'}),
-    url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_changeemail',kwargs = {'action':'validate'}),
-    #url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'),
+    url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_validateemail',kwargs = {'action':'validate'}),
+    url(r'^%s%s$' % (_('email/'), _('change/')), 'changeemail', name='user_changeemail'),
+    url(r'^%s%s$' % (_('email/'), _('sendkey/')), 'send_email_key', name='send_email_key'),
+    url(r'^%s%s(?P<id>\d+)/(?P<key>[\dabcdef]{32})/$' % (_('email/'), _('verify/')), 'verifyemail', name='user_verifyemail'),
+    url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'),
     url(r'^%s$' % _('delete/'), 'delete', name='user_delete'),
 )
diff --git a/django_authopenid/util.py b/django_authopenid/util.py
index 54c1246b..edb6808e 100644
--- a/django_authopenid/util.py
+++ b/django_authopenid/util.py
@@ -7,7 +7,7 @@ import openid.store
 from django.db.models.query import Q
 from django.conf import settings
 from django.http import str_to_unicode
-
+from django.core.urlresolvers import reverse
 
 # needed for some linux distributions like debian
 try:
@@ -22,7 +22,7 @@ from models import Association, Nonce
 
 __all__ = ['OpenID', 'DjangoOpenIDStore', 'from_openid_response', 'clean_next']
 
-DEFAULT_NEXT = getattr(settings, 'OPENID_REDIRECT_NEXT', '/')
+DEFAULT_NEXT = '/' + getattr(settings, 'FORUM_SCRIPT_ALIAS')
 def clean_next(next):
     if next is None:
         return DEFAULT_NEXT
@@ -32,6 +32,9 @@ def clean_next(next):
         return next
     return DEFAULT_NEXT
 
+def get_next_url(request):
+    return clean_next(request.REQUEST.get('next'))
+
 class OpenID:
     def __init__(self, openid_, issued, attrs=None, sreg_=None):
         self.openid = openid_
diff --git a/django_authopenid/views.py b/django_authopenid/views.py
index 65d579f4..feb6b58f 100644
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -30,19 +30,20 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from django.http import HttpResponseRedirect, get_host, Http404
+from django.http import HttpResponseRedirect, get_host, Http404, \
+                         HttpResponseServerError
 from django.shortcuts import render_to_response as render
 from django.template import RequestContext, loader, Context
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.contrib.auth import logout #for login I've added wrapper below - called login
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth import authenticate
 from django.core.urlresolvers import reverse
 from django.utils.encoding import smart_unicode
 from django.utils.html import escape
 from django.utils.translation import ugettext as _
-from django.contrib.sites.models import Site
 from django.utils.http import urlquote_plus
+from django.utils.safestring import mark_safe
 from django.core.mail import send_mail
 from django.views.defaults import server_error
 
@@ -60,15 +61,24 @@ import re
 import urllib
 
 
-from django_authopenid.util import OpenID, DjangoOpenIDStore, from_openid_response, clean_next
-from django_authopenid.models import UserAssociation, UserPasswordQueue
-from django_authopenid.forms import OpenidSigninForm, OpenidAuthForm, OpenidRegisterForm, \
-        OpenidVerifyForm, RegistrationForm, ChangepwForm, ChangeemailForm, \
+from forum.forms import EditUserEmailFeedsForm
+from django_authopenid.util import OpenID, DjangoOpenIDStore, from_openid_response, get_next_url 
+from django_authopenid.models import UserAssociation, UserPasswordQueue, ExternalLoginData
+from django_authopenid.forms import OpenidSigninForm, ClassicLoginForm, OpenidRegisterForm, \
+        OpenidVerifyForm, ClassicRegisterForm, ChangePasswordForm, ChangeEmailForm, \
         ChangeopenidForm, DeleteForm, EmailPasswordForm
+import external_login
+import logging
 
 def login(request,user):
     from django.contrib.auth import login as _login
     from forum.models import user_logged_in #custom signal
+
+    print 'in login call'
+
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        external_login.login(request,user)
+
     #1) get old session key
     session_key = request.session.session_key
     #2) login and get new session key
@@ -76,6 +86,12 @@ def login(request,user):
     #3) send signal with old session key as argument
     user_logged_in.send(user=user,session_key=session_key,sender=None)
 
+def logout(request):
+    from django.contrib.auth import logout as _logout#for login I've added wrapper below - called login
+    _logout(request)
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        external_login.logout(request)
+
 def get_url_host(request):
     if request.is_secure():
         protocol = 'https'
@@ -138,7 +154,7 @@ def complete(request, on_success=None, on_failure=None, return_to=None):
 def default_on_success(request, identity_url, openid_response):
     """ default action on openid signin success """
     request.session['openid'] = from_openid_response(openid_response)
-    return HttpResponseRedirect(clean_next(request.GET.get('next')))
+    return HttpResponseRedirect(get_next_url(request))
 
 def default_on_failure(request, message):
     """ default failure action on signin """
@@ -152,16 +168,15 @@ def not_authenticated(func):
     he is already logged."""
     def decorated(request, *args, **kwargs):
         if request.user.is_authenticated():
-            next = request.GET.get("next", "/")
-            return HttpResponseRedirect(next)
+            return HttpResponseRedirect(get_next_url(request))
         return func(request, *args, **kwargs)
     return decorated
 
 @not_authenticated
 def signin(request,newquestion=False,newanswer=False):
     """
-    signin page. It manage the legacy authentification (user/password) 
-    and authentification with openid.
+    signin page. It manages the legacy authentification (user/password) 
+    and openid authentification
 
     url: /signin/
     
@@ -169,27 +184,112 @@ def signin(request,newquestion=False,newanswer=False):
     """
     request.encoding = 'UTF-8'
     on_failure = signin_failure
-    next = clean_next(request.GET.get('next'))
-
+    email_feeds_form = EditUserEmailFeedsForm()
+    next = get_next_url(request)
     form_signin = OpenidSigninForm(initial={'next':next})
-    form_auth = OpenidAuthForm(initial={'next':next})
+    form_auth = ClassicLoginForm(initial={'next':next})
     
     if request.POST:   
-
+        #'blogin' - password login
         if 'blogin' in request.POST.keys():
-            # perform normal django authentification
-            form_auth = OpenidAuthForm(request.POST)
+            form_auth = ClassicLoginForm(request.POST)
             if form_auth.is_valid():
-                user_ = form_auth.get_user()
-                login(request, user_)
-                next = clean_next(form_auth.cleaned_data.get('next'))
-                print 'next stop is "%s"' % next
-                return HttpResponseRedirect(next)
+                #have login and password and need to login through external website
+                if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+                    username = form_auth.cleaned_data['username']
+                    password = form_auth.cleaned_data['password']
+                    next = form_auth.cleaned_data['next']
+                    if form_auth.get_user() == None:
+                        #need to create internal user
+
+                        #1) save login and password temporarily in session
+                        request.session['external_username'] = username
+                        request.session['external_password'] = password
+
+                        #2) see if username clashes with some existing user
+                        #if so, we have to prompt the user to pick a different name
+                        username_taken = User.is_username_taken(username)
+                        #try:
+                        #    User.objects.get(username=username)
+                        #    username_taken = True
+                        #except User.DoesNotExist:
+                        #    username_taken = False
+
+                        #3) try to extract user email from external service
+                        email = external_login.get_email(username,password)
+
+                        email_feeds_form = EditUserEmailFeedsForm()
+                        form_data = {'username':username,'email':email,'next':next}
+                        form = OpenidRegisterForm(initial=form_data)
+                        template_data = {'form1':form,'username':username,\
+                                        'email_feeds_form':email_feeds_form,\
+                                        'provider':mark_safe(settings.EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME),\
+                                        'login_type':'legacy',\
+                                        'gravatar_faq_url':reverse('faq') + '#gravatar',\
+                                        'external_login_name_is_taken':username_taken}
+                        return render('authopenid/complete.html',template_data,\
+                                context_instance=RequestContext(request))
+                    else:
+                        #user existed, external password is ok
+                        user = form_auth.get_user()
+                        login(request,user)
+                        response = HttpResponseRedirect(get_next_url(request))
+                        external_login.set_login_cookies(response,user)
+                        return response
+                else:
+                    #regular password authentication
+                    user = form_auth.get_user()
+                    login(request, user)
+                    return HttpResponseRedirect(get_next_url(request))
+
+        elif 'bnewaccount' in request.POST.keys():
+            #register externally logged in password user with a new local account
+            if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+                form = OpenidRegisterForm(request.POST) 
+                email_feeds_form = EditUserEmailFeedsForm(request.POST)
+                form1_is_valid = form.is_valid()
+                form2_is_valid = email_feeds_form.is_valid()
+                if form1_is_valid and form2_is_valid:
+                    #create the user
+                    username = form.cleaned_data['username']
+                    password = request.session.get('external_password',None)
+                    email = form.cleaned_data['email']
+                    print 'got email addr %s' % email
+                    if password and username:
+                        User.objects.create_user(username,email,password)
+                        user = authenticate(username=username,password=password)
+                        external_username = request.session['external_username']
+                        eld = ExternalLoginData.objects.get(external_username=external_username)
+                        eld.user = user
+                        eld.save()
+                        login(request,user)
+                        email_feeds_form.save(user)
+                        del request.session['external_username']
+                        del request.session['external_password']
+                        return HttpResponseRedirect(reverse('index'))
+                    else:
+                        if password:
+                            del request.session['external_username']
+                        if username:
+                            del request.session['external_password']
+                        return HttpResponseServerError()
+                else:
+                    username = request.POST.get('username',None)
+                    provider = mark_safe(settings.EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME)
+                    username_taken = User.is_username_taken(username)
+                    data = {'login_type':'legacy','form1':form,'username':username,\
+                        'email_feeds_form':email_feeds_form,'provider':provider,\
+                        'gravatar_faq_url':reverse('faq') + '#gravatar',\
+                        'external_login_name_is_taken':username_taken}
+                    return render('authopenid/complete.html',data,
+                            context_instance=RequestContext(request))
+            else:
+                raise Http404
 
         elif 'bsignin' in request.POST.keys() or 'openid_username' in request.POST.keys():
             form_signin = OpenidSigninForm(request.POST)
             if form_signin.is_valid():
-                next = clean_next(form_signin.cleaned_data.get('next'))
+                next = form_signin.cleaned_data['next']
                 sreg_req = sreg.SRegRequest(optional=['nickname', 'email'])
                 redirect_to = "%s%s?%s" % (
                         get_url_host(request),
@@ -203,6 +303,7 @@ def signin(request,newquestion=False,newanswer=False):
                         sreg_request=sreg_req)
 
 
+    #if request is GET
     question = None
     if newquestion == True:
         from forum.models import AnonymousQuestion as AQ
@@ -232,7 +333,6 @@ def complete_signin(request):
     return complete(request, signin_success, signin_failure,
             get_url_host(request) + reverse('user_complete_signin'))
 
-
 def signin_success(request, identity_url, openid_response):
     """
     openid signin success.
@@ -256,8 +356,7 @@ def signin_success(request, identity_url, openid_response):
         user_.backend = "django.contrib.auth.backends.ModelBackend"
         login(request, user_)
         
-    next = clean_next(request.GET.get('next'))
-    return HttpResponseRedirect(next)
+    return HttpResponseRedirect(get_next_url(request))
 
 def is_association_exist(openid_url):
     """ test if an openid is already in database """
@@ -284,15 +383,13 @@ def register(request):
     template : authopenid/complete.html
     """
 
-    is_redirect = False
-    next = clean_next(request.GET.get('next'))
     openid_ = request.session.get('openid', None)
+    next = get_next_url(request)
     if not openid_:
-        return HttpResponseRedirect(reverse('user_signin') + next)
+        return HttpResponseRedirect(reverse('user_signin') + '?next=%s' % next)
 
     nickname = openid_.sreg.get('nickname', '')
     email = openid_.sreg.get('email', '')
-    
     form1 = OpenidRegisterForm(initial={
         'next': next,
         'username': nickname,
@@ -302,19 +399,22 @@ def register(request):
         'next': next,
         'username': nickname,
     })
+    email_feeds_form = EditUserEmailFeedsForm()
 
     user_ = None
+    is_redirect = False
     if request.POST:
-        just_completed = False
         if 'bnewaccount' in request.POST.keys():
             form1 = OpenidRegisterForm(request.POST)
-            if form1.is_valid():
-                next = clean_next(form1.cleaned_data.get('next'))
+            email_feeds_form = EditUserEmailFeedsForm(request.POST)
+            if form1.is_valid() and email_feeds_form.is_valid():
+                next = form1.cleaned_data['next']
                 is_redirect = True
                 tmp_pwd = User.objects.make_random_password()
                 user_ = User.objects.create_user(form1.cleaned_data['username'],
                          form1.cleaned_data['email'], tmp_pwd)
-                
+
+                user_.set_unusable_password()
                 # make association with openid
                 uassoc = UserAssociation(openid_url=str(openid_),
                         user_id=user_.id)
@@ -323,11 +423,12 @@ def register(request):
                 # login 
                 user_.backend = "django.contrib.auth.backends.ModelBackend"
                 login(request, user_)
+                email_feeds_form.save(user_)
         elif 'bverify' in request.POST.keys():
             form2 = OpenidVerifyForm(request.POST)
             if form2.is_valid():
                 is_redirect = True
-                next = clean_next(form2.cleaned_data.get('next'))
+                next = form2.cleaned_data['next']
                 user_ = form2.get_user()
 
                 uassoc = UserAssociation(openid_url=str(openid_),
@@ -339,15 +440,16 @@ def register(request):
         #this needs to be a function call becase this is also done
         #if user just logged in and did not need to create the new account
         
-        if user_ != None and settings.EMAIL_VALIDATION == 'on':
-            send_new_email_key(user_,nomessage=True)
-            output = validation_email_sent(request)
-            set_email_validation_message(user_) #message set after generating view
-            return output
-        elif user_.is_authenticated():
-            return HttpResponseRedirect('/')
-        else:
-            raise server_error('')
+        if user_ != None:
+            if settings.EMAIL_VALIDATION == 'on':
+                send_new_email_key(user_,nomessage=True)
+                output = validation_email_sent(request)
+                set_email_validation_message(user_) #message set after generating view
+                return output
+            if user_.is_authenticated():
+                return HttpResponseRedirect(reverse('index'))
+            else:
+                raise Exception('openid login failed')#should not ever get here
     
     openid_str = str(openid_)
     bits = openid_str.split('/')
@@ -369,9 +471,12 @@ def register(request):
     return render('authopenid/complete.html', {
         'form1': form1,
         'form2': form2,
-        'provider':provider_logo,
-        'nickname': nickname,
-        'email': email
+        'email_feeds_form': email_feeds_form,
+        'provider':mark_safe(provider_logo),
+        'username': nickname,
+        'email': email,
+        'login_type':'openid',
+        'gravatar_faq_url':reverse('faq') + '#gravatar',
     }, context_instance=RequestContext(request))
 
 def signin_failure(request, message):
@@ -380,9 +485,9 @@ def signin_failure(request, message):
 
     template : "authopenid/signin.html"
     """
-    next = clean_next(request.GET.get('next'))
+    next = get_next_url(request)
     form_signin = OpenidSigninForm(initial={'next': next})
-    form_auth = OpenidAuthForm(initial={'next': next})
+    form_auth = ClassicLoginForm(initial={'next': next})
 
     return render('authopenid/signin.html', {
         'msg': message,
@@ -399,42 +504,52 @@ def signup(request):
 
     templates: authopenid/signup.html, authopenid/confirm_email.txt
     """
-    action_signin = reverse('user_signin')
-    next = clean_next(request.GET.get('next'))
-    form = RegistrationForm(initial={'next':next})
-    form_signin = OpenidSigninForm(initial={'next':next})
-    
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
+    next = get_next_url(request)
     if request.POST:
-        form = RegistrationForm(request.POST)
-        if form.is_valid():
-            next = clean_next(form.cleaned_data.get('next'))
-            user_ = User.objects.create_user( form.cleaned_data['username'],
-                    form.cleaned_data['email'], form.cleaned_data['password1'])
+        form = ClassicRegisterForm(request.POST)
+        email_feeds_form = EditUserEmailFeedsForm(request.POST)
+
+        #validation outside if to remember form values
+        form1_is_valid = form.is_valid()
+        form2_is_valid = email_feeds_form.is_valid()
+        if form1_is_valid and form2_is_valid:
+            next = form.cleaned_data['next']
+            username = form.cleaned_data['username']
+            password = form.cleaned_data['password1']
+            email = form.cleaned_data['email']
+
+            user_ = User.objects.create_user( username,email,password )
+            if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+                external_login.create_user(username,email,password)
            
             user_.backend = "django.contrib.auth.backends.ModelBackend"
             login(request, user_)
+            email_feeds_form.save(user_)
             
             # send email
-            current_domain = Site.objects.get_current().domain
-            subject = _("Welcome")
+            subject = _("Welcome email subject line")
             message_template = loader.get_template(
                     'authopenid/confirm_email.txt'
             )
             message_context = Context({ 
-                'site_url': 'http://%s/' % current_domain,
-                'username': form.cleaned_data['username'],
-                'password': form.cleaned_data['password1'] 
+                'signup_url': settings.APP_URL + reverse('user_signin'),
+                'username': username,
+                'password': password,
             })
             message = message_template.render(message_context)
             send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, 
                     [user_.email])
-            
             return HttpResponseRedirect(next)
-    
+    else:
+        form = ClassicRegisterForm(initial={'next':next})
+        email_feeds_form = EditUserEmailFeedsForm()
     return render('authopenid/signup.html', {
-        'form': form,
-        'form2': form_signin,
+        'form': form, 
+        'email_feeds_form': email_feeds_form 
         }, context_instance=RequestContext(request))
+    #what if request is not posted?
 
 @login_required
 def signout(request):
@@ -447,10 +562,8 @@ def signout(request):
         del request.session['openid']
     except KeyError:
         pass
-    next = clean_next(request.GET.get('next'))
     logout(request)
-    
-    return HttpResponseRedirect(next)
+    return HttpResponseRedirect(get_next_url(request))
     
 def xrdf(request):
     url_host = get_url_host(request)
@@ -498,11 +611,16 @@ def changepw(request):
     url : /changepw/
     template: authopenid/changepw.html
     """
-    
     user_ = request.user
+
+    if user_.has_usable_password():
+        if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+            return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
+    else:
+        raise Http404
     
     if request.POST:
-        form = ChangepwForm(request.POST, user=user_)
+        form = ChangePasswordForm(request.POST, user=user_)
         if form.is_valid():
             user_.set_password(form.cleaned_data['password1'])
             user_.save()
@@ -512,18 +630,20 @@ def changepw(request):
                     urlquote_plus(msg))
             return HttpResponseRedirect(redirect)
     else:
-        form = ChangepwForm(user=user_)
+        form = ChangePasswordForm(user=user_)
 
     return render('authopenid/changepw.html', {'form': form },
                                 context_instance=RequestContext(request))
 
 def find_email_validation_messages(user):
-    msg_text = _('your email needs to be validated')
+    msg_text = _('your email needs to be validated see %(details_url)s') \
+        % {'details_url':reverse('faq') + '#validate'}
     return user.message_set.filter(message__exact=msg_text)
 
 def set_email_validation_message(user):
     messages = find_email_validation_messages(user)
-    msg_text = _('your email needs to be validated')
+    msg_text = _('your email needs to be validated see %(details_url)s') \
+        % {'details_url':reverse('faq') + '#validate'}
     if len(messages) == 0:
         user.message_set.create(message=msg_text)
 
@@ -543,11 +663,11 @@ def _send_email_key(user):
     """private function. sends email containing validation key
     to user's email address
     """
-    subject = _("Welcome")
+    subject = _("Email verification subject line")
     message_template = loader.get_template('authopenid/email_validation.txt')
     import settings
     message_context = Context({
-    'validation_link': '%s/email/verify/%d/%s/' % (settings.APP_URL ,user.id,user.email_key)
+    'validation_link': settings.APP_URL + reverse('user_verifyemail', kwargs={'id':user.id,'key':user.email_key})
     })
     message = message_template.render(message_context)
     send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user.email])
@@ -583,7 +703,7 @@ def send_email_key(request):
                               context_instance=RequestContext(request)
                               )
         else:
-            _send_email_key(request.user)
+            send_new_email_key(request.user)
             return validation_email_sent(request)
     else:
         raise Http404
@@ -592,10 +712,11 @@ def send_email_key(request):
 #internal server view used as return value by other views
 def validation_email_sent(request):
     return render('authopenid/changeemail.html',
-                    { 'email': request.user.email, 'action_type': 'validate', }, 
+                    { 'email': request.user.email, 
+                    'change_email_url': reverse('user_changeemail'),
+                    'action_type': 'validate', }, 
                      context_instance=RequestContext(request))
 
-
 def verifyemail(request,id=None,key=None):
     """
     view that is shown when user clicks email validation link
@@ -614,53 +735,49 @@ def verifyemail(request,id=None,key=None):
     raise Http404
 
 @login_required
-def changeemail(request):
+def changeemail(request, action='change'):
     """ 
-    changeemail view. It require password or openid to allow change.
+    changeemail view. requires openid with request type GET
 
     url: /email/*
 
     template : authopenid/changeemail.html
     """
-    msg = request.GET.get('msg', '')
+    msg = request.GET.get('msg', None)
     extension_args = {}
     user_ = request.user
 
-    redirect_to = get_url_host(request) + reverse('user_changeemail')
-    action = 'change'
-
     if request.POST:
-        form = ChangeemailForm(request.POST, user=user_)
+        if 'cancel' in request.POST:
+            msg = _('your email was not changed')
+            request.user.message_set.create(message=msg)
+            return HttpResponseRedirect(get_next_url(request))
+        form = ChangeEmailForm(request.POST, user=user_)
         if form.is_valid():
-            if not form.test_openid:
-                new_email = form.cleaned_data['email']
-                if new_email != user_.email:
-                    if settings.EMAIL_VALIDATION == 'on':
-                        action = 'validate'
-                    else:
-                        action = 'done_novalidate'
-                    set_new_email(user_, new_email,nomessage=True)
+            new_email = form.cleaned_data['email']
+            if new_email != user_.email:
+                if settings.EMAIL_VALIDATION == 'on':
+                    action = 'validate'
                 else:
-                    action = 'keep'
+                    action = 'done_novalidate'
+                set_new_email(user_, new_email,nomessage=True)
             else:
-                #what does this branch do?
-                return server_error('')
-                request.session['new_email'] = form.cleaned_data['email']
-                return ask_openid(request, form.cleaned_data['password'], 
-                        redirect_to, on_failure=emailopenid_failure)    
+                action = 'keep'
 
     elif not request.POST and 'openid.mode' in request.GET:
+        redirect_to = get_url_host(request) + reverse('user_changeemail')
         return complete(request, emailopenid_success, 
                 emailopenid_failure, redirect_to) 
     else:
-        form = ChangeemailForm(initial={'email': user_.email},
+        form = ChangeEmailForm(initial={'email': user_.email},
                 user=user_)
-
     
     output = render('authopenid/changeemail.html', {
         'form': form,
         'email': user_.email,
         'action_type': action,
+        'gravatar_faq_url': reverse('faq') + '#gravatar',
+        'change_email_url': reverse('user_changeemail'),
         'msg': msg 
         }, context_instance=RequestContext(request))
 
@@ -669,7 +786,6 @@ def changeemail(request):
 
     return output
 
-
 def emailopenid_success(request, identity_url, openid_response):
     openid_ = from_openid_response(openid_response)
 
@@ -843,7 +959,7 @@ def deleteopenid_success(request, identity_url, openid_response):
                     identity_url))
     
     msg = _("Account deleted.") 
-    redirect = "/?msg=%s" % (urlquote_plus(msg))
+    redirect = reverse('index') + u"/?msg=%s" % (urlquote_plus(msg))
     return HttpResponseRedirect(redirect)
     
 
@@ -851,6 +967,8 @@ def deleteopenid_failure(request, message):
     redirect_to = "%s?msg=%s" % (reverse('user_delete'), urlquote_plus(message))
     return HttpResponseRedirect(redirect_to)
 
+def external_legacy_login_info(request):
+    return render('authopenid/external_legacy_login_info.html', context_instance=RequestContext(request))
 
 def sendpw(request):
     """
@@ -862,6 +980,8 @@ def sendpw(request):
 
     templates :  authopenid/sendpw_email.txt, authopenid/sendpw.html
     """
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
 
     msg = request.GET.get('msg','')
     if request.POST:
@@ -881,21 +1001,20 @@ def sendpw(request):
             uqueue.confirm_key = confirm_key
             uqueue.save()
             # send email 
-            current_domain = Site.objects.get_current().domain
             subject = _("Request for new password")
             message_template = loader.get_template(
                     'authopenid/sendpw_email.txt')
+            key_link = settings.APP_URL + reverse('user_confirmchangepw') + '?key=' + confirm_key
             message_context = Context({ 
-                'site_url': 'http://%s' % current_domain,
-                'confirm_key': confirm_key,
+                'site_url': settings.APP_URL + reverse('index'),
+                'key_link': key_link,
                 'username': form.user_cache.username,
                 'password': new_pw,
-                'url_confirm': reverse('user_confirmchangepw'),
             })
             message = message_template.render(message_context)
             send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, 
                     [form.user_cache.email])
-            msg = _("A new password has been sent to your email address.")
+            msg = _("A new password and the activation link were sent to your email address.")
     else:
         form = EmailPasswordForm()
         
@@ -918,7 +1037,7 @@ def confirmchangepw(request):
     """
     confirm_key = request.GET.get('key', '')
     if not confirm_key:
-        return HttpResponseRedirect('/')
+        return HttpResponseRedirect(reverse('index'))
 
     try:
         uqueue = UserPasswordQueue.objects.get(
diff --git a/drop-all-tables.sh b/drop-all-tables.sh
index 87783b77..1e55cb1f 100644
--- a/drop-all-tables.sh
+++ b/drop-all-tables.sh
@@ -1,4 +1,4 @@
-mysql_username='cnprog'
-mysql_database='cnprog'
+mysql_username=''
+mysql_database=''
 mysqldump -u $mysql_username -p --add-drop-table --no-data $mysql_database | grep ^DROP 
 #| mysql -u[USERNAME] -p[PASSWORD] [DATABASE]
diff --git a/drop-all.sql b/drop-all.sql
new file mode 100644
index 00000000..52feb337
--- /dev/null
+++ b/drop-all.sql
@@ -0,0 +1,39 @@
+DROP TABLE IF EXISTS `activity`;
+DROP TABLE IF EXISTS `answer`;
+DROP TABLE IF EXISTS `answer_revision`;
+DROP TABLE IF EXISTS `auth_group`;
+DROP TABLE IF EXISTS `auth_group_permissions`;
+DROP TABLE IF EXISTS `auth_message`;
+DROP TABLE IF EXISTS `auth_permission`;
+DROP TABLE IF EXISTS `auth_user`;
+DROP TABLE IF EXISTS `auth_user_groups`;
+DROP TABLE IF EXISTS `auth_user_user_permissions`;
+DROP TABLE IF EXISTS `award`;
+DROP TABLE IF EXISTS `badge`;
+DROP TABLE IF EXISTS `book`;
+DROP TABLE IF EXISTS `book_author_info`;
+DROP TABLE IF EXISTS `book_author_rss`;
+DROP TABLE IF EXISTS `book_question`;
+DROP TABLE IF EXISTS `comment`;
+DROP TABLE IF EXISTS `django_admin_log`;
+DROP TABLE IF EXISTS `django_authopenid_association`;
+DROP TABLE IF EXISTS `django_authopenid_externallogindata`;
+DROP TABLE IF EXISTS `django_authopenid_nonce`;
+DROP TABLE IF EXISTS `django_authopenid_userassociation`;
+DROP TABLE IF EXISTS `django_authopenid_userpasswordqueue`;
+DROP TABLE IF EXISTS `django_content_type`;
+DROP TABLE IF EXISTS `django_session`;
+DROP TABLE IF EXISTS `django_site`;
+DROP TABLE IF EXISTS `favorite_question`;
+DROP TABLE IF EXISTS `flagged_item`;
+DROP TABLE IF EXISTS `forum_anonymousanswer`;
+DROP TABLE IF EXISTS `forum_anonymousemail`;
+DROP TABLE IF EXISTS `forum_anonymousquestion`;
+DROP TABLE IF EXISTS `forum_emailfeed`;
+DROP TABLE IF EXISTS `forum_emailfeedsetting`;
+DROP TABLE IF EXISTS `question`;
+DROP TABLE IF EXISTS `question_revision`;
+DROP TABLE IF EXISTS `question_tags`;
+DROP TABLE IF EXISTS `repute`;
+DROP TABLE IF EXISTS `tag`;
+DROP TABLE IF EXISTS `vote`;
diff --git a/forum/auth.py b/forum/auth.py
index 776746e8..1569482f 100644
--- a/forum/auth.py
+++ b/forum/auth.py
@@ -6,18 +6,20 @@ and superuser status.
 """
 import datetime
 from django.contrib.contenttypes.models import ContentType
+from django.utils.translation import ugettext as _
 from django.db import transaction
 from models import Repute
 from models import Question
 from models import Answer
 from const import TYPE_REPUTATION
+import logging
 question_type = ContentType.objects.get_for_model(Question)
 answer_type = ContentType.objects.get_for_model(Answer)
 
 VOTE_UP                   = 15
 FLAG_OFFENSIVE            = 15
 POST_IMAGES               = 15
-LEAVE_COMMENTS            = 50
+LEAVE_COMMENTS            = 50 
 UPLOAD_FILES              = 60
 VOTE_DOWN                 = 100
 CLOSE_OWN_QUESTIONS       = 250
@@ -58,6 +60,9 @@ REPUTATION_RULES = {
     'lose_by_upvote_canceled'             : -10,
 }
 
+def can_moderate_users(user):
+    return user.is_superuser
+
 def can_vote_up(user):
     """Determines if a User can vote Questions and Answers up."""
     return user.is_authenticated() and (
@@ -70,11 +75,18 @@ def can_flag_offensive(user):
         user.reputation >= FLAG_OFFENSIVE or
         user.is_superuser)
 
-def can_add_comments(user):
+def can_add_comments(user,subject):
     """Determines if a User can add comments to Questions and Answers."""
-    return user.is_authenticated() and (
-        user.reputation >= LEAVE_COMMENTS or
-        user.is_superuser)
+    if user.is_authenticated():
+        if user.id == subject.author.id:
+            return True
+        if user.reputation >= LEAVE_COMMENTS:
+            return True
+        if user.is_superuser:
+            return True
+        if isinstance(subject,Answer) and subject.question.author.id == user.id:
+            return True
+    return False
 
 def can_vote_down(user):
     """Determines if a User can vote Questions and Answers down."""
@@ -139,8 +151,21 @@ def can_reopen_question(user, question):
         user.reputation >= REOPEN_OWN_QUESTIONS) or user.is_superuser
 
 def can_delete_post(user, post):
-    return (user.is_authenticated() and
-        user.id == post.author_id) or user.is_superuser
+    if user.is_superuser:
+        return True
+    elif user.is_authenticated() and user == post.author:
+        if isinstance(post,Answer):
+            return True
+        elif isinstance(post,Question):
+            answers = post.answers.all()
+            for answer in answers:
+                if user != answer.author and answer.deleted == False:
+                    return False
+            return True
+        else:
+            return False
+    else:
+        return False
 
 def can_view_deleted_post(user, post):
     return user.is_superuser
@@ -422,15 +447,20 @@ def onDownVotedCanceled(vote, post, user):
 
 def onDeleteCanceled(post, user):
     post.deleted = False
-    post.deleted_by = None
-    post.deleted_at = None
+    post.deleted_by = None 
+    post.deleted_at = None 
     post.save()
-    for tag in list(post.tags.all()):
-        if tag.used_count == 1 and tag.deleted:
-            tag.deleted = False
-            tag.deleted_by = None
-            tag.deleted_at = None
-            tag.save()
+    logging.debug('now restoring something')
+    if isinstance(post,Answer):
+        logging.debug('updated answer count on undelete, have %d' % post.question.answer_count)
+        Question.objects.update_answer_count(post.question)
+    elif isinstance(post,Question):
+        for tag in list(post.tags.all()):
+            if tag.used_count == 1 and tag.deleted:
+                tag.deleted = False
+                tag.deleted_by = None
+                tag.deleted_at = None 
+                tag.save()
 
 def onDeleted(post, user):
     post.deleted = True
@@ -438,9 +468,31 @@ def onDeleted(post, user):
     post.deleted_at = datetime.datetime.now()
     post.save()
 
-    for tag in list(post.tags.all()):
-        if tag.used_count == 1:
-            tag.deleted = True
-            tag.deleted_by = user
-            tag.deleted_at = datetime.datetime.now()
+    if isinstance(post, Question):
+        for tag in list(post.tags.all()):
+            if tag.used_count == 1:
+                tag.deleted = True
+                tag.deleted_by = user
+                tag.deleted_at = datetime.datetime.now()
+            else:
+                tag.used_count = tag.used_count - 1 
             tag.save()
+
+        answers = post.answers.all()
+        if user == post.author:
+            if len(answers) > 0:
+                msg = _('Your question and all of it\'s answers have been deleted')
+            else:
+                msg = _('Your question has been deleted')
+        else:
+            if len(answers) > 0:
+                msg = _('The question and all of it\'s answers have been deleted')
+            else:
+                msg = _('The question has been deleted')
+        user.message_set.create(message=msg)
+        logging.debug('posted a message %s' % msg)
+        for answer in answers:
+            onDeleted(answer, user)
+    elif isinstance(post, Answer):
+        Question.objects.update_answer_count(post.question)
+        logging.debug('updated answer count to %d' % post.question.answer_count)
diff --git a/forum/const.py b/forum/const.py
index f6649cc4..9b9230c0 100644
--- a/forum/const.py
+++ b/forum/const.py
@@ -6,7 +6,7 @@ For reasons that models, views can't have unicode text in this project, all unic
 """
 CLOSE_REASONS = (
     (1, _('duplicate question')),
-    (2, _('question if off-topic or not relevant')),
+    (2, _('question is off-topic or not relevant')),
     (3, _('too subjective and argumentative')),
     (4, _('is not an answer to the question')),
     (5, _('the question is answered, right answer was accepted')),
diff --git a/forum/forms.py b/forum/forms.py
index 59d0d620..5b181d48 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -4,6 +4,8 @@ from django import forms
 from models import *
 from const import *
 from django.utils.translation import ugettext as _
+from django_authopenid.forms import NextUrlField
+import settings
 
 class TitleField(forms.CharField):
     def __init__(self, *args, **kwargs):
@@ -47,26 +49,28 @@ class TagNamesField(forms.CharField):
         self.help_text = _('Tags are short keywords, with no spaces within. Up to five tags can be used.')
         self.initial = ''
 
-	def clean(self, value):
-		value = super(TagNamesField, self).clean(value)
-		data = value.strip()
-		if len(data) < 1:
-			raise forms.ValidationError(_('tags are required'))
-		list = data.split(' ')
-		list_temp = []
-		if len(list) > 5:
-			raise forms.ValidationError(_('please use 5 tags or less'))
-		for tag in list:
-			if len(tag) > 20:
-				raise forms.ValidationError(_('tags must be shorter than 20 characters'))
-			#take tag regex from settings
-			tagname_re = re.compile(r'[a-z0-9]+')
-			if not tagname_re.match(tag):
-				raise forms.ValidationError(_('please use following characters in tags: letters \'a-z\', numbers, and characters \'.-_#\''))
-			# only keep one same tag
-			if tag not in list_temp and len(tag.strip()) > 0:
-				list_temp.append(tag)
-		return u' '.join(list_temp)
+    def clean(self, value):
+        value = super(TagNamesField, self).clean(value)
+        data = value.strip()
+        if len(data) < 1:
+            raise forms.ValidationError(_('tags are required'))
+
+        split_re = re.compile(r'[ ,]+')
+        list = split_re.split(data)
+        list_temp = []
+        if len(list) > 5:
+            raise forms.ValidationError(_('please use 5 tags or less'))
+        for tag in list:
+            if len(tag) > 20:
+                raise forms.ValidationError(_('tags must be shorter than 20 characters'))
+            #take tag regex from settings
+            tagname_re = re.compile(r'[a-z0-9]+')
+            if not tagname_re.match(tag):
+                raise forms.ValidationError(_('please use following characters in tags: letters \'a-z\', numbers, and characters \'.-_#\''))
+            # only keep one same tag
+            if tag not in list_temp and len(tag.strip()) > 0:
+                list_temp.append(tag)
+        return u' '.join(list_temp)
 
 class WikiField(forms.BooleanField):
     def __init__(self, *args, **kwargs):
@@ -74,11 +78,14 @@ class WikiField(forms.BooleanField):
         self.required = False
         self.label  = _('community wiki')
         self.help_text = _('if you choose community wiki option, the question and answer do not generate points and name of author will not be shown')
+    def clean(self,value):
+        return value and settings.WIKI_ON
 
 class EmailNotifyField(forms.BooleanField):
     def __init__(self, *args, **kwargs):
         super(EmailNotifyField, self).__init__(*args, **kwargs)
         self.required = False
+        self.widget.attrs['class'] = 'nomargin'
 
 class SummaryField(forms.CharField):
     def __init__(self, *args, **kwargs):
@@ -89,6 +96,25 @@ class SummaryField(forms.CharField):
         self.label  = _('update summary:')
         self.help_text = _('enter a brief summary of your revision (e.g. fixed spelling, grammar, improved style, this field is optional)')
 
+class ModerateUserForm(forms.ModelForm):
+    is_approved = forms.BooleanField(label=_("Automatically accept user's contributions for the email updates"),
+                                     required=False)
+
+    def clean_is_approved(self):
+        if 'is_approved' not in self.cleaned_data:
+            self.cleaned_data['is_approved'] = False
+        return self.cleaned_data['is_approved']
+
+    class Meta:
+        model = User
+        fields = ('is_approved',)
+
+class FeedbackForm(forms.Form):
+    name = forms.CharField(label=_('Your name:'), required=False)
+    email = forms.EmailField(label=_('Email (not shared with anyone):'), required=False)
+    message = forms.CharField(label=_('Your message:'), max_length=800,widget=forms.Textarea(attrs={'cols':60}))
+    next = NextUrlField()
+
 class AskForm(forms.Form):
     title  = TitleField()
     text   = EditorField()
@@ -109,16 +135,12 @@ class AnswerForm(forms.Form):
     def __init__(self, question, user, *args, **kwargs):
         super(AnswerForm, self).__init__(*args, **kwargs)
         self.fields['email_notify'].widget.attrs['id'] = 'question-subscribe-updates';
-        if question.wiki:
+        if question.wiki and settings.WIKI_ON:
             self.fields['wiki'].initial = True
         if user.is_authenticated():
-            try:
-                feed = EmailFeed.objects.get(feed_id=question.id, subscriber_id=user.id)
-                if feed.subscriber == user and feed.content == question:
-                    self.fields['email_notify'].initial = True
-                    return
-            except EmailFeed.DoesNotExist:
-                pass
+            if user in question.followed_by.all():
+                self.fields['email_notify'].initial = True
+                return
         self.fields['email_notify'].initial = False
 
 
@@ -207,3 +229,70 @@ class EditUserForm(forms.Form):
                         raise forms.ValidationError(_('this email has already been registered, please use another one'))
                     raise forms.ValidationError(_('this email has already been registered, please use another one'))
         return self.cleaned_data['email']
+
+class EditUserEmailFeedsForm(forms.Form):
+    WN = (('w',_('weekly')),('n',_('no email')))
+    DWN = (('d',_('daily')),('w',_('weekly')),('n',_('no email')))
+    FORM_TO_MODEL_MAP = {
+                'all_questions':'q_all',
+                'asked_by_me':'q_ask',
+                'answered_by_me':'q_ans',
+                'individually_selected':'q_sel',
+                }
+    NO_EMAIL_INITIAL = {
+                'all_questions':'n',
+                'asked_by_me':'n',
+                'answered_by_me':'n',
+                'individually_selected':'n',
+                }
+    all_questions = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Entire forum'),)
+    asked_by_me = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Asked by me'))
+    answered_by_me = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Answered by me'))
+    individually_selected = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Individually selected'))
+
+    def set_initial_values(self,user=None):
+        KEY_MAP = dict([(v,k) for k,v in self.FORM_TO_MODEL_MAP.iteritems()])
+        if user != None:
+            settings = EmailFeedSetting.objects.filter(subscriber=user) 
+            initial_values = {}
+            for setting in settings:
+                feed_type = setting.feed_type
+                form_field = KEY_MAP[feed_type]
+                frequency = setting.frequency
+                initial_values[form_field] = frequency
+            self.initial = initial_values
+        return self
+
+    def reset(self):
+        self.cleaned_data['all_questions'] = 'n'
+        self.cleaned_data['asked_by_me'] = 'n'
+        self.cleaned_data['answered_by_me'] = 'n'
+        self.cleaned_data['individually_selected'] = 'n'
+        self.initial = self.NO_EMAIL_INITIAL
+        return self
+
+    def save(self,user):
+        changed = False
+        for form_field, feed_type in self.FORM_TO_MODEL_MAP.items():
+            s, created = EmailFeedSetting.objects.get_or_create(subscriber=user,\
+                                                    feed_type=feed_type)
+            new_value = self.cleaned_data[form_field]
+            if s.frequency != new_value:
+                s.frequency = self.cleaned_data[form_field]
+                s.save()
+                changed = True
+            else:
+                if created:
+                    s.save()
+            if form_field == 'individually_selected':
+                feed_type = ContentType.objects.get_for_model(Question)
+                user.followed_questions.clear()
+        return changed
diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index 3c37aaa3..a25e4343 100644
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -1,9 +1,11 @@
 from django.core.management.base import NoArgsCommand
 from django.db import connection
+from django.db.models import Q, F
 from forum.models import *
-import collections
 from django.core.mail import EmailMessage
 from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext
+import datetime
 import settings
 
 class Command(NoArgsCommand):
@@ -15,27 +17,116 @@ class Command(NoArgsCommand):
         finally:
             connection.close()
 
+    def get_updated_questions_for_user(self,user):
+        q_sel = []
+        q_ask = []
+        q_ans = []
+        q_all = []
+        now = datetime.datetime.now()
+        Q_set1 = Question.objects.exclude(
+                                        last_activity_by=user,
+                                  ).exclude(
+                                        last_activity_at__lt=user.date_joined
+                                  ).filter(
+                                        Q(viewed__who=user,viewed__when__lt=F('last_activity_at')) | \
+                                        ~Q(viewed__who=user)
+                                  ).exclude(
+                                        deleted=True
+                                  ).exclude(
+                                        closed=True
+                                  )
+        user_feeds = EmailFeedSetting.objects.filter(subscriber=user).exclude(frequency='n')
+        for feed in user_feeds:
+            cutoff_time = now - EmailFeedSetting.DELTA_TABLE[feed.frequency]
+            if feed.reported_at == None or feed.reported_at <= cutoff_time:
+                Q_set = Q_set1.exclude(last_activity_at__gt=cutoff_time)
+                feed.reported_at = now
+                feed.save()#may not actually report anything, depending on filters below
+                if feed.feed_type == 'q_sel':
+                    q_sel = Q_set.filter(followed_by=user)
+                    q_sel.cutoff_time = cutoff_time
+                elif feed.feed_type == 'q_ask':
+                    q_ask = Q_set.filter(author=user)
+                    q_ask.cutoff_time = cutoff_time
+                elif feed.feed_type == 'q_ans':
+                    q_ans = Q_set.filter(answers__author=user)
+                    q_ans.cutoff_time = cutoff_time
+                elif feed.feed_type == 'q_all':
+                    q_all = Q_set
+                    q_all.cutoff_time = cutoff_time
+        #build list in this order
+        q_tbl = {} 
+        def extend_question_list(src, dst):
+            if isinstance(src,list):
+                return
+            cutoff_time = src.cutoff_time
+            for q in src:
+                if q in dst:
+                    if cutoff_time < dst[q]:
+                        dst[q] = cutoff_time
+                else:
+                    dst[q] = cutoff_time
+
+        extend_question_list(q_sel, q_tbl)
+        extend_question_list(q_ask, q_tbl)
+        extend_question_list(q_ans, q_tbl)
+        extend_question_list(q_all, q_tbl)
+
+        ctype = ContentType.objects.get_for_model(Question)
+        out = {}
+        for q, cutoff_time in q_tbl.items():
+            #todo use Activity, but first start keeping more Activity records
+            #act = Activity.objects.filter(content_type=ctype, object_id=q.id)
+            #get info on question edits, answer edits, comments
+            out[q] = {}
+            q_rev = QuestionRevision.objects.filter(question=q,revised_at__lt=cutoff_time)
+            q_rev = q_rev.exclude(author=user)
+            out[q]['q_rev'] = len(q_rev)
+            if len(q_rev) > 0 and q.added_at == q_rev[0].revised_at:
+                out[q]['q_rev'] = 0
+                out[q]['new_q'] = True
+            else:
+                out[q]['new_q'] = False
+                
+            new_ans = Answer.objects.filter(question=q,added_at__lt=cutoff_time)
+            new_ans = new_ans.exclude(author=user)
+            out[q]['new_ans'] = len(new_ans)
+            ans_rev = AnswerRevision.objects.filter(answer__question=q,revised_at__lt=cutoff_time)
+            ans_rev = ans_rev.exclude(author=user)
+            out[q]['ans_rev'] = len(ans_rev)
+        return out 
+
+    def __act_count(self,string,number,output):
+        if number > 0:
+            output.append(_(string) % {'num':number})
+
     def send_email_alerts(self):
-        report_time = datetime.datetime.now()
-        feeds = EmailFeed.objects.all()
-        user_ctype = ContentType.objects.get_for_model(User)
-
-        #lists of update messages keyed by email address
-        update_collection = collections.defaultdict(list) 
-        for feed in feeds:
-            update_summary = feed.get_update_summary()
-            if update_summary != None:
-                email = feed.get_email()
-                update_collection[email].append(update_summary)
-                feed.reported_at = report_time
-                feed.save()
-
-        for email, updates in update_collection.items():
-            text = '\n'.join(updates)
-            subject = _('updates from website')
-            print 'sent %s to %s' % (updates,email)
-            msg = EmailMessage(subject, text, settings.DEFAULT_FROM_EMAIL, [email])
-            msg.content_subtype = 'html'
-            msg.send()
-
-            
+
+        for user in User.objects.all():
+            q_list = self.get_updated_questions_for_user(user)
+            num_q = len(q_list)
+            if num_q > 0:
+                url_prefix = settings.APP_URL
+                subject = _('email update message subject')
+                text = ungettext('%(name)s, this is an update message header for a question', 
+                            '%(name)s, this is an update message header for %(num)d questions',num_q) \
+                                % {'num':num_q, 'name':user.username}
+
+                text += '<ul>'
+                for q, act in q_list.items():
+                    act_list = []
+                    if act['new_q']:
+                        act_list.append(_('new question'))
+                    self.__act_count('%(num)d rev', act['q_rev'],act_list)
+                    self.__act_count('%(num)d ans', act['new_ans'],act_list)
+                    self.__act_count('%(num)d ans rev',act['ans_rev'],act_list)
+                    act_token = ', '.join(act_list)
+                    text += '<li><a href="%s?sort=latest">%s</a> <font color="#777777">(%s)</font></li>' \
+                                % (url_prefix + q.get_absolute_url(), q.title, act_token)
+                text += '</ul>'
+                link = url_prefix + user.get_profile_url() + '?sort=email_subscriptions'
+                text += _('go to %(link)s to change frequency of email updates or %(email)s administrator') \
+                                % {'link':link, 'email':settings.ADMINS[0][1]}
+                msg = EmailMessage(subject, text, settings.DEFAULT_FROM_EMAIL, [user.email])
+                msg.content_subtype = 'html'
+                msg.send()
diff --git a/forum/management/commands/subscribe_everyone.py b/forum/management/commands/subscribe_everyone.py
new file mode 100644
index 00000000..3f8da9ec
--- /dev/null
+++ b/forum/management/commands/subscribe_everyone.py
@@ -0,0 +1,31 @@
+from django.core.management.base import NoArgsCommand
+from django.db import connection
+from django.db.models import Q, F
+from forum.models import *
+from django.core.mail import EmailMessage
+from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext
+import datetime
+import settings
+
+class Command(NoArgsCommand):
+    def handle_noargs(self,**options):
+        try:
+            self.subscribe_everyone()
+        except Exception, e:
+            print e
+        finally:
+            connection.close()
+
+    def subscribe_everyone(self):
+
+        feed_type_info = EmailFeedSetting.FEED_TYPES
+        for user in User.objects.all():
+            for feed_type in feed_type_info:
+                try:
+                    feed_setting = EmailFeedSetting.objects.get(subscriber=user,feed_type = feed_type[0])
+                except EmailFeedSetting.DoesNotExist:
+                    feed_setting = EmailFeedSetting(subscriber=user,feed_type=feed_type[0])
+                feed_setting.frequency = 'w'
+                feed_setting.reported_at = None
+                feed_setting.save()
diff --git a/forum/managers.py b/forum/managers.py
index 6ae0ed99..795d382e 100644
--- a/forum/managers.py
+++ b/forum/managers.py
@@ -70,7 +70,7 @@ class QuestionManager(models.Manager):
         # although we have imported all classes from models on top.
         from forum.models import Answer
         self.filter(id=question.id).update(
-            answer_count=Answer.objects.get_answers_from_question(question).count())
+            answer_count=Answer.objects.get_answers_from_question(question).filter(deleted=False).count())
     
     def update_view_count(self, question):
         """
@@ -93,11 +93,11 @@ class QuestionManager(models.Manager):
         """
         #print datetime.datetime.now()
         from forum.models import Question
-        questions = list(Question.objects.filter(tagnames = question.tagnames).all())
+        questions = list(Question.objects.filter(tagnames = question.tagnames, deleted=False).all())
 
         tags_list = question.tags.all()
         for tag in tags_list:
-            extend_questions = Question.objects.filter(tags__id = tag.id)[:50]
+            extend_questions = Question.objects.filter(tags__id = tag.id, deleted=False)[:50]
             for item in extend_questions:
                 if item not in questions and len(questions) < 10:
                     questions.append(item)
@@ -110,10 +110,11 @@ class TagManager(models.Manager):
         'UPDATE tag '
         'SET used_count = ('
             'SELECT COUNT(*) FROM question_tags '
-            'WHERE tag_id = tag.id'
+            'INNER JOIN question ON question_id=question.id '
+            'WHERE tag_id = tag.id AND question.deleted=0'
         ') '
         'WHERE id IN (%s)')
-    
+
     def get_valid_tags(self, page_size):
       from forum.models import Tag
       tags = Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-id")[:page_size]
diff --git a/forum/models.py b/forum/models.py
index f647ba12..39058bea 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -2,7 +2,7 @@
 import datetime
 import hashlib
 from urllib import quote_plus, urlencode
-from django.db import models
+from django.db import models, IntegrityError
 from django.utils.html import strip_tags
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
@@ -11,33 +11,61 @@ from django.contrib.contenttypes.models import ContentType
 from django.template.defaultfilters import slugify
 from django.db.models.signals import post_delete, post_save, pre_save
 from django.utils.translation import ugettext as _
+from django.utils.safestring import mark_safe
 import django.dispatch
 import settings
 
 from forum.managers import *
 from const import *
 
-class EmailFeed(models.Model):
-    #subscription key for unsubscribe by visiting emailed link
-    key = models.CharField(max_length=32)
-    #generic relation with feed content (i.e. question or tags)
-    feed_content_type = models.ForeignKey(ContentType,related_name='content_emailfeed')
-    feed_id = models.PositiveIntegerField()
-    content = generic.GenericForeignKey('feed_content_type','feed_id')
-    #generic relation with owner - either nameless email or User
-    subscriber_content_type = models.ForeignKey(ContentType,related_name='subscriber_emailfeed')
-    subscriber_id = models.PositiveIntegerField()
-    subscriber = generic.GenericForeignKey('subscriber_content_type','subscriber_id')
-    added_at = models.DateTimeField(default=datetime.datetime.now)
-    reported_at = models.DateTimeField(default=datetime.datetime.now)
-
-    #getter functions rely on implementations of similar functions in content
-    #of subscriber objects
-    def get_update_summary(self):
-        return self.content.get_update_summary(last_reported_at = self.reported_at,recipient_email = self.get_email())
-
-    def get_email(self):
-        return self.subscriber.email
+def get_object_comments(self):
+    comments = self.comments.all().order_by('id')
+    return comments
+
+def post_get_last_update_info(self):
+        when = self.added_at
+        who = self.author
+        if self.last_edited_at and self.last_edited_at > when:
+            when = self.last_edited_at
+            who = self.last_edited_by
+        comments = self.comments.all()
+        if len(comments) > 0:
+            for c in comments:
+                if c.added_at > when:
+                    when = c.added_at
+                    who = c.user
+        return when, who
+
+class EmailFeedSetting(models.Model):
+    DELTA_TABLE = {
+        'w':datetime.timedelta(7),
+        'd':datetime.timedelta(1),
+        'n':datetime.timedelta(-1),
+    }
+    FEED_TYPES = (
+                    ('q_all',_('Entire forum')),
+                    ('q_ask',_('Questions that I asked')),
+                    ('q_ans',_('Questions that I answered')),
+                    ('q_sel',_('Individually selected questions')),
+                    )
+    UPDATE_FREQUENCY = (
+                    ('w',_('Weekly')),
+                    ('d',_('Daily')),
+                    ('n',_('No email')),
+                   )
+    subscriber = models.ForeignKey(User)
+    feed_type = models.CharField(max_length=16,choices=FEED_TYPES)
+    frequency = models.CharField(max_length=8,choices=UPDATE_FREQUENCY,default='n')
+    added_at = models.DateTimeField(auto_now_add=True)
+    reported_at = models.DateTimeField(null=True)
+
+    def save(self,*args,**kwargs):
+        type = self.feed_type
+        subscriber = self.subscriber
+        similar = self.__class__.objects.filter(feed_type=type,subscriber=subscriber).exclude(pk=self.id)
+        if len(similar) > 0:
+            raise IntegrityError('email feed setting already exists')
+        super(EmailFeedSetting,self).save(*args,**kwargs)
 
 class Tag(models.Model):
     name       = models.CharField(max_length=255, unique=True)
@@ -45,7 +73,6 @@ class Tag(models.Model):
     deleted         = models.BooleanField(default=False)
     deleted_at      = models.DateTimeField(null=True, blank=True)
     deleted_by      = models.ForeignKey(User, null=True, blank=True, related_name='deleted_tags')
-    email_feeds     = generic.GenericRelation(EmailFeed)
     # Denormalised data
     used_count = models.PositiveIntegerField(default=0)
 
@@ -136,6 +163,7 @@ class Question(models.Model):
     locked          = models.BooleanField(default=False)
     locked_by       = models.ForeignKey(User, null=True, blank=True, related_name='locked_questions')
     locked_at       = models.DateTimeField(null=True, blank=True)
+    followed_by     = models.ManyToManyField(User, related_name='followed_questions')
     # Denormalised data
     score                = models.IntegerField(default=0)
     vote_up_count        = models.IntegerField(default=0)
@@ -155,7 +183,6 @@ class Question(models.Model):
     comments             = generic.GenericRelation(Comment)
     votes                = generic.GenericRelation(Vote)
     flagged_items        = generic.GenericRelation(FlaggedItem)
-    email_feeds          = generic.GenericRelation(EmailFeed)
 
     objects = QuestionManager()
 
@@ -212,6 +239,22 @@ class Question(models.Model):
     def get_latest_revision(self):
         return self.revisions.all()[0]
 
+    get_comments = get_object_comments
+
+    def get_last_update_info(self):
+
+        when, who = post_get_last_update_info(self)
+
+        answers = self.answers.all()
+        if len(answers) > 0:
+            for a in answers:
+                a_when, a_who = a.get_last_update_info()
+                if a_when > when:
+                    when = a_when
+                    who = a_who
+
+        return when, who
+
     def get_update_summary(self,last_reported_at=None,recipient_email=''):
         edited = False 
         if self.last_edited_at and self.last_edited_at > last_reported_at:
@@ -240,7 +283,7 @@ class Question(models.Model):
                     answer_comments.append(comment)
 
         #create the report
-        if edited or comments or new_answers or modified_answers or answer_comments:
+        if edited or new_answers or modified_answers or answer_comments:
             out = [] 
             if edited:
                 out.append(_('%(author)s modified the question') % {'author':self.last_edited_by.username})
@@ -274,6 +317,11 @@ class Question(models.Model):
     class Meta:
         db_table = u'question'
 
+class QuestionView(models.Model):
+    question = models.ForeignKey(Question, related_name='viewed')
+    who = models.ForeignKey(User, related_name='question_views')
+    when = models.DateTimeField()
+
 class FavoriteQuestion(models.Model):
     """A favorite Question of a User."""
     question      = models.ForeignKey(Question)
@@ -303,7 +351,8 @@ class QuestionRevision(models.Model):
         return self.question.title
 
     def get_absolute_url(self):
-        return '/%s%s/%s' % (_('questions/'),self.question.id,_('revisions'))
+        print 'in QuestionRevision.get_absolute_url()'
+        return reverse('question_revisions', args=[self.question.id])
 
     def save(self, **kwargs):
         """Looks up the next available revision number."""
@@ -383,6 +432,9 @@ class Answer(models.Model):
 
     objects = AnswerManager()
 
+    get_comments = get_object_comments
+    get_last_update_info = post_get_last_update_info
+
     def get_user_vote(self, user):
         votes = self.votes.filter(user=user)
         if votes.count() > 0:
@@ -397,7 +449,7 @@ class Answer(models.Model):
         return self.question.title
 
     def get_absolute_url(self):
-        return '%s%s#%s' % (reverse('question', args=[self.question.id]), self.question.title, self.id)
+        return '%s%s#%s' % (reverse('question', args=[self.question.id]), slugify(self.question.title), self.id)
 
     class Meta:
         db_table = u'answer'
@@ -415,7 +467,7 @@ class AnswerRevision(models.Model):
     text       = models.TextField()
 
     def get_absolute_url(self):
-        return '/%s%s/%s' % (_('answers/'),self.answer.id,_('revisions'))
+        return reverse('answer_revisions', kwargs={'id':self.answer.id})
 
     def get_question_title(self):
         return self.answer.question.title
@@ -538,7 +590,7 @@ class Book(models.Model):
     questions = models.ManyToManyField(Question, related_name='book', db_table='book_question')
     
     def get_absolute_url(self):
-        return '%s' % reverse('book', args=[self.short_name])
+        return reverse('book', args=[self.short_name])
         
     def __unicode__(self):
         return self.title
@@ -577,7 +629,6 @@ class AnonymousEmail(models.Model):
     key = models.CharField(max_length=32)
     email = models.EmailField(null=False,unique=True)
     isvalid = models.BooleanField(default=False)
-    feeds = generic.GenericRelation(EmailFeed)
 
 # User extend properties
 QUESTIONS_PER_PAGE_CHOICES = (
@@ -586,11 +637,30 @@ QUESTIONS_PER_PAGE_CHOICES = (
    (50, u'50'),
 )
 
+def user_is_username_taken(cls,username):
+    try:
+        cls.objects.get(username=username)
+        return True
+    except cls.MultipleObjectsReturned:
+        return True
+    except cls.DoesNotExist:
+        return False
+
+def user_get_q_sel_email_feed_frequency(self):
+    print 'looking for frequency for user %s' % self
+    try:
+        feed_setting = EmailFeedSetting.objects.get(subscriber=self,feed_type='q_sel')
+    except Exception, e:
+        print 'have error %s' % e.message
+        raise e
+    print 'have freq=%s' % feed_setting.frequency
+    return feed_setting.frequency
+
+User.add_to_class('is_approved', models.BooleanField(default=False))
 User.add_to_class('email_isvalid', models.BooleanField(default=False))
 User.add_to_class('email_key', models.CharField(max_length=32, null=True))
 User.add_to_class('reputation', models.PositiveIntegerField(default=1))
 User.add_to_class('gravatar', models.CharField(max_length=32))
-User.add_to_class('email_feeds', generic.GenericRelation(EmailFeed))
 User.add_to_class('favorite_questions',
                   models.ManyToManyField(Question, through=FavoriteQuestion,
                                          related_name='favorited_by'))
@@ -608,6 +678,8 @@ User.add_to_class('website', models.URLField(max_length=200, blank=True))
 User.add_to_class('location', models.CharField(max_length=100, blank=True))
 User.add_to_class('date_of_birth', models.DateField(null=True, blank=True))
 User.add_to_class('about', models.TextField(blank=True))
+User.add_to_class('is_username_taken',classmethod(user_is_username_taken))
+User.add_to_class('get_q_sel_email_feed_frequency',user_get_q_sel_email_feed_frequency)
 
 # custom signal
 tags_updated = django.dispatch.Signal(providing_args=["question"])
@@ -630,7 +702,14 @@ def delete_messages(self):
 def get_profile_url(self):
     """Returns the URL for this User's profile."""
     return '%s%s/' % (reverse('user', args=[self.id]), slugify(self.username))
+
+def get_profile_link(self):
+    profile_link = u'<a href="%s">%s</a>' % (self.get_profile_url(),self.username)
+    logging.debug('in get profile link %s' % profile_link)
+    return mark_safe(profile_link)
+
 User.add_to_class('get_profile_url', get_profile_url)
+User.add_to_class('get_profile_link', get_profile_link)
 User.add_to_class('get_messages', get_messages)
 User.add_to_class('delete_messages', delete_messages)
 
diff --git a/forum/templatetags/extra_filters.py b/forum/templatetags/extra_filters.py
index d8b8e61f..3644fdc3 100644
--- a/forum/templatetags/extra_filters.py
+++ b/forum/templatetags/extra_filters.py
@@ -1,5 +1,6 @@
 from django import template
 from forum import auth
+import logging
 
 register = template.Library()
 
@@ -8,6 +9,10 @@ register = template.Library()
 def collapse(input):
     return ' '.join(input.split())
 
+@register.filter
+def can_moderate_users(user):
+    return auth.can_moderate_users(user)
+
 @register.filter
 def can_vote_up(user):
     return auth.can_vote_up(user)
@@ -17,8 +22,8 @@ def can_flag_offensive(user):
     return auth.can_flag_offensive(user)
 
 @register.filter
-def can_add_comments(user):
-    return auth.can_add_comments(user)
+def can_add_comments(user,subject):
+    return auth.can_add_comments(user,subject)
 
 @register.filter
 def can_vote_down(user):
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index 06a2d27c..8bd0e128 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -1,4 +1,5 @@
 import time
+import os
 import datetime
 import math
 import re
@@ -6,13 +7,15 @@ import logging
 from django import template
 from django.utils.encoding import smart_unicode
 from django.utils.safestring import mark_safe
-from django.utils.timesince import timesince
 from forum.const import *
+from forum.models import Question, Answer, QuestionRevision, AnswerRevision
 from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext
+from django.conf import settings
 
 register = template.Library()
 
-GRAVATAR_TEMPLATE = ('<img width="%(size)s" height="%(size)s" '
+GRAVATAR_TEMPLATE = ('<img class="gravatar" width="%(size)s" height="%(size)s" '
                      'src="http://www.gravatar.com/avatar/%(gravatar_hash)s'
                      '?s=%(size)s&amp;d=identicon&amp;r=PG" '
                      'alt="%(username)s\'s gravatar image" />')
@@ -115,6 +118,23 @@ def cnprog_pagesize(context):
             "pagesize" : context["pagesize"],
             "is_paginated": context["is_paginated"]
         }
+
+@register.inclusion_tag("post_contributor_info.html")
+def post_contributor_info(post,contributor_type='original_author'):
+    """contributor_type: original_author|last_updater
+    """
+    if isinstance(post,Question):
+        post_type = 'question'
+    elif isinstance(post,Answer):
+        post_type = 'answer'
+    elif isinstance(post,AnswerRevision) or isinstance(post,QuestionRevision):
+        post_type = 'revision'
+    return {
+        'post':post,
+        'post_type':post_type,
+        'wiki_on':settings.WIKI_ON,
+        'contributor_type':contributor_type
+    }
         
 @register.simple_tag
 def get_score_badge(user):
@@ -216,20 +236,31 @@ def convert2tagname_list(question):
 
 @register.simple_tag
 def diff_date(date, limen=2):
-    current_time = datetime.datetime(*time.localtime()[0:6])
-    diff = current_time - date
-    diff_days = diff.days
-    if diff_days > limen:
-        return date
+    now = datetime.datetime.now()#datetime(*time.localtime()[0:6])#???
+    diff = now - date
+    days = diff.days
+    hours = int(diff.seconds/3600)
+    minutes = int(diff.seconds/60)
+
+    if days > 2:
+        if date.year == now.year:
+            return date.strftime(_("%b %d at %H:%M"))
+        else:
+            return date.strftime(_("%b %d '%y at %H:%M"))
+    elif days == 2:
+        return _('2 days ago')
+    elif days == 1:
+        return _('yesterday')
+    elif minutes > 60:
+        return ungettext('%(hr)d hour ago','%(hr)d hours ago',hours) % {'hr':hours}
     else:
-        return timesince(date) + _(' ago')
-        
+        return ungettext('%(min)d min ago','%(min)d mins ago',minutes) % {'min':minutes}
+
 @register.simple_tag
 def get_latest_changed_timestamp():
     try:
         from time import localtime, strftime
         from os import path
-        from django.conf import settings
         root = settings.SITE_SRC_ROOT
         dir = (
             root,
@@ -242,3 +273,78 @@ def get_latest_changed_timestamp():
     except:
         timestr = ''
     return timestr
+
+@register.simple_tag
+def href(url):
+    url = '///' + settings.FORUM_SCRIPT_ALIAS + '/' + url
+    return os.path.normpath(url) + '?v=%d' % settings.RESOURCE_REVISION
+
+class ItemSeparatorNode(template.Node):
+    def __init__(self,separator):
+        sep = separator.strip()
+        if sep[0] == sep[-1] and sep[0] in ('\'','"'):
+            sep = sep[1:-1]
+        else:
+            raise template.TemplateSyntaxError('separator in joinitems tag must be quoted')
+        self.content = sep
+    def render(self,context):
+        return self.content
+
+class JoinItemListNode(template.Node):
+    def __init__(self,separator=ItemSeparatorNode("''"), items=()):
+        self.separator = separator
+        self.items = items
+    def render(self,context):
+        out = []
+        empty_re = re.compile(r'^\s*$')
+        for item in self.items:
+            bit = item.render(context)
+            if not empty_re.search(bit):
+                out.append(bit)
+        return self.separator.render(context).join(out)
+
+@register.tag(name="joinitems")
+def joinitems(parser,token):
+    try:
+        tagname,junk,sep_token = token.split_contents()
+    except ValueError:
+        raise template.TemplateSyntaxError("joinitems tag requires 'using \"separator html\"' parameters")
+    if junk == 'using':
+        sep_node = ItemSeparatorNode(sep_token)
+    else:
+        raise template.TemplateSyntaxError("joinitems tag requires 'using \"separator html\"' parameters")
+    nodelist = []
+    while True:
+        nodelist.append(parser.parse(('separator','endjoinitems')))
+        next = parser.next_token()
+        if next.contents == 'endjoinitems':
+            break
+
+    return JoinItemListNode(separator=sep_node,items=nodelist)
+
+class BlockResourceNode(template.Node):
+    def __init__(self,nodelist):
+        self.items = nodelist 
+    def render(self,context):
+        out = '///' + settings.FORUM_SCRIPT_ALIAS
+        if self.items:
+            out += '/'     
+        for item in self.items:
+            bit = item.render(context)
+            out += bit
+        out = out.replace(' ','')
+        return os.path.normpath(out) + '?v=%d' % settings.RESOURCE_REVISION
+
+@register.tag(name='blockresource')
+def blockresource(parser,token):
+    try:
+        tagname = token.split_contents()
+    except ValueError:
+        raise template.TemplateSyntaxError("blockresource tag does not use arguments")
+    nodelist = []
+    while True:
+        nodelist.append(parser.parse(('endblockresource')))
+        next = parser.next_token()
+        if next.contents == 'endblockresource':
+            break
+    return BlockResourceNode(nodelist)
diff --git a/forum/templatetags/smart_if.py b/forum/templatetags/smart_if.py
new file mode 100644
index 00000000..a8fc1944
--- /dev/null
+++ b/forum/templatetags/smart_if.py
@@ -0,0 +1,401 @@
+"""
+A smarter {% if %} tag for django templates.
+
+While retaining current Django functionality, it also handles equality,
+greater than and less than operators. Some common case examples::
+
+    {% if articles|length >= 5 %}...{% endif %}
+    {% if "ifnotequal tag" != "beautiful" %}...{% endif %}
+"""
+import unittest
+from django import template
+
+
+register = template.Library()
+
+
+#==============================================================================
+# Calculation objects
+#==============================================================================
+
+class BaseCalc(object):
+    def __init__(self, var1, var2=None, negate=False):
+        self.var1 = var1
+        self.var2 = var2
+        self.negate = negate
+
+    def resolve(self, context):
+        try:
+            var1, var2 = self.resolve_vars(context)
+            outcome = self.calculate(var1, var2)
+        except:
+            outcome = False
+        if self.negate:
+            return not outcome
+        return outcome
+
+    def resolve_vars(self, context):
+        var2 = self.var2 and self.var2.resolve(context)
+        return self.var1.resolve(context), var2
+
+    def calculate(self, var1, var2):
+        raise NotImplementedError()
+
+
+class Or(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 or var2
+
+
+class And(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 and var2
+
+
+class Equals(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 == var2
+
+
+class Greater(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 > var2
+
+
+class GreaterOrEqual(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 >= var2
+
+
+class In(BaseCalc):
+    def calculate(self, var1, var2):
+        return var1 in var2
+
+
+#==============================================================================
+# Tests
+#==============================================================================
+
+class TestVar(object):
+    """
+    A basic self-resolvable object similar to a Django template variable. Used
+    to assist with tests.
+    """
+    def __init__(self, value):
+        self.value = value
+
+    def resolve(self, context):
+        return self.value
+
+
+class SmartIfTests(unittest.TestCase):
+    def setUp(self):
+        self.true = TestVar(True)
+        self.false = TestVar(False)
+        self.high = TestVar(9000)
+        self.low = TestVar(1)
+
+    def assertCalc(self, calc, context=None):
+        """
+        Test a calculation is True, also checking the inverse "negate" case.
+        """
+        context = context or {}
+        self.assert_(calc.resolve(context))
+        calc.negate = not calc.negate
+        self.assertFalse(calc.resolve(context))
+
+    def assertCalcFalse(self, calc, context=None):
+        """
+        Test a calculation is False, also checking the inverse "negate" case.
+        """
+        context = context or {}
+        self.assertFalse(calc.resolve(context))
+        calc.negate = not calc.negate
+        self.assert_(calc.resolve(context))
+
+    def test_or(self):
+        self.assertCalc(Or(self.true))
+        self.assertCalcFalse(Or(self.false))
+        self.assertCalc(Or(self.true, self.true))
+        self.assertCalc(Or(self.true, self.false))
+        self.assertCalc(Or(self.false, self.true))
+        self.assertCalcFalse(Or(self.false, self.false))
+
+    def test_and(self):
+        self.assertCalc(And(self.true, self.true))
+        self.assertCalcFalse(And(self.true, self.false))
+        self.assertCalcFalse(And(self.false, self.true))
+        self.assertCalcFalse(And(self.false, self.false))
+
+    def test_equals(self):
+        self.assertCalc(Equals(self.low, self.low))
+        self.assertCalcFalse(Equals(self.low, self.high))
+
+    def test_greater(self):
+        self.assertCalc(Greater(self.high, self.low))
+        self.assertCalcFalse(Greater(self.low, self.low))
+        self.assertCalcFalse(Greater(self.low, self.high))
+
+    def test_greater_or_equal(self):
+        self.assertCalc(GreaterOrEqual(self.high, self.low))
+        self.assertCalc(GreaterOrEqual(self.low, self.low))
+        self.assertCalcFalse(GreaterOrEqual(self.low, self.high))
+
+    def test_in(self):
+        list_ = TestVar([1,2,3])
+        invalid_list = TestVar(None)
+        self.assertCalc(In(self.low, list_))
+        self.assertCalcFalse(In(self.low, invalid_list))
+
+    def test_parse_bits(self):
+        var = IfParser([True]).parse()
+        self.assert_(var.resolve({}))
+        var = IfParser([False]).parse()
+        self.assertFalse(var.resolve({}))
+
+        var = IfParser([False, 'or', True]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([False, 'and', True]).parse()
+        self.assertFalse(var.resolve({}))
+
+        var = IfParser(['not', False, 'and', 'not', False]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser(['not', 'not', True]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([1, '=', 1]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([1, 'not', '=', 1]).parse()
+        self.assertFalse(var.resolve({}))
+
+        var = IfParser([1, 'not', 'not', '=', 1]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([1, '!=', 1]).parse()
+        self.assertFalse(var.resolve({}))
+
+        var = IfParser([3, '>', 2]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([1, '<', 2]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([2, 'not', 'in', [2, 3]]).parse()
+        self.assertFalse(var.resolve({}))
+
+        var = IfParser([1, 'or', 1, '=', 2]).parse()
+        self.assert_(var.resolve({}))
+
+    def test_boolean(self):
+        var = IfParser([True, 'and', True, 'and', True]).parse()
+        self.assert_(var.resolve({}))
+        var = IfParser([False, 'or', False, 'or', True]).parse()
+        self.assert_(var.resolve({}))
+        var = IfParser([True, 'and', False, 'or', True]).parse()
+        self.assert_(var.resolve({}))
+        var = IfParser([False, 'or', True, 'and', True]).parse()
+        self.assert_(var.resolve({}))
+
+        var = IfParser([True, 'and', True, 'and', False]).parse()
+        self.assertFalse(var.resolve({}))
+        var = IfParser([False, 'or', False, 'or', False]).parse()
+        self.assertFalse(var.resolve({}))
+        var = IfParser([False, 'or', True, 'and', False]).parse()
+        self.assertFalse(var.resolve({}))
+        var = IfParser([False, 'and', True, 'or', False]).parse()
+        self.assertFalse(var.resolve({}))
+
+    def test_invalid(self):
+        self.assertRaises(ValueError, IfParser(['not']).parse)
+        self.assertRaises(ValueError, IfParser(['==']).parse)
+        self.assertRaises(ValueError, IfParser([1, 'in']).parse)
+        self.assertRaises(ValueError, IfParser([1, '>', 'in']).parse)
+        self.assertRaises(ValueError, IfParser([1, '==', 'not', 'not']).parse)
+        self.assertRaises(ValueError, IfParser([1, 2]).parse)
+
+
+OPERATORS = {
+    '=': (Equals, True),
+    '==': (Equals, True),
+    '!=': (Equals, False),
+    '>': (Greater, True),
+    '>=': (GreaterOrEqual, True),
+    '<=': (Greater, False),
+    '<': (GreaterOrEqual, False),
+    'or': (Or, True),
+    'and': (And, True),
+    'in': (In, True),
+}
+BOOL_OPERATORS = ('or', 'and')
+
+
+class IfParser(object):
+    error_class = ValueError
+
+    def __init__(self, tokens):
+        self.tokens = tokens
+
+    def _get_tokens(self):
+        return self._tokens
+
+    def _set_tokens(self, tokens):
+        self._tokens = tokens
+        self.len = len(tokens)
+        self.pos = 0
+
+    tokens = property(_get_tokens, _set_tokens)
+
+    def parse(self):
+        if self.at_end():
+            raise self.error_class('No variables provided.')
+        var1 = self.get_bool_var()
+        while not self.at_end():
+            op, negate = self.get_operator()
+            var2 = self.get_bool_var()
+            var1 = op(var1, var2, negate=negate)
+        return var1
+
+    def get_token(self, eof_message=None, lookahead=False):
+        negate = True
+        token = None
+        pos = self.pos
+        while token is None or token == 'not':
+            if pos >= self.len:
+                if eof_message is None:
+                    raise self.error_class()
+                raise self.error_class(eof_message)
+            token = self.tokens[pos]
+            negate = not negate
+            pos += 1
+        if not lookahead:
+            self.pos = pos
+        return token, negate
+
+    def at_end(self):
+        return self.pos >= self.len
+
+    def create_var(self, value):
+        return TestVar(value)
+
+    def get_bool_var(self):
+        """
+        Returns either a variable by itself or a non-boolean operation (such as
+        ``x == 0`` or ``x < 0``).
+
+        This is needed to keep correct precedence for boolean operations (i.e.
+        ``x or x == 0`` should be ``x or (x == 0)``, not ``(x or x) == 0``).
+        """
+        var = self.get_var()
+        if not self.at_end():
+            op_token = self.get_token(lookahead=True)[0]
+            if isinstance(op_token, basestring) and (op_token not in
+                                                     BOOL_OPERATORS):
+                op, negate = self.get_operator()
+                return op(var, self.get_var(), negate=negate)
+        return var
+
+    def get_var(self):
+        token, negate = self.get_token('Reached end of statement, still '
+                                       'expecting a variable.')
+        if isinstance(token, basestring) and token in OPERATORS:
+            raise self.error_class('Expected variable, got operator (%s).' %
+                                   token)
+        var = self.create_var(token)
+        if negate:
+            return Or(var, negate=True)
+        return var
+
+    def get_operator(self):
+        token, negate = self.get_token('Reached end of statement, still '
+                                       'expecting an operator.')
+        if not isinstance(token, basestring) or token not in OPERATORS:
+            raise self.error_class('%s is not a valid operator.' % token)
+        if self.at_end():
+            raise self.error_class('No variable provided after "%s".' % token)
+        op, true = OPERATORS[token]
+        if not true:
+            negate = not negate
+        return op, negate
+
+
+#==============================================================================
+# Actual templatetag code.
+#==============================================================================
+
+class TemplateIfParser(IfParser):
+    error_class = template.TemplateSyntaxError
+
+    def __init__(self, parser, *args, **kwargs):
+        self.template_parser = parser
+        return super(TemplateIfParser, self).__init__(*args, **kwargs)
+
+    def create_var(self, value):
+        return self.template_parser.compile_filter(value)
+
+
+class SmartIfNode(template.Node):
+    def __init__(self, var, nodelist_true, nodelist_false=None):
+        self.nodelist_true, self.nodelist_false = nodelist_true, nodelist_false
+        self.var = var
+
+    def render(self, context):
+        if self.var.resolve(context):
+            return self.nodelist_true.render(context)
+        if self.nodelist_false:
+            return self.nodelist_false.render(context)
+        return ''
+
+    def __repr__(self):
+        return "<Smart If node>"
+
+    def __iter__(self):
+        for node in self.nodelist_true:
+            yield node
+        if self.nodelist_false:
+            for node in self.nodelist_false:
+                yield node
+
+    def get_nodes_by_type(self, nodetype):
+        nodes = []
+        if isinstance(self, nodetype):
+            nodes.append(self)
+        nodes.extend(self.nodelist_true.get_nodes_by_type(nodetype))
+        if self.nodelist_false:
+            nodes.extend(self.nodelist_false.get_nodes_by_type(nodetype))
+        return nodes
+
+
+@register.tag('if')
+def smart_if(parser, token):
+    """
+    A smarter {% if %} tag for django templates.
+
+    While retaining current Django functionality, it also handles equality,
+    greater than and less than operators. Some common case examples::
+
+        {% if articles|length >= 5 %}...{% endif %}
+        {% if "ifnotequal tag" != "beautiful" %}...{% endif %}
+
+    Arguments and operators _must_ have a space between them, so
+    ``{% if 1>2 %}`` is not a valid smart if tag.
+
+    All supported operators are: ``or``, ``and``, ``in``, ``=`` (or ``==``),
+    ``!=``, ``>``, ``>=``, ``<`` and ``<=``.
+    """
+    bits = token.split_contents()[1:]
+    var = TemplateIfParser(parser, bits).parse()
+    nodelist_true = parser.parse(('else', 'endif'))
+    token = parser.next_token()
+    if token.contents == 'else':
+        nodelist_false = parser.parse(('endif',))
+        parser.delete_first_token()
+    else:
+        nodelist_false = None
+    return SmartIfNode(var, nodelist_true, nodelist_false)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/forum/urls.py b/forum/urls.py
new file mode 100644
index 00000000..a08fe716
--- /dev/null
+++ b/forum/urls.py
@@ -0,0 +1,72 @@
+import os.path
+from django.conf.urls.defaults import *
+from django.contrib import admin
+from forum import views as app
+from forum.feed import RssLastestQuestionsFeed
+from django.utils.translation import ugettext as _
+
+admin.autodiscover()
+feeds = {
+    'rss': RssLastestQuestionsFeed
+}
+
+APP_PATH = os.path.dirname(os.path.dirname(__file__))
+urlpatterns = patterns('',
+    url(r'^$', app.index, name='index'),
+    (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.ico'}),
+    (r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.gif'}),
+    (r'^content/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': os.path.join(APP_PATH, 'templates/content').replace('\\','/')}
+    ),
+    (r'^%s(?P<path>.*)$' % _('upfiles/'), 'django.views.static.serve',
+        {'document_root': os.path.join(APP_PATH, 'templates/upfiles').replace('\\','/')}
+    ),
+    (r'^%s/$' % _('signin/'), 'django_authopenid.views.signin'),
+    url(r'^%s$' % _('about/'), app.about, name='about'),
+    url(r'^%s$' % _('faq/'), app.faq, name='faq'),
+    url(r'^%s$' % _('privacy/'), app.privacy, name='privacy'),
+    url(r'^%s$' % _('logout/'), app.logout, name='logout'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('comments/')), app.answer_comments, name='answer_comments'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('edit/')), app.edit_answer, name='edit_answer'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('revisions/')), app.answer_revisions, name='answer_revisions'),
+    url(r'^%s$' % _('questions/'), app.questions, name='questions'),
+    url(r'^%s%s$' % (_('questions/'), _('ask/')), app.ask, name='ask'),
+    url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.unanswered, name='unanswered'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('edit/')), app.edit_question, name='edit_question'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('close/')), app.close, name='close'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('reopen/')), app.reopen, name='reopen'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('answer/')), app.answer, name='answer'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('vote/')), app.vote, name='vote'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('revisions/')), app.question_revisions, name='question_revisions'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('comments/')), app.question_comments, name='question_comments'),
+
+    url(r'^%s(?P<object_id>\d+)/%s(?P<comment_id>\d+)/%s$' % (_('questions/'), _('comments/'),_('delete/')), \
+                                                app.delete_comment, kwargs={'commented_object_type':'question'},\
+                                                name='delete_question_comment'),
+
+    url(r'^%s(?P<object_id>\d+)/%s(?P<comment_id>\d+)/%s$' % (_('answers/'), _('comments/'),_('delete/')), \
+                                                app.delete_comment, kwargs={'commented_object_type':'answer'}, \
+                                                name='delete_answer_comment'), \
+    #place general question item in the end of other operations
+    url(r'^%s(?P<id>\d+)//*' % _('question/'), app.question, name='question'),
+    url(r'^%s$' % _('tags/'), app.tags, name='tags'),
+    url(r'^%s(?P<tag>[^/]+)/$' % _('tags/'), app.tag),
+    url(r'^%s$' % _('users/'),app.users, name='users'),
+    url(r'^%s(?P<id>\d+)/$' % _('moderate-user/'), app.moderate_user, name='moderate_user'),
+    url(r'^%s(?P<id>\d+)/%s$' % (_('users/'), _('edit/')), app.edit_user, name='edit_user'),
+    url(r'^%s(?P<id>\d+)//*' % _('users/'), app.user, name='user'),
+    url(r'^%s$' % _('badges/'),app.badges, name='badges'),
+    url(r'^%s(?P<id>\d+)//*' % _('badges/'), app.badge, name='badge'),
+    url(r'^%s%s$' % (_('messages/'), _('markread/')),app.read_message, name='read_message'),
+    # (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')),
+    (r'^%s(.*)' % _('nimda/'), admin.site.root),
+    url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
+    (r'^%s$' % _('upload/'), app.upload),
+    url(r'^%s$' % _('books/'), app.books, name='books'),
+    url(r'^%s%s(?P<short_name>[^/]+)/$' % (_('books/'), _('ask/')), app.ask_book, name='ask_book'),
+    url(r'^%s(?P<short_name>[^/]+)/$' % _('books/'), app.book, name='book'),
+    url(r'^%s$' % _('search/'), app.search, name='search'),
+    url(r'^%s$' % _('feedback/'), app.feedback, name='feedback'),
+    (r'^%s' % _('account/'), include('django_authopenid.urls')),
+    (r'^i18n/', include('django.conf.urls.i18n')),
+)
diff --git a/forum/user.py b/forum/user.py
index 41811db9..40bf6a89 100644
--- a/forum/user.py
+++ b/forum/user.py
@@ -64,11 +64,11 @@ USER_TEMPLATE_VIEWS = (
         data_size = 50
     ),
     UserView(
-        id = 'preferences',
-        tab_title = _('preferences'),
-        tab_description = _('user preference settings'),
-        page_title = _('profile - user preferences'),
-        view_name = 'user_preferences',
-        template_file = 'user_preferences.html'
+        id = 'email_subscriptions',
+        tab_title = _('email subscriptions'),
+        tab_description = _('email subscription settings'),
+        page_title = _('profile - email subscriptions'),
+        view_name = 'user_email_subscriptions',
+        template_file = 'user_email_subscriptions.html'
     )
 )
diff --git a/forum/views.py b/forum/views.py
index d663a4cb..e4ccaa16 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -7,16 +7,18 @@ from django.conf import settings
 from django.core.files.storage import default_storage
 from django.shortcuts import render_to_response, get_object_or_404
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseRedirect, HttpResponse,Http404
+from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden, Http404
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
-from django.template import RequestContext
+from django.template import RequestContext, loader
 from django.utils.html import *
 from django.utils import simplejson
 from django.core import serializers
+from django.core.mail import mail_admins
 from django.db import transaction
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext as _
 from django.template.defaultfilters import slugify
+from django.core.exceptions import PermissionDenied
 
 from utils.html import sanitize_html
 from markdown2 import Markdown
@@ -28,6 +30,7 @@ from forum.auth import *
 from forum.const import *
 from forum.user import *
 from forum import auth
+from django_authopenid.util import get_next_url
 
 # used in index page
 INDEX_PAGE_SIZE = 20
@@ -63,24 +66,28 @@ def _get_tags_cache_json():
     tags = simplejson.dumps(tags_list)
     return tags
 
+def _get_and_remember_questions_sort_method(request, view_dic, default):
+    if default not in view_dic:
+        raise Exception('default value must be in view_dic')
+
+    q_sort_method = request.REQUEST.get('sort', None)
+    if q_sort_method == None:
+        q_sort_method = request.session.get('questions_sort_method', default)
+
+    if q_sort_method not in view_dic:
+        q_sort_method = default
+    request.session['questions_sort_method'] = q_sort_method
+    return q_sort_method, view_dic[q_sort_method]
+
 def index(request):
-    view_id = request.GET.get('sort', None)
     view_dic = {
              "latest":"-last_activity_at",
              "hottest":"-answer_count",
              "mostvoted":"-score",
-             "trans": "-last_activity_at"
              }
-    try:
-        orderby = view_dic[view_id]
-    except KeyError:
-        view_id = "latest"
-        orderby = "-last_activity_at"
-    # group questions by author_id of 28,29
-    if view_id == 'trans':
-        questions = Question.objects.get_translation_questions(orderby, INDEX_PAGE_SIZE)
-    else:
-        questions = Question.objects.get_questions_by_pagesize(orderby, INDEX_PAGE_SIZE)
+    view_id, orderby = _get_and_remember_questions_sort_method(request, view_dic, 'latest')
+
+    questions = Question.objects.get_questions_by_pagesize(orderby, INDEX_PAGE_SIZE)
     # RISK - inner join queries
     questions = questions.select_related()
     tags = Tag.objects.get_valid_tags(INDEX_TAGS_SIZE)
@@ -98,7 +105,34 @@ def about(request):
     return render_to_response('about.html', context_instance=RequestContext(request))
 
 def faq(request):
-    return render_to_response('faq.html', context_instance=RequestContext(request))
+    data = {
+        'gravatar_faq_url': reverse('faq') + '#gravatar',
+        'send_email_key_url': reverse('send_email_key'),
+        'ask_question_url': reverse('ask'),
+    }
+    return render_to_response('faq.html', data, context_instance=RequestContext(request))
+
+def feedback(request):
+    data = {}
+    form = None
+    if request.method == "POST":
+        form = FeedbackForm(request.POST)
+        if form.is_valid():
+            if not request.user.is_authenticated:
+                data['email'] = form.cleaned_data.get('email',None)
+            data['message'] = form.cleaned_data['message']
+            data['name'] = form.cleaned_data.get('name',None)
+            message = render_to_response('feedback_email.txt',data,context_instance=RequestContext(request))
+            mail_admins(_('Q&A forum feedback'), message)
+            msg = _('Thanks for the feedback!')
+            request.user.message_set.create(message=msg)
+            return HttpResponseRedirect(get_next_url(request))
+    else:
+        form = FeedbackForm(initial={'next':get_next_url(request)})
+
+    data['form'] = form
+    return render_to_response('feedback.html', data, context_instance=RequestContext(request))
+feedback.CANCEL_MESSAGE=_('We look forward to hearing your feedback! Please, give it next time :)')
 
 def privacy(request):
     return render_to_response('privacy.html', context_instance=RequestContext(request))
@@ -122,13 +156,8 @@ def questions(request, tagname=None, unanswered=False):
     except ValueError:
         page = 1
 
-    view_id = request.GET.get('sort', None)
     view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
-    try:
-        orderby = view_dic[view_id]
-    except KeyError:
-        view_id = "latest"
-        orderby = "-added_at"
+    view_id, orderby = _get_and_remember_questions_sort_method(request,view_dic,'latest')
 
     # check if request is from tagged questions
     if tagname is not None:
@@ -208,16 +237,12 @@ def create_new_answer( question=None, author=None,\
 
     #set notification/delete
     if email_notify:
-        try:
-            EmailFeed.objects.get(feed_id = question.id, subscriber_id = author.id, feed_content_type=question_type)
-        except EmailFeed.DoesNotExist:
-            feed = EmailFeed(content = question, subscriber = author)
-            feed.save()
+        if author not in question.followed_by.all():
+            question.followed_by.add(author)
     else:
         #not sure if this is necessary. ajax should take care of this...
         try:
-            feed = Email.objects.get(feed_id = question.id, subscriber_id = author.id, feed_content_type=question_type)
-            feed.delete()
+            question.followed_by.remove(author)
         except:
             pass
 
@@ -267,7 +292,7 @@ def ask(request):
         if form.is_valid():
 
             added_at = datetime.datetime.now()
-            title = strip_tags(form.cleaned_data['title'])
+            title = strip_tags(form.cleaned_data['title'].strip())
             wiki = form.cleaned_data['wiki']
             tagnames = form.cleaned_data['tags'].strip()
             text = form.cleaned_data['text']
@@ -302,7 +327,7 @@ def ask(request):
 					ip_addr = request.META['REMOTE_ADDR'],
                 )
                 question.save()
-                return HttpResponseRedirect('/%s%s%s' % ( _('account/'),_('signin/'),_('newquestion/')))
+                return HttpResponseRedirect(reverse('user_signin_new_question'))
     else:
         form = AskForm()
 
@@ -310,6 +335,7 @@ def ask(request):
     return render_to_response('ask.html', {
         'form' : form,
         'tags' : tags,
+        'email_validation_faq_url':reverse('faq') + '#validate',
         }, context_instance=RequestContext(request))
 
 def question(request, id):
@@ -317,13 +343,26 @@ def question(request, id):
         page = int(request.GET.get('page', '1'))
     except ValueError:
         page = 1
-    view_id = request.GET.get('sort', 'votes')
+
+    view_id = request.GET.get('sort', None)
     view_dic = {"latest":"-added_at", "oldest":"added_at", "votes":"-score" }
     try:
         orderby = view_dic[view_id]
     except KeyError:
-        view_id = "votes"
-        orderby = "-score"
+        qsm = request.session.get('questions_sort_method',None)
+        if qsm in ('mostvoted','latest'):
+            logging.debug('loaded from session ' + qsm)
+            if qsm == 'mostvoted':
+                view_id = 'votes'
+                orderby = '-score'
+            else:
+                view_id = 'latest'
+                orderby = '-added_at'
+        else:
+            view_id = "votes"
+            orderby = "-score"
+
+    logging.debug('view_id=' + str(view_id))
 
     question = get_object_or_404(Question, id=id)
     if question.deleted and not can_view_deleted_post(request.user, question):
@@ -349,7 +388,6 @@ def question(request, id):
                 vote_value = 1
             user_answer_votes[answer.id] = vote_value
 
-
     if answers is not None:
         answers = answers.order_by("-accepted", orderby)
 
@@ -363,8 +401,38 @@ def question(request, id):
 
     objects_list = Paginator(filtered_answers, ANSWERS_PAGE_SIZE)
     page_objects = objects_list.page(page)
-    # update view count
-    Question.objects.update_view_count(question)
+
+    #todo: merge view counts per user and per session
+    #1) view count per session
+    update_view_count = False
+    if 'question_view_times' not in request.session:
+        request.session['question_view_times'] = {}
+
+    last_seen = request.session['question_view_times'].get(question.id,None)
+    updated_when, updated_who = question.get_last_update_info()
+
+    if updated_who != request.user:
+        if last_seen:
+            if last_seen < updated_when:
+                update_view_count = True 
+        else:
+            update_view_count = True
+
+    request.session['question_view_times'][question.id] = datetime.datetime.now()
+
+    if update_view_count:
+        question.view_count += 1
+        question.save()
+
+    #2) question view count per user
+    if request.user.is_authenticated():
+        try:
+            question_view = QuestionView.objects.get(who=request.user, question=question)
+        except QuestionView.DoesNotExist:
+            question_view = QuestionView(who=request.user, question=question)
+        question_view.when = datetime.datetime.now()
+        question_view.save()
+
     return render_to_response('question.html', {
         "question" : question,
         "question_vote" : question_vote,
@@ -623,6 +691,7 @@ QUESTION_REVISION_TEMPLATE = ('<h1>%(title)s</h1>\n'
 def question_revisions(request, id):
     post = get_object_or_404(Question, id=id)
     revisions = list(post.revisions.all())
+    revisions.reverse()
     for i, revision in enumerate(revisions):
         revision.html = QUESTION_REVISION_TEMPLATE % {
             'title': revision.title,
@@ -631,16 +700,15 @@ def question_revisions(request, id):
                               for tag in revision.tagnames.split(' ')]),
         }
         if i > 0:
-            revisions[i - 1].diff = htmldiff(revision.html,
-                                             revisions[i - 1].html)
+            revisions[i].diff = htmldiff(revisions[i-1].html, revision.html)
         else:
-            revisions[i - 1].diff = QUESTION_REVISION_TEMPLATE % {
+            revisions[i].diff = QUESTION_REVISION_TEMPLATE % {
                 'title': revisions[0].title,
                 'html': sanitize_html(markdowner.convert(revisions[0].text)),
                 'tags': ' '.join(['<a class="post-tag">%s</a>' % tag
                                   for tag in revisions[0].tagnames.split(' ')]),
             }
-            revisions[i - 1].summary = None
+            revisions[i].summary = _('initial version') 
     return render_to_response('revisions_question.html', {
         'post': post,
         'revisions': revisions,
@@ -650,16 +718,16 @@ ANSWER_REVISION_TEMPLATE = ('<div class="text">%(html)s</div>')
 def answer_revisions(request, id):
     post = get_object_or_404(Answer, id=id)
     revisions = list(post.revisions.all())
+    revisions.reverse()
     for i, revision in enumerate(revisions):
         revision.html = ANSWER_REVISION_TEMPLATE % {
             'html': sanitize_html(markdowner.convert(revision.text))
         }
         if i > 0:
-            revisions[i - 1].diff = htmldiff(revision.html,
-                                             revisions[i - 1].html)
+            revisions[i].diff = htmldiff(revisions[i-1].html, revision.html)
         else:
-            revisions[i - 1].diff = revisions[i-1].text
-            revisions[i - 1].summary = None
+            revisions[i].diff = revisions[i].text
+            revisions[i].summary = _('initial version')
     return render_to_response('revisions_answer.html', {
         'post': post,
         'revisions': revisions,
@@ -696,8 +764,7 @@ def answer(request, id):
                     ip_addr = request.META['REMOTE_ADDR'],
                     )
                 anon.save()
-                return HttpResponseRedirect('/%s%s%s' % ( _('account/'),
-                    _('signin/'),_('newquestion/')))
+                return HttpResponseRedirect(reverse('user_signin_new_answer'))
 
     return HttpResponseRedirect(question.get_absolute_url())
 
@@ -712,7 +779,7 @@ def tags(request):
 
     if request.method == "GET":
         stag = request.GET.get("q", "").strip()
-        if stag is not None:
+        if stag != '':
             objects_list = Paginator(Tag.objects.filter(deleted=False).exclude(used_count=0).extra(where=['name like %s'], params=['%' + stag + '%']), DEFAULT_PAGE_SIZE)
         else:
             if sortby == "name":
@@ -738,7 +805,7 @@ def tags(request):
             'has_next': tags.has_next(),
             'previous': tags.previous_page_number(),
             'next': tags.next_page_number(),
-            'base_url' : '/%s?sort=%s&' % (_('tags/'), sortby)
+            'base_url' : reverse('tags') + '?sort=%s&' % sortby
         }
 
         }, context_instance=RequestContext(request))
@@ -930,7 +997,8 @@ def vote(request, id):
 
                 if not can_delete_post(request.user, post):
                     response_data['allowed'] = -2
-                elif post.deleted:
+                elif post.deleted == True:
+                    logging.debug('debug restoring post in view')
                     onDeleteCanceled(post, request.user)
                     response_data['status'] = 1
                 else:
@@ -939,13 +1007,19 @@ def vote(request, id):
             elif vote_type == '11':#subscribe q updates
                 user = request.user
                 if user.is_authenticated():
-                    try:
-                        EmailFeed.objects.get(feed_id=question.id,subscriber_id=user.id,feed_content_type=question_type)
-                    except EmailFeed.DoesNotExist:
-                        feed = EmailFeed(subscriber=user,content=question)
-                        feed.save()
+                    if user not in question.followed_by.all():
+                        question.followed_by.add(user)
                         if settings.EMAIL_VALIDATION == 'on' and user.email_isvalid == False:
-                            response_data['message'] = _('subscription saved, %(email)s needs validation') % {'email':user.email}
+                            response_data['message'] = \
+                                    _('subscription saved, %(email)s needs validation, see %(details_url)s') \
+                                    % {'email':user.email,'details_url':reverse('faq') + '#validate'}
+                    feed_setting = EmailFeedSetting.objects.get(subscriber=user,feed_type='q_sel')
+                    if feed_setting.frequency == 'n':
+                        feed_setting.frequency = 'd'
+                        feed_setting.save()
+                        if 'message' in response_data:
+                            response_data['message'] += '<br/>'
+                        response_data['message'] = _('email update frequency has been set to daily')
                     #response_data['status'] = 1
                     #responst_data['allowed'] = 1
                 else:
@@ -955,12 +1029,8 @@ def vote(request, id):
             elif vote_type == '12':#unsubscribe q updates
                 user = request.user
                 if user.is_authenticated():
-                    try:
-                        feed = EmailFeed.objects.get(feed_id=question.id,subscriber_id=user.id)
-                        feed.delete()
-                    except EmailFeed.DoesNotExist:
-                        pass
-                    
+                    if user in question.followed_by.all():
+                        question.followed_by.remove(user)
         else:
             response_data['success'] = 0
             response_data['message'] = u'Request mode is not supported. Please try again.'
@@ -991,11 +1061,11 @@ def users(request):
         # default
         else:
             objects_list = Paginator(User.objects.all().order_by('-reputation'), USERS_PAGE_SIZE)
-        base_url = '/%s?sort=%s&' % (_('users/'), sortby)
+        base_url = reverse('users') + '?sort=%s&' % sortby
     else:
         sortby = "reputation"
         objects_list = Paginator(User.objects.extra(where=['username like %s'], params=['%' + suser + '%']).order_by('-reputation'), USERS_PAGE_SIZE)
-        base_url = '/%s?name=%s&sort=%s&' % (_('users/'), suser, sortby)
+        base_url = reverse('users') + '?name=%s&sort=%s&' % (suser, sortby)
 
     try:
         users = objects_list.page(page)
@@ -1027,6 +1097,26 @@ def user(request, id):
     func = getattr(views, user_view.view_name)
     return func(request, id, user_view)
 
+@login_required
+def moderate_user(request, id):
+    """ajax handler of user moderation
+    """
+    if not auth.can_moderate_users(request.user) or request.method != 'POST':
+        raise Http404
+    if not request.is_ajax():
+        return HttpResponseForbidden(mimetype="application/json")
+
+    user = get_object_or_404(User, id=id)
+    form = ModerateUserForm(request.POST, instance=user)
+
+    if form.is_valid():
+        form.save()
+        logging.debug('data saved')
+        response = HttpResponse(simplejson.dumps(''), mimetype="application/json")
+    else:
+        response = HttpResponseForbidden(mimetype="application/json")
+    return response
+
 @login_required
 def edit_user(request, id):
     user = get_object_or_404(User, id=id)
@@ -1058,6 +1148,7 @@ def edit_user(request, id):
         form = EditUserForm(user)
     return render_to_response('user_edit.html', {
         'form' : form,
+        'gravatar_faq_url' : reverse('faq') + '#gravatar',
     }, context_instance=RequestContext(request))
 
 def user_stats(request, user_id, user_view):
@@ -1111,7 +1202,7 @@ def user_stats(request, user_id, user_view):
             'comment_count' : 'answer.comment_count'
             },
         tables=['question', 'answer'],
-        where=['answer.deleted=0 AND answer.author_id=%s AND answer.question_id=question.id'],
+        where=['answer.deleted=0 AND question.deleted=0 AND answer.author_id=%s AND answer.question_id=question.id'],
         params=[user_id],
         order_by=['-vote_count', '-answer_id'],
         select_params=[user_id]
@@ -1152,7 +1243,13 @@ def user_stats(request, user_id, user_view):
         from django.db.models import Count
         awards = awards.annotate(count = Count('badge__id'))
 
+    if auth.can_moderate_users(request.user):
+        moderate_user_form = ModerateUserForm(instance=user)
+    else:
+        moderate_user_form = None
+
     return render_to_response(user_view.template_file,{
+        'moderate_user_form': moderate_user_form,
         "tab_name" : user_view.id,
         "tab_description" : user_view.tab_description,
         "page_title" : user_view.page_title,
@@ -1184,10 +1281,9 @@ def user_recent(request, user_id, user_view):
             self.title = title
             self.summary = summary
             slug_title = slugify(title)
+            self.title_link = reverse('question', kwargs={'id':question_id}) + u'%s' % slug_title
             if int(answer_id) > 0:
-                self.title_link = u'/%s%s/%s#%s' %(_('questions/'),question_id, slug_title, answer_id)
-            else:
-                self.title_link = u'/%s%s/%s' %(_('questions/'),question_id, slug_title)
+                self.title_link += '#%s' % answer_id
 
     class AwardEvent:
         def __init__(self, time, type, id):
@@ -1207,7 +1303,7 @@ def user_recent(request, user_id, user_view):
             },
         tables=['activity', 'question'],
         where=['activity.content_type_id = %s AND activity.object_id = ' +
-            'question.id AND activity.user_id = %s AND activity.activity_type = %s'],
+            'question.id AND question.deleted=0 AND activity.user_id = %s AND activity.activity_type = %s'],
         params=[question_type_id, user_id, TYPE_ACTIVITY_ASK_QUESTION],
         order_by=['-activity.active_at']
     ).values(
@@ -1232,7 +1328,8 @@ def user_recent(request, user_id, user_view):
             },
         tables=['activity', 'answer', 'question'],
         where=['activity.content_type_id = %s AND activity.object_id = answer.id AND ' + 
-            'answer.question_id=question.id AND activity.user_id=%s AND activity.activity_type=%s'],
+            'answer.question_id=question.id AND answer.deleted=0 AND activity.user_id=%s AND '+ 
+            'activity.activity_type=%s AND question.deleted=0'],
         params=[answer_type_id, user_id, TYPE_ACTIVITY_ANSWER],
         order_by=['-activity.active_at']
     ).values(
@@ -1259,7 +1356,8 @@ def user_recent(request, user_id, user_view):
 
         where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
             'activity.user_id = comment.user_id AND comment.object_id=question.id AND '+
-            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s'],
+            'comment.content_type_id=%s AND activity.user_id = %s AND activity.activity_type=%s AND ' +
+            'question.deleted=0'],
         params=[comment_type_id, question_type_id, user_id, TYPE_ACTIVITY_COMMENT_QUESTION],
         order_by=['-comment.added_at']
     ).values(
@@ -1288,7 +1386,8 @@ def user_recent(request, user_id, user_view):
         where=['activity.content_type_id = %s AND activity.object_id = comment.id AND '+
             'activity.user_id = comment.user_id AND comment.object_id=answer.id AND '+
             'comment.content_type_id=%s AND question.id = answer.question_id AND '+
-            'activity.user_id = %s AND activity.activity_type=%s'],
+            'activity.user_id = %s AND activity.activity_type=%s AND '+
+            'answer.deleted=0 AND question.deleted=0'],
         params=[comment_type_id, answer_type_id, user_id, TYPE_ACTIVITY_COMMENT_ANSWER],
         order_by=['-comment.added_at']
     ).values(
@@ -1313,8 +1412,9 @@ def user_recent(request, user_id, user_view):
             'activity_type' : 'activity.activity_type',
             'summary' : 'question_revision.summary'
             },
-        tables=['activity', 'question_revision'],
+        tables=['activity', 'question_revision', 'question'],
         where=['activity.content_type_id = %s AND activity.object_id = question_revision.id AND '+
+            'question_revision.id=question.id AND question.deleted=0 AND '+
             'activity.user_id = question_revision.author_id AND activity.user_id = %s AND '+
             'activity.activity_type=%s'],
         params=[question_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_QUESTION],
@@ -1347,6 +1447,7 @@ def user_recent(request, user_id, user_view):
         where=['activity.content_type_id = %s AND activity.object_id = answer_revision.id AND '+
             'activity.user_id = answer_revision.author_id AND activity.user_id = %s AND '+
             'answer_revision.answer_id=answer.id AND answer.question_id = question.id AND '+
+            'question.deleted=0 AND answer.deleted=0 AND '+
             'activity.activity_type=%s'],
         params=[answer_revision_type_id, user_id, TYPE_ACTIVITY_UPDATE_ANSWER],
         order_by=['-activity.active_at']
@@ -1375,6 +1476,7 @@ def user_recent(request, user_id, user_view):
         tables=['activity', 'answer', 'question'],
         where=['activity.content_type_id = %s AND activity.object_id = answer.id AND '+
             'activity.user_id = question.author_id AND activity.user_id = %s AND '+
+            'answer.deleted=0 AND question.deleted=0 AND '+
             'answer.question_id=question.id AND activity.activity_type=%s'],
         params=[answer_type_id, user_id, TYPE_ACTIVITY_MARK_ANSWER],
         order_by=['-activity.active_at']
@@ -1427,9 +1529,9 @@ def user_responses(request, user_id, user_view):
         def __init__(self, type, title, question_id, answer_id, time, username, user_id, content):
             self.type = type
             self.title = title
-            self.titlelink = u'/%s%s/%s#%s' % (_('questions/'), question_id, title, answer_id)
+            self.titlelink = reverse('questions') + u'%s/%s#%s' % (question_id, title, answer_id)
             self.time = time
-            self.userlink = u'/%s%s/%s/' % (_('users/'), user_id, username)
+            self.userlink = reverse('users') + u'%s/%s/' % (user_id, username)
             self.username = username
             self.content = u'%s ...' % strip_tags(content)[:300]
 
@@ -1715,86 +1817,110 @@ def user_favorites(request, user_id, user_view):
     }, context_instance=RequestContext(request))
 
 
-def user_preferences(request, user_id, user_view):
+def user_email_subscriptions(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
+    if request.method == 'POST':
+        form = EditUserEmailFeedsForm(request.POST)
+        if form.is_valid():
+            if 'save' in request.POST:
+                saved = form.save(user)
+                if saved:
+                    action_status = _('changes saved')
+            elif 'stop_email' in request.POST:
+                saved = form.reset().save(user)
+                initial_values = EditUserEmailFeedsForm.NO_EMAIL_INITIAL
+                form = EditUserEmailFeedsForm(initial=initial_values)
+                if saved:
+                    action_status = _('email updates canceled')
+            if not saved:
+                action_status = None
+    else:
+        form = EditUserEmailFeedsForm()
+        form.set_initial_values(user)
+        action_status = None
     return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
+        'tab_name':user_view.id,
+        'tab_description':user_view.tab_description,
+        'page_title':user_view.page_title,
+        'view_user':user,
+        'email_feeds_form':form,
+        'action_status':action_status,
     }, context_instance=RequestContext(request))
 
 def question_comments(request, id):
     question = get_object_or_404(Question, id=id)
     user = request.user
-    return __comments(request, question, 'question', user)
+    return __comments(request, question, 'question')
 
 def answer_comments(request, id):
     answer = get_object_or_404(Answer, id=id)
     user = request.user
-    return __comments(request, answer, 'answer', user)
+    return __comments(request, answer, 'answer')
 
-def __comments(request, obj, type, user):
+def __comments(request, obj, type):
     # only support get comments by ajax now
+    user = request.user
     if request.is_ajax():
         if request.method == "GET":
-            return __generate_comments_json(obj, type, user)
+            response = __generate_comments_json(obj, type, user)
         elif request.method == "POST":
-            comment_data = request.POST.get('comment')
-            comment = Comment(content_object=obj, comment=comment_data, user=request.user)
-            comment.save()
-            obj.comment_count = obj.comment_count + 1
-            obj.save()
-            return __generate_comments_json(obj, type, user)
+            if auth.can_add_comments(user,obj):
+                comment_data = request.POST.get('comment')
+                comment = Comment(content_object=obj, comment=comment_data, user=request.user)
+                comment.save()
+                obj.comment_count = obj.comment_count + 1
+                obj.save()
+                response = __generate_comments_json(obj, type, user)
+            else:
+                response = HttpResponseForbidden(mimetype="application/json")
+        return response
 
 def __generate_comments_json(obj, type, user):
-    comments = obj.comments.all().order_by('-id')
+    comments = obj.comments.all().order_by('id')
     # {"Id":6,"PostId":38589,"CreationDate":"an hour ago","Text":"hello there!","UserDisplayName":"Jarrod Dixon","UserUrl":"/users/3/jarrod-dixon","DeleteUrl":null}
     json_comments = []
+    from forum.templatetags.extra_tags import diff_date
     for comment in comments:
         comment_user = comment.user
         delete_url = ""
         if user != None and auth.can_delete_comment(user, comment):
             #/posts/392845/comments/219852/delete
-            delete_url = "/" + type + "s/%s/comments/%s/delete/" % (obj.id, comment.id)
+            #todo translate this url
+            delete_url = reverse(index) + type + "s/%s/comments/%s/delete/" % (obj.id, comment.id)
         json_comments.append({"id" : comment.id,
             "object_id" : obj.id,
-            "add_date" : comment.added_at.strftime('%Y-%m-%d'),
+            "comment_age" : diff_date(comment.added_at),
             "text" : comment.comment,
             "user_display_name" : comment_user.username,
-            "user_url" : "/%s%s/%s" % (_('users/'), comment_user.id, comment_user.username),
+            "user_url" : comment_user.get_profile_url(),
             "delete_url" : delete_url
         })
 
     data = simplejson.dumps(json_comments)
     return HttpResponse(data, mimetype="application/json")
 
-def delete_question_comment(request, question_id, comment_id):
-    if request.is_ajax():
-        question = get_object_or_404(Question, id=question_id)
-        comment = get_object_or_404(Comment, id=comment_id)
-
-        question.comments.remove(comment)
-        question.comment_count = question.comment_count - 1
-        question.save()
-        user = request.user
-        return __generate_comments_json(question, 'question', user)
+def delete_comment(request, object_id='', comment_id='', commented_object_type=None):
+    response = None
+    commented_object = None
+    if commented_object_type == 'question':
+        commented_object = Question
+    elif commented_object_type == 'answer':
+        commented_object = Answer
 
-def delete_answer_comment(request, answer_id, comment_id):
     if request.is_ajax():
-        answer = get_object_or_404(Answer, id=answer_id)
         comment = get_object_or_404(Comment, id=comment_id)
-
-        answer.comments.remove(comment)
-        answer.comment_count = answer.comment_count - 1
-        answer.save()
-        user = request.user
-        return __generate_comments_json(answer, 'answer', user)
+        if auth.can_delete_comment(request.user, comment):
+            obj = get_object_or_404(commented_object, id=object_id)
+            obj.comments.remove(comment)
+            obj.comment_count = obj.comment_count - 1
+            obj.save()
+            user = request.user
+            return __generate_comments_json(obj, commented_object_type, user)
+    raise PermissionDenied()
 
 def logout(request):
-    url = request.GET.get('next')
     return render_to_response('logout.html', {
-        'next' : url,
+        'next' : get_next_url(request),
     }, context_instance=RequestContext(request))
 
 def badges(request):
@@ -1807,6 +1933,7 @@ def badges(request):
     return render_to_response('badges.html', {
         'badges' : badges,
         'mybadges' : my_badges,
+        'feedback_faq_url' : reverse('feedback'),
     }, context_instance=RequestContext(request))
 
 def badge(request, id):
@@ -1882,7 +2009,7 @@ def upload(request):
     return HttpResponse(result, mimetype="application/xml")
 
 def books(request):
-    return HttpResponseRedirect("/books/mysql-zhaoyang")
+    return HttpResponseRedirect(reverse('books') + '/mysql-zhaoyang')
     
 def book(request, short_name, unanswered=False):
     """
@@ -2007,6 +2134,7 @@ def ask_book(request, short_name):
     return render_to_response('ask.html', {
         'form' : form,
         'tags' : tags,
+        'email_validation_faq_url': reverse('faq') + '#validate',
         }, context_instance=RequestContext(request))
 
 def search(request):
@@ -2022,11 +2150,11 @@ def search(request):
         except ValueError:
             page = 1
         if keywords is None:
-            return HttpResponseRedirect('/')
+            return HttpResponseRedirect(reverse(index))
         if search_type == 'tag':
-            return HttpResponseRedirect('/%s?q=%s&page=%s' % (_('tags/'), keywords.strip(), page))
+            return HttpResponseRedirect(reverse('tags') + '?q=%s&page=%s' % (keywords.strip(), page))
         elif search_type == "user":
-            return HttpResponseRedirect('/%s?q=%s&page=%s' % (_('users/'), keywords.strip(), page))
+            return HttpResponseRedirect(reverse('users') + '?q=%s&page=%s' % (keywords.strip(), page))
         elif search_type == "question":
             
             template_file = "questions.html"
diff --git a/junk.py b/junk.py
new file mode 100644
index 00000000..c6c03d27
--- /dev/null
+++ b/junk.py
@@ -0,0 +1,3 @@
+import os
+
+print os.path.normpath('/haha//haha')
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index cd8de560..502c1075 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index b5e5c549..18eb61b1 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 00:41+0000\n"
+"POT-Creation-Date: 2009-11-10 19:00-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,339 +16,315 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699
-msgid "account/"
-msgstr ""
-
-#: settings.py:12 urls.py:26 django_authopenid/urls.py:9
-#: django_authopenid/urls.py:10 django_authopenid/urls.py:11
-#: django_authopenid/urls.py:13 forum/views.py:305 forum/views.py:700
-#: templates/authopenid/confirm_email.txt:10
-msgid "signin/"
-msgstr ""
-
-#: urls.py:22
-msgid "upfiles/"
-msgstr ""
-
-#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26
-#: django_authopenid/urls.py:27
-msgid "email/"
-msgstr ""
-
-#: urls.py:27
-msgid "change/"
-msgstr ""
-
-#: urls.py:28
-msgid "sendkey/"
-msgstr ""
-
-#: urls.py:29
-msgid "verify/"
-msgstr ""
-
-#: urls.py:30
-msgid "about/"
-msgstr ""
-
-#: urls.py:31
-msgid "faq/"
-msgstr ""
+#: django_authopenid/forms.py:70
+msgid "choose a username"
+msgstr "Choose screen name"
 
-#: urls.py:32
-msgid "privacy/"
+#: django_authopenid/forms.py:76
+msgid "user name is required"
 msgstr ""
 
-#: urls.py:33
-msgid "logout/"
+#: django_authopenid/forms.py:77
+msgid "sorry, this name is taken, please choose another"
 msgstr ""
 
-#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
-msgid "answers/"
+#: django_authopenid/forms.py:78
+msgid "sorry, this name is not allowed, please choose another"
 msgstr ""
 
-#: urls.py:34 urls.py:46
-msgid "comments/"
+#: django_authopenid/forms.py:79
+msgid "sorry, there is no user with this name"
 msgstr ""
 
-#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
-msgid "edit/"
+#: django_authopenid/forms.py:80
+msgid "sorry, we have a serious error - user name is taken by several users"
 msgstr ""
 
-#: urls.py:36 urls.py:45
-msgid "revisions/"
+#: django_authopenid/forms.py:81
+msgid "user name can only consist of letters, empty space and underscore"
 msgstr ""
 
-#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
-#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
-#: forum/models.py:306 forum/views.py:1188 forum/views.py:1190
-#: forum/views.py:1430
-msgid "questions/"
-msgstr ""
+#: django_authopenid/forms.py:116
+msgid "your email address"
+msgstr "Your email <i>(never shared)</i>"
 
-#: urls.py:38 urls.py:64
-msgid "ask/"
+#: django_authopenid/forms.py:117
+msgid "email address is required"
 msgstr ""
 
-#: urls.py:39
-msgid "unanswered/"
+#: django_authopenid/forms.py:118
+msgid "please enter a valid email address"
 msgstr ""
 
-#: urls.py:41
-msgid "close/"
+#: django_authopenid/forms.py:119
+msgid "this email is already used by someone else, please choose another"
 msgstr ""
 
-#: urls.py:42
-msgid "reopen/"
+#: django_authopenid/forms.py:163 django_authopenid/views.py:117
+msgid "i-names are not supported"
 msgstr ""
 
-#: urls.py:43
-msgid "answer/"
+#: django_authopenid/forms.py:239
+msgid "Please enter valid username and password (both are case-sensitive)."
 msgstr ""
 
-#: urls.py:44
-msgid "vote/"
+#: django_authopenid/forms.py:242 django_authopenid/forms.py:292
+msgid "This account is inactive."
 msgstr ""
 
-#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
-msgid "delete/"
+#: django_authopenid/forms.py:244
+msgid "Login failed."
 msgstr ""
 
-#: urls.py:50
-msgid "question/"
+#: django_authopenid/forms.py:246
+msgid "Please enter username and password"
 msgstr ""
 
-#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2027
-msgid "tags/"
+#: django_authopenid/forms.py:248
+msgid "Please enter your password"
 msgstr ""
 
-#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998
-#: forum/views.py:1432 forum/views.py:1765 forum/views.py:2029
-msgid "users/"
+#: django_authopenid/forms.py:250
+msgid "Please enter user name"
 msgstr ""
 
-#: urls.py:56 urls.py:57
-msgid "badges/"
+#: django_authopenid/forms.py:288
+msgid ""
+"Please enter a valid                     username and password. Note that "
+"both fields are                     case-sensitive."
 msgstr ""
 
-#: urls.py:58
-msgid "messages/"
-msgstr ""
+#: django_authopenid/forms.py:310
+msgid "choose password"
+msgstr "Password"
 
-#: urls.py:58
-msgid "markread/"
+#: django_authopenid/forms.py:311
+msgid "password is required"
 msgstr ""
 
-#: urls.py:60
-msgid "nimda/"
-msgstr ""
+#: django_authopenid/forms.py:314
+msgid "retype password"
+msgstr "Password <i>(please retype)</i>"
 
-#: urls.py:62
-msgid "upload/"
+#: django_authopenid/forms.py:315
+msgid "please, retype your password"
 msgstr ""
 
-#: urls.py:63 urls.py:64 urls.py:65
-msgid "books/"
+#: django_authopenid/forms.py:316
+msgid "sorry, entered passwords did not match, please try again"
 msgstr ""
 
-#: urls.py:66
-msgid "search/"
+#: django_authopenid/forms.py:341
+msgid "Current password"
 msgstr ""
 
-#: django_authopenid/forms.py:67 django_authopenid/views.py:102
-msgid "i-names are not supported"
+#: django_authopenid/forms.py:343
+msgid "New password"
 msgstr ""
 
-#: django_authopenid/forms.py:102
-msgid ""
-"Usernames can only contain                     letters, numbers and "
-"underscores"
+#: django_authopenid/forms.py:345
+msgid "Retype new password"
 msgstr ""
 
-#: django_authopenid/forms.py:109
+#: django_authopenid/forms.py:356
 msgid ""
-"This username does not exist                     in our database. Please "
-"choose another."
+"Old password is incorrect.                     Please enter the correct "
+"password."
 msgstr ""
 
-#: django_authopenid/forms.py:126 django_authopenid/forms.py:233
-msgid ""
-"Please enter a valid                     username and password. Note that "
-"both fields are                     case-sensitive."
+#: django_authopenid/forms.py:368
+msgid "new passwords do not match"
 msgstr ""
 
-#: django_authopenid/forms.py:130 django_authopenid/forms.py:237
-msgid "This account is inactive."
+#: django_authopenid/forms.py:432
+msgid "Your user name (<i>required</i>)"
 msgstr ""
 
-#: django_authopenid/forms.py:158 django_authopenid/forms.py:210
-msgid "invalid user name"
-msgstr "User names can contain letters, underscore and empty space."
-
-#: django_authopenid/forms.py:160
-msgid "sorry, this name can not be used, please try another"
-msgstr ""
+#: django_authopenid/forms.py:447
+msgid "Incorrect username."
+msgstr "sorry, there is no such user name"
 
-#: django_authopenid/forms.py:162
-msgid "username too short"
+#: django_authopenid/urls.py:9 django_authopenid/urls.py:10
+#: django_authopenid/urls.py:11 django_authopenid/urls.py:13 forum/urls.py:24
+msgid "signin/"
 msgstr ""
 
-#: django_authopenid/forms.py:170 django_authopenid/forms.py:171
-msgid "this name is already in use - please try anoter"
+#: django_authopenid/urls.py:10
+msgid "newquestion/"
 msgstr ""
 
-#: django_authopenid/forms.py:185
-msgid ""
-"This email is already                         registered in our database. "
-"Please choose another."
+#: django_authopenid/urls.py:11
+msgid "newanswer/"
 msgstr ""
 
-#: django_authopenid/forms.py:216
-msgid ""
-"This username don't exist.                         Please choose another."
+#: django_authopenid/urls.py:12
+msgid "signout/"
 msgstr ""
 
-#: django_authopenid/forms.py:255
-msgid "choose a username"
+#: django_authopenid/urls.py:13
+msgid "complete/"
 msgstr ""
 
-#: django_authopenid/forms.py:257 templates/authopenid/signup.html:38
-msgid "your email address"
-msgstr ""
+#: django_authopenid/urls.py:15
+msgid "external-login/"
+msgstr "using-nmr-wiki-login-and-password/"
 
-#: django_authopenid/forms.py:259 templates/authopenid/signup.html:39
-msgid "choose password"
+#: django_authopenid/urls.py:16
+msgid "register/"
 msgstr ""
 
-#: django_authopenid/forms.py:261 templates/authopenid/signup.html:40
-msgid "retype password"
+#: django_authopenid/urls.py:17
+msgid "signup/"
 msgstr ""
 
-#: django_authopenid/forms.py:335
-msgid ""
-"Old password is incorrect.                     Please enter the correct "
-"password."
+#: django_authopenid/urls.py:19
+msgid "sendpw/"
 msgstr ""
 
-#: django_authopenid/forms.py:347
-msgid "new passwords do not match"
+#: django_authopenid/urls.py:20 django_authopenid/urls.py:24
+msgid "password/"
 msgstr ""
 
-#: django_authopenid/forms.py:442
-msgid "Incorrect username."
+#: django_authopenid/urls.py:20
+msgid "confirm/"
 msgstr ""
 
-#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700
-msgid "newquestion/"
+#: django_authopenid/urls.py:23
+msgid "account_settings"
 msgstr ""
 
-#: django_authopenid/urls.py:11
-msgid "newanswer/"
+#: django_authopenid/urls.py:25 django_authopenid/urls.py:26
+#: django_authopenid/urls.py:27 django_authopenid/urls.py:28
+msgid "email/"
 msgstr ""
 
-#: django_authopenid/urls.py:12
-msgid "signout/"
+#: django_authopenid/urls.py:25
+msgid "validate/"
 msgstr ""
 
-#: django_authopenid/urls.py:13
-msgid "complete/"
+#: django_authopenid/urls.py:26
+msgid "change/"
 msgstr ""
 
-#: django_authopenid/urls.py:15
-msgid "register/"
+#: django_authopenid/urls.py:27
+msgid "sendkey/"
 msgstr ""
 
-#: django_authopenid/urls.py:16
-msgid "signup/"
+#: django_authopenid/urls.py:28
+msgid "verify/"
 msgstr ""
 
-#: django_authopenid/urls.py:18
-msgid "sendpw/"
+#: django_authopenid/urls.py:29
+msgid "openid/"
 msgstr ""
 
-#: django_authopenid/urls.py:27
-msgid "validate/"
+#: django_authopenid/urls.py:30 forum/urls.py:43 forum/urls.py:47
+msgid "delete/"
 msgstr ""
 
-#: django_authopenid/views.py:108
+#: django_authopenid/views.py:123
 #, python-format
 msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:418 django_authopenid/views.py:545
-msgid "Welcome"
-msgstr "Verification Email from Q&amp;A forum"
+#: django_authopenid/views.py:531
+msgid "Welcome email subject line"
+msgstr "Welcome to the Q&A forum"
 
-#: django_authopenid/views.py:508
+#: django_authopenid/views.py:626
 msgid "Password changed."
 msgstr ""
 
-#: django_authopenid/views.py:520 django_authopenid/views.py:525
-msgid "your email needs to be validated"
+#: django_authopenid/views.py:638 django_authopenid/views.py:644
+#, python-format
+msgid "your email needs to be validated see %(details_url)s"
 msgstr ""
 "Your email needs to be validated. Please see details <a "
-"id='validate_email_alert' href=\"/faq#validate\">here</a>."
+"id='validate_email_alert' href='%(details_url)s'>here</a>."
+
+#: django_authopenid/views.py:665
+msgid "Email verification subject line"
+msgstr "Verification Email from Q&A forum"
+
+#: django_authopenid/views.py:751
+msgid "your email was not changed"
+msgstr ""
 
-#: django_authopenid/views.py:682 django_authopenid/views.py:834
+#: django_authopenid/views.py:798 django_authopenid/views.py:950
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr ""
 
-#: django_authopenid/views.py:686 django_authopenid/views.py:841
+#: django_authopenid/views.py:802 django_authopenid/views.py:957
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr ""
 
-#: django_authopenid/views.py:694
+#: django_authopenid/views.py:810
 msgid "Email Changed."
 msgstr ""
 
-#: django_authopenid/views.py:769
+#: django_authopenid/views.py:885
 msgid "This OpenID is already associated with another account."
 msgstr ""
 
-#: django_authopenid/views.py:774
+#: django_authopenid/views.py:890
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr ""
 
-#: django_authopenid/views.py:844
+#: django_authopenid/views.py:960
 msgid "Account deleted."
 msgstr ""
 
-#: django_authopenid/views.py:884
+#: django_authopenid/views.py:1003
 msgid "Request for new password"
 msgstr ""
 
-#: django_authopenid/views.py:897
-msgid "A new password has been sent to your email address."
+#: django_authopenid/views.py:1016
+msgid "A new password and the activation link were sent to your email address."
 msgstr ""
 
-#: django_authopenid/views.py:927
+#: django_authopenid/views.py:1046
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
 "registered."
 msgstr ""
 
-#: django_authopenid/views.py:936
+#: django_authopenid/views.py:1055
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
 msgstr ""
 
-#: django_authopenid/views.py:945
+#: django_authopenid/views.py:1064
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr ""
 
+#: forum/auth.py:484
+msgid "Your question and all of it's answers have been deleted"
+msgstr ""
+
+#: forum/auth.py:486
+msgid "Your question has been deleted"
+msgstr ""
+
+#: forum/auth.py:489
+msgid "The question and all of it's answers have been deleted"
+msgstr ""
+
+#: forum/auth.py:491
+msgid "The question has been deleted"
+msgstr ""
+
 #: forum/const.py:8
 msgid "duplicate question"
 msgstr ""
 
 #: forum/const.py:9
-msgid "question if off-topic or not relevant"
+msgid "question is off-topic or not relevant"
 msgstr ""
 
 #: forum/const.py:10
@@ -467,151 +443,336 @@ msgstr ""
 msgid "latest questions"
 msgstr ""
 
-#: forum/forms.py:14 templates/answer_edit_tips.html:33
-#: templates/answer_edit_tips.html.py:37 templates/question_edit_tips.html:31
-#: templates/question_edit_tips.html:36
+#: forum/feed.py:19 forum/urls.py:32 forum/urls.py:33 forum/urls.py:34
+#: forum/urls.py:35 forum/urls.py:36 forum/urls.py:37 forum/urls.py:38
+#: forum/urls.py:39 forum/urls.py:40 forum/urls.py:41 forum/urls.py:43
+msgid "questions/"
+msgstr ""
+
+#: forum/forms.py:16 templates/answer_edit_tips.html:35
+#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:32
+#: templates/question_edit_tips.html:37
 msgid "title"
 msgstr ""
 
-#: forum/forms.py:15
+#: forum/forms.py:17
 msgid "please enter a descriptive title for your question"
 msgstr ""
 
-#: forum/forms.py:20
+#: forum/forms.py:22
 msgid "title must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:29
+#: forum/forms.py:31
 msgid "content"
 msgstr ""
 
-#: forum/forms.py:35
+#: forum/forms.py:37
 msgid "question content must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:64
+#: forum/forms.py:47 templates/header.html:29 templates/header.html.py:63
 msgid "tags"
 msgstr ""
 
-#: forum/forms.py:47
+#: forum/forms.py:49
 msgid ""
 "Tags are short keywords, with no spaces within. Up to five tags can be used."
 msgstr ""
 
-#: forum/forms.py:54 templates/question_retag.html:38
+#: forum/forms.py:56 templates/question_retag.html:39
 msgid "tags are required"
 msgstr ""
 
-#: forum/forms.py:58
+#: forum/forms.py:62
 msgid "please use 5 tags or less"
 msgstr ""
 
-#: forum/forms.py:61
+#: forum/forms.py:65
 msgid "tags must be shorter than 20 characters"
 msgstr ""
 
-#: forum/forms.py:65
+#: forum/forms.py:69
 msgid ""
 "please use following characters in tags: letters 'a-z', numbers, and "
 "characters '.-_#'"
 msgstr ""
 
-#: forum/forms.py:75 templates/index.html:57 templates/question.html:209
-#: templates/question.html.py:395 templates/questions.html:58
-#: templates/questions.html.py:70 templates/unanswered.html:48
-#: templates/unanswered.html.py:60
+#: forum/forms.py:79 templates/index.html:59 templates/index.html.py:71
+#: templates/post_contributor_info.html:7
+#: templates/question_summary_list_roll.html:26
+#: templates/question_summary_list_roll.html:38 templates/questions.html:59
+#: templates/questions.html.py:71 templates/unanswered.html:51
+#: templates/unanswered.html.py:63
 msgid "community wiki"
 msgstr ""
 
-#: forum/forms.py:76
+#: forum/forms.py:80
 msgid ""
 "if you choose community wiki option, the question and answer do not generate "
 "points and name of author will not be shown"
 msgstr ""
 
-#: forum/forms.py:89
+#: forum/forms.py:96
 msgid "update summary:"
 msgstr ""
 
-#: forum/forms.py:90
+#: forum/forms.py:97
 msgid ""
 "enter a brief summary of your revision (e.g. fixed spelling, grammar, "
 "improved style, this field is optional)"
 msgstr ""
 
-#: forum/forms.py:175
+#: forum/forms.py:100
+msgid "Automatically accept user's contributions for the email updates"
+msgstr ""
+
+#: forum/forms.py:113
+msgid "Your name:"
+msgstr ""
+
+#: forum/forms.py:114
+msgid "Email (not shared with anyone):"
+msgstr ""
+
+#: forum/forms.py:115
+msgid "Your message:"
+msgstr ""
+
+#: forum/forms.py:197
 msgid "this email does not have to be linked to gravatar"
 msgstr ""
 
-#: forum/forms.py:176
+#: forum/forms.py:198
 msgid "Real name"
 msgstr ""
 
-#: forum/forms.py:177
+#: forum/forms.py:199
 msgid "Website"
 msgstr ""
 
-#: forum/forms.py:178
+#: forum/forms.py:200
 msgid "Location"
 msgstr ""
 
-#: forum/forms.py:179
+#: forum/forms.py:201
 msgid "Date of birth"
 msgstr ""
 
-#: forum/forms.py:179
+#: forum/forms.py:201
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr ""
 
-#: forum/forms.py:180 templates/authopenid/settings.html:21
+#: forum/forms.py:202 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr ""
 
-#: forum/forms.py:207 forum/forms.py:208
+#: forum/forms.py:229 forum/forms.py:230
 msgid "this email has already been registered, please use another one"
 msgstr ""
 
-#: forum/models.py:246
+#: forum/forms.py:234 forum/forms.py:235
+msgid "weekly"
+msgstr ""
+
+#: forum/forms.py:234 forum/forms.py:235
+msgid "no email"
+msgstr ""
+
+#: forum/forms.py:235
+msgid "daily"
+msgstr ""
+
+#: forum/forms.py:250 forum/models.py:46
+msgid "Entire forum"
+msgstr ""
+
+#: forum/forms.py:253
+msgid "Asked by me"
+msgstr ""
+
+#: forum/forms.py:256
+msgid "Answered by me"
+msgstr ""
+
+#: forum/forms.py:259
+msgid "Individually selected"
+msgstr ""
+
+#: forum/models.py:47
+msgid "Questions that I asked"
+msgstr ""
+
+#: forum/models.py:48
+msgid "Questions that I answered"
+msgstr ""
+
+#: forum/models.py:49
+msgid "Individually selected questions"
+msgstr ""
+
+#: forum/models.py:52
+msgid "Weekly"
+msgstr ""
+
+#: forum/models.py:53
+msgid "Daily"
+msgstr ""
+
+#: forum/models.py:54
+msgid "No email"
+msgstr ""
+
+#: forum/models.py:289
 #, python-format
 msgid "%(author)s modified the question"
 msgstr ""
 
-#: forum/models.py:250
+#: forum/models.py:293
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr ""
 
-#: forum/models.py:255
+#: forum/models.py:298
 #, python-format
 msgid "%(people)s commented the question"
 msgstr ""
 
-#: forum/models.py:260
+#: forum/models.py:303
 #, python-format
 msgid "%(people)s commented answers"
 msgstr ""
 
-#: forum/models.py:262
+#: forum/models.py:305
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr ""
 
-#: forum/models.py:306 forum/models.py:418
-msgid "revisions"
-msgstr ""
-
-#: forum/models.py:441 templates/badges.html:51
+#: forum/models.py:493 templates/badges.html:53
 msgid "gold"
 msgstr ""
 
-#: forum/models.py:442 templates/badges.html:59
+#: forum/models.py:494 templates/badges.html:61
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:443 templates/badges.html:66
+#: forum/models.py:495 templates/badges.html:68
 msgid "bronze"
 msgstr ""
 
+#: forum/urls.py:21
+msgid "upfiles/"
+msgstr ""
+
+#: forum/urls.py:25
+msgid "about/"
+msgstr ""
+
+#: forum/urls.py:26
+msgid "faq/"
+msgstr ""
+
+#: forum/urls.py:27
+msgid "privacy/"
+msgstr ""
+
+#: forum/urls.py:28
+msgid "logout/"
+msgstr ""
+
+#: forum/urls.py:29 forum/urls.py:30 forum/urls.py:31 forum/urls.py:47
+msgid "answers/"
+msgstr ""
+
+#: forum/urls.py:29 forum/urls.py:41 forum/urls.py:43 forum/urls.py:47
+msgid "comments/"
+msgstr ""
+
+#: forum/urls.py:30 forum/urls.py:35 forum/urls.py:56
+#: templates/user_info.html:45
+msgid "edit/"
+msgstr ""
+
+#: forum/urls.py:31 forum/urls.py:40
+msgid "revisions/"
+msgstr ""
+
+#: forum/urls.py:33 forum/urls.py:66
+msgid "ask/"
+msgstr ""
+
+#: forum/urls.py:34
+msgid "unanswered/"
+msgstr ""
+
+#: forum/urls.py:36
+msgid "close/"
+msgstr ""
+
+#: forum/urls.py:37
+msgid "reopen/"
+msgstr ""
+
+#: forum/urls.py:38
+msgid "answer/"
+msgstr ""
+
+#: forum/urls.py:39
+msgid "vote/"
+msgstr ""
+
+#: forum/urls.py:51
+msgid "question/"
+msgstr ""
+
+#: forum/urls.py:52 forum/urls.py:53
+msgid "tags/"
+msgstr ""
+
+#: forum/urls.py:54 forum/urls.py:56 forum/urls.py:57
+msgid "users/"
+msgstr ""
+
+#: forum/urls.py:55
+msgid "moderate-user/"
+msgstr ""
+
+#: forum/urls.py:58 forum/urls.py:59
+msgid "badges/"
+msgstr ""
+
+#: forum/urls.py:60
+msgid "messages/"
+msgstr ""
+
+#: forum/urls.py:60
+msgid "markread/"
+msgstr ""
+
+#: forum/urls.py:62
+msgid "nimda/"
+msgstr ""
+
+#: forum/urls.py:64
+msgid "upload/"
+msgstr ""
+
+#: forum/urls.py:65 forum/urls.py:66 forum/urls.py:67
+msgid "books/"
+msgstr ""
+
+#: forum/urls.py:68
+msgid "search/"
+msgstr ""
+
+#: forum/urls.py:69
+msgid "feedback/"
+msgstr ""
+
+#: forum/urls.py:70
+msgid "account/"
+msgstr ""
+
 #: forum/user.py:16 templates/user_tabs.html:7
 msgid "overview"
 msgstr ""
@@ -648,17 +809,17 @@ msgstr ""
 msgid "profile - responses"
 msgstr ""
 
-#: forum/user.py:42 templates/user_info.html:23 templates/users.html:26
+#: forum/user.py:42 templates/user_info.html:22 templates/users.html:26
 msgid "reputation"
-msgstr ""
+msgstr "karma"
 
 #: forum/user.py:43
 msgid "user reputation in the community"
-msgstr ""
+msgstr "user karma"
 
 #: forum/user.py:44
 msgid "profile - user reputation"
-msgstr ""
+msgstr "Profile - User's Karma"
 
 #: forum/user.py:50
 msgid "favorite questions"
@@ -684,61 +845,130 @@ msgstr ""
 msgid "profile - votes"
 msgstr ""
 
-#: forum/user.py:68
-msgid "preferences"
+#: forum/user.py:68 templates/user_tabs.html:28
+msgid "email subscriptions"
 msgstr ""
 
 #: forum/user.py:69 templates/user_tabs.html:27
-msgid "user preference settings"
+msgid "email subscription settings"
 msgstr ""
 
 #: forum/user.py:70
-msgid "profile - user preferences"
+msgid "profile - email subscriptions"
 msgstr ""
 
-#: forum/views.py:948
+#: forum/views.py:126
+msgid "Q&A forum feedback"
+msgstr ""
+
+#: forum/views.py:127
+msgid "Thanks for the feedback!"
+msgstr ""
+
+#: forum/views.py:135
+msgid "We look forward to hearing your feedback! Please, give it next time :)"
+msgstr ""
+
+#: forum/views.py:1014
 #, python-format
-msgid "subscription saved, %(email)s needs validation"
+msgid "subscription saved, %(email)s needs validation, see %(details_url)s"
 msgstr ""
 "Your subscription is saved, but email address %(email)s needs to be "
-"validated, please see <a href='/faq#validate'>more details here</a>"
+"validated, please see <a href='%(details_url)s'>more details here</a>"
 
-#: forum/views.py:1874
-msgid "uploading images is limited to users with >60 reputation points"
+#: forum/views.py:1022
+msgid "email update frequency has been set to daily"
 msgstr ""
 
-#: forum/views.py:1876
+#: forum/views.py:1826
+msgid "changes saved"
+msgstr ""
+
+#: forum/views.py:1832
+msgid "email updates canceled"
+msgstr ""
+
+#: forum/views.py:1999
+msgid "uploading images is limited to users with >60 reputation points"
+msgstr "sorry, file uploading requires karma >60"
+
+#: forum/views.py:2001
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1878
+#: forum/views.py:2003
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1880
+#: forum/views.py:2005
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
 msgstr ""
 
-#: forum/management/commands/send_email_alerts.py:35
-msgid "updates from website"
-msgstr "Q&amp;A forum update"
+#: forum/management/commands/send_email_alerts.py:71
+msgid "email update message subject"
+msgstr "news from Q&A forum"
 
-#: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
-#: templates/header.html:35
+#: forum/management/commands/send_email_alerts.py:72
+#, python-format
+msgid "%(name)s, this is an update message header for a question"
+msgid_plural "%(name)s, this is an update message header for %(num)d questions"
+msgstr[0] "<p>Dear %(name)s,</p></p>The following question has been updated on the Q&A forum:</p>"
+msgstr[1] "<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on the Q&A forum:</p>"
+
+#: forum/management/commands/send_email_alerts.py:81
+#, python-format
+msgid ""
+"go to %(link)s to change frequency of email updates or %(email)s "
+"administrator"
+msgstr ""
+"<p>Please remember that you can always <a href='%(link)s'>adjust</a> frequency of the "
+"email updates or turn them off entirely.<br/>If you believe that this message "
+"was sent in an error, please email about it the forum administrator at %(email)"
+"s.</p>"
+"<p>Sincerely,</p><p>Your friendly Q&A forum server.</p>"
+
+#: forum/templatetags/extra_tags.py:160 forum/templatetags/extra_tags.py:189
+#: templates/header.html:34
 msgid "badges"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:144 forum/templatetags/extra_tags.py:171
+#: forum/templatetags/extra_tags.py:161 forum/templatetags/extra_tags.py:188
 msgid "reputation points"
+msgstr "karma"
+
+#: forum/templatetags/extra_tags.py:244
+msgid "%b %d at %H:%M"
+msgstr ""
+
+#: forum/templatetags/extra_tags.py:246
+msgid "%b %d '%y at %H:%M"
+msgstr ""
+
+#: forum/templatetags/extra_tags.py:248
+msgid "2 days ago"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:225
-msgid " ago"
+#: forum/templatetags/extra_tags.py:250
+msgid "yesterday"
 msgstr ""
 
+#: forum/templatetags/extra_tags.py:252
+#, python-format
+msgid "%(hr)d hour ago"
+msgid_plural "%(hr)d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: forum/templatetags/extra_tags.py:254
+#, python-format
+msgid "%(min)d min ago"
+msgid_plural "%(min)d mins ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/404.html:24
 msgid "Sorry, could not find the page you requested."
 msgstr ""
@@ -805,55 +1035,55 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: templates/answer_edit.html:4 templates/answer_edit.html.py:47
+#: templates/answer_edit.html:5 templates/answer_edit.html.py:48
 msgid "Edit answer"
 msgstr ""
 
-#: templates/answer_edit.html:24 templates/answer_edit.html.py:27
-#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:43
-#: templates/question.html.py:46 templates/question_edit.html:27
+#: templates/answer_edit.html:25 templates/answer_edit.html.py:28
+#: templates/ask.html:26 templates/ask.html.py:29 templates/question.html:45
+#: templates/question.html.py:48 templates/question_edit.html:28
 msgid "hide preview"
 msgstr ""
 
-#: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:46 templates/question_edit.html:27
+#: templates/answer_edit.html:28 templates/ask.html:29
+#: templates/question.html:48 templates/question_edit.html:28
 msgid "show preview"
 msgstr ""
 
-#: templates/answer_edit.html:47 templates/question_edit.html:65
-#: templates/question_retag.html:52 templates/revisions_answer.html:36
+#: templates/answer_edit.html:48 templates/question_edit.html:66
+#: templates/question_retag.html:53 templates/revisions_answer.html:36
 #: templates/revisions_question.html:36
 msgid "back"
 msgstr ""
 
-#: templates/answer_edit.html:52 templates/question_edit.html:70
-#: templates/revisions_answer.html:47 templates/revisions_question.html:47
+#: templates/answer_edit.html:53 templates/question_edit.html:71
+#: templates/revisions_answer.html:50 templates/revisions_question.html:50
 msgid "revision"
 msgstr ""
 
-#: templates/answer_edit.html:55 templates/question_edit.html:74
+#: templates/answer_edit.html:56 templates/question_edit.html:75
 msgid "select revision"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:467 templates/question_edit.html:91
+#: templates/answer_edit.html:63 templates/ask.html:97
+#: templates/question.html:434 templates/question_edit.html:92
 msgid "Toggle the real time Markdown editor preview"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:467 templates/question_edit.html:91
+#: templates/answer_edit.html:63 templates/ask.html:97
+#: templates/question.html:435 templates/question_edit.html:92
 msgid "toggle preview"
 msgstr ""
 
-#: templates/answer_edit.html:71 templates/question_edit.html:115
-#: templates/question_retag.html:73
+#: templates/answer_edit.html:72 templates/question_edit.html:118
+#: templates/question_retag.html:74
 msgid "Save edit"
 msgstr ""
 
-#: templates/answer_edit.html:72 templates/close.html:29
-#: templates/question_edit.html:116 templates/question_retag.html:74
-#: templates/reopen.html:30 templates/user_edit.html:83
-#: templates/authopenid/changeemail.html:34
+#: templates/answer_edit.html:73 templates/close.html:29
+#: templates/feedback.html:50 templates/question_edit.html:119
+#: templates/question_retag.html:75 templates/reopen.html:30
+#: templates/user_edit.html:83 templates/authopenid/changeemail.html:40
 msgid "Cancel"
 msgstr ""
 
@@ -877,80 +1107,82 @@ msgstr ""
 msgid "be clear and concise"
 msgstr ""
 
-#: templates/answer_edit_tips.html:19 templates/question_edit_tips.html:16
+#: templates/answer_edit_tips.html:20 templates/question_edit_tips.html:17
 msgid "see frequently asked questions"
 msgstr ""
 
-#: templates/answer_edit_tips.html:24 templates/question_edit_tips.html:22
+#: templates/answer_edit_tips.html:26 templates/question_edit_tips.html:23
 msgid "Markdown tips"
 msgstr "Markdown basics"
 
-#: templates/answer_edit_tips.html:27 templates/question_edit_tips.html:25
+#: templates/answer_edit_tips.html:29 templates/question_edit_tips.html:26
 msgid "*italic* or __italic__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:30 templates/question_edit_tips.html:28
+#: templates/answer_edit_tips.html:32 templates/question_edit_tips.html:29
 msgid "**bold** or __bold__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:33 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html:35 templates/question_edit_tips.html:32
 msgid "link"
 msgstr ""
 
-#: templates/answer_edit_tips.html:33 templates/answer_edit_tips.html.py:37
-#: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:35 templates/answer_edit_tips.html.py:39
+#: templates/question_edit_tips.html:32 templates/question_edit_tips.html:37
 msgid "text"
 msgstr ""
 
-#: templates/answer_edit_tips.html:37 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:37
 msgid "image"
 msgstr ""
 
-#: templates/answer_edit_tips.html:41 templates/question_edit_tips.html:40
+#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:41
 msgid "numbered list:"
 msgstr ""
 
-#: templates/answer_edit_tips.html:46 templates/question_edit_tips.html:45
+#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:46
 msgid "basic HTML tags are also supported"
 msgstr ""
 
-#: templates/answer_edit_tips.html:49 templates/question_edit_tips.html:48
+#: templates/answer_edit_tips.html:52 templates/question_edit_tips.html:50
 msgid "learn more about Markdown"
 msgstr ""
 
-#: templates/ask.html:4 templates/ask.html.py:60
+#: templates/ask.html:5 templates/ask.html.py:61
 msgid "Ask a question"
 msgstr ""
 
-#: templates/ask.html:67
+#: templates/ask.html:68
 msgid "login to post question info"
 msgstr ""
 "<span class=\"strong big\">You are welcome to start submitting your question "
-"anonymously</span>  - you are currently not logged in. When you post your "
-"question, you will be redirected to the login/signup page. Your question "
-"will be saved meanwhile  and will be posted when you log in. Login/signup "
-"process is very simple. Login takes about 30 seconds, initial signup takes a "
-"minute or less."
+"anonymously</span>. When you submit the post, you will be redirected to the "
+"login/signup page. Your question will be saved in the current session and "
+"will be published after you log in. Login/signup process is very simple. "
+"Login takes about 30 seconds, initial signup takes a minute or less."
 
-#: templates/ask.html:73
+#: templates/ask.html:74
 #, python-format
-msgid "must have valid %(email)s to post"
+msgid ""
+"must have valid %(email)s to post, \n"
+"                            see %(email_validation_faq_url)s\n"
+"                            "
 msgstr ""
 "<span class='strong big'>Looks like your email address, %(email)s has not "
 "yet been validated.</span> To post messages you must verify your email, "
-"please see <a href='/faq#validate'>more details here</a>.<br>You can submit "
-"your question now and validate email after that. Your question will saved as "
-"pending meanwhile. "
+"please see <a href='%(email_validation_faq_url)s'>more details here</a>."
+"<br>You can submit your question now and validate email after that. Your "
+"question will saved as pending meanwhile. "
 
-#: templates/ask.html:107
+#: templates/ask.html:112
 msgid "(required)"
 msgstr ""
 
-#: templates/ask.html:114
+#: templates/ask.html:119
 msgid "Login/signup to post your question"
 msgstr "Login/Signup to Post"
 
-#: templates/ask.html:116
+#: templates/ask.html:121
 msgid "Ask your question"
 msgstr "Ask Your Question"
 
@@ -966,7 +1198,7 @@ msgstr ""
 msgid "Badges summary"
 msgstr ""
 
-#: templates/badges.html:17 templates/user_stats.html:73
+#: templates/badges.html:17
 msgid "Badges"
 msgstr ""
 
@@ -977,38 +1209,41 @@ msgstr ""
 "Q&amp;A community will be recognized with the variety of badges."
 
 #: templates/badges.html:22
+#, python-format
 msgid ""
-"Below is the list of available badges and number of times each type of badge "
-"has been awarded."
+"Below is the list of available badges and number \n"
+"    of times each type of badge has been awarded. Give us feedback at %"
+"(feedback_faq_url)s.\n"
+"    "
 msgstr ""
 "Currently badges differ only by their level: <strong>gold</strong>, "
 "<strong>silver</strong> and <strong>bronze</strong> (their meanings are "
 "described on the right). In the future there will be many types of badges at "
-"each level. <strong>Please give us your <a href=\"/faq#feedback\">feedback</"
-"a></strong> - what kinds of badges would you like to see and suggest the "
-"activity for which those badges might be awarded."
+"each level. <strong>Please give us your <a href='%(feedback_faq_url)"
+"s'>feedback</a></strong> - what kinds of badges would you like to see and "
+"suggest the activity for which those badges might be awarded."
 
-#: templates/badges.html:48
+#: templates/badges.html:50
 msgid "Community badges"
 msgstr "Badge levels"
 
-#: templates/badges.html:54
+#: templates/badges.html:56
 msgid "gold badge description"
 msgstr ""
 "Gold badge is the highest award in this community. To obtain it have to show "
 "profound knowledge and ability in addition to your active participation."
 
-#: templates/badges.html:62
+#: templates/badges.html:64
 msgid "silver badge description"
 msgstr ""
 "Obtaining silver badge requires significant patience. If you have received "
 "one, that means you have greatly contributed to this community."
 
-#: templates/badges.html:65
+#: templates/badges.html:67
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: templates/badges.html:69
+#: templates/badges.html:71
 msgid "bronze badge description"
 msgstr ""
 "If you are an active participant in this community, you will be recognized "
@@ -1080,8 +1315,9 @@ msgstr ""
 msgid "number of times"
 msgstr ""
 
-#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
-#: templates/unanswered.html:37 templates/users_questions.html:32
+#: templates/book.html:105 templates/index.html:47
+#: templates/question_summary_list_roll.html:14 templates/questions.html:47
+#: templates/unanswered.html:39 templates/users_questions.html:32
 msgid "votes"
 msgstr ""
 
@@ -1089,15 +1325,17 @@ msgstr ""
 msgid "the answer has been accepted to be correct"
 msgstr ""
 
-#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
-#: templates/unanswered.html:38 templates/users_questions.html:42
+#: templates/book.html:115 templates/index.html:48
+#: templates/question_summary_list_roll.html:15 templates/questions.html:48
+#: templates/unanswered.html:40 templates/users_questions.html:40
 msgid "views"
 msgstr ""
 
-#: templates/book.html:125 templates/index.html:69 templates/question.html:499
-#: templates/questions.html:84 templates/questions.html.py:156
-#: templates/tags.html:49 templates/unanswered.html:75
-#: templates/unanswered.html.py:106 templates/users_questions.html:54
+#: templates/book.html:125 templates/index.html:103
+#: templates/question.html:480 templates/question_summary_list_roll.html:52
+#: templates/questions.html:103 templates/questions.html.py:171
+#: templates/tags.html:49 templates/unanswered.html:95
+#: templates/unanswered.html.py:122 templates/users_questions.html:52
 msgid "using tags"
 msgstr ""
 
@@ -1105,7 +1343,7 @@ msgstr ""
 msgid "subscribe to book RSS feed"
 msgstr ""
 
-#: templates/book.html:147 templates/index.html:118
+#: templates/book.html:147 templates/index.html:152
 msgid "subscribe to the questions feed"
 msgstr ""
 
@@ -1189,16 +1427,18 @@ msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
 msgstr ""
+"Karma system allows users to earn rights to perform a variety of moderation "
+"tasks"
 
 #: templates/faq.html:40
 msgid "How does reputation system work?"
-msgstr ""
+msgstr "How does karma system work?"
 
 #: templates/faq.html:41
 msgid "Rep system summary"
 msgstr ""
 "When a question or answer is upvoted, the user who posted them will gain "
-"some points, which are called \"reputation points\". These points serve as a "
+"some points, which are called \"karma points\". These points serve as a "
 "rough measure of the community trust to him/her. Various moderation tasks "
 "are gradually assigned to the users based on those points."
 
@@ -1237,51 +1477,53 @@ msgstr ""
 msgid "retag questions"
 msgstr ""
 
-#: templates/faq.html:77
+#: templates/faq.html:78
 msgid "edit community wiki questions"
 msgstr ""
 
-#: templates/faq.html:81
+#: templates/faq.html:83
 msgid "edit any answer"
 msgstr ""
 
-#: templates/faq.html:85
+#: templates/faq.html:87
 msgid "open any closed question"
 msgstr ""
 
-#: templates/faq.html:89
+#: templates/faq.html:91
 msgid "delete any comment"
 msgstr ""
 
-#: templates/faq.html:93
+#: templates/faq.html:95
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 
-#: templates/faq.html:100
+#: templates/faq.html:102
 msgid "how to validate email title"
 msgstr "How to validate email and why?"
 
-#: templates/faq.html:102
-msgid "how to validate email info"
-msgstr ""
-"<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
-"\"bigger strong\">How?</span> If you have just set or changed your email "
-"address - <strong>check your email and click the included link</strong>."
-"<br>The link contains a key generated specifically for you. You can also "
-"<button style='display:inline' type='submit'><strong>get a new key</strong></"
-"button> and check your email again.</p></form><span class=\"bigger strong"
-"\">Why?</span> Email validation is required to make sure that <strong>only "
-"you can post messages</strong> on your behalf and to <strong>minimize spam</"
-"strong> posts.<br>With email you can <strong>subscribe for updates</strong> "
-"on the most interesting questions. Also, when you sign up for the first time "
-"- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
-"personal image.</p>"
-
-#: templates/faq.html:106
+#: templates/faq.html:104
+#, python-format
+msgid ""
+"how to validate email info with %(send_email_key_url)s %(gravatar_faq_url)s"
+msgstr ""
+"<form style='margin:0;padding:0;' action='%(send_email_key_url)s'><p><span "
+"class=\"bigger strong\">How?</span> If you have just set or changed your "
+"email address - <strong>check your email and click the included link</"
+"strong>.<br>The link contains a key generated specifically for you. You can "
+"also <button style='display:inline' type='submit'><strong>get a new key</"
+"strong></button> and check your email again.</p></form><span class=\"bigger "
+"strong\">Why?</span> Email validation is required to make sure that "
+"<strong>only you can post messages</strong> on your behalf and to "
+"<strong>minimize spam</strong> posts.<br>With email you can "
+"<strong>subscribe for updates</strong> on the most interesting questions. "
+"Also, when you sign up for the first time - create a unique <a href='%"
+"(gravatar_faq_url)s'><strong>gravatar</strong></a> personal image.</p>"
+
+#: templates/faq.html:108
 msgid "what is gravatar"
 msgstr "What is gravatar?"
 
-#: templates/faq.html:107
+#: templates/faq.html:109
 msgid "gravatar faq info"
 msgstr ""
 "<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</"
@@ -1292,63 +1534,124 @@ msgstr ""
 "your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</"
 "strong></a>"
 
-#: templates/faq.html:110
+#: templates/faq.html:112
 msgid "To register, do I need to create new password?"
 msgstr ""
 
-#: templates/faq.html:111
+#: templates/faq.html:113
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
 msgstr ""
 
-#: templates/faq.html:112
+#: templates/faq.html:114
 msgid "Login now!"
 msgstr ""
 
-#: templates/faq.html:117
+#: templates/faq.html:119
 msgid "Why other people can edit my questions/answers?"
 msgstr ""
 
-#: templates/faq.html:118
+#: templates/faq.html:120
 msgid "Goal of this site is..."
 msgstr ""
 
-#: templates/faq.html:118
+#: templates/faq.html:120
 msgid ""
 "So questions and answers can be edited like wiki pages by experienced users "
 "of this site and this improves the overall quality of the knowledge base "
 "content."
 msgstr ""
 
-#: templates/faq.html:119
+#: templates/faq.html:121
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 
-#: templates/faq.html:123
+#: templates/faq.html:125
 msgid "Still have questions?"
 msgstr ""
 
-#: templates/faq.html:124
-msgid "Please ask your question, help make our community better!"
+#: templates/faq.html:126
+#, python-format
+msgid ""
+"Please ask your question at %(ask_question_url)s, help make our community "
+"better!"
 msgstr ""
-"Please <a href=\"/questions/ask\">ask</a> your question, help make our "
+"Please <a href='%(ask_question_url)s'>ask</a> your question, help make our "
 "community better!"
 
-#: templates/faq.html:126 templates/header.html:29 templates/header.html.py:63
+#: templates/faq.html:128 templates/header.html:28 templates/header.html.py:62
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:126 templates/index.html:123
+#: templates/faq.html:128 templates/index.html:157
 msgid "."
 msgstr ""
 
-#: templates/footer.html:8 templates/header.html:14 templates/index.html:83
+#: templates/feedback.html:6
+msgid "Feedback"
+msgstr ""
+
+#: templates/feedback.html:11
+msgid "Give us your feedback!"
+msgstr ""
+
+#: templates/feedback.html:17
+#, python-format
+msgid ""
+"\n"
+"            <span class='big strong'>Dear %(user_name)s</span>, we look "
+"forward to hearing your feedback. \n"
+"            Please type and send us your message below.\n"
+"            "
+msgstr ""
+
+#: templates/feedback.html:24
+msgid ""
+"\n"
+"            <span class='big strong'>Dear visitor</span>, we look forward to "
+"hearing your feedback.\n"
+"            Please type and send us your message below.\n"
+"            "
+msgstr ""
+
+#: templates/feedback.html:41
+msgid "(this field is required)"
+msgstr ""
+
+#: templates/feedback.html:49
+msgid "Send Feedback"
+msgstr ""
+
+#: templates/feedback_email.txt:3
+#, python-format
+msgid ""
+"\n"
+"Hello, this is a %(site_title)s forum feedback message\n"
+msgstr ""
+
+#: templates/feedback_email.txt:9
+msgid "Sender is"
+msgstr ""
+
+#: templates/feedback_email.txt:11 templates/feedback_email.txt.py:14
+msgid "email"
+msgstr ""
+
+#: templates/feedback_email.txt:13
+msgid "anonymous"
+msgstr ""
+
+#: templates/feedback_email.txt:19
+msgid "Message body:"
+msgstr ""
+
+#: templates/footer.html:8 templates/header.html:14 templates/index.html:117
 msgid "about"
 msgstr ""
 
-#: templates/footer.html:9 templates/header.html:15 templates/index.html:84
-#: templates/question_edit_tips.html:16
+#: templates/footer.html:9 templates/header.html:15 templates/index.html:118
+#: templates/question_edit_tips.html:17
 msgid "faq"
 msgstr ""
 
@@ -1368,162 +1671,176 @@ msgstr ""
 msgid "privacy policy"
 msgstr ""
 
-#: templates/footer.html:14
+#: templates/footer.html:22
 msgid "give feedback"
 msgstr ""
 
-#: templates/header.html:10
+#: templates/header.html:9
 msgid "logout"
 msgstr ""
 
-#: templates/header.html:12 templates/authopenid/signup.html:41
+#: templates/header.html:11
 msgid "login"
 msgstr ""
 
-#: templates/header.html:23
+#: templates/header.html:22
 msgid "back to home page"
 msgstr ""
 
-#: templates/header.html:31 templates/header.html.py:65
+#: templates/header.html:30 templates/header.html.py:64
 msgid "users"
 msgstr ""
 
-#: templates/header.html:33
+#: templates/header.html:32
 msgid "books"
 msgstr ""
 
-#: templates/header.html:36
+#: templates/header.html:35
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:40
+#: templates/header.html:39
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:44
+#: templates/header.html:43
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:59
+#: templates/header.html:58
 msgid "search"
 msgstr ""
 
-#: templates/index.html:7
+#: templates/index.html:8
 msgid "Home"
 msgstr ""
 
-#: templates/index.html:22 templates/questions.html:7
+#: templates/index.html:23 templates/questions.html:8
 msgid "Questions"
 msgstr ""
 
-#: templates/index.html:24
+#: templates/index.html:25
 msgid "last updated questions"
 msgstr ""
 
-#: templates/index.html:24 templates/questions.html:25
-#: templates/unanswered.html:20
+#: templates/index.html:25 templates/questions.html:26
+#: templates/unanswered.html:21
 msgid "newest"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "hottest questions"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "hottest"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:27 templates/questions.html:29
 msgid "most voted questions"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:27 templates/questions.html:29
 msgid "most voted"
 msgstr ""
 
-#: templates/index.html:27
+#: templates/index.html:28
 msgid "all questions"
 msgstr ""
 
-#: templates/index.html:47 templates/questions.html:45
-#: templates/unanswered.html:36 templates/users_questions.html:35
+#: templates/index.html:46 templates/question_summary_list_roll.html:13
+#: templates/questions.html:46 templates/unanswered.html:38
+#: templates/users_questions.html:36
 msgid "answers"
 msgstr ""
 
-#: templates/index.html:69 templates/question.html:499
-#: templates/questions.html:84 templates/questions.html.py:156
-#: templates/tags.html:49 templates/unanswered.html:75
-#: templates/unanswered.html.py:106 templates/users_questions.html:52
+#: templates/index.html:78 templates/index.html.py:92
+#: templates/questions.html:78 templates/questions.html.py:92
+#: templates/unanswered.html:70 templates/unanswered.html.py:84
+msgid "Posted:"
+msgstr ""
+
+#: templates/index.html:81 templates/index.html.py:86
+#: templates/questions.html:81 templates/questions.html.py:86
+#: templates/unanswered.html:73 templates/unanswered.html.py:78
+msgid "Updated:"
+msgstr ""
+
+#: templates/index.html:103 templates/question.html:480
+#: templates/question_summary_list_roll.html:52 templates/questions.html:103
+#: templates/questions.html.py:171 templates/tags.html:49
+#: templates/unanswered.html:95 templates/unanswered.html.py:122
+#: templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr ""
 
-#: templates/index.html:80
+#: templates/index.html:114
 msgid "welcome to website"
-msgstr ""
+msgstr "Welcome to Q&amp;A forum"
 
-#: templates/index.html:89
+#: templates/index.html:123
 msgid "Recent tags"
 msgstr ""
 
-#: templates/index.html:94 templates/question.html:125
+#: templates/index.html:128 templates/question.html:135
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
-#: templates/index.html:97 templates/index.html.py:123
+#: templates/index.html:131 templates/index.html.py:157
 msgid "popular tags"
 msgstr "tags"
 
-#: templates/index.html:102
+#: templates/index.html:136
 msgid "Recent awards"
 msgstr "Recent badges"
 
-#: templates/index.html:108
+#: templates/index.html:142
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:113
+#: templates/index.html:147
 msgid "all awards"
 msgstr "all badges"
 
-#: templates/index.html:118
+#: templates/index.html:152
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "complete list of questions"
 msgstr "list of all questions"
 
-#: templates/index.html:123
+#: templates/index.html:157 templates/authopenid/signup.html:18
 msgid "or"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "Please help us answer"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "list of unanswered questions"
 msgstr "unanswered questions"
 
-#: templates/logout.html:6 templates/logout.html.py:17
+#: templates/logout.html:6 templates/logout.html.py:16
 msgid "Logout"
 msgstr ""
 
-#: templates/logout.html:20
+#: templates/logout.html:19
 msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
-"Clicking <strong>Logout</strong> will log you out from the Q&amp;A forum.</"
-"p><p>If you wish to sign off completely - please make sure to log out from "
-"your OpenID provider."
+"Clicking <strong>Logout</strong> will log you out from the forum"
+"but will not sign you off from your OpenID provider.</p><p>If you wish to sign off "
+"completely - please make sure to log out from your OpenID provider as well."
 
-#: templates/logout.html:21
+#: templates/logout.html:20
 msgid "Logout now"
 msgstr "Logout Now"
 
@@ -1551,6 +1868,33 @@ msgstr ""
 msgid "next page"
 msgstr ""
 
+#: templates/post_contributor_info.html:9
+#, python-format
+msgid ""
+"\n"
+"                one revision\n"
+"            "
+msgid_plural ""
+"\n"
+"                %(rev_count)s revisions\n"
+"            "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/post_contributor_info.html:19 templates/revisions_answer.html:66
+#: templates/revisions_question.html:66
+msgid "asked"
+msgstr ""
+
+#: templates/post_contributor_info.html:21
+msgid "answered"
+msgstr ""
+
+#: templates/post_contributor_info.html:37 templates/revisions_answer.html:68
+#: templates/revisions_question.html:68
+msgid "updated"
+msgstr ""
+
 #: templates/privacy.html:6 templates/privacy.html.py:11
 msgid "Privacy policy"
 msgstr ""
@@ -1558,6 +1902,10 @@ msgstr ""
 #: templates/privacy.html:15
 msgid "general message about privacy"
 msgstr ""
+"Respecting users privacy is an important core principle "
+"of this Q&amp;A forum. "
+"Information on this page details how this forum protects your privacy, "
+"and what type of information is collected."
 
 #: templates/privacy.html:18
 msgid "Site Visitors"
@@ -1566,6 +1914,9 @@ msgstr ""
 #: templates/privacy.html:20
 msgid "what technical information is collected about visitors"
 msgstr ""
+"Information on question views, revisions of questions and answers - both times "
+"and content are recorded for each user in order to correctly count number of views, "
+"maintain data integrity and report relevant updates."
 
 #: templates/privacy.html:23
 msgid "Personal Information"
@@ -1574,6 +1925,9 @@ msgstr ""
 #: templates/privacy.html:25
 msgid "details on personal information policies"
 msgstr ""
+"Members of this community may choose to display personally identifiable information "
+"in their profiles. Forum will never display such information "
+"without a request from the user."
 
 #: templates/privacy.html:28
 msgid "Other Services"
@@ -1582,10 +1936,15 @@ msgstr ""
 #: templates/privacy.html:30
 msgid "details on sharing data with third parties"
 msgstr ""
+"None of the data that is not openly shown on the forum by the choice of the user "
+"is shared with any third party."
 
 #: templates/privacy.html:35
 msgid "cookie policy details"
 msgstr ""
+"Forum software relies on the internet cookie technology to "
+"keep track of user sessions. Cookies must be enabled "
+"in your browser so that forum can work for you."
 
 #: templates/privacy.html:37
 msgid "Policy Changes"
@@ -1594,194 +1953,305 @@ msgstr ""
 #: templates/privacy.html:38
 msgid "how privacy policies can be changed"
 msgstr ""
+"These policies may be adjusted to improve protection of "
+"user's privacy. Whenever such changes occur, users will be "
+"notified via the internal messaging system. "
 
-#: templates/question.html:72 templates/question.html.py:73
-#: templates/question.html:85 templates/question.html.py:87
+#: templates/question.html:77 templates/question.html.py:78
+#: templates/question.html:94 templates/question.html.py:96
 msgid "i like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:75 templates/question.html.py:89
-#: templates/question.html:289
+#: templates/question.html:80 templates/question.html.py:98
+#: templates/question.html:257
 msgid "current number of votes"
 msgstr ""
 
-#: templates/question.html:80 templates/question.html.py:81
-#: templates/question.html:94 templates/question.html.py:95
+#: templates/question.html:89 templates/question.html.py:90
+#: templates/question.html:103 templates/question.html.py:104
 msgid "i dont like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:100 templates/question.html.py:101
+#: templates/question.html:109 templates/question.html.py:110
 msgid "mark this question as favorite (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:107 templates/question.html.py:108
+#: templates/question.html:116 templates/question.html.py:117
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 
-#: templates/question.html:134 templates/question.html.py:322
-#: templates/revisions_answer.html:53 templates/revisions_question.html:53
+#: templates/question.html:140 templates/question.html.py:294
+#: templates/revisions_answer.html:56 templates/revisions_question.html:56
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:138 templates/question.html.py:332
+#: templates/question.html:144 templates/question.html.py:301
 msgid "delete"
 msgstr ""
 
-#: templates/question.html:143
+#: templates/question.html:149
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:148
+#: templates/question.html:153
 msgid "close"
 msgstr ""
 
-#: templates/question.html:154 templates/question.html.py:345
+#: templates/question.html:159 templates/question.html.py:308
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 
-#: templates/question.html:155 templates/question.html.py:346
+#: templates/question.html:160 templates/question.html.py:309
 msgid "flag offensive"
 msgstr ""
 
-#: templates/question.html:167 templates/question.html.py:355
-#: templates/revisions_answer.html:65 templates/revisions_question.html:65
-msgid "updated"
+#: templates/question.html:182 templates/question.html.py:331
+msgid "delete this comment"
 msgstr ""
 
-#: templates/question.html:216 templates/question.html.py:402
-#: templates/revisions_answer.html:63 templates/revisions_question.html:63
-msgid "asked"
-msgstr ""
+#: templates/question.html:193 templates/question.html.py:342
+msgid "add comment"
+msgstr "post a comment"
 
-#: templates/question.html:246 templates/question.html.py:429
-msgid "comments"
-msgstr ""
+#: templates/question.html:197
+#, python-format
+msgid ""
+"\n"
+"                                            see <strong>one</strong> more \n"
+"                                            "
+msgid_plural ""
+"\n"
+"                                            see <strong>%(counter)s</strong> "
+"more\n"
+"                                            "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:247 templates/question.html.py:430
-msgid "add comment"
-msgstr ""
+#: templates/question.html:203
+#, python-format
+msgid ""
+"\n"
+"                                            see <strong>one</strong> more "
+"comment\n"
+"                                            "
+msgid_plural ""
+"\n"
+"                                            see <strong>%(counter)s</strong> "
+"more comments\n"
+"                                            "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:260
+#: templates/question.html:219
 #, python-format
 msgid ""
-"The question has been closed for the following reason \"%(question."
-"get_close_reason_display)s\" by"
+"The question has been closed for the following reason \"%(close_reason)s\" by"
 msgstr ""
 
-#: templates/question.html:262
+#: templates/question.html:221
 #, python-format
-msgid "close date %(question.closed_at)s"
+msgid "close date %(closed_at)s"
 msgstr ""
 
-#: templates/question.html:269 templates/user_stats.html:13
-msgid "Answers"
-msgstr " Answers"
+#: templates/question.html:229
+#, python-format
+msgid ""
+"\n"
+"                    One Answer:\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    %(counter)s Answers:\n"
+"                    "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:271
+#: templates/question.html:237
 msgid "oldest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:271
+#: templates/question.html:237
 msgid "oldest answers"
 msgstr "oldest"
 
-#: templates/question.html:272
+#: templates/question.html:239
 msgid "newest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:272
+#: templates/question.html:239
 msgid "newest answers"
 msgstr "newest"
 
-#: templates/question.html:273
+#: templates/question.html:241
 msgid "most voted answers will be shown first"
 msgstr ""
 
-#: templates/question.html:273
+#: templates/question.html:241
 msgid "popular answers"
 msgstr "most voted"
 
-#: templates/question.html:287 templates/question.html.py:288
+#: templates/question.html:255 templates/question.html.py:256
 msgid "i like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:294 templates/question.html.py:295
+#: templates/question.html:262 templates/question.html.py:263
 msgid "i dont like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:300 templates/question.html.py:301
+#: templates/question.html:268 templates/question.html.py:269
 msgid "mark this answer as favorite (click again to undo)"
 msgstr ""
 
-#: templates/question.html:306 templates/question.html.py:307
+#: templates/question.html:274 templates/question.html.py:275
 msgid "the author of the question has selected this answer as correct"
 msgstr ""
 
-#: templates/question.html:329
+#: templates/question.html:288
+msgid "answer permanent link"
+msgstr ""
+
+#: templates/question.html:289
+msgid "permanent link"
+msgstr "link"
+
+#: templates/question.html:301
 msgid "undelete"
 msgstr ""
 
-#: templates/question.html:339
-msgid "answer permanent link"
+#: templates/question.html:346
+#, python-format
+msgid ""
+"\n"
+"                                                        see <strong>one</"
+"strong> more \n"
+"                                                        "
+msgid_plural ""
+"\n"
+"                                                        see <strong>%"
+"(counter)s</strong> more\n"
+"                                                        "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/question.html:352
+#, python-format
+msgid ""
+"\n"
+"                                                        see <strong>one</"
+"strong> more comment\n"
+"                                                        "
+msgid_plural ""
+"\n"
+"                                                        see <strong>%"
+"(counter)s</strong> more comments\n"
+"                                                        "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/question.html:378 templates/question.html.py:381
+msgid "Notify me once a day when there are any new answers"
 msgstr ""
+"<strong>Notify me</strong> once a day by email when there are any new "
+"answers or updates"
 
-#: templates/question.html:340
-msgid "permanent link"
+#: templates/question.html:384
+msgid "Notify me weekly when there are any new answers"
+msgstr ""
+"<strong>Notify me</strong> weekly when there are any new answers or updates"
+
+#: templates/question.html:389
+#, python-format
+msgid ""
+"\n"
+"                You can always adjust frequency of email updates from your %"
+"(profile_url)s\n"
+"                "
+msgstr ""
+"\n"
+"(note: you can always <a href='%(profile_url)s?"
+"sort=email_subscriptions'>adjust frequency</a> of email updates)"
+
+#: templates/question.html:396
+msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr ""
+"<span class='strong'>Here</span> (once you log in) you will be able to sign "
+"up for the periodic email updates about this question."
 
-#: templates/question.html:453
+#: templates/question.html:407
 msgid "Your answer"
 msgstr ""
 
-#: templates/question.html:456
+#: templates/question.html:409
+msgid "Be the first one to answer this question!"
+msgstr ""
+
+#: templates/question.html:415
 msgid "you can answer anonymously and then login"
 msgstr ""
-"<span class='strong big'>You are now not logged in</span> but you can answer "
-"first and then login"
+"<span class='strong big'>Please start posting your answer anonymously</span> "
+"- your answer will be saved within the current session and published after "
+"you log in or create a new account. Please try to give a <strong>substantial "
+"answer</strong>, for discussions, <strong>please use comments</strong> and "
+"<strong>please do remember to vote</strong> (after you log in)!"
 
-#: templates/question.html:479
-msgid "Answer the question"
+#: templates/question.html:419
+msgid "answer your own question only to give an answer"
 msgstr ""
+"<span class='big strong'>You are welcome to answer your own question</span>, "
+"but please make sure to give an <strong>answer</strong>. Remember that you "
+"can always <strong>revise your original question</strong>. Please "
+"<strong>use comments for discussions</strong>  and <strong>please don't "
+"forget to vote :)</strong> for the answers that you liked (or perhaps did "
+"not like)! "
 
-#: templates/question.html:481
-msgid "Notify me daily if there are any new answers."
+#: templates/question.html:421
+msgid "please only give an answer, no discussions"
 msgstr ""
+"<span class='big strong'>Please try to give a substantial answer</span>. If "
+"you wanted to comment on the question or answer, just <strong>use the "
+"commenting tool</strong>. Please remember that you can always <strong>revise "
+"your answers</strong> - no need to answer the same question twice. Also, "
+"please <strong>don't forget to vote</strong> - it really helps to select the "
+"best questions and answers!"
 
-#: templates/question.html:483
-msgid "once you sign in you will be able to subscribe for any updates here"
-msgstr "Here logged in users can sign up for the question updates."
+#: templates/question.html:457
+msgid "Login/Signup to Post Your Answer"
+msgstr ""
+
+#: templates/question.html:460
+msgid "Answer Your Own Question"
+msgstr ""
+
+#: templates/question.html:462
+msgid "Answer the question"
+msgstr "Post Your Answer"
 
-#: templates/question.html:494
+#: templates/question.html:475
 msgid "Question tags"
 msgstr "Tags"
 
-#: templates/question.html:504
+#: templates/question.html:485
 msgid "question asked"
 msgstr "Asked"
 
-#: templates/question.html:504 templates/question.html.py:510
-#: templates/user_info.html:51
-msgid "ago"
-msgstr ""
-
-#: templates/question.html:507
+#: templates/question.html:488
 msgid "question was seen"
 msgstr "Seen"
 
-#: templates/question.html:507
+#: templates/question.html:488
 msgid "times"
 msgstr ""
 
-#: templates/question.html:510
+#: templates/question.html:491
 msgid "last updated"
 msgstr "Last updated"
 
-#: templates/question.html:515
+#: templates/question.html:496
 msgid "Related questions"
 msgstr ""
 
-#: templates/question_edit.html:4 templates/question_edit.html.py:65
+#: templates/question_edit.html:5 templates/question_edit.html.py:66
 msgid "Edit question"
 msgstr ""
 
@@ -1791,57 +2261,57 @@ msgstr "Tips"
 
 #: templates/question_edit_tips.html:7
 msgid "please ask a relevant question"
-msgstr ""
+msgstr "ask a question relevant to the CNPROG community"
 
 #: templates/question_edit_tips.html:10
 msgid "please try provide enough details"
 msgstr "provide enough details"
 
-#: templates/question_retag.html:3 templates/question_retag.html.py:52
+#: templates/question_retag.html:4 templates/question_retag.html.py:53
 msgid "Change tags"
 msgstr ""
 
-#: templates/question_retag.html:39
+#: templates/question_retag.html:40
 msgid "up to 5 tags, less than 20 characters each"
 msgstr ""
 
-#: templates/question_retag.html:82
+#: templates/question_retag.html:83
 msgid "Why use and modify tags?"
 msgstr ""
 
-#: templates/question_retag.html:85
+#: templates/question_retag.html:86
 msgid "tags help us keep Questions organized"
 msgstr ""
 
-#: templates/question_retag.html:91
+#: templates/question_retag.html:94
 msgid "tag editors receive special awards from the community"
 msgstr ""
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "Found by tags"
 msgstr "Tagged questions"
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "Found by title"
 msgstr ""
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "All questions"
 msgstr ""
 
-#: templates/questions.html:25 templates/unanswered.html:20
+#: templates/questions.html:26 templates/unanswered.html:21
 msgid "most recently asked questions"
 msgstr ""
 
-#: templates/questions.html:26
+#: templates/questions.html:27
 msgid "most recently updated questions"
 msgstr ""
 
-#: templates/questions.html:26
+#: templates/questions.html:27
 msgid "active"
 msgstr ""
 
-#: templates/questions.html:109
+#: templates/questions.html:126
 #, python-format
 msgid ""
 "\n"
@@ -1860,7 +2330,7 @@ msgstr[1] ""
 "<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
 "class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
 
-#: templates/questions.html:116
+#: templates/questions.html:133
 #, python-format
 msgid ""
 "\n"
@@ -1881,7 +2351,7 @@ msgstr[1] ""
 "containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
 "p>"
 
-#: templates/questions.html:122
+#: templates/questions.html:139
 #, python-format
 msgid ""
 "\n"
@@ -1898,35 +2368,35 @@ msgstr[1] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
 
-#: templates/questions.html:131
+#: templates/questions.html:148
 msgid "latest questions info"
 msgstr "<strong>Newest</strong> questions are shown first."
 
-#: templates/questions.html:135
+#: templates/questions.html:152
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 
-#: templates/questions.html:136
+#: templates/questions.html:153
 msgid "Most recently answered ones are shown first."
 msgstr "<strong>Most recently answered</strong> questions are shown first."
 
-#: templates/questions.html:140
+#: templates/questions.html:157
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Questions sorted by the <strong>number of answers</strong>."
 
-#: templates/questions.html:141
+#: templates/questions.html:158
 msgid "Most answered questions are shown first."
 msgstr " "
 
-#: templates/questions.html:145
+#: templates/questions.html:162
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr ""
 
-#: templates/questions.html:146
+#: templates/questions.html:163
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:153 templates/unanswered.html:102
+#: templates/questions.html:168 templates/unanswered.html:118
 msgid "Related tags"
 msgstr "Tags"
 
@@ -1963,6 +2433,10 @@ msgstr ""
 msgid "Revision history"
 msgstr ""
 
+#: templates/revisions_answer.html:48 templates/revisions_question.html:48
+msgid "click to hide/show revision"
+msgstr ""
+
 #: templates/tags.html:6 templates/tags.html.py:30
 msgid "Tag list"
 msgstr ""
@@ -1995,16 +2469,16 @@ msgstr ""
 msgid "Nothing found"
 msgstr ""
 
-#: templates/unanswered.html:7 templates/unanswered.html.py:18
+#: templates/unanswered.html:8 templates/unanswered.html.py:19
 msgid "Unanswered questions"
 msgstr ""
 
-#: templates/unanswered.html:97
+#: templates/unanswered.html:114
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
-"questions"
+"<div class=\"questions-count\">%(num_q)s</div>questions <strong>without "
+"accepted answers</strong>"
 
 #: templates/user_edit.html:6
 msgid "Edit user profile"
@@ -2019,139 +2493,202 @@ msgid "image associated with your email address"
 msgstr ""
 
 #: templates/user_edit.html:31
-msgid "avatar"
-msgstr "<a href='/faq#gravatar'>gravatar</a>"
+#, python-format
+msgid "avatar, see %(gravatar_faq_url)s"
+msgstr "<a href='%(gravatar_faq_url)s'>gravatar</a>"
 
-#: templates/user_edit.html:36 templates/user_info.html:31
+#: templates/user_edit.html:36 templates/user_info.html:56
 msgid "Registered user"
 msgstr ""
 
-#: templates/user_edit.html:82
+#: templates/user_edit.html:82 templates/user_email_subscriptions.html:17
 msgid "Update"
 msgstr ""
 
-#: templates/user_info.html:34
+#: templates/user_email_subscriptions.html:8
+msgid "Email subscription settings"
+msgstr ""
+
+#: templates/user_email_subscriptions.html:9
+msgid "email subscription settings info"
+msgstr ""
+"<span class='big strong'>Adjust frequency of email updates.</span> Receive "
+"updates on interesting questions by email, <strong><br/>help the community</"
+"strong> by answering questions of your colleagues. If you do not wish to "
+"receive emails - select 'no email' on all items below.<br/>Updates are only "
+"sent when there is any new activity on selected items."
+
+#: templates/user_email_subscriptions.html:18
+msgid "Stop sending email"
+msgstr "Stop Email"
+
+#: templates/user_info.html:32
+msgid "Moderate this user"
+msgstr ""
+
+#: templates/user_info.html:45
 msgid "update profile"
 msgstr ""
 
-#: templates/user_info.html:40
+#: templates/user_info.html:60
 msgid "real name"
 msgstr ""
 
-#: templates/user_info.html:45
+#: templates/user_info.html:65
 msgid "member for"
-msgstr ""
+msgstr "member since"
 
-#: templates/user_info.html:50
+#: templates/user_info.html:70
 msgid "last seen"
 msgstr ""
 
-#: templates/user_info.html:56
+#: templates/user_info.html:76
 msgid "user website"
 msgstr ""
 
-#: templates/user_info.html:62
+#: templates/user_info.html:82
 msgid "location"
 msgstr ""
 
-#: templates/user_info.html:69
+#: templates/user_info.html:89
 msgid "age"
 msgstr ""
 
-#: templates/user_info.html:70
+#: templates/user_info.html:90
 msgid "age unit"
 msgstr "years old"
 
-#: templates/user_info.html:76
+#: templates/user_info.html:96
 msgid "todays unused votes"
 msgstr ""
 
-#: templates/user_info.html:77
+#: templates/user_info.html:97
 msgid "votes left"
 msgstr ""
 
-#: templates/user_preferences.html:10
-msgid "Connect with Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:13
-msgid "Twitter account name:"
-msgstr ""
-
-#: templates/user_preferences.html:15
-msgid "Twitter password:"
-msgstr ""
-
-#: templates/user_preferences.html:17
-msgid "Send my Questions to Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:18
-msgid "Send my Answers to Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:19
-msgid "Save"
-msgstr ""
+#: templates/user_stats.html:12
+#, python-format
+msgid ""
+"\n"
+"                <span class=\"count\">1</span> Question\n"
+"                "
+msgid_plural ""
+"\n"
+"                <span class=\"count\">%(counter)s</span> Questions\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:10
-msgid "User questions"
-msgstr ""
+#: templates/user_stats.html:23
+#, python-format
+msgid ""
+"\n"
+"                <span class=\"count\">1</span> Answer\n"
+"                "
+msgid_plural ""
+"\n"
+"                <span class=\"count\">%(counter)s</span> Answers\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:36
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:36
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:28
+#: templates/user_stats.html:46
 #, python-format
-msgid "the answer has been commented %(comment_count)s times"
-msgstr ""
+msgid ""
+"\n"
+"                    (one comment)\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    the answer has been commented %(comment_count)s times\n"
+"                    "
+msgstr[0] ""
+"\n"
+"(one comment)"
+msgstr[1] ""
+"\n"
+"(%(comment_count)s comments)"
 
-#: templates/user_stats.html:36
-msgid "Votes"
-msgstr ""
+#: templates/user_stats.html:61
+#, python-format
+msgid ""
+"\n"
+"                    <span class=\"count\">1</span> Vote\n"
+"                "
+msgid_plural ""
+"\n"
+"                    <span class=\"count\">%(cnt)s</span> Votes\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:41
+#: templates/user_stats.html:72
 msgid "thumb up"
 msgstr ""
 
-#: templates/user_stats.html:42
+#: templates/user_stats.html:73
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:46
+#: templates/user_stats.html:77
 msgid "thumb down"
 msgstr ""
 
-#: templates/user_stats.html:47
+#: templates/user_stats.html:78
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:54
-msgid "Tags"
-msgstr ""
+#: templates/user_stats.html:87
+#, python-format
+msgid ""
+"\n"
+"                    <span class=\"count\">1</span> Tag\n"
+"                "
+msgid_plural ""
+"\n"
+"                    <span class=\"count\">%(counter)s</span> Tags\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:61
+#: templates/user_stats.html:100
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
 
+#: templates/user_stats.html:114
+#, python-format
+msgid ""
+"\n"
+"            <span class=\"count\">1</span> Badge\n"
+"            "
+msgid_plural ""
+"\n"
+"            <span class=\"count\">%(counter)s</span> Badges\n"
+"            "
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/user_tabs.html:7
 msgid "User profile"
 msgstr ""
 
 #: templates/user_tabs.html:16
 msgid "graph of user reputation"
-msgstr ""
+msgstr "Graph of user karma"
 
 #: templates/user_tabs.html:17
 msgid "reputation history"
-msgstr ""
+msgstr "karma history"
 
 #: templates/user_tabs.html:23
 msgid "questions that user selected as his/her favorite"
@@ -2161,10 +2698,6 @@ msgstr ""
 msgid "favorites"
 msgstr ""
 
-#: templates/user_tabs.html:28
-msgid "settings"
-msgstr ""
-
 #: templates/users.html:6 templates/users.html.py:24
 msgid "Users"
 msgstr ""
@@ -2202,16 +2735,21 @@ msgstr ""
 msgid "thumb-up off"
 msgstr ""
 
-#: templates/users_questions.html:35
+#: templates/users_questions.html:34
 msgid "this answer has been accepted to be correct"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:7
-#: templates/authopenid/changeemail.html:33
+#: templates/authopenid/changeemail.html:3
+#: templates/authopenid/changeemail.html:9
+#: templates/authopenid/changeemail.html:38
 msgid "Change email"
 msgstr "Change Email"
 
-#: templates/authopenid/changeemail.html:10
+#: templates/authopenid/changeemail.html:11
+msgid "Save your email address"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:16
 #, python-format
 msgid "change %(email)s info"
 msgstr ""
@@ -2219,57 +2757,66 @@ msgstr ""
 "you'd like to use another email for <strong>update subscriptions</strong>."
 "<br>Currently you are using <strong>%(email)s</strong>"
 
-#: templates/authopenid/changeemail.html:13
-#: templates/authopenid/changeopenid.html:14
-#: templates/authopenid/changepw.html:19 templates/authopenid/delete.html:15
-#: templates/authopenid/delete.html:25
-msgid "Please correct errors below:"
+#: templates/authopenid/changeemail.html:18
+#, python-format
+msgid "here is why email is required, see %(gravatar_faq_url)s"
 msgstr ""
+"<span class='strong big'>Please enter your email address in the box below.</"
+"span> Valid email address is required on this Q&amp;"
+"A forum. If you like, you can <strong>receive updates</strong> on "
+"interesting questions or entire forum via email. Also, your email is used to "
+"create a unique <a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a> "
+"image for your account. Email addresses are never shown or otherwise shared "
+"with anybody else."
 
-#: templates/authopenid/changeemail.html:30
+#: templates/authopenid/changeemail.html:31
 msgid "Your new Email"
 msgstr ""
 "<strong>Your new Email:</strong> (will <strong>not</strong> be shown to "
 "anyone, must be valid)"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:154
-msgid "Password"
+msgid "Your Email"
 msgstr ""
+"<strong>Your Email</strong> (<i>must be valid, never shown to others</i>)"
 
-#: templates/authopenid/changeemail.html:42
+#: templates/authopenid/changeemail.html:38
+msgid "Save Email"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:49
 msgid "Validate email"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:45
+#: templates/authopenid/changeemail.html:52
 #, python-format
-msgid "validate %(email)s info"
+msgid "validate %(email)s info or go to %(change_email_url)s"
 msgstr ""
 "<span class=\"strong big\">An email with a validation link has been sent to %"
 "(email)s.</span> Please <strong>follow the emailed link</strong> with your "
 "web browser. Email validation is necessary to help insure the proper use of "
-"email on <span class=\"orange\">Q&amp;A</span> forum. If you would like "
-"to use <strong>another email</strong>, please <a href=\"/email/change/"
-"\"><strong>change it again</strong></a>."
+"email on <span class=\"orange\">Q&amp;A</span>. If you would like "
+"to use <strong>another email</strong>, please <a href='%(change_email_url)"
+"s'><strong>change it again</strong></a>."
 
-#: templates/authopenid/changeemail.html:50
+#: templates/authopenid/changeemail.html:57
 msgid "Email not changed"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:53
+#: templates/authopenid/changeemail.html:60
 #, python-format
-msgid "old %(email)s kept"
+msgid "old %(email)s kept, if you like go to %(change_email_url)s"
 msgstr ""
 "<span class=\"strong big\">Your email address %(email)s has not been changed."
 "</span> If you decide to change it later - you can always do it by editing "
-"it in your user profile or by using the <a href=\"/email/change/"
-"\"><strong>previous form</strong></a> again."
+"it in your user profile or by using the <a href='%(change_email_url)"
+"s'><strong>previous form</strong></a> again."
 
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:65
 msgid "Email changed"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:68
 #, python-format
 msgid "your current %(email)s can be used for this"
 msgstr ""
@@ -2278,11 +2825,11 @@ msgstr ""
 "Email notifications are sent once a day or less frequently - only when there "
 "are any news."
 
-#: templates/authopenid/changeemail.html:66
+#: templates/authopenid/changeemail.html:73
 msgid "Email verified"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:69
+#: templates/authopenid/changeemail.html:76
 msgid "thanks for verifying email"
 msgstr ""
 "<span class=\"big strong\">Thank you for verifying your email!</span> Now "
@@ -2291,11 +2838,11 @@ msgstr ""
 "updates</strong> - then will be notified about changes <strong>once a day</"
 "strong> or less frequently."
 
-#: templates/authopenid/changeemail.html:74
+#: templates/authopenid/changeemail.html:81
 msgid "email key not sent"
 msgstr "Validation email not sent"
 
-#: templates/authopenid/changeemail.html:77
+#: templates/authopenid/changeemail.html:84
 #, python-format
 msgid "email key not sent %(email)s change email here %(change_link)s"
 msgstr ""
@@ -2303,6 +2850,12 @@ msgstr ""
 "validated before</span> so the new key was not sent. You can <a href='%"
 "(change_link)s'>change</a> email used for update subscriptions if necessary."
 
+#: templates/authopenid/changeopenid.html:4
+#: templates/authopenid/changeopenid.html:30
+#: templates/authopenid/settings.html:34
+msgid "Change OpenID"
+msgstr ""
+
 #: templates/authopenid/changeopenid.html:8
 msgid "Account: change OpenID URL"
 msgstr ""
@@ -2312,97 +2865,129 @@ msgid ""
 "This is where you can change your OpenID URL. Make sure you remember it!"
 msgstr ""
 
+#: templates/authopenid/changeopenid.html:14
+#: templates/authopenid/delete.html:14 templates/authopenid/delete.html:24
+msgid "Please correct errors below:"
+msgstr ""
+
 #: templates/authopenid/changeopenid.html:29
 msgid "OpenID URL:"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:30
-msgid "Change OpenID"
+#: templates/authopenid/changepw.html:5 templates/authopenid/changepw.html:14
+#: templates/authopenid/settings.html:29
+msgid "Change password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:14
+#: templates/authopenid/changepw.html:7
 msgid "Account: change password"
-msgstr ""
+msgstr "Change your password"
 
-#: templates/authopenid/changepw.html:17
+#: templates/authopenid/changepw.html:8
 msgid "This is where you can change your password. Make sure you remember it!"
 msgstr ""
+"<span class='strong'>To change your password</span> please fill out and "
+"submit this form"
 
-#: templates/authopenid/changepw.html:27
-msgid "Current password"
-msgstr ""
-
-#: templates/authopenid/changepw.html:28
-msgid "New password"
-msgstr ""
-
-#: templates/authopenid/changepw.html:29
-msgid "New password again"
-msgstr ""
-
-#: templates/authopenid/changepw.html:30 templates/authopenid/settings.html:29
-msgid "Change password"
-msgstr ""
-
-#: templates/authopenid/complete.html:5
+#: templates/authopenid/complete.html:19
 msgid "Connect your OpenID with this site"
 msgstr "New user signup"
 
-#: templates/authopenid/complete.html:8
+#: templates/authopenid/complete.html:22
 msgid "Connect your OpenID with your account on this site"
 msgstr "New user signup"
 
-#: templates/authopenid/complete.html:12
+#: templates/authopenid/complete.html:27
 #, python-format
-msgid "register new %(provider)s account info"
+msgid "register new %(provider)s account info, see %(gravatar_faq_url)s"
 msgstr ""
 "<p><span class=\"big strong\">You are here for the first time with your %"
 "(provider)s login.</span> Please create your <strong>screen name</strong> "
 "and save your <strong>email</strong> address. Saved email address will let "
 "you <strong>subscribe for the updates</strong> on the most interesting "
 "questions and will be used to create and retrieve your unique avatar image - "
-"<a href='/faq#gravatar'><strong>gravatar</strong></a>."
+"<a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>"
 
-#: templates/authopenid/complete.html:14
+#: templates/authopenid/complete.html:31
+#, python-format
+msgid ""
+"%(username)s already exists, choose another name for \n"
+"                            %(provider)s. Email is required too, see %"
+"(gravatar_faq_url)s\n"
+"                        "
+msgstr ""
+"<p><span class='strong big'>Oops... looks like screen name %(username)s is "
+"already used in another account.</span></p><p>Please choose another screen name "
+"to use with your %(provider)s login. Also, a valid email address is "
+"required on the <span class='orange'>Q&amp;A</span> forum. Your "
+"email is used to create a unique <a href='%(gravatar_faq_url)"
+"s'><strong>gravatar</strong></a> image for your account. If you like, "
+"you can <strong>receive updates</strong> on the interesting questions or "
+"entire forum by email. Email addresses are never shown or otherwise shared "
+"with anybody else.</p>"
+
+#: templates/authopenid/complete.html:35
+#, python-format
+msgid ""
+"register new external %(provider)s account info, see %(gravatar_faq_url)s"
+msgstr ""
+"<p><span class=\"big strong\">You are here for the first time with your %"
+"(provider)s login.</span></p><p>You can either keep your <strong>screen "
+"name</strong> the same as your %(provider)s login name  or choose some other "
+"nickname.</p><p>Also, please save a valid <strong>email</strong> address. "
+"With the email you can <strong>subscribe for the updates</strong> on the "
+"most interesting questions. Email address is also used to create and "
+"retrieve your unique avatar image - <a href='%(gravatar_faq_url)"
+"s'><strong>gravatar</strong></a>.</p>"
+
+#: templates/authopenid/complete.html:40
 msgid "This account already exists, please use another."
 msgstr ""
 
-#: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/signin.html:138
+#: templates/authopenid/complete.html:55
 msgid "Sorry, looks like we have some errors:"
 msgstr ""
 
-#: templates/authopenid/complete.html:47
+#: templates/authopenid/complete.html:76
 msgid "Screen name label"
 msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)"
 
-#: templates/authopenid/complete.html:48
+#: templates/authopenid/complete.html:83
 msgid "Email address label"
 msgstr ""
 "<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with "
 "anyone, must be valid</i>)"
 
-#: templates/authopenid/complete.html:49
+#: templates/authopenid/complete.html:89 templates/authopenid/signup.html:15
+msgid "receive updates motivational blurb"
+msgstr ""
+"<strong>Receive forum updates by email</strong> - this will help our "
+"community grow and become more useful.<br/>By default "
+"<span class='orange'>Q&amp;A</span> forum sends up to <strong>one "
+"email digest per week</strong>  - only when there is anything new.<br/>If "
+"you like, please adjust this now or any time later from your user account."
+
+#: templates/authopenid/complete.html:91
 msgid "create account"
 msgstr "Signup"
 
-#: templates/authopenid/complete.html:56
+#: templates/authopenid/complete.html:100
 msgid "Existing account"
 msgstr ""
 
-#: templates/authopenid/complete.html:57
+#: templates/authopenid/complete.html:101
 msgid "user name"
 msgstr ""
 
-#: templates/authopenid/complete.html:58 templates/authopenid/signin.html:128
+#: templates/authopenid/complete.html:102
 msgid "password"
 msgstr ""
 
-#: templates/authopenid/complete.html:61
+#: templates/authopenid/complete.html:107
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:156
+#: templates/authopenid/complete.html:108 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr ""
 
@@ -2415,12 +3000,11 @@ msgid "Your account details are:"
 msgstr ""
 
 #: templates/authopenid/confirm_email.txt:6
-#: templates/authopenid/sendpw_email.txt:7
 msgid "Username:"
 msgstr ""
 
 #: templates/authopenid/confirm_email.txt:7
-#: templates/authopenid/delete.html:20
+#: templates/authopenid/delete.html:19
 msgid "Password:"
 msgstr ""
 
@@ -2430,45 +3014,51 @@ msgstr ""
 
 #: templates/authopenid/confirm_email.txt:12
 #: templates/authopenid/email_validation.txt:14
-#: templates/authopenid/sendpw_email.txt:13
+#: templates/authopenid/sendpw_email.txt:8
 msgid ""
 "Sincerely,\n"
 "Forum Administrator"
 msgstr ""
+"Sincerely,\n"
+"Q&A Forum Administrator"
+
+#: templates/authopenid/delete.html:4 templates/authopenid/settings.html:38
+msgid "Delete account"
+msgstr ""
 
-#: templates/authopenid/delete.html:9
+#: templates/authopenid/delete.html:8
 msgid "Account: delete account"
 msgstr ""
 
-#: templates/authopenid/delete.html:13
+#: templates/authopenid/delete.html:12
 msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
 msgstr ""
 
-#: templates/authopenid/delete.html:17
+#: templates/authopenid/delete.html:16
 msgid "Check confirm box, if you want delete your account."
 msgstr ""
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:31
 msgid "I am sure I want to delete my account."
 msgstr ""
 
-#: templates/authopenid/delete.html:33
+#: templates/authopenid/delete.html:32
 msgid "Password/OpenID URL"
 msgstr ""
 
-#: templates/authopenid/delete.html:33
+#: templates/authopenid/delete.html:32
 msgid "(required for your security)"
 msgstr ""
 
-#: templates/authopenid/delete.html:35
+#: templates/authopenid/delete.html:34
 msgid "Delete account permanently"
 msgstr ""
 
 #: templates/authopenid/email_validation.txt:2
 msgid "Greetings from the Q&A forum"
-msgstr "Greetings from the Q&amp;A forum"
+msgstr ""
 
 #: templates/authopenid/email_validation.txt:4
 msgid "To make use of the Forum, please follow the link below:"
@@ -2485,38 +3075,33 @@ msgid ""
 "for any inconvenience"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
-msgid "Send new password"
-msgstr ""
-
-#: templates/authopenid/sendpw.html:12
-msgid "Lost your password? No problem - here you can reset it."
+#: templates/authopenid/external_legacy_login_info.html:4
+#: templates/authopenid/external_legacy_login_info.html:7
+msgid "Traditional login information"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:13
-msgid ""
-"Please enter your username below and new password will be sent to your "
-"registered e-mail"
-msgstr ""
+#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:7
+msgid "Send new password"
+msgstr "Recover password"
 
-#: templates/authopenid/sendpw.html:28
-msgid "User name"
+#: templates/authopenid/sendpw.html:10
+msgid "password recovery information"
 msgstr ""
+"<span class='big strong'>Forgot you password? No problems - just get a new "
+"one!</span><br/>Please follow the following steps:<br/>&bull; submit your "
+"user name below and check your email<br/>&bull; <strong>follow the "
+"activation link</strong> for the new password - sent to you by email and "
+"login with the suggested password<br/>&bull; at this you might want to "
+"change your password to something you can remember better"
 
-#: templates/authopenid/sendpw.html:30
+#: templates/authopenid/sendpw.html:21
 msgid "Reset password"
-msgstr ""
+msgstr "Send me a new password"
 
-#: templates/authopenid/sendpw.html:30
+#: templates/authopenid/sendpw.html:22
 msgid "return to login"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:33
-msgid ""
-"Note: your new password will be activated only after you click the "
-"activation link in the email message"
-msgstr ""
-
 #: templates/authopenid/sendpw_email.txt:2
 #, python-format
 msgid ""
@@ -2525,15 +3110,18 @@ msgid ""
 msgstr ""
 
 #: templates/authopenid/sendpw_email.txt:5
-msgid "Your new account details are:"
-msgstr ""
-
-#: templates/authopenid/sendpw_email.txt:8
-msgid "New password:"
+#, python-format
+msgid ""
+"email explanation how to use new %(password)s for %(username)s\n"
+"with the %(key_link)s"
 msgstr ""
+"To change your password, please follow these steps:\n"
+"* visit this link: %(key_link)s\n"
+"* login with user name %(username)s and password %(password)s\n"
+"* go to your user profile and set the password to something you can remember"
 
-#: templates/authopenid/sendpw_email.txt:10
-msgid "To confirm that you wanted to reset your password please visit:"
+#: templates/authopenid/settings.html:4
+msgid "Account functions"
 msgstr ""
 
 #: templates/authopenid/settings.html:30
@@ -2552,15 +3140,11 @@ msgstr ""
 msgid "Change openid associated to your account"
 msgstr ""
 
-#: templates/authopenid/settings.html:38
-msgid "Delete account"
-msgstr ""
-
 #: templates/authopenid/settings.html:39
 msgid "Erase your username and all your data from website"
 msgstr ""
 
-#: templates/authopenid/signin.html:4 templates/authopenid/signin.html:21
+#: templates/authopenid/signin.html:5 templates/authopenid/signin.html:21
 msgid "User login"
 msgstr "User login"
 
@@ -2588,148 +3172,105 @@ msgstr ""
 "strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
 "posted once you log in.</span>"
 
-#: templates/authopenid/signin.html:40
+#: templates/authopenid/signin.html:42
 msgid "Click to sign in through any of these services."
 msgstr ""
-"<p><span class=\"big strong\">Please select your favorite login method below.</span>"
-"</p><p><font color=\"gray\">External login services use <a "
-"href=\"http://openid.net\"><b>OpenID</b></a> technology that increases "
-"security of your online identity and makes login process simpler. First option "
-"requires login name and password.</font></p>"
+"<p><span class=\"big strong\">Please select your favorite login method below."
+"</span></p><p><font color=\"gray\">External login services use <a href="
+"\"http://openid.net\"><b>OpenID</b></a> technology, where your password "
+"always stays confidential between you and your login provider and you don't "
+"have to remember another one. CNPROG option requires your login name and "
+"password entered here.</font></p>"
 
-#: templates/authopenid/signin.html:113
+#: templates/authopenid/signin.html:117
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
 msgstr ""
-"<span class=\"big strong\">Enter your <span id=\"enter_your_what\">Provider "
-"user name</span></span><br><span class='grey'>(or select another login method above)</span>"
+"<span class=\"big strong\">Enter your </span><span id=\"enter_your_what\" "
+"class='big strong'>Provider user name</span><br/><span class='grey'>(or "
+"select another login method above)</span>"
 
-#: templates/authopenid/signin.html:120
+#: templates/authopenid/signin.html:124
 msgid ""
 "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
 "web address"
 msgstr ""
 "<span class=\"big strong\">Enter your <a class=\"openid_logo\" href=\"http://"
-"openid.net\">OpenID</a> web address</span><br><span class='grey'>(or choose another login "
-"method above)</span>"
+"openid.net\">OpenID</a> web address</span><br/><span class='grey'>(or choose "
+"another login method above)</span>"
 
-#: templates/authopenid/signin.html:122 templates/authopenid/signin.html:130
-#: templates/authopenid/signin.html:155
+#: templates/authopenid/signin.html:126 templates/authopenid/signin.html:138
 msgid "Login"
 msgstr ""
 
-#: templates/authopenid/signin.html:125
+#: templates/authopenid/signin.html:129
 msgid "Enter your login name and password"
 msgstr ""
-"<span class='big strong'>Enter your forum login and password</span><br/>"
-"<span class='grey'>(or select your OpenID provider above)</span>"
-
-#: templates/authopenid/signin.html:126
-msgid "login name"
-msgstr ""
-
-#: templates/authopenid/signin.html:134
-msgid "we support two login modes"
-msgstr ""
-"You can log in either through one of these services or traditionally - using "
-"local username/password."
+"<span class='big strong'>Enter your CNPROG login and password</span><br/"
+"><span class='grey'>(or select your OpenID provider above)</span>"
 
-#: templates/authopenid/signin.html:152
-msgid "Use login name and password"
+#: templates/authopenid/signin.html:133
+msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:153
-msgid "Login name"
+#: templates/authopenid/signin.html:135
+msgid "Password"
 msgstr ""
 
-#: templates/authopenid/signin.html:157
-msgid "Create new account"
+#: templates/authopenid/signin.html:139
+msgid "Create account"
 msgstr ""
 
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:149
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:169
+#: templates/authopenid/signin.html:152
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:172
+#: templates/authopenid/signin.html:155
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:175
+#: templates/authopenid/signin.html:158
 msgid "openid is widely adopted"
 msgstr ""
 "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
 "enabled."
 
-#: templates/authopenid/signin.html:178
+#: templates/authopenid/signin.html:161
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:183
+#: templates/authopenid/signin.html:166
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:184
+#: templates/authopenid/signin.html:167
 msgid "Get OpenID"
 msgstr ""
 
-#: templates/authopenid/signup.html:4 templates/authopenid/signup.html.py:8
+#: templates/authopenid/signup.html:4
 msgid "Signup"
 msgstr ""
 
-#: templates/authopenid/signup.html:12
-msgid ""
-"We support two types of user registration: conventional username/password, "
-"and"
+#: templates/authopenid/signup.html:8
+msgid "Create login name and password"
 msgstr ""
 
-#: templates/authopenid/signup.html:12
-msgid "the OpenID method"
+#: templates/authopenid/signup.html:10
+msgid "Traditional signup info"
 msgstr ""
+"<span class='strong big'>If you prefer, create your forum login name and "
+"password here. However</span>, please keep in mind that we also support "
+"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can "
+"simply reuse your external login (e.g. Gmail or AOL) without ever sharing "
+"your login details with anyone and having to remember yet another password."
 
 #: templates/authopenid/signup.html:17
-msgid "Sorry, looks like we have some errors"
-msgstr ""
-
-#: templates/authopenid/signup.html:35
-msgid "Conventional registration"
-msgstr ""
-
-#: templates/authopenid/signup.html:36
-msgid "choose a user name"
-msgstr ""
-
-#: templates/authopenid/signup.html:42
-msgid "back to login"
+msgid "Create Account"
 msgstr ""
 
-#: templates/authopenid/signup.html:46
-msgid "Register with your OpenID"
+#: templates/authopenid/signup.html:19
+msgid "return to OpenID login"
 msgstr ""
-
-#: templates/authopenid/signup.html:49
-msgid "Login with your OpenID"
-msgstr ""
-
-#
-#~ msgid "editing tips"
-#~ msgstr "Tips"
-
-#~ msgid "Newest questions shown first."
-#~ msgstr ""
-#~ "Questions are sorted by <strong>entry date</strong>.Newest questions "
-#~ "shown first."
-
-#~ msgid ""
-#~ "please use space to separate tags (this enables autocomplete feature)"
-#~ msgstr "please use space to separate tags (uses autocomplete utility)"
-
-#~ msgid "select openid provider"
-#~ msgstr "1) Please select your id service provider."
-
-#~ msgid "verify openid link and login"
-#~ msgstr ""
-#~ "2) Please verify the OpenID URL (type your login name over {username}, if "
-#~ "present) and then log in."
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 91639ba1..fc7ebe14 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index d7655dd7..b528fcf2 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,21 +2,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-17 16:44+0000\n"
-"PO-Revision-Date: 2009-08-17 10:04-0600\n"
+"POT-Creation-Date: 2009-08-12 15:53+0000\n"
+"PO-Revision-Date: \n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:310 forum/views.py:705
+#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698
 msgid "account/"
 msgstr "cuenta/"
 
 #: settings.py:12 urls.py:26 django_authopenid/urls.py:9
 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11
-#: django_authopenid/urls.py:13 forum/views.py:310 forum/views.py:706
+#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699
+#: templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -24,132 +25,127 @@ msgstr "ingresar/"
 msgid "upfiles/"
 msgstr "archivossubidos/"
 
-#: urls.py:27 django_authopenid/urls.py:16
-msgid "signup/"
-msgstr "registrarse/"
-
-#: urls.py:28 urls.py:29 urls.py:30 django_authopenid/urls.py:26
+#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26
 #: django_authopenid/urls.py:27
 msgid "email/"
 msgstr "email/"
 
-#: urls.py:28
+#: urls.py:27
 msgid "change/"
 msgstr "cambiar/"
 
-#: urls.py:29
+#: urls.py:28
 msgid "sendkey/"
 msgstr "enviarclave/"
 
-#: urls.py:30
+#: urls.py:29
 msgid "verify/"
 msgstr "verificar/"
 
-#: urls.py:31
+#: urls.py:30
 msgid "about/"
 msgstr "acercadenosotros/"
 
-#: urls.py:32
+#: urls.py:31
 msgid "faq/"
 msgstr "preguntasfrecuentes/"
 
-#: urls.py:33
+#: urls.py:32
 msgid "privacy/"
 msgstr "códigodeprivacidad/"
 
-#: urls.py:34
+#: urls.py:33
 msgid "logout/"
 msgstr "cerrarsesion/"
 
-#: urls.py:35 urls.py:36 urls.py:37 urls.py:49 forum/models.py:425
+#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
 msgid "answers/"
 msgstr "respuestas/"
 
-#: urls.py:35 urls.py:47
+#: urls.py:34 urls.py:46
 msgid "comments/"
 msgstr "comentarios/"
 
-#: urls.py:36 urls.py:41 urls.py:55 templates/user_info.html:34
+#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
 msgid "edit/"
 msgstr "editar/"
 
-#: urls.py:37 urls.py:46
+#: urls.py:36 urls.py:45
 msgid "revisions/"
 msgstr "revisiones/"
 
-#: urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 urls.py:43
-#: urls.py:44 urls.py:45 urls.py:46 urls.py:47 urls.py:48 forum/feed.py:19
-#: forum/models.py:313 forum/views.py:1232 forum/views.py:1234
-#: forum/views.py:1474
+#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
+#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
+#: forum/models.py:306 forum/views.py:1416
 msgid "questions/"
 msgstr "preguntas/"
 
-#: urls.py:39 urls.py:65
+#: urls.py:38 urls.py:64
 msgid "ask/"
 msgstr "preguntar/"
 
-#: urls.py:40
+#: urls.py:39
 msgid "unanswered/"
 msgstr "sinrespuesta/"
 
-#: urls.py:42
+#: urls.py:41
 msgid "close/"
 msgstr "cerrar/"
 
-#: urls.py:43
+#: urls.py:42
 msgid "reopen/"
 msgstr "reabrir/"
 
-#: urls.py:44
+#: urls.py:43
 msgid "answer/"
 msgstr "respuesta/"
 
-#: urls.py:45
+#: urls.py:44
 msgid "vote/"
 msgstr "votar/"
 
-#: urls.py:48 urls.py:49 django_authopenid/urls.py:29
+#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
 msgid "delete/"
 msgstr "borrar/"
 
-#: urls.py:51
+#: urls.py:50
 msgid "question/"
 msgstr "pregunta/"
 
-#: urls.py:52 urls.py:53 forum/views.py:747 forum/views.py:2071
+#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
 msgid "tags/"
 msgstr "etiquetas/"
 
-#: urls.py:54 urls.py:55 urls.py:56 forum/views.py:1034 forum/views.py:1038
-#: forum/views.py:1476 forum/views.py:1809 forum/views.py:2073
+#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997
+#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015
 msgid "users/"
 msgstr "usuarios/"
 
-#: urls.py:57 urls.py:58
+#: urls.py:56 urls.py:57
 msgid "badges/"
 msgstr "distinciones/"
 
-#: urls.py:59
+#: urls.py:58
 msgid "messages/"
 msgstr "mensajes/"
 
-#: urls.py:59
+#: urls.py:58
 msgid "markread/"
 msgstr "marcarleido/"
 
-#: urls.py:61
+#: urls.py:60
 msgid "nimda/"
 msgstr "administrador/"
 
-#: urls.py:63
+#: urls.py:62
 msgid "upload/"
 msgstr "subir/"
 
-#: urls.py:64 urls.py:65 urls.py:66
+#: urls.py:63 urls.py:64 urls.py:65
 msgid "books/"
 msgstr "libros/"
 
-#: urls.py:67
+#: urls.py:66
 msgid "search/"
 msgstr "buscar/"
 
@@ -244,7 +240,7 @@ msgstr "la nueva contraseña no coincide"
 msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
-#: django_authopenid/urls.py:10 forum/views.py:310 forum/views.py:706
+#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699
 msgid "newquestion/"
 msgstr "nuevapregunta/"
 
@@ -264,19 +260,14 @@ msgstr "completado/"
 msgid "register/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:19
+#: django_authopenid/urls.py:16
+msgid "signup/"
+msgstr "registrarse/"
+
+#: django_authopenid/urls.py:18
 msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
-#: django_authopenid/urls.py:20
-#, fuzzy
-msgid "password/"
-msgstr "contraseña"
-
-#: django_authopenid/urls.py:20
-msgid "confirm/"
-msgstr ""
-
 #: django_authopenid/urls.py:27
 msgid "validate/"
 msgstr ""
@@ -532,8 +523,8 @@ msgstr ""
 "por favor use solo los siguientes caracteres en los nombres de etiquetas: "
 "letras 'a-z', números y caracteres '.-_#'"
 
-#: forum/forms.py:75 templates/index.html:57 templates/question.html:210
-#: templates/question.html.py:396 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:209
+#: templates/question.html.py:395 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
 #: templates/unanswered.html.py:60
 msgid "community wiki"
@@ -559,84 +550,75 @@ msgstr ""
 "ingresa un breve resumen de tu revisión (ej. error ortográfico, gramática, "
 "mejoras de estilo. Este campo es opcional."
 
-#: forum/forms.py:98 forum/forms.py:159
-msgid "please choice a category"
-msgstr "por favor escoja una categoría"
-
-#: forum/forms.py:99 forum/forms.py:160
-msgid "Category"
-msgstr "Categoría"
-
-#: forum/forms.py:180
+#: forum/forms.py:175
 msgid "this email does not have to be linked to gravatar"
 msgstr "este email no tiene porque estar asociado a un Gravatar"
 
-#: forum/forms.py:181
+#: forum/forms.py:176
 msgid "Real name"
 msgstr "Nombre real"
 
-#: forum/forms.py:182
+#: forum/forms.py:177
 msgid "Website"
 msgstr "Sitio Web"
 
-#: forum/forms.py:183
+#: forum/forms.py:178
 msgid "Location"
 msgstr "Ubicación"
 
-#: forum/forms.py:184
+#: forum/forms.py:179
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: forum/forms.py:184
+#: forum/forms.py:179
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD"
 
-#: forum/forms.py:185 templates/authopenid/settings.html:21
+#: forum/forms.py:180 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr "Perfil"
 
-#: forum/forms.py:212 forum/forms.py:213
+#: forum/forms.py:207 forum/forms.py:208
 msgid "this email has already been registered, please use another one"
 msgstr "este email ya ha sido registrado, por favor use otro"
 
-#: forum/models.py:253
-#, python-format
+#: forum/models.py:246
 msgid "%(author)s modified the question"
 msgstr "%(author)s modificó la pregunta"
 
-#: forum/models.py:257
+#: forum/models.py:250
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr "%(people)s publicaron %(new_answer_count)s nuevas respuestas"
 
-#: forum/models.py:262
+#: forum/models.py:255
 #, python-format
 msgid "%(people)s commented the question"
 msgstr "%(people)s comentarion la pregunta"
 
-#: forum/models.py:267
+#: forum/models.py:260
 #, python-format
 msgid "%(people)s commented answers"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:269
+#: forum/models.py:262
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:313 forum/models.py:425
+#: forum/models.py:306 forum/models.py:418
 msgid "revisions"
 msgstr "revisiones/"
 
-#: forum/models.py:448 templates/badges.html:51
+#: forum/models.py:441 templates/badges.html:51
 msgid "gold"
 msgstr "oro"
 
-#: forum/models.py:449 templates/badges.html:59
+#: forum/models.py:442 templates/badges.html:59
 msgid "silver"
 msgstr "plata"
 
-#: forum/models.py:450 templates/badges.html:66
+#: forum/models.py:443 templates/badges.html:66
 msgid "bronze"
 msgstr "bronce"
 
@@ -724,27 +706,27 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:988
+#: forum/views.py:947
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr "subscripción guardada, %(email)s necesita validación"
 
-#: forum/views.py:1918
+#: forum/views.py:1860
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr "para subir imagenes debes tener más de 60 puntos de reputación"
 
-#: forum/views.py:1920
+#: forum/views.py:1862
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', "
 "'tiff'"
 
-#: forum/views.py:1922
+#: forum/views.py:1864
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1924
+#: forum/views.py:1866
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -868,22 +850,22 @@ msgid "select revision"
 msgstr "seleccionar revisión"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:468 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "Toggle the real time Markdown editor preview"
 msgstr "Activar la visualización en tiempo real de Markdown"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:468 templates/question_edit.html:91
+#: templates/question.html:467 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr "Activar previsualización"
 
-#: templates/answer_edit.html:71 templates/question_edit.html:121
+#: templates/answer_edit.html:71 templates/question_edit.html:115
 #: templates/question_retag.html:73
 msgid "Save edit"
 msgstr "Guardar la edición"
 
 #: templates/answer_edit.html:72 templates/close.html:29
-#: templates/question_edit.html:122 templates/question_retag.html:74
+#: templates/question_edit.html:116 templates/question_retag.html:74
 #: templates/reopen.html:30 templates/user_edit.html:83
 #: templates/authopenid/changeemail.html:34
 msgid "Cancel"
@@ -974,16 +956,15 @@ msgstr ""
 "a>. <br/> Puedes enviar tu pregunta ahora y validar tu email luego. Tu "
 "pregunta será guardada mientras tanto y publicada cuando valides tu email."
 
-#: templates/ask.html:107 templates/ask.html.py:114
-#: templates/question_edit.html:117
+#: templates/ask.html:107
 msgid "(required)"
 msgstr "(requerido)"
 
-#: templates/ask.html:121
+#: templates/ask.html:114
 msgid "Login/signup to post your question"
 msgstr "Iniciar sesión/registrarse para publicar su pregunta"
 
-#: templates/ask.html:123
+#: templates/ask.html:116
 msgid "Ask your question"
 msgstr "Haz tu pregunta"
 
@@ -999,7 +980,7 @@ msgstr "Usuarios han sido galardonados con distinciones:"
 msgid "Badges summary"
 msgstr "Resumen de distinciones"
 
-#: templates/badges.html:17 templates/user_stats.html:73
+#: templates/badges.html:17 templates/user_stats.html:115
 msgid "Badges"
 msgstr "Distinciones"
 
@@ -1100,17 +1081,17 @@ msgid "ask the author"
 msgstr "preguntar al autor"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:18
+#: templates/users_questions.html:17
 msgid "this question was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:11 templates/users_questions.html.py:18
+#: templates/users_questions.html:11 templates/users_questions.html.py:17
 msgid "number of times"
 msgstr "numero de veces"
 
 #: templates/book.html:105 templates/index.html:48 templates/questions.html:46
-#: templates/unanswered.html:37 templates/users_questions.html:32
+#: templates/unanswered.html:37 templates/users_questions.html:30
 msgid "votes"
 msgstr "votos"
 
@@ -1119,14 +1100,14 @@ msgid "the answer has been accepted to be correct"
 msgstr "la respuesta ha sido aceptada como correcta"
 
 #: templates/book.html:115 templates/index.html:49 templates/questions.html:47
-#: templates/unanswered.html:38 templates/users_questions.html:42
+#: templates/unanswered.html:38 templates/users_questions.html:40
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/index.html:69 templates/question.html:500
-#: templates/questions.html:84 templates/questions.html.py:157
+#: templates/book.html:125 templates/index.html:69 templates/question.html:499
+#: templates/questions.html:84 templates/questions.html.py:156
 #: templates/tags.html:49 templates/unanswered.html:75
-#: templates/unanswered.html.py:106 templates/users_questions.html:54
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "using tags"
 msgstr "usando etiquetas"
 
@@ -1138,23 +1119,6 @@ msgstr "suscribirse al RSS del libro"
 msgid "subscribe to the questions feed"
 msgstr "suscribirse al agregado de noticias"
 
-#: templates/categories.html:6 templates/categories.html.py:29
-msgid "Category list"
-msgstr "Lista de Categorías"
-
-#: templates/categories.html:34 templates/tags.html:42
-msgid "Nothing found"
-msgstr "Nada encontrado"
-
-#: templates/categories.html:40
-#, fuzzy
-msgid "see questions that matches"
-msgstr "ver preguntas etiquetadas"
-
-#: templates/categories.html:40
-msgid "category "
-msgstr "categoría"
-
 #: templates/close.html:6 templates/close.html.py:16
 msgid "Close question"
 msgstr "Cerrar pregunta"
@@ -1514,14 +1478,14 @@ msgid "all questions"
 msgstr "todas las preguntas"
 
 #: templates/index.html:47 templates/questions.html:45
-#: templates/unanswered.html:36 templates/users_questions.html:37
+#: templates/unanswered.html:36 templates/users_questions.html:35
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:69 templates/question.html:500
-#: templates/questions.html:84 templates/questions.html.py:157
+#: templates/index.html:69 templates/question.html:499
+#: templates/questions.html:84 templates/questions.html.py:156
 #: templates/tags.html:49 templates/unanswered.html:75
-#: templates/unanswered.html.py:106 templates/users_questions.html:54
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
@@ -1668,7 +1632,7 @@ msgid "i like this post (click again to cancel)"
 msgstr "Me gusta esta entrada (clickear devuelta para cancelar)"
 
 #: templates/question.html:75 templates/question.html.py:89
-#: templates/question.html:290
+#: templates/question.html:289
 msgid "current number of votes"
 msgstr "número actual de votos"
 
@@ -1687,171 +1651,169 @@ msgstr ""
 "remover marca de favorito a esta pregunta (clickear devuelta para volver a "
 "marcar)"
 
-#: templates/question.html:128 templates/questions.html:87
-msgid "Category: "
-msgstr "Categoría: "
-
-#: templates/question.html:135 templates/question.html.py:323
+#: templates/question.html:134 templates/question.html.py:322
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
 msgstr "editar"
 
-#: templates/question.html:139 templates/question.html.py:333
+#: templates/question.html:138 templates/question.html.py:332
 msgid "delete"
 msgstr "borrar"
 
-#: templates/question.html:144
+#: templates/question.html:143
 msgid "reopen"
 msgstr "re-abrir"
 
-#: templates/question.html:149
+#: templates/question.html:148
 msgid "close"
 msgstr "cerrar"
 
-#: templates/question.html:155 templates/question.html.py:346
+#: templates/question.html:154 templates/question.html.py:345
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 "reportar como ofensivo (ej. contiene spam, publicidad, texto malicioso, etc.)"
 
-#: templates/question.html:156 templates/question.html.py:347
+#: templates/question.html:155 templates/question.html.py:346
 msgid "flag offensive"
 msgstr "marcar como ofensivo"
 
-#: templates/question.html:168 templates/question.html.py:356
+#: templates/question.html:167 templates/question.html.py:355
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
 msgstr "actualizado"
 
-#: templates/question.html:217 templates/question.html.py:403
+#: templates/question.html:216 templates/question.html.py:402
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
 msgstr "preguntado"
 
-#: templates/question.html:247 templates/question.html.py:430
+#: templates/question.html:246 templates/question.html.py:429
 msgid "comments"
 msgstr "comentarios"
 
-#: templates/question.html:248 templates/question.html.py:431
+#: templates/question.html:247 templates/question.html.py:430
 msgid "add comment"
 msgstr "agregar comentario"
 
-#: templates/question.html:261
-msgid "The question has been closed for the following reason"
-msgstr "La pregunta fue cerrada por el siguiente motivo "
-
-#: templates/question.html:261
-msgid "by"
-msgstr "por"
+#: templates/question.html:260
+#, python-format
+msgid ""
+"The question has been closed for the following reason \"%(question."
+"get_close_reason_display)s\" by"
+msgstr ""
+"La pregunta ha sido cerrada por el siguiente motivo \"%(question."
+"get_close_reason_display)s\" por"
 
-#: templates/question.html:263
-msgid "close date "
-msgstr "fecha de cierre"
+#: templates/question.html:262
+#, python-format
+msgid "close date %(question.closed_at)s"
+msgstr "fecha de cerrada %(question.closed_at)s"
 
-#: templates/question.html:270 templates/user_stats.html:13
+#: templates/question.html:269 templates/user_stats.html:28
 msgid "Answers"
 msgstr "Respuestas"
 
-#: templates/question.html:272
+#: templates/question.html:271
 msgid "oldest answers will be shown first"
 msgstr "la respuesta mas vieja será mostrada primero"
 
-#: templates/question.html:272
+#: templates/question.html:271
 msgid "oldest answers"
 msgstr "pregunta más vieja"
 
-#: templates/question.html:273
+#: templates/question.html:272
 msgid "newest answers will be shown first"
 msgstr "preguntas más nuevas serán mostradas primero"
 
-#: templates/question.html:273
+#: templates/question.html:272
 msgid "newest answers"
 msgstr "más nuevas"
 
-#: templates/question.html:274
+#: templates/question.html:273
 msgid "most voted answers will be shown first"
 msgstr "las preguntas más votadas serán mostradas primero"
 
-#: templates/question.html:274
+#: templates/question.html:273
 msgid "popular answers"
 msgstr "respuestas populares"
 
-#: templates/question.html:288 templates/question.html.py:289
+#: templates/question.html:287 templates/question.html.py:288
 msgid "i like this answer (click again to cancel)"
 msgstr "me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:295 templates/question.html.py:296
+#: templates/question.html:294 templates/question.html.py:295
 msgid "i dont like this answer (click again to cancel)"
 msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:301 templates/question.html.py:302
+#: templates/question.html:300 templates/question.html.py:301
 msgid "mark this answer as favorite (click again to undo)"
 msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)"
 
-#: templates/question.html:307 templates/question.html.py:308
+#: templates/question.html:306 templates/question.html.py:307
 msgid "the author of the question has selected this answer as correct"
 msgstr "el autor de esta pregunta ha seleccionado esta respuesta como correcta"
 
-#: templates/question.html:330
+#: templates/question.html:329
 msgid "undelete"
 msgstr "deshacer eliminar"
 
-#: templates/question.html:340
+#: templates/question.html:339
 msgid "answer permanent link"
 msgstr "enlace permanente a respuesta"
 
-#: templates/question.html:341
+#: templates/question.html:340
 msgid "permanent link"
 msgstr "enlace permanente"
 
-#: templates/question.html:454
+#: templates/question.html:453
 msgid "Your answer"
 msgstr "Tu respuesta"
 
-#: templates/question.html:457
+#: templates/question.html:456
 msgid "you can answer anonymously and then login"
 msgstr "puedes responder de forma anónima y luego ingresar"
 
-#: templates/question.html:480
+#: templates/question.html:479
 msgid "Answer the question"
 msgstr "Responde la pregunta"
 
-#: templates/question.html:482
+#: templates/question.html:481
 msgid "Notify me daily if there are any new answers."
 msgstr "Notificarme diariamente si hay nuevas respuestas."
 
-#: templates/question.html:484
+#: templates/question.html:483
 msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr ""
 "una vez que hayas ingresado podrás suscribirte a cualquiera de las "
 "actualizaciones aquí."
 
-#: templates/question.html:495
+#: templates/question.html:494
 msgid "Question tags"
 msgstr "Tags de la pregunta"
 
-#: templates/question.html:505
+#: templates/question.html:504
 msgid "question asked"
 msgstr "pregunta preguntada"
 
-#: templates/question.html:505 templates/question.html.py:511
+#: templates/question.html:504 templates/question.html.py:510
 #: templates/user_info.html:51
 msgid "ago"
 msgstr " atras"
 
-#: templates/question.html:508
+#: templates/question.html:507
 msgid "question was seen"
 msgstr "la pregunta fue vista"
 
-#: templates/question.html:508
+#: templates/question.html:507
 msgid "times"
 msgstr "veces"
 
-#: templates/question.html:511
+#: templates/question.html:510
 msgid "last updated"
 msgstr "última vez actualizada"
 
-#: templates/question.html:516
+#: templates/question.html:515
 msgid "Related questions"
 msgstr "Preguntas relacionadas"
 
@@ -1916,7 +1878,7 @@ msgstr "preguntas actualizadas más recientemente"
 msgid "active"
 msgstr "actividad"
 
-#: templates/questions.html:110
+#: templates/questions.html:109
 #, python-format
 msgid ""
 "\n"
@@ -1935,7 +1897,7 @@ msgstr[1] ""
 "\t\t\ttiene un total de %(q_num)s preguntas etiquetadas con %(tagname)s\n"
 "\t\t\t"
 
-#: templates/questions.html:117
+#: templates/questions.html:116
 #, python-format
 msgid ""
 "\n"
@@ -1954,7 +1916,7 @@ msgstr[1] ""
 "\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n"
 "\t\t\t"
 
-#: templates/questions.html:123
+#: templates/questions.html:122
 #, fuzzy, python-format
 msgid ""
 "\n"
@@ -1967,36 +1929,36 @@ msgid_plural ""
 msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
 msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
 
-#: templates/questions.html:132
+#: templates/questions.html:131
 msgid "latest questions info"
 msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/questions.html:136
+#: templates/questions.html:135
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 "Las preguntas estan ordenadas por <strong>fecha de último update</strong>."
 
-#: templates/questions.html:137
+#: templates/questions.html:136
 msgid "Most recently answered ones are shown first."
 msgstr "Las más recientemente respondidas son mostradas primero."
 
-#: templates/questions.html:141
+#: templates/questions.html:140
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Preguntas ordenadas por <strong>número de respuestas</strong>."
 
-#: templates/questions.html:142
+#: templates/questions.html:141
 msgid "Most answered questions are shown first."
 msgstr "Preguntas más respondidas aparecen primero."
 
-#: templates/questions.html:146
+#: templates/questions.html:145
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>."
 
-#: templates/questions.html:147
+#: templates/questions.html:146
 msgid "Most voted questions are shown first."
 msgstr "Las preguntas más votadas son mostradas primero."
 
-#: templates/questions.html:154 templates/unanswered.html:102
+#: templates/questions.html:153 templates/unanswered.html:102
 msgid "Related tags"
 msgstr "Etiquetas relacionadas"
 
@@ -2061,6 +2023,10 @@ msgstr "Todas las etiquetas que coincidan con la busqueda"
 msgid "all tags - make this empty in english"
 msgstr "todas las tags"
 
+#: templates/tags.html:42
+msgid "Nothing found"
+msgstr "Nada encontrado"
+
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
 msgid "Unanswered questions"
 msgstr "Preguntas sin respuesta"
@@ -2160,50 +2126,41 @@ msgstr "Enviar mis respuestas a Twitter"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/user_stats.html:10
+#: templates/user_stats.html:16
 msgid "User questions"
 msgstr "Preguntas del usuario"
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:38
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr "la respuesta ha sido votada %(vote_count)s veces"
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:38
 msgid "this answer has been selected as correct"
 msgstr "esta respuesta ha sido seleccionada como correcta"
 
-#: templates/user_stats.html:28
+#: templates/user_stats.html:46
 #, python-format
 msgid "the answer has been commented %(comment_count)s times"
 msgstr "la respuesta ha sido comentada %(comment_count)s veces"
 
-#: templates/user_stats.html:36
-#, fuzzy
-msgid "Votes"
-msgstr "votos"
-
-#: templates/user_stats.html:41
-msgid "thumb up"
-msgstr ""
+#: templates/user_stats.html:60
+msgid "votes total"
+msgstr "votos totales"
 
-#: templates/user_stats.html:42
+#: templates/user_stats.html:69
 msgid "user has voted up this many times"
 msgstr "el usuario ha votado positivo esta cantidad de veces"
 
-#: templates/user_stats.html:46
-msgid "thumb down"
-msgstr ""
-
-#: templates/user_stats.html:47
+#: templates/user_stats.html:74
 msgid "user voted down this many times"
 msgstr "el usuario voto negativo esta cantidad de veces"
 
-#: templates/user_stats.html:54
+#: templates/user_stats.html:87
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/user_stats.html:61
+#: templates/user_stats.html:97
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr "ver otras preguntas etiqueteadas '%(tag)s'"
@@ -2220,11 +2177,6 @@ msgstr "gráfica de la reputación del usuario"
 msgid "reputation history"
 msgstr "historial de reputación"
 
-#: templates/user_tabs.html:23
-#, fuzzy
-msgid "questions that user selected as his/her favorite"
-msgstr "esta pregunta ha sido seleccionada como favorita"
-
 #: templates/user_tabs.html:24
 msgid "favorites"
 msgstr "favoritos"
@@ -2262,15 +2214,7 @@ msgstr "Nada encontrado."
 msgid "this questions was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
-#: templates/users_questions.html:12
-msgid "thumb-up on"
-msgstr ""
-
-#: templates/users_questions.html:19
-msgid "thumb-up off"
-msgstr ""
-
-#: templates/users_questions.html:35
+#: templates/users_questions.html:33
 msgid "this answer has been accepted to be correct"
 msgstr "esta respuesta ha sido aceptada como correcta"
 
@@ -2296,7 +2240,7 @@ msgid "Your new Email"
 msgstr "Tu nuevo Email"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:136
 msgid "Password"
 msgstr "Contraseña"
 
@@ -2404,7 +2348,7 @@ msgid "This account already exists, please use another."
 msgstr "Esta cuenta ya existe, por favor usar otra."
 
 #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/sendpw.html:16 templates/authopenid/signin.html:121
+#: templates/authopenid/signin.html:120
 msgid "Sorry, looks like we have some errors:"
 msgstr "Ups, parece que hay errores:"
 
@@ -2436,10 +2380,40 @@ msgstr "contraseña"
 msgid "Register"
 msgstr "Registrarse"
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:139
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
+#: templates/authopenid/confirm_email.txt:2
+msgid "Thank you for registering at our Q&A forum!"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:4
+msgid "Your account details are:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:6
+#: templates/authopenid/sendpw_email.txt:7
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: templates/authopenid/confirm_email.txt:7
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr "Contraseña"
+
+#: templates/authopenid/confirm_email.txt:9
+msgid "Please sign in here:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:12
+#: templates/authopenid/email_validation.txt:14
+#: templates/authopenid/sendpw_email.txt:13
+msgid ""
+"Sincerely,\n"
+"Forum Administrator"
+msgstr ""
+
 #: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr "Cuenta: borrar cuenta"
@@ -2456,10 +2430,6 @@ msgstr ""
 msgid "Check confirm box, if you want delete your account."
 msgstr "Marca caja de confirmación, si deseas borrar tu cuenta."
 
-#: templates/authopenid/delete.html:20
-msgid "Password:"
-msgstr "Contraseña"
-
 #: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr "Estoy seguro que quiero borrar mi cuenta."
@@ -2476,6 +2446,25 @@ msgstr "(requerido por tu seguridad)"
 msgid "Delete account permanently"
 msgstr "Borrar la cuenta de forma permanente"
 
+#: templates/authopenid/email_validation.txt:2
+msgid "Greetings from the Q&A forum"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:4
+msgid "To make use of the Forum, please follow the link below:"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:8
+msgid "Following the link above will help us verify your email address."
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:10
+msgid ""
+"If you beleive that this message was sent in mistake - \n"
+"no further action is needed. Just ingore this email, we apologize\n"
+"for any inconvenience"
+msgstr ""
+
 #: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr "Enviar nueva contraseña"
@@ -2512,6 +2501,26 @@ msgstr ""
 "Nota: tu nueva contraseña solo será activada luego de que hagas click en el "
 "link de activación en el email enviado."
 
+#: templates/authopenid/sendpw_email.txt:2
+#, python-format
+msgid ""
+"Someone has requested to reset your password on %(site_url)s.\n"
+"If it were not you, it is safe to ignore this email."
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:5
+msgid "Your new account details are:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:8
+#, fuzzy
+msgid "New password:"
+msgstr "Nueva contraseña:"
+
+#: templates/authopenid/sendpw_email.txt:10
+msgid "To confirm that you wanted to reset your password please visit:"
+msgstr ""
+
 #: templates/authopenid/settings.html:30
 msgid "Give your  account a new password."
 msgstr "Crea una nueva contraseña para tu cuenta."
@@ -2580,7 +2589,7 @@ msgstr ""
 "Ingresa tu dirección (URL) de <a class=\"openid_logo\" href=\"http://openid."
 "net\">OpenID</a>"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:138
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
 msgid "Login"
 msgstr "Ingresar"
 
@@ -2588,48 +2597,48 @@ msgstr "Ingresar"
 msgid "we support two login modes"
 msgstr "soportamos dos tipos de ingreso"
 
-#: templates/authopenid/signin.html:135
+#: templates/authopenid/signin.html:134
 msgid "Use login name and password"
 msgstr "Nombre de usuario y contraseña"
 
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:135
 msgid "Login name"
 msgstr "Nombre de usuario"
 
-#: templates/authopenid/signin.html:140
+#: templates/authopenid/signin.html:139
 msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-#: templates/authopenid/signin.html:149
+#: templates/authopenid/signin.html:148
 msgid "Why use OpenID?"
 msgstr "¿Porqué usar OpenID?"
 
-#: templates/authopenid/signin.html:152
+#: templates/authopenid/signin.html:151
 msgid "with openid it is easier"
 msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña."
 
-#: templates/authopenid/signin.html:155
+#: templates/authopenid/signin.html:154
 msgid "reuse openid"
 msgstr ""
 "Puedes de forma segura re-usar el mismo nombre de usuario para todos los "
 "sitios que acepten OpenID."
 
-#: templates/authopenid/signin.html:158
+#: templates/authopenid/signin.html:157
 msgid "openid is widely adopted"
 msgstr ""
 "OpenID es extensamente usado. Hay más de 160,000,000 cuentas de OpenID en "
 "uso en el mundo. Mas de 10,000 sitios aceptan OpenID."
 
-#: templates/authopenid/signin.html:161
+#: templates/authopenid/signin.html:160
 msgid "openid is supported open standard"
 msgstr ""
 "OpenID es basado en un standard abierto, apoyado por muchas organizaciones."
 
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:165
 msgid "Find out more"
 msgstr "Averigua más"
 
-#: templates/authopenid/signin.html:167
+#: templates/authopenid/signin.html:166
 msgid "Get OpenID"
 msgstr "Adquiere una OpenID"
 
@@ -2673,20 +2682,6 @@ msgstr "Registrate con tu OpenID"
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
-#, fuzzy
-#~ msgid "complete list of quesionts"
-#~ msgstr "lista completa de preguntas"
-
-#~ msgid "votes total"
-#~ msgstr "votos totales"
-
-#~ msgid "Username:"
-#~ msgstr "Nombre de usuario:"
-
-#, fuzzy
-#~ msgid "New password:"
-#~ msgstr "Nueva contraseña:"
-
 #~ msgid "site title"
 #~ msgstr "Preguntalo.com.uy"
 
diff --git a/middleware/anon_user.py b/middleware/anon_user.py
new file mode 100644
index 00000000..c7ff05bc
--- /dev/null
+++ b/middleware/anon_user.py
@@ -0,0 +1,26 @@
+from django.http import HttpResponseRedirect
+from django_authopenid.util import get_next_url
+from user_messages import create_message, get_and_delete_messages
+import logging
+
+class AnonymousMessageManager(object):
+    def __init__(self,request):
+        self.request = request
+    def create(self,message=''):
+        create_message(self.request,message)  
+    def get_and_delete(self):
+        messages = get_and_delete_messages(self.request)
+        return messages
+
+def dummy_deepcopy(*arg):
+    """this is necessary to prevent deepcopy() on anonymous user object
+    that now contains reference to request, which cannot be deepcopied
+    """
+    return None
+
+class ConnectToSessionMessagesMiddleware(object):
+    def process_request(self, request):
+        if not request.user.is_authenticated():
+            request.user.__deepcopy__ = dummy_deepcopy #plug on deepcopy which may be called by django db "driver"
+            request.user.message_set = AnonymousMessageManager(request) #here request is linked to anon user
+            request.user.get_and_delete_messages = request.user.message_set.get_and_delete
diff --git a/middleware/cancel.py b/middleware/cancel.py
new file mode 100644
index 00000000..f03ff35e
--- /dev/null
+++ b/middleware/cancel.py
@@ -0,0 +1,15 @@
+from django.http import HttpResponseRedirect
+from django_authopenid.util import get_next_url
+import logging
+class CancelActionMiddleware(object):
+    def process_view(self, request, view_func, view_args, view_kwargs):
+        if 'cancel' in request.REQUEST:
+            #todo use session messages for the anonymous users
+            try:
+                msg = getattr(view_func,'CANCEL_MESSAGE')
+            except AttributeError:
+                msg = 'action canceled'
+            request.user.message_set.create(message=msg)
+            return HttpResponseRedirect(get_next_url(request))
+        else:
+            return None
diff --git a/middleware/pagesize.py b/middleware/pagesize.py
index bb6c7aa3..f6e6fcfd 100644
--- a/middleware/pagesize.py
+++ b/middleware/pagesize.py
@@ -26,4 +26,8 @@ class QuestionsPageSizeMiddleware(object):
                 user.questions_per_page = pagesize
                 user.save()
         # put pagesize into session
-        request.session["pagesize"] = pagesize
\ No newline at end of file
+        request.session["pagesize"] = pagesize
+
+    def process_exception(self,request,exception):
+        import logging
+        logging.debug('have exception %s' % str(exception))
diff --git a/migration b/migration
new file mode 100644
index 00000000..eb5dffa1
--- /dev/null
+++ b/migration
@@ -0,0 +1,7 @@
+cp cnprog-current/templates/content/style/style.css  test/templates/content/style/
+cp cnprog-current/templates/footer.html  test/templates/
+cp cnprog-current/templates/content/images/logo.png test/templates/content/images
+cp cnprog-current/locale/en/LC_MESSAGES/django.po test/locale/en/LC_MESSAGES/
+python manage.py makemessages -l en -e html,py,txt
+#fix fuzzy messages
+python manage.py compilemessages
diff --git a/session_messages/.svn/all-wcprops b/session_messages/.svn/all-wcprops
new file mode 100644
index 00000000..2a15b353
--- /dev/null
+++ b/session_messages/.svn/all-wcprops
@@ -0,0 +1,23 @@
+K 25
+svn:wc:ra_dav:version-url
+V 38
+/svn/!svn/ver/5/trunk/session_messages
+END
+__init__.py
+K 25
+svn:wc:ra_dav:version-url
+V 50
+/svn/!svn/ver/5/trunk/session_messages/__init__.py
+END
+models.py
+K 25
+svn:wc:ra_dav:version-url
+V 48
+/svn/!svn/ver/2/trunk/session_messages/models.py
+END
+context_processors.py
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/2/trunk/session_messages/context_processors.py
+END
diff --git a/session_messages/.svn/dir-prop-base b/session_messages/.svn/dir-prop-base
new file mode 100644
index 00000000..4cc643b7
--- /dev/null
+++ b/session_messages/.svn/dir-prop-base
@@ -0,0 +1,6 @@
+K 10
+svn:ignore
+V 6
+*.pyc
+
+END
diff --git a/session_messages/.svn/entries b/session_messages/.svn/entries
new file mode 100644
index 00000000..67c0db8a
--- /dev/null
+++ b/session_messages/.svn/entries
@@ -0,0 +1,64 @@
+8
+
+dir
+5
+http://django-session-messages.googlecode.com/svn/trunk/session_messages
+http://django-session-messages.googlecode.com/svn
+
+
+
+2009-03-10T23:30:03.043791Z
+5
+carl.j.meyer
+has-props
+
+svn:special svn:externals svn:needs-lock
+
+
+
+
+
+
+
+
+
+
+
+b8288d2d-7354-0410-af5b-714f73743f4b
+
+__init__.py
+file
+
+
+
+
+2009-10-25T23:36:02.000000Z
+89aa0f71c9973e4889e5fad0b4771a34
+2009-03-10T23:30:03.043791Z
+5
+carl.j.meyer
+
+models.py
+file
+
+
+
+
+2009-10-25T23:36:02.000000Z
+c5b4f274dbb06bc66a14f0c18c9115cd
+2008-08-14T23:13:23.180432Z
+2
+carl.j.meyer
+
+context_processors.py
+file
+
+
+
+
+2009-10-25T23:36:02.000000Z
+24779c7e504d3f7f1918fdf3fe8096bc
+2008-08-14T23:13:23.180432Z
+2
+carl.j.meyer
+
diff --git a/session_messages/.svn/format b/session_messages/.svn/format
new file mode 100644
index 00000000..45a4fb75
--- /dev/null
+++ b/session_messages/.svn/format
@@ -0,0 +1 @@
+8
diff --git a/session_messages/.svn/text-base/__init__.py.svn-base b/session_messages/.svn/text-base/__init__.py.svn-base
new file mode 100644
index 00000000..0136c888
--- /dev/null
+++ b/session_messages/.svn/text-base/__init__.py.svn-base
@@ -0,0 +1,36 @@
+"""
+Lightweight session-based messaging system.
+
+Time-stamp: <2009-03-10 19:22:29 carljm __init__.py>
+
+"""
+VERSION = (0, 1, 'pre')
+
+def create_message (request, message):
+    """
+    Create a message in the current session.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+    
+    try:
+        request.session['messages'].append(message)
+    except KeyError:
+        request.session['messages'] = [message]
+
+def get_and_delete_messages (request, include_auth=False):
+    """
+    Get and delete all messages for current session.
+
+    Optionally also fetches user messages from django.contrib.auth.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+
+    messages = request.session.pop('messages', [])
+
+    if include_auth and request.user.is_authenticated():
+        messages.extend(request.user.get_and_delete_messages())
+    
+    return messages
+
diff --git a/session_messages/.svn/text-base/context_processors.py.svn-base b/session_messages/.svn/text-base/context_processors.py.svn-base
new file mode 100644
index 00000000..df9840fd
--- /dev/null
+++ b/session_messages/.svn/text-base/context_processors.py.svn-base
@@ -0,0 +1,48 @@
+"""
+Context processor for lightweight session messages.
+
+Time-stamp: <2008-07-19 23:16:19 carljm context_processors.py>
+
+"""
+from django.utils.encoding import StrAndUnicode
+
+from session_messages import get_and_delete_messages
+
+def session_messages (request):
+    """
+    Returns session messages for the current session.
+
+    """
+    return { 'session_messages': LazyMessages(request) }
+
+class LazyMessages (StrAndUnicode):
+    """
+    Lazy message container, so messages aren't actually retrieved from
+    session and deleted until the template asks for them.
+
+    """
+    def __init__(self, request):
+        self.request = request
+
+    def __iter__(self):
+        return iter(self.messages)
+
+    def __len__(self):
+        return len(self.messages)
+
+    def __nonzero__(self):
+        return bool(self.messages)
+
+    def __unicode__(self):
+        return unicode(self.messages)
+
+    def __getitem__(self, *args, **kwargs):
+        return self.messages.__getitem__(*args, **kwargs)
+
+    def _get_messages(self):
+        if hasattr(self, '_messages'):
+            return self._messages
+        self._messages = get_and_delete_messages(self.request)
+        return self._messages
+    messages = property(_get_messages)
+    
diff --git a/session_messages/.svn/text-base/models.py.svn-base b/session_messages/.svn/text-base/models.py.svn-base
new file mode 100644
index 00000000..b67ead6d
--- /dev/null
+++ b/session_messages/.svn/text-base/models.py.svn-base
@@ -0,0 +1,3 @@
+"""
+blank models.py
+"""
diff --git a/session_messages/__init__.py b/session_messages/__init__.py
new file mode 100644
index 00000000..4dd10a6b
--- /dev/null
+++ b/session_messages/__init__.py
@@ -0,0 +1,37 @@
+"""
+Lightweight session-based messaging system.
+
+Time-stamp: <2009-03-10 19:22:29 carljm __init__.py>
+
+"""
+VERSION = (0, 1, 'pre')
+
+def create_message (request, message):
+    """
+    Create a message in the current session.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+    
+    try:
+        request.session['messages'].append(message)
+    except KeyError:
+        request.session['messages'] = [message]
+
+def get_and_delete_messages (request, include_auth=False):
+    """
+    Get and delete all messages for current session.
+
+    Optionally also fetches user messages from django.contrib.auth.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+
+    messages = request.session.pop('messages', [])
+    import logging
+
+    if include_auth and request.user.is_authenticated():
+        messages.extend(request.user.get_and_delete_messages())
+    
+    return messages
+
diff --git a/session_messages/context_processors.py b/session_messages/context_processors.py
new file mode 100644
index 00000000..df9840fd
--- /dev/null
+++ b/session_messages/context_processors.py
@@ -0,0 +1,48 @@
+"""
+Context processor for lightweight session messages.
+
+Time-stamp: <2008-07-19 23:16:19 carljm context_processors.py>
+
+"""
+from django.utils.encoding import StrAndUnicode
+
+from session_messages import get_and_delete_messages
+
+def session_messages (request):
+    """
+    Returns session messages for the current session.
+
+    """
+    return { 'session_messages': LazyMessages(request) }
+
+class LazyMessages (StrAndUnicode):
+    """
+    Lazy message container, so messages aren't actually retrieved from
+    session and deleted until the template asks for them.
+
+    """
+    def __init__(self, request):
+        self.request = request
+
+    def __iter__(self):
+        return iter(self.messages)
+
+    def __len__(self):
+        return len(self.messages)
+
+    def __nonzero__(self):
+        return bool(self.messages)
+
+    def __unicode__(self):
+        return unicode(self.messages)
+
+    def __getitem__(self, *args, **kwargs):
+        return self.messages.__getitem__(*args, **kwargs)
+
+    def _get_messages(self):
+        if hasattr(self, '_messages'):
+            return self._messages
+        self._messages = get_and_delete_messages(self.request)
+        return self._messages
+    messages = property(_get_messages)
+    
diff --git a/session_messages/models.py b/session_messages/models.py
new file mode 100644
index 00000000..b67ead6d
--- /dev/null
+++ b/session_messages/models.py
@@ -0,0 +1,3 @@
+"""
+blank models.py
+"""
diff --git a/settings.py b/settings.py
index fcfdb548..daada933 100644
--- a/settings.py
+++ b/settings.py
@@ -1,25 +1,23 @@
 # encoding:utf-8
 # Django settings for lanai project.
 import os.path
+import sys
+sys.path.insert(0,'/home/fadeev/incoming/Django-1.1.1')
 
 #DEBUG SETTINGS
-DEBUG = True
+DEBUG = False 
 TEMPLATE_DEBUG = DEBUG
-INTERNAL_IPS = ('127.0.0.1',)
-
-#for OpenID auth
-ugettext = lambda s: s
-LOGIN_URL = '/%s%s' % (ugettext('account/'), ugettext('signin/'))
+INTERNAL_IPS = ('127.0.0.1','128.200.203.33')
 
 #EMAIL AND ADMINS
 ADMINS = (
-    ('CNProg team', 'team@cnprog.com'),
+    ('Evgeny Fadeev', 'evgeny.fadeev@gmail.com'),
 )
 MANAGERS = ADMINS
 
 SITE_ID = 1
 
-ADMIN_MEDIA_PREFIX = '/admin/media/'
+ADMIN_MEDIA_PREFIX = '/forum/admin/media/'
 SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
@@ -36,16 +34,18 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
     #'django.middleware.sqlprint.SqlPrintingMiddleware',
-    #'middleware.pagesize.QuestionsPageSizeMiddleware',
+    'middleware.anon_user.ConnectToSessionMessagesMiddleware',
+    'middleware.pagesize.QuestionsPageSizeMiddleware',
+    'middleware.cancel.CancelActionMiddleware',
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
-    'context.auth_processor',
     'context.application_settings',
     #'django.core.context_processors.i18n',
-    'django.core.context_processors.auth' #this is required for admin
+    'user_messages.context_processors.user_messages',#must be before auth
+    'django.core.context_processors.auth', #this is required for admin
 )
 
 ROOT_URLCONF = 'urls'
@@ -73,7 +73,8 @@ INSTALLED_APPS = (
     'django.contrib.humanize',
     'forum',
     'django_authopenid',
-    'debug_toolbar' ,
+    #'debug_toolbar' ,
+    'user_messages',
 )
 
 # User settings
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 48d7b567..e43522ef 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -1,5 +1,6 @@
 # encoding:utf-8
 import os.path
+from django.utils.translation import ugettext as _
 
 SITE_SRC_ROOT = os.path.dirname(__file__) 
 LOG_FILENAME = 'django.lanai.log'
@@ -8,40 +9,60 @@ LOG_FILENAME = 'django.lanai.log'
 import logging
 logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
 
-DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
-DATABASE_ENGINE = ''  #mysql, etc
+DATABASE_ENGINE = 'mysql'  #mysql, etc
 
 #Moved from settings.py for better organization. (please check it up to clean up settings.py)
 
 #email server settings
 SERVER_EMAIL = ''
-DEFAULT_FROM_EMAIL = 'team@cnprog.com'
+DEFAULT_FROM_EMAIL = ''
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
-EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
-EMAIL_HOST='smtp.gmail.com'
-EMAIL_PORT='587'
-EMAIL_USE_TLS=True
+EMAIL_SUBJECT_PREFIX = '[CNPROG] '
+EMAIL_HOST='cnprog.com'
+EMAIL_PORT='25'
+EMAIL_USE_TLS=False
 
 #LOCALIZATIONS
-TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
-# LANGUAGE_CODE = 'en-us'
+TIME_ZONE = 'America/Tijuana'
 
 #OTHER SETTINGS
-APP_TITLE = u'CNProg.com 程序员问答社区'
-APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
-APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
-APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
-APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
+APP_TITLE = u'CNPROG Q&A Forum'
+APP_KEYWORDS = u'CNPROG,forum,community'
+APP_DESCRIPTION = u'Ask and answer questions.'
+APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
+APP_COPYRIGHT = 'Copyright CNPROG, 2009. Some rights reserved under creative commons license.'
+
+###########################
+#
+#   this will allow running your forum with url like http://site.com/forum
+#
+#   FORUM_SCRIPT_ALIAS = 'forum/'
+#
+#   also make sure to set '/':'/forum' in file templates/content/js/com.cnprog.i18n.js
+#   this is necessary to make client scripts work in this configuration
+#
+FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
 
 USE_I18N = True
 LANGUAGE_CODE = 'en'
-EMAIL_VALIDATION = 'off'
+EMAIL_VALIDATION = 'off' #string - on|off
 MIN_USERNAME_LENGTH = 1
 EMAIL_UNIQUE = False
-APP_URL = 'http://server.com' #used by email notif system and RSS
+APP_URL = 'http://cnprog.com' #used by email notif system and RSS
 GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
 GOOGLE_ANALYTICS_KEY = ''
-BOOKS_ON = True 
+BOOKS_ON = False 
+WIKI_ON = True 
+USE_EXTERNAL_LEGACY_LOGIN = True 
+EXTERNAL_LEGACY_LOGIN_HOST = 'login.cnprog.com'
+EXTERNAL_LEGACY_LOGIN_PORT = 80
+EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">CNPROG</span>'
+FEEDBACK_SITE_URL = None #None or url
+LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
+
+DJANGO_VERSION = 1.1
+RESOURCE_REVISION=4
diff --git a/sql_scripts/091111_upgrade_evgeny.sql b/sql_scripts/091111_upgrade_evgeny.sql
new file mode 100644
index 00000000..cb76ec3c
--- /dev/null
+++ b/sql_scripts/091111_upgrade_evgeny.sql
@@ -0,0 +1 @@
+ALTER TABLE `auth_user` add column is_approved tinyint(1) not NULL;
diff --git a/tables.sql b/tables.sql
new file mode 100644
index 00000000..6034c08c
--- /dev/null
+++ b/tables.sql
@@ -0,0 +1,440 @@
+BEGIN;
+CREATE TABLE `forum_emailfeedsetting` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `subscriber_id` integer NOT NULL,
+    `feed_type` varchar(16) NOT NULL,
+    `frequency` varchar(8) NOT NULL,
+    `added_at` datetime NOT NULL,
+    `reported_at` datetime NULL
+)
+;
+ALTER TABLE `forum_emailfeedsetting` ADD CONSTRAINT subscriber_id_refs_id_6fee6730cc813af8 FOREIGN KEY (`subscriber_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `tag` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `name` varchar(255) NOT NULL UNIQUE,
+    `created_by_id` integer NOT NULL,
+    `deleted` bool NOT NULL,
+    `deleted_at` datetime NULL,
+    `deleted_by_id` integer NULL,
+    `used_count` integer UNSIGNED NOT NULL
+)
+;
+ALTER TABLE `tag` ADD CONSTRAINT created_by_id_refs_id_6ae4d97547205d6d FOREIGN KEY (`created_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `tag` ADD CONSTRAINT deleted_by_id_refs_id_6ae4d97547205d6d FOREIGN KEY (`deleted_by_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `comment` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `content_type_id` integer NOT NULL,
+    `object_id` integer UNSIGNED NOT NULL,
+    `user_id` integer NOT NULL,
+    `comment` varchar(300) NOT NULL,
+    `added_at` datetime NOT NULL
+)
+;
+ALTER TABLE `comment` ADD CONSTRAINT content_type_id_refs_id_89a4b13ec5a7994 FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+ALTER TABLE `comment` ADD CONSTRAINT user_id_refs_id_5ba842626be725e8 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `vote` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `content_type_id` integer NOT NULL,
+    `object_id` integer UNSIGNED NOT NULL,
+    `user_id` integer NOT NULL,
+    `vote` smallint NOT NULL,
+    `voted_at` datetime NOT NULL,
+    UNIQUE (`content_type_id`, `object_id`, `user_id`)
+)
+;
+ALTER TABLE `vote` ADD CONSTRAINT content_type_id_refs_id_77dc6ffafedbbec FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+ALTER TABLE `vote` ADD CONSTRAINT user_id_refs_id_3ce5b20589f5b210 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `flagged_item` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `content_type_id` integer NOT NULL,
+    `object_id` integer UNSIGNED NOT NULL,
+    `user_id` integer NOT NULL,
+    `flagged_at` datetime NOT NULL,
+    UNIQUE (`content_type_id`, `object_id`, `user_id`)
+)
+;
+ALTER TABLE `flagged_item` ADD CONSTRAINT content_type_id_refs_id_261d26c8891bb28c FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+ALTER TABLE `flagged_item` ADD CONSTRAINT user_id_refs_id_92ae9d35e3c608 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `question` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `title` varchar(300) NOT NULL,
+    `author_id` integer NOT NULL,
+    `added_at` datetime NOT NULL,
+    `wiki` bool NOT NULL,
+    `wikified_at` datetime NULL,
+    `answer_accepted` bool NOT NULL,
+    `closed` bool NOT NULL,
+    `closed_by_id` integer NULL,
+    `closed_at` datetime NULL,
+    `close_reason` smallint NULL,
+    `deleted` bool NOT NULL,
+    `deleted_at` datetime NULL,
+    `deleted_by_id` integer NULL,
+    `locked` bool NOT NULL,
+    `locked_by_id` integer NULL,
+    `locked_at` datetime NULL,
+    `score` integer NOT NULL,
+    `vote_up_count` integer NOT NULL,
+    `vote_down_count` integer NOT NULL,
+    `answer_count` integer UNSIGNED NOT NULL,
+    `comment_count` integer UNSIGNED NOT NULL,
+    `view_count` integer UNSIGNED NOT NULL,
+    `offensive_flag_count` smallint NOT NULL,
+    `favourite_count` integer UNSIGNED NOT NULL,
+    `last_edited_at` datetime NULL,
+    `last_edited_by_id` integer NULL,
+    `last_activity_at` datetime NOT NULL,
+    `last_activity_by_id` integer NOT NULL,
+    `tagnames` varchar(125) NOT NULL,
+    `summary` varchar(180) NOT NULL,
+    `html` longtext NOT NULL
+)
+;
+ALTER TABLE `question` ADD CONSTRAINT author_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `question` ADD CONSTRAINT closed_by_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`closed_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `question` ADD CONSTRAINT deleted_by_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`deleted_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `question` ADD CONSTRAINT locked_by_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`locked_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `question` ADD CONSTRAINT last_edited_by_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`last_edited_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `question` ADD CONSTRAINT last_activity_by_id_refs_id_5159d9f3a9162ff4 FOREIGN KEY (`last_activity_by_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `forum_questionview` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `who_id` integer NOT NULL,
+    `when` datetime NOT NULL
+)
+;
+ALTER TABLE `forum_questionview` ADD CONSTRAINT question_id_refs_id_fe63ebce6b3cbac FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `forum_questionview` ADD CONSTRAINT who_id_refs_id_293b67239e957c53 FOREIGN KEY (`who_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `favorite_question` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `user_id` integer NOT NULL,
+    `added_at` datetime NOT NULL
+)
+;
+ALTER TABLE `favorite_question` ADD CONSTRAINT question_id_refs_id_2cafd2f21ebe1cc3 FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `favorite_question` ADD CONSTRAINT user_id_refs_id_1632ce11ad7ac7de FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `question_revision` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `revision` integer UNSIGNED NOT NULL,
+    `title` varchar(300) NOT NULL,
+    `author_id` integer NOT NULL,
+    `revised_at` datetime NOT NULL,
+    `tagnames` varchar(125) NOT NULL,
+    `summary` varchar(300) NOT NULL,
+    `text` longtext NOT NULL
+)
+;
+ALTER TABLE `question_revision` ADD CONSTRAINT question_id_refs_id_61316ec87bef5296 FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `question_revision` ADD CONSTRAINT author_id_refs_id_79de7cc0b077fdb1 FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `forum_anonymousanswer` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `session_key` varchar(40) NOT NULL,
+    `wiki` bool NOT NULL,
+    `added_at` datetime NOT NULL,
+    `ip_addr` char(15) NOT NULL,
+    `author_id` integer NULL,
+    `text` longtext NOT NULL,
+    `summary` varchar(180) NOT NULL
+)
+;
+ALTER TABLE `forum_anonymousanswer` ADD CONSTRAINT question_id_refs_id_17dd6b2f4cc171c7 FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `forum_anonymousanswer` ADD CONSTRAINT author_id_refs_id_3ac41be013fb542e FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `forum_anonymousquestion` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `title` varchar(300) NOT NULL,
+    `session_key` varchar(40) NOT NULL,
+    `text` longtext NOT NULL,
+    `summary` varchar(180) NOT NULL,
+    `tagnames` varchar(125) NOT NULL,
+    `wiki` bool NOT NULL,
+    `added_at` datetime NOT NULL,
+    `ip_addr` char(15) NOT NULL,
+    `author_id` integer NULL
+)
+;
+ALTER TABLE `forum_anonymousquestion` ADD CONSTRAINT author_id_refs_id_2a673297511a98a FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `answer` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `author_id` integer NOT NULL,
+    `added_at` datetime NOT NULL,
+    `wiki` bool NOT NULL,
+    `wikified_at` datetime NULL,
+    `accepted` bool NOT NULL,
+    `accepted_at` datetime NULL,
+    `deleted` bool NOT NULL,
+    `deleted_by_id` integer NULL,
+    `locked` bool NOT NULL,
+    `locked_by_id` integer NULL,
+    `locked_at` datetime NULL,
+    `score` integer NOT NULL,
+    `vote_up_count` integer NOT NULL,
+    `vote_down_count` integer NOT NULL,
+    `comment_count` integer UNSIGNED NOT NULL,
+    `offensive_flag_count` smallint NOT NULL,
+    `last_edited_at` datetime NULL,
+    `last_edited_by_id` integer NULL,
+    `html` longtext NOT NULL
+)
+;
+ALTER TABLE `answer` ADD CONSTRAINT question_id_refs_id_2300e0297d6550c9 FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `answer` ADD CONSTRAINT author_id_refs_id_6573e62f192b0170 FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `answer` ADD CONSTRAINT deleted_by_id_refs_id_6573e62f192b0170 FOREIGN KEY (`deleted_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `answer` ADD CONSTRAINT locked_by_id_refs_id_6573e62f192b0170 FOREIGN KEY (`locked_by_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `answer` ADD CONSTRAINT last_edited_by_id_refs_id_6573e62f192b0170 FOREIGN KEY (`last_edited_by_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `answer_revision` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `answer_id` integer NOT NULL,
+    `revision` integer UNSIGNED NOT NULL,
+    `author_id` integer NOT NULL,
+    `revised_at` datetime NOT NULL,
+    `summary` varchar(300) NOT NULL,
+    `text` longtext NOT NULL
+)
+;
+ALTER TABLE `answer_revision` ADD CONSTRAINT answer_id_refs_id_47145eaebe77d8fe FOREIGN KEY (`answer_id`) REFERENCES `answer` (`id`);
+ALTER TABLE `answer_revision` ADD CONSTRAINT author_id_refs_id_2c17693c3ccc055f FOREIGN KEY (`author_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `badge` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `name` varchar(50) NOT NULL,
+    `type` smallint NOT NULL,
+    `slug` varchar(50) NOT NULL,
+    `description` varchar(300) NOT NULL,
+    `multiple` bool NOT NULL,
+    `awarded_count` integer UNSIGNED NOT NULL,
+    UNIQUE (`name`, `type`)
+)
+;
+CREATE TABLE `award` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `badge_id` integer NOT NULL,
+    `content_type_id` integer NOT NULL,
+    `object_id` integer UNSIGNED NOT NULL,
+    `awarded_at` datetime NOT NULL,
+    `notified` bool NOT NULL
+)
+;
+ALTER TABLE `award` ADD CONSTRAINT user_id_refs_id_5d197ea32d83e9b6 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `award` ADD CONSTRAINT badge_id_refs_id_4237a025651af0e1 FOREIGN KEY (`badge_id`) REFERENCES `badge` (`id`);
+ALTER TABLE `award` ADD CONSTRAINT content_type_id_refs_id_72f17e2d83bbde26 FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+CREATE TABLE `repute` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `positive` smallint NOT NULL,
+    `negative` smallint NOT NULL,
+    `question_id` integer NOT NULL,
+    `reputed_at` datetime NOT NULL,
+    `reputation_type` smallint NOT NULL,
+    `reputation` integer NOT NULL
+)
+;
+ALTER TABLE `repute` ADD CONSTRAINT user_id_refs_id_fcf719405a426cd FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `repute` ADD CONSTRAINT question_id_refs_id_4749166abeb39c4e FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+CREATE TABLE `activity` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `activity_type` smallint NOT NULL,
+    `active_at` datetime NOT NULL,
+    `content_type_id` integer NOT NULL,
+    `object_id` integer UNSIGNED NOT NULL,
+    `is_auditted` bool NOT NULL
+)
+;
+ALTER TABLE `activity` ADD CONSTRAINT user_id_refs_id_6015206347c8583f FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `activity` ADD CONSTRAINT content_type_id_refs_id_78877d15efa8edfd FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+CREATE TABLE `book` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `title` varchar(255) NOT NULL,
+    `short_name` varchar(255) NOT NULL,
+    `author` varchar(255) NOT NULL,
+    `price` numeric(6, 2) NOT NULL,
+    `pages` smallint NOT NULL,
+    `published_at` datetime NOT NULL,
+    `publication` varchar(255) NOT NULL,
+    `cover_img` varchar(255) NOT NULL,
+    `tagnames` varchar(125) NOT NULL,
+    `added_at` datetime NOT NULL,
+    `last_edited_at` datetime NOT NULL
+)
+;
+ALTER TABLE `book` ADD CONSTRAINT user_id_refs_id_607b4cfdf0283c8d FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `book_author_info` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `book_id` integer NOT NULL,
+    `blog_url` varchar(255) NOT NULL,
+    `added_at` datetime NOT NULL,
+    `last_edited_at` datetime NOT NULL
+)
+;
+ALTER TABLE `book_author_info` ADD CONSTRAINT user_id_refs_id_3781e2a5fbe1cfda FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `book_author_info` ADD CONSTRAINT book_id_refs_id_688c8f047c49bbf8 FOREIGN KEY (`book_id`) REFERENCES `book` (`id`);
+CREATE TABLE `book_author_rss` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `book_id` integer NOT NULL,
+    `title` varchar(255) NOT NULL,
+    `url` varchar(255) NOT NULL,
+    `rss_created_at` datetime NOT NULL,
+    `added_at` datetime NOT NULL
+)
+;
+ALTER TABLE `book_author_rss` ADD CONSTRAINT user_id_refs_id_1fd25dcf3596f741 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `book_author_rss` ADD CONSTRAINT book_id_refs_id_f64066171717121 FOREIGN KEY (`book_id`) REFERENCES `book` (`id`);
+CREATE TABLE `forum_anonymousemail` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `key` varchar(32) NOT NULL,
+    `email` varchar(75) NOT NULL UNIQUE,
+    `isvalid` bool NOT NULL
+)
+;
+CREATE TABLE `question_tags` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `tag_id` integer NOT NULL,
+    UNIQUE (`question_id`, `tag_id`)
+)
+;
+ALTER TABLE `question_tags` ADD CONSTRAINT question_id_refs_id_35d758e3d99eb83a FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `question_tags` ADD CONSTRAINT tag_id_refs_id_3b0ddddfbc0346ad FOREIGN KEY (`tag_id`) REFERENCES `tag` (`id`);
+CREATE TABLE `question_followed_by` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `question_id` integer NOT NULL,
+    `user_id` integer NOT NULL,
+    UNIQUE (`question_id`, `user_id`)
+)
+;
+ALTER TABLE `question_followed_by` ADD CONSTRAINT question_id_refs_id_6ea9c52125c22aae FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+ALTER TABLE `question_followed_by` ADD CONSTRAINT user_id_refs_id_49cca2976d30712d FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `book_question` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `book_id` integer NOT NULL,
+    `question_id` integer NOT NULL,
+    UNIQUE (`book_id`, `question_id`)
+)
+;
+ALTER TABLE `book_question` ADD CONSTRAINT book_id_refs_id_535ac8946a43c4d1 FOREIGN KEY (`book_id`) REFERENCES `book` (`id`);
+ALTER TABLE `book_question` ADD CONSTRAINT question_id_refs_id_372b7e81c7aff6d8 FOREIGN KEY (`question_id`) REFERENCES `question` (`id`);
+CREATE TABLE `django_authopenid_nonce` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `server_url` varchar(255) NOT NULL,
+    `timestamp` integer NOT NULL,
+    `salt` varchar(40) NOT NULL
+)
+;
+CREATE TABLE `django_authopenid_association` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `server_url` longtext NOT NULL,
+    `handle` varchar(255) NOT NULL,
+    `secret` longtext NOT NULL,
+    `issued` integer NOT NULL,
+    `lifetime` integer NOT NULL,
+    `assoc_type` longtext NOT NULL
+)
+;
+CREATE TABLE `django_authopenid_userassociation` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `openid_url` varchar(255) NOT NULL,
+    `user_id` integer NOT NULL UNIQUE
+)
+;
+ALTER TABLE `django_authopenid_userassociation` ADD CONSTRAINT user_id_refs_id_f63a9e7163d208d FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `django_authopenid_userpasswordqueue` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL UNIQUE,
+    `new_password` varchar(30) NOT NULL,
+    `confirm_key` varchar(40) NOT NULL
+)
+;
+ALTER TABLE `django_authopenid_userpasswordqueue` ADD CONSTRAINT user_id_refs_id_7f488ca76bcaaa4 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `django_authopenid_externallogindata` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `external_username` varchar(40) NOT NULL UNIQUE,
+    `external_session_data` longtext NOT NULL,
+    `user_id` integer NULL
+)
+;
+ALTER TABLE `django_authopenid_externallogindata` ADD CONSTRAINT user_id_refs_id_462c0ee2c3e5e139 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `auth_permission` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `name` varchar(50) NOT NULL,
+    `content_type_id` integer NOT NULL,
+    `codename` varchar(100) NOT NULL,
+    UNIQUE (`content_type_id`, `codename`)
+)
+;
+ALTER TABLE `auth_permission` ADD CONSTRAINT content_type_id_refs_id_6bc81a32728de91f FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`);
+CREATE TABLE `auth_group` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `name` varchar(80) NOT NULL UNIQUE
+)
+;
+CREATE TABLE `auth_user` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `username` varchar(30) NOT NULL UNIQUE,
+    `first_name` varchar(30) NOT NULL,
+    `last_name` varchar(30) NOT NULL,
+    `email` varchar(75) NOT NULL,
+    `password` varchar(128) NOT NULL,
+    `is_staff` bool NOT NULL,
+    `is_active` bool NOT NULL,
+    `is_superuser` bool NOT NULL,
+    `last_login` datetime NOT NULL,
+    `date_joined` datetime NOT NULL,
+    `is_approved` bool NOT NULL,
+    `email_isvalid` bool NOT NULL,
+    `email_key` varchar(32) NULL,
+    `reputation` integer UNSIGNED NOT NULL,
+    `gravatar` varchar(32) NOT NULL,
+    `gold` smallint NOT NULL,
+    `silver` smallint NOT NULL,
+    `bronze` smallint NOT NULL,
+    `questions_per_page` smallint NOT NULL,
+    `last_seen` datetime NOT NULL,
+    `real_name` varchar(100) NOT NULL,
+    `website` varchar(200) NOT NULL,
+    `location` varchar(100) NOT NULL,
+    `date_of_birth` date NULL,
+    `about` longtext NOT NULL
+)
+;
+CREATE TABLE `auth_message` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `message` longtext NOT NULL
+)
+;
+ALTER TABLE `auth_message` ADD CONSTRAINT user_id_refs_id_7837edc69af0b65a FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+CREATE TABLE `auth_group_permissions` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `group_id` integer NOT NULL,
+    `permission_id` integer NOT NULL,
+    UNIQUE (`group_id`, `permission_id`)
+)
+;
+ALTER TABLE `auth_group_permissions` ADD CONSTRAINT group_id_refs_id_2ccea4c93cea63fe FOREIGN KEY (`group_id`) REFERENCES `auth_group` (`id`);
+ALTER TABLE `auth_group_permissions` ADD CONSTRAINT permission_id_refs_id_4de83ca7792de1 FOREIGN KEY (`permission_id`) REFERENCES `auth_permission` (`id`);
+CREATE TABLE `auth_user_groups` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `group_id` integer NOT NULL,
+    UNIQUE (`user_id`, `group_id`)
+)
+;
+ALTER TABLE `auth_user_groups` ADD CONSTRAINT user_id_refs_id_1993cb70831107f1 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `auth_user_groups` ADD CONSTRAINT group_id_refs_id_321a8efef0ee9890 FOREIGN KEY (`group_id`) REFERENCES `auth_group` (`id`);
+CREATE TABLE `auth_user_user_permissions` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `user_id` integer NOT NULL,
+    `permission_id` integer NOT NULL,
+    UNIQUE (`user_id`, `permission_id`)
+)
+;
+ALTER TABLE `auth_user_user_permissions` ADD CONSTRAINT user_id_refs_id_166738bf2045483 FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`);
+ALTER TABLE `auth_user_user_permissions` ADD CONSTRAINT permission_id_refs_id_6d7fb3c2067e79cb FOREIGN KEY (`permission_id`) REFERENCES `auth_permission` (`id`);
+COMMIT;
diff --git a/templates/404.html b/templates/404.html
index 2fa38f99..227de3ae 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -33,7 +33,7 @@
             </u>
         </div>
         <script type="text/javascript">
-            var GOOG_FIXURL_LANG = 'zh-cn';
+            var GOOG_FIXURL_LANG = '{{settings.LANGUAGE_CODE}}';
             var GOOG_FIXURL_SITE = '{{site_url}}';
         </script>
         <script type="text/javascript" src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
diff --git a/templates/about.html b/templates/about.html
index eaf0d591..6d5f3060 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -12,10 +12,35 @@
 </div>
 
 <div class="content">
+    <!-- default text
 	<p>edit file templates/about.html. Below are just suggestions of what can go here</p>
 	<p>what is your site for?</p>
 	<p>how does it work? what are roles of members?</p>
 	<p>is there a place to find out more about this website?</p>
+    -->
+    <p>{% blocktrans %}<strong>CNPROG <span class="orange">Q&amp;A</span></strong> is a collaboratively edited question
+            and answer site created for the <strong>CNPROG</strong> community.
+    {% endblocktrans %}
+    </p>
+    <p>{% blocktrans %}Here you can <strong>ask</strong> and <strong>answer</strong> questions, <strong>comment</strong>
+    and <strong>vote</strong> for the questions of others and their answers. Both questions and answers
+    <strong>can be revised</strong> and improved. Questions can be <strong>tagged</strong> with
+    the relevant keywords to simplify future access and organize the accumulated material.{% endblocktrans %}
+    </p>
+
+    <p>{% blocktrans %}This <span class="orange">Q&amp;A</span> site is moderated by its members, hopefully - including yourself!
+    Moderation rights are gradually assigned to the site users based on the accumulated <strong>"reputation"</strong>
+    points. These points are added to the users account when others vote for his/her questions or answers.
+    These points (very) roughly reflect the level of trust of the community.{% endblocktrans %}
+    </p>
+    <p>{% blocktrans %}No points are necessary to ask or answer the questions - so please -
+    <strong><a href="{% url user_signin %}">join us!</a></strong>{% endblocktrans %}
+    </p>
+    <p>
+        {% blocktrans %}
+            If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
+        {% endblocktrans %}
+    </p>
 </div>
 {% endblock %}
 <!-- end template about.html -->
diff --git a/templates/answer_edit.html b/templates/answer_edit.html
index 8baa7c1e..cd247a3c 100644
--- a/templates/answer_edit.html
+++ b/templates/answer_edit.html
@@ -1,14 +1,15 @@
 {% extends "base.html" %}
 <!-- template answer_edit.html -->
 {% load i18n %}
+{% load extra_tags %}
 {% block title %}{% spaceless %}{% trans "Edit answer" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/wmd.js'></script>
-        <link rel="stylesheet" type="text/css" href="/content/js/wmd/wmd.css" />
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/showdown.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/wmd.js" %}'></script>
+        <link rel="stylesheet" type="text/css" href="{% href "/content/js/wmd/wmd.css" %}" />
         <script type="text/javascript">
         
         $().ready(function(){
diff --git a/templates/answer_edit_tips.html b/templates/answer_edit_tips.html
index 33e4e242..c390da06 100644
--- a/templates/answer_edit_tips.html
+++ b/templates/answer_edit_tips.html
@@ -16,7 +16,9 @@
 				{% trans "be clear and concise" %}
             </li>
         </ul>
-         <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
+        <p class='info-box-follow-up-links'>
+            <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}">faq »</a>
+        </p>
     </div>
 </div>
 
@@ -46,6 +48,8 @@
 			{% trans "basic HTML tags are also supported" %}
         </li>
     </ul>
-    <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank" style="float:right;position:relative">{% trans "learn more about Markdown" %} »</a>
+    <p class='info-box-follow-up-links'>
+        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans "learn more about Markdown" %} »</a>
+    </p>
 </div>
 <!-- end template answer_edit_tips.html -->
diff --git a/templates/ask.html b/templates/ask.html
index 9e86a5a0..30d43ee0 100644
--- a/templates/ask.html
+++ b/templates/ask.html
@@ -1,14 +1,15 @@
 {% extends "base.html" %}
 <!-- template ask.html -->
 {% load i18n %}
+{% load extra_tags %}
 {% block title %}{% spaceless %}{% trans "Ask a question" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/wmd.js'></script>
-        <link rel="stylesheet" type="text/css" href="/content/js/wmd/wmd.css" />
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/showdown.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/wmd.js" %}'></script>
+        <link rel="stylesheet" type="text/css" href="{% href "/content/js/wmd/wmd.css" %}" />
         <script type="text/javascript">
         $().ready(function(){
             //set current module button style
@@ -70,7 +71,9 @@
                 {% ifequal settings.EMAIL_VALIDATION 'on' %}
                     {% if not request.user.email_isvalid %}
                         <div class="message">
-                            {% blocktrans with request.user.email as email %}must have valid {{email}} to post{% endblocktrans %}
+                            {% blocktrans with request.user.email as email %}must have valid {{email}} to post, 
+                            see {{email_validation_faq_url}}
+                            {% endblocktrans %}
                         </div>
                     {% endif %}
                 {% endifequal %}
@@ -93,9 +96,11 @@
                             <td>
                                 <span id="pre-collapse" title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
                             </td>
+                            {% if settings.WIKI_ON %}
                             <td style="text-align:right;">
                                 {{ form.wiki }} <span style="font-weight:normal;cursor:help" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>
                             </td>
+                            {% endif %}
                         </tr>
 
                     </table>
diff --git a/templates/authopenid/changeemail.html b/templates/authopenid/changeemail.html
index 09857d17..94d1881c 100644
--- a/templates/authopenid/changeemail.html
+++ b/templates/authopenid/changeemail.html
@@ -1,37 +1,44 @@
 {% extends "base_content.html" %}
 {% load i18n %}
+{% block title %}{% spaceless %}{% trans "Change email" %}{% endspaceless %}{% endblock %}
 {% block content %}
 <!-- changeemail.html action_type={{action_type}}-->
 {% ifequal action_type "change" %}
     <div id="main-bar" class="headNormal">
-        {% trans "Change email" %}
+        {% if user.email %}
+            {% trans "Change email" %}
+        {% else %}
+            {% trans "Save your email address" %}
+        {% endif %}
     </div>
     <p class="message">
-    {% blocktrans %}change {{email}} info{% endblocktrans %}
-    </p>
-    {% if form.errors %}
-    <p class="errors">{% trans "Please correct errors below:" %}<br />
-        {% if form.email.errors %} 
-            <span class="error">{{ form.email.errors|join:", " }}</span>
-        {% endif %}
-        {% if form.password.errors %} 
-            <span class="error">{{ form.password.errors|join:", " }}</span>
+        {% if user.email %}
+            {% blocktrans %}change {{email}} info{% endblocktrans %}
+        {% else %}
+            {% blocktrans %}here is why email is required, see {{gravatar_faq_url}}{% endblocktrans %}
         {% endif %}
     </p>
-    {% endif %}
-
     {% if msg %}
-    <p class="errors">{{ msg }}</p>
+    <p class="error">{{ msg }}</p>
     {% endif %}
 
     <div class="aligned">
         <form action="." method="post" accept-charset="utf-8">
-
-            <div class="form-row"><label for="id_email">{% trans "Your new Email" %}</label><br/>{{ form.email }}</div>
-            <!--<div class="form-row"><label for="id_password">{% trans "Password" %}</label>{{ form.password }}</div>-->
+            {% if next %}
+                <input type="hidden" name="next" value="{{next}}"/>
+            {% endif %}
+            <div class="form-row-vertical">
+                <label for="id_email">{% if user.email %}{% trans "Your new Email" %}{% else %}{% trans "Your Email" %}{% endif %}</label>
+                {% if form.email.errors %}
+                <p class="error">{{form.email.errors|join:", "}}</p>
+                {% endif %}
+                {{ form.email }}
+            </div>
             <div class="submit-row">
-                <input class="submit" type="submit" name="change_email" value="{% trans "Change email" %}">
+                <input class="submit" type="submit" name="change_email" value="{% if user.email %}{% trans "Change email" %}{% else %}{% trans "Save Email" %}{% endif %}">
+                {% if user.email %}
                 <input class="submit" type="submit" name="cancel" value="{% trans "Cancel" %}">
+                {% endif %}
             </div>
 
         </form>
@@ -42,7 +49,7 @@
         {% trans "Validate email" %}
     </div>
     <p class="message">
-        {% blocktrans %}validate {{email}} info{% endblocktrans %}
+        {% blocktrans %}validate {{email}} info or go to {{change_email_url}}{% endblocktrans %}
     </p>
 {% endifequal %}
 {% ifequal action_type "keep" %}
@@ -50,7 +57,7 @@
         {% trans "Email not changed" %}
     </div>
     <p class="message">
-        {% blocktrans %}old {{email}} kept{% endblocktrans %}
+        {% blocktrans %}old {{email}} kept, if you like go to {{change_email_url}}{% endblocktrans %}
     </p>
 {% endifequal %}
 {% ifequal action_type "done_novalidate" %}
diff --git a/templates/authopenid/changeopenid.html b/templates/authopenid/changeopenid.html
index 9b5a196a..d01788fb 100644
--- a/templates/authopenid/changeopenid.html
+++ b/templates/authopenid/changeopenid.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 <!-- changeopenid.html -->
 {% load i18n %}
-
+{% block title %}{% spaceless %}{% trans "Change OpenID" %}{% endspaceless %}{% endblock %}
 {% block content %}
 <div id="main-bar" class="">
     <h3>
diff --git a/templates/authopenid/changepw.html b/templates/authopenid/changepw.html
index 0e90b172..8b059544 100644
--- a/templates/authopenid/changepw.html
+++ b/templates/authopenid/changepw.html
@@ -1,34 +1,17 @@
 {% extends "base.html" %}
 <!-- changepw.html -->
 {% load i18n %}
-
-{% block head %}
-		
-{% endblock %}
-
-
-
+{% block head %}{% endblock %}
+{% block title %}{% spaceless %}{% trans "Change password" %}{% endspaceless %}{% endblock %}
 {% block content %}
-<div id="main-bar" class="">
-    <h3>
-        {% trans "Account: change password" %}
-    </h3>
-</div>
-<p>{% blocktrans %}This is where you can change your password. Make sure you remember it!{% endblocktrans %}</p>
-{% if form.errors %}
-<p class="errors">{% trans "Please correct errors below:" %}<br />
-{{ form.errors }}
-</p>
-{% endif %}
-
+<div class="headNormal">{% trans "Account: change password" %}</div>
+<p class="message">{% blocktrans %}This is where you can change your password. Make sure you remember it!{% endblocktrans %}</p>
 <div class="aligned">
 	<form action="." method="post" accept-charset="utf-8">
-
-		<div id="form-row"><label for="id_oldpw">{% trans "Current password" %}</label>{{ form.oldpw }}</div>
-		<div id="form-row"><label for="id_password1">{% trans "New password" %}</label>{{ form.password1 }}</div>
-		<div id="form-row"><label for="id_password2">{% trans "New password again" %}</label>{{ form.password2 }}</div>
-        <p><input type="submit" value="{% trans "Change password" %}"></p>
-
+        <ul id="changepw-form" class="form-horizontal-rows">
+        {{form.as_ul}}
+        </ul>
+        <div class="submit-row"><input type="submit" class="submit" value="{% trans "Change password" %}" /></div>
 	</form>
 	</div>
 {% endblock %}
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index f29b7670..9a94c3c4 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -1,5 +1,19 @@
 {% extends "base_content.html" %}
 <!-- complete.html -->
+{% comment %}
+views calling this template: 
+* django_authopenid.views.register with login_type='openid'
+* django_authopenid.views.signin - with login_type='legacy'
+
+parameters:
+* provider 
+* login_type openid|legacy
+* username (same as screen name or username in the models, and nickname in openid sreg)
+* form1 - OpenidRegisterForm
+* form2 - OpenidVerifyForm not clear what this form is supposed to do, not used for legacy
+* email_feeds_form forum.forms.EditUserEmailFeedsForm
+* openid_username_exists
+{% endcomment %}
 {% load i18n %}
 {% block head %}{% endblock %}
 {% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %}
@@ -9,25 +23,34 @@
     </div>      
 	<div id="completetxt" >
         <div class="message">
-            {% blocktrans %}register new {{provider}} account info{% endblocktrans %}
+            {% ifequal login_type 'openid' %}
+                {% blocktrans %}register new {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %}
+            {% else %}
+                {% ifequal login_type 'legacy' %}
+                    {% if external_login_name_is_taken %}
+                        {% blocktrans %}{{username}} already exists, choose another name for 
+                            {{provider}}. Email is required too, see {{gravatar_faq_url}}
+                        {% endblocktrans %} 
+                    {% else %}
+                        {% blocktrans %}register new external {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %}
+                    {% endif %}
+                {% endifequal %}
+            {% endifequal %}
         </div>
     	<p style="display:none">{% trans "This account already exists, please use another." %}</p>
 	</div>
 
 	{% if form1.errors %}
-	<div class="errors">
-        <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
-        <ul class="error-list">
-		{% if form1.username.errors %} 
-			<li><span class="error">{{ form1.username.errors|join:", " }}</span></li>
-		{% endif %}
-		{% if form1.email.errors %} 
-			<li><span class="error">{{ form1.email.errors|join:", " }}</span></li>
-		{% endif %}
+        <ul class="errorlist">
+        {% if form1.non_field_errors %}
+            {% for error in form1.non_field_errors %}
+                <li>{{error}}</li>
+            {% endfor %}
+        {% endif %}
         </ul>
-	</div>
 	{% endif %}
-	{% if form2.errors %}
+    {% comment %}
+	{% if form2.errors %}<!--form2 is dysfunctional so commented out -->
 	<div class="errors">
         <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
         <ul class="error-list">
@@ -40,29 +63,54 @@
        </ul>
 	</div>
 	{% endif %}
+    {% endcomment %}
 
 	<div class="login">
+        {% ifequal login_type 'openid' %}
         <form name="fregister" action="{% url user_register %}" method="POST">
-            {{ form.next }}
-            <div class="form-row"><label for="id_username">{% trans "Screen name label" %}</label><br/>{{ form1.username }}</div>
-            <div class="form-row"><label for="id_email">{% trans "Email address label" %}</label><br/>{{ form1.email }}</div>
+        {% else %}
+        <form name="fregister" action="{% url user_signin %}" method="POST">
+        {% endifequal %}
+            {{ form1.next }}
+            <div class="form-row-vertical">
+                <label for="id_username">{% trans "Screen name label" %}</label>
+                {% if form1.username.errors %} 
+                    <p class="error">{{ form1.username.errors|join:", " }}</p>
+                {% endif %}
+                {{ form1.username }}
+            </div>
+            <div class="form-row-vertical margin-bottom">
+                <label for="id_email">{% trans "Email address label" %}</label>
+                {% if form1.email.errors %} 
+                    <p class="error">{{ form1.email.errors|join:", " }}</p>
+                {% endif %}
+                {{ form1.email }}
+            </div>
+            <p class='nomargin'>{% trans "receive updates motivational blurb" %}</p>
+            {% include "edit_user_email_feeds_form.html" %}
             <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div>
 		</form>
 	</div>
+    {% comment %}<!-- this form associates openID with an existing password-protected account, not yet functional -->
+    {% if form2 %}
 	<div class="login" style="display:none">
         <form name="fverify" action="{% url user_register %}" method="POST">
-            {{ form.next }}
+            {{ form2.next }}
 			<fieldset style="padding:10px">
 				<legend class="big">{% trans "Existing account" %}</legend>
 				<div class="form-row"><label for="id_username">{% trans "user name" %}</label><br/>{{ form2.username }}</div>
 				<div class="form-row"><label for="id_passwordl">{% trans "password" %}</label><br/>{{ form2.password }}</div>
+                <p><span class='big strong'>(Optional) receive updates by email</span> - only sent when there are any.</p>
+                {% include "edit_user_email_feeds_form.html" %}
 				<!--todo double check translation from chinese 确认 = "Register" -->
 				<div class="submit-row">
 					<input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"/> 
-					<a href="">{% trans "Forgot your password?" %}</a>
+					<a href="{% url user_sendpw %}">{% trans "Forgot your password?" %}</a>
 				</div>
 			</fieldset>
 		</form>
 	</div>
+    {% endif %}
+    {% endcomment %}
 {% endblock %}
 <!-- end complete.html -->
diff --git a/templates/authopenid/confirm_email.txt b/templates/authopenid/confirm_email.txt
index 202db0fc..3a01f146 100644
--- a/templates/authopenid/confirm_email.txt
+++ b/templates/authopenid/confirm_email.txt
@@ -7,7 +7,7 @@
 {% trans "Password:" %} {{ password }}
 
 {% trans "Please sign in here:" %}
-{{ site_url }}{% trans "signin/" %}
+{{signup_url}}
 
 {% blocktrans %}Sincerely,
 Forum Administrator{% endblocktrans %}
diff --git a/templates/authopenid/delete.html b/templates/authopenid/delete.html
index d39bc962..0f9f1c60 100644
--- a/templates/authopenid/delete.html
+++ b/templates/authopenid/delete.html
@@ -1,8 +1,7 @@
 {% extends "base.html" %}
 <!-- delete.html -->
 {% load i18n %}
-
-
+{% block title %}{% spaceless %}{% trans "Delete account" %}{% endspaceless %}{% endblock %}
 {% block content %}
 <div id="main-bar" class="">
     <h3>
diff --git a/templates/authopenid/external_legacy_login_info.html b/templates/authopenid/external_legacy_login_info.html
new file mode 100644
index 00000000..e2f4713e
--- /dev/null
+++ b/templates/authopenid/external_legacy_login_info.html
@@ -0,0 +1,16 @@
+{% extends "base_content.html" %}
+<!--customize this template-->
+{% load i18n %}
+{% block title %}{% spaceless %}{% trans "Traditional login information" %}{% endspaceless %}{% endblock %}
+{% block content %}
+<div class="headNormal">
+    {% trans "Traditional login information" %}
+</div>
+{% spaceless %}
+<div class="message">
+fill in template templates/authopenid/external_legacy_login_info.html
+and explain how to change password, recover password, etc.
+<!--add info about your external login site here-->
+</div>
+{% endspaceless %}
+{% endblock %}
diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
index 37091261..6241c811 100644
--- a/templates/authopenid/sendpw.html
+++ b/templates/authopenid/sendpw.html
@@ -2,35 +2,25 @@
 <!-- sendpw.html -->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %}
-
 {% block content %}
-<div id="main-bar" class="">
-    <h3>{% trans "Send new password" %}</h3>
-
-</div>
-<div class="paragraph">
-{% trans "Lost your password? No problem - here you can reset it." %}<br/>
-{% trans "Please enter your username below and new password will be sent to your registered e-mail" %}
+<div class="headNormal">
+    {% trans "Send new password" %}
 </div>
-{% if form.errors %}
-<p class="errors"><span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
-	{% if form.username.errors %} 
-		<span class="error">{{ form.username.errors|join:", " }}</span>
-	{% endif %}
+<p class="message">
+{% trans "password recovery information" %}
 </p>
-{% endif %}
 {% if msg %}
-    <div class="paragraph error">{{ msg }}</div>
+    <p class="action-status"><span>{{msg}}</span><p>
 {% endif %}
 
 <div class="aligned">
 	<form action="." method="post" accept-charset="utf-8">
-		<div id="form-row"><label for="id_username">{% trans "User name" %}:</label>{{ form.username }}</div>
-
-        <p style="padding-top:10px"><input type="submit" value="{% trans "Reset password" %}"> <a href="{% url user_signin %}">{% trans "return to login" %}</a></p>
-
+        <ul id="emailpw-form" class="form-horizontal-rows">
+            {{form.as_ul}}
+        </ul>
+        <p style="padding-top:10px"><input type="submit" class="submit" value="{% trans "Reset password" %}" /> 
+        <a href="{% url user_signin %}"><span class="strong">{% trans "return to login" %}</span></a></p>
 	</form>
-    <span class="darkred">{% trans "Note: your new password will be activated only after you click the activation link in the email message" %}</span>
 </div>
 {% endblock %}
 <!-- end sendpw.html -->
diff --git a/templates/authopenid/sendpw_email.txt b/templates/authopenid/sendpw_email.txt
index 2024061c..f044ca45 100644
--- a/templates/authopenid/sendpw_email.txt
+++ b/templates/authopenid/sendpw_email.txt
@@ -1,14 +1,9 @@
 {% load i18n %}
-{% blocktrans %}Someone has requested to reset your password on {{ site_url }}.
+{% blocktrans%}Someone has requested to reset your password on {{site_url}}.
 If it were not you, it is safe to ignore this email.{% endblocktrans %}
 
-{% trans "Your new account details are:" %}
-
-{% trans "Username:" %} {{ username }}
-{% trans "New password:" %} {{ password }}
-
-{% trans "To confirm that you wanted to reset your password please visit:" %}
-{{ site_url }}{{ url_confirm }}?key={{ confirm_key }}
+{% blocktrans %}email explanation how to use new {{password}} for {{username}}
+with the {{key_link}}{% endblocktrans %}
 
 {% blocktrans %}Sincerely,
 Forum Administrator{% endblocktrans %}
diff --git a/templates/authopenid/settings.html b/templates/authopenid/settings.html
index ecc16c72..66ea5953 100644
--- a/templates/authopenid/settings.html
+++ b/templates/authopenid/settings.html
@@ -1,7 +1,7 @@
 {% extends "base_content.html" %}
 <!-- settings.html -->
 {% load i18n %}
-
+{% block title %}{% spaceless %}{% trans "Account functions" %}{% endspaceless %}{% endblock %}
 {% block head %}
 <style type="text/css" media="screen">
     h4 {font-size:12pt;}
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index 60aa5e5d..1363661e 100644
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -1,13 +1,13 @@
 {% extends "base.html" %}
 <!-- signin.html -->
 {% load i18n %}
+{% load extra_tags %}
 {% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-	<!--<script type="text/javascript" src="/content/js/jquery.openid.js?"></script>-->
-    <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
+    <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
 
-	<link rel="stylesheet" type="text/css" media="screen" href="/content/jquery-openid/openid.css"/>
-	<script type="text/javascript" src="/content/jquery-openid/jquery.openid.js"></script>
+	<link rel="stylesheet" type="text/css" media="screen" href="{% href "/content/jquery-openid/openid.css" %}"/>
+	<script type="text/javascript" src="{% href "/content/jquery-openid/jquery.openid.js" %}"></script>
 	<script type="text/javascript">  $().ready( function() { $("form.openid:eq(0)").openid(); })</script>
 	<!--<script type="text/javascript">
 	$().ready(function(){
@@ -44,25 +44,27 @@
 			  <ul class="providers"> 
 			  <li class="local" title="Local login">
 				  <div class="logo_box local_login_box">
-						<img src="/content/jquery-openid/images/local-login.png" alt="icon" /> 
+						<img src="{% href "/content/jquery-openid/images/local-login.png" %}" alt="your icon here" /> 
 				  </div>
 			  <span></span>
 			  </li> 
 			  <li class="direct" title="Google"> 
 			  	<div class="logo_box google_box">
-					<img src="/content/jquery-openid/images/google.gif" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
+					<img src="{% href "/content/jquery-openid/images/google.gif" %}" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
 				</div>
 		 	  </li>
 			  <li class="direct" title="Yahoo"> 
 			  	<div class="logo_box yahoo_box">
-					<img src="/content/jquery-openid/images/yahoo.gif" alt="icon" /><span>http://yahoo.com/</span>
+					<img src="{% href "/content/jquery-openid/images/yahoo.gif" %}" alt="icon" /><span>http://yahoo.com/</span>
 				</div>
 			  </li>
 			  <li class="username" title="AOL screen name"> 
 			  	<div class="logo_box aol_box">
-					<img src="/content/jquery-openid/images/aol.gif" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
+					<img src="{% href "/content/jquery-openid/images/aol.gif" %}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
 				</div>
 			  </li>
+              </ul>
+			  <ul class="providers"> 
 			  <!--<li class="openid" title="OpenID">
 				  <div class="logo_box openid_box">
 						<img src="/content/jquery-openid/images/openid.gif" alt="icon" /> 
@@ -70,43 +72,43 @@
 			  <span><strong>http://{your-openid-url}</strong></span>
 			  </li>-->
 			  <li class="openid first_tiny_li" title="OpenID URL"> 
-					<img src="/content/jquery-openid/images/openidico16.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/openidico16.png" %}" alt="icon" />
 					<span>http://{your-openid-url}</span>
 		      </li> 
 			  <li class="username" title="MyOpenID user name"> 
-					<img src="/content/jquery-openid/images/myopenid-2.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/myopenid-2.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.myopenid.com/</span>
 		      </li> 
 			  <li class="username" title="Flickr user name"> 
-					<img src="/content/jquery-openid/images/flickr.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/flickr.png" %}" alt="icon" />
 					<span>http://flickr.com/<strong>username</strong>/</span>
 			  </li> 
 			  <li class="username" title="Technorati user name"> 
-					<img src="/content/jquery-openid/images/technorati-1.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/technorati-1.png" %}" alt="icon" />
 					<span>http://technorati.com/people/technorati/<strong>username</strong>/</span>
 			  </li> 
 			  <li class="username" title="Wordpress blog name"> 
-					<img src="/content/jquery-openid/images/wordpress.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/wordpress.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.wordpress.com</span>
               </li> 
 			  <li class="username" title="Blogger blog name"> 
-					<img src="/content/jquery-openid/images/blogger-1.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/blogger-1.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.blogspot.com/</span>
 			  </li> 
 			  <li class="username" title="LiveJournal blog name"> 
-					<img src="/content/jquery-openid/images/livejournal-1.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/livejournal-1.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.livejournal.com</span>
 			  </li> 
 			  <li class="username" title="ClaimID user name"> 
-					<img src="/content/jquery-openid/images/claimid-0.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/claimid-0.png" %}" alt="icon" />
 					<span>http://claimid.com/<strong>username</strong></span>
 			  </li> 
 			  <li class="username" title="Vidoop user name"> 
-					<img src="/content/jquery-openid/images/vidoop.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/vidoop.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.myvidoop.com/</span>
 			  </li> 
 			  <li class="username" title="Verisign user name"> 
-					<img src="/content/jquery-openid/images/verisign-2.png" alt="icon" />
+					<img src="{% href "/content/jquery-openid/images/verisign-2.png" %}" alt="icon" />
 					<span>http://<strong>username</strong>.pip.verisignlabs.com/</span>
 			  </li> 
 			  </ul>
@@ -125,27 +127,17 @@
 			  </fieldset> 
               <fieldset id='local_login_fs'>
 				  <p>{% trans 'Enter your login name and password' %}</p> 
-                        {% if form1.errors %}
-                        <p class="errors">
-                            <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
-                            <ul class="error-list">
-                                {% if form1.username.errors %} 
-                                <li><span class="error">{{ form1.username.errors|join:", " }}</span></li>
-                                {% endif %}
-                                {% if form1.password.errors %} 
-                                <li><span class="error">{{ form1.password.errors|join:", " }}</span></li>
-                                {% endif %}
-                            </ul>
-                        </p>
-                        {% endif %}
-				  <div><label for="username">{% trans "Login name" %}</label>
-                            {{form1.username}}<br/>
-                  <label for="password">{% trans "Password" %}</label>
-                            {{form1.password}}<br/>
+                  {% if form1.errors %}
+                    {{form1.non_field_errors.as_ul}}
+                  {% endif %}
+				  <div><p class="login"><label for="id_username">{% trans "Login name" %}</label>
+                            {{form1.username}}</p>
+                  <p class="login"><label for="id_password">{% trans "Password" %}</label>
+                            {{form1.password}}</p>
                   <p id="local_login_buttons">
 				  <input id="blogin" name="blogin" type="submit" value="{% trans "Login" %}" />
                   <a href="{% url user_signup %}">{% trans "Create account" %}</a><br/>
-                  <a href="{% url user_sendpw %}">{% trans "I forgot my password" %}</a>
+                  <a href="{% url user_sendpw %}">{% trans "Forgot your password?" %}</a>
                   </p>
                   </div>
               </fieldset>
@@ -170,9 +162,9 @@
         </li>
         
     </ul>
-    <p>
-    <a href="http://openid.net/what/" target="_blank" style="float:right;position:relative">{% trans "Find out more" %} »</a><br/>
-    <a href="http://openid.net/get/" target="_blank" style="float:right;position:relative">{% trans "Get OpenID" %} »</a>
+    <p class="info-box-follow-up-links">
+        <a href="http://openid.net/what/" target="_blank">{% trans "Find out more" %} »</a><br/>
+        <a href="http://openid.net/get/" target="_blank">{% trans "Get OpenID" %} »</a>
     </p>
 </div>
 {% endblock%}
diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html
index 5e405d3f..45dfb51b 100644
--- a/templates/authopenid/signup.html
+++ b/templates/authopenid/signup.html
@@ -1,53 +1,22 @@
-{% extends "base.html" %}
+{% extends "base_content.html" %}
 <!--signup.html-->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %}
 
 {% block content %}
-<div id="main-bar" class="">
-    <h3 >{% trans "Signup" %}</h3>
-
-</div>
-<div class="jointxt">
-    <p>{% trans "We support two types of user registration: conventional username/password, and" %} <a href="{% url user_signin %}">{% trans "the OpenID method" %}</a>.</p>
-
-    {% if form.errors %}
-    
-    <p class="errors">
-        <span class="big">{% trans "Sorry, looks like we have some errors" %}</span><br/>
-        <ul class="error-list">
-        {% if form.username.errors %} 
-        <li><span class="error">{{ form.username.errors|join:", " }}</span></li>
-        {% endif %}
-        {% if form.email.errors %} 
-        <li><span class="error">{{ form.email.errors|join:", " }}</span></li>
-        {% endif %}
-        {% if form.password2.errors %} 
-        <li><span class="error">{{ form.password2.errors|join:", " }}
-        </span></li>
-        {% endif %}
-        </ul>
-    </p>
-    {% endif %}
+<div class="headNormal">
+    {% trans "Create login name and password" %}
 </div>
-    <form action="{% url user_signup %}" method="post" accept-charset="utf-8">
-        <fieldset class="fieldset">
-        <legend class="big">{% trans "Conventional registration" %}</legend>	
-            <div class="form-row"><label for="id_username">{% trans "choose a user name" %}:</label><br/>{{ form.username }}</div>
-
-            <div class="form-row"><label for="id_email">{% trans "your email address" %}:</label><br/>{{ form.email }}</div>
-            <div class="form-row"><label for="id_password1">{% trans "choose password" %}:</label><br />{{ form.password1 }}</div>
-            <div class="form-row"><label for="id_password2">{% trans "retype password" %}:</label><br/>{{ form.password2 }}</div>
-            <div class="submit-row"><input type="submit" class="submit" value="{% trans "login" %}" > 
-			<a href="{% url user_signin %}">{% trans "back to login" %}</a></div>
-        </fieldset>
-    </form>
-    <div style="display:none">
-    <h2 class="signup">{% trans "Register with your OpenID" %}</h2>
-    <form name="fopenid" action="{% url user_signin %}" method="post">
-        <div class="form-row">{{ form2.openid_url }}</div>
-        <div class="submit-row "><input name="bsignin" class="submit" type="submit" value="{% trans "Login with your OpenID" %}"></div>
-    </form>
-    </div>
+<p class="message">{% trans "Traditional signup info" %}</p>
+<form action="{% url user_signup %}" method="post" accept-charset="utf-8">
+    <ul class="form-horizontal-rows">
+    {{form.as_ul}}
+    </ul>
+    <p style="margin:10px 0px 0px 3px;">{% trans "receive updates motivational blurb" %}</p>
+    {% include "edit_user_email_feeds_form.html" %}
+    <div class="submit-row"><input type="submit" class="submit" value="{% trans "Create Account" %}" /> 
+    <strong>{% trans "or" %}
+    <a href="{% url user_signin %}">{% trans "return to OpenID login" %}</a></strong></div>
+</form>
 {% endblock %}
 <!--end signup.html-->
diff --git a/templates/badges.html b/templates/badges.html
index 4a1ba091..1902a3b0 100644
--- a/templates/badges.html
+++ b/templates/badges.html
@@ -19,7 +19,9 @@
 <div class="badges" id="main-body" style="width:100%">
     <p>
 	{% trans "Community gives you awards for your questions, answers and votes." %}<br/>
-	{% trans "Below is the list of available badges and number of times each type of badge has been awarded." %}
+	{% blocktrans %}Below is the list of available badges and number 
+    of times each type of badge has been awarded. Give us feedback at {{feedback_faq_url}}.
+    {% endblocktrans %}
     </p>
     <div id="medalList">
         {% for badge in badges %}
@@ -32,7 +34,7 @@
             {% endfor %}
             </div>
             <div style="float:left;width:180px;">
-                <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a><strong> &#x2715; {{ badge.awarded_count|intcomma }}</strong>
+                <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a><strong> &#215; {{ badge.awarded_count|intcomma }}</strong>
             </div>
             <p style="float:left;width:350px;">
                 {{ badge.description }}
diff --git a/templates/base.html b/templates/base.html
index 0f568f73..2b933c4a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!-- template base.html -->
 {% load extra_filters %}
+{% load extra_tags %}
 {% load i18n %}
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
@@ -12,16 +13,16 @@
         {% if settings.GOOGLE_SITEMAP_CODE %}
         <meta name="verify-v1" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
         {% endif %}
-        <link rel="shortcut icon" href="/content/images/favicon.ico" />
-        <link href="/content/style/style.css" rel="stylesheet" type="text/css" />
+        <link rel="shortcut icon" href="{% href "/content/images/favicon.ico" %}" />
+        <link href="{% href "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
         <script src="http://www.google.com/jsapi" type="text/javascript"></script>
         <script type="text/javascript">google.load("jquery", "1.2.6");</script>
 		<script type="text/javascript">
 			var i18nLang = '{{settings.LANGUAGE_CODE}}';
 		</script>
-        <script type='text/javascript' src='/content/js/com.cnprog.i18n.js'></script>
-		<script type='text/javascript' src='/content/js/jquery.i18n.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.utils.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script>
+		<script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.utils.js" %}'></script>
         <!--<script type="text/javascript">
         var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
         document.write(unescape("%3Cscript src='" + uservoiceJsHost + "/javascripts/widgets/tab.js' type='text/javascript'%3E%3C/script%3E"))
@@ -39,7 +40,7 @@
         })
         </script>-->
 		<!-- todo move this to settings -->
-        {% if messages %}
+        {% if user_messages %}
         <style type="text/css">
             body { margin-top:2.4em; }
         </style>
@@ -57,8 +58,8 @@
     <body>
         <div class="notify" style="display:none">
             {% autoescape off %}
-                {% if messages %}
-                    {% for message in messages %}
+                {% if user_messages %}
+                    {% for message in user_messages %}
                           <p class="darkred">{{ message }}<p>
                     {% endfor %}
                 {% endif %}
diff --git a/templates/base_content.html b/templates/base_content.html
index a05198f5..52cc6134 100644
--- a/templates/base_content.html
+++ b/templates/base_content.html
@@ -1,13 +1,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!-- base_content.html -->
 {% load i18n %}
+{% load extra_tags %}
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <meta name="verify-v1" content="{{ settings.GOOGLE_SITEMAP_CODE }}" />
-        <link rel="shortcut icon" href="/content/images/favicon.ico" />
-        <link href="/content/style/style.css" rel="stylesheet" type="text/css" />
+        <link rel="shortcut icon" href="{% href "/content/images/favicon.ico" %}" />
+        <link href="{% href "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
 		 {% spaceless %}
         {% block forestyle %}{% endblock %}
         {% endspaceless %}
@@ -16,9 +17,9 @@
 		<script type="text/javascript">
 			var i18nLang = '{{ settings.LANGUAGE_CODE }}';
 		</script>
-        <script type='text/javascript' src='/content/js/com.cnprog.i18n.js'></script>
-	    <script type='text/javascript' src='/content/js/jquery.i18n.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.utils.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script>
+	    <script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.utils.js" %}'></script>
 
        <!-- <script type="text/javascript">
         var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
@@ -39,7 +40,7 @@
         </script>-->
 		<!-- todo move this to settings-->
 
-        {% if messages %}
+        {% if user_messages %}
         <style type="text/css">
             body { margin-top:2.4em; }
         </style>
@@ -58,8 +59,8 @@
     <body>
         <div class="notify" style="display:none">
             {% autoescape off %}
-                {% if messages %}
-                    {% for message in messages %}
+                {% if user_messages %}
+                    {% for message in user_messages %}
                           <p class="darkred">{{ message }}<p>
                     {% endfor %}
                 {% endif %}
diff --git a/templates/book.html b/templates/book.html
index cc6fc77b..e83268e4 100644
--- a/templates/book.html
+++ b/templates/book.html
@@ -85,12 +85,12 @@
                 {% if question.favourite_count %}
                     {% if question.favorited_myself %}
                         <div class="favorites-count">
-                            <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="/content/images/vote-favorite-on.png">
+                            <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="{% href "/content/images/vote-favorite-on.png" %}">
                             <div><b>{{question.favourite_count|intcomma}}</b></div>
                         </div>
                     {% else %}
                         <div class="favorites-count-off">
-                            <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="/content/images/vote-favorite-off.png">
+                            <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="{% href "/content/images/vote-favorite-off.png" %}">
                             <div><b>{{question.favourite_count|intcomma}}</b></div>
                         </div>
                     {% endif %}
@@ -144,7 +144,7 @@
                         </div>
                         <div class="bookFeed">
                             <div id="feeds">
-                                <a href="/feeds/rss" title="{% trans "subscribe to book RSS feed" %}">{% trans "subscribe to the questions feed" %}</a>
+                                <a href="{% href "/feeds/rss" %} " title="{% trans "subscribe to book RSS feed" %}">{% trans "subscribe to the questions feed" %}</a>
                             </div>
                         </div>
 
diff --git a/templates/content/images/blue-up-arrow-h18px.png b/templates/content/images/blue-up-arrow-h18px.png
new file mode 100644
index 00000000..e1f29e86
Binary files /dev/null and b/templates/content/images/blue-up-arrow-h18px.png differ
diff --git a/templates/content/images/cnprog_logo_200_56.gif b/templates/content/images/cnprog_logo_200_56.gif
deleted file mode 100644
index ab690de2..00000000
Binary files a/templates/content/images/cnprog_logo_200_56.gif and /dev/null differ
diff --git a/templates/content/images/gray-up-arrow-h18px.png b/templates/content/images/gray-up-arrow-h18px.png
new file mode 100644
index 00000000..78767445
Binary files /dev/null and b/templates/content/images/gray-up-arrow-h18px.png differ
diff --git a/templates/content/images/logo.gif b/templates/content/images/logo.gif
new file mode 100644
index 00000000..ab690de2
Binary files /dev/null and b/templates/content/images/logo.gif differ
diff --git a/templates/content/images/logo.png b/templates/content/images/logo.png
index 640eb1da..b53732e3 100644
Binary files a/templates/content/images/logo.png and b/templates/content/images/logo.png differ
diff --git a/templates/content/jquery-openid/jquery.openid.js b/templates/content/jquery-openid/jquery.openid.js
index 6486fd39..763af2c6 100644
--- a/templates/content/jquery-openid/jquery.openid.js
+++ b/templates/content/jquery-openid/jquery.openid.js
@@ -36,7 +36,7 @@ $.fn.openid = function() {
   };
   var local = function() {
     var $li = $(this);
-    $li.parent().find('li').removeClass('highlight');
+    $('#openid_form .providers li').removeClass('highlight');
     $li.addClass('highlight');
     $usrfs.hide();
     $idfs.hide();
@@ -47,7 +47,7 @@ $.fn.openid = function() {
 
   var direct = function() {
     var $li = $(this);
-    $li.parent().find('li').removeClass('highlight');
+    $('#openid_form .providers li').removeClass('highlight');
     $li.addClass('highlight');
     $usrfs.fadeOut('slow');
     $localfs.fadeOut('slow');
@@ -59,7 +59,7 @@ $.fn.openid = function() {
 
   var openid = function() {
     var $li = $(this);
-    $li.parent().find('li').removeClass('highlight');
+    $('#openid_form .providers li').removeClass('highlight');
     $li.addClass('highlight');
     $usrfs.hide();
     $localfs.hide();
@@ -71,7 +71,7 @@ $.fn.openid = function() {
 
   var username = function() {
     var $li = $(this);
-    $li.parent().find('li').removeClass('highlight');
+    $('#openid_form .providers li').removeClass('highlight');
     $li.addClass('highlight');
     $idfs.hide();
     $localfs.hide();
diff --git a/templates/content/jquery-openid/openid.css b/templates/content/jquery-openid/openid.css
index 2ec8adf4..88960b56 100644
--- a/templates/content/jquery-openid/openid.css
+++ b/templates/content/jquery-openid/openid.css
@@ -1,28 +1,35 @@
-fieldset {border-style:none;}
+fieldset { border-style:none; }
 img {border-style:none;}
 
-.logo_box {display:inline-block;width:90px;height:40px;background:white;border:1px solid #dddddd;}
+.logo_box {display:inline-block;float:left;width:90px;height:40px;background:white;border:1px solid #dddddd;}
 .openid_box img {margin-top:6px;}
 .aol_box img {margin-top:6px;}
 .yahoo_box img {margin-top:13px;}
 .google_box img {margin-top:6px;}
-.local_login_box img {margin-top:9px;}
+.local_login_box img {margin-top:2px;margin-left:-3px;}
 
 form.openid ul{ margin:0;padding:0;text-align:center; list-style-type:none; display:block;}
-form.openid ul li {float:left; padding:4px;} 
+form.openid ul li {float:left; padding:4px;display:inline-block;} 
+form.openid ul li div {display:inline-block;} 
 form.openid ul li span {padding:0 1em 0 3px}
 form.openid ul li.first_tiny_li {clear:left;}
 form.openid fieldset {clear:both;padding:10px 0px 0px 0px;}
 form.openid div+fieldset {display:none}
-form.openid label {display:block; font-weight:bold; margin-bottom:.5em}
+form.openid label {display:block; font-weight:bold;}
 input[name=openid_username] {width:8em}
 input[name=openid_identifier] {width:18em}
 form.openid ul li.highlight { -moz-border-radius:4px; -webkit-border-radius:4px; background-color: #FD6}
-form.openid fieldset div {-moz-border-radius:4px; -webkit-border-radius:4px; 
-                          background: #DCDCDC;
-						  padding:10px;display:inline-block}
+form.openid fieldset div {
+    -moz-border-radius:4px; 
+    -webkit-border-radius:4px; 
+    background: #DCDCDC;
+    padding:10px;
+    display:inline-block;
+    float:left;
+}
 form.openid p {margin-bottom:4px;}
 form.openid fieldset div p {padding:0px;margin:0px;}
+form.openid fieldset div p.login {padding:0px;margin:0 0 10px 0;}
 form.openid label {
     display:inline-block;
     font-weight:normal;
@@ -47,3 +54,16 @@ background: url(images/openidico.png) no-repeat;
 
 #openid_login {float:left; width:30%; margin:2em 1em; text-align:center}
 #openid_login div{margin-top:0.5em}
+
+form.openid ul.errorlist {
+    border: none;
+    list-style-position:inside;
+    list-style-type: disc;
+    margin-bottom:5px;
+}
+form.openid ul.errorlist li {
+    text-align: left;
+    margin: 5px;
+    float: none;
+    color:blue;
+}
diff --git a/templates/content/js/com.cnprog.admin.js b/templates/content/js/com.cnprog.admin.js
new file mode 100644
index 00000000..73b5768f
--- /dev/null
+++ b/templates/content/js/com.cnprog.admin.js
@@ -0,0 +1,13 @@
+$().ready( function(){
+    var options = {
+                   success: function(a,b){$('.admin #action_status').html($.i18n._('changes saved'));},
+                   dataType:'json',
+                   timeout:5000,
+                   url: $.i18n._('/') + $.i18n._('moderate-user/') + viewUserID +  '/'
+                    };
+    var form = $('.admin #moderate_user_form').ajaxForm(options);
+    var box = $('.admin input#id_is_approved').click(function(){ 
+        $('.admin #action_status').html($.i18n._('sending data...'));
+        form.ajaxSubmit(options);
+    });
+});
diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index 6ba8b59d..d2356abc 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -20,7 +20,7 @@ var i18nZh = {
 	'post recovered':"操作成功！该帖子已被恢复。",
 	'post deleted':"操作成功！该帖子已删除。",
 	'add comment':'添加评论',
-	'community reputation points':'社区积分',
+	'community karma points':'社区积分',
 	'to comment, need':'评论需要',
 	'delete this comment':'删除此评论',
 	'hide comments':"隐藏评论",
@@ -53,27 +53,29 @@ var i18nZh = {
 	'redo':'重做',
 	'enter image url':'<b>输入图片地址</b></p><p>示例：<br />http://www.example.com/image.jpg   \"我的截图\"',
 	'enter url':'<b>输入Web地址</b></p><p>示例：<br />http://www.cnprog.com/   \"我的网站\"</p>"',
-	'upload image':'或者上传本地图片：',
+	'upload image':'或者上传本地图片：'
 };
 
 var i18nEn = {
-    '>15 points requried to upvote':'>15 points requried to upvote ',
+    '/':'/',
+	'need >15 points to report spam':'need >15 points to report spam ',
+    '>15 points requried to upvote':'>15 points required to upvote ',
 	'tags cannot be empty':'please enter at least one tag',
-	'anonymous users cannot vote':'anonymous users cannot vote ',
-	'anonymous users cannot select favorite questions':'anonymous users cannot select favorite questions ',
-	'to comment, need': 'to comment, need reputation ',
+	'anonymous users cannot vote':'sorry, anonymous users cannot vote ',
+	'anonymous users cannot select favorite questions':'sorry, anonymous users cannot select favorite questions ',
+	'to comment, need': '(to comment other people\'s posts, karma ',
 	'please see':'please see ',
-	'community reputation points':' ',
+	'community karma points':' or more is necessary) - ',
 	'upload image':'Upload image:',
 	'enter image url':'enter URL of the image, e.g. http://www.example.com/image.jpg \"image title\"',
 	'enter url':'enter Web address, e.g. http://www.example.com \"page title\"',
 	'daily vote cap exhausted':'sorry, you\'ve used up todays vote cap',
-	'cannot pick own answer as best':'cannot accept own answer',
-	'cannot revoke old vote':'older votes cannot be revoked',
+	'cannot pick own answer as best':'sorry, you cannot accept your own answer',
+	'cannot revoke old vote':'sorry, older votes cannot be revoked',
 	'please confirm offensive':'are you sure this post is offensive, contains spam, advertising, malicious remarks, etc.?',
-	'flag offensive cap exhausted':'sorry, you\'ve used up todays cap of flagging offensive messages',
+	'flag offensive cap exhausted':'sorry, you\'ve used up todays cap of flagging offensive messages ',
 	'confirm delete':'are you sure you want to delete this?',
-	'anonymous users cannot delete/undelete':'anonymous users cannot delete or undelete posts',
+	'anonymous users cannot delete/undelete':'sorry, anonymous users cannot delete or undelete posts',
 	'post recovered':'your post is now restored!',
 	'post deleted':'your post has been deleted',
 	'confirm delete comment':'do you really want to delete this comment?',
@@ -82,6 +84,9 @@ var i18nEn = {
 	'content minchars': 'please enter more than {0} characters',
 	'title minchars':"please enter at least {0} characters",
 	'characters':'characters left',
+    'cannot vote for own posts':'sorry, you cannot vote for your own posts',
+    'cannot flag message as offensive twice':'cannot flag message as offensive twice ',
+	'>100 points required to downvote':'>100 points required to downvote '
 };
 
 var i18nEs = {
@@ -106,7 +111,7 @@ var i18nEs = {
 	'post recovered':"publicación recuperada",
 	'post deleted':"publicación borrada。",
 	'add comment':'agregar comentario',
-	'community reputation points':'reputación comunitaria',
+	'community karma points':'reputación comunitaria',
 	'to comment, need':'para comentar, necesita reputación',
 	'delete this comment':'borrar este comentario',
 	'hide comments':"ocultar comentarios",
@@ -141,7 +146,7 @@ var i18nEs = {
 	'enter url':'introduzca direcciones web, ejemplo：<br />http://www.cnprog.com/   \"titulo del enlace\"</p>"',
 	'upload image':'cargar imagen：',
 	'questions/' : 'preguntas/',
-	'vote/' : 'votar/',
+	'vote/' : 'votar/'
 };
 
 var i18n = {
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index aa6c51b6..58db9b33 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -52,31 +52,25 @@ var Vote = function(){
     
     var acceptAnonymousMessage = $.i18n._('insufficient privilege');
     var acceptOwnAnswerMessage = $.i18n._('cannot pick own answer as best');
-    var favoriteAnonymousMessage = $.i18n._('anonymous users cannot select favorite questions') 
-					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
-					+ $.i18n._('please login') + "</a>";
-    var voteAnonymousMessage = $.i18n._('anonymous users cannot vote') 
-					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
+
+    var pleaseLogin = "<a href='" + $.i18n._("/") + $.i18n._("account/") + $.i18n._("signin/")
+                    + "?next=" + $.i18n._("/") + $.i18n._("questions/") + "{{QuestionID}}'>"
 					+ $.i18n._('please login') + "</a>";
-    var upVoteRequiredScoreMessage = $.i18n._('>15 points requried to upvote') 
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var downVoteRequiredScoreMessage = $.i18n._('>100 points requried to downvote')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+
+    var pleaseSeeFAQ = $.i18n._('please see') + "<a href='" + $.i18n._("/") + $.i18n._("faq/") + "'>faq</a>";
+
+    var favoriteAnonymousMessage = $.i18n._('anonymous users cannot select favorite questions') 
+    var voteAnonymousMessage = $.i18n._('anonymous users cannot vote') + pleaseLogin;
+    var upVoteRequiredScoreMessage = $.i18n._('>15 points requried to upvote') + pleaseSeeFAQ;
+    var downVoteRequiredScoreMessage = $.i18n._('>100 points required to downvote') + pleaseSeeFAQ;
     var voteOwnDeniedMessage = $.i18n._('cannot vote for own posts');
-    var voteRequiredMoreVotes = $.i18n._('daily vote cap exhausted')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var voteDenyCancelMessage = $.i18n._('cannot revoke old vote')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+    var voteRequiredMoreVotes = $.i18n._('daily vote cap exhausted') + pleaseSeeFAQ;
+    var voteDenyCancelMessage = $.i18n._('cannot revoke old vote') + pleaseSeeFAQ;
     var offensiveConfirmation = $.i18n._('please confirm offensive');
-    var offensiveAnonymousMessage = $.i18n._('anonymous users cannot flag offensive posts')
-					+ "<a href='/account/signin/?next=/questions/{{QuestionID}}'>"
-					+ $.i18n._('please login') + "</a>";
-    var offensiveTwiceMessage = $.i18n._('cannot flag message as offensive twice')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var offensiveNoFlagsLeftMessage = $.i18n._('flag offensive cap exhausted')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
-    var offensiveNoPermissionMessage = $.i18n._('need >15 points to report spam')
-					+ $.i18n._('please see') + "<a href='/faq'>faq</a>";
+    var offensiveAnonymousMessage = $.i18n._('anonymous users cannot flag offensive posts') + pleaseLogin;
+    var offensiveTwiceMessage = $.i18n._('cannot flag message as offensive twice') + pleaseSeeFAQ;
+    var offensiveNoFlagsLeftMessage = $.i18n._('flag offensive cap exhausted') + pleaseSeeFAQ;
+    var offensiveNoPermissionMessage = $.i18n._('need >15 points to report spam') + pleaseSeeFAQ;
     var removeConfirmation = $.i18n._('confirm delete');
     var removeAnonymousMessage = $.i18n._('anonymous users cannot delete/undelete');
     var recoveredMessage = $.i18n._('post recovered');
@@ -94,7 +88,7 @@ var Vote = function(){
         removeQuestion: 9,
         removeAnswer:10,
         questionSubscribeUpdates:11,
-        questionUnsubscribeUpdates:12,
+        questionUnsubscribeUpdates:12
     };
 
     var getFavoriteButton = function(){
@@ -131,7 +125,7 @@ var Vote = function(){
     };
     
     var getOffensiveQuestionFlag = function(){
-        var offensiveQuestionFlag = 'table[id=question-table] span[class='+ offensiveClassFlag +']';
+        var offensiveQuestionFlag = '#question-table span[class='+ offensiveClassFlag +']';
         return $(offensiveQuestionFlag);
     };
     
@@ -157,17 +151,17 @@ var Vote = function(){
     var setVoteImage = function(voteType, undo, object){
         var flag = undo ? "" : "-on";
         var arrow = (voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote) ? "up" : "down";
-        object.attr("src", "/content/images/vote-arrow-"+ arrow + flag +".png");
+        object.attr("src", $.i18n._("/") + "content/images/vote-arrow-"+ arrow + flag +".png");
         
         // if undo voting, then undo the pair of arrows.
         if(undo){
             if(voteType == VoteType.questionUpVote || voteType == VoteType.questionDownVote){
-                $(getQuestionVoteUpButton()).attr("src", "/content/images/vote-arrow-up.png");
-                $(getQuestionVoteDownButton()).attr("src", "/content/images/vote-arrow-down.png");
+                $(getQuestionVoteUpButton()).attr("src", $.i18n._("/") + "content/images/vote-arrow-up.png");
+                $(getQuestionVoteDownButton()).attr("src", $.i18n._("/") + "content/images/vote-arrow-down.png");
             }
             else{
-                $(getAnswerVoteUpButton(postId)).attr("src", "/content/images/vote-arrow-up.png");
-                $(getAnswerVoteDownButton(postId)).attr("src", "/content/images/vote-arrow-down.png");
+                $(getAnswerVoteUpButton(postId)).attr("src", $.i18n._("/") + "content/images/vote-arrow-up.png");
+                $(getAnswerVoteDownButton(postId)).attr("src", $.i18n._("/") + "content/images/vote-arrow-down.png");
             }
         }
     };
@@ -182,42 +176,42 @@ var Vote = function(){
         if(questionAuthorId == currentUserId){
             var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']';
             $(acceptedButtons).unbind('click').click(function(event){
-               Vote.accept($(event.target))
+               Vote.accept($(event.target));
             });
         }
         // set favorite question
         var favoriteButton = getFavoriteButton();
         favoriteButton.unbind('click').click(function(event){
-           Vote.favorite($(event.target))
+           Vote.favorite($(event.target));
         });
     
         // question vote up
         var questionVoteUpButton = getQuestionVoteUpButton();
         questionVoteUpButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.questionUpVote)
+           Vote.vote($(event.target), VoteType.questionUpVote);
         });
     
         var questionVoteDownButton = getQuestionVoteDownButton();
         questionVoteDownButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.questionDownVote)
+           Vote.vote($(event.target), VoteType.questionDownVote);
         });
     
         var answerVoteUpButton = getAnswerVoteUpButtons();
         answerVoteUpButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.answerUpVote)
+           Vote.vote($(event.target), VoteType.answerUpVote);
         });
         
         var answerVoteDownButton = getAnswerVoteDownButtons();
         answerVoteDownButton.unbind('click').click(function(event){
-           Vote.vote($(event.target), VoteType.answerDownVote)
+           Vote.vote($(event.target), VoteType.answerDownVote);
         });
     
         getOffensiveQuestionFlag().unbind('click').click(function(event){
-           Vote.offensive(this, VoteType.offensiveQuestion)
+           Vote.offensive(this, VoteType.offensiveQuestion);
         });
     
         getOffensiveAnswerFlags().unbind('click').click(function(event){
-           Vote.offensive(this, VoteType.offensiveAnswer)
+           Vote.offensive(this, VoteType.offensiveAnswer);
         });
     
         getremoveQuestionLink().unbind('click').click(function(event){
@@ -234,7 +228,7 @@ var Vote = function(){
         });
     
         getremoveAnswersLinks().unbind('click').click(function(event){
-            Vote.remove(this, VoteType.removeAnswer)
+            Vote.remove(this, VoteType.removeAnswer);
         });
     };
     
@@ -243,14 +237,14 @@ var Vote = function(){
             type: "POST",
             cache: false,
             dataType: "json",
-            url: "/" + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"),
+            url: $.i18n._("/") + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"),
             data: { "type": voteType, "postId": postId },
             error: handleFail,
             success: function(data){callback(object, voteType, data)}});
     };
     
     var handleFail = function(xhr, msg){
-        alert("Callback invoke error: " + msg)
+        alert("Callback invoke error: " + msg);
     };
 
     // callback function for Accept Answer action
@@ -262,19 +256,19 @@ var Vote = function(){
             showMessage(object, acceptOwnAnswerMessage);
         }
         else if(data.status == "1"){
-            object.attr("src", "/content/images/vote-accepted.png");
+            object.attr("src", $.i18n._("/") + "content/images/vote-accepted.png");
             $("#"+answerContainerIdPrefix+postId).removeClass("accepted-answer");
             $("#"+commentLinkIdPrefix+postId).removeClass("comment-link-accepted");
         }
         else if(data.success == "1"){
             var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']';
-            $(acceptedButtons).attr("src", "/content/images/vote-accepted.png");
+            $(acceptedButtons).attr("src", $.i18n._("/") + "content/images/vote-accepted.png");
             var answers = ("div[id^="+answerContainerIdPrefix +"]");
             $(answers).removeClass("accepted-answer");
             var commentLinks = ("div[id^="+answerContainerIdPrefix +"] div[id^="+ commentLinkIdPrefix +"]");
             $(commentLinks).removeClass("comment-link-accepted");
             
-            object.attr("src", "/content/images/vote-accepted-on.png");
+            object.attr("src", $.i18n._("/") + "content/images/vote-accepted-on.png");
             $("#"+answerContainerIdPrefix+postId).addClass("accepted-answer");
             $("#"+commentLinkIdPrefix+postId).addClass("comment-link-accepted");
         }
@@ -288,7 +282,7 @@ var Vote = function(){
             showMessage(object, favoriteAnonymousMessage.replace("{{QuestionID}}", questionId));
         }
         else if(data.status == "1"){
-            object.attr("src", "/content/images/vote-favorite-off.png");
+            object.attr("src", $.i18n._("/") + "content/images/vote-favorite-off.png");
             var fav = getFavoriteNumber();
             fav.removeClass("my-favorite-number");
             if(data.count == 0)
@@ -296,7 +290,7 @@ var Vote = function(){
             fav.text(data.count);
         }
         else if(data.success == "1"){
-            object.attr("src", "/content/images/vote-favorite-on.png");
+            object.attr("src", $.i18n._("/") + "/content/images/vote-favorite-on.png");
             var fav = getFavoriteNumber();
             fav.text(data.count);
             fav.addClass("my-favorite-number");
@@ -310,69 +304,75 @@ var Vote = function(){
         if(data.allowed == "0" && data.success == "0"){
             showMessage(object, voteAnonymousMessage.replace("{{QuestionID}}", questionId));
         }
-        else if(data.allowed == "-3"){
+        else if (data.allowed == "-3"){
             showMessage(object, voteRequiredMoreVotes);
         }
-        else if(data.allowed == "-2"){
-            if(voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote){
+        else if (data.allowed == "-2"){
+            if (voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote){
                 showMessage(object, upVoteRequiredScoreMessage);
             }
-            else if(voteType == VoteType.questionDownVote || voteType == VoteType.answerDownVote){
+            else if (voteType == VoteType.questionDownVote || voteType == VoteType.answerDownVote){
                 showMessage(object, downVoteRequiredScoreMessage);
             }
         }
-        else if(data.allowed == "-1"){
+        else if (data.allowed == "-1"){
             showMessage(object, voteOwnDeniedMessage);
         }
-        else if(data.status == "2"){
+        else if (data.status == "2"){
             showMessage(object, voteDenyCancelMessage);
         }
-        else if(data.status == "1"){
+        else if (data.status == "1"){
             setVoteImage(voteType, true, object);
             setVoteNumber(object, data.count);
         }     
-        else if(data.success == "1"){
+        else if (data.success == "1"){
             setVoteImage(voteType, false, object);
             setVoteNumber(object, data.count);
-            if(data.message.length > 0)
+            if (data.message.length > 0){
                 showMessage(object, data.message);
+            }
         }
     };
         
     var callback_offensive = function(object, voteType, data){
         object = $(object);
-        if(data.allowed == "0" && data.success == "0"){
+        if (data.allowed == "0" && data.success == "0"){
             showMessage(object, offensiveAnonymousMessage.replace("{{QuestionID}}", questionId));
         }
-        else if(data.allowed == "-3"){
+        else if (data.allowed == "-3"){
             showMessage(object, offensiveNoFlagsLeftMessage);
         }  
-        else if(data.allowed == "-2"){
+        else if (data.allowed == "-2"){
             showMessage(object, offensiveNoPermissionMessage);
         }  
-        else if(data.status == "1"){
+        else if (data.status == "1"){
             showMessage(object, offensiveTwiceMessage);
         }  
-        else if(data.success == "1"){
+        else if (data.success == "1"){
             $(object).children('span[class=darkred]').text("("+ data.count +")");
         }
     };
         
     var callback_remove = function(object, voteType, data){
-        if(data.allowed == "0" && data.success == "0"){
+        if (data.allowed == "0" && data.success == "0"){
             showMessage(object, removeAnonymousMessage.replace("{{QuestionID}}", questionId));
         }
         else if (data.success == "1"){
-			if (removeActionType == 'delete'){
-				postNode.addClass('deleted');
-				postRemoveLink.innerHTML = $.i18n._('undelete');
-        		showMessage(object, deletedMessage);
-			}
-			else if (removeActionType == 'undelete') {
-				postNode.removeClass('deleted');
-				postRemoveLink.innerHTML = $.i18n._('delete');
-            	showMessage(object, recoveredMessage);
-			}
+            if (voteType == VoteType.removeQuestion){
+                window.location.href = $.i18n._("/") + $.i18n._("questions/");
+            }
+            else {
+                if (removeActionType == 'delete'){
+                    postNode.addClass('deleted');
+                    postRemoveLink.innerHTML = $.i18n._('undelete');
+                    showMessage(object, deletedMessage);
+                }
+                else if (removeActionType == 'undelete') {
+                    postNode.removeClass('deleted');
+                    postRemoveLink.innerHTML = $.i18n._('delete');
+                    showMessage(object, recoveredMessage);
+                }
+            }
 		}
     };
         
@@ -391,7 +391,7 @@ var Vote = function(){
         },
         
         favorite: function(object){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+            if (!currentUserId || currentUserId.toUpperCase() == "NONE"){
                 showMessage(object, favoriteAnonymousMessage.replace("{{QuestionID}}", questionId));
                 return false;
             }
@@ -399,14 +399,14 @@ var Vote = function(){
         },
             
         vote: function(object, voteType){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+            if (!currentUserId || currentUserId.toUpperCase() == "NONE"){
                 showMessage(object, voteAnonymousMessage.replace("{{QuestionID}}", questionId));
                 return false;   
             }
-            if(voteType == VoteType.answerUpVote){
+            if (voteType == VoteType.answerUpVote){
                 postId = object.attr("id").substring(imgIdPrefixAnswerVoteup.length);
             }
-            else if(voteType == VoteType.answerDownVote){
+            else if (voteType == VoteType.answerDownVote){
                 postId = object.attr("id").substring(imgIdPrefixAnswerVotedown.length);
             }
             
@@ -414,39 +414,43 @@ var Vote = function(){
         },
         
         offensive: function(object, voteType){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+            if (!currentUserId || currentUserId.toUpperCase() == "NONE"){
                 showMessage($(object), offensiveAnonymousMessage.replace("{{QuestionID}}", questionId));
                 return false;   
             }
-            if(confirm(offensiveConfirmation)){
+            if (confirm(offensiveConfirmation)){
                 postId = object.id.substr(object.id.lastIndexOf('-') + 1);
                 submit(object, voteType, callback_offensive);
             }
         },
             
         remove: function(object, voteType){
-            if(!currentUserId || currentUserId.toUpperCase() == "NONE"){
+            if (!currentUserId || currentUserId.toUpperCase() == "NONE"){
                 showMessage($(object), removeAnonymousMessage.replace("{{QuestionID}}", questionId));
                 return false;   
             }
-            if(confirm(removeConfirmation)){
-				bits = object.id.split('-');
-				postId = bits.pop();/* this seems to be used within submit! */
-				postType = bits.shift();
-
-				if (postType == 'answer'){
-					postNode = $('#answer-container-' + postId);
-					postRemoveLink = object;
-					if (postNode.hasClass('deleted')){
-						removeActionType = 'undelete';
-					}
-					else {
-						removeActionType = 'delete';
-					}
-				}
+            bits = object.id.split('-');
+            postId = bits.pop();/* this seems to be used within submit! */
+            postType = bits.shift();
+
+            var do_proceed = false; 
+            if (postType == 'answer'){
+                postNode = $('#answer-container-' + postId);
+                postRemoveLink = object;
+                if (postNode.hasClass('deleted')){
+                    removeActionType = 'undelete';
+                    do_proceed = true;
+                }
+                else {
+                    removeActionType = 'delete';
+                    do_proceed = confirm(removeConfirmation);
+                }
+            }
+            else {
+                do_proceed = confirm(removeConfirmation);
+            }
+            if (do_proceed) {
                 submit($(object), voteType, callback_remove);
-
-
             }
         }
     }
@@ -457,21 +461,24 @@ var Vote = function(){
 function createComments(type) {
     var objectType = type;
     var jDivInit = function(id) {
-        return $("#comments-" + objectType + '-' + id);
+        return $("#comments-container-" + objectType + '-' + id);
     };
 
     var appendLoaderImg = function(id) {
-        appendLoader("#comments-" + objectType + '-' + id + " div.comments");
+        appendLoader("#comments-container-" + objectType + '-' + id);
     };
 
-    var canPostComments = function(id, jDiv) {
-        var jHidden = jDiv.siblings("#can-post-comments-" + objectType + '-' + id);
+    var canPostComments = function(id) {
+        var jHidden = $("#can-post-comments-" + objectType + '-' + id);
         return jHidden.val().toLowerCase() == "true";
     };
 
-    var renderForm = function(id, jDiv) {
+    var renderForm = function(id) {
         var formId = "form-comments-" + objectType + "-" + id;
-        if (canPostComments(id, jDiv)) {
+        var jDiv = $('#comments-link-' + objectType + "-" + id).parent();
+        $(jDiv).css('background','none');
+        $(jDiv).css('padding-left',0);
+        if (canPostComments(id)) {
             if (jDiv.find("#" + formId).length == 0) {
                 var form = '<form id="' + formId + '" class="post-comments"><div>';
                 form += '<textarea name="comment" cols="60" rows="5" maxlength="300" onblur="'+ objectType +'Comments.updateTextCounter(this)" ';
@@ -490,64 +497,79 @@ function createComments(type) {
         else {
             var divId = "comments-rep-needed-" + objectType + '-' + id;
             if (jDiv.find("#" + divId).length == 0) {
-                jDiv.append('<div id="' + divId + '" style="color:red">'
+                jDiv.append('<p id="' + divId + '" class="comment">'
 					+ $.i18n._('to comment, need') + ' ' +
-					+ repNeededForComments + ' ' + $.i18n._('community reputation points')
-					+ '<a href="/faq" class="comment-user">' + $.i18n._('please see') + 'faq</a></span>');
+					+ repNeededForComments + ' ' + $.i18n._('community karma points') 
+					+ '<a href="' + $.i18n._('/') + $.i18n._('faq/') + '" class="comment-user">'
+                    + $.i18n._('please see') + 'faq</a></span></p>');
             }
         }
     };
 
     var getComments = function(id, jDiv) {
-        appendLoaderImg(id);
-        $.getJSON("/" + objectType + "s/" + id + "/comments/", function(json) { showComments(id, json); });
+        //appendLoaderImg(id);
+        $.getJSON($.i18n._("/") + objectType + "s/" + id + "/" + $.i18n._("comments/")
+                , function(json) { showComments(id, json); });
     };
 
     var showComments = function(id, json) {
         var jDiv = jDivInit(id);
 
-        jDiv = jDiv.find("div.comments");   // this div should contain any fetched comments..
-        jDiv.find("div[id^='comment-" + objectType + "-'" + "]").remove();  // clean previous calls..
-
+        //jDiv = jDiv.find("div.comments");   // this div should contain any fetched comments..
+        //jDiv.find("div[id^='comment-" + objectType + "-'" + "]").remove();  // clean previous calls..
+        jDiv.children().remove();
         removeLoader();
-
         if (json && json.length > 0) {
             for (var i = 0; i < json.length; i++)
                 renderComment(jDiv, json[i]);
-
             jDiv.children().show();
         }
     };
 
+    var renderDeleteCommentIcon = function(post_id, delete_url){
+        if (canPostComments(post_id)){
+            var html = '';
+            var img = $.i18n._("/") + "content/images/close-small.png";
+            var imgHover = $.i18n._("/") + "content/images/close-small-hover.png";
+            html += '<img class="delete-icon" onclick="' + objectType + 'Comments.deleteComment($(this), ' + post_id + ', \'' + delete_url + '\')" src="' + img;
+            html += '" onmouseover="$(this).attr(\'src\', \'' + imgHover + '\')" onmouseout="$(this).attr(\'src\', \'' + img
+            html += '\')" title="' + $.i18n._('delete this comment') + '" />';
+            return html;
+        }
+        else{
+            return '';
+        }
+    }
+
     // {"Id":6,"PostId":38589,"CreationDate":"an hour ago","Text":"hello there!","UserDisplayName":"Jarrod Dixon","UserUrl":"/users/3/jarrod-dixon","DeleteUrl":null}
     var renderComment = function(jDiv, json) {
-        var html = '<div id="comment-' + objectType + "-" + json.id + '" style="display:none">' + json.text;
-        html += json.user_url ? '&nbsp;&ndash;&nbsp;<a href="' + json.user_url + '"' : '<span';
+        var html = '<p id="comment-' + json.id + '" class="comment" style="display:none">' + json.text;
+        html += json.user_url ? ' - <a href="' + json.user_url + '"' : '<span';
         html += ' class="comment-user">' + json.user_display_name + (json.user_url ? '</a>' : '</span>');
-        html += ' <span class="comment-date">(' + json.add_date + ')</span>';
+        html += ' (' + json.comment_age + ')';
+
+        if (json.delete_url){
+            html += renderDeleteCommentIcon(json.object_id, json.delete_url);
+        }
 
         if (json.delete_url) {
-            var img = "/content/images/close-small.png";
-            var imgHover = "/content/images/close-small-hover.png";
-            html += '<img onclick="' + objectType + 'Comments.deleteComment($(this), ' + json.object_id + ', \'' + json.delete_url + '\')" src="' + img;
-            html += '" onmouseover="$(this).attr(\'src\', \'' + imgHover + '\')" onmouseout="$(this).attr(\'src\', \'' + img
-            html += '\')" title="' + $.i18n._('delete this comment') + '" />';
         }
 
-        html += '</div>';
+        html += '</p>';
 
         jDiv.append(html);
     };
 
     var postComment = function(id, formId) {
-        appendLoaderImg(id);
+        //appendLoaderImg(id);
 
         var formSelector = "#" + formId;
         var textarea = $(formSelector + " textarea");
 
+        //todo fix url translations!!!
         $.ajax({
             type: "POST",
-            url: "/" + objectType + "s/" + id + "/comments/",
+            url: $.i18n._("/") + objectType + "s/" + id + "/" + $.i18n._("comments/"),
             dataType: "json",
             data: { comment: textarea.val() },
             success: function(json) {
@@ -569,18 +591,52 @@ function createComments(type) {
 
         init: function() {
             // Setup "show comments" clicks..
-            $("a[id^='comments-link-" + objectType + "-" + "']").unbind("click").click(function() { commentsFactory[objectType].show($(this).attr("id").substr(("comments-link-" + objectType + "-").length)); });
+            $("a[id^='comments-link-" + objectType + "-" + "']").unbind("click").click(function() { 
+                commentsFactory[objectType].show($(this).attr("id").substr(("comments-link-" + objectType + "-").length)); 
+                });
+
+            var cBox = $("[id^='comments-container-" + objectType + "']");
+            cBox.each( function(i){
+                var post_id = $(this).attr('id').replace('comments-container-' + objectType + '-', '');
+                $(this).children().each(
+                    function(i){
+                        var comment_id = $(this).attr('id').replace('comment-','');
+                        var delete_url = $.i18n._('/') + objectType + 's/' + post_id + '/'
+                                        + $.i18n._('comments/') + comment_id + '/' + $.i18n._('delete/');
+                        var html = $(this).html();
+                        var CommentsClass;
+                        if (objectType == 'question'){
+                            CommentsClass = questionComments;
+                        }
+                        else if (objectType == 'answer') {
+                            CommentsClass = answerComments;
+                        }
+                        var delete_icon = $(this).find('img.delete-icon');
+                        delete_icon.click(function(){CommentsClass.deleteComment($(this),comment_id,delete_url);});
+                        delete_icon.unbind('mouseover').bind('mouseover',
+                            function(){
+                                $(this).attr('src',$.i18n._('/') + 'content/images/close-small-hover.png');
+                            }
+                        );
+                        delete_icon.unbind('mouseout').bind('mouseout',
+                            function(){
+                                $(this).attr('src',$.i18n._('/') + 'content/images/close-small.png');
+                            }
+                        );
+                    }
+                );
+            });
         },
 
         show: function(id) {
             var jDiv = jDivInit(id);
             getComments(id, jDiv);
-            renderForm(id, jDiv);
+            renderForm(id);
             jDiv.show();
-            if (canPostComments(id, jDiv)) jDiv.find("textarea").get(0).focus();
-            jDiv.siblings("a").unbind("click").click(function(){ 
-													commentsFactory[objectType].hide(id); 
-													}).text($.i18n._('hide comments'));
+
+            var link = $('#comments-link-' + objectType + '-' + id);
+            if (canPostComments(id)) link.parent().find("textarea").get(0).focus();
+            link.remove();
         },
 
         hide: function(id) {
@@ -596,9 +652,9 @@ function createComments(type) {
         deleteComment: function(jImg, id, deleteUrl) {
             if (confirm($.i18n._('confirm delete comment'))) {
                 jImg.hide();
-                appendLoaderImg(id);
                 $.post(deleteUrl, { dataNeeded: "forIIS7" }, function(json) {
-                    showComments(id, json);
+                    var par = jImg.parent();
+                    par.remove();
                 }, "json");
             }
         },
diff --git a/templates/content/js/com.cnprog.utils.js b/templates/content/js/com.cnprog.utils.js
index e271ed78..fff61759 100644
--- a/templates/content/js/com.cnprog.utils.js
+++ b/templates/content/js/com.cnprog.utils.js
@@ -23,7 +23,8 @@ var notify = function() {
         },       
         close: function(doPostback) {
             if (doPostback) {
-               $.post("/messages/markread/", { formdata: "required" });
+               $.post($.i18n._("/") + $.i18n._("messages/") + 
+                $.i18n._("markread/"), { formdata: "required" });
             }
             $(".notify").fadeOut("fast");
             $("body").css("margin-top", "0");
@@ -35,7 +36,7 @@ var notify = function() {
 
 function appendLoader(containerSelector) {
     $(containerSelector).append('<img class="ajax-loader" '
-		+'src="/content/images/indicator.gif" title="'
+		+'src="' + $.i18n._('/') + 'content/images/indicator.gif" title="'
 		+$.i18n._('loading...')
 		+'" alt="'
 		+$.i18n._('loading...')
@@ -103,7 +104,7 @@ var CPValidator = function(){
             return {
                 tags: {
                     required: " " + $.i18n._('tags cannot be empty'),
-                    maxlength: " " + $.i18n._('tablimits info'),
+                    maxlength: " " + $.i18n._('tablimits info')
                 },
                 text: {
                     required: " " + $.i18n._('content cannot be empty'),
diff --git a/templates/content/js/jquery.form.js b/templates/content/js/jquery.form.js
new file mode 100644
index 00000000..443114fd
--- /dev/null
+++ b/templates/content/js/jquery.form.js
@@ -0,0 +1,654 @@
+/*
+ * jQuery Form Plugin
+ * version: 2.33 (22-SEP-2009)
+ * @requires jQuery v1.2.6 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+;(function($) {
+
+/*
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function() {
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+			return false; // <-- important!
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+
+	if (typeof options == 'function')
+		options = { success: options };
+
+	var url = $.trim(this.attr('action'));
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+   	}
+   	url = url || window.location.href || '';
+
+	options = $.extend({
+		url:  url,
+		type: this.attr('method') || 'GET'
+	}, options || {});
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		for (var n in options.data) {
+		  if(options.data[n] instanceof Array) {
+			for (var k in options.data[n])
+			  a.push( { name: n, value: options.data[n][k] } );
+		  }
+		  else
+			 a.push( { name: n, value: options.data[n] } );
+		}
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a);
+
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else
+		options.data = q; // data is the query string for 'post'
+
+	var $form = this, callbacks = [];
+	if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
+	if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			$(options.target).html(data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success)
+		callbacks.push(options.success);
+
+	options.success = function(data, status) {
+		for (var i=0, max=callbacks.length; i < max; i++)
+			callbacks[i].apply(options, [data, status, $form]);
+	};
+
+	// are there files to upload?
+	var files = $('input:file', this).fieldValue();
+	var found = false;
+	for (var j=0; j < files.length; j++)
+		if (files[j])
+			found = true;
+
+	var multipart = false;
+//	var mp = 'multipart/form-data';
+//	multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	// options.iframe allows user to force iframe mode
+   if (options.iframe || found || multipart) {
+	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
+	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+	   if (options.closeKeepAlive)
+		   $.get(options.closeKeepAlive, fileUpload);
+	   else
+		   fileUpload();
+	   }
+   else{
+	   $.ajax(options);
+   }
+
+	// fire 'notify' event
+	this.trigger('form-submit-notify', [this, options]);
+	return this;
+
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUpload() {
+		var form = $form[0];
+
+		if ($(':input[name=submit]', form).length) {
+			alert('Error: Form elements must not be named "submit".');
+			return;
+		}
+
+		var opts = $.extend({}, $.ajaxSettings, options);
+		var s = $.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
+
+		var id = 'jqFormIO' + (new Date().getTime());
+		var $io = $('<iframe id="' + id + '" name="' + id + '" src="about:blank" />');
+		var io = $io[0];
+
+		$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+
+		var xhr = { // mock object
+			aborted: 0,
+			responseText: null,
+			responseXML: null,
+			status: 0,
+			statusText: 'n/a',
+			getAllResponseHeaders: function() {},
+			getResponseHeader: function() {},
+			setRequestHeader: function() {},
+			abort: function() {
+				this.aborted = 1;
+				$io.attr('src','about:blank'); // abort op in progress
+			}
+		};
+
+		var g = opts.global;
+		// trigger ajax global events so that activity/block indicators work like normal
+		if (g && ! $.active++) $.event.trigger("ajaxStart");
+		if (g) $.event.trigger("ajaxSend", [xhr, opts]);
+
+		if (s.beforeSend && s.beforeSend(xhr, s) === false) {
+			s.global && $.active--;
+			return;
+		}
+		if (xhr.aborted)
+			return;
+
+		var cbInvoked = 0;
+		var timedOut = 0;
+
+		// add submitting element to data if we know it
+		var sub = form.clk;
+		if (sub) {
+			var n = sub.name;
+			if (n && !sub.disabled) {
+				options.extraData = options.extraData || {};
+				options.extraData[n] = sub.value;
+				if (sub.type == "image") {
+					options.extraData[name+'.x'] = form.clk_x;
+					options.extraData[name+'.y'] = form.clk_y;
+				}
+			}
+		}
+
+		// take a breath so that pending repaints get some cpu time before the upload starts
+		setTimeout(function() {
+			// make sure form attrs are set
+			var t = $form.attr('target'), a = $form.attr('action');
+
+			// update form attrs in IE friendly way
+			form.setAttribute('target',id);
+			if (form.getAttribute('method') != 'POST')
+				form.setAttribute('method', 'POST');
+			if (form.getAttribute('action') != opts.url)
+				form.setAttribute('action', opts.url);
+
+			// ie borks in some cases when setting encoding
+			if (! options.skipEncodingOverride) {
+				$form.attr({
+					encoding: 'multipart/form-data',
+					enctype:  'multipart/form-data'
+				});
+			}
+
+			// support timout
+			if (opts.timeout)
+				setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
+
+			// add "extra" data to form if provided in options
+			var extraInputs = [];
+			try {
+				if (options.extraData)
+					for (var n in options.extraData)
+						extraInputs.push(
+							$('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')
+								.appendTo(form)[0]);
+
+				// add iframe to doc and submit the form
+				$io.appendTo('body');
+				io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+				form.submit();
+			}
+			finally {
+				// reset attrs and remove "extra" input elements
+				form.setAttribute('action',a);
+				t ? form.setAttribute('target', t) : $form.removeAttr('target');
+				$(extraInputs).remove();
+			}
+		}, 10);
+
+		var domCheckCount = 50;
+
+		function cb() {
+			if (cbInvoked++) return;
+
+			io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+
+			var ok = true;
+			try {
+				if (timedOut) throw 'timeout';
+				// extract the server response from the iframe
+				var data, doc;
+
+				doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+				
+				var isXml = opts.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				log('isXml='+isXml);
+				if (!isXml && (doc.body == null || doc.body.innerHTML == '')) {
+				 	if (--domCheckCount) {
+						// in some browsers (Opera) the iframe DOM is not always traversable when
+						// the onload callback fires, so we loop a bit to accommodate
+						cbInvoked = 0;
+						setTimeout(cb, 100);
+						return;
+					}
+					log('Could not access iframe DOM after 50 tries.');
+					return;
+				}
+
+				xhr.responseText = doc.body ? doc.body.innerHTML : null;
+				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+				xhr.getResponseHeader = function(header){
+					var headers = {'content-type': opts.dataType};
+					return headers[header];
+				};
+
+				if (opts.dataType == 'json' || opts.dataType == 'script') {
+					// see if user embedded response in textarea
+					var ta = doc.getElementsByTagName('textarea')[0];
+					if (ta)
+						xhr.responseText = ta.value;
+					else {
+						// account for browsers injecting pre around json response
+						var pre = doc.getElementsByTagName('pre')[0];
+						if (pre)
+							xhr.responseText = pre.innerHTML;
+					}			  
+				}
+				else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+					xhr.responseXML = toXml(xhr.responseText);
+				}
+				data = $.httpData(xhr, opts.dataType);
+			}
+			catch(e){
+				ok = false;
+				$.handleError(opts, xhr, 'error', e);
+			}
+
+			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+			if (ok) {
+				opts.success(data, 'success');
+				if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
+			}
+			if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
+			if (g && ! --$.active) $.event.trigger("ajaxStop");
+			if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
+
+			// clean up
+			setTimeout(function() {
+				$io.remove();
+				xhr.responseXML = null;
+			}, 100);
+		};
+
+		function toXml(s, doc) {
+			if (window.ActiveXObject) {
+				doc = new ActiveXObject('Microsoft.XMLDOM');
+				doc.async = 'false';
+				doc.loadXML(s);
+			}
+			else
+				doc = (new DOMParser()).parseFromString(s, 'text/xml');
+			return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
+		};
+	};
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *	is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *	used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function() {
+		$(this).ajaxSubmit(options);
+		return false;
+	}).bind('click.form-plugin', function(e) {
+		var $el = $(e.target);
+		if (!($el.is(":submit,input:image"))) {
+			return;
+		}
+		var form = this;
+		form.clk = e.target;
+		if (e.target.type == 'image') {
+			if (e.offsetX != undefined) {
+				form.clk_x = e.offsetX;
+				form.clk_y = e.offsetY;
+			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+				var offset = $el.offset();
+				form.clk_x = e.pageX - offset.left;
+				form.clk_y = e.pageY - offset.top;
+			} else {
+				form.clk_x = e.pageX - e.target.offsetLeft;
+				form.clk_y = e.pageY - e.target.offsetTop;
+			}
+		}
+		// clear form vars
+		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 10);
+	});
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+	return this.unbind('submit.form-plugin click.form-plugin');
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+	var a = [];
+	if (this.length == 0) return a;
+
+	var form = this[0];
+	var els = semantic ? form.getElementsByTagName('*') : form.elements;
+	if (!els) return a;
+	for(var i=0, max=els.length; i < max; i++) {
+		var el = els[i];
+		var n = el.name;
+		if (!n) continue;
+
+		if (semantic && form.clk && el.type == "image") {
+			// handle image inputs on the fly when semantic == true
+			if(!el.disabled && form.clk == el) {
+				a.push({name: n, value: $(el).val()});
+				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+			}
+			continue;
+		}
+
+		var v = $.fieldValue(el, true);
+		if (v && v.constructor == Array) {
+			for(var j=0, jmax=v.length; j < jmax; j++)
+				a.push({name: n, value: v[j]});
+		}
+		else if (v !== null && typeof v != 'undefined')
+			a.push({name: n, value: v});
+	}
+
+	if (!semantic && form.clk) {
+		// input type=='image' are not found in elements array! handle it here
+		var $input = $(form.clk), input = $input[0], n = input.name;
+		if (n && !input.disabled && input.type == 'image') {
+			a.push({name: n, value: $input.val()});
+			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+		}
+	}
+	return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+	//hand off to jQuery.param for proper encoding
+	return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+	var a = [];
+	this.each(function() {
+		var n = this.name;
+		if (!n) return;
+		var v = $.fieldValue(this, successful);
+		if (v && v.constructor == Array) {
+			for (var i=0,max=v.length; i < max; i++)
+				a.push({name: n, value: v[i]});
+		}
+		else if (v !== null && typeof v != 'undefined')
+			a.push({name: this.name, value: v});
+	});
+	//hand off to jQuery.param for proper encoding
+	return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *	  <input name="A" type="text" />
+ *	  <input name="A" type="text" />
+ *	  <input name="B" type="checkbox" value="B1" />
+ *	  <input name="B" type="checkbox" value="B2"/>
+ *	  <input name="C" type="radio" value="C1" />
+ *	  <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *	   array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+	for (var val=[], i=0, max=this.length; i < max; i++) {
+		var el = this[i];
+		var v = $.fieldValue(el, successful);
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
+			continue;
+		v.constructor == Array ? $.merge(val, v) : val.push(v);
+	}
+	return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+	if (typeof successful == 'undefined') successful = true;
+
+	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+		(t == 'checkbox' || t == 'radio') && !el.checked ||
+		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+		tag == 'select' && el.selectedIndex == -1))
+			return null;
+
+	if (tag == 'select') {
+		var index = el.selectedIndex;
+		if (index < 0) return null;
+		var a = [], ops = el.options;
+		var one = (t == 'select-one');
+		var max = (one ? index+1 : ops.length);
+		for(var i=(one ? index : 0); i < max; i++) {
+			var op = ops[i];
+			if (op.selected) {
+				var v = op.value;
+				if (!v) // extra pain for IE...
+					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+				if (one) return v;
+				a.push(v);
+			}
+		}
+		return a;
+	}
+	return el.value;
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+	return this.each(function() {
+		$('input,select,textarea', this).clearFields();
+	});
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+	return this.each(function() {
+		var t = this.type, tag = this.tagName.toLowerCase();
+		if (t == 'text' || t == 'password' || tag == 'textarea')
+			this.value = '';
+		else if (t == 'checkbox' || t == 'radio')
+			this.checked = false;
+		else if (tag == 'select')
+			this.selectedIndex = -1;
+	});
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+	return this.each(function() {
+		// guard against an input with the name of 'reset'
+		// note that IE reports the reset function as an 'object'
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
+			this.reset();
+	});
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+	if (b == undefined) b = true;
+	return this.each(function() {
+		this.disabled = !b;
+	});
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+	if (select == undefined) select = true;
+	return this.each(function() {
+		var t = this.type;
+		if (t == 'checkbox' || t == 'radio')
+			this.checked = select;
+		else if (this.tagName.toLowerCase() == 'option') {
+			var $sel = $(this).parent('select');
+			if (select && $sel[0] && $sel[0].type == 'select-one') {
+				// deselect all other options
+				$sel.find('option').selected(false);
+			}
+			this.selected = select;
+		}
+	});
+};
+
+// helper fn for console logging
+// set $.fn.ajaxSubmit.debug to true to enable debug logging
+function log() {
+	if ($.fn.ajaxSubmit.debug && window.console && window.console.log)
+		window.console.log('[jquery.form] ' + Array.prototype.join.call(arguments,''));
+};
+
+})(jQuery);
diff --git a/templates/content/js/wmd/wmd.js b/templates/content/js/wmd/wmd.js
index 7b611dba..0bdc55b6 100644
--- a/templates/content/js/wmd/wmd.js
+++ b/templates/content/js/wmd/wmd.js
@@ -54,7 +54,7 @@ Attacklab.wmdBase = function(){
 	var uploadImageHTML ="<div>" + $.i18n._('upload image') + "</div>" + 
         "<input type=\"file\" name=\"file-upload\" id=\"file-upload\" size=\"26\" "+
         "onchange=\"return ajaxFileUpload($('#image-url'));\"/><br>" + 
-        "<img id=\"loading\" src=\"/content/images/indicator.gif\" style=\"display:none;\"/>";
+        "<img id=\"loading\" src=\"" + $.i18n._("/") + "content/images/indicator.gif\" style=\"display:none;\"/>";
     
 	// The default text that appears in the dialog input box when entering
 	// links.
diff --git a/templates/content/style/default.css b/templates/content/style/default.css
index 0221cc03..2bc185ad 100644
--- a/templates/content/style/default.css
+++ b/templates/content/style/default.css
@@ -7,9 +7,9 @@ Style sheet for cnprog.com
 All rights reserved. 2008 CNPROG.COM
 */
 
-@import url(/content/style/jquery.autocomplete.css);
-@import url(/content/style/openid.css);
-@import url(/content/style/prettify.css);
+@import url(content/style/jquery.autocomplete.css);
+@import url(content/style/openid.css);
+@import url(content/style/prettify.css);
 
 html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, form, label, table, caption, tbody, tfoot, thead, tr, th, td
 {
@@ -232,19 +232,19 @@ h4 {display:block;font-size:90%; font-family:Verdana;color:#ccc;}
 }
 
 #main-bar .golden{
-    background:url(/content/images/bg_title_golden.gif) no-repeat;
+    background:url(../../images/bg_title_golden.gif) no-repeat;
 }
 
 #main-bar .pink{
-    background:url(/content/images/bg_title_red.gif) no-repeat;
+    background:url(../../images/bg_title_red.gif) no-repeat;
 }
 
 #main-bar .orange{
-    background:url(/content/images/bg_title_orange.gif) no-repeat;
+    background:url(../../images/bg_title_orange.gif) no-repeat;
 }
 
 #main-bar .green{
-    background:url(/content/images/bg_title_green.gif) no-repeat;
+    background:url(../../images/bg_title_green.gif) no-repeat;
 }
 
 #tab{
@@ -906,7 +906,7 @@ h4 {display:block;font-size:90%; font-family:Verdana;color:#ccc;}
 
 /* 2 textarea resizer styles */
 div.grippie {
-    background:#EEEEEE url(/content/images/grippie.png) no-repeat scroll center 2px;
+    background:#EEEEEE url(../../images/grippie.png) no-repeat scroll center 2px;
     border-color:#DDDDDD;
     border-style:solid;
     border-width:0pt 1px 1px;
@@ -923,14 +923,14 @@ div.grippie {
 }
 
 .openid-input{
-    background:url(/content/images/openid.gif) no-repeat;
+    background:url(../../images/openid.gif) no-repeat;
     padding-left:15px;
     cursor:pointer;
 }
 
 .openid-login-input{
     background-position:center left;
-    background:url(/content/images/openid.gif) no-repeat 0% 50%;
+    background:url(../../images/openid.gif) no-repeat 0% 50%;
     padding:5px 5px 5px 15px;
     cursor:pointer;
     font-family:Trebuchet MS;
@@ -941,7 +941,7 @@ div.grippie {
 
 .openid-login-submit{
     padding:6px;
-    #padding:4px;
+    /*padding:4px;*/
     cursor:pointer;
     font-weight:bold;
     font-size:120%;
@@ -990,7 +990,6 @@ div.grippie {
 
 .item-right{
     float:left;
-
 }
 
 .vote-number{
@@ -1609,7 +1608,9 @@ div.comments {
 }
 
 div.post-comments{
-    width:585px
+    width:585px;
+    clear:both;
+    float:left;
 }
 
 form.post-comments textarea {
diff --git a/templates/content/style/jquery.autocomplete.css b/templates/content/style/jquery.autocomplete.css
index 7c3127d1..3bf2c2d9 100644
--- a/templates/content/style/jquery.autocomplete.css
+++ b/templates/content/style/jquery.autocomplete.css
@@ -36,7 +36,7 @@
 }
 
 .ac_loading {
-	background: white url('/content/images/indicator.gif') right center no-repeat;
+	background: white url(../../images/indicator.gif) right center no-repeat;
 }
 
 .ac_odd {
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 0fb96c7f..6c1d6a3f 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -1,15 +1,16 @@
-@import url(/content/style/jquery.autocomplete.css);
-@import url(/content/style/openid.css);
-@import url(/content/style/prettify.css);
+@import url(jquery.autocomplete.css);
+@import url(openid.css);
+@import url(prettify.css);
 /* 公用 */
 body{background:#FFF; font-size:12px; line-height:150%; margin:0; padding:0; color:#000; font-family: sans-serif; 
 }
 div{margin:0 auto; padding:0;}
 h1,h2,h3,h4,h5,h6,ul,li,dl,dt,dd,form,img,p{margin:0; padding:0; border:none; }
-input, select {font-family:Trebuchet MS,"segoe ui",Helvetica,"Microsoft YaHei",宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif;}
+label {vertical-align:middle;}
+hr {border:none;border-top: 1px dashed #ccccce;}
+input, select {vertical-align:middle;font-family:Trebuchet MS,"segoe ui",Helvetica,"Microsoft YaHei",宋体,Tahoma,Verdana,MingLiu,PMingLiu,Arial,sans-serif;}
 p{margin-bottom:13px; font-size:13px; line-height:140%;}
 a {color:#333333; text-decoration:none;}
-
 .badges a {color:#763333;text-decoration:underline;}
 a:hover {text-decoration:underline;}
 .block{width:960px; height:auto;}
@@ -49,6 +50,12 @@ ol
 	margin-bottom: 1em;
     padding-left:0px;
 }
+td ul {
+    vertical-align:middle;
+}
+li input {
+    margin: 3px 3px 4px 3px;
+}
 pre
 {
 	font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace;
@@ -113,62 +120,115 @@ blockquote
 #navBar .nav {margin:20px 0px 0px 16px;
 	/*letter-spacing:1px; */
 	}
-#navBar .nav a {color:#333333; background-color:#F9F7ED; 
-                border: 1px solid #aaaaaa;
-                border-bottom: none;
+#navBar .nav a {color:#333333; background-color:#fff0e0; 
+				/*border-left: 1px solid #eeeeec;
+				border-right: 1px solid #babdb6;
+				border-top: 1px solid #eeeeec;*/
+				border: 1px solid #888888;
+				border-bottom: none;
 				padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:14px; font-weight:400; text-decoration:none;display: block;float: left;}
 #navBar .nav a:hover {text-decoration:underline}
-#navBar .nav a.on {height:24px;line-height:28px;border:1px solid #d64000; background:#B02B2C; color:#FFF; font-weight:600; text-decoration:none}
-#navBar .nav a.special {font-size:15px; color:#B02B2C; font-weight:bold; text-decoration:none; }
+#navBar .nav a.on {height:24px;line-height:28px;
+	border-bottom: 1px solid #a40000;
+	border-right:1px solid #820000; 
+	border-top:1px solid #d40000; 
+	border-left:1px solid #d40000; 
+	/*background:#A31E39; */
+	background:#a40000;
+	color:#FFF; font-weight:600; text-decoration:none}
+#navBar .nav a.special {font-size:14px; color:#B02B2C; font-weight:bold; text-decoration:none; }
 #navBar .nav a.special:hover {text-decoration:underline;}
 #navBar .nav div.focus {float:right; padding-right:0px;}
 /*搜索栏*/
-#searchBar {
-    background-color:#9db2b1;/*#e9b96e;*/
-    padding:5px 0 0 0;} /* #B02B2C */
+#searchBar {width:958px;   
+    background-color:#888a85;/*#e9b96e;*/
+    border: 1px solid #aaaaaa;
+    padding:4px 0 0 0;} /* #B02B2C */
 #searchBar .content { }
 #searchBar .searchInput {font-size:13px; height:18px; width:400px;}
 #searchBar .searchBtn {font-size:14px; height:26px; width:80px;}
-#searchBar .options {padding-top:5px; font-size:100%;color:#EEE;
+#searchBar .options {padding:3px 0 3px 0;font-size:100%;color:#EEE;
 	/*letter-spacing:1px;*/
 	}
-#searchBar .options INPUT {margin-left:15px;}
+#searchBar .options INPUT {margin:0 3px 0 15px;}
 #searchBar .options INPUT:hover {cursor:pointer}
 
 /*问题列表*/
 #listA {float:left; background-color:#FFF;padding:0 0px 0 0px; width:100%;}
-#listA .qstA {padding:3px 5px 0 5px; margin:0 0px 10px 0px; background:url(/content/images/quest-bg.gif) repeat-x top;}
+#listA .qstA {
+    position:relative;
+    padding:3px 5px 5px 10px; 
+    border-top:1px dashed #ccccce;
+    /*border-left:1px solid #ebebbe;
+    border-right:1px solid #b4b48e;
+    border-bottom:1px solid #b4b48e;*/
+    background: white;/* #f9f7ed;*/
+    margin:10px 0 10px 0;
+    /*background:url(../images/quest-bg.gif) repeat-x top;*/
+}
 #listA .qstA thumb {float:left; }
-#listA .qstA H2 {font-size:15px; font-weight:800; margin:8px auto;padding:0px;}
-#listA .qstA H2 a {color:#663333; }
-#listA .qstA .stat {font-size:13px;letter-spacing:1px;float:right;}
+#listA .qstA H2 {font-size:14px; font-weight:800; margin:8px auto;padding:0px;}
+#listA .qstA H2 a {color:333333/*#2e3436*/;font-size:15px;}
+#listA .qstA .stat {
+    position:absolute;
+    right:0px;
+    bottom:5px;
+    font-size:12px;
+	/*letter-spacing:1px;*/
+	float:right;
+}
 #listA .qstA .stat span {margin-right:5px;}
 #listA .qstA .stat td {min-width:40px;text-align:center;}
-#listA .qstA .stat .num {font-family:arial;color:#905213; font-size:20px; font-weight:800;}
-#listA .qstA .stat .unit {color:#777;}
-#listA .qstA .from {margin-top:5px; font-size:13px;}
-#listA .qstA .from .score {font-family:arial;}
-#listA .qstA .date {margin-left:20px; color:#777;}
-#listA .qstA .wiki {color:#663333;font-size:12px;}
+#listA .qstA .stat .num {
+    font-family:sans-serif;
+    color:#a40000; 
+    /*background:#eeeeec;
+    border: 1px solid #babdb6;*/
+    margin:0px;
+    font-size:17px; 
+    font-weight:800;
+}
+#listA .qstA table {border-spacing:0px;}
+#listA .qstA table td {padding:0px;width:60px;text-align:center;}
+#listA .qstA .stat .unit {color:#777777;margin:0px}
+#listA .qstA .from {margin-top:5px; font-size:13px;color:#777777;}
+#listA .qstA .from .score {font-family:sans-serif;color:#555555;}
+#listA .qstA .date {margin-left:10px; color:#777777;}
+#listA .qstA .wiki {color:#763333;font-size:12px;}
 #listA .qstA .from a {}
 #listA .qstA .from IMG {vertical-align:middle;}
 #listA .qstA .author {font-weight:400; }
-#listA .qstA .author a{ }
+#listA .qstA .author a{color:#444444; }
 #listA .qstA .summary{margin-right:5px;}
-
+#question-table {
+    margin-bottom:10px;
+    /*border-bottom:1px solid #888a85;*/
+}
 .evenMore {font-size:14px; font-weight:800;}
 .questions-count{font-size:32px;font-family:sans-serif;font-weight:600;padding:0 0 5px 7px;color:#a40000;}
 
 /*内容块*/
-.boxA {background:#777; padding:6px; margin-bottom:8px;}
+.boxA {background:#888a85; padding:6px; margin-bottom:8px;border 1px solid #babdb6;}
 .boxA H3 {font-size:13px; font-weight:800; color:#FFF; margin:0; padding:0; margin-bottom:4px;}
 .boxA .body {border:1px solid #999; padding:8px; background:#FFF; font-size:13px;}
 .boxA .more {padding:2px; text-align:right; font-weight:800;}
-.boxB {background:#F9F7CD; padding:6px; margin-bottom:8px;}
-.boxB H3 {font-size:13px; font-weight:800; color:#000; margin:0; padding:0 0 0 15px; margin-bottom:4px; background:url(/content/images/dot-g.gif) no-repeat left center;}
-.boxB .body {border:1px solid #FFFF88; padding:8px; background:#FFF; font-size:13px; line-height:160%;}
+.boxB {background:#F9F7ED; padding:6px; margin-bottom:8px;border:solid 1px #aaaaaa;}
+.boxB H3 {font-size:13px; font-weight:800; color:#000; margin:0; padding:0 0 0 15px; margin-bottom:4px; background:url(../images/dot-g.gif) no-repeat left center;}
+.boxB .body {border:1px solid #aaaaaa; padding:8px; background:#FFF; font-size:13px; line-height:160%;}
 .boxB .more {padding:1px; text-align:right; font-weight:800;}
-.boxC {background:#F5F5F5; padding:6px; margin-bottom:8px;}
+.boxC {
+    background:#babdb6;/*f9f7ed;*/
+    padding:10px; 
+    margin-bottom:8px;
+    border-top:1px solid #eeeeec;
+    border-left:1px solid #eeeeec;
+    border-right:1px solid #a9aca5;
+    border-bottom:1px solid #babdb6;
+}
+.boxC p.info-box-follow-up-links {
+    text-align:right;
+    margin:0;
+}
 /*分页*/
 .pager {margin-top:10px; margin-bottom:16px; float:left;}
 .pagesize {margin-top:10px; margin-bottom:16px; float:right;}
@@ -257,29 +317,36 @@ blockquote
 .tag-number {font-weight:700;font-family:sans-serif;}
 
 /*奖牌*/
-a.medal  { font-size:14px; line-height:250%; font-weight:800; color:#333; text-decoration:none; background:url(/content/images/medala.gif) no-repeat; border-left:1px solid #EEE; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:4px 12px 4px 6px;}
-a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images/medala_on.gif) no-repeat; border-left:1px solid #E7E296; border-top:1px solid #E7E296; border-bottom:1px solid #D1CA3D; border-right:1px solid #D1CA3D;}
+a.medal  { font-size:14px; line-height:250%; font-weight:800; color:#333; text-decoration:none; background:url(../images/medala.gif) no-repeat; border-left:1px solid #EEE; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:4px 12px 4px 6px;}
+a:hover.medal  {color:#333; text-decoration:none; background:url(../images/medala_on.gif) no-repeat; border-left:1px solid #E7E296; border-top:1px solid #E7E296; border-bottom:1px solid #D1CA3D; border-right:1px solid #D1CA3D;}
 
 /*Tab栏*/
-.tabBar{background-color:#FFF;border-bottom: 1px solid #666;height: 30px; width: 100%;clear:both; margin-bottom:3px;}
+.tabBar{background-color:#FFF;border-bottom: 1px solid white;height: 30px; width: 100%;clear:both; margin-bottom:3px;}
 .tabsA {background-color:#FFF;float:right;position:relative;display:block;font-weight:bold;height:20px;}
 .tabsB {background-color:#FFF;float:left;position:relative;display:block;font-weight:bold;height:20px;}
-.tabsA a.on, .tabsA a.on:hover,.tabsB a.on, .tabsB a.on:hover {background: #fff;
-    color:#333;
-	border: 1px solid #777;
-    border-bottom:2px solid #FFF;
-	height: 25px;
+.tabsA a.on, .tabsA a:hover,.tabsB a.on, .tabsB a:hover {
+    background: #fff;
+    color:#a40000;
+    border-top:1px solid #babdb6;
+    border-left:1px solid #babdb6;
+    border-right:1px solid #888a85;
+    border-bottom:1px solid #888a85;
+	height: 24px;
 	line-height: 26px;
 	margin-top: 3px;
 	padding: 0px 11px 0px 11px;}
 
-.tabsA a {background: #eee;
-	border: 1px solid #eee;
-	color: #777;
+.tabsA a {
+    background: #f9f7eb;
+    border-top:1px solid #eeeeec;
+    border-left:1px solid #eeeeec;
+    border-right:1px solid #a9aca5;
+    border-bottom:1px solid #888a85;
+	color: #888a85;
 	display: block;
 	float: left;
-	height: 22px;
-	line-height: 28px;
+	height: 20px;
+	line-height: 22px;
 	margin: 5px 4px 0 0;
 	padding: 0 11px 0 11px;
 	text-decoration: none;
@@ -295,19 +362,28 @@ a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images
 	padding: 0 11px 0 11px;
 	text-decoration: none;
 }
-.tabsA a:hover, .tabsB a:hover {background: #fff;border: 1px solid #777;border-bottom:3px solid #FFF;}
+/*.tabsA a:hover, .tabsB a:hover {background: #fff;border: 1px solid #777;border-bottom:3px solid #FFF;}*/
 .headlineA {font-size:13px; border-bottom:1px solid #777; padding-bottom:2px; font-weight:800; margin-bottom:12px; text-align:right; height:30px;}
-.headQuestions {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
-.headAnswers {float:left; padding:3px; font-size:18px; font-weight:800; background:url(/content/images/ico_answers.gif) left 2px no-repeat; padding-left:24px;}
-.headTags {float:left; padding:3px; font-size:18px; font-weight:800; background:url(/content/images/ico_tags.gif) no-repeat; padding-left:24px;}
-.headUsers {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
-.headMedals {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(/content/images/dot-list.gif) no-repeat left center;}
-.headLogin {float:left; padding:3px; font-size:15px; font-weight:800; background:url(/content/images/ico_login.gif) no-repeat; padding-left:24px;}
-.headNormal {text-align:left;padding:3px; font-size:15px; margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
-.headUser {text-align:left;padding:5px; font-size:20px; letter-spacing:1px;margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
+.headQuestions {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(../images/dot-list.gif) no-repeat left center;}
+.headAnswers {float:left; padding:3px; font-size:18px; font-weight:800; background:url(../images/ico_answers.gif) left 2px no-repeat; padding-left:24px;}
+.headTags {float:left; padding:3px; font-size:18px; font-weight:800; background:url(../images/ico_tags.gif) no-repeat; padding-left:24px;}
+.headUsers {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(../images/dot-list.gif) no-repeat left center;}
+.headMedals {float:left; height:23px; line-height:23px; margin:5px 0 0 5px;padding:0px 6px 0px 15px; font-size:15px; font-weight:700; border-bottom:0px solid #777; border-left:0px solid #darkred; background-color:#FFF;background:url(../images/dot-list.gif) no-repeat left center;}
+.headLogin {float:left; padding:3px; font-size:15px; font-weight:800; background:url(../images/ico_login.gif) no-repeat; padding-left:24px;}
+.headNormal {
+	text-align:left;
+	padding:3px; 
+	font-size:15px; 
+	margin-bottom:12px; 
+	font-weight:bold;
+	border-bottom: 1px solid #777;
+}
+.headUser {text-align:left;padding:5px; font-size:20px; 
+	/*letter-spacing:1px;*/
+		margin-bottom:12px; font-weight:800;border-bottom:1px solid #777;}
 /*RSS订阅*/
 #feeds {margin:10px 0; }
-#feeds a {background:url(/content/images/feed-icon-small.png) no-repeat 0; padding-left:18px; font-weight:700; font-size:13px; }
+#feeds a {background:url(../images/feed-icon-small.png) no-repeat 0; padding-left:18px; font-weight:700; font-size:13px; }
 
 /*问题*/
 #question {margin-bottom:30px;}
@@ -355,9 +431,9 @@ a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images
     font-weight:bold;
     color:#777;
 }
-.question-img-upvote:hover{background:url(/content/images/vote-arrow-up-on.png)}
-.question-img-downvote:hover{background:url(/content/images/vote-arrow-down-on.png)}
-.question-img-favorite:hover{background:url(/content/images/vote-favorite-on.png)}
+.question-img-upvote:hover{background:url(../images/vote-arrow-up-on.png)}
+.question-img-downvote:hover{background:url(../images/vote-arrow-down-on.png)}
+.question-img-favorite:hover{background:url(../images/vote-favorite-on.png)}
 .favorite-number{padding:0px;font-size:100%; font-family:Arial;font-weight:bold;color:#777;}
 .vote-notification
 {
@@ -405,7 +481,7 @@ a:hover.medal  {color:#333; text-decoration:none; background:url(/content/images
     cursor:pointer;
 }
 
-.action-link a:hover{
+.action-link: a hover{
     background-color:#777;
     text-decoration:none;
     color:#fff;
@@ -425,8 +501,11 @@ div.comments {
 }
 
 div.post-comments{
+    clear:both;
+    background: url(../images/gray-up-arrow-h18px.png) no-repeat;
     width:100%;
-    margin-bottom:10px;
+    padding-left: 12px;
+    margin:3px 0 10px 0;
 }
 
 form.post-comments textarea {
@@ -442,6 +521,7 @@ form.post-comments input {
 }
 span.text-counter {
     margin-right:20px;
+    font-size:11px;
 }
 
 span.form-error {
@@ -454,13 +534,7 @@ p.form-item {
 }
 
 div.comments-container, div.comments-container-accepted, div.comments-container-owner, div.comments-container-deleted {
-    display:none;
-    margin-top:-1px;
-    padding:0 5px 5px;
-}
-
-div.comments-container, a.comments-link {
-    background-color:#EEEEEE;
+    padding:0;
 }
 
 .post-comments a {
@@ -470,7 +544,9 @@ div.comments-container, a.comments-link {
 
 a.comments-link, a.comments-link-accepted, a.comments-link-owner, a.comments-link-deleted {
     color:black;
-    padding:2px;
+    font-size:11px;
+    background: #eeeeee;
+    padding:3px;
     cursor:pointer;
 }
 
@@ -482,7 +558,7 @@ a.comments-link, a.comments-link-accepted, a.comments-link-owner, a.comments-lin
 
 a.comment-user, a.comment-user:hover {
     background-color:inherit;
-    color:#0077CC;
+    color:blue;
     padding:0;
 }
 
@@ -494,6 +570,7 @@ a.comment-user:hover {
 .answer{
     padding-top:10px;
     width: 100%;
+    border-bottom:1px solid #ccccce;
 }
 .answer-body{
     min-height:80px;
@@ -556,7 +633,7 @@ a.comment-user:hover {
 	color: #E1E818;
 }
 
-.answer-img-accept:hover{background:url(/content/images/vote-accepted-on.png)}
+.answer-img-accept:hover{background:url(../images/vote-accepted-on.png)}
 
 .deleted{
     background:#F4E7E7 none repeat scroll 0 0;
@@ -575,21 +652,44 @@ a.comment-user:hover {
 .list-item LI{list-style-type:disc; font-size:13px; line-height:20px; margin-bottom:10px;}
 /* openid styles */
 .form-row{line-height:25px;}
+table.form-as-table {
+    margin-top:5px;
+}
+table.form-as-table ul {
+    list-style-type:none;
+    display: inline;
+}
+table.form-as-table li {
+    display: inline;
+}
+table.form-as-table td {
+    text-align:right;
+}
+table.form-as-table th {
+    text-align:left;
+    font-weight:normal;
+}
+/*.form-row li label {
+    display: inline
+}*/
 .submit-row{line-height:30px;padding-top:10px;}
 .errors{line-height:20px;color:red;}
-.error{color:red;}
+.error{
+    color:darkred;
+    margin:0;
+    font-size: 10px;
+}
 .error-list li{padding:5px;}
-.login{margin-bottom:10px;}
 .fieldset{
 /*	border:solid 1px #777;*/
 	border: none;
 	margin-top:10px;
 	padding:10px;
 }
-.openid-input{background:url(/content/images/openid.gif) no-repeat;padding-left:15px;cursor:pointer;}
+.openid-input{background:url(../images/openid.gif) no-repeat;padding-left:15px;cursor:pointer;}
 .openid-login-input{
     background-position:center left;
-    background:url(/content/images/openid.gif) no-repeat 0% 50%;
+    background:url(../images/openid.gif) no-repeat 0% 50%;
     padding:5px 5px 5px 15px;
     cursor:pointer;
     font-family:Trebuchet MS;
@@ -627,7 +727,7 @@ span.form-error {
     margin-left:5px;
 }
 .title-desc{
-    color:#999;
+    color:#666666;
     font-size:90%;
 }
 
@@ -705,6 +805,8 @@ span.form-error {
 
 .revision .summary span{
     background-color:yellow;
+    padding-left:3px;
+    padding-right:3px;
     display:inline;
 }
 .revision h1{
@@ -716,6 +818,7 @@ span.form-error {
 .revision-mark{
     width:200px;
     text-align:left;
+    display:inline-block;
     font-size:90%;
     overflow:hidden;
 }
@@ -745,13 +848,13 @@ background-color: #97ff97;
 }
 
 /*用户资料页面*/
-.count {font-family:Arial;font-size:24px;font-weight:700;color:#777}
+.count {font-family:Arial;font-size:200%;font-weight:700;color:#777}
 .scoreNumber{font-family:Arial;font-size:35px;font-weight:800;color:#777;line-height:40px;
 	/*letter-spacing:0px*/
 	}
 .user-details{font-size:13px;}
 .user-about{background-color:#EEEEEE;height:200px;line-height:20px; overflow:auto;padding:10px;width:90%;}
-.user-edit-link {background:url(/content/images/edit.png) no-repeat; padding-left:20px; font-weight:600;}
+.user-edit-link {background:url(../images/edit.png) no-repeat; padding-left:20px;}
 .favorites-count-off {
     color:#919191;
     float:left;
@@ -815,7 +918,8 @@ width:950;margin-bottom:10px;
 }
 
 .narrow .summary {
-    width:620px;
+    width:600px;
+    display:inline-block;
 }
 
 .narrow .summary h3 {
@@ -824,8 +928,8 @@ width:950;margin-bottom:10px;
 }
 
 .narrow .views {
-    float:left;
     height:42px;
+    float:left;
     margin:0 7px 0 0;
     /*padding:5px 0 5px 4px;*/
 	padding: 5px;
@@ -851,11 +955,22 @@ width:950;margin-bottom:10px;
 
 .narrow .vote-count-post {
     font-weight:800;
+    display:block;
     margin:0;
     font-size: 190%; color:#555; line-height:20px;
 }
-.narrow .answer-count-post{font-weight:800;margin:0; font-size: 190%; }
-.narrow .views-count-post{font-weight:800;margin:0; font-size: 190%;}
+.narrow .answer-count-post{
+    font-weight:800;
+    display:block;
+    margin:0; 
+    font-size: 190%; 
+}
+.narrow .views-count-post{
+    font-weight:800;
+    display:block;
+    margin:0; 
+    font-size: 190%;
+}
 div.started {
     color:#999999;
     float:right;
@@ -886,6 +1001,7 @@ div.started .reputation-score {
 .narrow  .tags{float:left;}
 
 .answer-summary {
+    display:block;
     clear:both;
     padding:3px;
 }
@@ -1009,7 +1125,7 @@ div.started .reputation-score {
 a.comment {background:#EEE; color:#993300; padding:4px;}
 a.permLink {padding:2px;}
 a.offensive {color:#999;}
-ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2px; padding-left:16px; margin-bottom:4px;}
+ul.bulleta li {background:url(../images/bullet_green.gif) no-repeat 0px 2px; padding-left:16px; margin-bottom:4px;}
 .user {padding:5px; line-height:140%; width:170px;}
 .user ul {margin:0; list-style-type:none;}
 .user .thumb{clear:both;float:left; margin-right:4px; display:inline;}
@@ -1036,13 +1152,15 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p
 	/*letter-spacing:1px;*/
 	background-color:#D4D0C8;
 	height:40px;
-	border:1px solid #777;
+	border:1px solid #777777;
 /*	width:100px; */
 	font-weight:bold;
+    padding-bottom:4px;
 	font-size:120%;}
 .submit:hover{text-decoration:underline;}
 .ask-body{padding-right:10px;}
 .thousand{color:orange;}
+
 .notify
 {
 	position: fixed;
@@ -1056,11 +1174,13 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p
 	color: #444;
 	background-color: #F4A83D;
 }
+
 .notify p {
     margin-top:5px;
     margin-bottom:5px;
     font-size:16px;
 }
+
 #close-notify
 {
     position:absolute;
@@ -1117,3 +1237,186 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p
 .highlight {
     background-color:#FFF8C6;
 }
+.nomargin {
+    margin:0;
+}
+.margin-bottom {
+    margin-bottom: 10px;
+}
+.inline-block {
+    display:inline-block;
+}
+.action-status {
+    margin:0;
+    border:none;
+    text-align:center;
+    line-height:10px;
+    font-size:12px;
+    padding:0;
+}
+.action-status span {
+    padding:3px 5px 3px 5px;
+    background-color:#fff380;/* nice yellow */
+    font-weight:normal;
+    -moz-border-radius: 5px;
+    -khtml-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+.tight {
+    margin:0;
+    padding:0;
+}
+
+.list-table td {
+    vertical-align:top;
+}
+
+p.comment {
+    border-top: 1px dotted #ccccce;
+    margin:0;
+    font-size:11px;
+    color: #444444;
+    padding:5px 0 5px 0;
+}
+
+.delete-icon {
+    vertical-align:middle;
+    padding-left:3px;
+}
+/* these need to go */
+table.form-as-table .errorlist {
+    display: block;
+    margin:0;
+    padding:0 0 0 5px;
+    text-align:left;
+    font-size:10px;
+    color:darkred;
+}
+table.form-as-table input {
+    display: inline;
+    margin-left: 4px;
+}
+table.form-as-table th {
+    vertical-align:bottom; 
+    padding-bottom:4px;
+}
+.form-row-vertical {
+    margin-top: 8px;
+    display: block;
+}
+.form-row-vertical label {
+    margin-bottom:3px;
+    display:block;
+}
+/* above stuff needs to go */
+.text-align-right {
+    text-align: center;
+}
+ul.form-horizontal-rows {
+    list-style:none;
+    margin:0;
+}
+ul.form-horizontal-rows li {
+    position:relative;
+    height:40px;
+}
+ul.form-horizontal-rows label {
+    display:inline-block;
+}
+ul.form-horizontal-rows ul.errorlist {
+    list-style:none;
+    color:darkred;
+    font-size:10px;
+    line-height:10px;
+    position:absolute;
+    top:2px;
+    left:180px;
+    text-align:left;
+    margin:0;
+}
+ul.form-horizontal-rows ul.errorlist li {
+    height:10px;
+}
+ul.form-horizontal-rows label {
+    position:absolute;
+    left:0px;
+    bottom:6px;
+    margin:0px;
+    line-height: 12px;
+    font-size: 12px;
+}
+ul.form-horizontal-rows li input {
+    position:absolute;
+    bottom:0px;
+    left:180px;
+    margin:0px;
+}
+#emailpw-form li input {
+    left:170px;
+}
+#emailpw-form ul.errorlist {
+    left:170px;
+}
+#changepw-form li input {
+    left:150px;
+}
+#changepw-form ul.errorlist {
+    left:150px;
+}
+.narrow .summary {
+    float: left;
+}
+.narrow .summary .question-title {
+    font-weight: bold;
+    font-size: 120%;
+}
+.user-profile-tool-links {
+    padding-bottom:10px;
+    font-weight: bold;
+}
+.post-controls {
+    float:left;
+    font-size:11px;
+    line-height:12px;
+    min-width:200px;
+    margin-bottom:5px;
+}
+#question-controls .tags {
+    margin:0 0 3px 0;
+}
+.post-update-info-container {
+    float: right;
+    min-width:190px;
+}
+.post-update-info {
+    display:inline-block;
+    float:right;
+    width:190px;
+    margin-bottom:5px;
+}
+.post-update-info p {
+    font-size:11px;
+    line-height:15px;
+    margin:0 0 4px 0;
+    padding:0;
+}
+.post-update-info img {
+    float: left;
+    width: 32px;
+    margin: 4px 8px 0 0;
+}
+.comments-container {
+    clear:both;
+}
+.admin {
+    background-color:#fff380;/* nice yellow */
+    border: 1px solid darkred;
+    padding: 0 5px 0 5px;
+}
+.admin p {
+    margin-bottom: 3px;
+}
+.admin #action_status {
+    text-align:center;
+    font-weight:bold;
+}
diff --git a/templates/edit_user_email_feeds_form.html b/templates/edit_user_email_feeds_form.html
new file mode 100644
index 00000000..65902e7e
--- /dev/null
+++ b/templates/edit_user_email_feeds_form.html
@@ -0,0 +1,4 @@
+{% load i18n %}
+<table class='form-as-table'>
+{{email_feeds_form.as_table}}
+</table>
diff --git a/templates/faq.html b/templates/faq.html
index aec37a56..236f4f76 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -72,10 +72,12 @@
                     <td style="text-align:right;padding-right:5px"><strong>500</strong></td>
                     <td>{% trans "retag questions" %}</td>
                 </tr>
+                {% if settings.WIKI_ON %}
                 <tr>
                     <td style="text-align:right;padding-right:5px"><strong>750</strong></td>
                     <td>{% trans "edit community wiki questions" %}</td>
                 </tr>
+                {% endif %}
                 <tr>
                     <td style="text-align:right;padding-right:5px"><strong>2000</strong></td>
                     <td>{% trans "edit any answer" %}</td>
@@ -99,7 +101,7 @@
         <div>
             <a id='validate'></a><h3 class="subtitle">{% trans "how to validate email title" %}</h3>
             <!--special case here message must contain paragraphs-->
-            {% trans "how to validate email info" %}
+            {% blocktrans %}how to validate email info with {{send_email_key_url}} {{gravatar_faq_url}}{% endblocktrans %}
         </div>
         {% endifequal %}
         <div>
@@ -121,7 +123,7 @@
         </div>
         <div>
             <h3 class="subtitle">{% trans "Still have questions?" %}</h3>
-            <p>{% trans "Please ask your question, help make our community better!" %} 
+            <p>{% blocktrans %}Please ask your question at {{ask_question_url}}, help make our community better!{% endblocktrans %} 
             <!--
             <a href="{% url tags %}faq" class="big">{{ settings.APP_TITLE }} {% trans "questions" %}</a>{% trans "." %}
             -->
diff --git a/templates/feedback.html b/templates/feedback.html
new file mode 100644
index 00000000..38bb48ff
--- /dev/null
+++ b/templates/feedback.html
@@ -0,0 +1,55 @@
+{% extends "base_content.html" %}
+<!-- template about.html -->
+{% load i18n %}
+{% load extra_tags %}
+{% load humanize %}
+{% block title %}{% spaceless %}{% trans "Feedback" %}{% endspaceless %}{% endblock %}
+{% block forejs %}
+{% endblock %}
+{% block content %}
+<div class="headNormal">
+{% trans "Give us your feedback!" %}
+</div>
+<div class="content">
+    <form method="post" action="{% url feedback %}" accept-charset="utf-8">
+        {% if user.is_authenticated %}
+            <p class="message">
+            {% blocktrans with user.username as user_name %}
+            <span class='big strong'>Dear {{user_name}}</span>, we look forward to hearing your feedback. 
+            Please type and send us your message below.
+            {% endblocktrans %}
+            <p>
+        {% else %}
+            <p class="message">
+            {% blocktrans %}
+            <span class='big strong'>Dear visitor</span>, we look forward to hearing your feedback.
+            Please type and send us your message below.
+            {% endblocktrans %}
+            </p>
+            <div class="form-row"><label>{{form.name.label}}</label><br/>{{form.name}}</div>
+            <div class="form-row">
+                <label>{{form.email.label}} 
+                    {% if form.errors.email %}
+                        <span class='red'>(please enter a valid email)</span>
+                    {% endif %}
+                </label><br/>{{form.email}}
+            </div>
+        {% endif %}
+        <div class="form-row">
+            <label>{{form.message.label}}
+            {% if form.errors.message %}
+            <span class="red">{% trans "(this field is required)" %}</span>
+            </label>
+            {% endif %}
+            <br/>
+            {{form.message}}
+        </div>
+        {{form.next}}
+        <div class="submit-row">
+            <input type="submit" class="submit" value="{% trans "Send Feedback" %}"/>
+            <input type="submit" class="submit" name="cancel" value="{% trans "Cancel" %}"/>
+        </div>
+    </form>
+</div>
+{% endblock %}
+<!-- end template about.html -->
diff --git a/templates/feedback_email.txt b/templates/feedback_email.txt
new file mode 100644
index 00000000..df768180
--- /dev/null
+++ b/templates/feedback_email.txt
@@ -0,0 +1,19 @@
+{% load i18n %}
+{% spaceless %}
+{% blocktrans with settings.APP_TITLE|safe as site_title %}
+Hello, this is a {{site_title}} forum feedback message
+{% endblocktrans %}
+{% endspaceless %}
+
+{% spaceless %}
+{% trans "Sender is" %}
+{% if user.is_authenticated %}
+    {{user.username|safe}} {% trans "email" %}:{{user.email|safe}} 
+{% else %}
+    {% if name %}{{name|safe}}{% else %}{% trans "anonymous" %}{% endif %}
+    {% if email %}{% trans "email" %}:{{email|safe}}{% endif %}
+{% endif %}
+    ip:{{request.META.REMOTE_ADDR}}
+{% endspaceless %}
+
+{% trans "Message body:" %} {{message|safe}}
diff --git a/templates/footer.html b/templates/footer.html
index 7eb0205e..9d19b41e 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -3,33 +3,47 @@
 {% load i18n %}
 <!-- 页面底部开始： -->
     <div id="ground">
-       <div class="footerLinks" >
-            <a href="{% url about %}">{% trans "about" %}</a><span class="link-separator"> |</span>
-            <a href="{% url faq %}">{% trans "faq" %}</a><span class="link-separator"> |</span>
-            <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
-            <a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>
-            <a href="{% url privacy %}">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
-            <a href="{{ feedback_url }}" target="_blank">{% trans "give feedback" %}</a>
-        </div>
-	  <p style="margin-top:10px;">
-         <a href="http://code.google.com/p/cnprog/" target="_blank">
-            <img src="/content/images/djangomade124x25_grey.gif" border="0" alt="Made with Django." title="Made with Django." />
-         </a>
-         <!--<div style="font-size:90%;color:#333">{% trans "current revision" %}: R-0120-20090406</div>-->
-      </p>
-	  <p id="licenseLogo"><img src="/content/images/cc-wiki.png" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" /></p>
+		<div>
+			<div class="footerLinks" >
+				<a href="{% url about %}">{% trans "about" %}</a><span class="link-separator"> |</span>
+				<a href="{% url faq %}">{% trans "faq" %}</a><span class="link-separator"> |</span>
+				<!--<a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>-->
+				<!--<a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>-->
+				<a href="{% url privacy %}">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
+                {% spaceless %}
+				<a href=
+                    {% if settings.FEEDBACK_SITE_URL %}
+                        "{{settings.FEEDBACK_SITE_URL}}"
+                        target="_blank">
+                    {% else %}
+                        "{% url feedback %}?next={{request.path}}">
+                    {% endif %}
+                    {% trans "give feedback" %}
+                </a>
+                {% endspaceless %}
+			</div>
+		  <p>
+			 <a href="http://github.com/cnprog/CNPROG/network" target="_blank">
+				powered by cnprog platform
+				<!--<img src="{% href "/content/images/djangomade124x25_grey.gif" %}" border="0" alt="Made with Django." title="Made with Django." >-->
+			 </a>
+		  </p>
+	   </div>
+		 <div id="licenseLogo">
+		  <a href="http://creativecommons.org/licenses/by/3.0/">
+					<img src="{% href "/content/images/cc-wiki.png" %}" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" />
+		  </a>
+		 </div>
 	</div>
 	<!-- 页面底部结束： -->
-    {% if settings.GOOGLE_ANALYTICS_KEY %}
         <script type="text/javascript">
             var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
             document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
             </script>
             <script type="text/javascript">
             try {
-            var pageTracker = _gat._getTracker("{{ settings.GOOGLE_ANALYTICS_KEY }}");
+            var pageTracker = _gat._getTracker('{{ settings.GOOGLE_ANALYTICS_KEY }}');
             pageTracker._trackPageview();
             } catch(err) {}
         </script>
-    {% endif %}
-<!-- end footer.html -->
+<!-- end template footer.html -->
diff --git a/templates/header.html b/templates/header.html
index e1097802..42074763 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>
diff --git a/templates/index.html b/templates/index.html
index 104b24d0..470612b4 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,6 +4,7 @@
 {% load extra_tags %}
 {% load humanize %}
 {% load extra_filters %}
+{% load smart_if %}
 {% block title %}{% spaceless %}{% trans "Home" %}{% endspaceless %}{% endblock %}
 {% block meta %}<meta name="keywords" content="{{ settings.APP_KEYWORDS }}" />
         <meta name="description" content="{{ settings.APP_DESCRIPTION }}" />{% endblock %}
@@ -32,30 +33,31 @@
     {% for question in questions %}
     <div class="qstA">
         <h2>
-            <a href="{{ question.get_absolute_url }}" title="{{ question.summary|collapse }}...">
-            {{ question.get_question_title }}
-            </a>
+            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
         </h2>
         <div class="stat">
             <table>
-	            <tr>
+                <tr>
                     <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
                     <td><span class="num">{{ question.score|intcomma }}</span> </td>
                     <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-	            </tr>  
+                </tr>  
                 <tr>
                     <td><span class="unit">{% trans "answers" %}</span></td>
                     <td><span class="unit">{% trans "votes" %}</span></td>
                     <td><span class="unit">{% trans "views" %}</span></td>
-	            </tr> 
+                </tr> 
             </table>
         </div>
+        
         <div class="summary">
-            {{ question.summary}}...
+            {{ question.summary }}...                
         </div>
-        {% if question.wiki %}
+        
+        {% ifequal tab_id 'active'%}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
-        <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
             {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
@@ -64,6 +66,38 @@
             <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
         </div>
         {% endif %}
+        {% else %}
+        {% if question.wiki and settings.WIKI_ON %}
+        <span class="from wiki">{% trans "community wiki" %}</span>
+        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+        {% else %}
+        <div class="from">
+            {% comment %}{% gravatar question.author 24 %}{% endcomment %}
+            {% if question.last_activity_at != question.added_at %}
+                {% if question.author.id != question.last_activity_by.id %}
+                    {% trans "Posted:" %}
+                    <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                    <span class="score">{% get_score_badge question.author %} </span>
+                    / {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% else %}
+                    {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% endif %}
+            {% else %}
+                {% trans "Posted:" %}
+                <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                <span class="score">{% get_score_badge question.author %} </span>
+                <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% endif %}
+        </div>
+        {% endif %}
+        {% endifequal %}
+        
         <div class="tags">
         {% for tag in question.tagname_list %}
         <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
@@ -85,7 +119,7 @@
 	</div>
 </div>
 {% endif %}
-<div class="boxB">
+<div class="boxC">
 	<h3>{% trans "Recent tags" %}</h3>
 	<div class="body">
          <div class="tags">
@@ -98,7 +132,7 @@
     </div>
 </div>
 {% if awards %}
-<div class="boxB">
+<div class="boxC">
     <h3>{% trans "Recent awards" %}</h3>
         <div class="body">
              <ul class="badge-list">
@@ -115,12 +149,12 @@
 </div>
 {% endif %}
 <div id="feeds">
-<a href="/feeds/rss" title="{% trans "subscribe to last 30 questions by RSS" %}">{% trans "subscribe to the questions feed" %}</a>
+<a href="{% href "/feeds/rss" %}" title="{% trans "subscribe to last 30 questions by RSS" %}">{% trans "subscribe to the questions feed" %}</a>
 </div>
 {% endblock %}
 {% block tail %}
 <div style="padding:5px 0 5px 5px;">
-<span class="evenMore">{% trans "Still looking for more? See" %} <a href="{% url questions %}">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="/tags/">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="{% url questions %}unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
+<span class="evenMore">{% trans "Still looking for more? See" %} <a href="{% url questions %}">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="{% url tags %}">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="{% url questions %}unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
 </div>
 {% endblock %}
 <!-- index.html -->
diff --git a/templates/logout.html b/templates/logout.html
index 2cd935a0..650ba044 100644
--- a/templates/logout.html
+++ b/templates/logout.html
@@ -8,7 +8,6 @@
     <script type="text/javascript">
     $().ready(function(){
         $('#btLogout').bind('click', function(){ window.location.href='{% url user_signout %}?next={{ next }}'; });
-    
     });
     </script>
 {% endblock %}
diff --git a/templates/post_contributor_info.html b/templates/post_contributor_info.html
new file mode 100644
index 00000000..9997be5f
--- /dev/null
+++ b/templates/post_contributor_info.html
@@ -0,0 +1,55 @@
+{% load i18n %}
+{% load smart_if %}
+{% load extra_tags %}
+<div class='post-update-info'>
+{% ifequal contributor_type "original_author" %}
+    {% if wiki %}
+        <p>{% trans "community wiki" %}</p>
+        <p>
+            {% blocktrans count post.revisions.all|length as rev_count %}
+                one revision
+            {% plural %}
+                {{rev_count}} revisions
+            {% endblocktrans %}
+        </p>
+        <p>{{post.author.get_profile_link}}</p>
+    {% else %}
+        <p style="line-height:12px;">
+            {% ifequal post_type "question" %}
+                {% trans "asked" %}
+            {% else %}
+                {% ifequal post_type "answer" %}
+                    {% trans "answered" %}
+                {% else %}
+                    {% trans "posted" %}
+                {% endifequal %}
+            {% endifequal %}
+            {% ifequal post_type "revision" %}
+                <strong>{% diff_date post.revised_at %}</strong>
+            {% else %}
+                <strong>{% diff_date post.added_at %}</strong>
+            {% endifequal %}
+        </p>
+        {% gravatar post.author 32 %}
+        <p>{{post.author.get_profile_link}}<br/>
+        {% get_score_badge post.author %}</p>
+    {% endif %}
+{% else %}
+    {% if post.last_edited_at %}
+        <p style="line-height:12px;">
+        {% ifequal post_type 'question' %}
+        <a href="{% url question_revisions post.id %}">
+        {% else %}
+        <a href="{% url answer_revisions post.id %}">
+        {% endifequal %}
+        {% trans "updated" %} <strong>{% diff_date post.last_edited_at %}</strong>
+        </a>
+        </p>
+        {% if post.author != post.last_edited_by or wiki %}
+            {% gravatar post.last_edited_by 32 %}
+            <p style="float:left">{{post.last_edited_by.get_profile_link}}<br/>
+            {% get_score_badge post.last_edited_by %}</p>
+        {% endif %}
+    {% endif %}
+{% endifequal %}
+</div>
diff --git a/templates/question.html b/templates/question.html
index c9446076..6929b762 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -2,21 +2,23 @@
 <!-- question.html -->
 {% load extra_tags %}
 {% load extra_filters %}
+{% load smart_if %}
 {% load humanize %}
 {% load i18n %}
 {% block title %}{% spaceless %}{{ question.get_question_title }}{% endspaceless %}{% endblock %}
 {% block forejs %}
         <meta name="description" content="{{question.summary}}" />
         <meta name="keywords" content="{{question.tagname_meta_generator}}" />
-        <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}"/>
+        <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />
         {% if not question.closed %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/wmd.js'></script>
-        <link rel="stylesheet" type="text/css" href="/content/js/wmd/wmd.css" />
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/showdown.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/wmd.js" %}'></script>
+        <link rel="stylesheet" type="text/css" href="{% href "/content/js/wmd/wmd.css" %}" />
         {% endif %}
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
+
         <script type="text/javascript">
         // define reputation needs for comments
         var repNeededForComments = 50;
@@ -61,14 +63,17 @@
 </div>
 <div id="main-body" class="">
     <div id="askform">
-        <form id="fmanswer" action="{% url answer question.id %}" method="post">
             <table style="width:100%;" id="question-table" {% if question.deleted %}class="deleted"{%endif%}>
                 <tr>
                     <td style="width:30px;vertical-align:top">
                         <div class="vote-buttons">
                             {% if question_vote %}
                             <img id="question-img-upvote-{{ question.id }}" class="question-img-upvote" 
-								src="/content/images/vote-arrow-up{% if question_vote.is_upvote %}-on{% endif %}.png" 
+                                {% if question_vote.is_upvote %}
+								    src="{% href "/content/images/vote-arrow-up-on.png" %}" 
+                                {% else %}
+								    src="{% href "/content/images/vote-arrow-up.png" %}" 
+                                {% endif %}
                                 alt="{% trans "i like this post (click again to cancel)" %}"
 								title="{% trans "i like this post (click again to cancel)" %}" />
                             <div id="question-vote-number-{{ question.id }}" class="vote-number" 
@@ -76,34 +81,38 @@
                                 {{ question.score }}
                             </div>
                             <img id="question-img-downvote-{{ question.id }}" class="question-img-downvote" 
-								src="/content/images/vote-arrow-down{% if question_vote.is_downvote %}-on{% endif %}.png" 
+                                {% if question_vote.is_downvote %}
+								    src="{% href "/content/images/vote-arrow-down-on.png" %}" 
+                                {% else %}
+								    src="{% href "/content/images/vote-arrow-down.png" %}" 
+                                {% endif %}
                                 alt="{% trans "i dont like this post (click again to cancel)" %}"
 								title="{% trans "i dont like this post (click again to cancel)" %}" />
                            
                             {% else %}
                             <img id="question-img-upvote-{{ question.id }}" class="question-img-upvote" 
                                 alt="{% trans "i like this post (click again to cancel)" %}"
-								src="/content/images/vote-arrow-up.png" 
+								src="{% href "/content/images/vote-arrow-up.png" %}" 
 								title="{% trans "i like this post (click again to cancel)" %}" />
                             <div id="question-vote-number-{{ question.id }}" class="vote-number" 
 								title="{% trans "current number of votes" %}">
                                 {{ question.score }}
                             </div>
                             <img id="question-img-downvote-{{ question.id }}" class="question-img-downvote" 
-								src="/content/images/vote-arrow-down.png" 
+								src="{% href "/content/images/vote-arrow-down.png" %}"
                                 alt="{% trans "i dont like this post (click again to cancel)" %}"
                                 title="{% trans "i dont like this post (click again to cancel)" %}" />
           
                             {% endif %}
                             {% if favorited %}
-                            <img class="question-img-favorite" src="/content/images/vote-favorite-on.png" 
+                            <img class="question-img-favorite" src="{% href "/content/images/vote-favorite-on.png" %}"
 								alt="{% trans "mark this question as favorite (click again to cancel)" %}"
 								title="{% trans "mark this question as favorite (click again to cancel)" %}" />
                             <div id="favorite-number" class="favorite-number my-favorite-number">
                                 {{ question.favourite_count }}
                             </div>
                             {% else %}
-                            <img class="question-img-favorite" src="/content/images/vote-favorite-off.png" 
+                            <img class="question-img-favorite" src="{% href "/content/images/vote-favorite-off.png" %}"
 								alt="{% trans "remove favorite mark from this question (click again to restore mark)" %}"
 								title="{% trans "remove favorite mark from this question (click again to restore mark)" %}" />
                             <div id="favorite-number" class="favorite-number">
@@ -119,137 +128,87 @@
                             <div class="question-body">
                                 {{ question.html|safe }}
                             </div>
-                            <div id="question-tags" class="tags" >
-                                {% for tag in question.tagname_list %}
-                                    <a href="{% url forum.views.tag tag|urlencode %}" class="post-tag" 
-										title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
-                                {% endfor %}
+                            <div id="question-controls" class="post-controls">
+                                <div id="question-tags" class="tags">
+                                    {% for tag in question.tagname_list %}
+                                        <a href="{% url forum.views.tag tag|urlencode %}" class="post-tag" 
+                                            title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
+                                    {% endfor %}
+                                </div>
+                                {% joinitems using '<span class="action-link-separator">|</span>' %}    
+                                    {% if request.user|can_edit_post:question %}
+                                    <span class="action-link"><a href="{% url edit_question question.id %}">{% trans 'edit' %}</a></span>
+                                    {% endif %}
+                                {% separator %}
+                                    {% if request.user|can_delete_post:question %}
+                                    <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span>
+                                    {% endif %}
+                                {% separator %}
+                                    {% if question.closed %}
+                                    {% if request.user|can_reopen_question:question %}
+                                    <span class="action-link"><a href="{% url reopen question.id %}">{% trans "reopen" %}</a></span>
+                                    {% endif %}
+                                    {% else %}
+                                    {% if request.user|can_close_question:question %}
+                                    <span class="action-link"><a href="{% url close question.id %}">{% trans "close" %}</a></span>
+                                    {% endif %}
+                                    {% endif %}
+                                {% separator %}
+                                    {% if request.user|can_flag_offensive %}
+                                    <span id="question-offensive-flag-{{ question.id }}" class="offensive-flag" 
+                                        title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">
+                                        <a>{% trans "flag offensive" %}</a>
+                                        {% if request.user|can_view_offensive_flags and question.offensive_flag_count %}
+                                        <span class="darkred">({{ question.offensive_flag_count }})</span>
+                                        {% endif %}
+                                    </span>
+                                    {% endif %}
+                                {% endjoinitems %}
                             </div>
-                            <div id="question-controls" style="clear:both;">
-                                <table width="100%">
-                                    <tr>
-                                        <td width="210px" style="vertical-align:top">
-                                            
-                                            {% if request.user|can_edit_post:question %}
-                                            <span class="action-link"><a href="{% url edit_question question.id %}">{% trans 'edit' %}</a></span>
-                                            <span class="action-link-separator">|</span>
-                                            {% endif %}
-                                            {% if request.user|can_delete_post:question %}
-                                            <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span>
-                                            <span class="action-link-separator">|</span>
-                                            {% endif %}
-                                            {% if question.closed %}
-                                            {% if request.user|can_reopen_question:question %}
-                                            <span class="action-link"><a href="{% url reopen question.id %}">{% trans "reopen" %}</a></span>
-                                            <span class="action-link-separator">|</span>
-                                            {% endif %}
-                                            {% else %}
-                                            {% if request.user|can_close_question:question %}
-                                            <span class="action-link"><a href="{% url close question.id %}">{% trans "close" %}</a></span>
-                                            <span class="action-link-separator">|</span>
-                                            {% endif %}
-                                            {% endif %}
-                                            
-                                            <span id="question-offensive-flag-{{ question.id }}" class="offensive-flag" 
-												title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">
-												<a>{% trans "flag offensive" %}</a>
-												<span class="darkred">{% if request.user|can_view_offensive_flags %}
-												{% if question.offensive_flag_count %}({{ question.offensive_flag_count }}){% endif %}{% endif %}</span>
-                                            </span>
-                                            
-                                        </td>
-                                        <td width="210px" style="vertical-align:top">
-                                            {% if question.last_edited_by %}
-                                            <div class="question-edit" >
-                                                <table width="200px" >
-                                                    <tr>
-                                                        <td colspan="2"> 
-                                                         {% trans "updated" %} <a href="{% url question_revisions question.id %}"><strong title="{{question.last_edited_at }}">{% diff_date question.last_edited_at  %}</strong></a>
-                                                        </td>
-                                                        
-                                                    </tr>
-                                                    {% if question.wiki %}
-                                                    <tr>
-                                                        <td style="width:40px;vertical-align:bottom">
-                                                        {% gravatar question.last_edited_by 32 %}
-                                                        </td>
-                                                        <td style="width:160px; vertical-align:top">
-                                                            <a href="{% url users %}{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a>
-                                                        </td>
-                                                    </tr>
-                                                    {% else %}
-                                                    {% ifequal question.last_edited_by question.author %}
-                                                    <tr>
-                                                        <td> </td>
-                                                        <td> </td>
-                                                    </tr>
-                                                    {% else %}
-                                                    <tr>
-                                                        <td style="width:40px;vertical-align:bottom">
-                                                        {% gravatar question.last_edited_by 32 %}
-                                                        </td>
-                                                        <td style="width:160px; vertical-align:top">
-                                                            <div><a href="{% url users %}{{ question.last_edited_by.id }}/{{ question.last_edited_by.username }}">{{ question.last_edited_by.username }}</a></div>
-                                
-                                                            <div>
-                                                            {% get_score_badge question.last_edited_by %}
-                                                            </div>
-                                                          
-                                                        </td>
-                                                    </tr>
-                                                    {% endifequal %}
-                                                    {% endif %}
-                                                </table>
-                                            </div>
-                                            {% endif %}
-                                            
-                                        </td>
-                                        <td style="vertical-align:top">
-                                            {% if question.wiki %}
-                                            <span class="wiki-category">{% trans "community wiki" %}</span>
-                                            <div style="margin-bottom:10px"></div>
-                                            {% else %}
-                                            <div  class="question-mark">
-                                                <table width="200px">
-                                                    <tr>
-                                                        <td colspan="2"> 
-                                                        {% trans "asked" %} <strong title="{{ question.added_at }}">{% diff_date question.added_at %}</strong>
-                                                        </td>
-                                                        
-                                                    </tr>
-                                                    
-                                                    <tr>
-                                                        <td style="width:40px; vertical-align:bottom">
-                                                        {% gravatar question.author 32 %}
-                                                        </td>
-                                                        <td align="left" style="width:160px;vertical-align:top">
-                                                            <div><a href="{% url users %}{{ question.author.id }}/{{ question.author }}">{{ question.author }}</a></div>
-                                                            <div>
-                                                            {% get_score_badge question.author %}
-                                                            </div>
-                                                        </td>
-                                                    </tr>
-                                                    
-                                                </table>
-                                            </div>
-                                            {% endif %}
-                                        
-                                        </td>
-                                    </tr>
-                                </table>
-                                
+                            <div class="post-update-info-container">
+                                {% post_contributor_info question "original_author" %}
+                                {% post_contributor_info question "last_updater" %}
+                            </div>
+                            <div class="comments-container" id="comments-container-question-{{question.id}}">
+                            {% for comment in question.get_comments|slice:":5" %}
+                                <p class="comment" id="comment-{{comment.id}}">
+                                    {{comment.comment}} 
+                                    - <a class="comment-user" href="{{comment.user.get_profile_url}}">{{comment.user}}</a>
+                                    {% spaceless %}
+                                    <span class="comment-age">({% diff_date comment.added_at %})</span>
+                                    {% if request.user|can_delete_comment:comment %}
+                                        <img class="delete-icon" 
+                                            src="{% href "/content/images/close-small.png" %}"
+                                            title="{% trans "delete this comment" %}"/>
+                                    {% endif %}
+                                    {% endspaceless %}
+                                </p>
+                            {% endfor %}
                             </div>
-                            
                             <div class="post-comments" style="margin-bottom:20px">
-                                <input id="can-post-comments-question-{{question.id}}" type="hidden" value="{{ request.user|can_add_comments }}"/>
-                                <a id="comments-link-question-{{question.id}}" class="comments-link">
-								{% if question.comment_count %}{% trans "comments" %} <strong>({{question.comment_count}})</strong>
-								{% else %}{% trans "add comment" %}
-								{% endif %}</a>
-                                <div id="comments-question-{{question.id}}" class="comments-container">
-                                <div class="comments"/></div>
+                                <input id="can-post-comments-question-{{question.id}}" type="hidden" value="{{ request.user|can_add_comments:question }}"/>
+                                {% if request.user|can_add_comments:question or question.comment_count > 5 %}
+                                    <a id="comments-link-question-{{question.id}}" class="comments-link">
+                                    {% if request.user|can_add_comments:question %}
+                                        {% trans "add comment" %}
+                                    {% endif %}
+                                    {% if question.comment_count > 5 %}
+                                        {% if request.user|can_add_comments:question %}/
+                                            {% blocktrans count question.get_comments|slice:"5:"|length as counter %}
+                                            see <strong>one</strong> more 
+                                            {% plural %}
+                                            see <strong>{{counter}}</strong> more
+                                            {% endblocktrans %}
+                                        {% else %}
+                                            {% blocktrans count question.get_comments|slice:"5:"|length as counter %}
+                                            see <strong>one</strong> more comment
+                                            {% plural %}
+                                            see <strong>{{counter}}</strong> more comments
+                                            {% endblocktrans %}
+                                        {% endif %}
+                                    {% endif %}</a>
+                                {% endif %}
                             </div>
-                            
                         </div>
                         
                     </td>
@@ -257,20 +216,29 @@
             </table>
             {% if question.closed %}
             <div class="question-status" style="margin-bottom:15px">
-                <h3>{% trans "The question has been closed for the following reason" %} "{{ question.get_close_reason_display }}" {% trans "by"%} 
+            <h3>{% blocktrans with question.get_close_reason_display as close_reason %}The question has been closed for the following reason "{{ close_reason }}" by{% endblocktrans %} 
 			<a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> 
-			{% blocktrans %}close date {% endblocktrans %} {{question.closed_at|date:"d-m-Y H:i"}}</h3>
+			{% blocktrans with question.closed_at as closed_at %}close date {{closed_at}}{% endblocktrans %}</h3>
             </div>
             {% endif %}
-            
-            {% ifnotequal answers.length 0 %}
+            {% if answers %}
+                <hr/>
                 <div class="tabBar">
                     <a name="sort-top"></a>
-                    <div class="headQuestions">{{ answers|length }}{% trans "Answers" %}:</div>
+                    <div class="headQuestions">
+                    {% blocktrans count answers|length as counter %}
+                    One Answer:
+                    {% plural %}
+                    {{counter}} Answers:
+                    {% endblocktrans %}
+                    </div>
                     <div class="tabsA">
-                         <a id="oldest" href="?sort=oldest#sort-top" title="{% trans "oldest answers will be shown first" %}">{% trans "oldest answers" %}</a>
-                        <a id="latest" href="?sort=latest#sort-top" title="{% trans "newest answers will be shown first" %}">{% trans "newest answers" %}</a>
-                        <a id="votes" href="?sort=votes#sort-top" title="{% trans "most voted answers will be shown first" %}">{% trans "popular answers" %}</a>   
+                         <a id="oldest" href="{% url question question.id %}?sort=oldest#sort-top" 
+                            title="{% trans "oldest answers will be shown first" %}">{% trans "oldest answers" %}</a>
+                        <a id="latest" href="{% url question question.id %}?sort=latest#sort-top" 
+                            title="{% trans "newest answers will be shown first" %}">{% trans "newest answers" %}</a>
+                        <a id="votes" href="{% url question question.id %}?sort=votes#sort-top" 
+                            title="{% trans "most voted answers will be shown first" %}">{% trans "popular answers" %}</a>   
                     </div>
                 </div>
                 {% cnprog_paginator context %}
@@ -283,26 +251,26 @@
                                 <td style="width:30px;vertical-align:top">
                                     <div class="vote-buttons">
                                         <img id="answer-img-upvote-{{ answer.id }}" class="answer-img-upvote" 
-                                                src="/content/images/vote-arrow-up{% get_user_vote_image user_answer_votes answer.id 1 %}.png" 
+                                                src="{% blockresource %}/content/images/vote-arrow-up{% get_user_vote_image user_answer_votes answer.id 1 %}.png{% endblockresource %}" 
                                                 alt="{% trans "i like this answer (click again to cancel)" %}"
                                                 title="{% trans "i like this answer (click again to cancel)" %}"/>
                                         <div id="answer-vote-number-{{ answer.id }}" class="vote-number" title="{% trans "current number of votes" %}">
                                             {{ answer.score }}
                                         </div>
                                         <img id="answer-img-downvote-{{ answer.id }}" class="answer-img-downvote" 
-											src="/content/images/vote-arrow-down{% get_user_vote_image user_answer_votes answer.id -1 %}.png" 
+											src="{% blockresource %}/content/images/vote-arrow-down{% get_user_vote_image user_answer_votes answer.id -1 %}.png{% endblockresource %}" 
 											alt="{% trans "i dont like this answer (click again to cancel)" %}"
 											title="{% trans "i dont like this answer (click again to cancel)" %}" />
                                      
                                         {% ifequal request.user question.author  %}
                                         <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" 
-											src="/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png" 
+											src="{% blockresource %}/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockresource %}" 
 											alt="{% trans "mark this answer as favorite (click again to undo)" %}"
 											title="{% trans "mark this answer as favorite (click again to undo)" %}" />
                                         {% else %}
                                             {% if answer.accepted %}
                                             <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" 
-												src="/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png" 
+												src="{% blockresource %}/content/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockresource %}" 
 												alt="{% trans "the author of the question has selected this answer as correct" %}"
 												title="{% trans "the author of the question has selected this answer as correct" %}" />
                                             {% endif %}
@@ -314,124 +282,82 @@
                                         <div class="answer-body">
                                             {{ answer.html|safe }}
                                         </div>
-                                        <div class="answer-controls" style="clear:both;">
-                                            <table width="100%">
-                        	                    <tr>
-                                                    <td width="400px" style="vertical-align:top">
-                                                        {% if request.user|can_edit_post:answer %}
-                                                        <span class="action-link"><a href="{% url edit_answer answer.id %}">{% trans "edit" %}</a></span>
-                                                        <span class="action-link-separator">|</span>
-                                                        {% endif %}
-                                                        {% if request.user|can_delete_post:answer %}
-                                                        <span class="action-link">
-															<a id="answer-delete-link-{{answer.id}}">
-																{% if answer.deleted %}
-																	{% trans "undelete" %}
-																{% endif %}
-																{% if not answer.deleted %}
-																	{% trans "delete" %}
-																{% endif %}
-															</a>
-														</span>
-                                                        <span class="action-link-separator">|</span>
-                                                        {% endif %}
-                                                        <span class="linksopt">
-                                                            <a href="#{{ answer.id }}" title="{% trans "answer permanent link" %}">
-															{% trans "permanent link" %}
-                                                            </a>
-                                                        </span>
-                                                        <span class="action-link-separator">|</span>
-                                                        <span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag" 
-															title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">
-															<a>{% trans "flag offensive" %}</a>
-															<span class="darkred">{% if request.user|can_view_offensive_flags %}{% if answer.offensive_flag_count %}({{ answer.offensive_flag_count }}){% endif %}{% endif %}</span></span>
-                                                    </td>
-                        	                    	<td width="110px" style="vertical-align:top">
-                                                    {% if answer.last_edited_by %}
-                                                    <div class="question-edit" >
-                                                        <table width="200px" >
-                                                            <tr>
-                                                                <td colspan="2"> 
-                                                                 {% trans "updated" %}<a href="{% url answer_revisions answer.id %}"><strong title="{{answer.last_edited_at }}">{% diff_date answer.last_edited_at  %}</strong></a>
-                                                                </td>
-                                                            </tr>
-                                                            {% if answer.wiki %}
-                                                            <tr>
-                                                                <td width="40px" style="vertical-align:bottom">
-                                                                {% gravatar answer.last_edited_by 32 %}
-                                                                </td>
-                                                                <td style="width:160px; vertical-align:top">
-                                                                    <div><a href="{% url users %}{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
-                                                               
-                                                                </td>
-                                                            </tr>
-                                                            {% else %}
-                                                            {% ifequal answer.last_edited_by answer.author %}
-                                                            <tr>
-                                                                <td> </td>
-                                                                <td> </td>
-                                                            </tr>
-                                                            {% else %}
-                                                            <tr>
-                                                                <td width="40px" style="vertical-align:bottom">
-                                                                {% gravatar answer.last_edited_by 32 %}
-                                                                </td>
-                                                                <td style="width:160px; vertical-align:top">
-                                                                    <div><a href="{% url users %}{{ answer.last_edited_by.id }}/{{ answer.last_edited_by.username }}">{{ answer.last_edited_by.username }}</a></div>
-                                                                    <div>
-                                                                    {% get_score_badge answer.last_edited_by %}
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            {% endifequal %}
-                                                            {% endif %}
-                                                        </table>
-                                                    </div>
+                                        <div class="answer-controls post-controls">
+                                            {% joinitems using '<span class="action-link-separator">|</span>' %}    
+                                                <span class="linksopt">
+                                                    <a href="#{{ answer.id }}" title="{% trans "answer permanent link" %}">
+                                                        {% trans "permanent link" %}
+                                                    </a>
+                                                </span>
+                                            {% separator %}
+                                                {% if request.user|can_edit_post:answer %}
+                                                <span class="action-link"><a href="{% url edit_answer answer.id %}">{% trans 'edit' %}</a></span>
+                                                {% endif %}
+                                            {% separator %}
+                                                {% if request.user|can_delete_post:answer %}
+                                                    {% spaceless %}
+                                                    <span class="action-link">
+                                                        <a id="answer-delete-link-{{answer.id}}">
+                                                        {% if answer.deleted %}{% trans "undelete" %}{% else %}{% trans "delete" %}{% endif %}</a>
+                                                    </span>
+                                                    {% endspaceless %}
+                                                {% endif %}
+                                            {% separator %}
+                                                {% if request.user|can_flag_offensive %}
+                                                <span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag" 
+                                                    title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">
+                                                    <a>{% trans "flag offensive" %}</a>
+                                                    {% if request.user|can_view_offensive_flags and answer.offensive_flag_count %}
+                                                    <span class="darkred">({{ answer.offensive_flag_count }})</span>
                                                     {% endif %}
-                                                    
-                                                </td>
-                                                 <td style="vertical-align:top">
-                                                    {% if answer.wiki %}
-                                                    <span class="wiki-category">{% trans "community wiki" %}</span>
-                                                    <div style="margin-bottom:10px"></div>
+                                                </span>
+                                                {% endif %}
+                                            {% endjoinitems %}
+                                        </div>
+                                        <div class="post-update-info-container">
+                                            {% post_contributor_info answer "original_author" %}
+                                            {% post_contributor_info answer "last_updater" %}
+                                        </div>
+                                        <div class="comments-container" id="comments-container-answer-{{answer.id}}">
+                                        {% for comment in answer.get_comments|slice:":5" %}
+                                            <p id="comment-{{comment.id}}" class="comment">
+                                                {{comment.comment}} 
+                                                - <a class="comment-user" href="{{comment.user.get_profile_url}}">{{comment.user}}</a>
+                                                {% spaceless %}
+                                                <span class="comment-age">({% diff_date comment.added_at %})</span>
+                                                {% if request.user|can_delete_comment:comment %}
+                                                    <img class="delete-icon" 
+                                                        src="{% href "/content/images/close-small.png" %}"
+                                                        title="{% trans "delete this comment" %}"/>
+                                                {% endif %}
+                                                {% endspaceless %}
+                                            </p>
+                                        {% endfor %}
+                                        </div>
+                                        <div class="post-comments" style="margin-bottom:20px">
+                                            <input id="can-post-comments-answer-{{answer.id}}" type="hidden" value="{{ request.user|can_add_comments:answer}}"/>
+                                            {% if request.user|can_add_comments:answer or answer.comment_count > 5 %}
+                                                <a id="comments-link-answer-{{answer.id}}" class="comments-link">
+                                                {% if request.user|can_add_comments:answer %}
+                                                    {% trans "add comment" %}
+                                                {% endif %}
+                                                {% if answer.comment_count > 5 %}
+                                                    {% if request.user|can_add_comments:answer %}/
+                                                        {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}
+                                                        see <strong>one</strong> more 
+                                                        {% plural %}
+                                                        see <strong>{{counter}}</strong> more
+                                                        {% endblocktrans %}
                                                     {% else %}
-                                                    <div  class="answer-mark">
-                                                        <table width="200px">
-                            	                            <tr>
-                                	                           	<td colspan="2"> 
-                                                                {% trans "asked" %} <strong title="{{answer.added_at}}">{% diff_date answer.added_at %}</strong>
-                                                                </td>
-                            	                            </tr>
-                            	                            <tr>
-                                                                <td width="40px" style="vertical-align:bottom">
-                                                                {% gravatar answer.author 32 %}
-                                                                </td>
-                                                                <td style="width:160px; vertical-align:top">
-                                                                    <div><a href="{% url users %}{{ answer.author.id }}/{{ answer.author.username }}">{{ answer.author }}</a></div>
-                                                                    <div>
-                                                                    {% get_score_badge answer.author %}
-                                                                    </div>
-                                                                </td>
-                            	                            </tr>
-                                                        </table>
-                                                    </div>
+                                                        {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}
+                                                        see <strong>one</strong> more comment
+                                                        {% plural %}
+                                                        see <strong>{{counter}}</strong> more comments
+                                                        {% endblocktrans %}
                                                     {% endif %}
-                                                    
-                                                 </td>
-                        	                    </tr>
-                        	                    
-                                            </table>
-                                            
-                                        </div>
-                                        <div id="comment-{{ answer.id }}" class="post-comments" >
-                                            <input id="can-post-comments-answer-{{answer.id}}" type="hidden" value="{{ request.user|can_add_comments }}"/>
-                                            <a id="comments-link-answer-{{answer.id}}" class="comments-link">
-												{% if answer.comment_count %}{% trans "comments" %} 
-												<strong>({{answer.comment_count}})</strong>{% else %}{% trans "add comment" %}{% endif %}</a>
-                                            <div id="comments-answer-{{answer.id}}" class="comments-container">
-                                            <div class="comments"/></div>
+                                                {% endif %}</a>
+                                            {% endif %}
                                         </div>
-                                        
                                     </div>
                                     
                                 </td>
@@ -442,46 +368,101 @@
                 <div class="paginator-container-left">
                     {% cnprog_paginator context %}
                 </div>
+            {% endif %}
+        <form id="fmanswer" action="{% url answer question.id %}" method="post">
+            {% if request.user.is_authenticated %}
+                <p style="padding-left:3px">
+                {{ answer.email_notify }} 
+                <label for="question-subscribe-updates">
+                {% ifequal request.user.get_q_sel_email_feed_frequency 'n' %}
+                    {% trans "Notify me once a day when there are any new answers" %}
+                {% else %}
+                    {% ifequal request.user.get_q_sel_email_feed_frequency 'd' %}
+                        {% trans "Notify me once a day when there are any new answers" %}
+                    {% else %}
+                        {% ifequal request.user.get_q_sel_email_feed_frequency 'w' %}
+                            {% trans "Notify me weekly when there are any new answers" %}
+                        {% endifequal %}
+                    {% endifequal %}
+                {% endifequal %}
+                </label>
+                {% blocktrans with request.user.get_profile_url as profile_url %}
+                You can always adjust frequency of email updates from your {{profile_url}}
+                {% endblocktrans %}
+                </p>
             {% else %}
-                <div class="line"></div>
-            {% endifnotequal %}
+                <p style="padding-left:3px">
+                    <input class="nomargin" type="checkbox" disabled="disabled" />
+                    <label>{% trans "once you sign in you will be able to subscribe for any updates here" %}</label>
+                </p>
+            {% endif %}
             <div style="clear:both">
             </div>
             
             {% if not question.closed %}
-            <div style="padding:10px 0 0 0;">
-                <div class="headNormal">{% trans "Your answer" %}:</div>
-            </div>
-            {% if not request.user.is_authenticated %}
-                <div class="message">{% trans "you can answer anonymously and then login" %}</div>
-            {% endif %}
-
-            <div id="description" class="" >
-                <div id="wmd-button-bar" class="wmd-panel"></div>
-                {{ answer.text }}
-                <div class="preview-toggle">
-                    <table width="100%">
-                        <tr>
-                            <td>
-                                <span id="pre-collapse" 
-									title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
-                            </td>
-                            <td style="text-align:right;">
-                                {{ answer.wiki }} <span style="font-weight:normal;cursor:help" title="{{answer.wiki.help_text}}">{{ answer.wiki.label_tag }} </span>
-                            </td>
-                        </tr>
-                    
-                    </table>  
+                <div style="padding:10px 0 0 0;">
+                    {% spaceless %}
+                    <div class="headNormal">
+                        {% if answers %}
+                            {% trans "Your answer" %}
+                        {% else %}
+                            {% trans "Be the first one to answer this question!" %}
+                        {% endif %}
+                    </div>
+                    {% endspaceless %}
                 </div>
-                <div id="previewer" class="wmd-preview"></div>
-                {{ answer.text.errors }}
-            </div>
-            <input type="submit" value="{% trans "Answer the question" %}" class="submit"/><span class="form-error"></span>
-                {% if request.user.is_authenticated %}
-                    {{ answer.email_notify }} <label for="question-subscribe-updates">{% trans "Notify me daily if there are any new answers." %}</label>
+                {% if not request.user.is_authenticated %}
+                    <div class="message">{% trans "you can answer anonymously and then login" %}</div>
                 {% else %}
-                    <input type="checkbox" disabled="disabled" /><label>{% trans "once you sign in you will be able to subscribe for any updates here" %}</label>
+                    <p class="message">
+                        {% ifequal request.user question.author  %}
+                            {% trans "answer your own question only to give an answer" %}
+                        {% else %}
+                            {% trans "please only give an answer, no discussions" %}
+                        {% endifequal %}
+                    </p>
                 {% endif %}
+
+                <div id="description" class="" >
+                    <div id="wmd-button-bar" class="wmd-panel"></div>
+                    {{ answer.text }}
+                    <div class="preview-toggle">
+                        <table width="100%">
+                            <tr>
+                                <td>
+                                    <span id="pre-collapse" 
+                                        title="{% trans "Toggle the real time Markdown editor preview" %}">
+                                            {% trans "toggle preview" %}
+                                    </span>
+                                </td>
+                                {% if settings.WIKI_ON %}
+                                <td style="text-align:right;">
+                                    {{ answer.wiki }} 
+                                    <span style="font-weight:normal;cursor:help" 
+                                        title="{{answer.wiki.help_text}}">
+                                            {{ answer.wiki.label_tag }} 
+                                    </span>
+                                </td>
+                                {% endif %}
+                            </tr>
+                        
+                        </table>  
+                    </div>
+                    <div id="previewer" class="wmd-preview"></div>
+                    {{ answer.text.errors }}
+                </div>
+                <p><span class="form-error"></span></p>
+                <input type="submit" 
+                    {% if user.is_anonymous %}
+                        value="{% trans "Login/Signup to Post Your Answer" %}" 
+                    {% else %}
+                        {% if user == question.author %}
+                        value="{% trans "Answer Your Own Question" %}" 
+                        {% else %}
+                        value="{% trans "Answer the question" %}" 
+                        {% endif %}
+                    {% endif %}
+                    class="submit" style="float:left"/>
             {% endif %}
         </form>
     </div>
@@ -497,17 +478,17 @@
         {% for tag in tags %}
         	<a href="{% url forum.views.tag tag.name|urlencode %}" 
 			title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" 
-			rel="tag">{{ tag.name }}</a> <span class="tag-number">&#x2715;{{ tag.used_count|intcomma }}</span><br/>
+			rel="tag">{{ tag.name }}</a> <span class="tag-number">&#215;{{ tag.used_count|intcomma }}</span><br/>
         {% endfor %}
     </p>
     <p>
-        {% trans "question asked" %}: <strong title="{{ question.added_at }}">{{ question.added_at|timesince }} {% trans "ago" %}</strong>
+        {% trans "question asked" %}: <strong title="{{ question.added_at }}">{% diff_date question.added_at %}</strong>
     </p>
     <p> 
      	{% trans "question was seen" %}: <strong>{{ question.view_count|intcomma }} {% trans "times" %}</strong>
     </p>
     <p> 
-        {% trans "last updated" %}: <strong title="{{ question.last_activity_at }}">{{ question.last_activity_at|timesince }} {% trans "ago" %}</strong>
+        {% trans "last updated" %}: <strong title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</strong>
     </p>
 </div>
 
@@ -516,7 +497,7 @@
     <div class="questions-related">
         {% for question in similar_questions %}
         <p>
-            <a href="{% url questions %}{{question.id}}/{{ question.get_question_title }}">{{ question.get_question_title }}</a>
+            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
         </p>
         {% endfor %}
     </div>
diff --git a/templates/question_edit.html b/templates/question_edit.html
index db090ca3..d6728caf 100644
--- a/templates/question_edit.html
+++ b/templates/question_edit.html
@@ -1,14 +1,15 @@
 {% extends "base.html" %}
 <!-- question_edit.html -->
 {% load i18n %}
+{% load extra_tags %}
 {% block title %}{% spaceless %}{% trans "Edit question" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/wmd.js'></script>
-        <link rel="stylesheet" type="text/css" href="/content/js/wmd/wmd.css" />
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/showdown.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/wmd/wmd.js" %}'></script>
+        <link rel="stylesheet" type="text/css" href="{% href "/content/js/wmd/wmd.css" %}" />
         <script type="text/javascript">
 		//todo move javascript out        
         $().ready(function(){
@@ -90,9 +91,11 @@
                             <td>
                                 <span id="pre-collapse" title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
                             </td>
+                            {% if settings.WIKI_ON %}
                             <td style="text-align:right;">
                                 {{ form.wiki }} <span style="color:#000;cursor:help" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>
                             </td>
+                            {% endif %}
                         </tr>
                     
                     </table>   
diff --git a/templates/question_edit_tips.html b/templates/question_edit_tips.html
index 85614595..4cabea79 100644
--- a/templates/question_edit_tips.html
+++ b/templates/question_edit_tips.html
@@ -13,8 +13,9 @@
 				{% trans "be clear and concise" %}
             </li>
         </ul>
-         <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">{% trans "faq" %} »</a>
-         <br>  
+        <p class='info-box-follow-up-links'>
+            <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}">{% trans "faq" %} »</a>
+        </p>
     </div>
 </div>
 
@@ -45,6 +46,8 @@
 			{% trans "basic HTML tags are also supported" %}
         </li>
     </ul>
-    <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank" style="float:right;position:relative">{% trans "learn more about Markdown" %} »</a>
+    <p class='info-box-follow-up-links'>
+        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans "learn more about Markdown" %} »</a>
+    </p>
 </div>
 <!-- end question_edit_tips.html -->
diff --git a/templates/question_retag.html b/templates/question_retag.html
index 66e51c8c..b7957962 100644
--- a/templates/question_retag.html
+++ b/templates/question_retag.html
@@ -1,10 +1,11 @@
 {% extends "base.html" %}
 <!-- question_retag.html -->
+{% load extra_tags %}
 {% block title %}{% spaceless %}{% trans "Change tags" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
-        <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
         <script type="text/javascript">
         
         $().ready(function(){
@@ -84,14 +85,18 @@
         <li>
             {% trans "tags help us keep Questions organized" %}
         </li>
+        {% comment %}
         <li>
             修改完整问题需要用户的积分达到一定条件（比如：积分 >= 3000分，自己发布的问题除外），而用户积分达到比较低的时候，就可以修改问题的标签（比如：积分 >= 500, 这里指所有问题的标签）。
         </li>
+        {% endcomment %}
         <li>
             {% trans "tag editors receive special awards from the community" %}
         </li>
     </ul>
-    <a href="{% url faq %}" style="float:right;position:relative">faq »</a>
+    <p class='info-box-follow-up-links'>
+        <a href="{% url faq %}">faq »</a>
+    </p>
 </div>
 
 {% endblock %}
diff --git a/templates/question_summary_list_roll.html b/templates/question_summary_list_roll.html
new file mode 100644
index 00000000..7312dca9
--- /dev/null
+++ b/templates/question_summary_list_roll.html
@@ -0,0 +1,55 @@
+    <div class="qstA">
+        <h2>
+            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
+        </h2>
+        <div class="stat">
+            <table>
+                <tr>
+                    <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
+                    <td><span class="num">{{ question.score|intcomma }}</span> </td>
+                    <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
+                </tr>  
+                <tr>
+                    <td><span class="unit">{% trans "answers" %}</span></td>
+                    <td><span class="unit">{% trans "votes" %}</span></td>
+                    <td><span class="unit">{% trans "views" %}</span></td>
+                </tr> 
+            </table>
+        </div>
+        
+        <div class="summary">
+            {{ question.summary }}...                
+        </div>
+        
+        {% ifequal tab_id 'active'%}
+        {% if question.wiki and settings.WIKI_ON %}
+        <span class="from wiki">{% trans "community wiki" %}</span>
+        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+        {% else %}
+        <div class="from">
+            {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
+            <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+            <span class="score">{% get_score_badge question.last_activity_by %} </span>
+            <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+        </div>
+        {% endif %}
+        {% else %}
+        {% if question.wiki and settings.WIKI_ON %}
+        <span class="from wiki">{% trans "community wiki" %}</span>
+        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+        {% else %}
+        <div class="from">
+            {% comment %}{% gravatar question.author 24 %}{% endcomment %}
+            <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+            <span class="score">{% get_score_badge question.author %} </span>
+            <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+        </div>
+        {% endif %}
+        {% endifequal %}
+        
+        <div class="tags">
+        {% for tag in question.tagname_list %}
+        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
+        {% endfor %}
+        </div>
+    </div>
diff --git a/templates/questions.html b/templates/questions.html
index 985b4921..f298381e 100644
--- a/templates/questions.html
+++ b/templates/questions.html
@@ -4,6 +4,7 @@
 {% load i18n %}
 {% load humanize %}
 {% load extra_filters %}
+{% load smart_if %}
 {% block title %}{% spaceless %}{% trans "Questions" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
@@ -36,16 +37,16 @@
         </h2>
         <div class="stat">
             <table>
-	            <tr>
+                <tr>
                     <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
                     <td><span class="num">{{ question.score|intcomma }}</span> </td>
                     <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-	            </tr>  
+                </tr>  
                 <tr>
                     <td><span class="unit">{% trans "answers" %}</span></td>
                     <td><span class="unit">{% trans "votes" %}</span></td>
                     <td><span class="unit">{% trans "views" %}</span></td>
-	            </tr> 
+                </tr> 
             </table>
         </div>
         
@@ -54,7 +55,7 @@
         </div>
         
         {% ifequal tab_id 'active'%}
-        {% if question.wiki %}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
@@ -66,15 +67,33 @@
         </div>
         {% endif %}
         {% else %}
-        {% if question.wiki %}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
             {% comment %}{% gravatar question.author 24 %}{% endcomment %}
-            <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
-            <span class="score">{% get_score_badge question.author %} </span>
-            <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% if question.last_activity_at != question.added_at %}
+                {% if question.author.id != question.last_activity_by.id %}
+                    {% trans "Posted:" %}
+                    <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                    <span class="score">{% get_score_badge question.author %} </span>
+                    / {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% else %}
+                    {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% endif %}
+            {% else %}
+                {% trans "Posted:" %}
+                <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                <span class="score">{% get_score_badge question.author %} </span>
+                <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% endif %}
         </div>
         {% endif %}
         {% endifequal %}
@@ -87,7 +106,6 @@
     </div>
     {% endfor %}
 </div>
-
 {% endblock %}
 
 {% block tail %}
@@ -104,7 +122,6 @@
 
 {% block sidebar %}
 <div class="boxC">
-    <p>
 		{% if searchtag %}
 			{% blocktrans count questions_count as cnt with questions_count|intcomma as q_num and searchtag as tagname %}
 			have total {{q_num}} questions tagged {{tagname}}
@@ -126,7 +143,7 @@
 				{% endblocktrans %}
 			{% endif %}
 		{% endif %}
-        <br/>
+        <p>
         {% ifequal tab_id "latest" %}
 			{% trans "latest questions info" %}
         {% endifequal %}
@@ -145,16 +162,14 @@
 			{% trans "Questions are sorted by the <strong>number of votes</strong>." %}
             {% trans "Most voted questions are shown first." %}
         {% endifequal %}
-        
-        
-    </p>
+        </p>
 </div>
 <div class="boxC">
 	<h3 class="subtitle">{% trans "Related tags" %}</h3>
     <div class="tags">
         {% for tag in tags %}
             <a rel="tag" title="{% trans "see questions tagged" %}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
-            <span class="tag-number">&#x2715; {{ tag.used_count|intcomma }}</span>
+            <span class="tag-number">&#215; {{ tag.used_count|intcomma }}</span>
             <br />
         {% endfor %}
         <br />
diff --git a/templates/revisions_answer.html b/templates/revisions_answer.html
index 23606dc9..974e589c 100644
--- a/templates/revisions_answer.html
+++ b/templates/revisions_answer.html
@@ -6,8 +6,8 @@
 {% load humanize %}
 {% block title %}{% spaceless %}{% trans "Revision history" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
         <script type="text/javascript">
         //todo - take this out into .js file 
         $().ready(function(){
@@ -24,7 +24,9 @@
             var arrow = $("#rev-arrow-" + id);
             var visible = arrow.attr("src").indexOf("hide") > -1;
 
-            arrow.attr("src", "/content/images/expander-arrow-" + (visible ? "show" : "hide") + ".gif");
+            var path = $.i18n._('/') + "content/images/expander-arrow-" + 
+                        (visible ? "show" : "hide") + ".gif" + "?v={{settings.RESOURCE_REVISION}}";
+            arrow.attr("src", path);
             $("#rev-body-" + id).slideToggle("fast");
         }
         
@@ -43,11 +45,14 @@
           <div class="header-controls">
             <table width="100%">
                 <tr>
-                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" src="/content/images/expander-arrow-show.gif"></td>
+                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" 
+                                                                    src="{% href "/content/images/expander-arrow-show.gif" %}"
+                                                                    alt="{% trans "click to hide/show revision" %}"/>
+                    </td>
                     <td width="30px" style="vertical-align:middle"><span class="revision-number" title="{% trans "revision" %} {{ revision.revision }}">{{ revision.revision }}</span></td>
                     <td width="200px" style="vertical-align:middle">
                         {% if revision.summary %}
-                        <div class="summary"><span>{{ revision.summary }}<span></div>
+                        <div class="summary"><span>{{ revision.summary }}</span></div>
                         {% endif %}
                         {% if request.user|can_edit_post:post %}
                         <a href="{% url edit_answer post.id %}?revision={{ revision.revision }}">{% trans "edit" %}</a>
@@ -56,31 +61,7 @@
                     </td>
                     <td align="right">
                         <div class="revision-mark" >
-                            <table width="100%" style="text-align:left" >
-                                <tr >
-                                    <td colspan="2" style="padding:3px 0 3px 0"> 
-                                        {% ifequal revision.revision 1 %}
-                                        {% trans "asked" %} <strong title="{{ post.added_at }}">{% diff_date post.added_at  %}</strong>
-                                        {% else %}
-                                        {% trans "updated" %} <strong title="{{ post.last_edited_at }}">{% diff_date revision.revised_at  %}</strong>
-                                        {% endifequal %}
-                                    </td>
-                                    
-                                </tr>
-                                <tr>
-                                    <td width="35px" style="vertical-align:bottom; ">
-                                        {% gravatar revision.author 32 %}
-                                    </td>
-                                    <td style="width:120px; vertical-align:top">
-                                        <div style="height:18px">
-                                            <a href="{% url users %}{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
-                                        <div>
-                                        {% get_score_badge revision.author %}
-                                        </div>
-                                    </td>
-                                </tr>
-
-                            </table>
+                            {% post_contributor_info revision %}
                         </div>
                     </td>
                 </tr>
diff --git a/templates/revisions_question.html b/templates/revisions_question.html
index b76ced24..83512e4a 100644
--- a/templates/revisions_question.html
+++ b/templates/revisions_question.html
@@ -7,8 +7,8 @@
 {% load humanize %}
 {% block title %}{% spaceless %}{% trans "Revision history" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
         <script type="text/javascript">
         //todo - take this out into .js file 
         $().ready(function(){
@@ -25,7 +25,9 @@
             var arrow = $("#rev-arrow-" + id);
             var visible = arrow.attr("src").indexOf("hide") > -1;
 
-            arrow.attr("src", "/content/images/expander-arrow-" + (visible ? "show" : "hide") + ".gif");
+            var path = $.i18n._('/') + "content/images/expander-arrow-" + 
+                        (visible ? "show" : "hide") + ".gif" + "?v={{settings.RESOURCE_REVISION}}";
+            arrow.attr("src", path);
             $("#rev-body-" + id).slideToggle("fast");
         }
         </script>
@@ -43,11 +45,14 @@
           <div class="header-controls">
             <table width="100%">
                 <tr>
-                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" src="/content/images/expander-arrow-show.gif"></td>
+                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" 
+                                                                src="{% href "/content/images/expander-arrow-show.gif" %}"
+                                                                alt="{% trans "click to hide/show revision" %}"/>
+                    </td>
                     <td width="30px" style="vertical-align:middle"><span class="revision-number" title="{% trans "revision" %} {{ revision.revision }}">{{ revision.revision }}</span></td>
                     <td width="200px" style="vertical-align:middle">
                         {% if revision.summary %}
-                        <div class="summary"><span>{{ revision.summary }}<span></div>
+                        <div class="summary"><span>{{ revision.summary }}</span></div>
                         {% endif %}
                         {% if request.user|can_edit_post:post %}
                         <a href="{% url edit_question post.id %}?revision={{ revision.revision }}">{% trans "edit" %}</a>
@@ -56,31 +61,7 @@
                     </td>
                     <td align="right">
                         <div class="revision-mark" >
-                            <table width="100%" style="text-align:left" >
-                                <tr >
-                                    <td colspan="2" style="padding:3px 0 3px 0"> 
-                                        {% ifequal revision.revision 1 %}
-                                        {% trans "asked" %}<strong title="{{ post.added_at }}">{% diff_date post.added_at  %}</strong>
-                                        {% else %}
-                                        {% trans "updated" %}<strong title="{{ post.last_edited_at }}">{% diff_date revision.revised_at  %}</strong>
-                                        {% endifequal %}
-                                    </td>
-                                    
-                                </tr>
-                                <tr>
-                                    <td width="35px" style="vertical-align:bottom; ">
-                                        {% gravatar revision.author 32 %}
-                                    </td>
-                                    <td style="width:120px; vertical-align:top">
-                                        <div style="height:18px">
-                                            <a href="{% url users %}{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
-                                        <div>
-                                        {% get_score_badge revision.author %}
-                                        </div>
-                                    </td>
-                                </tr>
-
-                            </table>
+                            {% post_contributor_info revision %}
                         </div>
                     </td>
                 </tr>
diff --git a/templates/tags.html b/templates/tags.html
index f558594a..1bde187f 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -49,7 +49,7 @@
     <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">
         {{ tag }}
     </a>&nbsp;
-    <span class="tag-number">× {{ tag.used_count|intcomma }}</span>
+    <span class="tag-number">&#215; {{ tag.used_count|intcomma }}</span>
     <br/>
 
     </li>
diff --git a/templates/unanswered.html b/templates/unanswered.html
index a56d3ae3..80a23631 100644
--- a/templates/unanswered.html
+++ b/templates/unanswered.html
@@ -4,6 +4,7 @@
 {% load i18n %}
 {% load humanize %}
 {% load extra_filters %}
+{% load smart_if %}
 {% block title %}{% spaceless %}{% trans "Unanswered questions" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
@@ -17,65 +18,82 @@
 <div class="tabBar">
     <span class="headQuestions">{% trans "Unanswered questions" %}</span>
     <div class="tabsA">
-        <a id="latest" href="?sort=latest" class="on" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a> 
+        <a id="latest" href="{% url unanswered %}?sort=latest" class="on" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a> 
     </div>
 </div>
-
 <div id="listA">
     {% for question in questions.object_list %}
     <div class="qstA">
-        <h2><a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a></h2>
+        <h2>
+            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
+        </h2>
         <div class="stat">
             <table>
-	            <tr>
+                <tr>
                     <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
                     <td><span class="num">{{ question.score|intcomma }}</span> </td>
                     <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-	            </tr>  
+                </tr>  
                 <tr>
                     <td><span class="unit">{% trans "answers" %}</span></td>
                     <td><span class="unit">{% trans "votes" %}</span></td>
                     <td><span class="unit">{% trans "views" %}</span></td>
-	            </tr> 
+                </tr> 
             </table>
         </div>
+        
         <div class="summary">
             {{ question.summary }}...                
         </div>
-    
+        
         {% ifequal tab_id 'active'%}
-        {% if question.wiki %}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
-             {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
+            {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
             <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
             <span class="score">{% get_score_badge question.last_activity_by %} </span>
             <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
         </div>
         {% endif %}
         {% else %}
-        {% if question.wiki %}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
-             {% comment %}{% gravatar question.author 24 %}{% endcomment %}
-            <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
-            <span class="score">{% get_score_badge question.author %} </span>
-            <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% comment %}{% gravatar question.author 24 %}{% endcomment %}
+            {% if question.last_activity_at != question.added_at %}
+                {% if question.author.id != question.last_activity_by.id %}
+                    {% trans "Posted:" %}
+                    <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                    <span class="score">{% get_score_badge question.author %} </span>
+                    / {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% else %}
+                    {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% endif %}
+            {% else %}
+                {% trans "Posted:" %}
+                <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                <span class="score">{% get_score_badge question.author %} </span>
+                <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% endif %}
         </div>
         {% endif %}
         {% endifequal %}
         
         <div class="tags">
-			{% for tag in question.tagname_list %}
-			<a href="{% url forum.views.tag tag|urlencode %}" 
-				title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" 
-				rel="tag">{{ tag }}
-			</a>
-			{% endfor %}
+        {% for tag in question.tagname_list %}
+        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
+        {% endfor %}
         </div>
     </div>
     {% endfor %}
@@ -93,10 +111,8 @@
 
 {% block sidebar %}
 <div class="boxC">
-    <p>
-		{% blocktrans with questions_count|intcomma as num_q %}have {{num_q}} unanswered questions{% endblocktrans %}
-        <!---<p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>-->
-    </p>
+    {% blocktrans with questions_count|intcomma as num_q %}have {{num_q}} unanswered questions{% endblocktrans %}
+    <!---<p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>-->
 </div>
 <div class="boxC">
 	<h3 class="subtitle">{% trans "Related tags" %}</h3>
@@ -104,7 +120,7 @@
     <div class="tags">
         {% for tag in tags %}
             <a rel="tag" title="{% trans "see questions tagged"%}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
-            <span class="tag-number"> &#x2715; {{ tag.used_count|intcomma }}</span>
+            <span class="tag-number"> &#215; {{ tag.used_count|intcomma }}</span>
             <br/>
         {% endfor %}
         <br/>
diff --git a/templates/upfiles/1245715031297631.png b/templates/upfiles/1245715031297631.png
deleted file mode 100755
index 89a6aed4..00000000
Binary files a/templates/upfiles/1245715031297631.png and /dev/null differ
diff --git a/templates/upfiles/12457157052552259.png b/templates/upfiles/12457157052552259.png
deleted file mode 100755
index 89a6aed4..00000000
Binary files a/templates/upfiles/12457157052552259.png and /dev/null differ
diff --git a/templates/user.html b/templates/user.html
index efca80e6..6e4098e9 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -1,6 +1,7 @@
 {% extends "base_content.html" %}
 <!-- user.html -->
 {% load extra_tags %}
+{% load extra_filters %}
 {% load humanize %}
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
 {% block forestyle%}
@@ -10,17 +11,22 @@
 	</style>
 {% endblock %}
 {% block forejs %}
-        <script type="text/javascript">
-            $().ready(function(){
-                {% ifequal view_user request.user%}
-                    $("#nav_profile").attr('className',"on");
-                {% else %}
-                    $("#nav_users").attr('className',"on");
-                {% endifequal %}
-            }); 
-        </script>
-        {% block userjs %}
-        {% endblock %}
+    {% if request.user|can_moderate_users %}
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.admin.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/jquery.form.js" %}'></script>
+    {% endif %}
+    <script type="text/javascript">
+        var viewUserID = {{view_user.id}};
+        $().ready(function(){
+            {% ifequal view_user request.user%}
+                $("#nav_profile").attr('className',"on");
+            {% else %}
+                $("#nav_users").attr('className',"on");
+            {% endifequal %}
+        }); 
+    </script>
+    {% block userjs %}
+    {% endblock %}
 {% endblock %}
 {% block content %}
     <div id="mainbar-full">
@@ -28,6 +34,6 @@
         {% include "user_tabs.html" %}
         {% block usercontent %}
         {% endblock %}
-        {% include "user_footer.html" %}
+        {%comment%}{% include "user_footer.html" %}{%endcomment%}
 	</div>
 {% endblock %}<!-- end user.html -->
diff --git a/templates/user_edit.html b/templates/user_edit.html
index b49cea31..051d6537 100644
--- a/templates/user_edit.html
+++ b/templates/user_edit.html
@@ -24,11 +24,11 @@
             {% if request.user.email %}
             {% gravatar request.user 128 %}
             {% else %}
-            <img src="/content/images/nophoto.png">
+            <img src="{% href "/content/images/nophoto.png" %}">
             {% endif %}
             <div style="padding:20px 0 0 20px;font-weight:bold;font-size:150%">
                 <a href="http://www.gravatar.com/" target="_blank" 
-					title="gravatar {% trans "image associated with your email address" %}">{% trans "avatar" %}</a>
+					title="gravatar {% trans "image associated with your email address" %}">{% blocktrans %}avatar, see {{gravatar_faq_url}}{% endblocktrans %}</a>
             </div>
         </div>
         
diff --git a/templates/user_email_subscriptions.html b/templates/user_email_subscriptions.html
new file mode 100644
index 00000000..8f27bd2a
--- /dev/null
+++ b/templates/user_email_subscriptions.html
@@ -0,0 +1,23 @@
+{% extends "user.html" %}
+<!-- user_email_subscriptions.html -->
+{% load i18n %}
+{% load extra_tags %}
+{% load humanize %}
+
+{% block usercontent %}
+    <h2>{% trans "Email subscription settings" %}</h2>
+    <p class="message">{% trans "email subscription settings info" %}</p>
+    <div class='inline-block'>
+    {% if action_status %}
+    <p class="action-status"><span>{{action_status}}</span></p>
+    {% endif %}
+    <form method="POST"> 
+        {% include "edit_user_email_feeds_form.html" %}
+        <div class="submit-row text-align-right">
+            <input type="submit" class="submit" name="save" value="{% trans "Update" %}"/>
+            <input type="submit" class="submit" name="stop_email" value="{% trans "Stop sending email" %}"/>
+        </div>
+    </form>
+    </div>
+{% endblock %}
+<!-- end user_email_subscriptions.html -->
diff --git a/templates/user_favorites.html b/templates/user_favorites.html
index 185423c6..9db01e9a 100644
--- a/templates/user_favorites.html
+++ b/templates/user_favorites.html
@@ -2,7 +2,6 @@
 <!-- user_favorites.html -->
 {% load extra_tags %}
 {% load humanize %}
-
 {% block usercontent %}
 		{% include "users_questions.html" %}
 {% endblock %}
diff --git a/templates/user_info.html b/templates/user_info.html
index e56fb143..4ebcddd6 100644
--- a/templates/user_info.html
+++ b/templates/user_info.html
@@ -2,12 +2,11 @@
 {% load extra_tags %}
 {% load extra_filters %}
 {% load humanize %}
+{% load smart_if %}
 {% load i18n %}
 <div id="subheader" class="headUser">
     {{view_user.username}}
-    
 </div>
-
 <table class="user-info-table">
     <tr>
         <td width="180" style="vertical-align:middle;text-align:center;">
@@ -20,20 +19,41 @@
                 <tr>
                     <td align="center">
                         <div class="scoreNumber">{{view_user.reputation|intcomma}}</div>
-                        <p><b style="color:#777;">{% trans "reputation" %}</b></p>
+                        <p><b style="color:#777;">{% trans "karma" %}</b></p>
                     </td>
                 </tr>
             </table>
         </td>
         <td width="360" style="vertical-align: top;">
             <table class="user-details">
+                {% if view_user != request.user and request.user|can_moderate_users %}
                 <tr>
-                    <th width="130" align="left"><strong>{% trans "Registered user" %}</strong></th>
-                    <th width="230"  align="right">
-                        {% if request.user|can_view_user_edit:view_user %}
-                        <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/{% trans "edit/" %}">{% trans "update profile" %}</a></span>
-                        {% endif %}
-                    </th>
+                    <td class="admin" align="left" colspan="2">
+                        <h3>{% trans "Moderate this user" %}</h3>
+                        <form id="moderate_user_form" method="post">
+                            {{moderate_user_form.as_p}}
+                        </form>
+                        <p id="action_status"></p>
+                    </td>
+                </tr>
+                {% endif %}
+                {% if request.user|can_view_user_edit:view_user %}
+                <tr>
+                    <td class="user-profile-tool-links" align="left" colspan="2">
+                        {% joinitems using ' | ' %}
+                            {% if request.user|can_view_user_edit:view_user %}
+                            <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/{% trans "edit/" %}">{% trans "update profile" %}</a></span>
+                            {% endif %}
+                        {% separator %}
+                            {% if request.user.has_usable_password %}
+                                <a href="{% url user_changepw %}">change password</a>
+                            {% endif %}
+                        {% endjoinitems %}
+                    </td>
+                </tr>  
+                {% endif %}
+                <tr>
+                    <th colspan="2" align="left"><h3>{% trans "Registered user" %}</h3></th>
                 </tr>
                 {% if view_user.real_name %}
                 <tr>
@@ -43,12 +63,12 @@
                 {% endif %}
                 <tr>
                     <td>{% trans "member for" %}</td>
-                    <td>{{ view_user.date_joined|timesince }}</td>
+                    <td><strong>{% diff_date view_user.date_joined %}</strong></td>
                 </tr>
                 {% if view_user.last_seen %}
                 <tr>
                     <td>{% trans "last seen" %}</td>
-                    <td><strong title="{{ view_user.last_seen }}">{{ view_user.last_seen|timesince }} {% trans "ago" %}</strong></td>
+                    <td><strong title="{{ view_user.last_seen }}">{% diff_date view_user.last_seen %}</strong></td>
                 </tr>
                 {% endif %}
                 {% if view_user.website %}
diff --git a/templates/user_preferences.html b/templates/user_preferences.html
deleted file mode 100644
index 00129c28..00000000
--- a/templates/user_preferences.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends "user.html" %}
-<!-- user_preferences.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load humanize %}
-
-{% block usercontent %}
-        <div style="padding:5px;">
-        <fieldset>
-            <legend><b>{% trans "Connect with Twitter" %}</b></legend>
-            <!-- todo: form action needs to be fixed -->
-            <form name="twittersync" action="/sdfgsdlgjkhsdfljh">
-                <label for="name">{% trans "Twitter account name:" %}</label>
-                <input id="name" /><br/>
-                <label for="password">{% trans "Twitter password:" %}</label>
-                <input id="password" type="password"/><br/>
-                <input id="cbMessage" type="checkbox" />{% trans "Send my Questions to Twitter" %}<br/>
-                <input id="cbReply" type="checkbox" />{% trans "Send my Answers to Twitter" %}<br/>
-                <input type="submit" value="{% trans "Save" %}" />
-            </form>
-        </fieldset>
-        </div>
-{% endblock %}
-<!-- end user_preferences.html -->
diff --git a/templates/user_recent.html b/templates/user_recent.html
index 7f6c9c8c..b704ab25 100644
--- a/templates/user_recent.html
+++ b/templates/user_recent.html
@@ -2,7 +2,6 @@
 <!-- user_recent.html -->
 {% load extra_tags %}
 {% load humanize %}
-
 {% block usercontent %}
         <div style="padding-top:5px;font-size:13px;">
         {% for act in activities %}
diff --git a/templates/user_reputation.html b/templates/user_reputation.html
index 270bb37d..29d642fe 100644
--- a/templates/user_reputation.html
+++ b/templates/user_reputation.html
@@ -3,8 +3,8 @@
 {% load extra_tags %}
 {% load humanize %}
 {% block userjs %}
-       <script type='text/javascript' src='/content/js/excanvas.pack.js'></script>
-       <script type='text/javascript' src='/content/js/jquery.flot.pack.js'></script>
+       <script type='text/javascript' src='{% href "/content/js/excanvas.pack.js" %}'></script>
+       <script type='text/javascript' src='{% href "/content/js/jquery.flot.pack.js" %}'></script>
        
        <script type="text/javascript">
         $().ready(function(){
diff --git a/templates/user_stats.html b/templates/user_stats.html
index 07578cb7..2b7949e8 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -7,43 +7,74 @@
 		{% block usercontent %}
 	
         <a name="questions"></a>
-        <h2><span class="count">{{questions|length}}</span> {% trans "User questions" %}</h2>
+        {% spaceless %}
+            <h2>
+                {% blocktrans count questions|length as counter %}
+                <span class="count">1</span> Question
+                {% plural %}
+                <span class="count">{{counter}}</span> Questions
+                {% endblocktrans %}
+            </h2>
+        {% endspaceless %}
 		{% include "users_questions.html" %}
         <a name="answers"></a>
-        <h2><span class="count">{{answered_questions|length}}</span> {% trans "Answers" %}</h2>
+        {% spaceless %}
+            <h2>
+                {% blocktrans count answered_questions|length as counter %}
+                <span class="count">1</span> Answer
+                {% plural %}
+                <span class="count">{{counter}}</span> Answers
+                {% endblocktrans %}
+            </h2>
+        {% endspaceless %}
         <div class="user-stats-table">
             {% for answered_question in answered_questions %}
             <div class="answer-summary">
                 <a title="{{answered_question.summary|collapse}}" 
-                    href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">
+                    href="{% url question answered_question.id %}{{answered_question.title|slugify}}#{{answered_question.answer_id}}">
                     <span class="answer-votes {% if answered_question.accepted %}answered-accepted{% endif %}" 
 						title="{% blocktrans with answered_question.vote_count as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %} {% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
                         {{ answered_question.vote_count }}
                     </span>
                 </a>
                 <div class="answer-link">
-                    <a href="{% url questions %}{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> 
+                    {% spaceless %}
+                    <a href="{% url question answered_question.id %}{{answered_question.title|slugify}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> 
+                    {% endspaceless %}
                     {% if answered_question.comment_count %}
                     <span>
-				    {% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %}
+				    {% blocktrans count answered_question.comment_count as comment_count %}
+                    (one comment)
+                    {% plural %}
+                    the answer has been commented {{comment_count}} times
+                    {% endblocktrans %}
                     </span> 
                     {% endif %}
                 </div>
             </div>
             {% endfor %}
         </div>
+        <br/>
         <a name="votes"></a>
-        <h2><span class="count">{{total_votes}}</span> {% trans "Votes" %}</h2>
+        {% spaceless %}
+            <h2>
+                {% blocktrans count total_votes as cnt %}
+                    <span class="count">1</span> Vote
+                {% plural %}
+                    <span class="count">{{cnt}}</span> Votes
+                {% endblocktrans %}
+            </h2>
+        {% endspaceless %}
         <div class="user-stats-table">
             <table>
                 <tr>
                     <td width="60">
-                        <img style="cursor: default;" src="/content/images/vote-arrow-up-on.png" alt="{% trans "thumb up" %}" />
+                        <img style="cursor: default;" src="{% href "/content/images/vote-arrow-up-on.png" %}" alt="{% trans "thumb up" %}" />
                             <span title="{% trans "user has voted up this many times" %}" class="vote-count">{{up_votes}}</span>
 
                     </td>
                     <td width="60">
-                        <img style="cursor: default;" src="/content/images/vote-arrow-down-on.png" alt="{% trans "thumb down" %}" />
+                        <img style="cursor: default;" src="{% href "/content/images/vote-arrow-down-on.png" %}" alt="{% trans "thumb down" %}" />
                             <span title="{% trans "user voted down this many times" %}" class="vote-count">{{down_votes}}</span>
 
                     </td>
@@ -51,7 +82,15 @@
             </table>
         </div>
         <a name="tags"></a>
-        <h2><span class="count">{{tags|length}}</span> {% trans "Tags" %}</h2>
+        {% spaceless %}
+            <h2>
+                {% blocktrans count tags|length as counter %}
+                    <span class="count">1</span> Tag
+                {% plural %}
+                    <span class="count">{{counter}}</span> Tags
+                {% endblocktrans %}
+            </h2>
+        {% endspaceless %}
         <div class="user-stats-table">
             <table class="tags">
                 <tr>
@@ -59,7 +98,7 @@
                         {% for tag in tags%}
                         <a rel="tag" 
 							title="{% blocktrans %}see other questions tagged '{{ tag }}' {% endblocktrans %}" 
-							href="{% url forum.views.tag tag|urlencode %}">{{tag.name}}</a><span class="tag-number"> × {{ tag.used_count|intcomma }}</span><br/>
+							href="{% url forum.views.tag tag|urlencode %}">{{tag.name}}</a><span class="tag-number"> &#215; {{ tag.used_count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"10" %}
                                 </td>
                                 <td width="180"  valign="top">
@@ -70,7 +109,15 @@
             </table>
         </div>
         <a name="badges"></a>
-        <h2><span class="count">{{total_awards}}</span> {% trans "Badges" %}</h2>
+        {% spaceless %}
+        <h2>
+            {% blocktrans count total_awards as counter %}
+            <span class="count">1</span> Badge
+            {% plural %}
+            <span class="count">{{counter}}</span> Badges
+            {% endblocktrans %}
+        </h2>
+        {% endspaceless %}
         <div class="user-stats-table">
             <table>
                 <tr>
@@ -86,6 +133,5 @@
                 </tr>
             </table>
         </div>
-
 {% endblock %}
 <!-- end user_stats.html -->
diff --git a/templates/user_tabs.html b/templates/user_tabs.html
index cb7e1d2f..908e8430 100644
--- a/templates/user_tabs.html
+++ b/templates/user_tabs.html
@@ -23,9 +23,9 @@
 			title="{% trans "questions that user selected as his/her favorite" %}"
 			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
         {% if request.user|can_view_user_preferences:view_user %}
-        <a id="preferences" {% ifequal tab_name "preferences" %}class="on"{% endifequal %} 
-			title="{% trans "user preference settings" %}" 
-			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=preferences">{% trans "settings" %}</a>
+        <a id="email_subscriptions" {% ifequal tab_name "email_subscriptions" %}class="on"{% endifequal %} 
+			title="{% trans "email subscription settings" %}" 
+			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=email_subscriptions">{% trans "email subscriptions" %}</a>
         {% endif %}  
     </div>
 </div>
diff --git a/templates/user_votes.html b/templates/user_votes.html
index 45134ac9..4abbf46d 100644
--- a/templates/user_votes.html
+++ b/templates/user_votes.html
@@ -11,9 +11,9 @@
                 <div style="width:150px;float:left">{% diff_date vote.voted_at 3 %}</div>
                 <div style="width:30px;float:left">
                 {% ifequal vote.vote 1 %}
-                    <img src="/content/images/vote-arrow-up-on.png" title="{% trans "upvote" %}">
+                    <img src="{% href "/content/images/vote-arrow-up-on.png" %}" title="{% trans "upvote" %}">
                 {% else %}
-                    <img src="/content/images/vote-arrow-down-on.png" title="{% trans "downvote" %}">
+                    <img src="{% href "/content/images/vote-arrow-down-on.png" %}" title="{% trans "downvote" %}">
                 {% endifequal %}
                 </div>
                 <div style="float:left;overflow:hidden;width:750px">
diff --git a/templates/users.html b/templates/users.html
index 966596fc..3a59b0c0 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -23,10 +23,10 @@
 <div class="tabBar">
     <div class="headUsers">{% trans "Users" %}</div>
     <div class="tabsA">
-        <a id="sort_reputation" href="?sort=reputation" class="off" title="{% trans "reputation" %}">{% trans "reputation" %}</a>
-        <a id="sort_newest" href="?sort=newest" class="off" title="{% trans "recent" %}">{% trans "recent" %}</a>
-        <a id="sort_last" href="?sort=last" class="off" title="{% trans "oldest" %}">{% trans "oldest" %}</a>
-        <a id="sort_user" href="?sort=user" class="off" title="{% trans "by username" %}">{% trans "by username" %}</a>
+        <a id="sort_reputation" href="{% url users %}?sort=reputation" class="off" title="{% trans "reputation" %}">{% trans "reputation" %}</a>
+        <a id="sort_newest" href="{% url users %}?sort=newest" class="off" title="{% trans "recent" %}">{% trans "recent" %}</a>
+        <a id="sort_last" href="{% url users %}?sort=last" class="off" title="{% trans "oldest" %}">{% trans "oldest" %}</a>
+        <a id="sort_user" href="{% url users %}?sort=user" class="off" title="{% trans "by username" %}">{% trans "by username" %}</a>
     </div>
 </div>
 <div id="main-body" style="width:100%">
diff --git a/templates/users_questions.html b/templates/users_questions.html
index 9907885e..b445a74c 100644
--- a/templates/users_questions.html
+++ b/templates/users_questions.html
@@ -4,20 +4,20 @@
 {% load humanize %}
 {% load i18n %}
 <div class="user-stats-table">
-    {% for question in questions%}
+    {% for question in questions %}
         {% if question.favourite_count %}
             {% if question.favorited_myself %}
                 <div class="favorites-count">
                     <img title="{% trans "this questions was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" 
                         alt="{% trans "thumb-up on" %}"
-						src="/content/images/vote-favorite-on.png"/>
+						src="{% href "/content/images/vote-favorite-on.png" %}"/>
                     <div><b>{{question.favourite_count|intcomma}}</b></div>
                 </div>
             {% else %}
                 <div class="favorites-count-off">
                     <img title="{% trans "this question was selected as favorite" %}{{question.favourite_count}} {% trans "number of times" %}" 
                         alt="{% trans "thumb-up off" %}"
-						src="/content/images/vote-favorite-off.png"/>
+						src="{% href "/content/images/vote-favorite-off.png" %}"/>
                     <div><b>{{question.favourite_count|intcomma}}</b></div>
                 </div>
             {% endif %}
@@ -25,28 +25,26 @@
             <div class="favorites-empty"> </div>
         {% endif %}
     <div id="question-summary-{{question.id}}" class="question-summary narrow">
-        <a style="text-decoration: none;" href="{% url questions %}{{question.id}}/{{question.get_question_title}}">
-            <span class="stats">
-                <span class="votes">
-                    <span class="vote-count-post">{{question.vote_count|intcomma}}</span> 
+        <a style="text-decoration: none;" href="{% url question id=question.id %}{{question.title|slugify}}">
+            <div class="stats">
+                <div class="votes">
+                    <span class="vote-count-post">{{question.vote_count|intcomma}}</span>
                     {% trans "votes" %}
-                  
-                </span>
-                <span title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
+                </div >
+                <div title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
                     <span class="answer-count-post">{{question.answer_count|intcomma}}</span>
                     {% trans "answers" %}
-             
-                </span>
-                <span class="views">
+                </div>
+                <div class="views">
                      <span class="views-count-post">{{question.view_count|cnprog_intword|safe}}</span>
 					 {% trans "views" %}
-                </span>
-            </span>
+                </div>
+            </div>
         </a>
         <div class="summary">
-            <h3>
-                <a title="{{question.summary}}" href="{% url questions %}{{question.id}}/{{question.title}}">{{question.title}}</a>
-            </h3>
+            <div class="question-title">
+                <a title="{{question.summary}}" href="{% url question id=question.id %}{{question.title|slugify}}">{{question.title}}</a>
+            </div>
             <div class="tags">
                 {% convert2tagname_list question %}
                 {% for tag in question.tagnames %}
diff --git a/urls.py b/urls.py
index cce4969e..0608aaa8 100644
--- a/urls.py
+++ b/urls.py
@@ -1,68 +1,7 @@
-import os.path
 from django.conf.urls.defaults import *
-from django.contrib import admin
-from forum.views import index
-from forum import views as app
-from forum.feed import RssLastestQuestionsFeed
 from django.utils.translation import ugettext as _
+import settings
 
-admin.autodiscover()
-feeds = {
-    'rss': RssLastestQuestionsFeed
-}
-
-APP_PATH = os.path.dirname(__file__)
 urlpatterns = patterns('',
-    (r'^$', index),
-    (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.ico'}),
-    (r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.gif'}),
-    (r'^content/(?P<path>.*)$', 'django.views.static.serve',
-        {'document_root': os.path.join(APP_PATH, 'templates/content').replace('\\','/')}
-    ),
-    (r'^%s(?P<path>.*)$' % _('upfiles/'), 'django.views.static.serve',
-        {'document_root': os.path.join(APP_PATH, 'templates/upfiles').replace('\\','/')}
-    ),
-    (r'^%s' % _('account/'), include('django_authopenid.urls')),
-    (r'^%s/$' % _('signin/'), 'django_authopenid.views.signin'),
-    url(r'^%s%s$' % (_('email/'), _('change/')), 'django_authopenid.views.changeemail', name='user_changeemail'),
-    url(r'^%s%s$' % (_('email/'), _('sendkey/')), 'django_authopenid.views.send_email_key'),
-    url(r'^%s%s(?P<id>\d+)/(?P<key>[\dabcdef]{32})/$' % (_('email/'), _('verify/')), 'django_authopenid.views.verifyemail', name='user_verifyemail'),
-    url(r'^%s$' % _('about/'), app.about, name='about'),
-    url(r'^%s$' % _('faq/'), app.faq, name='faq'),
-    url(r'^%s$' % _('privacy/'), app.privacy, name='privacy'),
-    url(r'^%s$' % _('logout/'), app.logout, name='logout'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('comments/')), app.answer_comments, name='answer_comments'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('edit/')), app.edit_answer, name='edit_answer'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('revisions/')), app.answer_revisions, name='answer_revisions'),
-    url(r'^%s$' % _('questions/'), app.questions, name='questions'),
-    url(r'^%s%s$' % (_('questions/'), _('ask/')), app.ask, name='ask'),
-    url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.unanswered, name='unanswered'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('edit/')), app.edit_question, name='edit_question'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('close/')), app.close, name='close'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('reopen/')), app.reopen, name='reopen'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('answer/')), app.answer, name='answer'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('vote/')), app.vote, name='vote'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('revisions/')), app.question_revisions, name='question_revisions'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('comments/')), app.question_comments, name='question_comments'),
-    url(r'^%s(?P<question_id>\d+)/%s(?P<comment_id>\d+)/%s$' % (_('questions/'), _('questions/'),_('delete/')), app.delete_question_comment, name='delete_question_comment'),
-    url(r'^%s(?P<answer_id>\d+)/%s(?P<comment_id>\d+)/%s$' % (_('answers/'), _('answers/'),_('delete/')), app.delete_answer_comment, name='delete_answer_comment'),
-    #place general question item in the end of other operations
-    url(r'^%s(?P<id>\d+)//*' % _('question/'), app.question, name='question'),
-    url(r'^%s$' % _('tags/'), app.tags, name='tags'),
-    url(r'^%s(?P<tag>[^/]+)/$' % _('tags/'), app.tag),
-    url(r'^%s$' % _('users/'),app.users, name='users'),
-    url(r'^%s(?P<id>\d+)/%s$' % (_('users/'), _('edit/')), app.edit_user, name='edit_user'),
-    url(r'^%s(?P<id>\d+)//*' % _('users/'), app.user, name='user'),
-    url(r'^%s$' % _('badges/'),app.badges, name='badges'),
-    url(r'^%s(?P<id>\d+)//*' % _('badges/'), app.badge, name='badge'),
-    url(r'^%s%s$' % (_('messages/'), _('markread/')),app.read_message, name='read_message'),
-    # (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')),
-    (r'^%s(.*)' % _('nimda/'), admin.site.root),
-    url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
-    (r'^%s$' % _('upload/'), app.upload),
-    url(r'^%s$' % _('books/'), app.books, name='books'),
-    url(r'^%s%s(?P<short_name>[^/]+)/$' % (_('books/'), _('ask/')), app.ask_book, name='ask_book'),
-    url(r'^%s(?P<short_name>[^/]+)/$' % _('books/'), app.book, name='book'),
-    url(r'^%s$' % _('search/'), app.search, name='search'),
-    (r'^i18n/', include('django.conf.urls.i18n')),
+    (r'^%s' % settings.FORUM_SCRIPT_ALIAS, include('forum.urls')),
 )
diff --git a/user_messages/__init__.py b/user_messages/__init__.py
new file mode 100644
index 00000000..0136c888
--- /dev/null
+++ b/user_messages/__init__.py
@@ -0,0 +1,36 @@
+"""
+Lightweight session-based messaging system.
+
+Time-stamp: <2009-03-10 19:22:29 carljm __init__.py>
+
+"""
+VERSION = (0, 1, 'pre')
+
+def create_message (request, message):
+    """
+    Create a message in the current session.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+    
+    try:
+        request.session['messages'].append(message)
+    except KeyError:
+        request.session['messages'] = [message]
+
+def get_and_delete_messages (request, include_auth=False):
+    """
+    Get and delete all messages for current session.
+
+    Optionally also fetches user messages from django.contrib.auth.
+
+    """
+    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+
+    messages = request.session.pop('messages', [])
+
+    if include_auth and request.user.is_authenticated():
+        messages.extend(request.user.get_and_delete_messages())
+    
+    return messages
+
diff --git a/user_messages/context_processors.py b/user_messages/context_processors.py
new file mode 100644
index 00000000..894f5801
--- /dev/null
+++ b/user_messages/context_processors.py
@@ -0,0 +1,52 @@
+"""
+Context processor for lightweight session messages.
+
+Time-stamp: <2008-07-19 23:16:19 carljm context_processors.py>
+
+"""
+from django.utils.encoding import StrAndUnicode
+
+from user_messages import get_and_delete_messages
+
+def user_messages (request):
+    """
+    Returns session messages for the current session.
+
+    """
+    messages = request.user.get_and_delete_messages()
+    #if request.user.is_authenticated():
+    #else:
+    #    messages = LazyMessages(request)
+    return { 'user_messages': messages }
+
+class LazyMessages (StrAndUnicode):
+    """
+    Lazy message container, so messages aren't actually retrieved from
+    session and deleted until the template asks for them.
+
+    """
+    def __init__(self, request):
+        self.request = request
+
+    def __iter__(self):
+        return iter(self.messages)
+
+    def __len__(self):
+        return len(self.messages)
+
+    def __nonzero__(self):
+        return bool(self.messages)
+
+    def __unicode__(self):
+        return unicode(self.messages)
+
+    def __getitem__(self, *args, **kwargs):
+        return self.messages.__getitem__(*args, **kwargs)
+
+    def _get_messages(self):
+        if hasattr(self, '_messages'):
+            return self._messages
+        self._messages = get_and_delete_messages(self.request)
+        return self._messages
+    messages = property(_get_messages)
+    
diff --git a/user_messages/models.py b/user_messages/models.py
new file mode 100644
index 00000000..b67ead6d
--- /dev/null
+++ b/user_messages/models.py
@@ -0,0 +1,3 @@
+"""
+blank models.py
+"""
-- 
cgit v1.2.3-1-g7c22


From 635f0e7ad5038540f42d9be173d437ce921de914 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 15 Nov 2009 15:50:56 -0500
Subject: added INSTALL file, expanded it with more detailed setup instructions
 and explanation of setting parameters, some walkthrough on how to install
 cnprog on Apache/WSGI

---
 INSTALL | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 206 insertions(+), 10 deletions(-)

diff --git a/INSTALL b/INSTALL
index 35683147..b028a788 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,35 +1,231 @@
-PRE-REQUIREMENTS:
+CONTENTS
+------------------
+A. PREREQUISITES
+B. INSTALLATION
+   1. Settings file
+   2. Database
+   3. Running CNPROG in the development server
+   4. Installation under Apache/WSGI
+   5. Miscellaneous
+C. CONFIGURATION PARAMETERS (settings_local.py)
+
+
+A. PREREQUISITES
 -----------------------------------------------
-1. Python2.5, MySQL, Django v1.0+
+0. We recommend you to use python-setuptools to install pre-requirement libraries.
+If you haven't installed it, please try to install it first.
+e.g, sudo apt-get install python-setuptools
+
+1. Python2.5/2.6, MySQL, Django v1.0/1.1
+Note: email subscription sender job requires Django 1.1, everything else works with 1.0
+Make sure mysql for python provider has been installed.
+sudo easy_install mysql-python
 
 2. Python-openid v2.2
 http://openidenabled.com/python-openid/
-
-3. django-authopenid(Included in project already)
-http://code.google.com/p/django-authopenid/
+sudo easy_install python-openid
 
 4. html5lib
 http://code.google.com/p/html5lib/
 Used for HTML sanitizer
+sudo easy_install html5lib
 
 5. Markdown2
 http://code.google.com/p/python-markdown2/
+sudo easy_install markdown2
 
 6. Django Debug Toolbar
 http://github.com/robhudson/django-debug-toolbar/tree/master
 
-INSTALL STEPS:
+NOTES: django_authopenid is included into CNPROG code 
+and is significantly modified.  http://code.google.com/p/django-authopenid/
+no need to install this library
+
+B. INSTALLATION
 -----------------------------------------------
-1. Copy settings_local.py.dist to settings_local.py and 
+0. Make sure you have all above python libraries installed.
+
+   make cnprog installation server-readable on Linux command might be:
+   chown -R yourlogin:apache /path/to/CNPROG
+   
+   directories templates/upfiles and log must be server writable
+
+   on Linux type chmod
+   chmod -R g+w /path/to/CNPROG/upfiles
+   chmod -R g+w /path/to/log
+
+   above it is assumed that webserver runs under group named "apache"
+
+1. Settings file
+
+Copy settings_local.py.dist to settings_local.py and 
 update all your settings. Check settings.py and update 
 it as well if necessory.
+Section C explains configuration paramaters.
 
-2. Prepare your database by using the same database/account 
+2. Database
+
+Prepare your database by using the same database/account 
 configuration from above.
+e.g,
+create database cnprog DEFAULT CHARACTER SET UTF8 COLLATE utf8_general_ci;
+grant all on cnprog.* to 'cnprog'@'localhost';
+And then run "python manage.py syncdb" to synchronize your database.
+
+3. Running CNPROG on the development server 
 
-3. Run "python manager.py runserver" to startup django 
+Run "python manage.py runserver" to startup django 
 development environment.
+(Under Linux you can use command "python manage.py runserver `hostname -i`:8000",
+where you can use any other available number for the port)
+
+you might want to have DEBUG=True in the beginning of settings.py 
+when using the test server
+
+4. Installation under Apache/WSGI
+
+4.1 Prepare wsgi script
+
+Make a file readable by your webserver with the following content:
+
+---------
+import os
+import sys
+
+sys.path.insert(0,'/one/level/above') #insert to make sure that forum will be found
+sys.path.append('/one/level/above/CNPROG') #maybe this is not necessary
+os.environ['DJANGO_SETTINGS_MODULE'] = 'CNPROG.settings'
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
+-----------
+
+insert method is used for path because if the forum directory name 
+is by accident the same as some other python module
+you wull see strange errors - forum won't be found even though
+it's in the python path. for example using name "test" is
+not a good idea - as there is a module with such name
 
-4. There are some demo scripts under sql_scripts folder, 
+
+4.2 Configure webserver
+Settings below are not perfect but may be a good starting point
+
+---------
+WSGISocketPrefix /path/to/socket/sock #must be readable and writable by apache
+WSGIPythonHome /usr/local #must be readable by apache
+WSGIPythonEggs /var/python/eggs #must be readable and writable by apache
+
+#NOTE: all urs below will need to be adjusted if 
+#settings.FORUM_SCRIPT_ALIAS !='' (e.g. = 'forum/')
+#this allows "rooting" forum at http://example.com/forum, if you like
+<VirtualHost ...your ip...:80>
+    ServerAdmin forum@example.com
+    DocumentRoot /path/to/cnprog
+    ServerName example.com
+
+    #run mod_wsgi process for django in daemon mode
+    #this allows avoiding confused timezone settings when
+    #another application runs in the same virtual host
+    WSGIDaemonProcess CNPROG 
+    WSGIProcessGroup CNPROG 
+
+    #force all content to be served as static files
+    #otherwise django will be crunching images through itself wasting time
+    Alias /content/ /path/to/cnprog/templates/content/
+    AliasMatch /([^/]*\.css) /path/to/cnprog/templates/content/style/$1
+    <Directory /path/to/cnprog/templates/content>
+        Order deny,allow
+        Allow from all
+    </Directory>
+
+    #this is your wsgi script described in the prev section
+    WSGIScriptAlias / /path/to/cnprog/cnprog.wsgi
+
+    #this will force admin interface to work only
+    #through https (optional)
+    #"nimda" is the secret spelling of "admin" ;)
+    <Location "/nimda">
+        RewriteEngine on
+        RewriteRule /nimda(.*)$ https://example.com/nimda$1 [L,R=301]
+    </Location>
+    CustomLog /var/log/httpd/CNPROG/access_log common
+    ErrorLog /var/log/httpd/CNPROG/error_log
+</VirtualHost>
+#(optional) run admin interface under https
+<VirtualHost ..your ip..:443>
+    ServerAdmin forum@example.com
+    DocumentRoot /path/to/cnrpog
+    ServerName example.com
+    SSLEngine on
+    SSLCertificateFile /path/to/ssl-certificate/server.crt
+    SSLCertificateKeyFile /path/to/ssl-certificate/server.key
+    WSGIScriptAlias / /path/to/cnprogcnprog.wsgi
+    CustomLog /var/log/httpd/CNPROG/access_log common
+    ErrorLog /var/log/httpd/CNPROG/error_log
+    DirectoryIndex index.html
+</VirtualHost>
+-------------
+
+5. Miscellaneous
+
+There are some demo scripts under sql_scripts folder, 
 including badges and test accounts for CNProg.com. You 
 don't need them to run your sample.
+
+C. CONFIGURATION PARAMETERS
+
+#the only parameter that needs to be touched in settings.py is 
+DEBUG=False #set to True to enable debug mode
+
+#all forum parameters are set in file settings_local.py
+
+LOG_FILENAME = 'cnprog.log' #where logging messages should go
+DATABASE_NAME = 'cnprog'    # Or path to database file if using sqlite3.
+DATABASE_USER = ''          # Not used with sqlite3.
+DATABASE_PASSWORD = ''      # Not used with sqlite3.
+DATABASE_ENGINE = 'mysql'   #mysql, etc
+SERVER_EMAIL = ''
+DEFAULT_FROM_EMAIL = ''
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''    #not necessary if mailserver is run on local machine
+EMAIL_SUBJECT_PREFIX = '[CNPROG] '
+EMAIL_HOST='cnprog.com'
+EMAIL_PORT='25'
+EMAIL_USE_TLS=False
+TIME_ZONE = 'America/Tijuana'
+APP_TITLE = u'CNPROG Q&A Forum' #title of your forum
+APP_KEYWORDS = u'CNPROG,forum,community' #keywords for search engines
+APP_DESCRIPTION = u'Ask and answer questions.' #site description for searche engines 
+APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>' #slogan that goes to front page in logged out mode
+APP_COPYRIGHT = '' #copyright message
+
+#if you set FORUM_SCRIPT_ALIAS= 'forum/'
+#then CNPROG will run at url http://example.com/forum
+#FORUM_SCRIPT_ALIAS cannot have leading slash, otherwise it can be set to anything
+FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
+#also remember to set '/':'/forum' in file templates/content/js/com.cnprog.i18n.js
+#this is because javascript also needs to know the correct url prefix
+#nothing needs to be changed in .css files, as all urls there are relative
+
+LANGUAGE_CODE = 'en' #forum language (see language instructions on the wiki)
+EMAIL_VALIDATION = 'off' #string - on|off
+MIN_USERNAME_LENGTH = 1
+EMAIL_UNIQUE = False    #if True, email addresses must be unique in all accounts
+APP_URL = 'http://cnprog.com' #used by email notif system and RSS
+GOOGLE_SITEMAP_CODE = '' #code for google site crawler (look up google webmaster tools)
+GOOGLE_ANALYTICS_KEY = '' #key to enable google analytics on this site
+BOOKS_ON = False  #if True - books tab will be on
+WIKI_ON = True  #if False - community wiki feature is disabled
+
+#experimental - allow password login through external site
+#must implement django_authopenid/external_login.py
+#included prototype external_login works with Mediawiki
+USE_EXTERNAL_LEGACY_LOGIN = True #if false CNPROG uses it's own login/password
+EXTERNAL_LEGACY_LOGIN_HOST = 'login.cnprog.com'
+EXTERNAL_LEGACY_LOGIN_PORT = 80
+EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">CNPROG</span>'
+
+FEEDBACK_SITE_URL = None #None or url
+LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
+
+DJANGO_VERSION = 1.1 #must be either 1.0 or 1.1
+RESOURCE_REVISION=4 #increment when you update media files - clients will be forced to load new version
-- 
cgit v1.2.3-1-g7c22


From 56bc6d41fa35c8fb06eff8270a986ff5d3f3dc7c Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 17 Nov 2009 12:25:10 -0500
Subject: turned off by default legacy password login through external website

---
 settings_local.py.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings_local.py.dist b/settings_local.py.dist
index e43522ef..685c9fb8 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -57,7 +57,7 @@ GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
 GOOGLE_ANALYTICS_KEY = ''
 BOOKS_ON = False 
 WIKI_ON = True 
-USE_EXTERNAL_LEGACY_LOGIN = True 
+USE_EXTERNAL_LEGACY_LOGIN = False
 EXTERNAL_LEGACY_LOGIN_HOST = 'login.cnprog.com'
 EXTERNAL_LEGACY_LOGIN_PORT = 80
 EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">CNPROG</span>'
-- 
cgit v1.2.3-1-g7c22


From 46e48e400f30bde76a9b21db78f9b727149a3e24 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 17 Nov 2009 22:14:15 -0500
Subject: full text search with Sphinx, added session-based greeting message
 for the first time visitor

---
 INSTALL                                            |  40 ++++++-
 context.py                                         |   1 +
 forum/models.py                                    |  11 ++
 forum/templatetags/extra_tags.py                   |   4 +-
 forum/views.py                                     |  12 +-
 middleware/anon_user.py                            |   8 ++
 settings.py                                        |   1 +
 settings_local.py.dist                             |  27 +++--
 sphinx/sphinx.conf                                 | 127 +++++++++++++++++++++
 .../authopenid/external_legacy_login_info.html     |   3 +-
 templates/content/style/style.css                  |   5 +-
 templates/questions.html                           |  45 +++++++-
 templates/user_info.html                           |   2 +-
 13 files changed, 261 insertions(+), 25 deletions(-)
 create mode 100644 sphinx/sphinx.conf

diff --git a/INSTALL b/INSTALL
index b028a788..38d3a365 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,8 @@ B. INSTALLATION
    2. Database
    3. Running CNPROG in the development server
    4. Installation under Apache/WSGI
-   5. Miscellaneous
+   5. Full text search
+   6. Miscellaneous
 C. CONFIGURATION PARAMETERS (settings_local.py)
 
 
@@ -37,6 +38,12 @@ sudo easy_install markdown2
 6. Django Debug Toolbar
 http://github.com/robhudson/django-debug-toolbar/tree/master
 
+7. djangosphinx (optional - for full text questions+answer+tag)
+http://github.com/dcramer/django-sphinx/tree/master/djangosphinx
+
+8. sphinx search engine (optional, works together with djangosphinx)
+http://sphinxsearch.com/downloads.html
+
 NOTES: django_authopenid is included into CNPROG code 
 and is significantly modified.  http://code.google.com/p/django-authopenid/
 no need to install this library
@@ -165,7 +172,36 @@ WSGIPythonEggs /var/python/eggs #must be readable and writable by apache
 </VirtualHost>
 -------------
 
-5. Miscellaneous
+5. Full text search (using sphinx search)
+   Currently full text search works only with sphinx search engine
+   Sphinx at this time supports only MySQL and PostgreSQL databases
+   to enable this, install sphinx search engine and djangosphinx
+
+   configure sphinx, sample configuration can be found in
+   sphinx/sphinx.conf file usually goes somewhere in /etc tree
+
+   build cnprog index first time manually
+
+   % indexer --config /path/to/sphinx.conf --index cnprog
+
+   setup cron job to rebuild index periodically with command
+   your crontab entry may be something like
+
+   0 9,15,21 * * * /usr/local/bin/indexer --config /etc/sphinx/sphinx.conf --all --rotate >/dev/null 2>&1
+   adjust it as necessary this one will reindex three times a day at 9am 3pm and 9pm
+
+   if your forum grows very big ( good luck with that :) you'll
+   need to two search indices one diff index and one main
+   please refer to online sphinx search documentation for the information
+   on the subject http://sphinxsearch.com/docs/
+
+   in settings_local.py set
+   USE_SPHINX_SEARCH=True
+   adjust other settings that have SPHINX_* prefix accordingly 
+   remember that there must be trailing comma in parentheses for
+   SHPINX_SEARCH_INDICES tuple - particlarly with just one item!
+
+6. Miscellaneous
 
 There are some demo scripts under sql_scripts folder, 
 including badges and test accounts for CNProg.com. You 
diff --git a/context.py b/context.py
index 680d1c3c..26d326a7 100644
--- a/context.py
+++ b/context.py
@@ -14,6 +14,7 @@ def application_settings(context):
         'WIKI_ON':settings.WIKI_ON,
         'USE_EXTERNAL_LEGACY_LOGIN':settings.USE_EXTERNAL_LEGACY_LOGIN,
         'RESOURCE_REVISION':settings.RESOURCE_REVISION,
+        'USE_SPHINX_SEARCH':settings.USE_SPHINX_SEARCH,
         }
     return {'settings':my_settings}
 
diff --git a/forum/models.py b/forum/models.py
index 39058bea..60fcee0a 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -14,6 +14,10 @@ from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 import django.dispatch
 import settings
+import logging
+
+if settings.USE_SPHINX_SEARCH == True:
+    from djangosphinx.models import SphinxSearch
 
 from forum.managers import *
 from const import *
@@ -184,6 +188,13 @@ class Question(models.Model):
     votes                = generic.GenericRelation(Vote)
     flagged_items        = generic.GenericRelation(FlaggedItem)
 
+    if settings.USE_SPHINX_SEARCH == True:
+        search = SphinxSearch(
+                           index=' '.join(settings.SPHINX_SEARCH_INDICES),
+                           mode='SPH_MATCH_ALL',
+                        )
+        logging.debug('have sphinx search')
+
     objects = QuestionManager()
 
     def save(self, **kwargs):
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index 8bd0e128..96dc9024 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -332,8 +332,8 @@ class BlockResourceNode(template.Node):
         for item in self.items:
             bit = item.render(context)
             out += bit
-        out = out.replace(' ','')
-        return os.path.normpath(out) + '?v=%d' % settings.RESOURCE_REVISION
+        out = os.path.normpath(out) + '?v=%d' % settings.RESOURCE_REVISION
+        return out.replace(' ','')
 
 @register.tag(name='blockresource')
 def blockresource(parser,token):
diff --git a/forum/views.py b/forum/views.py
index e4ccaa16..8f7d07fd 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -2193,10 +2193,16 @@ def search(request):
                 view_id = "latest"
                 orderby = "-added_at"
                 
-            objects = Question.objects.filter(deleted=False).extra(where=['title like %s'], params=['%' + keywords + '%']).order_by(orderby)
+            if settings.USE_SPHINX_SEARCH == True:
+                #search index is now free of delete questions and answers
+                #so there is not "antideleted" filtering here
+                objects = Question.search.query(keywords)
+                #no related selection either because we're relying on full text search here
+            else:
+                objects = Question.objects.filter(deleted=False).extra(where=['title like %s'], params=['%' + keywords + '%']).order_by(orderby)
+                # RISK - inner join queries
+                objects = objects.select_related();
 
-            # RISK - inner join queries
-            objects = objects.select_related();
             objects_list = Paginator(objects, pagesize)
             questions = objects_list.page(page)
 
diff --git a/middleware/anon_user.py b/middleware/anon_user.py
index c7ff05bc..8422d89b 100644
--- a/middleware/anon_user.py
+++ b/middleware/anon_user.py
@@ -1,6 +1,8 @@
 from django.http import HttpResponseRedirect
 from django_authopenid.util import get_next_url
+from django.utils.translation import ugettext as _
 from user_messages import create_message, get_and_delete_messages
+import settings
 import logging
 
 class AnonymousMessageManager(object):
@@ -24,3 +26,9 @@ class ConnectToSessionMessagesMiddleware(object):
             request.user.__deepcopy__ = dummy_deepcopy #plug on deepcopy which may be called by django db "driver"
             request.user.message_set = AnonymousMessageManager(request) #here request is linked to anon user
             request.user.get_and_delete_messages = request.user.message_set.get_and_delete
+
+            #also set the first greeting one time per session only
+            if 'greeting_set' not in request.session:
+                request.session['greeting_set'] = True
+                msg = _('first time greeting with %(url)s') % {'url':settings.GREETING_URL}
+                request.user.message_set.create(message=msg)
diff --git a/settings.py b/settings.py
index daada933..3fc37dce 100644
--- a/settings.py
+++ b/settings.py
@@ -73,6 +73,7 @@ INSTALLED_APPS = (
     'django.contrib.humanize',
     'forum',
     'django_authopenid',
+    'djangosphinx',
     #'debug_toolbar' ,
     'user_messages',
 )
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 685c9fb8..33402d35 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -29,13 +29,6 @@ EMAIL_USE_TLS=False
 #LOCALIZATIONS
 TIME_ZONE = 'America/Tijuana'
 
-#OTHER SETTINGS
-APP_TITLE = u'CNPROG Q&A Forum'
-APP_KEYWORDS = u'CNPROG,forum,community'
-APP_DESCRIPTION = u'Ask and answer questions.'
-APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
-APP_COPYRIGHT = 'Copyright CNPROG, 2009. Some rights reserved under creative commons license.'
-
 ###########################
 #
 #   this will allow running your forum with url like http://site.com/forum
@@ -47,6 +40,16 @@ APP_COPYRIGHT = 'Copyright CNPROG, 2009. Some rights reserved under creative com
 #
 FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
 
+
+#OTHER SETTINGS
+APP_TITLE = u'CNPROG Q&A Forum'
+APP_KEYWORDS = u'CNPROG,forum,community'
+APP_DESCRIPTION = u'Ask and answer questions.'
+APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
+APP_COPYRIGHT = 'Copyright CNPROG, 2009. Some rights reserved under creative commons license.'
+LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
+GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc
+
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 EMAIL_VALIDATION = 'off' #string - on|off
@@ -62,7 +65,15 @@ EXTERNAL_LEGACY_LOGIN_HOST = 'login.cnprog.com'
 EXTERNAL_LEGACY_LOGIN_PORT = 80
 EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">CNPROG</span>'
 FEEDBACK_SITE_URL = None #None or url
-LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
 
 DJANGO_VERSION = 1.1
 RESOURCE_REVISION=4
+
+USE_SPHINX_SEARCH = True #if True all SPHINX_* settings are required
+#also sphinx search engine and djangosphinxs app must be installed
+#sample sphinx configuration file is /sphinx/sphinx.conf
+SPHINX_API_VERSION = 0x113 #refer to djangosphinx documentation
+SPHINX_SEARCH_INDICES=('cnprog',) #a tuple of index names remember about a comma after the 
+#last item, especially if you have just one :)
+SPHINX_SERVER='localhost'
+SPHINX_PORT=3312
diff --git a/sphinx/sphinx.conf b/sphinx/sphinx.conf
new file mode 100644
index 00000000..bf4bdc8b
--- /dev/null
+++ b/sphinx/sphinx.conf
@@ -0,0 +1,127 @@
+#if you have many posts, it's best to configure another index for new posts and 
+#periodically merge the diff index to the main
+#this is not important until you get to hundreds of thousands posts
+
+source src_cnprog
+{
+	# data source
+	type		= mysql
+	sql_host	= localhost
+	sql_user	= cnprog #replace with your db username
+	sql_pass	= secret #replace with your db password
+	sql_db		= cnprog #replace with your db name
+	# these two are optional
+	#sql_port	= 3306
+	#sql_sock	= /var/lib/mysql/mysql.sock
+
+	# pre-query, executed before the main fetch query
+	sql_query_pre	= SET NAMES utf8
+
+	# main document fetch query - change the table names if you are using a prefix
+    # this query creates a flat document from each question that includes only latest
+    # revisions of the question and all of it's answers
+    sql_query       =       SELECT q.id as id, q.title AS title, q.tagnames as tags, qr.text AS text, answers_combined.text AS answers \
+                            FROM question AS q \
+                            INNER JOIN \
+                            ( \
+                                SELECT MAX(id) as id, question_id \
+                                FROM question_revision \
+                                GROUP BY question_id \
+                            ) \
+                            AS mqr \
+                            ON q.id=mqr.question_id \
+                            INNER JOIN question_revision AS qr ON qr.id=mqr.id \
+                            LEFT JOIN \
+                            ( \
+                                SELECT GROUP_CONCAT(answer_current.text SEPARATOR '. ') AS text, \
+                                       question_id \
+                                FROM \
+                                ( \
+                                    SELECT a.question_id as question_id, ar.text as text \
+                                    FROM answer AS a \
+                                    INNER JOIN \
+                                    ( \
+                                        SELECT MAX(id) as id, answer_id \
+                                        FROM answer_revision \
+                                        GROUP BY answer_id \
+                                    ) \
+                                    AS mar \
+                                    ON mar.answer_id = a.id \
+                                    INNER JOIN answer_revision AS ar ON ar.id=mar.id \
+                                    WHERE a.deleted=0 \
+                                ) \
+                                AS answer_current \
+                                GROUP BY question_id \
+                            ) \
+                            AS answers_combined ON q.id=answers_combined.question_id \
+                            WHERE q.deleted=0;
+
+	# optional - used by command-line search utility to display document information
+	sql_query_info	= SELECT title, id FROM question WHERE id=$id
+}
+
+index cnprog {
+	# which document source to index
+	source		= src_cnprog
+
+	# this is path and index file name without extension
+	# you may need to change this path or create this folder
+	path		= /var/data/sphinx/cnprog_main
+
+	# docinfo (ie. per-document attribute values) storage strategy
+	docinfo		= extern
+
+	# morphology
+	morphology	= stem_en
+
+	# stopwords file
+	#stopwords	= /var/data/sphinx/stopwords.txt
+
+	# minimum word length
+	min_word_len	= 1
+
+	# uncomment next 2 lines to allow wildcard (*) searches
+	#min_infix_len = 1
+	#enable_star = 1
+
+	# charset encoding type
+	charset_type	= utf-8
+}
+
+# indexer settings
+indexer
+{
+	# memory limit (default is 32M)
+	mem_limit	= 64M
+}
+
+# searchd settings
+searchd
+{
+	# IP address on which search daemon will bind and accept
+	# optional, default is to listen on all addresses,
+	# ie. address = 0.0.0.0
+	address		= 127.0.0.1
+
+	# port on which search daemon will listen
+	port		= 3312
+
+	# searchd run info is logged here - create or change the folder
+	log		= /var/log/sphinx/searchd.log
+
+	# all the search queries are logged here
+	query_log	= /var/log/sphinx/query.log
+
+	# client read timeout, seconds
+	read_timeout	= 5
+
+	# maximum amount of children to fork
+	max_children	= 30
+
+	# a file which will contain searchd process ID
+	pid_file	= /var/log/sphinx/searchd.pid
+
+	# maximum amount of matches this daemon would ever retrieve
+	# from each index and serve to client
+	max_matches	= 1000
+}
diff --git a/templates/authopenid/external_legacy_login_info.html b/templates/authopenid/external_legacy_login_info.html
index e2f4713e..c200b29d 100644
--- a/templates/authopenid/external_legacy_login_info.html
+++ b/templates/authopenid/external_legacy_login_info.html
@@ -8,9 +8,8 @@
 </div>
 {% spaceless %}
 <div class="message">
-fill in template templates/authopenid/external_legacy_login_info.html
-and explain how to change password, recover password, etc.
 <!--add info about your external login site here-->
+{% trans "how to login with password through external login website" %}
 </div>
 {% endspaceless %}
 {% endblock %}
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 6c1d6a3f..65a323db 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -163,7 +163,7 @@ blockquote
     border-right:1px solid #b4b48e;
     border-bottom:1px solid #b4b48e;*/
     background: white;/* #f9f7ed;*/
-    margin:10px 0 10px 0;
+    margin:10px 0 0 0;
     /*background:url(../images/quest-bg.gif) repeat-x top;*/
 }
 #listA .qstA thumb {float:left; }
@@ -1144,6 +1144,9 @@ ul.bulleta li {background:url(../images/bullet_green.gif) no-repeat 0px 2px; pad
 .message p {
     margin-bottom:0px;
 }
+.message p.space-above {
+    margin-top:10px;
+}
 
 .warning{color:red;}
 .darkred{color:darkred;}
diff --git a/templates/questions.html b/templates/questions.html
index f298381e..47bda129 100644
--- a/templates/questions.html
+++ b/templates/questions.html
@@ -21,7 +21,21 @@
 {% endblock %}
 {% block content %}
 <div class="tabBar">
-    <div class="headQuestions">{% if searchtag %}{% trans "Found by tags" %}{% else %}{% if searchtitle %}{% trans "Found by title" %}{% else %}{% trans "All questions" %}{% endif %}{% endif %}</div>
+    <div class="headQuestions">
+        {% if searchtag %}
+            {% trans "Found by tags" %}
+        {% else %}
+            {% if searchtitle %}
+                {% if settings.USE_SPHINX_SEARCH %}
+                    {% trans "Search results" %}
+                {% else %}
+                    {% trans "Found by title" %}
+                {% endif %}
+            {% else %}
+                {% trans "All questions" %}
+            {% endif %}
+        {% endif %}
+    </div>
     <div class="tabsA">
         <a id="latest" href="?sort=latest" class="off" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a>
         <a id="active" href="?sort=active" class="off" title="{% trans "most recently updated questions" %}">{% trans "active" %}</a>
@@ -105,6 +119,17 @@
         </div>
     </div>
     {% endfor %}
+    {% if searchtitle %}
+        {% if questions_count == 0 %}
+        <p class="evenMore" style="padding-top:30px;text-align:center;">
+            {% trans "Did not find anything?" %}
+        {% else %}
+        <p class="evenMore" style="padding-left:9px">
+            {% trans "Did not find what you were looking for?" %} 
+        {% endif %}
+        <a href="{% url ask %}">{% trans "Please, post your question!" %}</a>
+        </p>
+    {% endif %}
 </div>
 {% endblock %}
 
@@ -130,11 +155,19 @@
 			{% endblocktrans %}
 		{% else %}
 			{% if searchtitle %}
-				{% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}
-				have total {{q_num}} questions containing {{searchtitle}}
-				{% plural %}
-				have total {{q_num}} questions containing {{searchtitle}}
-				{% endblocktrans %}
+                {% if settings.USE_SPHINX_SEARCH %}
+                    {% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}
+                    have total {{q_num}} questions containing {{searchtitle}} in full text
+                    {% plural %}
+                    have total {{q_num}} questions containing {{searchtitle}} in full text
+                    {% endblocktrans %}
+                {% else %}
+                    {% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}
+                    have total {{q_num}} questions containing {{searchtitle}}
+                    {% plural %}
+                    have total {{q_num}} questions containing {{searchtitle}}
+                    {% endblocktrans %}
+                {% endif %}
 			{% else %}
 				{% blocktrans count questions as cnt with questions_count|intcomma as q_num %}
 				have total {{q_num}} questions
diff --git a/templates/user_info.html b/templates/user_info.html
index 4ebcddd6..c550e13f 100644
--- a/templates/user_info.html
+++ b/templates/user_info.html
@@ -19,7 +19,7 @@
                 <tr>
                     <td align="center">
                         <div class="scoreNumber">{{view_user.reputation|intcomma}}</div>
-                        <p><b style="color:#777;">{% trans "karma" %}</b></p>
+                        <p><b style="color:#777;">{% trans "reputation" %}</b></p>
                     </td>
                 </tr>
             </table>
-- 
cgit v1.2.3-1-g7c22


From 76788fb1f6deebf806a0199e6183ad6a9af4096a Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 22 Nov 2009 21:58:06 -0500
Subject: fixed broken links in few places, added Arvyd's modification of
 user_reputation view, email sender cron job, some edits in INSTALL file

---
 INSTALL                                 | 26 +++++++++++++++--
 cron/send_email_alerts                  |  4 +++
 forum/feed.py                           |  4 +--
 forum/views.py                          | 51 ++++++++++++++++++++-------------
 templates/content/js/com.cnprog.post.js |  2 +-
 templates/content/style/style.css       |  5 +---
 templates/question.html                 | 26 ++++++++---------
 templates/user_reputation.html          |  3 +-
 templates/user_votes.html               |  5 ++--
 9 files changed, 81 insertions(+), 45 deletions(-)
 create mode 100644 cron/send_email_alerts

diff --git a/INSTALL b/INSTALL
index 38d3a365..4b878f24 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,8 +7,10 @@ B. INSTALLATION
    3. Running CNPROG in the development server
    4. Installation under Apache/WSGI
    5. Full text search
-   6. Miscellaneous
+   6. Email subscriptions
+   7. Miscellaneous
 C. CONFIGURATION PARAMETERS (settings_local.py)
+D. CUSTOMIZATION
 
 
 A. PREREQUISITES
@@ -201,7 +203,16 @@ WSGIPythonEggs /var/python/eggs #must be readable and writable by apache
    remember that there must be trailing comma in parentheses for
    SHPINX_SEARCH_INDICES tuple - particlarly with just one item!
 
-6. Miscellaneous
+6. Email subscriptions
+   
+   This function at the moment requires Django 1.1
+
+   edit paths in the file cron/send_email_alerts
+   set up a cron job to call cron/send_email_alerts once or twice a day
+   subscription sender may be tested manually in shell 
+   by calling cron/send_email_alerts
+
+7. Miscellaneous
 
 There are some demo scripts under sql_scripts folder, 
 including badges and test accounts for CNProg.com. You 
@@ -265,3 +276,14 @@ LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
 
 DJANGO_VERSION = 1.1 #must be either 1.0 or 1.1
 RESOURCE_REVISION=4 #increment when you update media files - clients will be forced to load new version
+
+D. Customization
+
+Other than settings_local.py the following will most likely need customization:
+* locale/*/django.po - language files that may also contain your site-specific messages
+  if you want to start with english messages file - look for words like "forum" and
+  "CNPROG" in the msgstr lines
+* templates/header.html and templates/footer.html may contain extra links
+* templates/about.html - a place to explain for is your forum for
+* templates/faq.html - put answers to users frequent questions
+* templates/content/style/style.css - modify style sheet to add disctinctive look to your forum
diff --git a/cron/send_email_alerts b/cron/send_email_alerts
new file mode 100644
index 00000000..e9e433be
--- /dev/null
+++ b/cron/send_email_alerts
@@ -0,0 +1,4 @@
+PYTHONPATH=/dir/just/above_forum
+export PYTHONPATH
+APP_ROOT=$PYTHONPATH/CNPROG
+/usr/local/bin/python $APP_ROOT/manage.py send_email_alerts >> $APP_ROOT/log/django.lanai.log
diff --git a/forum/feed.py b/forum/feed.py
index 373f8a87..ad1d5cbd 100644
--- a/forum/feed.py
+++ b/forum/feed.py
@@ -16,7 +16,7 @@ from models import Question
 import settings
 class RssLastestQuestionsFeed(Feed):
     title = settings.APP_TITLE + _(' - ')+ _('latest questions')
-    link = settings.APP_URL + '/' + _('questions/')
+    link = settings.APP_URL + '/' + _('question/')
     description = settings.APP_DESCRIPTION
     #ttl = 10
     copyright = settings.APP_COPYRIGHT
@@ -34,7 +34,7 @@ class RssLastestQuestionsFeed(Feed):
         return item.added_at
 
     def items(self, item):
-       return Question.objects.filter(deleted=False).order_by('-added_at')[:30]
+       return Question.objects.filter(deleted=False).order_by('-last_activity_at')[:30]
 
 def main():
     pass
diff --git a/forum/views.py b/forum/views.py
index 8f7d07fd..a1b37717 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1739,32 +1739,43 @@ def user_votes(request, user_id, user_view):
 
 def user_reputation(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
-    reputation = Repute.objects.extra(
-        select={'positive': 'sum(positive)', 'negative': 'sum(negative)', 'question_id':'question_id', 
-            'title': 'question.title'},
-        tables=['repute', 'question'],
-        order_by=['-reputed_at'],
-        where=['user_id=%s AND question_id=question.id'],
-        params=[user.id]
-    ).values('positive', 'negative', 'question_id', 'title', 'reputed_at', 'reputation')
-
-    reputation.query.group_by = ['question_id']
-
+    try:
+        from django.db.models import Sum
+        reputation = Repute.objects.extra(
+                                          select={'question_id':'question_id',
+                                          'title': 'question.title'},
+                                          tables=['repute', 'question'],
+                                          order_by=['-reputed_at'],
+                                          where=['user_id=%s AND question_id=question.id'],
+                                          params=[user.id]
+                                          ).values('question_id', 'title', 'reputed_at', 'reputation')
+        reputation = reputation.annotate(positive=Sum("positive"), negative=Sum("negative"))
+    except ImportError:
+        reputation = Repute.objects.extra(
+                                          select={'positive':'sum(positive)', 'negative':'sum(negative)', 'question_id':'question_id',
+                                          'title': 'question.title'},
+                                          tables=['repute', 'question'],
+                                          order_by=['-reputed_at'],
+                                          where=['user_id=%s AND question_id=question.id'],
+                                          params=[user.id]
+                                          ).values('positive', 'negative', 'question_id', 'title', 'reputed_at', 'reputation')
+        reputation.query.group_by = ['question_id']
+ 
     rep_list = []
     for rep in Repute.objects.filter(user=user).order_by('reputed_at'):
         dic = '[%s,%s]' % (calendar.timegm(rep.reputed_at.timetuple()) * 1000, rep.reputation)
         rep_list.append(dic)
     reps = ','.join(rep_list)
     reps = '[%s]' % reps
-
-    return render_to_response(user_view.template_file,{
-        "tab_name" : user_view.id,
-        "tab_description" : user_view.tab_description,
-        "page_title" : user_view.page_title,
-        "view_user" : user,
-        "reputation" : reputation,
-        "reps" : reps
-    }, context_instance=RequestContext(request))
+ 
+    return render_to_response(user_view.template_file, {
+                              "tab_name": user_view.id,
+                              "tab_description": user_view.tab_description,
+                              "page_title": user_view.page_title,
+                              "view_user": user,
+                              "reputation": reputation,
+                              "reps": reps
+                              }, context_instance=RequestContext(request))
 
 def user_favorites(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index 58db9b33..0e604b8f 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -290,7 +290,7 @@ var Vote = function(){
             fav.text(data.count);
         }
         else if(data.success == "1"){
-            object.attr("src", $.i18n._("/") + "/content/images/vote-favorite-on.png");
+            object.attr("src", $.i18n._("/") + "content/images/vote-favorite-on.png");
             var fav = getFavoriteNumber();
             fav.text(data.count);
             fav.addClass("my-favorite-number");
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 65a323db..6c1d6a3f 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -163,7 +163,7 @@ blockquote
     border-right:1px solid #b4b48e;
     border-bottom:1px solid #b4b48e;*/
     background: white;/* #f9f7ed;*/
-    margin:10px 0 0 0;
+    margin:10px 0 10px 0;
     /*background:url(../images/quest-bg.gif) repeat-x top;*/
 }
 #listA .qstA thumb {float:left; }
@@ -1144,9 +1144,6 @@ ul.bulleta li {background:url(../images/bullet_green.gif) no-repeat 0px 2px; pad
 .message p {
     margin-bottom:0px;
 }
-.message p.space-above {
-    margin-top:10px;
-}
 
 .warning{color:red;}
 .darkred{color:darkred;}
diff --git a/templates/question.html b/templates/question.html
index 6929b762..9183767f 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -139,10 +139,6 @@
                                     {% if request.user|can_edit_post:question %}
                                     <span class="action-link"><a href="{% url edit_question question.id %}">{% trans 'edit' %}</a></span>
                                     {% endif %}
-                                {% separator %}
-                                    {% if request.user|can_delete_post:question %}
-                                    <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span>
-                                    {% endif %}
                                 {% separator %}
                                     {% if question.closed %}
                                     {% if request.user|can_reopen_question:question %}
@@ -163,6 +159,10 @@
                                         {% endif %}
                                     </span>
                                     {% endif %}
+                                {% separator %}
+                                    {% if request.user|can_delete_post:question %}
+                                    <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span>
+                                    {% endif %}
                                 {% endjoinitems %}
                             </div>
                             <div class="post-update-info-container">
@@ -293,15 +293,6 @@
                                                 {% if request.user|can_edit_post:answer %}
                                                 <span class="action-link"><a href="{% url edit_answer answer.id %}">{% trans 'edit' %}</a></span>
                                                 {% endif %}
-                                            {% separator %}
-                                                {% if request.user|can_delete_post:answer %}
-                                                    {% spaceless %}
-                                                    <span class="action-link">
-                                                        <a id="answer-delete-link-{{answer.id}}">
-                                                        {% if answer.deleted %}{% trans "undelete" %}{% else %}{% trans "delete" %}{% endif %}</a>
-                                                    </span>
-                                                    {% endspaceless %}
-                                                {% endif %}
                                             {% separator %}
                                                 {% if request.user|can_flag_offensive %}
                                                 <span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag" 
@@ -312,6 +303,15 @@
                                                     {% endif %}
                                                 </span>
                                                 {% endif %}
+                                            {% separator %}
+                                                {% if request.user|can_delete_post:answer %}
+                                                    {% spaceless %}
+                                                    <span class="action-link">
+                                                        <a id="answer-delete-link-{{answer.id}}">
+                                                        {% if answer.deleted %}{% trans "undelete" %}{% else %}{% trans "delete" %}{% endif %}</a>
+                                                    </span>
+                                                    {% endspaceless %}
+                                                {% endif %}
                                             {% endjoinitems %}
                                         </div>
                                         <div class="post-update-info-container">
diff --git a/templates/user_reputation.html b/templates/user_reputation.html
index 29d642fe..16127140 100644
--- a/templates/user_reputation.html
+++ b/templates/user_reputation.html
@@ -1,6 +1,7 @@
 {% extends "user.html" %}
 <!-- user_reputation.html -->
 {% load extra_tags %}
+{% load extra_filters %}
 {% load humanize %}
 {% block userjs %}
        <script type='text/javascript' src='{% href "/content/js/excanvas.pack.js" %}'></script>
@@ -33,7 +34,7 @@
                         <div style="float:left;width:20px;color:red">{{ rep.negative }}</div>
                         
                     </div>
-                    <a href="{% url questions %}{{ rep.question_id }}/{{ rep.title }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span>                    
+                    <a href="{% url question rep.question_id %}{{ rep.title|slugify }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span>                    
                 </p>
                 {% endfor %}
             </div>
diff --git a/templates/user_votes.html b/templates/user_votes.html
index 4abbf46d..b72b3ef6 100644
--- a/templates/user_votes.html
+++ b/templates/user_votes.html
@@ -1,6 +1,7 @@
 {% extends "user.html" %}
 <!-- user_votes.html -->
 {% load extra_tags %}
+{% load extra_filters %}
 {% load humanize %}
 {% load i18n %}
 
@@ -18,9 +19,9 @@
                 </div>
                 <div style="float:left;overflow:hidden;width:750px">
                     {% ifequal vote.answer_id 0 %}
-                    <span class="question-title-link"><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title }}">{{ vote.title }}</a></span>
+                    <span class="question-title-link"><a href="{% url question vote.question_id %}/{{ vote.title|slugify }}">{{ vote.title }}</a></span>
                     {% else %}
-                    <span class="answer-title-link" ><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title }}#{{ vote.answer_id }}">{{ vote.title }}</a></span>
+                    <span class="answer-title-link" ><a href="{% url question vote.question_id %}/{{ vote.title|slugify }}#{{ vote.answer_id }}">{{ vote.title }}</a></span>
                     {% endifequal %}
                     <div style="height:5px"></div>
                 </div>          
-- 
cgit v1.2.3-1-g7c22


From 007d4522c2999188d77bde9ba5059231ccc53f73 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 22 Nov 2009 22:01:57 -0500
Subject: small css fix

---
 templates/content/style/style.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 6c1d6a3f..13494721 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -1144,6 +1144,9 @@ ul.bulleta li {background:url(../images/bullet_green.gif) no-repeat 0px 2px; pad
 .message p {
     margin-bottom:0px;
 }
+.message p.space-above {
+    margin-top:10px;
+}
 
 .warning{color:red;}
 .darkred{color:darkred;}
-- 
cgit v1.2.3-1-g7c22


From fa98d95d8c675f37c321c40e0151624dca240efc Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Mon, 23 Nov 2009 21:16:55 -0500
Subject: improved email subscription job, some small fixes, users now can
 change their screen name any time

---
 TODO                                           |    7 +-
 forum/const.py                                 |    2 +
 forum/forms.py                                 |    4 +-
 forum/management/commands/send_email_alerts.py |  134 ++-
 forum/views.py                                 |    3 +-
 templates/content/js/com.cnprog.i18n.js        |    2 +-
 templates/question_edit.html                   |    2 +-
 templates/user_edit.html                       |    4 +
 templates/user_votes.html                      |    4 +-
 utils/odict.py                                 | 1399 ++++++++++++++++++++++++
 10 files changed, 1510 insertions(+), 51 deletions(-)
 create mode 100644 utils/odict.py

diff --git a/TODO b/TODO
index 3769fa08..372e714f 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
-*check change email function - there is a strange 'password' field in form
-*make reusable question-block template for index questions unanswered - get rid of copy-paste
-*unused votes count in user profile not working - left that commented out in templates/user_info.html
-*badge award notification messages need to be set fixed at place where badges are awarded
+* per-tag email subscriptions
+* make sorting tabs work in question search
+* allow multiple logins to the same account
diff --git a/forum/const.py b/forum/const.py
index 9b9230c0..312dde26 100644
--- a/forum/const.py
+++ b/forum/const.py
@@ -49,6 +49,7 @@ TYPE_ACTIVITY_MARK_OFFENSIVE=14
 TYPE_ACTIVITY_UPDATE_TAGS=15
 TYPE_ACTIVITY_FAVORITE=16
 TYPE_ACTIVITY_USER_FULL_UPDATED = 17
+TYPE_ACTIVITY_QUESTION_EMAIL_UPDATE_SENT = 18
 #TYPE_ACTIVITY_EDIT_QUESTION=17
 #TYPE_ACTIVITY_EDIT_ANSWER=18
 
@@ -70,6 +71,7 @@ TYPE_ACTIVITY = (
     (TYPE_ACTIVITY_UPDATE_TAGS, _('updated tags')),
     (TYPE_ACTIVITY_FAVORITE, _('selected favorite')),
     (TYPE_ACTIVITY_USER_FULL_UPDATED, _('completed user profile')),
+    (TYPE_ACTIVITY_QUESTION_EMAIL_UPDATE_SENT, _('email update sent to user')),
 )
 
 TYPE_RESPONSE = {
diff --git a/forum/forms.py b/forum/forms.py
index 5b181d48..511a0a0d 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -4,7 +4,7 @@ from django import forms
 from models import *
 from const import *
 from django.utils.translation import ugettext as _
-from django_authopenid.forms import NextUrlField
+from django_authopenid.forms import NextUrlField, UserNameField
 import settings
 
 class TitleField(forms.CharField):
@@ -195,6 +195,7 @@ class EditAnswerForm(forms.Form):
 
 class EditUserForm(forms.Form):
     email = forms.EmailField(label=u'Email', help_text=_('this email does not have to be linked to gravatar'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
+    username = UserNameField(label=_('Screen name'))
     realname = forms.CharField(label=_('Real name'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
     website = forms.URLField(label=_('Website'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
     city = forms.CharField(label=_('Location'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
@@ -203,6 +204,7 @@ class EditUserForm(forms.Form):
 
     def __init__(self, user, *args, **kwargs):
         super(EditUserForm, self).__init__(*args, **kwargs)
+        self.fields['username'].initial = user.username
         self.fields['email'].initial = user.email
         self.fields['realname'].initial = user.real_name
         self.fields['website'].initial = user.website
diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index a25e4343..8d52ed64 100644
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -2,11 +2,14 @@ from django.core.management.base import NoArgsCommand
 from django.db import connection
 from django.db.models import Q, F
 from forum.models import *
+from forum import const 
 from django.core.mail import EmailMessage
 from django.utils.translation import ugettext as _
 from django.utils.translation import ungettext
 import datetime
 import settings
+import logging
+from utils.odict import OrderedDict
 
 class Command(NoArgsCommand):
     def handle_noargs(self,**options):
@@ -18,10 +21,10 @@ class Command(NoArgsCommand):
             connection.close()
 
     def get_updated_questions_for_user(self,user):
-        q_sel = []
-        q_ask = []
-        q_ans = []
-        q_all = []
+        q_sel = None 
+        q_ask = None 
+        q_ans = None 
+        q_all = None 
         now = datetime.datetime.now()
         Q_set1 = Question.objects.exclude(
                                         last_activity_by=user,
@@ -39,12 +42,12 @@ class Command(NoArgsCommand):
         for feed in user_feeds:
             cutoff_time = now - EmailFeedSetting.DELTA_TABLE[feed.frequency]
             if feed.reported_at == None or feed.reported_at <= cutoff_time:
-                Q_set = Q_set1.exclude(last_activity_at__gt=cutoff_time)
+                Q_set = Q_set1.exclude(last_activity_at__gt=cutoff_time)#report these excluded later
                 feed.reported_at = now
                 feed.save()#may not actually report anything, depending on filters below
                 if feed.feed_type == 'q_sel':
                     q_sel = Q_set.filter(followed_by=user)
-                    q_sel.cutoff_time = cutoff_time
+                    q_sel.cutoff_time = cutoff_time #store cutoff time per query set
                 elif feed.feed_type == 'q_ask':
                     q_ask = Q_set.filter(author=user)
                     q_ask.cutoff_time = cutoff_time
@@ -55,56 +58,92 @@ class Command(NoArgsCommand):
                     q_all = Q_set
                     q_all.cutoff_time = cutoff_time
         #build list in this order
-        q_tbl = {} 
+        q_list = OrderedDict()
         def extend_question_list(src, dst):
-            if isinstance(src,list):
-                return
+            """src is a query set with questions
+               or an empty list
+                dst - is an ordered dictionary
+            """
+            if src is None:
+                return #will not do anything if subscription of this type is not used
             cutoff_time = src.cutoff_time
             for q in src:
                 if q in dst:
-                    if cutoff_time < dst[q]:
-                        dst[q] = cutoff_time
+                    if cutoff_time < dst[q]['cutoff_time']:
+                        dst[q]['cutoff_time'] = cutoff_time
                 else:
-                    dst[q] = cutoff_time
+                    #initialise a questions metadata dictionary to use for email reporting
+                    dst[q] = {'cutoff_time':cutoff_time}
 
-        extend_question_list(q_sel, q_tbl)
-        extend_question_list(q_ask, q_tbl)
-        extend_question_list(q_ans, q_tbl)
-        extend_question_list(q_all, q_tbl)
+        extend_question_list(q_sel, q_list)
+        extend_question_list(q_ask, q_list)
+        extend_question_list(q_ans, q_list)
+        extend_question_list(q_all, q_list)
 
         ctype = ContentType.objects.get_for_model(Question)
-        out = {}
-        for q, cutoff_time in q_tbl.items():
+        EMAIL_UPDATE_ACTIVITY = const.TYPE_ACTIVITY_QUESTION_EMAIL_UPDATE_SENT
+        for q, meta_data in q_list.items():
             #todo use Activity, but first start keeping more Activity records
             #act = Activity.objects.filter(content_type=ctype, object_id=q.id)
-            #get info on question edits, answer edits, comments
-            out[q] = {}
-            q_rev = QuestionRevision.objects.filter(question=q,revised_at__lt=cutoff_time)
+            #because currently activity is not fully recorded to through
+            #revision records to see what kind modifications were done on
+            #the questions and answers
+            try:
+                update_info = Activity.objects.get(content_type=ctype, 
+                                                    object_id=q.id,
+                                                    activity_type=EMAIL_UPDATE_ACTIVITY)
+                emailed_at = update_info.active_at
+            except Activity.DoesNotExist:
+                update_info = Activity(user=user, content_object=q, activity_type=EMAIL_UPDATE_ACTIVITY)
+                emailed_at = datetime.datetime(1970,1,1)#long time ago
+            except Activity.MultipleObjectsReturned:
+                raise Exception('server error - multiple question email activities found per user-question pair')
+
+            q_rev = QuestionRevision.objects.filter(question=q,\
+                                                    revised_at__lt=cutoff_time,\
+                                                    revised_at__gt=emailed_at)
             q_rev = q_rev.exclude(author=user)
-            out[q]['q_rev'] = len(q_rev)
+            meta_data['q_rev'] = len(q_rev)
             if len(q_rev) > 0 and q.added_at == q_rev[0].revised_at:
-                out[q]['q_rev'] = 0
-                out[q]['new_q'] = True
+                meta_data['q_rev'] = 0
+                meta_data['new_q'] = True
             else:
-                out[q]['new_q'] = False
+                meta_data['new_q'] = False
                 
-            new_ans = Answer.objects.filter(question=q,added_at__lt=cutoff_time)
+            new_ans = Answer.objects.filter(question=q,\
+                                            added_at__lt=cutoff_time,\
+                                            added_at__gt=emailed_at)
             new_ans = new_ans.exclude(author=user)
-            out[q]['new_ans'] = len(new_ans)
-            ans_rev = AnswerRevision.objects.filter(answer__question=q,revised_at__lt=cutoff_time)
+            meta_data['new_ans'] = len(new_ans)
+            ans_rev = AnswerRevision.objects.filter(answer__question=q,\
+                                            revised_at__lt=cutoff_time,\
+                                            revised_at__gt=emailed_at)
             ans_rev = ans_rev.exclude(author=user)
-            out[q]['ans_rev'] = len(ans_rev)
-        return out 
+            meta_data['ans_rev'] = len(ans_rev)
+            if len(q_rev) == 0 and len(new_ans) == 0 and len(ans_rev) == 0:
+                meta_data['nothing_new'] = True
+            else:
+                meta_data['nothing_new'] = False
+                update_info.active_at = now
+                update_info.save() #save question email update activity 
+        return q_list 
 
-    def __act_count(self,string,number,output):
+    def __action_count(self,string,number,output):
         if number > 0:
             output.append(_(string) % {'num':number})
 
     def send_email_alerts(self):
 
+        #todo: move this to template
         for user in User.objects.all():
             q_list = self.get_updated_questions_for_user(user)
-            num_q = len(q_list)
+            num_q = 0
+            num_moot = 0
+            for meta_data in q_list.values():
+                if meta_data['nothing_new'] == False:
+                    num_q += 1
+                else:
+                    num_moot += 1
             if num_q > 0:
                 url_prefix = settings.APP_URL
                 subject = _('email update message subject')
@@ -113,17 +152,30 @@ class Command(NoArgsCommand):
                                 % {'num':num_q, 'name':user.username}
 
                 text += '<ul>'
-                for q, act in q_list.items():
+                for q, meta_data in q_list.items():
                     act_list = []
-                    if act['new_q']:
-                        act_list.append(_('new question'))
-                    self.__act_count('%(num)d rev', act['q_rev'],act_list)
-                    self.__act_count('%(num)d ans', act['new_ans'],act_list)
-                    self.__act_count('%(num)d ans rev',act['ans_rev'],act_list)
-                    act_token = ', '.join(act_list)
-                    text += '<li><a href="%s?sort=latest">%s</a> <font color="#777777">(%s)</font></li>' \
-                                % (url_prefix + q.get_absolute_url(), q.title, act_token)
+                    if meta_data['nothing_new']:
+                        continue
+                    else:
+                        if meta_data['new_q']:
+                            act_list.append(_('new question'))
+                        self.__action_count('%(num)d rev', meta_data['q_rev'],act_list)
+                        self.__action_count('%(num)d ans', meta_data['new_ans'],act_list)
+                        self.__action_count('%(num)d ans rev',meta_data['ans_rev'],act_list)
+                        act_token = ', '.join(act_list)
+                        text += '<li><a href="%s?sort=latest">%s</a> <font color="#777777">(%s)</font></li>' \
+                                    % (url_prefix + q.get_absolute_url(), q.title, act_token)
                 text += '</ul>'
+                if num_moot > 0:
+                    text += '<p></p>'
+                    text += ungettext('There is also one question which was recently '\
+                                +'updated but you might not have seen its latest version.',
+                            'There are also %(num)d more questions which were recently updated '\
+                            +'but you might not have seen their latest version.',num_moot) \
+                                % {'num':num_moot,}
+                    text += _('Perhaps you could look up previously sent forum reminders in your mailbox.')
+                    text += '</p>'
+
                 link = url_prefix + user.get_profile_url() + '?sort=email_subscriptions'
                 text += _('go to %(link)s to change frequency of email updates or %(email)s administrator') \
                                 % {'link':link, 'email':settings.ADMINS[0][1]}
diff --git a/forum/views.py b/forum/views.py
index a1b37717..d9d87e02 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1130,6 +1130,7 @@ def edit_user(request, id):
             from django_authopenid.views import set_new_email
             set_new_email(user, new_email)
 
+            user.username = sanitize_html(form.cleaned_data['username'])
             user.real_name = sanitize_html(form.cleaned_data['realname'])
             user.website = sanitize_html(form.cleaned_data['website'])
             user.location = sanitize_html(form.cleaned_data['city'])
@@ -1529,7 +1530,7 @@ def user_responses(request, user_id, user_view):
         def __init__(self, type, title, question_id, answer_id, time, username, user_id, content):
             self.type = type
             self.title = title
-            self.titlelink = reverse('questions') + u'%s/%s#%s' % (question_id, title, answer_id)
+            self.titlelink = reverse('question', args=[question_id]) + u'%s#%s' % (slugify(title), answer_id)
             self.time = time
             self.userlink = reverse('users') + u'%s/%s/' % (user_id, username)
             self.username = username
diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index d2356abc..96e107c8 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -57,7 +57,7 @@ var i18nZh = {
 };
 
 var i18nEn = {
-    '/':'/',
+    '/':'/forum/',
 	'need >15 points to report spam':'need >15 points to report spam ',
     '>15 points requried to upvote':'>15 points required to upvote ',
 	'tags cannot be empty':'please enter at least one tag',
diff --git a/templates/question_edit.html b/templates/question_edit.html
index d6728caf..8ce980fe 100644
--- a/templates/question_edit.html
+++ b/templates/question_edit.html
@@ -22,7 +22,7 @@
                              
             //toggle preview of editor
             var display = true;
-            var txt = "[{% trans "hide preview"}%]";
+            var txt = "[{% trans "hide preview" %}]";
             $('#pre-collapse').text(txt);
             $('#pre-collapse').bind('click', function(){
                 txt = display ? "[{% trans "show preview" %}]" : "[{% trans "hide preview" %}]";
diff --git a/templates/user_edit.html b/templates/user_edit.html
index 051d6537..5886c071 100644
--- a/templates/user_edit.html
+++ b/templates/user_edit.html
@@ -39,6 +39,10 @@
                     <th width="100px"></th>
                     <th></th>
                 </tr>
+                <tr style="height:35px">
+	            	<td>{{ form.username.label_tag }}:</td>
+	            	<td>{{ form.username }} <span class="form-error"></span> {{ form.username.errors }} </td>
+	            </tr>
                 
 	            <tr style="height:35px">
 	            	<td>{{ form.email.label_tag }}:</td>
diff --git a/templates/user_votes.html b/templates/user_votes.html
index b72b3ef6..94d7fcbd 100644
--- a/templates/user_votes.html
+++ b/templates/user_votes.html
@@ -19,9 +19,9 @@
                 </div>
                 <div style="float:left;overflow:hidden;width:750px">
                     {% ifequal vote.answer_id 0 %}
-                    <span class="question-title-link"><a href="{% url question vote.question_id %}/{{ vote.title|slugify }}">{{ vote.title }}</a></span>
+                    <span class="question-title-link"><a href="{% url question vote.question_id %}{{ vote.title|slugify }}">{{ vote.title }}</a></span>
                     {% else %}
-                    <span class="answer-title-link" ><a href="{% url question vote.question_id %}/{{ vote.title|slugify }}#{{ vote.answer_id }}">{{ vote.title }}</a></span>
+                    <span class="answer-title-link" ><a href="{% url question vote.question_id %}{{ vote.title|slugify }}#{{ vote.answer_id }}">{{ vote.title }}</a></span>
                     {% endifequal %}
                     <div style="height:5px"></div>
                 </div>          
diff --git a/utils/odict.py b/utils/odict.py
new file mode 100644
index 00000000..2c8391d7
--- /dev/null
+++ b/utils/odict.py
@@ -0,0 +1,1399 @@
+# odict.py
+# An Ordered Dictionary object
+# Copyright (C) 2005 Nicola Larosa, Michael Foord
+# E-mail: nico AT tekNico DOT net, fuzzyman AT voidspace DOT org DOT uk
+
+# This software is licensed under the terms of the BSD license.
+# http://www.voidspace.org.uk/python/license.shtml
+# Basically you're free to copy, modify, distribute and relicense it,
+# So long as you keep a copy of the license with it.
+
+# Documentation at http://www.voidspace.org.uk/python/odict.html
+# For information about bugfixes, updates and support, please join the
+# Pythonutils mailing list:
+# http://groups.google.com/group/pythonutils/
+# Comments, suggestions and bug reports welcome.
+
+"""A dict that keeps keys in insertion order"""
+from __future__ import generators
+
+__author__ = ('Nicola Larosa <nico-NoSp@m-tekNico.net>,'
+    'Michael Foord <fuzzyman AT voidspace DOT org DOT uk>')
+
+__docformat__ = "restructuredtext en"
+
+__revision__ = '$Id: odict.py 129 2005-09-12 18:15:28Z teknico $'
+
+__version__ = '0.2.2'
+
+__all__ = ['OrderedDict', 'SequenceOrderedDict']
+
+import sys
+INTP_VER = sys.version_info[:2]
+if INTP_VER < (2, 2):
+    raise RuntimeError("Python v.2.2 or later required")
+
+import types, warnings
+
+class OrderedDict(dict):
+    """
+    A class of dictionary that keeps the insertion order of keys.
+    
+    All appropriate methods return keys, items, or values in an ordered way.
+    
+    All normal dictionary methods are available. Update and comparison is
+    restricted to other OrderedDict objects.
+    
+    Various sequence methods are available, including the ability to explicitly
+    mutate the key ordering.
+    
+    __contains__ tests:
+    
+    >>> d = OrderedDict(((1, 3),))
+    >>> 1 in d
+    1
+    >>> 4 in d
+    0
+    
+    __getitem__ tests:
+    
+    >>> OrderedDict(((1, 3), (3, 2), (2, 1)))[2]
+    1
+    >>> OrderedDict(((1, 3), (3, 2), (2, 1)))[4]
+    Traceback (most recent call last):
+    KeyError: 4
+    
+    __len__ tests:
+    
+    >>> len(OrderedDict())
+    0
+    >>> len(OrderedDict(((1, 3), (3, 2), (2, 1))))
+    3
+    
+    get tests:
+    
+    >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+    >>> d.get(1)
+    3
+    >>> d.get(4) is None
+    1
+    >>> d.get(4, 5)
+    5
+    >>> d
+    OrderedDict([(1, 3), (3, 2), (2, 1)])
+    
+    has_key tests:
+    
+    >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+    >>> d.has_key(1)
+    1
+    >>> d.has_key(4)
+    0
+    """
+
+    def __init__(self, init_val=(), strict=False):
+        """
+        Create a new ordered dictionary. Cannot init from a normal dict,
+        nor from kwargs, since items order is undefined in those cases.
+        
+        If the ``strict`` keyword argument is ``True`` (``False`` is the
+        default) then when doing slice assignment - the ``OrderedDict`` you are
+        assigning from *must not* contain any keys in the remaining dict.
+        
+        >>> OrderedDict()
+        OrderedDict([])
+        >>> OrderedDict({1: 1})
+        Traceback (most recent call last):
+        TypeError: undefined order, cannot get items from dict
+        >>> OrderedDict({1: 1}.items())
+        OrderedDict([(1, 1)])
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d
+        OrderedDict([(1, 3), (3, 2), (2, 1)])
+        >>> OrderedDict(d)
+        OrderedDict([(1, 3), (3, 2), (2, 1)])
+        """
+        self.strict = strict
+        dict.__init__(self)
+        if isinstance(init_val, OrderedDict):
+            self._sequence = init_val.keys()
+            dict.update(self, init_val)
+        elif isinstance(init_val, dict):
+            # we lose compatibility with other ordered dict types this way
+            raise TypeError('undefined order, cannot get items from dict')
+        else:
+            self._sequence = []
+            self.update(init_val)
+
+### Special methods ###
+
+    def __delitem__(self, key):
+        """
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> del d[3]
+        >>> d
+        OrderedDict([(1, 3), (2, 1)])
+        >>> del d[3]
+        Traceback (most recent call last):
+        KeyError: 3
+        >>> d[3] = 2
+        >>> d
+        OrderedDict([(1, 3), (2, 1), (3, 2)])
+        >>> del d[0:1]
+        >>> d
+        OrderedDict([(2, 1), (3, 2)])
+        """
+        if isinstance(key, types.SliceType):
+            # FIXME: efficiency?
+            keys = self._sequence[key]
+            for entry in keys:
+                dict.__delitem__(self, entry)
+            del self._sequence[key]
+        else:
+            # do the dict.__delitem__ *first* as it raises
+            # the more appropriate error
+            dict.__delitem__(self, key)
+            self._sequence.remove(key)
+
+    def __eq__(self, other):
+        """
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d == OrderedDict(d)
+        True
+        >>> d == OrderedDict(((1, 3), (2, 1), (3, 2)))
+        False
+        >>> d == OrderedDict(((1, 0), (3, 2), (2, 1)))
+        False
+        >>> d == OrderedDict(((0, 3), (3, 2), (2, 1)))
+        False
+        >>> d == dict(d)
+        False
+        >>> d == False
+        False
+        """
+        if isinstance(other, OrderedDict):
+            # FIXME: efficiency?
+            #   Generate both item lists for each compare
+            return (self.items() == other.items())
+        else:
+            return False
+
+    def __lt__(self, other):
+        """
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> c = OrderedDict(((0, 3), (3, 2), (2, 1)))
+        >>> c < d
+        True
+        >>> d < c
+        False
+        >>> d < dict(c)
+        Traceback (most recent call last):
+        TypeError: Can only compare with other OrderedDicts
+        """
+        if not isinstance(other, OrderedDict):
+            raise TypeError('Can only compare with other OrderedDicts')
+        # FIXME: efficiency?
+        #   Generate both item lists for each compare
+        return (self.items() < other.items())
+
+    def __le__(self, other):
+        """
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> c = OrderedDict(((0, 3), (3, 2), (2, 1)))
+        >>> e = OrderedDict(d)
+        >>> c <= d
+        True
+        >>> d <= c
+        False
+        >>> d <= dict(c)
+        Traceback (most recent call last):
+        TypeError: Can only compare with other OrderedDicts
+        >>> d <= e
+        True
+        """
+        if not isinstance(other, OrderedDict):
+            raise TypeError('Can only compare with other OrderedDicts')
+        # FIXME: efficiency?
+        #   Generate both item lists for each compare
+        return (self.items() <= other.items())
+
+    def __ne__(self, other):
+        """
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d != OrderedDict(d)
+        False
+        >>> d != OrderedDict(((1, 3), (2, 1), (3, 2)))
+        True
+        >>> d != OrderedDict(((1, 0), (3, 2), (2, 1)))
+        True
+        >>> d == OrderedDict(((0, 3), (3, 2), (2, 1)))
+        False
+        >>> d != dict(d)
+        True
+        >>> d != False
+        True
+        """
+        if isinstance(other, OrderedDict):
+            # FIXME: efficiency?
+            #   Generate both item lists for each compare
+            return not (self.items() == other.items())
+        else:
+            return True
+
+    def __gt__(self, other):
+        """
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> c = OrderedDict(((0, 3), (3, 2), (2, 1)))
+        >>> d > c
+        True
+        >>> c > d
+        False
+        >>> d > dict(c)
+        Traceback (most recent call last):
+        TypeError: Can only compare with other OrderedDicts
+        """
+        if not isinstance(other, OrderedDict):
+            raise TypeError('Can only compare with other OrderedDicts')
+        # FIXME: efficiency?
+        #   Generate both item lists for each compare
+        return (self.items() > other.items())
+
+    def __ge__(self, other):
+        """
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> c = OrderedDict(((0, 3), (3, 2), (2, 1)))
+        >>> e = OrderedDict(d)
+        >>> c >= d
+        False
+        >>> d >= c
+        True
+        >>> d >= dict(c)
+        Traceback (most recent call last):
+        TypeError: Can only compare with other OrderedDicts
+        >>> e >= d
+        True
+        """
+        if not isinstance(other, OrderedDict):
+            raise TypeError('Can only compare with other OrderedDicts')
+        # FIXME: efficiency?
+        #   Generate both item lists for each compare
+        return (self.items() >= other.items())
+
+    def __repr__(self):
+        """
+        Used for __repr__ and __str__
+        
+        >>> r1 = repr(OrderedDict((('a', 'b'), ('c', 'd'), ('e', 'f'))))
+        >>> r1
+        "OrderedDict([('a', 'b'), ('c', 'd'), ('e', 'f')])"
+        >>> r2 = repr(OrderedDict((('a', 'b'), ('e', 'f'), ('c', 'd'))))
+        >>> r2
+        "OrderedDict([('a', 'b'), ('e', 'f'), ('c', 'd')])"
+        >>> r1 == str(OrderedDict((('a', 'b'), ('c', 'd'), ('e', 'f'))))
+        True
+        >>> r2 == str(OrderedDict((('a', 'b'), ('e', 'f'), ('c', 'd'))))
+        True
+        """
+        return '%s([%s])' % (self.__class__.__name__, ', '.join(
+            ['(%r, %r)' % (key, self[key]) for key in self._sequence]))
+
+    def __setitem__(self, key, val):
+        """
+        Allows slice assignment, so long as the slice is an OrderedDict
+        >>> d = OrderedDict()
+        >>> d['a'] = 'b'
+        >>> d['b'] = 'a'
+        >>> d[3] = 12
+        >>> d
+        OrderedDict([('a', 'b'), ('b', 'a'), (3, 12)])
+        >>> d[:] = OrderedDict(((1, 2), (2, 3), (3, 4)))
+        >>> d
+        OrderedDict([(1, 2), (2, 3), (3, 4)])
+        >>> d[::2] = OrderedDict(((7, 8), (9, 10)))
+        >>> d
+        OrderedDict([(7, 8), (2, 3), (9, 10)])
+        >>> d = OrderedDict(((0, 1), (1, 2), (2, 3), (3, 4)))
+        >>> d[1:3] = OrderedDict(((1, 2), (5, 6), (7, 8)))
+        >>> d
+        OrderedDict([(0, 1), (1, 2), (5, 6), (7, 8), (3, 4)])
+        >>> d = OrderedDict(((0, 1), (1, 2), (2, 3), (3, 4)), strict=True)
+        >>> d[1:3] = OrderedDict(((1, 2), (5, 6), (7, 8)))
+        >>> d
+        OrderedDict([(0, 1), (1, 2), (5, 6), (7, 8), (3, 4)])
+        
+        >>> a = OrderedDict(((0, 1), (1, 2), (2, 3)), strict=True)
+        >>> a[3] = 4
+        >>> a
+        OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4)])
+        >>> a[::1] = OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4)])
+        >>> a
+        OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4)])
+        >>> a[:2] = OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4), (4, 5)])
+        Traceback (most recent call last):
+        ValueError: slice assignment must be from unique keys
+        >>> a = OrderedDict(((0, 1), (1, 2), (2, 3)))
+        >>> a[3] = 4
+        >>> a
+        OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4)])
+        >>> a[::1] = OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4)])
+        >>> a
+        OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4)])
+        >>> a[:2] = OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4)])
+        >>> a
+        OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4)])
+        >>> a[::-1] = OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4)])
+        >>> a
+        OrderedDict([(3, 4), (2, 3), (1, 2), (0, 1)])
+        
+        >>> d = OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4)])
+        >>> d[:1] = 3
+        Traceback (most recent call last):
+        TypeError: slice assignment requires an OrderedDict
+        
+        >>> d = OrderedDict([(0, 1), (1, 2), (2, 3), (3, 4)])
+        >>> d[:1] = OrderedDict([(9, 8)])
+        >>> d
+        OrderedDict([(9, 8), (1, 2), (2, 3), (3, 4)])
+        """
+        if isinstance(key, types.SliceType):
+            if not isinstance(val, OrderedDict):
+                # FIXME: allow a list of tuples?
+                raise TypeError('slice assignment requires an OrderedDict')
+            keys = self._sequence[key]
+            # NOTE: Could use ``range(*key.indices(len(self._sequence)))``
+            indexes = range(len(self._sequence))[key]
+            if key.step is None:
+                # NOTE: new slice may not be the same size as the one being
+                #   overwritten !
+                # NOTE: What is the algorithm for an impossible slice?
+                #   e.g. d[5:3]
+                pos = key.start or 0
+                del self[key]
+                newkeys = val.keys()
+                for k in newkeys:
+                    if k in self:
+                        if self.strict:
+                            raise ValueError('slice assignment must be from '
+                                'unique keys')
+                        else:
+                            # NOTE: This removes duplicate keys *first*
+                            #   so start position might have changed?
+                            del self[k]
+                self._sequence = (self._sequence[:pos] + newkeys +
+                    self._sequence[pos:])
+                dict.update(self, val)
+            else:
+                # extended slice - length of new slice must be the same
+                # as the one being replaced
+                if len(keys) != len(val):
+                    raise ValueError('attempt to assign sequence of size %s '
+                        'to extended slice of size %s' % (len(val), len(keys)))
+                # FIXME: efficiency?
+                del self[key]
+                item_list = zip(indexes, val.items())
+                # smallest indexes first - higher indexes not guaranteed to
+                # exist
+                item_list.sort()
+                for pos, (newkey, newval) in item_list:
+                    if self.strict and newkey in self:
+                        raise ValueError('slice assignment must be from unique'
+                            ' keys')
+                    self.insert(pos, newkey, newval)
+        else:
+            if key not in self:
+                self._sequence.append(key)
+            dict.__setitem__(self, key, val)
+
+    def __getitem__(self, key):
+        """
+        Allows slicing. Returns an OrderedDict if you slice.
+        >>> b = OrderedDict([(7, 0), (6, 1), (5, 2), (4, 3), (3, 4), (2, 5), (1, 6)])
+        >>> b[::-1]
+        OrderedDict([(1, 6), (2, 5), (3, 4), (4, 3), (5, 2), (6, 1), (7, 0)])
+        >>> b[2:5]
+        OrderedDict([(5, 2), (4, 3), (3, 4)])
+        >>> type(b[2:4])
+        <class '__main__.OrderedDict'>
+        """
+        if isinstance(key, types.SliceType):
+            # FIXME: does this raise the error we want?
+            keys = self._sequence[key]
+            # FIXME: efficiency?
+            return OrderedDict([(entry, self[entry]) for entry in keys])
+        else:
+            return dict.__getitem__(self, key)
+
+    __str__ = __repr__
+
+    def __setattr__(self, name, value):
+        """
+        Implemented so that accesses to ``sequence`` raise a warning and are
+        diverted to the new ``setkeys`` method.
+        """
+        if name == 'sequence':
+            warnings.warn('Use of the sequence attribute is deprecated.'
+                ' Use the keys method instead.', DeprecationWarning)
+            # NOTE: doesn't return anything
+            self.setkeys(value)
+        else:
+            # FIXME: do we want to allow arbitrary setting of attributes?
+            #   Or do we want to manage it?
+            object.__setattr__(self, name, value)
+
+    def __getattr__(self, name):
+        """
+        Implemented so that access to ``sequence`` raises a warning.
+        
+        >>> d = OrderedDict()
+        >>> d.sequence
+        []
+        """
+        if name == 'sequence':
+            warnings.warn('Use of the sequence attribute is deprecated.'
+                ' Use the keys method instead.', DeprecationWarning)
+            # NOTE: Still (currently) returns a direct reference. Need to
+            #   because code that uses sequence will expect to be able to
+            #   mutate it in place.
+            return self._sequence
+        else:
+            # raise the appropriate error
+            raise AttributeError("OrderedDict has no '%s' attribute" % name)
+
+    def __deepcopy__(self, memo):
+        """
+        To allow deepcopy to work with OrderedDict.
+        
+        >>> from copy import deepcopy
+        >>> a = OrderedDict([(1, 1), (2, 2), (3, 3)])
+        >>> a['test'] = {}
+        >>> b = deepcopy(a)
+        >>> b == a
+        True
+        >>> b is a
+        False
+        >>> a['test'] is b['test']
+        False
+        """
+        from copy import deepcopy
+        return self.__class__(deepcopy(self.items(), memo), self.strict)
+
+
+### Read-only methods ###
+
+    def copy(self):
+        """
+        >>> OrderedDict(((1, 3), (3, 2), (2, 1))).copy()
+        OrderedDict([(1, 3), (3, 2), (2, 1)])
+        """
+        return OrderedDict(self)
+
+    def items(self):
+        """
+        ``items`` returns a list of tuples representing all the 
+        ``(key, value)`` pairs in the dictionary.
+        
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.items()
+        [(1, 3), (3, 2), (2, 1)]
+        >>> d.clear()
+        >>> d.items()
+        []
+        """
+        return zip(self._sequence, self.values())
+
+    def keys(self):
+        """
+        Return a list of keys in the ``OrderedDict``.
+        
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.keys()
+        [1, 3, 2]
+        """
+        return self._sequence[:]
+
+    def values(self, values=None):
+        """
+        Return a list of all the values in the OrderedDict.
+        
+        Optionally you can pass in a list of values, which will replace the
+        current list. The value list must be the same len as the OrderedDict.
+        
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.values()
+        [3, 2, 1]
+        """
+        return [self[key] for key in self._sequence]
+
+    def iteritems(self):
+        """
+        >>> ii = OrderedDict(((1, 3), (3, 2), (2, 1))).iteritems()
+        >>> ii.next()
+        (1, 3)
+        >>> ii.next()
+        (3, 2)
+        >>> ii.next()
+        (2, 1)
+        >>> ii.next()
+        Traceback (most recent call last):
+        StopIteration
+        """
+        def make_iter(self=self):
+            keys = self.iterkeys()
+            while True:
+                key = keys.next()
+                yield (key, self[key])
+        return make_iter()
+
+    def iterkeys(self):
+        """
+        >>> ii = OrderedDict(((1, 3), (3, 2), (2, 1))).iterkeys()
+        >>> ii.next()
+        1
+        >>> ii.next()
+        3
+        >>> ii.next()
+        2
+        >>> ii.next()
+        Traceback (most recent call last):
+        StopIteration
+        """
+        return iter(self._sequence)
+
+    __iter__ = iterkeys
+
+    def itervalues(self):
+        """
+        >>> iv = OrderedDict(((1, 3), (3, 2), (2, 1))).itervalues()
+        >>> iv.next()
+        3
+        >>> iv.next()
+        2
+        >>> iv.next()
+        1
+        >>> iv.next()
+        Traceback (most recent call last):
+        StopIteration
+        """
+        def make_iter(self=self):
+            keys = self.iterkeys()
+            while True:
+                yield self[keys.next()]
+        return make_iter()
+
+### Read-write methods ###
+
+    def clear(self):
+        """
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.clear()
+        >>> d
+        OrderedDict([])
+        """
+        dict.clear(self)
+        self._sequence = []
+
+    def pop(self, key, *args):
+        """
+        No dict.pop in Python 2.2, gotta reimplement it
+        
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.pop(3)
+        2
+        >>> d
+        OrderedDict([(1, 3), (2, 1)])
+        >>> d.pop(4)
+        Traceback (most recent call last):
+        KeyError: 4
+        >>> d.pop(4, 0)
+        0
+        >>> d.pop(4, 0, 1)
+        Traceback (most recent call last):
+        TypeError: pop expected at most 2 arguments, got 3
+        """
+        if len(args) > 1:
+            raise TypeError, ('pop expected at most 2 arguments, got %s' %
+                (len(args) + 1))
+        if key in self:
+            val = self[key]
+            del self[key]
+        else:
+            try:
+                val = args[0]
+            except IndexError:
+                raise KeyError(key)
+        return val
+
+    def popitem(self, i=-1):
+        """
+        Delete and return an item specified by index, not a random one as in
+        dict. The index is -1 by default (the last item).
+        
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.popitem()
+        (2, 1)
+        >>> d
+        OrderedDict([(1, 3), (3, 2)])
+        >>> d.popitem(0)
+        (1, 3)
+        >>> OrderedDict().popitem()
+        Traceback (most recent call last):
+        KeyError: 'popitem(): dictionary is empty'
+        >>> d.popitem(2)
+        Traceback (most recent call last):
+        IndexError: popitem(): index 2 not valid
+        """
+        if not self._sequence:
+            raise KeyError('popitem(): dictionary is empty')
+        try:
+            key = self._sequence[i]
+        except IndexError:
+            raise IndexError('popitem(): index %s not valid' % i)
+        return (key, self.pop(key))
+
+    def setdefault(self, key, defval = None):
+        """
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.setdefault(1)
+        3
+        >>> d.setdefault(4) is None
+        True
+        >>> d
+        OrderedDict([(1, 3), (3, 2), (2, 1), (4, None)])
+        >>> d.setdefault(5, 0)
+        0
+        >>> d
+        OrderedDict([(1, 3), (3, 2), (2, 1), (4, None), (5, 0)])
+        """
+        if key in self:
+            return self[key]
+        else:
+            self[key] = defval
+            return defval
+
+    def update(self, from_od):
+        """
+        Update from another OrderedDict or sequence of (key, value) pairs
+        
+        >>> d = OrderedDict(((1, 0), (0, 1)))
+        >>> d.update(OrderedDict(((1, 3), (3, 2), (2, 1))))
+        >>> d
+        OrderedDict([(1, 3), (0, 1), (3, 2), (2, 1)])
+        >>> d.update({4: 4})
+        Traceback (most recent call last):
+        TypeError: undefined order, cannot get items from dict
+        >>> d.update((4, 4))
+        Traceback (most recent call last):
+        TypeError: cannot convert dictionary update sequence element "4" to a 2-item sequence
+        """
+        if isinstance(from_od, OrderedDict):
+            for key, val in from_od.items():
+                self[key] = val
+        elif isinstance(from_od, dict):
+            # we lose compatibility with other ordered dict types this way
+            raise TypeError('undefined order, cannot get items from dict')
+        else:
+            # FIXME: efficiency?
+            # sequence of 2-item sequences, or error
+            for item in from_od:
+                try:
+                    key, val = item
+                except TypeError:
+                    raise TypeError('cannot convert dictionary update'
+                        ' sequence element "%s" to a 2-item sequence' % item)
+                self[key] = val
+
+    def rename(self, old_key, new_key):
+        """
+        Rename the key for a given value, without modifying sequence order.
+        
+        For the case where new_key already exists this raise an exception,
+        since if new_key exists, it is ambiguous as to what happens to the
+        associated values, and the position of new_key in the sequence.
+        
+        >>> od = OrderedDict()
+        >>> od['a'] = 1
+        >>> od['b'] = 2
+        >>> od.items()
+        [('a', 1), ('b', 2)]
+        >>> od.rename('b', 'c')
+        >>> od.items()
+        [('a', 1), ('c', 2)]
+        >>> od.rename('c', 'a')
+        Traceback (most recent call last):
+        ValueError: New key already exists: 'a'
+        >>> od.rename('d', 'b')
+        Traceback (most recent call last):
+        KeyError: 'd'
+        """
+        if new_key == old_key:
+            # no-op
+            return
+        if new_key in self:
+            raise ValueError("New key already exists: %r" % new_key)
+        # rename sequence entry
+        value = self[old_key] 
+        old_idx = self._sequence.index(old_key)
+        self._sequence[old_idx] = new_key
+        # rename internal dict entry
+        dict.__delitem__(self, old_key)
+        dict.__setitem__(self, new_key, value)
+
+    def setitems(self, items):
+        """
+        This method allows you to set the items in the dict.
+        
+        It takes a list of tuples - of the same sort returned by the ``items``
+        method.
+        
+        >>> d = OrderedDict()
+        >>> d.setitems(((3, 1), (2, 3), (1, 2)))
+        >>> d
+        OrderedDict([(3, 1), (2, 3), (1, 2)])
+        """
+        self.clear()
+        # FIXME: this allows you to pass in an OrderedDict as well :-)
+        self.update(items)
+
+    def setkeys(self, keys):
+        """
+        ``setkeys`` all ows you to pass in a new list of keys which will
+        replace the current set. This must contain the same set of keys, but
+        need not be in the same order.
+        
+        If you pass in new keys that don't match, a ``KeyError`` will be
+        raised.
+        
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.keys()
+        [1, 3, 2]
+        >>> d.setkeys((1, 2, 3))
+        >>> d
+        OrderedDict([(1, 3), (2, 1), (3, 2)])
+        >>> d.setkeys(['a', 'b', 'c'])
+        Traceback (most recent call last):
+        KeyError: 'Keylist is not the same as current keylist.'
+        """
+        # FIXME: Efficiency? (use set for Python 2.4 :-)
+        # NOTE: list(keys) rather than keys[:] because keys[:] returns
+        #   a tuple, if keys is a tuple.
+        kcopy = list(keys)
+        kcopy.sort()
+        self._sequence.sort()
+        if kcopy != self._sequence:
+            raise KeyError('Keylist is not the same as current keylist.')
+        # NOTE: This makes the _sequence attribute a new object, instead
+        #       of changing it in place.
+        # FIXME: efficiency?
+        self._sequence = list(keys)
+
+    def setvalues(self, values):
+        """
+        You can pass in a list of values, which will replace the
+        current list. The value list must be the same len as the OrderedDict.
+        
+        (Or a ``ValueError`` is raised.)
+        
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.setvalues((1, 2, 3))
+        >>> d
+        OrderedDict([(1, 1), (3, 2), (2, 3)])
+        >>> d.setvalues([6])
+        Traceback (most recent call last):
+        ValueError: Value list is not the same length as the OrderedDict.
+        """
+        if len(values) != len(self):
+            # FIXME: correct error to raise?
+            raise ValueError('Value list is not the same length as the '
+                'OrderedDict.')
+        self.update(zip(self, values))
+
+### Sequence Methods ###
+
+    def index(self, key):
+        """
+        Return the position of the specified key in the OrderedDict.
+        
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.index(3)
+        1
+        >>> d.index(4)
+        Traceback (most recent call last):
+        ValueError: list.index(x): x not in list
+        """
+        return self._sequence.index(key)
+
+    def insert(self, index, key, value):
+        """
+        Takes ``index``, ``key``, and ``value`` as arguments.
+        
+        Sets ``key`` to ``value``, so that ``key`` is at position ``index`` in
+        the OrderedDict.
+        
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.insert(0, 4, 0)
+        >>> d
+        OrderedDict([(4, 0), (1, 3), (3, 2), (2, 1)])
+        >>> d.insert(0, 2, 1)
+        >>> d
+        OrderedDict([(2, 1), (4, 0), (1, 3), (3, 2)])
+        >>> d.insert(8, 8, 1)
+        >>> d
+        OrderedDict([(2, 1), (4, 0), (1, 3), (3, 2), (8, 1)])
+        """
+        if key in self:
+            # FIXME: efficiency?
+            del self[key]
+        self._sequence.insert(index, key)
+        dict.__setitem__(self, key, value)
+
+    def reverse(self):
+        """
+        Reverse the order of the OrderedDict.
+        
+        >>> d = OrderedDict(((1, 3), (3, 2), (2, 1)))
+        >>> d.reverse()
+        >>> d
+        OrderedDict([(2, 1), (3, 2), (1, 3)])
+        """
+        self._sequence.reverse()
+
+    def sort(self, *args, **kwargs):
+        """
+        Sort the key order in the OrderedDict.
+        
+        This method takes the same arguments as the ``list.sort`` method on
+        your version of Python.
+        
+        >>> d = OrderedDict(((4, 1), (2, 2), (3, 3), (1, 4)))
+        >>> d.sort()
+        >>> d
+        OrderedDict([(1, 4), (2, 2), (3, 3), (4, 1)])
+        """
+        self._sequence.sort(*args, **kwargs)
+
+class Keys(object):
+    # FIXME: should this object be a subclass of list?
+    """
+    Custom object for accessing the keys of an OrderedDict.
+    
+    Can be called like the normal ``OrderedDict.keys`` method, but also
+    supports indexing and sequence methods.
+    """
+
+    def __init__(self, main):
+        self._main = main
+
+    def __call__(self):
+        """Pretend to be the keys method."""
+        return self._main._keys()
+
+    def __getitem__(self, index):
+        """Fetch the key at position i."""
+        # NOTE: this automatically supports slicing :-)
+        return self._main._sequence[index]
+
+    def __setitem__(self, index, name):
+        """
+        You cannot assign to keys, but you can do slice assignment to re-order
+        them.
+        
+        You can only do slice assignment if the new set of keys is a reordering
+        of the original set.
+        """
+        if isinstance(index, types.SliceType):
+            # FIXME: efficiency?
+            # check length is the same
+            indexes = range(len(self._main._sequence))[index]
+            if len(indexes) != len(name):
+                raise ValueError('attempt to assign sequence of size %s '
+                    'to slice of size %s' % (len(name), len(indexes)))
+            # check they are the same keys
+            # FIXME: Use set
+            old_keys = self._main._sequence[index]
+            new_keys = list(name)
+            old_keys.sort()
+            new_keys.sort()
+            if old_keys != new_keys:
+                raise KeyError('Keylist is not the same as current keylist.')
+            orig_vals = [self._main[k] for k in name]
+            del self._main[index]
+            vals = zip(indexes, name, orig_vals)
+            vals.sort()
+            for i, k, v in vals:
+                if self._main.strict and k in self._main:
+                    raise ValueError('slice assignment must be from '
+                        'unique keys')
+                self._main.insert(i, k, v)
+        else:
+            raise ValueError('Cannot assign to keys')
+
+    ### following methods pinched from UserList and adapted ###
+    def __repr__(self): return repr(self._main._sequence)
+
+    # FIXME: do we need to check if we are comparing with another ``Keys``
+    #   object? (like the __cast method of UserList)
+    def __lt__(self, other): return self._main._sequence <  other
+    def __le__(self, other): return self._main._sequence <= other
+    def __eq__(self, other): return self._main._sequence == other
+    def __ne__(self, other): return self._main._sequence != other
+    def __gt__(self, other): return self._main._sequence >  other
+    def __ge__(self, other): return self._main._sequence >= other
+    # FIXME: do we need __cmp__ as well as rich comparisons?
+    def __cmp__(self, other): return cmp(self._main._sequence, other)
+
+    def __contains__(self, item): return item in self._main._sequence
+    def __len__(self): return len(self._main._sequence)
+    def __iter__(self): return self._main.iterkeys()
+    def count(self, item): return self._main._sequence.count(item)
+    def index(self, item, *args): return self._main._sequence.index(item, *args)
+    def reverse(self): self._main._sequence.reverse()
+    def sort(self, *args, **kwds): self._main._sequence.sort(*args, **kwds)
+    def __mul__(self, n): return self._main._sequence*n
+    __rmul__ = __mul__
+    def __add__(self, other): return self._main._sequence + other
+    def __radd__(self, other): return other + self._main._sequence
+
+    ## following methods not implemented for keys ##
+    def __delitem__(self, i): raise TypeError('Can\'t delete items from keys')
+    def __iadd__(self, other): raise TypeError('Can\'t add in place to keys')
+    def __imul__(self, n): raise TypeError('Can\'t multiply keys in place')
+    def append(self, item): raise TypeError('Can\'t append items to keys')
+    def insert(self, i, item): raise TypeError('Can\'t insert items into keys')
+    def pop(self, i=-1): raise TypeError('Can\'t pop items from keys')
+    def remove(self, item): raise TypeError('Can\'t remove items from keys')
+    def extend(self, other): raise TypeError('Can\'t extend keys')
+
+class Items(object):
+    """
+    Custom object for accessing the items of an OrderedDict.
+    
+    Can be called like the normal ``OrderedDict.items`` method, but also
+    supports indexing and sequence methods.
+    """
+
+    def __init__(self, main):
+        self._main = main
+
+    def __call__(self):
+        """Pretend to be the items method."""
+        return self._main._items()
+
+    def __getitem__(self, index):
+        """Fetch the item at position i."""
+        if isinstance(index, types.SliceType):
+            # fetching a slice returns an OrderedDict
+            return self._main[index].items()
+        key = self._main._sequence[index]
+        return (key, self._main[key])
+
+    def __setitem__(self, index, item):
+        """Set item at position i to item."""
+        if isinstance(index, types.SliceType):
+            # NOTE: item must be an iterable (list of tuples)
+            self._main[index] = OrderedDict(item)
+        else:
+            # FIXME: Does this raise a sensible error?
+            orig = self._main.keys[index]
+            key, value = item
+            if self._main.strict and key in self and (key != orig):
+                raise ValueError('slice assignment must be from '
+                        'unique keys')
+            # delete the current one
+            del self._main[self._main._sequence[index]]
+            self._main.insert(index, key, value)
+
+    def __delitem__(self, i):
+        """Delete the item at position i."""
+        key = self._main._sequence[i]
+        if isinstance(i, types.SliceType):
+            for k in key:
+                # FIXME: efficiency?
+                del self._main[k]
+        else:
+            del self._main[key]
+
+    ### following methods pinched from UserList and adapted ###
+    def __repr__(self): return repr(self._main.items())
+
+    # FIXME: do we need to check if we are comparing with another ``Items``
+    #   object? (like the __cast method of UserList)
+    def __lt__(self, other): return self._main.items() <  other
+    def __le__(self, other): return self._main.items() <= other
+    def __eq__(self, other): return self._main.items() == other
+    def __ne__(self, other): return self._main.items() != other
+    def __gt__(self, other): return self._main.items() >  other
+    def __ge__(self, other): return self._main.items() >= other
+    def __cmp__(self, other): return cmp(self._main.items(), other)
+
+    def __contains__(self, item): return item in self._main.items()
+    def __len__(self): return len(self._main._sequence) # easier :-)
+    def __iter__(self): return self._main.iteritems()
+    def count(self, item): return self._main.items().count(item)
+    def index(self, item, *args): return self._main.items().index(item, *args)
+    def reverse(self): self._main.reverse()
+    def sort(self, *args, **kwds): self._main.sort(*args, **kwds)
+    def __mul__(self, n): return self._main.items()*n
+    __rmul__ = __mul__
+    def __add__(self, other): return self._main.items() + other
+    def __radd__(self, other): return other + self._main.items()
+
+    def append(self, item):
+        """Add an item to the end."""
+        # FIXME: this is only append if the key isn't already present
+        key, value = item
+        self._main[key] = value
+
+    def insert(self, i, item):
+        key, value = item
+        self._main.insert(i, key, value)
+
+    def pop(self, i=-1):
+        key = self._main._sequence[i]
+        return (key, self._main.pop(key))
+
+    def remove(self, item):
+        key, value = item
+        try:
+            assert value == self._main[key]
+        except (KeyError, AssertionError):
+            raise ValueError('ValueError: list.remove(x): x not in list')
+        else:
+            del self._main[key]
+
+    def extend(self, other):
+        # FIXME: is only a true extend if none of the keys already present
+        for item in other:
+            key, value = item
+            self._main[key] = value
+
+    def __iadd__(self, other):
+        self.extend(other)
+
+    ## following methods not implemented for items ##
+
+    def __imul__(self, n): raise TypeError('Can\'t multiply items in place')
+
+class Values(object):
+    """
+    Custom object for accessing the values of an OrderedDict.
+    
+    Can be called like the normal ``OrderedDict.values`` method, but also
+    supports indexing and sequence methods.
+    """
+
+    def __init__(self, main):
+        self._main = main
+
+    def __call__(self):
+        """Pretend to be the values method."""
+        return self._main._values()
+
+    def __getitem__(self, index):
+        """Fetch the value at position i."""
+        if isinstance(index, types.SliceType):
+            return [self._main[key] for key in self._main._sequence[index]]
+        else:
+            return self._main[self._main._sequence[index]]
+
+    def __setitem__(self, index, value):
+        """
+        Set the value at position i to value.
+        
+        You can only do slice assignment to values if you supply a sequence of
+        equal length to the slice you are replacing.
+        """
+        if isinstance(index, types.SliceType):
+            keys = self._main._sequence[index]
+            if len(keys) != len(value):
+                raise ValueError('attempt to assign sequence of size %s '
+                    'to slice of size %s' % (len(name), len(keys)))
+            # FIXME: efficiency?  Would be better to calculate the indexes
+            #   directly from the slice object
+            # NOTE: the new keys can collide with existing keys (or even
+            #   contain duplicates) - these will overwrite
+            for key, val in zip(keys, value):
+                self._main[key] = val
+        else:
+            self._main[self._main._sequence[index]] = value
+
+    ### following methods pinched from UserList and adapted ###
+    def __repr__(self): return repr(self._main.values())
+
+    # FIXME: do we need to check if we are comparing with another ``Values``
+    #   object? (like the __cast method of UserList)
+    def __lt__(self, other): return self._main.values() <  other
+    def __le__(self, other): return self._main.values() <= other
+    def __eq__(self, other): return self._main.values() == other
+    def __ne__(self, other): return self._main.values() != other
+    def __gt__(self, other): return self._main.values() >  other
+    def __ge__(self, other): return self._main.values() >= other
+    def __cmp__(self, other): return cmp(self._main.values(), other)
+
+    def __contains__(self, item): return item in self._main.values()
+    def __len__(self): return len(self._main._sequence) # easier :-)
+    def __iter__(self): return self._main.itervalues()
+    def count(self, item): return self._main.values().count(item)
+    def index(self, item, *args): return self._main.values().index(item, *args)
+
+    def reverse(self):
+        """Reverse the values"""
+        vals = self._main.values()
+        vals.reverse()
+        # FIXME: efficiency
+        self[:] = vals
+
+    def sort(self, *args, **kwds):
+        """Sort the values."""
+        vals = self._main.values()
+        vals.sort(*args, **kwds)
+        self[:] = vals
+
+    def __mul__(self, n): return self._main.values()*n
+    __rmul__ = __mul__
+    def __add__(self, other): return self._main.values() + other
+    def __radd__(self, other): return other + self._main.values()
+
+    ## following methods not implemented for values ##
+    def __delitem__(self, i): raise TypeError('Can\'t delete items from values')
+    def __iadd__(self, other): raise TypeError('Can\'t add in place to values')
+    def __imul__(self, n): raise TypeError('Can\'t multiply values in place')
+    def append(self, item): raise TypeError('Can\'t append items to values')
+    def insert(self, i, item): raise TypeError('Can\'t insert items into values')
+    def pop(self, i=-1): raise TypeError('Can\'t pop items from values')
+    def remove(self, item): raise TypeError('Can\'t remove items from values')
+    def extend(self, other): raise TypeError('Can\'t extend values')
+
+class SequenceOrderedDict(OrderedDict):
+    """
+    Experimental version of OrderedDict that has a custom object for ``keys``,
+    ``values``, and ``items``.
+    
+    These are callable sequence objects that work as methods, or can be
+    manipulated directly as sequences.
+    
+    Test for ``keys``, ``items`` and ``values``.
+    
+    >>> d = SequenceOrderedDict(((1, 2), (2, 3), (3, 4)))
+    >>> d
+    SequenceOrderedDict([(1, 2), (2, 3), (3, 4)])
+    >>> d.keys
+    [1, 2, 3]
+    >>> d.keys()
+    [1, 2, 3]
+    >>> d.setkeys((3, 2, 1))
+    >>> d
+    SequenceOrderedDict([(3, 4), (2, 3), (1, 2)])
+    >>> d.setkeys((1, 2, 3))
+    >>> d.keys[0]
+    1
+    >>> d.keys[:]
+    [1, 2, 3]
+    >>> d.keys[-1]
+    3
+    >>> d.keys[-2]
+    2
+    >>> d.keys[0:2] = [2, 1]
+    >>> d
+    SequenceOrderedDict([(2, 3), (1, 2), (3, 4)])
+    >>> d.keys.reverse()
+    >>> d.keys
+    [3, 1, 2]
+    >>> d.keys = [1, 2, 3]
+    >>> d
+    SequenceOrderedDict([(1, 2), (2, 3), (3, 4)])
+    >>> d.keys = [3, 1, 2]
+    >>> d
+    SequenceOrderedDict([(3, 4), (1, 2), (2, 3)])
+    >>> a = SequenceOrderedDict()
+    >>> b = SequenceOrderedDict()
+    >>> a.keys == b.keys
+    1
+    >>> a['a'] = 3
+    >>> a.keys == b.keys
+    0
+    >>> b['a'] = 3
+    >>> a.keys == b.keys
+    1
+    >>> b['b'] = 3
+    >>> a.keys == b.keys
+    0
+    >>> a.keys > b.keys
+    0
+    >>> a.keys < b.keys
+    1
+    >>> 'a' in a.keys
+    1
+    >>> len(b.keys)
+    2
+    >>> 'c' in d.keys
+    0
+    >>> 1 in d.keys
+    1
+    >>> [v for v in d.keys]
+    [3, 1, 2]
+    >>> d.keys.sort()
+    >>> d.keys
+    [1, 2, 3]
+    >>> d = SequenceOrderedDict(((1, 2), (2, 3), (3, 4)), strict=True)
+    >>> d.keys[::-1] = [1, 2, 3]
+    >>> d
+    SequenceOrderedDict([(3, 4), (2, 3), (1, 2)])
+    >>> d.keys[:2]
+    [3, 2]
+    >>> d.keys[:2] = [1, 3]
+    Traceback (most recent call last):
+    KeyError: 'Keylist is not the same as current keylist.'
+
+    >>> d = SequenceOrderedDict(((1, 2), (2, 3), (3, 4)))
+    >>> d
+    SequenceOrderedDict([(1, 2), (2, 3), (3, 4)])
+    >>> d.values
+    [2, 3, 4]
+    >>> d.values()
+    [2, 3, 4]
+    >>> d.setvalues((4, 3, 2))
+    >>> d
+    SequenceOrderedDict([(1, 4), (2, 3), (3, 2)])
+    >>> d.values[::-1]
+    [2, 3, 4]
+    >>> d.values[0]
+    4
+    >>> d.values[-2]
+    3
+    >>> del d.values[0]
+    Traceback (most recent call last):
+    TypeError: Can't delete items from values
+    >>> d.values[::2] = [2, 4]
+    >>> d
+    SequenceOrderedDict([(1, 2), (2, 3), (3, 4)])
+    >>> 7 in d.values
+    0
+    >>> len(d.values)
+    3
+    >>> [val for val in d.values]
+    [2, 3, 4]
+    >>> d.values[-1] = 2
+    >>> d.values.count(2)
+    2
+    >>> d.values.index(2)
+    0
+    >>> d.values[-1] = 7
+    >>> d.values
+    [2, 3, 7]
+    >>> d.values.reverse()
+    >>> d.values
+    [7, 3, 2]
+    >>> d.values.sort()
+    >>> d.values
+    [2, 3, 7]
+    >>> d.values.append('anything')
+    Traceback (most recent call last):
+    TypeError: Can't append items to values
+    >>> d.values = (1, 2, 3)
+    >>> d
+    SequenceOrderedDict([(1, 1), (2, 2), (3, 3)])
+    
+    >>> d = SequenceOrderedDict(((1, 2), (2, 3), (3, 4)))
+    >>> d
+    SequenceOrderedDict([(1, 2), (2, 3), (3, 4)])
+    >>> d.items()
+    [(1, 2), (2, 3), (3, 4)]
+    >>> d.setitems([(3, 4), (2 ,3), (1, 2)])
+    >>> d
+    SequenceOrderedDict([(3, 4), (2, 3), (1, 2)])
+    >>> d.items[0]
+    (3, 4)
+    >>> d.items[:-1]
+    [(3, 4), (2, 3)]
+    >>> d.items[1] = (6, 3)
+    >>> d.items
+    [(3, 4), (6, 3), (1, 2)]
+    >>> d.items[1:2] = [(9, 9)]
+    >>> d
+    SequenceOrderedDict([(3, 4), (9, 9), (1, 2)])
+    >>> del d.items[1:2]
+    >>> d
+    SequenceOrderedDict([(3, 4), (1, 2)])
+    >>> (3, 4) in d.items
+    1
+    >>> (4, 3) in d.items
+    0
+    >>> len(d.items)
+    2
+    >>> [v for v in d.items]
+    [(3, 4), (1, 2)]
+    >>> d.items.count((3, 4))
+    1
+    >>> d.items.index((1, 2))
+    1
+    >>> d.items.index((2, 1))
+    Traceback (most recent call last):
+    ValueError: list.index(x): x not in list
+    >>> d.items.reverse()
+    >>> d.items
+    [(1, 2), (3, 4)]
+    >>> d.items.reverse()
+    >>> d.items.sort()
+    >>> d.items
+    [(1, 2), (3, 4)]
+    >>> d.items.append((5, 6))
+    >>> d.items
+    [(1, 2), (3, 4), (5, 6)]
+    >>> d.items.insert(0, (0, 0))
+    >>> d.items
+    [(0, 0), (1, 2), (3, 4), (5, 6)]
+    >>> d.items.insert(-1, (7, 8))
+    >>> d.items
+    [(0, 0), (1, 2), (3, 4), (7, 8), (5, 6)]
+    >>> d.items.pop()
+    (5, 6)
+    >>> d.items
+    [(0, 0), (1, 2), (3, 4), (7, 8)]
+    >>> d.items.remove((1, 2))
+    >>> d.items
+    [(0, 0), (3, 4), (7, 8)]
+    >>> d.items.extend([(1, 2), (5, 6)])
+    >>> d.items
+    [(0, 0), (3, 4), (7, 8), (1, 2), (5, 6)]
+    """
+
+    def __init__(self, init_val=(), strict=True):
+        OrderedDict.__init__(self, init_val, strict=strict)
+        self._keys = self.keys
+        self._values = self.values
+        self._items = self.items
+        self.keys = Keys(self)
+        self.values = Values(self)
+        self.items = Items(self)
+        self._att_dict = {
+            'keys': self.setkeys,
+            'items': self.setitems,
+            'values': self.setvalues,
+        }
+
+    def __setattr__(self, name, value):
+        """Protect keys, items, and values."""
+        if not '_att_dict' in self.__dict__:
+            object.__setattr__(self, name, value)
+        else:
+            try:
+                fun = self._att_dict[name]
+            except KeyError:
+                OrderedDict.__setattr__(self, name, value)
+            else:
+                fun(value)
+
+if __name__ == '__main__':
+    if INTP_VER < (2, 3):
+        raise RuntimeError("Tests require Python v.2.3 or later")
+    # turn off warnings for tests
+    warnings.filterwarnings('ignore')
+    # run the code tests in doctest format
+    import doctest
+    m = sys.modules.get('__main__')
+    globs = m.__dict__.copy()
+    globs.update({
+        'INTP_VER': INTP_VER,
+    })
+    doctest.testmod(m, globs=globs)
+
-- 
cgit v1.2.3-1-g7c22


From f73deac697a396ac1f0e2fd1e0c831a28c990a74 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Mon, 23 Nov 2009 21:20:23 -0500
Subject: tiny fix in javascript language file

---
 templates/content/js/com.cnprog.i18n.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index 96e107c8..d2356abc 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -57,7 +57,7 @@ var i18nZh = {
 };
 
 var i18nEn = {
-    '/':'/forum/',
+    '/':'/',
 	'need >15 points to report spam':'need >15 points to report spam ',
     '>15 points requried to upvote':'>15 points required to upvote ',
 	'tags cannot be empty':'please enter at least one tag',
-- 
cgit v1.2.3-1-g7c22


From bf3a507acbc253f436ffc51e2cf8b42b707c617b Mon Sep 17 00:00:00 2001
From: root <root@u15356270.onlinehome-server.com>
Date: Wed, 25 Nov 2009 17:15:08 -0500
Subject: fixed error in template and removed ADMINS and DEBUG settings from
 settings.py

---
 cnprog.wsgi                                        |  6 +-
 junk.py                                            |  3 -
 session_messages/.svn/all-wcprops                  | 23 --------
 session_messages/.svn/dir-prop-base                |  6 --
 session_messages/.svn/entries                      | 64 ----------------------
 session_messages/.svn/format                       |  1 -
 .../.svn/text-base/__init__.py.svn-base            | 36 ------------
 .../.svn/text-base/context_processors.py.svn-base  | 48 ----------------
 session_messages/.svn/text-base/models.py.svn-base |  3 -
 settings.py                                        | 12 ----
 settings_local.py.dist                             |  9 +++
 templates/about.html                               |  9 +--
 12 files changed, 15 insertions(+), 205 deletions(-)
 delete mode 100644 junk.py
 delete mode 100644 session_messages/.svn/all-wcprops
 delete mode 100644 session_messages/.svn/dir-prop-base
 delete mode 100644 session_messages/.svn/entries
 delete mode 100644 session_messages/.svn/format
 delete mode 100644 session_messages/.svn/text-base/__init__.py.svn-base
 delete mode 100644 session_messages/.svn/text-base/context_processors.py.svn-base
 delete mode 100644 session_messages/.svn/text-base/models.py.svn-base

diff --git a/cnprog.wsgi b/cnprog.wsgi
index a3d332f2..14a62e0e 100644
--- a/cnprog.wsgi
+++ b/cnprog.wsgi
@@ -1,7 +1,7 @@
 import os
 import sys
-sys.path.append('/var/www/vhosts/default/htdocs')
-sys.path.append('/var/www/vhosts/default/htdocs/forum')
-os.environ['DJANGO_SETTINGS_MODULE'] = 'forum.settings'
+sys.path.append('/path/above_forum')
+sys.path.append('/path/above_forum/forum_dir')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'forum_dir.settings'
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/junk.py b/junk.py
deleted file mode 100644
index c6c03d27..00000000
--- a/junk.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import os
-
-print os.path.normpath('/haha//haha')
diff --git a/session_messages/.svn/all-wcprops b/session_messages/.svn/all-wcprops
deleted file mode 100644
index 2a15b353..00000000
--- a/session_messages/.svn/all-wcprops
+++ /dev/null
@@ -1,23 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 38
-/svn/!svn/ver/5/trunk/session_messages
-END
-__init__.py
-K 25
-svn:wc:ra_dav:version-url
-V 50
-/svn/!svn/ver/5/trunk/session_messages/__init__.py
-END
-models.py
-K 25
-svn:wc:ra_dav:version-url
-V 48
-/svn/!svn/ver/2/trunk/session_messages/models.py
-END
-context_processors.py
-K 25
-svn:wc:ra_dav:version-url
-V 60
-/svn/!svn/ver/2/trunk/session_messages/context_processors.py
-END
diff --git a/session_messages/.svn/dir-prop-base b/session_messages/.svn/dir-prop-base
deleted file mode 100644
index 4cc643b7..00000000
--- a/session_messages/.svn/dir-prop-base
+++ /dev/null
@@ -1,6 +0,0 @@
-K 10
-svn:ignore
-V 6
-*.pyc
-
-END
diff --git a/session_messages/.svn/entries b/session_messages/.svn/entries
deleted file mode 100644
index 67c0db8a..00000000
--- a/session_messages/.svn/entries
+++ /dev/null
@@ -1,64 +0,0 @@
-8
-
-dir
-5
-http://django-session-messages.googlecode.com/svn/trunk/session_messages
-http://django-session-messages.googlecode.com/svn
-
-
-
-2009-03-10T23:30:03.043791Z
-5
-carl.j.meyer
-has-props
-
-svn:special svn:externals svn:needs-lock
-
-
-
-
-
-
-
-
-
-
-
-b8288d2d-7354-0410-af5b-714f73743f4b
-
-__init__.py
-file
-
-
-
-
-2009-10-25T23:36:02.000000Z
-89aa0f71c9973e4889e5fad0b4771a34
-2009-03-10T23:30:03.043791Z
-5
-carl.j.meyer
-
-models.py
-file
-
-
-
-
-2009-10-25T23:36:02.000000Z
-c5b4f274dbb06bc66a14f0c18c9115cd
-2008-08-14T23:13:23.180432Z
-2
-carl.j.meyer
-
-context_processors.py
-file
-
-
-
-
-2009-10-25T23:36:02.000000Z
-24779c7e504d3f7f1918fdf3fe8096bc
-2008-08-14T23:13:23.180432Z
-2
-carl.j.meyer
-
diff --git a/session_messages/.svn/format b/session_messages/.svn/format
deleted file mode 100644
index 45a4fb75..00000000
--- a/session_messages/.svn/format
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/session_messages/.svn/text-base/__init__.py.svn-base b/session_messages/.svn/text-base/__init__.py.svn-base
deleted file mode 100644
index 0136c888..00000000
--- a/session_messages/.svn/text-base/__init__.py.svn-base
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-Lightweight session-based messaging system.
-
-Time-stamp: <2009-03-10 19:22:29 carljm __init__.py>
-
-"""
-VERSION = (0, 1, 'pre')
-
-def create_message (request, message):
-    """
-    Create a message in the current session.
-
-    """
-    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
-    
-    try:
-        request.session['messages'].append(message)
-    except KeyError:
-        request.session['messages'] = [message]
-
-def get_and_delete_messages (request, include_auth=False):
-    """
-    Get and delete all messages for current session.
-
-    Optionally also fetches user messages from django.contrib.auth.
-
-    """
-    assert hasattr(request, 'session'), "django-session-messages requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
-
-    messages = request.session.pop('messages', [])
-
-    if include_auth and request.user.is_authenticated():
-        messages.extend(request.user.get_and_delete_messages())
-    
-    return messages
-
diff --git a/session_messages/.svn/text-base/context_processors.py.svn-base b/session_messages/.svn/text-base/context_processors.py.svn-base
deleted file mode 100644
index df9840fd..00000000
--- a/session_messages/.svn/text-base/context_processors.py.svn-base
+++ /dev/null
@@ -1,48 +0,0 @@
-"""
-Context processor for lightweight session messages.
-
-Time-stamp: <2008-07-19 23:16:19 carljm context_processors.py>
-
-"""
-from django.utils.encoding import StrAndUnicode
-
-from session_messages import get_and_delete_messages
-
-def session_messages (request):
-    """
-    Returns session messages for the current session.
-
-    """
-    return { 'session_messages': LazyMessages(request) }
-
-class LazyMessages (StrAndUnicode):
-    """
-    Lazy message container, so messages aren't actually retrieved from
-    session and deleted until the template asks for them.
-
-    """
-    def __init__(self, request):
-        self.request = request
-
-    def __iter__(self):
-        return iter(self.messages)
-
-    def __len__(self):
-        return len(self.messages)
-
-    def __nonzero__(self):
-        return bool(self.messages)
-
-    def __unicode__(self):
-        return unicode(self.messages)
-
-    def __getitem__(self, *args, **kwargs):
-        return self.messages.__getitem__(*args, **kwargs)
-
-    def _get_messages(self):
-        if hasattr(self, '_messages'):
-            return self._messages
-        self._messages = get_and_delete_messages(self.request)
-        return self._messages
-    messages = property(_get_messages)
-    
diff --git a/session_messages/.svn/text-base/models.py.svn-base b/session_messages/.svn/text-base/models.py.svn-base
deleted file mode 100644
index b67ead6d..00000000
--- a/session_messages/.svn/text-base/models.py.svn-base
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-blank models.py
-"""
diff --git a/settings.py b/settings.py
index 3fc37dce..e964f092 100644
--- a/settings.py
+++ b/settings.py
@@ -2,18 +2,6 @@
 # Django settings for lanai project.
 import os.path
 import sys
-sys.path.insert(0,'/home/fadeev/incoming/Django-1.1.1')
-
-#DEBUG SETTINGS
-DEBUG = False 
-TEMPLATE_DEBUG = DEBUG
-INTERNAL_IPS = ('127.0.0.1','128.200.203.33')
-
-#EMAIL AND ADMINS
-ADMINS = (
-    ('Evgeny Fadeev', 'evgeny.fadeev@gmail.com'),
-)
-MANAGERS = ADMINS
 
 SITE_ID = 1
 
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 33402d35..8209a9fe 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -9,6 +9,15 @@ LOG_FILENAME = 'django.lanai.log'
 import logging
 logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
 
+#ADMINS and MANAGERS
+ADMINS = (('Forum Admin', 'team@cnprog.com'),)
+MANAGERS = ADMINS
+
+#DEBUG SETTINGS
+DEBUG = False 
+TEMPLATE_DEBUG = DEBUG
+INTERNAL_IPS = ('127.0.0.1',)
+
 DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
diff --git a/templates/about.html b/templates/about.html
index 6d5f3060..671964cc 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -33,13 +33,10 @@
     points. These points are added to the users account when others vote for his/her questions or answers.
     These points (very) roughly reflect the level of trust of the community.{% endblocktrans %}
     </p>
-    <p>{% blocktrans %}No points are necessary to ask or answer the questions - so please -
-    <strong><a href="{% url user_signin %}">join us!</a></strong>{% endblocktrans %}
+    <p>No points are necessary to ask or answer the questions - so please -
+    <strong><a href="{% url user_signin %}">join us!</a></strong>
     </p>
-    <p>
-        {% blocktrans %}
-            If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
-        {% endblocktrans %}
+    <p>If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
     </p>
 </div>
 {% endblock %}
-- 
cgit v1.2.3-1-g7c22


From ad98bb5c3f6408ac9a12d1c79448ca841fbcd904 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 25 Nov 2009 17:18:54 -0500
Subject: added generic email to settings_local.py.dist

---
 settings_local.py.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 8209a9fe..3c37c14e 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -10,7 +10,7 @@ import logging
 logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
 
 #ADMINS and MANAGERS
-ADMINS = (('Forum Admin', 'team@cnprog.com'),)
+ADMINS = (('Forum Admin', 'forum@example.com'),)
 MANAGERS = ADMINS
 
 #DEBUG SETTINGS
-- 
cgit v1.2.3-1-g7c22


From 19b8d46665cc8fa02121c5761ee62d99e9359105 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 25 Nov 2009 19:45:10 -0500
Subject: fixed user tag selection and count, link points to user authored
 questions/answers, fixed diff_date a little

---
 forum/templatetags/extra_tags.py |  2 +-
 forum/urls.py                    |  2 +-
 forum/views.py                   | 43 ++++++++++++++++++++++++++++++----------
 templates/user_stats.html        |  9 +++++----
 4 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py
index 96dc9024..b2199284 100644
--- a/forum/templatetags/extra_tags.py
+++ b/forum/templatetags/extra_tags.py
@@ -251,7 +251,7 @@ def diff_date(date, limen=2):
         return _('2 days ago')
     elif days == 1:
         return _('yesterday')
-    elif minutes > 60:
+    elif minutes >= 60:
         return ungettext('%(hr)d hour ago','%(hr)d hours ago',hours) % {'hr':hours}
     else:
         return ungettext('%(min)d min ago','%(min)d mins ago',minutes) % {'min':minutes}
diff --git a/forum/urls.py b/forum/urls.py
index a08fe716..ee4f0992 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -50,7 +50,7 @@ urlpatterns = patterns('',
     #place general question item in the end of other operations
     url(r'^%s(?P<id>\d+)//*' % _('question/'), app.question, name='question'),
     url(r'^%s$' % _('tags/'), app.tags, name='tags'),
-    url(r'^%s(?P<tag>[^/]+)/$' % _('tags/'), app.tag),
+    url(r'^%s(?P<tag>[^/]+)/$' % _('tags/'), app.tag, name='tag_questions'),
     url(r'^%s$' % _('users/'),app.users, name='users'),
     url(r'^%s(?P<id>\d+)/$' % _('moderate-user/'), app.moderate_user, name='moderate_user'),
     url(r'^%s(?P<id>\d+)/%s$' % (_('users/'), _('edit/')), app.edit_user, name='edit_user'),
diff --git a/forum/views.py b/forum/views.py
index d9d87e02..53338dd3 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -169,6 +169,15 @@ def questions(request, tagname=None, unanswered=False):
     else:
         objects = Question.objects.get_questions(orderby)
 
+    author_name = None
+    if 'user' in request.GET:
+        try:
+            author_name = request.GET['user']
+            u = User.objects.get(username=author_name)
+            objects = objects.filter(Q(author=u) | Q(answers__author=u))
+        except User.DoesNotExist:
+            author_name = None
+
     # RISK - inner join queries
     objects = objects.select_related(depth=1);
     objects_list = Paginator(objects, pagesize)
@@ -181,6 +190,7 @@ def questions(request, tagname=None, unanswered=False):
         related_tags = None
     return render_to_response(template_file, {
         "questions" : questions,
+        "author_name" : author_name,
         "tab_id" : view_id,
         "questions_count" : objects_list.count,
         "tags" : related_tags,
@@ -1221,28 +1231,40 @@ def user_stats(request, user_id, user_view):
     down_votes = Vote.objects.get_down_vote_count_from_user(user)
     votes_today = Vote.objects.get_votes_count_today_from_user(user)
     votes_total = VOTE_RULES['scope_votes_per_user_per_day']
-    tags = user.created_tags.all().order_by('-used_count')[:50]
-    if settings.DJANGO_VERSION < 1.1:
+
+    question_id_set = set(map(lambda v: v['id'], list(questions))) \
+                        | set(map(lambda v: v['id'], list(answered_questions)))
+
+    user_tags = Tag.objects.filter(questions__id__in = question_id_set)
+
+    try:
+        from django.db.models import Count
         awards = Award.objects.extra(
-            select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
+            select={'id': 'badge.id', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
             tables=['award', 'badge'],
             order_by=['-awarded_at'],
             where=['user_id=%s AND badge_id=badge.id'],
             params=[user.id]
-        ).values('id', 'count', 'name', 'description', 'type')
+        ).values('id', 'name', 'description', 'type')
         total_awards = awards.count()
-        awards.query.group_by = ['badge_id']
-    else:
+        awards = awards.annotate(count = Count('badge__id'))
+        user_tags = user_tags.annotate(user_tag_usage_count=Count('name'))
+
+    except ImportError:
         awards = Award.objects.extra(
-            select={'id': 'badge.id', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
+            select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'},
             tables=['award', 'badge'],
             order_by=['-awarded_at'],
             where=['user_id=%s AND badge_id=badge.id'],
             params=[user.id]
-        ).values('id', 'name', 'description', 'type')
+        ).values('id', 'count', 'name', 'description', 'type')
         total_awards = awards.count()
-        from django.db.models import Count
-        awards = awards.annotate(count = Count('badge__id'))
+        awards.query.group_by = ['badge_id']
+        user_tags = user_tags.extra(
+            select={'user_tag_usage_count': 'COUNT(1)',},
+            order_by=['-user_tag_usage_count'],
+        )
+        user_tags.query.group_by = ['name']
 
     if auth.can_moderate_users(request.user):
         moderate_user_form = ModerateUserForm(instance=user)
@@ -1262,6 +1284,7 @@ def user_stats(request, user_id, user_view):
         "total_votes": up_votes + down_votes,
         "votes_today_left": votes_total-votes_today,
         "votes_total_per_day": votes_total,
+        "user_tags" : user_tags[:50],
         "tags" : tags,
         "awards": awards,
         "total_awards" : total_awards,
diff --git a/templates/user_stats.html b/templates/user_stats.html
index 2b7949e8..06f1cd2b 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -84,7 +84,7 @@
         <a name="tags"></a>
         {% spaceless %}
             <h2>
-                {% blocktrans count tags|length as counter %}
+                {% blocktrans count user_tags|length as counter %}
                     <span class="count">1</span> Tag
                 {% plural %}
                     <span class="count">{{counter}}</span> Tags
@@ -95,10 +95,11 @@
             <table class="tags">
                 <tr>
                     <td width="180" valign="top">
-                        {% for tag in tags%}
+                        {% for tag in user_tags%}
                         <a rel="tag" 
-							title="{% blocktrans %}see other questions tagged '{{ tag }}' {% endblocktrans %}" 
-							href="{% url forum.views.tag tag|urlencode %}">{{tag.name}}</a><span class="tag-number"> &#215; {{ tag.used_count|intcomma }}</span><br/>
+							title="{% blocktrans with tag.name as tag_name %}see other questions tagged '{{ tag_name }}' {% endblocktrans %}" 
+							href="{% url forum.views.tag tag|urlencode %}?user={{view_user.username}}">{{tag.name}}</a>
+                        <span class="tag-number">&#215; {{ tag.user_tag_usage_count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"10" %}
                                 </td>
                                 <td width="180"  valign="top">
-- 
cgit v1.2.3-1-g7c22


From 88acb037263ed4f0afa48ef4a4fe4a2717ff1a16 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sat, 28 Nov 2009 00:02:19 -0500
Subject: trivial change

---
 cnprog.wsgi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cnprog.wsgi b/cnprog.wsgi
index 14a62e0e..bd3745ee 100644
--- a/cnprog.wsgi
+++ b/cnprog.wsgi
@@ -1,3 +1,4 @@
+#example wsgi setup script
 import os
 import sys
 sys.path.append('/path/above_forum')
-- 
cgit v1.2.3-1-g7c22


From 818d0b99a9ed70a2f92c59a835a2a51bc66dc7d1 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sat, 28 Nov 2009 00:10:25 -0500
Subject: configuration of javascript base url is no longer needed

---
 INSTALL                                  |  3 ---
 settings_local.py.dist                   |  3 ---
 templates/base.html                      |  3 ++-
 templates/base_content.html              |  5 +++-
 templates/content/js/com.cnprog.post.js  | 42 +++++++++++++++++++-------------
 templates/content/js/com.cnprog.utils.js |  2 +-
 templates/content/js/wmd/wmd.js          |  2 +-
 templates/content/style/style.css        |  2 +-
 8 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/INSTALL b/INSTALL
index 4b878f24..e071f9a7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -249,9 +249,6 @@ APP_COPYRIGHT = '' #copyright message
 #then CNPROG will run at url http://example.com/forum
 #FORUM_SCRIPT_ALIAS cannot have leading slash, otherwise it can be set to anything
 FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
-#also remember to set '/':'/forum' in file templates/content/js/com.cnprog.i18n.js
-#this is because javascript also needs to know the correct url prefix
-#nothing needs to be changed in .css files, as all urls there are relative
 
 LANGUAGE_CODE = 'en' #forum language (see language instructions on the wiki)
 EMAIL_VALIDATION = 'off' #string - on|off
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 3c37c14e..5447e517 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -44,9 +44,6 @@ TIME_ZONE = 'America/Tijuana'
 #
 #   FORUM_SCRIPT_ALIAS = 'forum/'
 #
-#   also make sure to set '/':'/forum' in file templates/content/js/com.cnprog.i18n.js
-#   this is necessary to make client scripts work in this configuration
-#
 FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
 
 
diff --git a/templates/base.html b/templates/base.html
index 2b933c4a..ec0a53d7 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -18,7 +18,8 @@
         <script src="http://www.google.com/jsapi" type="text/javascript"></script>
         <script type="text/javascript">google.load("jquery", "1.2.6");</script>
 		<script type="text/javascript">
-			var i18nLang = '{{settings.LANGUAGE_CODE}}';
+            var i18nLang = '{{settings.LANGUAGE_CODE}}';
+            var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
 		</script>
         <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script>
 		<script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script>
diff --git a/templates/base_content.html b/templates/base_content.html
index 52cc6134..78e5fe38 100644
--- a/templates/base_content.html
+++ b/templates/base_content.html
@@ -6,7 +6,9 @@
     <head>
         <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        {% if settings.GOOGLE_SITEMAP_CODE %}
         <meta name="verify-v1" content="{{ settings.GOOGLE_SITEMAP_CODE }}" />
+        {% endif %}
         <link rel="shortcut icon" href="{% href "/content/images/favicon.ico" %}" />
         <link href="{% href "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
 		 {% spaceless %}
@@ -15,7 +17,8 @@
         <script src="http://www.google.com/jsapi" type="text/javascript"></script>
         <script type="text/javascript">google.load("jquery", "1.2.6");</script>
 		<script type="text/javascript">
-			var i18nLang = '{{ settings.LANGUAGE_CODE }}';
+            var i18nLang = '{{ settings.LANGUAGE_CODE }}';
+            var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
 		</script>
         <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script>
 	    <script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script>
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index 0e604b8f..0ddc8f74 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -53,11 +53,11 @@ var Vote = function(){
     var acceptAnonymousMessage = $.i18n._('insufficient privilege');
     var acceptOwnAnswerMessage = $.i18n._('cannot pick own answer as best');
 
-    var pleaseLogin = "<a href='" + $.i18n._("/") + $.i18n._("account/") + $.i18n._("signin/")
-                    + "?next=" + $.i18n._("/") + $.i18n._("questions/") + "{{QuestionID}}'>"
+    var pleaseLogin = "<a href='" + scriptUrl + $.i18n._("account/") + $.i18n._("signin/")
+                    + "?next=" + scriptUrl + $.i18n._("questions/") + "{{QuestionID}}'>"
 					+ $.i18n._('please login') + "</a>";
 
-    var pleaseSeeFAQ = $.i18n._('please see') + "<a href='" + $.i18n._("/") + $.i18n._("faq/") + "'>faq</a>";
+    var pleaseSeeFAQ = $.i18n._('please see') + "<a href='" + scriptUrl + $.i18n._("faq/") + "'>faq</a>";
 
     var favoriteAnonymousMessage = $.i18n._('anonymous users cannot select favorite questions') 
     var voteAnonymousMessage = $.i18n._('anonymous users cannot vote') + pleaseLogin;
@@ -151,17 +151,17 @@ var Vote = function(){
     var setVoteImage = function(voteType, undo, object){
         var flag = undo ? "" : "-on";
         var arrow = (voteType == VoteType.questionUpVote || voteType == VoteType.answerUpVote) ? "up" : "down";
-        object.attr("src", $.i18n._("/") + "content/images/vote-arrow-"+ arrow + flag +".png");
+        object.attr("src", scriptUrl + "content/images/vote-arrow-"+ arrow + flag +".png");
         
         // if undo voting, then undo the pair of arrows.
         if(undo){
             if(voteType == VoteType.questionUpVote || voteType == VoteType.questionDownVote){
-                $(getQuestionVoteUpButton()).attr("src", $.i18n._("/") + "content/images/vote-arrow-up.png");
-                $(getQuestionVoteDownButton()).attr("src", $.i18n._("/") + "content/images/vote-arrow-down.png");
+                $(getQuestionVoteUpButton()).attr("src", scriptUrl + "content/images/vote-arrow-up.png");
+                $(getQuestionVoteDownButton()).attr("src", scriptUrl + "content/images/vote-arrow-down.png");
             }
             else{
-                $(getAnswerVoteUpButton(postId)).attr("src", $.i18n._("/") + "content/images/vote-arrow-up.png");
-                $(getAnswerVoteDownButton(postId)).attr("src", $.i18n._("/") + "content/images/vote-arrow-down.png");
+                $(getAnswerVoteUpButton(postId)).attr("src", scriptUrl + "content/images/vote-arrow-up.png");
+                $(getAnswerVoteDownButton(postId)).attr("src", scriptUrl + "content/images/vote-arrow-down.png");
             }
         }
     };
@@ -237,7 +237,7 @@ var Vote = function(){
             type: "POST",
             cache: false,
             dataType: "json",
-            url: $.i18n._("/") + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"),
+            url: scriptUrl + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"),
             data: { "type": voteType, "postId": postId },
             error: handleFail,
             success: function(data){callback(object, voteType, data)}});
@@ -256,19 +256,23 @@ var Vote = function(){
             showMessage(object, acceptOwnAnswerMessage);
         }
         else if(data.status == "1"){
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
             object.attr("src", $.i18n._("/") + "content/images/vote-accepted.png");
+=======
+            object.attr("src", scriptUrl + "content/images/vote-accepted.png");
+>>>>>>> private:templates/content/js/com.cnprog.post.js
             $("#"+answerContainerIdPrefix+postId).removeClass("accepted-answer");
             $("#"+commentLinkIdPrefix+postId).removeClass("comment-link-accepted");
         }
         else if(data.success == "1"){
             var acceptedButtons = 'div.'+ voteContainerId +' img[id^='+ imgIdPrefixAccept +']';
-            $(acceptedButtons).attr("src", $.i18n._("/") + "content/images/vote-accepted.png");
+            $(acceptedButtons).attr("src", scriptUrl + "content/images/vote-accepted.png");
             var answers = ("div[id^="+answerContainerIdPrefix +"]");
             $(answers).removeClass("accepted-answer");
             var commentLinks = ("div[id^="+answerContainerIdPrefix +"] div[id^="+ commentLinkIdPrefix +"]");
             $(commentLinks).removeClass("comment-link-accepted");
             
-            object.attr("src", $.i18n._("/") + "content/images/vote-accepted-on.png");
+            object.attr("src", scriptUrl + "content/images/vote-accepted-on.png");
             $("#"+answerContainerIdPrefix+postId).addClass("accepted-answer");
             $("#"+commentLinkIdPrefix+postId).addClass("comment-link-accepted");
         }
@@ -282,7 +286,7 @@ var Vote = function(){
             showMessage(object, favoriteAnonymousMessage.replace("{{QuestionID}}", questionId));
         }
         else if(data.status == "1"){
-            object.attr("src", $.i18n._("/") + "content/images/vote-favorite-off.png");
+            object.attr("src", scriptUrl + "content/images/vote-favorite-off.png");
             var fav = getFavoriteNumber();
             fav.removeClass("my-favorite-number");
             if(data.count == 0)
@@ -290,7 +294,7 @@ var Vote = function(){
             fav.text(data.count);
         }
         else if(data.success == "1"){
-            object.attr("src", $.i18n._("/") + "content/images/vote-favorite-on.png");
+            object.attr("src", scriptUrl + "content/images/vote-favorite-on.png");
             var fav = getFavoriteNumber();
             fav.text(data.count);
             fav.addClass("my-favorite-number");
@@ -359,7 +363,7 @@ var Vote = function(){
         }
         else if (data.success == "1"){
             if (voteType == VoteType.removeQuestion){
-                window.location.href = $.i18n._("/") + $.i18n._("questions/");
+                window.location.href = scriptUrl + $.i18n._("questions/");
             }
             else {
                 if (removeActionType == 'delete'){
@@ -508,7 +512,7 @@ function createComments(type) {
 
     var getComments = function(id, jDiv) {
         //appendLoaderImg(id);
-        $.getJSON($.i18n._("/") + objectType + "s/" + id + "/" + $.i18n._("comments/")
+        $.getJSON(scriptUrl + objectType + "s/" + id + "/" + $.i18n._("comments/")
                 , function(json) { showComments(id, json); });
     };
 
@@ -529,8 +533,8 @@ function createComments(type) {
     var renderDeleteCommentIcon = function(post_id, delete_url){
         if (canPostComments(post_id)){
             var html = '';
-            var img = $.i18n._("/") + "content/images/close-small.png";
-            var imgHover = $.i18n._("/") + "content/images/close-small-hover.png";
+            var img = scriptUrl + "content/images/close-small.png";
+            var imgHover = scriptUrl + "content/images/close-small-hover.png";
             html += '<img class="delete-icon" onclick="' + objectType + 'Comments.deleteComment($(this), ' + post_id + ', \'' + delete_url + '\')" src="' + img;
             html += '" onmouseover="$(this).attr(\'src\', \'' + imgHover + '\')" onmouseout="$(this).attr(\'src\', \'' + img
             html += '\')" title="' + $.i18n._('delete this comment') + '" />';
@@ -569,7 +573,11 @@ function createComments(type) {
         //todo fix url translations!!!
         $.ajax({
             type: "POST",
+<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
             url: $.i18n._("/") + objectType + "s/" + id + "/" + $.i18n._("comments/"),
+=======
+            url: scriptUrl + objectType + "s/" + id + "/" + $.i18n._("comments/"),
+>>>>>>> private:templates/content/js/com.cnprog.post.js
             dataType: "json",
             data: { comment: textarea.val() },
             success: function(json) {
diff --git a/templates/content/js/com.cnprog.utils.js b/templates/content/js/com.cnprog.utils.js
index fff61759..cf27c8a1 100644
--- a/templates/content/js/com.cnprog.utils.js
+++ b/templates/content/js/com.cnprog.utils.js
@@ -23,7 +23,7 @@ var notify = function() {
         },       
         close: function(doPostback) {
             if (doPostback) {
-               $.post($.i18n._("/") + $.i18n._("messages/") + 
+               $.post(scriptUrl + $.i18n._("messages/") + 
                 $.i18n._("markread/"), { formdata: "required" });
             }
             $(".notify").fadeOut("fast");
diff --git a/templates/content/js/wmd/wmd.js b/templates/content/js/wmd/wmd.js
index 0bdc55b6..e396d3cb 100644
--- a/templates/content/js/wmd/wmd.js
+++ b/templates/content/js/wmd/wmd.js
@@ -54,7 +54,7 @@ Attacklab.wmdBase = function(){
 	var uploadImageHTML ="<div>" + $.i18n._('upload image') + "</div>" + 
         "<input type=\"file\" name=\"file-upload\" id=\"file-upload\" size=\"26\" "+
         "onchange=\"return ajaxFileUpload($('#image-url'));\"/><br>" + 
-        "<img id=\"loading\" src=\"" + $.i18n._("/") + "content/images/indicator.gif\" style=\"display:none;\"/>";
+        "<img id=\"loading\" src=\"" + scriptUrl + "content/images/indicator.gif\" style=\"display:none;\"/>";
     
 	// The default text that appears in the dialog input box when entering
 	// links.
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 13494721..ffa72676 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -258,7 +258,7 @@ blockquote
 	border:1px solid #fff;
 	background-color:#fff;
 	color:#777;
-	padding:.3em;
+	padding:2px 4px 3px 4px;
 	font:bold 100% sans-serif;
 }
 
-- 
cgit v1.2.3-1-g7c22


From 6afaa6d392e97cc425e4ecdc82f3c1a3716986f4 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sat, 28 Nov 2009 00:27:08 -0500
Subject: fixed some local merge errors

---
 templates/content/js/com.cnprog.i18n.js | 1 -
 templates/content/js/com.cnprog.post.js | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index d2356abc..7562628b 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -57,7 +57,6 @@ var i18nZh = {
 };
 
 var i18nEn = {
-    '/':'/',
 	'need >15 points to report spam':'need >15 points to report spam ',
     '>15 points requried to upvote':'>15 points required to upvote ',
 	'tags cannot be empty':'please enter at least one tag',
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index 0ddc8f74..5d58ff21 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -256,11 +256,7 @@ var Vote = function(){
             showMessage(object, acceptOwnAnswerMessage);
         }
         else if(data.status == "1"){
-<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
-            object.attr("src", $.i18n._("/") + "content/images/vote-accepted.png");
-=======
             object.attr("src", scriptUrl + "content/images/vote-accepted.png");
->>>>>>> private:templates/content/js/com.cnprog.post.js
             $("#"+answerContainerIdPrefix+postId).removeClass("accepted-answer");
             $("#"+commentLinkIdPrefix+postId).removeClass("comment-link-accepted");
         }
@@ -573,11 +569,7 @@ function createComments(type) {
         //todo fix url translations!!!
         $.ajax({
             type: "POST",
-<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
-            url: $.i18n._("/") + objectType + "s/" + id + "/" + $.i18n._("comments/"),
-=======
             url: scriptUrl + objectType + "s/" + id + "/" + $.i18n._("comments/"),
->>>>>>> private:templates/content/js/com.cnprog.post.js
             dataType: "json",
             data: { comment: textarea.val() },
             success: function(json) {
-- 
cgit v1.2.3-1-g7c22


From 932b13188b08871e4f541f46c1dbb4eca693adfa Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Mon, 30 Nov 2009 12:19:01 -0500
Subject: reogranized branches

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index fa3c2c62..b217d5cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@
 *.log
 settings_local.py
 nbproject
-log
-- 
cgit v1.2.3-1-g7c22


From 9655bd421022dd6488b21184cc9fd0242c6b345e Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 8 Dec 2009 22:50:45 -0500
Subject: added interesting and ignored tag selectors (works) and per-tag
 subscription (not tested yet)

---
 forum/const.py                                 |    3 +
 forum/forms.py                                 |   15 +-
 forum/management/commands/send_email_alerts.py |  139 +--
 forum/managers.py                              |   41 +-
 forum/models.py                                |   24 +-
 forum/templatetags/extra_filters.py            |    5 +
 forum/urls.py                                  |   14 +
 forum/views.py                                 | 1276 +++++++++++++-----------
 settings.py                                    |    4 +-
 sql_scripts/091208_upgrade_evgeny.sql          |    1 +
 sql_scripts/091208_upgrade_evgeny_1.sql        |    1 +
 sql_scripts/update_2009_01_25_001.sql          |    2 +-
 sql_scripts/update_2009_02_26_001.sql          |    2 +-
 sql_scripts/update_2009_04_10_001.sql          |    2 +-
 templates/authopenid/complete.html             |    1 +
 templates/base.html                            |    1 -
 templates/content/images/close-small-dark.png  |  Bin 0 -> 226 bytes
 templates/content/js/com.cnprog.admin.js       |    2 +-
 templates/content/js/com.cnprog.post.js        |  174 +++-
 templates/content/js/com.cnprog.utils.js       |    2 +-
 templates/content/js/compress.bat              |    3 +-
 templates/content/js/flot-build.bat            |    2 +-
 templates/content/style/style.css              |   32 +-
 templates/index.html                           |   18 +-
 templates/questions.html                       |   88 +-
 templates/tag_selector.html                    |   42 +
 templates/user_email_subscriptions.html        |    3 +
 templates/user_stats.html                      |    2 +-
 utils/decorators.py                            |   25 +
 29 files changed, 1192 insertions(+), 732 deletions(-)
 create mode 100644 sql_scripts/091208_upgrade_evgeny.sql
 create mode 100644 sql_scripts/091208_upgrade_evgeny_1.sql
 create mode 100644 templates/content/images/close-small-dark.png
 create mode 100644 templates/tag_selector.html
 create mode 100644 utils/decorators.py

diff --git a/forum/const.py b/forum/const.py
index 312dde26..91b6f5e5 100644
--- a/forum/const.py
+++ b/forum/const.py
@@ -87,3 +87,6 @@ CONST = {
     'default_version'   : _('initial version'),
     'retagged'          : _('retagged'),
 }
+
+#how to filter questions by tags in email digests?
+TAG_EMAIL_FILTER_CHOICES = (('ignored', _('exclude ignored tags')),('interesting',_('allow only interesting tags')))
diff --git a/forum/forms.py b/forum/forms.py
index 511a0a0d..ecdd9c95 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -232,6 +232,15 @@ class EditUserForm(forms.Form):
                     raise forms.ValidationError(_('this email has already been registered, please use another one'))
         return self.cleaned_data['email']
 
+class TagFilterSelectionForm(forms.ModelForm):
+    tag_filter_setting = forms.ChoiceField(choices=TAG_EMAIL_FILTER_CHOICES, #imported from forum/const.py
+                                            initial='ignored',
+                                            label=_('Choose email tag filter'),
+                                            widget=forms.RadioSelect)
+    class Meta:
+        model = User
+        fields = ('tag_filter_setting',)
+
 class EditUserEmailFeedsForm(forms.Form):
     WN = (('w',_('weekly')),('n',_('no email')))
     DWN = (('d',_('daily')),('w',_('weekly')),('n',_('no email')))
@@ -247,9 +256,6 @@ class EditUserEmailFeedsForm(forms.Form):
                 'answered_by_me':'n',
                 'individually_selected':'n',
                 }
-    all_questions = forms.ChoiceField(choices=DWN,initial='w',
-                            widget=forms.RadioSelect,
-                            label=_('Entire forum'),)
     asked_by_me = forms.ChoiceField(choices=DWN,initial='w',
                             widget=forms.RadioSelect,
                             label=_('Asked by me'))
@@ -259,6 +265,9 @@ class EditUserEmailFeedsForm(forms.Form):
     individually_selected = forms.ChoiceField(choices=DWN,initial='w',
                             widget=forms.RadioSelect,
                             label=_('Individually selected'))
+    all_questions = forms.ChoiceField(choices=DWN,initial='w',
+                            widget=forms.RadioSelect,
+                            label=_('Entire forum (tag filtered)'),)
 
     def set_initial_values(self,user=None):
         KEY_MAP = dict([(v,k) for k,v in self.FORM_TO_MODEL_MAP.iteritems()])
diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index 8d52ed64..563aab69 100644
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -38,73 +38,84 @@ class Command(NoArgsCommand):
                                   ).exclude(
                                         closed=True
                                   )
-        user_feeds = EmailFeedSetting.objects.filter(subscriber=user).exclude(frequency='n')
-        for feed in user_feeds:
-            cutoff_time = now - EmailFeedSetting.DELTA_TABLE[feed.frequency]
-            if feed.reported_at == None or feed.reported_at <= cutoff_time:
-                Q_set = Q_set1.exclude(last_activity_at__gt=cutoff_time)#report these excluded later
-                feed.reported_at = now
-                feed.save()#may not actually report anything, depending on filters below
-                if feed.feed_type == 'q_sel':
-                    q_sel = Q_set.filter(followed_by=user)
-                    q_sel.cutoff_time = cutoff_time #store cutoff time per query set
-                elif feed.feed_type == 'q_ask':
-                    q_ask = Q_set.filter(author=user)
-                    q_ask.cutoff_time = cutoff_time
-                elif feed.feed_type == 'q_ans':
-                    q_ans = Q_set.filter(answers__author=user)
-                    q_ans.cutoff_time = cutoff_time
-                elif feed.feed_type == 'q_all':
-                    q_all = Q_set
-                    q_all.cutoff_time = cutoff_time
-        #build list in this order
-        q_list = OrderedDict()
-        def extend_question_list(src, dst):
-            """src is a query set with questions
-               or an empty list
-                dst - is an ordered dictionary
-            """
-            if src is None:
-                return #will not do anything if subscription of this type is not used
-            cutoff_time = src.cutoff_time
-            for q in src:
-                if q in dst:
-                    if cutoff_time < dst[q]['cutoff_time']:
-                        dst[q]['cutoff_time'] = cutoff_time
-                else:
-                    #initialise a questions metadata dictionary to use for email reporting
-                    dst[q] = {'cutoff_time':cutoff_time}
+    #todo: still need to add back individually selected and other questions....
+    #these may be filtered out by tags
+    if user.tag_filter_setting == 'ignored':
+        ignored_tags = user.markedtag_set.filter(reason='bad').values_list('tag', flat=True).distinct()
+        Q_set1 = Q_set1.exclude( tags__in=ignored_tags )
+        logging.debug('removed ignored tags')
+    else:
+        selected_tags = user.markedtag_set.filter(reason='good').values_list('tag', flat=True).distinct()
+        Q_set1 = Q_set1.filter( tags__in=selected_tags )
+        logging.debug('filtered for only selected tags')
+        
+    user_feeds = EmailFeedSetting.objects.filter(subscriber=user).exclude(frequency='n')
+    for feed in user_feeds:
+        cutoff_time = now - EmailFeedSetting.DELTA_TABLE[feed.frequency]
+        if feed.reported_at == None or feed.reported_at <= cutoff_time:
+            Q_set = Q_set1.exclude(last_activity_at__gt=cutoff_time)#report these excluded later
+            feed.reported_at = now
+            feed.save()#may not actually report anything, depending on filters below
+            if feed.feed_type == 'q_sel':
+                q_sel = Q_set.filter(followed_by=user)
+                q_sel.cutoff_time = cutoff_time #store cutoff time per query set
+            elif feed.feed_type == 'q_ask':
+                q_ask = Q_set.filter(author=user)
+                q_ask.cutoff_time = cutoff_time
+            elif feed.feed_type == 'q_ans':
+                q_ans = Q_set.filter(answers__author=user)
+                q_ans.cutoff_time = cutoff_time
+            elif feed.feed_type == 'q_all':
+                q_all = Q_set
+                q_all.cutoff_time = cutoff_time
+    #build list in this order
+    q_list = OrderedDict()
+    def extend_question_list(src, dst):
+        """src is a query set with questions
+           or an empty list
+            dst - is an ordered dictionary
+        """
+        if src is None:
+            return #will not do anything if subscription of this type is not used
+        cutoff_time = src.cutoff_time
+        for q in src:
+            if q in dst:
+                if cutoff_time < dst[q]['cutoff_time']:
+                    dst[q]['cutoff_time'] = cutoff_time
+            else:
+                #initialise a questions metadata dictionary to use for email reporting
+                dst[q] = {'cutoff_time':cutoff_time}
 
-        extend_question_list(q_sel, q_list)
-        extend_question_list(q_ask, q_list)
-        extend_question_list(q_ans, q_list)
-        extend_question_list(q_all, q_list)
+    extend_question_list(q_sel, q_list)
+    extend_question_list(q_ask, q_list)
+    extend_question_list(q_ans, q_list)
+    extend_question_list(q_all, q_list)
 
-        ctype = ContentType.objects.get_for_model(Question)
-        EMAIL_UPDATE_ACTIVITY = const.TYPE_ACTIVITY_QUESTION_EMAIL_UPDATE_SENT
-        for q, meta_data in q_list.items():
-            #todo use Activity, but first start keeping more Activity records
-            #act = Activity.objects.filter(content_type=ctype, object_id=q.id)
-            #because currently activity is not fully recorded to through
-            #revision records to see what kind modifications were done on
-            #the questions and answers
-            try:
-                update_info = Activity.objects.get(content_type=ctype, 
-                                                    object_id=q.id,
-                                                    activity_type=EMAIL_UPDATE_ACTIVITY)
-                emailed_at = update_info.active_at
-            except Activity.DoesNotExist:
-                update_info = Activity(user=user, content_object=q, activity_type=EMAIL_UPDATE_ACTIVITY)
-                emailed_at = datetime.datetime(1970,1,1)#long time ago
-            except Activity.MultipleObjectsReturned:
-                raise Exception('server error - multiple question email activities found per user-question pair')
+    ctype = ContentType.objects.get_for_model(Question)
+    EMAIL_UPDATE_ACTIVITY = const.TYPE_ACTIVITY_QUESTION_EMAIL_UPDATE_SENT
+    for q, meta_data in q_list.items():
+        #todo use Activity, but first start keeping more Activity records
+        #act = Activity.objects.filter(content_type=ctype, object_id=q.id)
+        #because currently activity is not fully recorded to through
+        #revision records to see what kind modifications were done on
+        #the questions and answers
+        try:
+            update_info = Activity.objects.get(content_type=ctype, 
+                                                object_id=q.id,
+                                                activity_type=EMAIL_UPDATE_ACTIVITY)
+            emailed_at = update_info.active_at
+        except Activity.DoesNotExist:
+            update_info = Activity(user=user, content_object=q, activity_type=EMAIL_UPDATE_ACTIVITY)
+            emailed_at = datetime.datetime(1970,1,1)#long time ago
+        except Activity.MultipleObjectsReturned:
+            raise Exception('server error - multiple question email activities found per user-question pair')
 
-            q_rev = QuestionRevision.objects.filter(question=q,\
-                                                    revised_at__lt=cutoff_time,\
-                                                    revised_at__gt=emailed_at)
-            q_rev = q_rev.exclude(author=user)
-            meta_data['q_rev'] = len(q_rev)
-            if len(q_rev) > 0 and q.added_at == q_rev[0].revised_at:
+        q_rev = QuestionRevision.objects.filter(question=q,\
+                                                revised_at__lt=cutoff_time,\
+                                                revised_at__gt=emailed_at)
+        q_rev = q_rev.exclude(author=user)
+        meta_data['q_rev'] = len(q_rev)
+        if len(q_rev) > 0 and q.added_at == q_rev[0].revised_at:
                 meta_data['q_rev'] = 0
                 meta_data['new_q'] = True
             else:
diff --git a/forum/managers.py b/forum/managers.py
index 56967f64..90437e91 100644
--- a/forum/managers.py
+++ b/forum/managers.py
@@ -7,25 +7,6 @@ from forum.models import *
 from urllib import quote, unquote
 
 class QuestionManager(models.Manager):
-    def get_translation_questions(self, orderby, page_size):
-        questions = self.filter(deleted=False, author__id__in=[28,29]).order_by(orderby)[:page_size]
-        return questions
-    
-    def get_questions_by_pagesize(self, orderby, page_size):
-        questions = self.filter(deleted=False).order_by(orderby)[:page_size]
-        return questions
-    
-    def get_questions_by_tag(self, tagname, orderby):
-        questions = self.filter(deleted=False, tags__name = unquote(tagname)).order_by(orderby)
-        return questions
-    
-    def get_unanswered_questions(self, orderby):
-        questions = self.filter(deleted=False, answer_accepted=False).order_by(orderby)
-        return questions
-    
-    def get_questions(self, orderby):
-        questions = self.filter(deleted=False).order_by(orderby)
-        return questions
     
     def update_tags(self, question, tagnames, user):
         """
@@ -92,12 +73,11 @@ class QuestionManager(models.Manager):
         Questions with the individual tags will be added to list if above questions are not full.
         """
         #print datetime.datetime.now()
-        from forum.models import Question
-        questions = list(Question.objects.filter(tagnames = question.tagnames, deleted=False).all())
+        questions = list(self.filter(tagnames = question.tagnames, deleted=False).all())
 
         tags_list = question.tags.all()
         for tag in tags_list:
-            extend_questions = Question.objects.filter(tags__id = tag.id, deleted=False)[:50]
+            extend_questions = self.filter(tags__id = tag.id, deleted=False)[:50]
             for item in extend_questions:
                 if item not in questions and len(questions) < 10:
                     questions.append(item)
@@ -166,22 +146,17 @@ class TagManager(models.Manager):
 
 class AnswerManager(models.Manager):
     GET_ANSWERS_FROM_USER_QUESTIONS = u'SELECT answer.* FROM answer INNER JOIN question ON answer.question_id = question.id WHERE question.author_id =%s AND answer.author_id <> %s'
-    def get_answers_from_question(self, question, user=None, other_orderby = None):
+    def get_answers_from_question(self, question, user=None):
         """
         Retrieves visibile answers for the given question. Delete answers
         are only visibile to the person who deleted them.
-        """   
+        """
+       
         if user is None or not user.is_authenticated():
-            q = self.filter(question=question, deleted=False)
-        else:
-            q = self.filter(Q(question=question),
-                            Q(deleted=False) | Q(deleted_by=user))
-        if other_orderby is None:
-            q = q.order_by("-accepted")
+            return self.filter(question=question, deleted=False)
         else:
-            q = q.order_by("-accepted", other_orderby)
-
-        return q
+            return self.filter(Q(question=question),
+                               Q(deleted=False) | Q(deleted_by=user))
                                
     def get_answers_from_questions(self, user_id):
         """
diff --git a/forum/models.py b/forum/models.py
index 27f88dcc..8873fd87 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -267,16 +267,6 @@ class Question(models.Model):
 
         return when, who
 
-    def get_user_votes_in_answers(self, user):
-        content_type = ContentType.objects.get_for_model(Answer)
-        query_set = Vote.objects.extra(
-            tables = ['question', 'answer'],
-            where = ['question.id = answer.question_id AND question.id = %s AND vote.object_id = answer.id AND vote.content_type_id = %s AND vote.user_id = %s'],
-            params = [self.id, content_type.id, user.id]
-        )
-        
-        return query_set
-        
     def get_update_summary(self,last_reported_at=None,recipient_email=''):
         edited = False 
         if self.last_edited_at and self.last_edited_at > last_reported_at:
@@ -354,6 +344,12 @@ class FavoriteQuestion(models.Model):
     def __unicode__(self):
         return '[%s] favorited at %s' %(self.user, self.added_at)
 
+class MarkedTag(models.Model):
+    TAG_MARK_REASONS = (('good',_('interesting')),('bad',_('ignored')))
+    tag = models.ForeignKey(Tag)
+    user = models.ForeignKey(User)
+    reason = models.CharField(max_length=16, choices=TAG_MARK_REASONS)
+
 class QuestionRevision(models.Model):
     """A revision of a Question."""
     question   = models.ForeignKey(Question, related_name='revisions')
@@ -702,6 +698,14 @@ User.add_to_class('date_of_birth', models.DateField(null=True, blank=True))
 User.add_to_class('about', models.TextField(blank=True))
 User.add_to_class('is_username_taken',classmethod(user_is_username_taken))
 User.add_to_class('get_q_sel_email_feed_frequency',user_get_q_sel_email_feed_frequency)
+User.add_to_class('hide_ignored_questions', models.BooleanField(default=False))
+User.add_to_class('tag_filter_setting', 
+                    models.CharField(
+                                        max_length=16, 
+                                        choices=TAG_EMAIL_FILTER_CHOICES, 
+                                        default='ignored'
+                                     )
+                 )
 
 # custom signal
 tags_updated = django.dispatch.Signal(providing_args=["question"])
diff --git a/forum/templatetags/extra_filters.py b/forum/templatetags/extra_filters.py
index 3644fdc3..22ec0109 100644
--- a/forum/templatetags/extra_filters.py
+++ b/forum/templatetags/extra_filters.py
@@ -1,4 +1,5 @@
 from django import template
+from django.core import serializers
 from forum import auth
 import logging
 
@@ -91,3 +92,7 @@ def cnprog_intword(number):
             return number
     except:
         return number
+
+@register.filter
+def json_serialize(object):
+    return serializers.serialize('json',object)
diff --git a/forum/urls.py b/forum/urls.py
index ee4f0992..927e149c 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -39,6 +39,7 @@ urlpatterns = patterns('',
     url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('vote/')), app.vote, name='vote'),
     url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('revisions/')), app.question_revisions, name='question_revisions'),
     url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('comments/')), app.question_comments, name='question_comments'),
+    url(r'^%s$' % _('command/'), app.ajax_command, name='call_ajax'),
 
     url(r'^%s(?P<object_id>\d+)/%s(?P<comment_id>\d+)/%s$' % (_('questions/'), _('comments/'),_('delete/')), \
                                                 app.delete_comment, kwargs={'commented_object_type':'question'},\
@@ -51,6 +52,19 @@ urlpatterns = patterns('',
     url(r'^%s(?P<id>\d+)//*' % _('question/'), app.question, name='question'),
     url(r'^%s$' % _('tags/'), app.tags, name='tags'),
     url(r'^%s(?P<tag>[^/]+)/$' % _('tags/'), app.tag, name='tag_questions'),
+
+    url(r'^%s%s(?P<tag>[^/]+)/$' % (_('mark-tag/'),_('interesting/')), app.mark_tag, \
+                                kwargs={'reason':'good','action':'add'}, \
+                                name='mark_interesting_tag'),
+
+    url(r'^%s%s(?P<tag>[^/]+)/$' % (_('mark-tag/'),_('ignored/')), app.mark_tag, \
+                                kwargs={'reason':'bad','action':'add'}, \
+                                name='mark_ignored_tag'),
+
+    url(r'^%s(?P<tag>[^/]+)/$' % _('unmark-tag/'), app.mark_tag, \
+                                kwargs={'action':'remove'}, \
+                                name='mark_ignored_tag'),
+
     url(r'^%s$' % _('users/'),app.users, name='users'),
     url(r'^%s(?P<id>\d+)/$' % _('moderate-user/'), app.moderate_user, name='moderate_user'),
     url(r'^%s(?P<id>\d+)/%s$' % (_('users/'), _('edit/')), app.edit_user, name='edit_user'),
diff --git a/forum/views.py b/forum/views.py
index 8ff44f4b..f1eb4d0c 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1,33 +1,36 @@
 # encoding:utf-8
-import calendar
+import os.path
+import time, datetime, calendar, random
+import logging
+from urllib import quote, unquote
 from django.conf import settings
+from django.core.files.storage import default_storage
+from django.shortcuts import render_to_response, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden, Http404
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.template import RequestContext, loader
+from django.utils.html import *
+from django.utils import simplejson
+from django.core import serializers
 from django.core.mail import mail_admins
+from django.db import transaction
+from django.db.models import Count, Q
 from django.contrib.contenttypes.models import ContentType
+from django.utils.translation import ugettext as _
+from django.utils.datastructures import SortedDict
 from django.template.defaultfilters import slugify
 from django.core.exceptions import PermissionDenied
+
 from utils.html import sanitize_html
-from django.core.files.storage import default_storage
-from django.shortcuts import get_object_or_404
-from django.shortcuts import render_to_response
-from django.utils import simplejson
-from django.utils.html import *
-from django.utils.translation import ugettext as _
+from utils.decorators import ajax_method, ajax_login_required
 from markdown2 import Markdown
-import os.path
-import random
-import time
-
-import datetime
-from forum import auth
-from forum.auth import *
-from forum.const import *
+#from lxml.html.diff import htmldiff
 from forum.diff import textDiff as htmldiff
 from forum.forms import *
 from forum.models import *
+from forum.auth import *
+from forum.const import *
 from forum.user import *
 from forum import auth
 from django_authopenid.util import get_next_url
@@ -87,19 +90,31 @@ def index(request):
              }
     view_id, orderby = _get_and_remember_questions_sort_method(request, view_dic, 'latest')
 
-    questions = Question.objects.get_questions_by_pagesize(orderby, INDEX_PAGE_SIZE)
+    page_size = request.session.get('pagesize', QUESTIONS_PAGE_SIZE)
+    questions = Question.objects.exclude(deleted=True).order_by(orderby)[:page_size] 
     # RISK - inner join queries
     questions = questions.select_related()
     tags = Tag.objects.get_valid_tags(INDEX_TAGS_SIZE)
 
     awards = Award.objects.get_recent_awards()
 
+    (interesting_tag_names, ignored_tag_names) = (None, None)
+    if request.user.is_authenticated():
+        pt = MarkedTag.objects.filter(user=request.user)
+        interesting_tag_names = pt.filter(reason='good').values_list('tag__name', flat=True)
+        ignored_tag_names = pt.filter(reason='bad').values_list('tag__name', flat=True)
+
+    tags_autocomplete = _get_tags_cache_json()
+
     return render_to_response('index.html', {
-                              "questions": questions,
-                              "tab_id": view_id,
-                              "tags": tags,
-                              "awards": awards[:INDEX_AWARD_SIZE],
-                              }, context_instance=RequestContext(request))
+        'interesting_tag_names': interesting_tag_names,
+        'tags_autocomplete': tags_autocomplete,
+        'ignored_tag_names': ignored_tag_names,
+        "questions" : questions,
+        "tab_id" : view_id,
+        "tags" : tags,
+        "awards" : awards[:INDEX_AWARD_SIZE],
+        }, context_instance=RequestContext(request))
 
 def about(request):
     return render_to_response('about.html', context_instance=RequestContext(request))
@@ -145,10 +160,12 @@ def questions(request, tagname=None, unanswered=False):
     List of Questions, Tagged questions, and Unanswered questions.
     """
     # template file
-    # "questions.html" or "unanswered.html"
+    # "questions.html" or maybe index.html in the future
     template_file = "questions.html"
+    # Set flag to False by default. If it is equal to True, then need to be saved.
+    pagesize_changed = False
     # get pagesize from session, if failed then get default value
-    pagesize = request.session.get("pagesize", 10)
+    pagesize = request.session.get("pagesize",10)
     try:
         page = int(request.GET.get('page', '1'))
     except ValueError:
@@ -158,68 +175,172 @@ def questions(request, tagname=None, unanswered=False):
     view_id, orderby = _get_and_remember_questions_sort_method(request,view_dic,'latest')
 
     # check if request is from tagged questions
+    qs = Question.objects.exclude(deleted=True)
+
     if tagname is not None:
-        objects = Question.objects.get_questions_by_tag(tagname, orderby)
-    elif unanswered:
-        #check if request is from unanswered questions
-        template_file = "unanswered.html"
-        objects = Question.objects.get_unanswered_questions(orderby)
-    else:
-        objects = Question.objects.get_questions(orderby)
+        qs = qs.filter(tags__name = unquote(tagname))
+
+    if unanswered:
+        qs = qs.exclude(answer_accepted=True)
 
     author_name = None
+    #user contributed questions & answers
     if 'user' in request.GET:
         try:
             author_name = request.GET['user']
             u = User.objects.get(username=author_name)
-            objects = objects.filter(Q(author=u) | Q(answers__author=u))
+            qs = qs.filter(Q(author=u) | Q(answers__author=u))
         except User.DoesNotExist:
             author_name = None
 
-    # RISK - inner join queries
-    objects = objects.select_related(depth=1);
-    objects_list = Paginator(objects, pagesize)
-    questions = objects_list.page(page)
+    if request.user.is_authenticated():
+        uid_str = str(request.user.id)
+        qs = qs.extra(
+                        select = SortedDict([
+                            (
+                                'interesting_score', 
+                                'SELECT COUNT(1) FROM forum_markedtag, question_tags '
+                                  + 'WHERE forum_markedtag.user_id = %s '
+                                  + 'AND forum_markedtag.tag_id = question_tags.tag_id '
+                                  + 'AND forum_markedtag.reason = "good" '
+                                  + 'AND question_tags.question_id = question.id'
+                            ),
+                            (
+                                'ignored_score', 
+                                'SELECT COUNT(1) FROM forum_markedtag, question_tags '
+                                  + 'WHERE forum_markedtag.user_id = %s '
+                                  + 'AND forum_markedtag.tag_id = question_tags.tag_id '
+                                  + 'AND forum_markedtag.reason = "bad" '
+                                  + 'AND question_tags.question_id = question.id'
+                            )
+                                ]),
+                        select_params = (uid_str, uid_str)
+                     )
+        #if request.user.hide_ignored_questions:
+        #    qs = qs.extra(where=['ignored_score=0']) #this doesn't work, 
+                                                      #no way to filter on ignored_score!
+
+    qs = qs.select_related(depth=1).order_by(orderby)
+
+    #don't know how to get around this - maybe have to use raw sql?
+    #the probjem is that it seems to be impossible to exclude ingored questions
+    #from the query set - 'the django way'
+    #the erzatz paginator below compensates for the current lack of proper SQL statement
+    class DummyQuerySet(list):
+        def __init__(self,items):
+            super(DummyQuerySet, self).__init__(items)
+        def count(self):
+            return len(self)
+
+    class DummyPage(list):
+        def __init__(self,items,num=1,has_next=True):
+            self.object_list = DummyQuerySet(items)
+            self.num = num
+            self.has_next_page = has_next
+        def count(self):
+            return len(self.object_list)
+        def has_next(self):
+            return self.has_next_page
+        def has_previous(self):
+            return (self.num > 1)
+        def previous_page_number(self):
+            if self.has_previous():
+                return self.num - 1
+            return self.num
+        def next_page_number(self):
+            if self.has_next():
+                return self.num + 1
+            return self.num
+
+    class HidingIgnoredPaginator(object):
+        def __init__(self,query_set,page_size):
+            self.query_set = list(query_set)#force db hit
+            self.page_size = page_size
+            self.pages = []
+            self.count = 0
+            cpage = []
+            for q in self.query_set:
+                if self.count % page_size == 0:
+                    if len(cpage) > 0:
+                        self.pages.append(cpage)
+                        cpage = []
+                if q.ignored_score == 0:
+                    cpage.append(q) 
+                    self.count += 1
+            if cpage not in self.pages and len(cpage) > 0:
+                self.pages.append(cpage)
+            self.num_pages = len(self.pages)
+
+        def page(self,num):
+            if self.num_pages == 0:
+                return DummyPage([],num=1,has_next=False)
+            elif num >= self.num_pages:
+                page_content = self.pages[-1]
+                num = self.num_pages
+                has_next = False
+            else:
+                page_content = self.pages[num-1]
+                has_next = True
+            return DummyPage(page_content,num=num,has_next=has_next)
+
+    if request.user.is_authenticated() and request.user.hide_ignored_questions:
+        objects_list = HidingIgnoredPaginator(qs, pagesize)
+        questions = objects_list.page(page)
+    else: #otherwise just use the paginator
+        objects_list = Paginator(qs, pagesize)
+        questions = objects_list.page(page)
 
     # Get related tags from this page objects
     if questions.object_list.count() > 0:
         related_tags = Tag.objects.get_tags_by_questions(questions.object_list)
     else:
         related_tags = None
+    tags_autocomplete = _get_tags_cache_json()
+
+    # get the list of interesting and ignored tags
+    (interesting_tag_names, ignored_tag_names) = (None, None)
+    if request.user.is_authenticated():
+        pt = MarkedTag.objects.filter(user=request.user)
+        interesting_tag_names = pt.filter(reason='good').values_list('tag__name', flat=True)
+        ignored_tag_names = pt.filter(reason='bad').values_list('tag__name', flat=True)
+
     return render_to_response(template_file, {
-                              "questions": questions,
-                              "author_name": author_name,
-                              "tab_id": view_id,
-                              "questions_count": objects_list.count,
-                              "tags": related_tags,
-                              "searchtag": tagname,
-                              "is_unanswered": unanswered,
-                              "context": {
-                                  'is_paginated': True,
-                                  'pages': objects_list.num_pages,
-                                  'page': page,
-                                  'has_previous': questions.has_previous(),
-                                  'has_next': questions.has_next(),
-                                  'previous': questions.previous_page_number(),
-                                  'next': questions.next_page_number(),
-                                  'base_url': request.path + '?sort=%s&' % view_id,
-                                  'pagesize': pagesize
-                              }}, context_instance=RequestContext(request))
-
-def create_new_answer(question=None, author=None, \
-                      added_at=None, wiki=False, \
-                      text='', email_notify=False):
+        "questions" : questions,
+        "author_name" : author_name,
+        "tab_id" : view_id,
+        "questions_count" : objects_list.count,
+        "tags" : related_tags,
+        "tags_autocomplete" : tags_autocomplete, 
+        "searchtag" : tagname,
+        "is_unanswered" : unanswered,
+        "interesting_tag_names": interesting_tag_names,
+        'ignored_tag_names': ignored_tag_names, 
+        "context" : {
+            'is_paginated' : True,
+            'pages': objects_list.num_pages,
+            'page': page,
+            'has_previous': questions.has_previous(),
+            'has_next': questions.has_next(),
+            'previous': questions.previous_page_number(),
+            'next': questions.next_page_number(),
+            'base_url' : request.path + '?sort=%s&' % view_id,
+            'pagesize' : pagesize
+        }}, context_instance=RequestContext(request))
+
+def create_new_answer( question=None, author=None,\
+            added_at=None, wiki=False,\
+            text='', email_notify=False):
 
     html = sanitize_html(markdowner.convert(text))
 
     #create answer
     answer = Answer(
-                    question=question,
-                    author=author,
-                    added_at=added_at,
-                    wiki=wiki,
-                    html=html
-                    )
+        question = question,
+        author = author,
+        added_at = added_at,
+        wiki = wiki,
+        html = html
+    )
     if answer.wiki:
         answer.last_edited_by = answer.author
         answer.last_edited_at = added_at 
@@ -235,13 +356,13 @@ def create_new_answer(question=None, author=None, \
 
     #update revision
     AnswerRevision.objects.create(
-                                  answer=answer,
-                                  revision=1,
-                                  author=author,
-                                  revised_at=added_at,
-                                  summary=CONST['default_version'],
-                                  text=text
-                                  )
+        answer     = answer,
+        revision   = 1,
+        author     = author,
+        revised_at = added_at,
+        summary    = CONST['default_version'],
+        text       = text
+    )
 
     #set notification/delete
     if email_notify:
@@ -254,24 +375,24 @@ def create_new_answer(question=None, author=None, \
         except:
             pass
 
-def create_new_question(title=None, author=None, added_at=None,
-                        wiki=False, tagnames=None, summary=None,
+def create_new_question(title=None,author=None,added_at=None,
+                        wiki=False,tagnames=None,summary=None,
                         text=None):
     """this is not a view
     and maybe should become one of the methods on Question object?
     """
     html = sanitize_html(markdowner.convert(text))
     question = Question(
-                        title=title,
-                        author=author,
-                        added_at=added_at,
-                        last_activity_at=added_at,
-                        last_activity_by=author,
-                        wiki=wiki,
-                        tagnames=tagnames,
-                        html=html,
-                        summary=summary
-                        )
+        title            = title,
+        author           = author, 
+        added_at         = added_at,
+        last_activity_at = added_at,
+        last_activity_by = author,
+        wiki             = wiki,
+        tagnames         = tagnames,
+        html             = html,
+        summary          = summary 
+    )
     if question.wiki:
         question.last_edited_by = question.author
         question.last_edited_at = added_at
@@ -281,15 +402,15 @@ def create_new_question(title=None, author=None, added_at=None,
 
     # create the first revision
     QuestionRevision.objects.create(
-                                    question=question,
-                                    revision=1,
-                                    title=question.title,
-                                    author=author,
-                                    revised_at=added_at,
-                                    tagnames=question.tagnames,
-                                    summary=CONST['default_version'],
-                                    text=text
-                                    )
+        question   = question,
+        revision   = 1,
+        title      = question.title,
+        author     = author,
+        revised_at = added_at,
+        tagnames   = question.tagnames,
+        summary    = CONST['default_version'],
+        text       = text
+    )
     return question
 
 #TODO: allow anynomus user to ask question by providing email and username.
@@ -300,7 +421,7 @@ def ask(request):
         if form.is_valid():
 
             added_at = datetime.datetime.now()
-            title = strip_tags(form.cleaned_data['title']).strip()
+            title = strip_tags(form.cleaned_data['title'].strip())
             wiki = form.cleaned_data['wiki']
             tagnames = form.cleaned_data['tags'].strip()
             text = form.cleaned_data['text']
@@ -311,29 +432,29 @@ def ask(request):
                 author = request.user 
 
                 question = create_new_question(
-                                               title=title,
-                                               author=author,
-                                               added_at=added_at,
-                                               wiki=wiki,
-                                               tagnames=tagnames,
-                                               summary=summary,
-                                               text=text
-                                               )
+                    title            = title,
+                    author           = author, 
+                    added_at         = added_at,
+                    wiki             = wiki,
+                    tagnames         = tagnames,
+                    summary          = summary,
+                    text = text
+                )
 
                 return HttpResponseRedirect(question.get_absolute_url())
             else:
                 request.session.flush()
                 session_key = request.session.session_key
                 question = AnonymousQuestion(
-                                             session_key=session_key,
-                                             title=title,
-                                             tagnames=tagnames,
-                                             wiki=wiki,
-                                             text=text,
-                                             summary=summary,
-                                             added_at=added_at,
-                                             ip_addr=request.META['REMOTE_ADDR'],
-                                             )
+                    session_key = session_key,
+                    title       = title,
+                    tagnames = tagnames,
+                    wiki = wiki,
+                    text = text,
+                    summary = summary,
+                    added_at = added_at,
+					ip_addr = request.META['REMOTE_ADDR'],
+                )
                 question.save()
                 return HttpResponseRedirect(reverse('user_signin_new_question'))
     else:
@@ -375,8 +496,8 @@ def question(request, id):
     question = get_object_or_404(Question, id=id)
     if question.deleted and not can_view_deleted_post(request.user, question):
         raise Http404
-    answer_form = AnswerForm(question, request.user)
-    answers = Answer.objects.get_answers_from_question(question, request.user, orderby)
+    answer_form = AnswerForm(question,request.user)
+    answers = Answer.objects.get_answers_from_question(question, request.user)
     answers = answers.select_related(depth=1)
 
     favorited = question.has_favorite_by_user(request.user)
@@ -388,14 +509,14 @@ def question(request, id):
         question_vote = question_vote[0]
 
     user_answer_votes = {}
-    for vote in question.get_user_votes_in_answers(request.user):
-        if not user_answer_votes.has_key(vote.object_id):
+    for answer in answers:
+        vote = answer.get_user_vote(request.user)
+        if vote is not None and not user_answer_votes.has_key(answer.id):
             vote_value = -1
             if vote.is_upvote():
                 vote_value = 1
-            user_answer_votes[vote.object_id] = vote_value      
+            user_answer_votes[answer.id] = vote_value
 
-    #do we need this?
     if answers is not None:
         answers = answers.order_by("-accepted", orderby)
 
@@ -442,28 +563,28 @@ def question(request, id):
         question_view.save()
 
     return render_to_response('question.html', {
-                              "question": question,
-                              "question_vote": question_vote,
-                              "question_comment_count":question.comments.count(),
-                              "answer": answer_form,
-                              "answers": page_objects.object_list,
-                              "user_answer_votes": user_answer_votes,
-                              "tags": question.tags.all(),
-                              "tab_id": view_id,
-                              "favorited": favorited,
-                              "similar_questions": Question.objects.get_similar_questions(question),
-                              "context": {
-                              'is_paginated': True,
-                              'pages': objects_list.num_pages,
-                              'page': page,
-                              'has_previous': page_objects.has_previous(),
-                              'has_next': page_objects.has_next(),
-                              'previous': page_objects.previous_page_number(),
-                              'next': page_objects.next_page_number(),
-                              'base_url': request.path + '?sort=%s&' % view_id,
-                              'extend_url': "#sort-top"
-                              }
-                              }, context_instance=RequestContext(request))
+        "question" : question,
+        "question_vote" : question_vote,
+        "question_comment_count":question.comments.count(),
+        "answer" : answer_form,
+        "answers" : page_objects.object_list,
+        "user_answer_votes": user_answer_votes,
+        "tags" : question.tags.all(),
+        "tab_id" : view_id,
+        "favorited" : favorited,
+        "similar_questions" : Question.objects.get_similar_questions(question),
+        "context" : {
+            'is_paginated' : True,
+            'pages': objects_list.num_pages,
+            'page': page,
+            'has_previous': page_objects.has_previous(),
+            'has_next': page_objects.has_next(),
+            'previous': page_objects.previous_page_number(),
+            'next': page_objects.next_page_number(),
+            'base_url' : request.path + '?sort=%s&' % view_id,
+            'extend_url' : "#sort-top"
+        }
+        }, context_instance=RequestContext(request))
 
 @login_required
 def close(request, id):
@@ -483,9 +604,9 @@ def close(request, id):
     else:
         form = CloseForm()
         return render_to_response('close.html', {
-                                  'form': form,
-                                  'question': question,
-                                  }, context_instance=RequestContext(request))
+            'form' : form,
+            'question' : question,
+            }, context_instance=RequestContext(request))
 
 @login_required
 def reopen(request, id):
@@ -493,14 +614,14 @@ def reopen(request, id):
     # open question
     if not can_reopen_question(request.user, question):
         return HttpResponse('Permission denied.')
-    if request.method == 'POST':
+    if request.method == 'POST' :
         Question.objects.filter(id=question.id).update(closed=False,
-                                                       closed_by=None, closed_at=None, close_reason=None)
+            closed_by=None, closed_at=None, close_reason=None)
         return HttpResponseRedirect(question.get_absolute_url())
     else:
         return render_to_response('reopen.html', {
-                                  'question': question,
-                                  }, context_instance=RequestContext(request))
+            'question' : question,
+            }, context_instance=RequestContext(request))
 
 @login_required
 def edit_question(request, id):
@@ -523,25 +644,25 @@ def _retag_question(request, question):
                 retagged_at = datetime.datetime.now()
                 # Update the Question itself
                 Question.objects.filter(id=question.id).update(
-                                                               tagnames=form.cleaned_data['tags'],
-                                                               last_edited_at=retagged_at,
-                                                               last_edited_by=request.user,
-                                                               last_activity_at=retagged_at,
-                                                               last_activity_by=request.user
-                                                               )
+                    tagnames         = form.cleaned_data['tags'],
+                    last_edited_at   = retagged_at,
+                    last_edited_by   = request.user,
+                    last_activity_at = retagged_at,
+                    last_activity_by = request.user
+                )
                 # Update the Question's tag associations
                 tags_updated = Question.objects.update_tags(question,
-                                                            form.cleaned_data['tags'], request.user)
+                    form.cleaned_data['tags'], request.user)
                 # Create a new revision
                 QuestionRevision.objects.create(
-                                                question=question,
-                                                title=latest_revision.title,
-                                                author=request.user,
-                                                revised_at=retagged_at,
-                                                tagnames=form.cleaned_data['tags'],
-                                                summary=CONST['retagged'],
-                                                text=latest_revision.text
-                                                )
+                    question   = question,
+                    title      = latest_revision.title,
+                    author     = request.user,
+                    revised_at = retagged_at,
+                    tagnames   = form.cleaned_data['tags'],
+                    summary    = CONST['retagged'],
+                    text       = latest_revision.text
+                )
                 # send tags updated singal
                 tags_updated.send(sender=question.__class__, question=question)
 
@@ -549,11 +670,10 @@ def _retag_question(request, question):
     else:
         form = RetagQuestionForm(question)
     return render_to_response('question_retag.html', {
-                              'question': question,
-                              'form': form,
-                              'tags': _get_tags_cache_json(),
-                              }, context_instance=RequestContext(request))
-
+        'question': question,
+        'form' : form,
+        'tags' : _get_tags_cache_json(),
+    }, context_instance=RequestContext(request))
 
 def _edit_question(request, question):
     latest_revision = question.get_latest_revision()
@@ -565,8 +685,8 @@ def _edit_question(request, question):
             if revision_form.is_valid():
                 # Replace with those from the selected revision
                 form = EditQuestionForm(question,
-                                        QuestionRevision.objects.get(question=question,
-                                        revision=revision_form.cleaned_data['revision']))
+                    QuestionRevision.objects.get(question=question,
+                        revision=revision_form.cleaned_data['revision']))
             else:
                 form = EditQuestionForm(question, latest_revision, request.POST)
         else:
@@ -600,20 +720,20 @@ def _edit_question(request, question):
                         updated_fields['wikified_at'] = edited_at
 
                     Question.objects.filter(
-                                            id=question.id).update(** updated_fields)
+                        id=question.id).update(**updated_fields)
                     # Update the Question's tag associations
                     if tags_changed:
                         tags_updated = Question.objects.update_tags(
-                                                                    question, form.cleaned_data['tags'], request.user)
+                            question, form.cleaned_data['tags'], request.user)
                     # Create a new revision
                     revision = QuestionRevision(
-                                                question=question,
-                                                title=form.cleaned_data['title'],
-                                                author=request.user,
-                                                revised_at=edited_at,
-                                                tagnames=form.cleaned_data['tags'],
-                                                text=form.cleaned_data['text'],
-                                                )
+                        question   = question,
+                        title      = form.cleaned_data['title'],
+                        author     = request.user,
+                        revised_at = edited_at,
+                        tagnames   = form.cleaned_data['tags'],
+                        text       = form.cleaned_data['text'],
+                    )
                     if form.cleaned_data['summary']:
                         revision.summary = form.cleaned_data['summary']
                     else:
@@ -626,11 +746,11 @@ def _edit_question(request, question):
         revision_form = RevisionForm(question, latest_revision)
         form = EditQuestionForm(question, latest_revision)
     return render_to_response('question_edit.html', {
-                              'question': question,
-                              'revision_form': revision_form,
-                              'form': form,
-                              'tags': _get_tags_cache_json()
-                              }, context_instance=RequestContext(request))
+        'question': question,
+        'revision_form': revision_form,
+        'form' : form,
+        'tags' : _get_tags_cache_json()
+    }, context_instance=RequestContext(request))
 
 
 @login_required
@@ -664,7 +784,7 @@ def edit_answer(request, id):
                             'last_edited_by': request.user,
                             'html': html,
                         }
-                        Answer.objects.filter(id=answer.id).update(** updated_fields)
+                        Answer.objects.filter(id=answer.id).update(**updated_fields)
 
                         revision = AnswerRevision(
                                                   answer=answer,
@@ -705,7 +825,7 @@ def question_revisions(request, id):
             'title': revision.title,
             'html': sanitize_html(markdowner.convert(revision.text)),
             'tags': ' '.join(['<a class="post-tag">%s</a>' % tag
-                             for tag in revision.tagnames.split(' ')]),
+                              for tag in revision.tagnames.split(' ')]),
         }
         if i > 0:
             revisions[i].diff = htmldiff(revisions[i-1].html, revision.html)
@@ -787,14 +907,14 @@ def tags(request):
 
     if request.method == "GET":
         stag = request.GET.get("q", "").strip()
-        if len(stag) > 0:
+        if stag != '':
             objects_list = Paginator(Tag.objects.filter(deleted=False).exclude(used_count=0).extra(where=['name like %s'], params=['%' + stag + '%']), DEFAULT_PAGE_SIZE)
         else:
-            if sortby == "used":
-                sortby = "-used_count"
+            if sortby == "name":
+                objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("name"), DEFAULT_PAGE_SIZE)
             else:
-                sortby = "name"
-            objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by(sortby), DEFAULT_PAGE_SIZE)
+                objects_list = Paginator(Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("-used_count"), DEFAULT_PAGE_SIZE)
+
     try:
         tags = objects_list.page(page)
     except (EmptyPage, InvalidPage):
@@ -814,8 +934,7 @@ def tags(request):
                                                 'previous': tags.previous_page_number(),
                                                 'next': tags.next_page_number(),
                                                 'base_url' : reverse('tags') + '?sort=%s&' % sortby
-                                            }
-        }, context_instance=RequestContext(request))
+                                            }})
 
 def tag(request, tag):
     return questions(request, tagname=tag)
@@ -861,9 +980,9 @@ def vote(request, id):
     response_data = {
         "allowed": 1,
         "success": 1,
-        "status": 0,
-        "count": 0,
-        "message": ''
+        "status" : 0,
+        "count"  : 0,
+        "message" : ''
     }
 
     def can_vote(vote_score, user):
@@ -1049,10 +1168,46 @@ def vote(request, id):
         data = simplejson.dumps(response_data)
     return HttpResponse(data, mimetype="application/json")
 
+@ajax_login_required
+def mark_tag(request, tag=None, **kwargs):
+    action = kwargs['action']
+    ts = MarkedTag.objects.filter(user=request.user, tag__name=tag)
+    if action == 'remove':
+        logging.debug('deleting tag %s' % tag)
+        ts.delete()
+    else:
+        reason = kwargs['reason']
+        if len(ts) == 0:
+            try:
+                t = Tag.objects.get(name=tag)
+                mt = MarkedTag(user=request.user, reason=reason, tag=t)
+                mt.save()
+            except:
+                pass
+        else:
+            ts.update(reason=reason)
+    return HttpResponse(simplejson.dumps(''), mimetype="application/json")
+
+@ajax_login_required
+def ajax_toggle_ignored_questions(request):
+    if request.user.hide_ignored_questions:
+        new_hide_setting = False
+    else:
+        new_hide_setting = True
+    request.user.hide_ignored_questions = new_hide_setting
+    request.user.save()
+
+@ajax_method
+def ajax_command(request):
+    if 'command' not in request.POST:
+        return HttpResponseForbidden(mimetype="application/json")
+    if request.POST['command'] == 'toggle-ignored-questions':
+        return ajax_toggle_ignored_questions(request)
+
 def users(request):
     is_paginated = True
     sortby = request.GET.get('sort', 'reputation')
-    suser = request.REQUEST.get('q', "")
+    suser = request.REQUEST.get('q',  "")
     try:
         page = int(request.GET.get('page', '1'))
     except ValueError:
@@ -1080,22 +1235,22 @@ def users(request):
         users = objects_list.page(objects_list.num_pages)
 
     return render_to_response('users.html', {
-                              "users": users,
-                              "suser": suser,
-                              "keywords": suser,
-                              "tab_id": sortby,
-                              "context": {
-                              'is_paginated': is_paginated,
-                              'pages': objects_list.num_pages,
-                              'page': page,
-                              'has_previous': users.has_previous(),
-                              'has_next': users.has_next(),
-                              'previous': users.previous_page_number(),
-                              'next': users.next_page_number(),
-                              'base_url': base_url
-                              }
-
-                              }, context_instance=RequestContext(request))
+                                "users" : users,
+                                "suser" : suser,
+                                "keywords" : suser,
+                                "tab_id" : sortby,
+                                "context" : {
+                                    'is_paginated' : is_paginated,
+                                    'pages': objects_list.num_pages,
+                                    'page': page,
+                                    'has_previous': users.has_previous(),
+                                    'has_next': users.has_next(),
+                                    'previous': users.previous_page_number(),
+                                    'next': users.next_page_number(),
+                                    'base_url' : base_url
+                                }
+
+                                }, context_instance=RequestContext(request))
 
 def user(request, id):
     sort = request.GET.get('sort', 'stats')
@@ -1162,43 +1317,43 @@ def edit_user(request, id):
 def user_stats(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
     questions = Question.objects.extra(
-                                       select={
-                                       'vote_count': 'question.score',
-                                       'favorited_myself': 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s AND f.question_id = question.id',
-                                       'la_user_id': 'auth_user.id',
-                                       'la_username': 'auth_user.username',
-                                       'la_user_gold': 'auth_user.gold',
-                                       'la_user_silver': 'auth_user.silver',
-                                       'la_user_bronze': 'auth_user.bronze',
-                                       'la_user_reputation': 'auth_user.reputation'
-                                       },
-                                       select_params=[user_id],
-                                       tables=['question', 'auth_user'],
-                                       where=['question.deleted = 0 AND question.author_id=%s AND question.last_activity_by_id = auth_user.id'],
-                                       params=[user_id],
-                                       order_by=['-vote_count', '-last_activity_at']
-                                       ).values('vote_count',
-        'favorited_myself',
-        'id',
-        'title',
-        'author_id',
-        'added_at',
-        'answer_accepted',
-        'answer_count',
-        'comment_count',
-        'view_count',
-        'favourite_count',
-        'summary',
-        'tagnames',
-        'vote_up_count',
-        'vote_down_count',
-        'last_activity_at',
-        'la_user_id',
-        'la_username',
-        'la_user_gold',
-        'la_user_silver',
-        'la_user_bronze',
-        'la_user_reputation')[:100]
+        select={
+            'vote_count' : 'question.score',
+            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s AND f.question_id = question.id',
+            'la_user_id' : 'auth_user.id',
+            'la_username' : 'auth_user.username',
+            'la_user_gold' : 'auth_user.gold',
+            'la_user_silver' : 'auth_user.silver',
+            'la_user_bronze' : 'auth_user.bronze',
+            'la_user_reputation' : 'auth_user.reputation'
+            },
+        select_params=[user_id],
+        tables=['question', 'auth_user'],
+        where=['question.deleted = 0 AND question.author_id=%s AND question.last_activity_by_id = auth_user.id'],
+        params=[user_id],
+        order_by=['-vote_count', '-last_activity_at']
+    ).values('vote_count',
+             'favorited_myself',
+             'id',
+             'title',
+             'author_id',
+             'added_at',
+             'answer_accepted',
+             'answer_count',
+             'comment_count',
+             'view_count',
+             'favourite_count',
+             'summary',
+             'tagnames',
+             'vote_up_count',
+             'vote_down_count',
+             'last_activity_at',
+             'la_user_id',
+             'la_username',
+             'la_user_gold',
+             'la_user_silver',
+             'la_user_bronze',
+             'la_user_reputation')[:100]
 
     answered_questions = Question.objects.extra(
         select={
@@ -1276,8 +1431,7 @@ def user_stats(request, user_id, user_view):
     else:
         moderate_user_form = None
 
-    return render_to_response(user_view.template_file,
-                              {
+    return render_to_response(user_view.template_file,{
                                 'moderate_user_form': moderate_user_form,
                                 "tab_name" : user_view.id,
                                 "tab_description" : user_view.tab_description,
@@ -1291,6 +1445,7 @@ def user_stats(request, user_id, user_view):
                                 "votes_today_left": votes_total-votes_today,
                                 "votes_total_per_day": votes_total,
                                 "user_tags" : user_tags[:50],
+                                "tags" : tags,
                                 "awards": awards,
                                 "total_awards" : total_awards,
                             }, context_instance=RequestContext(request))
@@ -1313,6 +1468,7 @@ def user_recent(request, user_id, user_view):
             self.title_link = reverse('question', kwargs={'id':question_id}) + u'%s' % slug_title
             if int(answer_id) > 0:
                 self.title_link += '#%s' % answer_id
+
     class AwardEvent:
         def __init__(self, time, type, id):
             self.time = time
@@ -1514,41 +1670,40 @@ def user_recent(request, user_id, user_view):
             'added_at',
             'activity_type',
             )
-
     if len(accept_answers) > 0:
         accept_answers = [(Event(q['added_at'], q['activity_type'], q['title'], '', '0', \
-                           q['question_id'])) for q in accept_answers]
+            q['question_id'])) for q in accept_answers]
         activities.extend(accept_answers)
     #award history
     awards = Activity.objects.extra(
-                                    select={
-                                    'badge_id': 'badge.id',
-                                    'awarded_at': 'award.awarded_at',
-                                    'activity_type': 'activity.activity_type'
-                                    },
-                                    tables=['activity', 'award', 'badge'],
-                                    where=['activity.user_id = award.user_id AND activity.user_id = %s AND ' +
-                                    'award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
-                                    params=[user_id, TYPE_ACTIVITY_PRIZE],
-                                    order_by=['-activity.active_at']
-                                    ).values(
-        'badge_id',
-        'awarded_at',
-        'activity_type'
-        )
+        select={
+            'badge_id' : 'badge.id',
+            'awarded_at': 'award.awarded_at',
+            'activity_type' : 'activity.activity_type'
+            },
+        tables=['activity', 'award', 'badge'],
+        where=['activity.user_id = award.user_id AND activity.user_id = %s AND '+
+            'award.badge_id=badge.id AND activity.object_id=award.id AND activity.activity_type=%s'],
+        params=[user_id, TYPE_ACTIVITY_PRIZE],
+        order_by=['-activity.active_at']
+    ).values(
+            'badge_id',
+            'awarded_at',
+            'activity_type'
+            )
     if len(awards) > 0:
         awards = [(AwardEvent(q['awarded_at'], q['activity_type'], q['badge_id'])) for q in awards]
         activities.extend(awards)
 
-    activities.sort(lambda x, y: cmp(y.time, x.time))
+    activities.sort(lambda x,y: cmp(y.time, x.time))
 
-    return render_to_response(user_view.template_file, {
-                              "tab_name": user_view.id,
-                              "tab_description": user_view.tab_description,
-                              "page_title": user_view.page_title,
-                              "view_user": user,
-                              "activities": activities[:user_view.data_size]
-                              }, context_instance=RequestContext(request))
+    return render_to_response(user_view.template_file,{
+                                    "tab_name" : user_view.id,
+                                    "tab_description" : user_view.tab_description,
+                                    "page_title" : user_view.page_title,
+                                    "view_user" : user,
+                                    "activities" : activities[:user_view.data_size]
+                                }, context_instance=RequestContext(request))
 
 def user_responses(request, user_id, user_view):
     """
@@ -1570,139 +1725,139 @@ def user_responses(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
     responses = []
     answers = Answer.objects.extra(
-                                   select={
-                                   'title': 'question.title',
-                                   'question_id': 'question.id',
-                                   'answer_id': 'answer.id',
-                                   'added_at': 'answer.added_at',
-                                   'html': 'answer.html',
-                                   'username': 'auth_user.username',
-                                   'user_id': 'auth_user.id'
-                                   },
-                                   select_params=[user_id],
-                                   tables=['answer', 'question', 'auth_user'],
-                                   where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND ' +
-                                   'question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
-                                   params=[user_id, user_id],
-                                   order_by=['-answer.id']
-                                   ).values(
-        'title',
-        'question_id',
-        'answer_id',
-        'added_at',
-        'html',
-        'username',
-        'user_id'
-        )
+                                    select={
+                                        'title' : 'question.title',
+                                        'question_id' : 'question.id',
+                                        'answer_id' : 'answer.id',
+                                        'added_at' : 'answer.added_at',
+                                        'html' : 'answer.html',
+                                        'username' : 'auth_user.username',
+                                        'user_id' : 'auth_user.id'
+                                        },
+                                    select_params=[user_id],
+                                    tables=['answer', 'question', 'auth_user'],
+                                    where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
+                                        'question.author_id = %s AND answer.author_id <> %s AND answer.author_id=auth_user.id'],
+                                    params=[user_id, user_id],
+                                    order_by=['-answer.id']
+                                ).values(
+                                        'title',
+                                        'question_id',
+                                        'answer_id',
+                                        'added_at',
+                                        'html',
+                                        'username',
+                                        'user_id'
+                                        )
     if len(answers) > 0:
         answers = [(Response(TYPE_RESPONSE['QUESTION_ANSWERED'], a['title'], a['question_id'],
-                    a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
+        a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
         responses.extend(answers)
 
 
     # question comments
     comments = Comment.objects.extra(
-                                     select={
-                                     'title': 'question.title',
-                                     'question_id': 'comment.object_id',
-                                     'added_at': 'comment.added_at',
-                                     'comment': 'comment.comment',
-                                     'username': 'auth_user.username',
-                                     'user_id': 'auth_user.id'
-                                     },
-                                     tables=['question', 'auth_user', 'comment'],
-                                     where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND ' +
-                                     'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
-                                     params=[user_id, question_type_id, user_id],
-                                     order_by=['-comment.added_at']
-                                     ).values(
-        'title',
-        'question_id',
-        'added_at',
-        'comment',
-        'username',
-        'user_id'
-        )
+                                select={
+                                    'title' : 'question.title',
+                                    'question_id' : 'comment.object_id',
+                                    'added_at' : 'comment.added_at',
+                                    'comment' : 'comment.comment',
+                                    'username' : 'auth_user.username',
+                                    'user_id' : 'auth_user.id'
+                                    },
+                                tables=['question', 'auth_user', 'comment'],
+                                where=['question.deleted = 0 AND question.author_id = %s AND comment.object_id=question.id AND '+
+                                    'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id'],
+                                params=[user_id, question_type_id, user_id],
+                                order_by=['-comment.added_at']
+                            ).values(
+                                    'title',
+                                    'question_id',
+                                    'added_at',
+                                    'comment',
+                                    'username',
+                                    'user_id'
+                                    )
 
     if len(comments) > 0:
         comments = [(Response(TYPE_RESPONSE['QUESTION_COMMENTED'], c['title'], c['question_id'],
-                     '', c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
+            '', c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
         responses.extend(comments)
 
     # answer comments
     comments = Comment.objects.extra(
-                                     select={
-                                     'title': 'question.title',
-                                     'question_id': 'question.id',
-                                     'answer_id': 'answer.id',
-                                     'added_at': 'comment.added_at',
-                                     'comment': 'comment.comment',
-                                     'username': 'auth_user.username',
-                                     'user_id': 'auth_user.id'
-                                     },
-                                     tables=['answer', 'auth_user', 'comment', 'question'],
-                                     where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND ' +
-                                     'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id ' +
-                                     'AND question.id = answer.question_id'],
-                                     params=[user_id, answer_type_id, user_id],
-                                     order_by=['-comment.added_at']
-                                     ).values(
-        'title',
-        'question_id',
-        'answer_id',
-        'added_at',
-        'comment',
-        'username',
-        'user_id'
-        )
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 'answer.id',
+            'added_at' : 'comment.added_at',
+            'comment' : 'comment.comment',
+            'username' : 'auth_user.username',
+            'user_id' : 'auth_user.id'
+            },
+        tables=['answer', 'auth_user', 'comment', 'question'],
+        where=['answer.deleted = 0 AND answer.author_id = %s AND comment.object_id=answer.id AND '+
+            'comment.content_type_id=%s AND comment.user_id <> %s AND comment.user_id = auth_user.id '+
+            'AND question.id = answer.question_id'],
+        params=[user_id, answer_type_id, user_id],
+        order_by=['-comment.added_at']
+    ).values(
+            'title',
+            'question_id',
+            'answer_id',
+            'added_at',
+            'comment',
+            'username',
+            'user_id'
+            )
 
     if len(comments) > 0:
         comments = [(Response(TYPE_RESPONSE['ANSWER_COMMENTED'], c['title'], c['question_id'],
-                     c['answer_id'], c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
+        c['answer_id'], c['added_at'], c['username'], c['user_id'], c['comment'])) for c in comments]
         responses.extend(comments)
 
     # answer has been accepted
     answers = Answer.objects.extra(
-                                   select={
-                                   'title': 'question.title',
-                                   'question_id': 'question.id',
-                                   'answer_id': 'answer.id',
-                                   'added_at': 'answer.accepted_at',
-                                   'html': 'answer.html',
-                                   'username': 'auth_user.username',
-                                   'user_id': 'auth_user.id'
-                                   },
-                                   select_params=[user_id],
-                                   tables=['answer', 'question', 'auth_user'],
-                                   where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND ' +
-                                   'answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
-                                   params=[user_id],
-                                   order_by=['-answer.id']
-                                   ).values(
-        'title',
-        'question_id',
-        'answer_id',
-        'added_at',
-        'html',
-        'username',
-        'user_id'
-        )
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 'answer.id',
+            'added_at' : 'answer.accepted_at',
+            'html' : 'answer.html',
+            'username' : 'auth_user.username',
+            'user_id' : 'auth_user.id'
+            },
+        select_params=[user_id],
+        tables=['answer', 'question', 'auth_user'],
+        where=['answer.question_id = question.id AND answer.deleted=0 AND question.deleted = 0 AND '+
+            'answer.author_id = %s AND answer.accepted=1 AND question.author_id=auth_user.id'],
+        params=[user_id],
+        order_by=['-answer.id']
+    ).values(
+            'title',
+            'question_id',
+            'answer_id',
+            'added_at',
+            'html',
+            'username',
+            'user_id'
+            )
     if len(answers) > 0:
         answers = [(Response(TYPE_RESPONSE['ANSWER_ACCEPTED'], a['title'], a['question_id'],
-                    a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
+            a['answer_id'], a['added_at'], a['username'], a['user_id'], a['html'])) for a in answers]
         responses.extend(answers)
 
     # sort posts by time
-    responses.sort(lambda x, y: cmp(y.time, x.time))
+    responses.sort(lambda x,y: cmp(y.time, x.time))
 
-    return render_to_response(user_view.template_file, {
-                              "tab_name": user_view.id,
-                              "tab_description": user_view.tab_description,
-                              "page_title": user_view.page_title,
-                              "view_user": user,
-                              "responses": responses[:user_view.data_size],
+    return render_to_response(user_view.template_file,{
+        "tab_name" : user_view.id,
+        "tab_description" : user_view.tab_description,
+        "page_title" : user_view.page_title,
+        "view_user" : user,
+        "responses" : responses[:user_view.data_size],
 
-                              }, context_instance=RequestContext(request))
+    }, context_instance=RequestContext(request))
 
 def user_votes(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
@@ -1710,61 +1865,61 @@ def user_votes(request, user_id, user_view):
         raise Http404
     votes = []
     question_votes = Vote.objects.extra(
-                                        select={
-                                        'title': 'question.title',
-                                        'question_id': 'question.id',
-                                        'answer_id': 0,
-                                        'voted_at': 'vote.voted_at',
-                                        'vote': 'vote',
-                                        },
-                                        select_params=[user_id],
-                                        tables=['vote', 'question', 'auth_user'],
-                                        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id ' +
-                                        'AND vote.user_id=auth_user.id'],
-                                        params=[question_type_id, user_id],
-                                        order_by=['-vote.id']
-                                        ).values(
-        'title',
-        'question_id',
-        'answer_id',
-        'voted_at',
-        'vote',
-        )
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 0,
+            'voted_at' : 'vote.voted_at',
+            'vote' : 'vote',
+            },
+        select_params=[user_id],
+        tables=['vote', 'question', 'auth_user'],
+        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = question.id '+
+            'AND vote.user_id=auth_user.id'],
+        params=[question_type_id, user_id],
+        order_by=['-vote.id']
+    ).values(
+            'title',
+            'question_id',
+            'answer_id',
+            'voted_at',
+            'vote',
+            )
     if(len(question_votes) > 0):
         votes.extend(question_votes)
 
     answer_votes = Vote.objects.extra(
-                                      select={
-                                      'title': 'question.title',
-                                      'question_id': 'question.id',
-                                      'answer_id': 'answer.id',
-                                      'voted_at': 'vote.voted_at',
-                                      'vote': 'vote',
-                                      },
-                                      select_params=[user_id],
-                                      tables=['vote', 'answer', 'question', 'auth_user'],
-                                      where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id ' +
-                                      'AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
-                                      params=[answer_type_id, user_id],
-                                      order_by=['-vote.id']
-                                      ).values(
-        'title',
-        'question_id',
-        'answer_id',
-        'voted_at',
-        'vote',
-        )
+        select={
+            'title' : 'question.title',
+            'question_id' : 'question.id',
+            'answer_id' : 'answer.id',
+            'voted_at' : 'vote.voted_at',
+            'vote' : 'vote',
+            },
+        select_params=[user_id],
+        tables=['vote', 'answer', 'question', 'auth_user'],
+        where=['vote.content_type_id = %s AND vote.user_id = %s AND vote.object_id = answer.id '+
+            'AND answer.question_id = question.id AND vote.user_id=auth_user.id'],
+        params=[answer_type_id, user_id],
+        order_by=['-vote.id']
+    ).values(
+            'title',
+            'question_id',
+            'answer_id',
+            'voted_at',
+            'vote',
+            )
     if(len(answer_votes) > 0):
         votes.extend(answer_votes)
-    votes.sort(lambda x, y: cmp(y['voted_at'], x['voted_at']))
-    return render_to_response(user_view.template_file, {
-                              "tab_name": user_view.id,
-                              "tab_description": user_view.tab_description,
-                              "page_title": user_view.page_title,
-                              "view_user": user,
-                              "votes": votes[:user_view.data_size]
+    votes.sort(lambda x,y: cmp(y['voted_at'], x['voted_at']))
+    return render_to_response(user_view.template_file,{
+        "tab_name" : user_view.id,
+        "tab_description" : user_view.tab_description,
+        "page_title" : user_view.page_title,
+        "view_user" : user,
+        "votes" : votes[:user_view.data_size]
 
-                              }, context_instance=RequestContext(request))
+    }, context_instance=RequestContext(request))
 
 def user_reputation(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
@@ -1789,14 +1944,12 @@ def user_reputation(request, user_id, user_view):
                                           params=[user.id]
                                           ).values('positive', 'negative', 'question_id', 'title', 'reputed_at', 'reputation')
         reputation.query.group_by = ['question_id']
-
     rep_list = []
     for rep in Repute.objects.filter(user=user).order_by('reputed_at'):
         dic = '[%s,%s]' % (calendar.timegm(rep.reputed_at.timetuple()) * 1000, rep.reputation)
         rep_list.append(dic)
     reps = ','.join(rep_list)
     reps = '[%s]' % reps
-
     return render_to_response(user_view.template_file, {
                               "tab_name": user_view.id,
                               "tab_description": user_view.tab_description,
@@ -1809,81 +1962,84 @@ def user_reputation(request, user_id, user_view):
 def user_favorites(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
     questions = Question.objects.extra(
-                                       select={
-                                       'vote_count': 'question.vote_up_count + question.vote_down_count',
-                                       'favorited_myself': 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s ' +
-                                       'AND f.question_id = question.id',
-                                       'la_user_id': 'auth_user.id',
-                                       'la_username': 'auth_user.username',
-                                       'la_user_gold': 'auth_user.gold',
-                                       'la_user_silver': 'auth_user.silver',
-                                       'la_user_bronze': 'auth_user.bronze',
-                                       'la_user_reputation': 'auth_user.reputation'
-                                       },
-                                       select_params=[user_id],
-                                       tables=['question', 'auth_user', 'favorite_question'],
-                                       where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id ' +
-                                       'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
-                                       params=[user_id],
-                                       order_by=['-vote_count', '-question.id']
-                                       ).values('vote_count',
-        'favorited_myself',
-        'id',
-        'title',
-        'author_id',
-        'added_at',
-        'answer_accepted',
-        'answer_count',
-        'comment_count',
-        'view_count',
-        'favourite_count',
-        'summary',
-        'tagnames',
-        'vote_up_count',
-        'vote_down_count',
-        'last_activity_at',
-        'la_user_id',
-        'la_username',
-        'la_user_gold',
-        'la_user_silver',
-        'la_user_bronze',
-        'la_user_reputation')
-    return render_to_response(user_view.template_file, {
-                              "tab_name": user_view.id,
-                              "tab_description": user_view.tab_description,
-                              "page_title": user_view.page_title,
-                              "questions": questions[:user_view.data_size],
-                              "view_user": user
-                              }, context_instance=RequestContext(request))
-
+        select={
+            'vote_count' : 'question.vote_up_count + question.vote_down_count',
+            'favorited_myself' : 'SELECT count(*) FROM favorite_question f WHERE f.user_id = %s '+
+                'AND f.question_id = question.id',
+            'la_user_id' : 'auth_user.id',
+            'la_username' : 'auth_user.username',
+            'la_user_gold' : 'auth_user.gold',
+            'la_user_silver' : 'auth_user.silver',
+            'la_user_bronze' : 'auth_user.bronze',
+            'la_user_reputation' : 'auth_user.reputation'
+            },
+        select_params=[user_id],
+        tables=['question', 'auth_user', 'favorite_question'],
+        where=['question.deleted = 0 AND question.last_activity_by_id = auth_user.id '+
+            'AND favorite_question.question_id = question.id AND favorite_question.user_id = %s'],
+        params=[user_id],
+        order_by=['-vote_count', '-question.id']
+    ).values('vote_count',
+             'favorited_myself',
+             'id',
+             'title',
+             'author_id',
+             'added_at',
+             'answer_accepted',
+             'answer_count',
+             'comment_count',
+             'view_count',
+             'favourite_count',
+             'summary',
+             'tagnames',
+             'vote_up_count',
+             'vote_down_count',
+             'last_activity_at',
+             'la_user_id',
+             'la_username',
+             'la_user_gold',
+             'la_user_silver',
+             'la_user_bronze',
+             'la_user_reputation')
+    return render_to_response(user_view.template_file,{
+        "tab_name" : user_view.id,
+        "tab_description" : user_view.tab_description,
+        "page_title" : user_view.page_title,
+        "questions" : questions[:user_view.data_size],
+        "view_user" : user
+    }, context_instance=RequestContext(request))
 
 def user_email_subscriptions(request, user_id, user_view):
     user = get_object_or_404(User, id=user_id)
     if request.method == 'POST':
-        form = EditUserEmailFeedsForm(request.POST)
-        if form.is_valid():
+        email_feeds_form = EditUserEmailFeedsForm(request.POST)
+        tag_filter_form = TagFilterSelectionForm(request.POST, instance=user)
+        if email_feeds_form.is_valid() and tag_filter_form.is_valid():
+            tag_filter_form.save()
             if 'save' in request.POST:
-                saved = form.save(user)
+                saved = email_feeds_form.save(user)
                 if saved:
                     action_status = _('changes saved')
             elif 'stop_email' in request.POST:
-                saved = form.reset().save(user)
+                saved = email_feeds_form.reset().save(user)
                 initial_values = EditUserEmailFeedsForm.NO_EMAIL_INITIAL
-                form = EditUserEmailFeedsForm(initial=initial_values)
+                email_feeds_form = EditUserEmailFeedsForm(initial=initial_values)
                 if saved:
                     action_status = _('email updates canceled')
             if not saved:
                 action_status = None
     else:
-        form = EditUserEmailFeedsForm()
-        form.set_initial_values(user)
+        email_feeds_form = EditUserEmailFeedsForm()
+        email_feeds_form.set_initial_values(user)
+        tag_filter_form = TagFilterSelectionForm(instance=user)
         action_status = None
     return render_to_response(user_view.template_file,{
         'tab_name':user_view.id,
         'tab_description':user_view.tab_description,
         'page_title':user_view.page_title,
         'view_user':user,
-        'email_feeds_form':form,
+        'email_feeds_form':email_feeds_form,
+        'tag_filter_selection_form':tag_filter_form,
         'action_status':action_status,
     }, context_instance=RequestContext(request))
 
@@ -1979,21 +2135,21 @@ def badges(request):
 def badge(request, id):
     badge = get_object_or_404(Badge, id=id)
     awards = Award.objects.extra(
-                                 select={'id': 'auth_user.id',
-                                 'name': 'auth_user.username',
-                                 'rep':'auth_user.reputation',
-                                 'gold': 'auth_user.gold',
-                                 'silver': 'auth_user.silver',
-                                 'bronze': 'auth_user.bronze'},
-                                 tables=['award', 'auth_user'],
-                                 where=['badge_id=%s AND user_id=auth_user.id'],
-                                 params=[id]
-                                 ).values('id').distinct()
+        select={'id': 'auth_user.id', 
+                'name': 'auth_user.username', 
+                'rep':'auth_user.reputation', 
+                'gold': 'auth_user.gold', 
+                'silver': 'auth_user.silver', 
+                'bronze': 'auth_user.bronze'},
+        tables=['award', 'auth_user'],
+        where=['badge_id=%s AND user_id=auth_user.id'],
+        params=[id]
+    ).values('id').distinct()
 
     return render_to_response('badge.html', {
-                              'awards': awards,
-                              'badge': badge,
-                              }, context_instance=RequestContext(request))
+        'awards' : awards,
+        'badge' : badge,
+    }, context_instance=RequestContext(request))
 
 def read_message(request):
     if request.method == "POST":
@@ -2025,8 +2181,8 @@ def upload(request):
         if not file_name_suffix in settings.ALLOW_FILE_TYPES:
             raise FileTypeNotAllow
 
-        # genetate new file name
-        new_file_name = str(time.time()).replace('.', str(random.randint(0, 100000))) + file_name_suffix
+        # generate new file name
+        new_file_name = str(time.time()).replace('.', str(random.randint(0,100000))) + file_name_suffix
         # use default storage to store file
         default_storage.save(new_file_name, f)
         # check file size
@@ -2084,7 +2240,7 @@ def book(request, short_name, unanswered=False):
             page = 1
 
         view_id = request.GET.get('sort', None)
-        view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score"}
+        view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
         try:
             orderby = view_dic[view_id]
         except KeyError:
@@ -2105,22 +2261,22 @@ def book(request, short_name, unanswered=False):
         questions = objects_list.page(page)
 
         return render_to_response('book.html', {
-                                  "book": book,
-                                  "author_info": author_info,
-                                  "author_rss": author_rss,
-                                  "questions": questions,
-                                  "context": {
-                                  'is_paginated': True,
-                                  'pages': objects_list.num_pages,
-                                  'page': page,
-                                  'has_previous': questions.has_previous(),
-                                  'has_next': questions.has_next(),
-                                  'previous': questions.previous_page_number(),
-                                  'next': questions.next_page_number(),
-                                  'base_url': request.path + '?sort=%s&' % view_id,
-                                  'pagesize': user_page_size
-                                  }
-                                  }, context_instance=RequestContext(request))
+            "book" : book,
+            "author_info" : author_info,
+            "author_rss" : author_rss,
+            "questions" : questions,
+            "context" : {
+                'is_paginated' : True,
+                'pages': objects_list.num_pages,
+                'page': page,
+                'has_previous': questions.has_previous(),
+                'has_next': questions.has_next(),
+                'previous': questions.previous_page_number(),
+                'next': questions.next_page_number(),
+                'base_url' : request.path + '?sort=%s&' % view_id,
+                'pagesize' : user_page_size
+            }
+        }, context_instance=RequestContext(request))
 
 @login_required
 def ask_book(request, short_name):
@@ -2130,16 +2286,16 @@ def ask_book(request, short_name):
             added_at = datetime.datetime.now()
             html = sanitize_html(markdowner.convert(form.cleaned_data['text']))
             question = Question(
-                                title=strip_tags(form.cleaned_data['title']),
-                                author=request.user,
-                                added_at=added_at,
-                                last_activity_at=added_at,
-                                last_activity_by=request.user,
-                                wiki=form.cleaned_data['wiki'],
-                                tagnames=form.cleaned_data['tags'].strip(),
-                                html=html,
-                                summary=strip_tags(html)[:120]
-                                )
+                title            = strip_tags(form.cleaned_data['title']),
+                author           = request.user,
+                added_at         = added_at,
+                last_activity_at = added_at,
+                last_activity_by = request.user,
+                wiki             = form.cleaned_data['wiki'],
+                tagnames         = form.cleaned_data['tags'].strip(),
+                html             = html,
+                summary          = strip_tags(html)[:120]
+            )
             if question.wiki:
                 question.last_edited_by = question.author
                 question.last_edited_at = added_at
@@ -2149,15 +2305,15 @@ def ask_book(request, short_name):
 
             # create the first revision
             QuestionRevision.objects.create(
-                                            question=question,
-                                            revision=1,
-                                            title=question.title,
-                                            author=request.user,
-                                            revised_at=added_at,
-                                            tagnames=question.tagnames,
-                                            summary=CONST['default_version'],
-                                            text=form.cleaned_data['text']
-                                            )
+                question   = question,
+                revision   = 1,
+                title      = question.title,
+                author     = request.user,
+                revised_at = added_at,
+                tagnames   = question.tagnames,
+                summary    = CONST['default_version'],
+                text       = form.cleaned_data['text']
+            )
             
             books = Book.objects.extra(where=['short_name = %s'], params=[short_name])
             match_count = len(books)
@@ -2171,13 +2327,11 @@ def ask_book(request, short_name):
         form = AskForm()
 
     tags = _get_tags_cache_json()
-    return render_to_response('ask.html', 
-                                {
-                                    'form' : form,
-                                    'tags' : tags,
-                                    'email_validation_faq_url': reverse('faq') + '#validate',
-                                }, context_instance=RequestContext(request)
-                             )
+    return render_to_response('ask.html', {
+        'form' : form,
+        'tags' : tags,
+        'email_validation_faq_url': reverse('faq') + '#validate',
+        }, context_instance=RequestContext(request))
 
 def search(request):
     """
@@ -2228,7 +2382,7 @@ def search(request):
                     user.save()
 
             view_id = request.GET.get('sort', None)
-            view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score"}
+            view_dic = {"latest":"-added_at", "active":"-last_activity_at", "hottest":"-answer_count", "mostvoted":"-score" }
             try:
                 orderby = view_dic[view_id]
             except KeyError:
@@ -2257,25 +2411,25 @@ def search(request):
                         related_tags.append(tag)
 
             return render_to_response(template_file, {
-                                      "questions": questions,
-                                      "tab_id": view_id,
-                                      "questions_count": objects_list.count,
-                                      "tags": related_tags,
-                                      "searchtag": None,
-                                      "searchtitle": keywords,
-                                      "keywords": keywords,
-                                      "is_unanswered": False,
-                                      "context": {
-                                      'is_paginated': True,
-                                      'pages': objects_list.num_pages,
-                                      'page': page,
-                                      'has_previous': questions.has_previous(),
-                                      'has_next': questions.has_next(),
-                                      'previous': questions.previous_page_number(),
-                                      'next': questions.next_page_number(),
-                                      'base_url': request.path + '?t=question&q=%s&sort=%s&' % (keywords, view_id),
-                                      'pagesize': pagesize
-                                      }}, context_instance=RequestContext(request))
+                "questions" : questions,
+                "tab_id" : view_id,
+                "questions_count" : objects_list.count,
+                "tags" : related_tags,
+                "searchtag" : None,
+                "searchtitle" : keywords,
+                "keywords" : keywords,
+                "is_unanswered" : False,
+                "context" : {
+                    'is_paginated' : True,
+                    'pages': objects_list.num_pages,
+                    'page': page,
+                    'has_previous': questions.has_previous(),
+                    'has_next': questions.has_next(),
+                    'previous': questions.previous_page_number(),
+                    'next': questions.next_page_number(),
+                    'base_url' : request.path + '?t=question&q=%s&sort=%s&' % (keywords, view_id),
+                    'pagesize' : pagesize
+                }}, context_instance=RequestContext(request))
  
     else:
         raise Http404
diff --git a/settings.py b/settings.py
index e964f092..a32b2303 100644
--- a/settings.py
+++ b/settings.py
@@ -25,7 +25,7 @@ MIDDLEWARE_CLASSES = (
     'middleware.anon_user.ConnectToSessionMessagesMiddleware',
     'middleware.pagesize.QuestionsPageSizeMiddleware',
     'middleware.cancel.CancelActionMiddleware',
-    #'debug_toolbar.middleware.DebugToolbarMiddleware',
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -62,7 +62,7 @@ INSTALLED_APPS = (
     'forum',
     'django_authopenid',
     'djangosphinx',
-    #'debug_toolbar' ,
+    'debug_toolbar' ,
     'user_messages',
 )
 
diff --git a/sql_scripts/091208_upgrade_evgeny.sql b/sql_scripts/091208_upgrade_evgeny.sql
new file mode 100644
index 00000000..d9c4289a
--- /dev/null
+++ b/sql_scripts/091208_upgrade_evgeny.sql
@@ -0,0 +1 @@
+ALTER TABLE `auth_user` add column hide_ignored_questions tinyint(1) not NULL;
diff --git a/sql_scripts/091208_upgrade_evgeny_1.sql b/sql_scripts/091208_upgrade_evgeny_1.sql
new file mode 100644
index 00000000..b1b4107f
--- /dev/null
+++ b/sql_scripts/091208_upgrade_evgeny_1.sql
@@ -0,0 +1 @@
+ALTER TABLE `auth_user` add column `tag_filter_setting` varchar(16) not NULL default 'ignored';
diff --git a/sql_scripts/update_2009_01_25_001.sql b/sql_scripts/update_2009_01_25_001.sql
index f6f3bed2..16c3487b 100644
--- a/sql_scripts/update_2009_01_25_001.sql
+++ b/sql_scripts/update_2009_01_25_001.sql
@@ -1,2 +1,2 @@
 ALTER TABLE `award` ADD `content_type_id` INT NULL 
-ALTER TABLE `award` ADD `object_id` INT NULL 
\ No newline at end of file
+ALTER TABLE `award` ADD `object_id` INT NULL 
diff --git a/sql_scripts/update_2009_02_26_001.sql b/sql_scripts/update_2009_02_26_001.sql
index 4113d8f5..a6af5931 100644
--- a/sql_scripts/update_2009_02_26_001.sql
+++ b/sql_scripts/update_2009_02_26_001.sql
@@ -16,4 +16,4 @@ WHERE tagnames like '%c#%'
 
 UPDATE question_revision
 SET tagnames = replace(tagnames, 'c#', 'csharp')
-WHERE tagnames like '%c#%'
\ No newline at end of file
+WHERE tagnames like '%c#%'
diff --git a/sql_scripts/update_2009_04_10_001.sql b/sql_scripts/update_2009_04_10_001.sql
index e1ceb3bc..8148632a 100644
--- a/sql_scripts/update_2009_04_10_001.sql
+++ b/sql_scripts/update_2009_04_10_001.sql
@@ -1,3 +1,3 @@
 ALTER TABLE Tag ADD COLUMN deleted_at datetime default null;
 ALTER TABLE Tag ADD COLUMN deleted_by_id INTEGER NULL;
-ALTER TABLE Tag ADD COLUMN deleted TINYINT NOT NULL;
\ No newline at end of file
+ALTER TABLE Tag ADD COLUMN deleted TINYINT NOT NULL;
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index 9a94c3c4..ce5fb7fe 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -88,6 +88,7 @@ parameters:
             </div>
             <p class='nomargin'>{% trans "receive updates motivational blurb" %}</p>
             {% include "edit_user_email_feeds_form.html" %}
+            <p class='nomargin'>{% trans "Tag filter tool will be your right panel, once you log in." %}</p>
             <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div>
 		</form>
 	</div>
diff --git a/templates/base.html b/templates/base.html
index ec0a53d7..daafc3bc 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -75,7 +75,6 @@
                     {% endblock%}
 
                 </div>
-
                 <div id="CARight">
                     {% block sidebar%}
                     {% endblock%}
diff --git a/templates/content/images/close-small-dark.png b/templates/content/images/close-small-dark.png
new file mode 100644
index 00000000..280c1fc7
Binary files /dev/null and b/templates/content/images/close-small-dark.png differ
diff --git a/templates/content/js/com.cnprog.admin.js b/templates/content/js/com.cnprog.admin.js
index 73b5768f..cb1c1b15 100644
--- a/templates/content/js/com.cnprog.admin.js
+++ b/templates/content/js/com.cnprog.admin.js
@@ -3,7 +3,7 @@ $().ready( function(){
                    success: function(a,b){$('.admin #action_status').html($.i18n._('changes saved'));},
                    dataType:'json',
                    timeout:5000,
-                   url: $.i18n._('/') + $.i18n._('moderate-user/') + viewUserID +  '/'
+                   url: scriptUrl + $.i18n._('moderate-user/') + viewUserID +  '/'
                     };
     var form = $('.admin #moderate_user_form').ajaxForm(options);
     var box = $('.admin input#id_is_approved').click(function(){ 
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index 5d58ff21..0d4c52d3 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -500,7 +500,7 @@ function createComments(type) {
                 jDiv.append('<p id="' + divId + '" class="comment">'
 					+ $.i18n._('to comment, need') + ' ' +
 					+ repNeededForComments + ' ' + $.i18n._('community karma points') 
-					+ '<a href="' + $.i18n._('/') + $.i18n._('faq/') + '" class="comment-user">'
+					+ '<a href="' + scriptUrl + $.i18n._('faq/') + '" class="comment-user">'
                     + $.i18n._('please see') + 'faq</a></span></p>');
             }
         }
@@ -601,7 +601,7 @@ function createComments(type) {
                 $(this).children().each(
                     function(i){
                         var comment_id = $(this).attr('id').replace('comment-','');
-                        var delete_url = $.i18n._('/') + objectType + 's/' + post_id + '/'
+                        var delete_url = scriptUrl + objectType + 's/' + post_id + '/'
                                         + $.i18n._('comments/') + comment_id + '/' + $.i18n._('delete/');
                         var html = $(this).html();
                         var CommentsClass;
@@ -615,12 +615,12 @@ function createComments(type) {
                         delete_icon.click(function(){CommentsClass.deleteComment($(this),comment_id,delete_url);});
                         delete_icon.unbind('mouseover').bind('mouseover',
                             function(){
-                                $(this).attr('src',$.i18n._('/') + 'content/images/close-small-hover.png');
+                                $(this).attr('src',scriptUrl + 'content/images/close-small-hover.png');
                             }
                         );
                         delete_icon.unbind('mouseout').bind('mouseout',
                             function(){
-                                $(this).attr('src',$.i18n._('/') + 'content/images/close-small.png');
+                                $(this).attr('src',scriptUrl + 'content/images/close-small.png');
                             }
                         );
                     }
@@ -670,12 +670,178 @@ function createComments(type) {
     };
 }
 
+function pickedTags(){
+
+    var sendAjax = function(tagname, reason, action, callback){
+        url = scriptUrl;
+        if (action == 'add'){
+            url += $.i18n._('mark-tag/');
+            if (reason == 'good'){
+                url += $.i18n._('interesting/');
+            }
+            else {
+                url += $.i18n._('ignored/');
+            }
+        }
+        else {
+            url += $.i18n._('unmark-tag/');
+        }
+        url = url + tagname + '/';
+
+        call_settings = {
+            type:'POST',
+            url:url
+        }
+        if (callback != false){
+            call_settings['success'] = callback;
+        }
+        $.ajax(call_settings);
+    }
+
+
+    var unpickTag = function(from_target ,tagname, reason, send_ajax){
+        //send ajax request to delete tag
+        var deleteTagLocally = function(){
+            from_target[tagname].remove();
+            delete from_target[tagname];
+        }
+        if (send_ajax){
+            sendAjax(tagname,reason,'remove',deleteTagLocally);
+        }
+        else {
+            deleteTagLocally();
+        }
+
+    }
+
+    var setupTagDeleteEvents = function(obj,tag_store,tagname,reason,send_ajax){
+        obj.unbind('mouseover').bind('mouseover', function(){
+            $(this).attr('src', scriptUrl + 'content/images/close-small-hover.png');
+        });
+        obj.unbind('mouseout').bind('mouseout', function(){
+            $(this).attr('src', scriptUrl + 'content/images/close-small-dark.png');
+        });
+        obj.click( function(){
+            unpickTag(tag_store,tagname,reason,send_ajax);
+        });
+    }
+
+    var handlePickedTag = function(obj,reason){
+        var tagname = $.trim($(obj).prev().attr('value'));
+        to_target = interestingTags;
+        from_target = ignoredTags;
+        if (reason == 'bad'){
+            to_target = ignoredTags;
+            from_target = interestingTags;
+            to_tag_container = $('div .tags.ignored');
+        }
+        else if (reason != 'good'){
+            return;
+        }
+        else {
+            to_tag_container = $('div .tags.interesting');
+        }
+
+        if (tagname in from_target){
+            unpickTag(from_target,tagname,reason,false);
+        }
+
+        if (!(tagname in to_target)){
+            //send ajax request to pick this tag
+
+            sendAjax(tagname,reason,'add',function(){
+                new_tag = $('<span></span>');
+                new_tag.addClass('deletable-tag');
+                tag_link = $('<a></a>');
+                tag_link.attr('rel','tag');
+                tag_link.attr('href', scriptUrl + $.i18n._('tags/') + tagname);
+                tag_link.html(tagname);
+                del_link = $('<img></img>');
+                del_link.addClass('delete-icon');
+                del_link.attr('src', scriptUrl + 'content/images/close-small-dark.png');
+
+                setupTagDeleteEvents(del_link, to_target, tagname, reason, true);
+
+                new_tag.append(tag_link);
+                new_tag.append(del_link);
+                to_tag_container.append(new_tag);
+
+                to_target[tagname] = new_tag;
+            });
+        }
+    }
+
+    var collectPickedTags = function(){
+        var good_prefix = 'interesting-tag-';
+        var bad_prefix = 'ignored-tag-';
+        var good_re = RegExp('^' + good_prefix);
+        var bad_re = RegExp('^' + bad_prefix);
+        interestingTags = {};
+        ignoredTags = {};
+        $('.deletable-tag').each(
+            function(i,item){
+                item_id = $(item).attr('id')
+                if (good_re.test(item_id)){
+                    tag_name = item_id.replace(good_prefix,'');
+                    tag_store = interestingTags;
+                    reason = 'good';
+                }
+                else if (bad_re.test(item_id)){
+                    tag_name = item_id.replace(bad_prefix,'');
+                    tag_store = ignoredTags;
+                    reason = 'bad';
+                } 
+                else {
+                    return;
+                }
+                tag_store[tag_name] = $(item);
+                setupTagDeleteEvents($(item).find('img'),tag_store,tag_name,reason,true)
+            }
+        );
+    }
+
+    var setupHideIgnoredQuestionsControl = function(){
+        $('#hideIgnoredTagsCb').unbind('click').click(function(){
+            $.ajax({
+                        type: 'POST',
+                        dataType: 'json',
+                        cache: false,
+                        url: scriptUrl + $.i18n._('command/'),
+                        data: {command:'toggle-ignored-questions'}
+                    });
+        });
+    }
+    return {
+        init: function(){
+            collectPickedTags();
+            setupHideIgnoredQuestionsControl();
+            $("#interestingTagInput, #ignoredTagInput").autocomplete(tags, {
+                minChars: 1,
+                matchContains: true,
+                max: 20,
+                multiple: true,
+                multipleSeparator: " ",
+                formatItem: function(row, i, max) {
+                    return row.n + " ("+ row.c +")";
+                },
+                formatResult: function(row, i, max){
+                    return row.n;
+                }
+
+            });
+            $("#interestingTagAdd").click(function(){handlePickedTag(this,'good')});
+            $("#ignoredTagAdd").click(function(){handlePickedTag(this,'bad')});
+        }
+    };
+}
+
 var questionComments = createComments('question');
 var answerComments = createComments('answer');
 
 $().ready(function() {
     questionComments.init();
     answerComments.init();
+    pickedTags().init();
 });
 
 var commentsFactory = {'question' : questionComments, 'answer' : answerComments};
diff --git a/templates/content/js/com.cnprog.utils.js b/templates/content/js/com.cnprog.utils.js
index cf27c8a1..b19b6773 100644
--- a/templates/content/js/com.cnprog.utils.js
+++ b/templates/content/js/com.cnprog.utils.js
@@ -36,7 +36,7 @@ var notify = function() {
 
 function appendLoader(containerSelector) {
     $(containerSelector).append('<img class="ajax-loader" '
-		+'src="' + $.i18n._('/') + 'content/images/indicator.gif" title="'
+		+'src="' + scriptUrl + 'content/images/indicator.gif" title="'
 		+$.i18n._('loading...')
 		+'" alt="'
 		+$.i18n._('loading...')
diff --git a/templates/content/js/compress.bat b/templates/content/js/compress.bat
index 41e1882a..5b2673cf 100644
--- a/templates/content/js/compress.bat
+++ b/templates/content/js/compress.bat
@@ -2,5 +2,4 @@
 #java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 wmd\showdown.js -o wmd\showdown-min.js
 #java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 com.cnprog.post.js -o com.cnprog.post.pack.js
 java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 se_hilite_src.js -o se_hilite.js
-
-pause
\ No newline at end of file
+pause
diff --git a/templates/content/js/flot-build.bat b/templates/content/js/flot-build.bat
index fc715e3a..f9f32cb7 100644
--- a/templates/content/js/flot-build.bat
+++ b/templates/content/js/flot-build.bat
@@ -1,3 +1,3 @@
 java -jar yuicompressor-2.4.2.jar --type js  --charset utf-8 jquery.flot.js -o jquery.flot.pack.js
 
-pause
\ No newline at end of file
+pause
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 4038e8a1..47b4dc00 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -162,7 +162,7 @@ blockquote
     border-right:1px solid #b4b48e;
     border-bottom:1px solid #b4b48e;*/
     background: white;/* #f9f7ed;*/
-    margin:10px 0 10px 0;
+    /*margin:10px 0 10px 0;*/
     /*background:url(../images/quest-bg.gif) repeat-x top;*/
 }
 #listA .qstA thumb {float:left; }
@@ -204,7 +204,14 @@ blockquote
     /*border-bottom:1px solid #888a85;*/
 }
 .evenMore {font-size:14px; font-weight:800;}
-.questions-count{font-size:32px;font-family:sans-serif;font-weight:600;padding:0 0 5px 7px;color:#a40000;}
+.questions-count{
+    font-size:32px;
+    font-family:sans-serif;
+    font-weight:600;
+    padding:0 0 5px 0px;
+    color:#a40000;
+    margin-top:3px;
+}
 
 /*内容块*/
 .boxA {background:#888a85; padding:6px; margin-bottom:8px;border 1px solid #babdb6;}
@@ -216,7 +223,7 @@ blockquote
 .boxB .body {border:1px solid #aaaaaa; padding:8px; background:#FFF; font-size:13px; line-height:160%;}
 .boxB .more {padding:1px; text-align:right; font-weight:800;}
 .boxC {
-    background:#babdb6;/*f9f7ed;*/
+    background: #cacdc6;/*f9f7ed;*/
     padding:10px; 
     margin-bottom:8px;
     border-top:1px solid #eeeeec;
@@ -224,6 +231,12 @@ blockquote
     border-right:1px solid #a9aca5;
     border-bottom:1px solid #babdb6;
 }
+.boxC p {
+    margin-bottom:8px;
+}
+.boxC p.nomargin {
+    margin:0px;
+}
 .boxC p.info-box-follow-up-links {
     text-align:right;
     margin:0;
@@ -308,12 +321,14 @@ blockquote
 /*标签*/
 .tag {font-size:13px; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
 .tags {font-family:sans-serif; line-height:200%; display:block; margin-top:5px;}
-.tags a {font-size:13px; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
+.tags a {white-space: nowrap; font-size:13px; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
 .tags a:hover {background-color:#fFF;color:#333;}
 .tagsbox {line-height:200%;}
 .tagsbox a {font-size:13px; font-weight:normal; color:#333; text-decoration:none;background-color:#EEE; border-left:3px solid #777; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:1px 8px 1px 8px;}
 .tagsbox a:hover {background-color:#fFF;color:#333;}
 .tag-number {font-weight:700;font-family:sans-serif;}
+.marked-tags { margin-top: 0px;margin-bottom: 5px; }
+.deletable-tag { margin-right: 3px; white-space:nowrap; }
 
 /*奖牌*/
 a.medal  { font-size:14px; line-height:250%; font-weight:800; color:#333; text-decoration:none; background:url(../images/medala.gif) no-repeat; border-left:1px solid #EEE; border-top:1px solid #EEE; border-bottom:1px solid #CCC; border-right:1px solid #CCC; padding:4px 12px 4px 6px;}
@@ -1422,3 +1437,12 @@ ul.form-horizontal-rows li input {
     text-align:center;
     font-weight:bold;
 }
+#tagSelector {
+    padding-bottom: 2px;
+}
+#hideIgnoredTagsControl {
+    margin: 5px 0 0 0;
+}
+#hideIgnoredTagsCb {
+    margin: 0 2px 0 1px;
+}
diff --git a/templates/index.html b/templates/index.html
index 470612b4..68a13197 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,13 +10,15 @@
         <meta name="description" content="{{ settings.APP_DESCRIPTION }}" />{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
-        $().ready(function(){
-            var tab_id = "{{ tab_id }}";
-            $("#"+tab_id).attr('className',"on");
-            $("#nav_questions").attr('className',"on");
-        });
-
-        </script>
+           var tags = {{ tags_autocomplete|safe }};
+           $().ready(function(){
+               var tab_id = "{{ tab_id }}";
+               $("#"+tab_id).attr('className',"on");
+               $("#nav_questions").attr('className',"on");
+           });
+       </script>
+       <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+       <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
 {% endblock %}
 {% block content %}
 <div class="tabBar">
@@ -118,6 +120,8 @@
 	  <div class="more"><a href="{% url faq %}">{% trans "faq" %} »</a></div>
 	</div>
 </div>
+{% else %}
+{% include "tag_selector.html" %}
 {% endif %}
 <div class="boxC">
 	<h3>{% trans "Recent tags" %}</h3>
diff --git a/templates/questions.html b/templates/questions.html
index 47bda129..63026dc3 100644
--- a/templates/questions.html
+++ b/templates/questions.html
@@ -8,16 +8,19 @@
 {% block title %}{% spaceless %}{% trans "Questions" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
-        $().ready(function(){
-            var tab_id = "{{ tab_id }}";
-            $("#"+tab_id).attr('className',"on");
-            $("#nav_questions").attr('className',"on");
-            Hilite.exact = false;
-            Hilite.elementid = "listA";
-            Hilite.debug_referrer = location.href;
-        });
-         
-        </script>
+           var tags = {{ tags_autocomplete|safe }};
+           $().ready(function(){
+               var tab_id = "{{ tab_id }}";
+               $("#"+tab_id).attr('className',"on");
+               var on_tab = {% if is_unanswered %}'#nav_unanswered'{% else %}'#nav_questions'{% endif %};
+               $(on_tab).attr('className','on');
+               Hilite.exact = false;
+               Hilite.elementid = "listA";
+               Hilite.debug_referrer = location.href;
+           });
+       </script>
+       <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+       <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
 {% endblock %}
 {% block content %}
 <div class="tabBar">
@@ -32,7 +35,11 @@
                     {% trans "Found by title" %}
                 {% endif %}
             {% else %}
-                {% trans "All questions" %}
+                {% if is_unanswered %}
+                    {% trans "Unanswered questions" %}
+                {% else %}
+                    {% trans "All questions" %}
+                {% endif %}
             {% endif %}
         {% endif %}
     </div>
@@ -45,7 +52,17 @@
 </div>
 <div id="listA">
     {% for question in questions.object_list %}
-    <div class="qstA">
+    <div class="qstA"
+        {% if request.user.is_authenticated %}
+            {% if question.interesting_score > 0 %}
+                    style="background:#ffff99;"
+            {% else %}
+                {% if question.ignored_score > 0 %}
+                    style="background:#f3f3f3;"
+                {% endif %}
+            {% endif %}
+        {% endif %}
+    >
         <h2>
             <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
         </h2>
@@ -134,25 +151,18 @@
 {% endblock %}
 
 {% block tail %}
-                            
-                        <div class="pager">
-                            {% cnprog_paginator context %}
-                            
-                        </div>
-                        <div class="pagesize">
-                            {% cnprog_pagesize context %}
-                        </div>
-                        
+    <div class="pager">{% cnprog_paginator context %}</div>
+    <div class="pagesize">{% cnprog_pagesize context %}</div>
 {% endblock %}
 
 {% block sidebar %}
 <div class="boxC">
 		{% if searchtag %}
-			{% blocktrans count questions_count as cnt with questions_count|intcomma as q_num and searchtag as tagname %}
-			have total {{q_num}} questions tagged {{tagname}}
-			{% plural %}
-			have total {{q_num}} questions tagged {{tagname}}
-			{% endblocktrans %}
+            {% blocktrans count questions_count as cnt with questions_count|intcomma as q_num and searchtag as tagname %}
+            have total {{q_num}} questions tagged {{tagname}}
+            {% plural %}
+            have total {{q_num}} questions tagged {{tagname}}
+            {% endblocktrans %}
 		{% else %}
 			{% if searchtitle %}
                 {% if settings.USE_SPHINX_SEARCH %}
@@ -169,14 +179,22 @@
                     {% endblocktrans %}
                 {% endif %}
 			{% else %}
-				{% blocktrans count questions as cnt with questions_count|intcomma as q_num %}
-				have total {{q_num}} questions
-				{% plural %}
-				have total {{q_num}} questions
-				{% endblocktrans %}
+                {% if is_unanswered %}
+                    {% blocktrans count questions as cnt with questions_count|intcomma as q_num %}
+                    have total {{q_num}} unanswered questions
+                    {% plural %}
+                    have total {{q_num}} unanswered questions
+                    {% endblocktrans %}
+                {% else %}
+                    {% blocktrans count questions as cnt with questions_count|intcomma as q_num %}
+                    have total {{q_num}} questions
+                    {% plural %}
+                    have total {{q_num}} questions
+                    {% endblocktrans %}
+                {% endif %}
 			{% endif %}
 		{% endif %}
-        <p>
+        <p class="nomargin">
         {% ifequal tab_id "latest" %}
 			{% trans "latest questions info" %}
         {% endifequal %}
@@ -197,15 +215,17 @@
         {% endifequal %}
         </p>
 </div>
+{% if request.user.is_authenticated %} 
+{% include "tag_selector.html" %}
+{% endif %}
 <div class="boxC">
 	<h3 class="subtitle">{% trans "Related tags" %}</h3>
     <div class="tags">
         {% for tag in tags %}
-            <a rel="tag" title="{% trans "see questions tagged" %}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
+            <a rel="tag" title="{% blocktrans with tag.name as tag_name %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
             <span class="tag-number">&#215; {{ tag.used_count|intcomma }}</span>
             <br />
         {% endfor %}
-        <br />
     </div>
 </div>
 
diff --git a/templates/tag_selector.html b/templates/tag_selector.html
new file mode 100644
index 00000000..6edc5cc8
--- /dev/null
+++ b/templates/tag_selector.html
@@ -0,0 +1,42 @@
+{% load i18n %}
+{% load extra_tags %}
+<div id="tagSelector" class="boxC">
+	<h3 class="subtitle">{% trans "Interesting tags" %}</h3>
+    <div class="tags interesting marked-tags">
+    {% for tag_name in interesting_tag_names %}
+        {% spaceless %}
+        <span class="deletable-tag" id="interesting-tag-{{tag_name}}">
+            <a rel="tag" 
+                title="{% blocktrans with tag as tagname %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"
+                href="{% url tag_questions tag_name|urlencode %}">{{tag_name}}</a>
+            <img class="delete-icon" 
+                src="{% href "/content/images/close-small-dark.png" %}"
+                title="{% blocktrans %}remove '{{tag_name}}' from the list of interesting tags{% endblocktrans %}"/>
+        </span>
+        {% endspaceless %}
+    {% endfor %}
+    </div>
+    <input id="interestingTagInput" autocomplete="off" type="text"/>
+    <input id="interestingTagAdd" type="submit" value="{% trans "Add" %}"/>
+	<h3 class="subtitle">{% trans "Ignored tags" %}</h3>
+    <div class="tags ignored marked-tags">
+    {% for tag_name in ignored_tag_names %}
+        {% spaceless %}
+        <span class="deletable-tag" id="ignored-tag-{{tag_name}}">
+            <a rel="tag" 
+                title="{% blocktrans with tag as tagname %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"
+                href="{% url tag_questions tag_name|urlencode %}">{{tag_name}}</a>
+            <img class="delete-icon" 
+                src="{% href "/content/images/close-small-dark.png" %}"
+                title="{% blocktrans %}remove '{{tag_name}}' from the list of ignored tags{% endblocktrans %}"/>
+        </span>
+        {% endspaceless %}
+    {% endfor %}
+    </div>
+    <input id="ignoredTagInput" autocomplete="off" type="text"/>
+    <input id="ignoredTagAdd" type="submit" value="{% trans "Add" %}"/>
+    <p id="hideIgnoredTagsControl">
+    <input id="hideIgnoredTagsCb" type="checkbox" {% if request.user.hide_ignored_questions %}checked="checked"{% endif %} />
+    <label id="hideIgnoredTagsLabel" for="hideIgnoredTags">{% trans "keep ingored questions hidden" %}</label>
+    <p>
+</div>
diff --git a/templates/user_email_subscriptions.html b/templates/user_email_subscriptions.html
index 8f27bd2a..c0204cbc 100644
--- a/templates/user_email_subscriptions.html
+++ b/templates/user_email_subscriptions.html
@@ -13,6 +13,9 @@
     {% endif %}
     <form method="POST"> 
         {% include "edit_user_email_feeds_form.html" %}
+        <table class='form-as-table'>
+        {{tag_filter_selection_form}}
+        </table>
         <div class="submit-row text-align-right">
             <input type="submit" class="submit" name="save" value="{% trans "Update" %}"/>
             <input type="submit" class="submit" name="stop_email" value="{% trans "Stop sending email" %}"/>
diff --git a/templates/user_stats.html b/templates/user_stats.html
index 06f1cd2b..ecc39807 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -97,7 +97,7 @@
                     <td width="180" valign="top">
                         {% for tag in user_tags%}
                         <a rel="tag" 
-							title="{% blocktrans with tag.name as tag_name %}see other questions tagged '{{ tag_name }}' {% endblocktrans %}" 
+							title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}" 
 							href="{% url forum.views.tag tag|urlencode %}?user={{view_user.username}}">{{tag.name}}</a>
                         <span class="tag-number">&#215; {{ tag.user_tag_usage_count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"10" %}
diff --git a/utils/decorators.py b/utils/decorators.py
new file mode 100644
index 00000000..e4e7acb3
--- /dev/null
+++ b/utils/decorators.py
@@ -0,0 +1,25 @@
+from django.http import HttpResponse, HttpResponseForbidden, Http404
+from django.utils import simplejson
+
+def ajax_login_required(view_func):
+    def wrap(request,*args,**kwargs):
+        if request.user.is_authenticated():
+            return view_func(request,*args,**kwargs)
+        else:
+            json = simplejson.dumps({'login_required':True})
+            return HttpResponseForbidden(json,mimetype='application/json')
+    return wrap
+
+def ajax_method(view_func):
+    def wrap(request,*args,**kwargs):
+        if not request.is_ajax():
+            raise Http404
+        retval = view_func(request,*args,**kwargs)
+        if isinstance(retval, HttpResponse):
+            retval.mimetype = 'application/json'
+            return retval
+        else:
+            json = simplejson.dumps(retval)
+            return HttpResponse(json,mimetype='application/json')
+    return wrap
+            
-- 
cgit v1.2.3-1-g7c22


From 4be0491e6adef6bf5817545ec9e050555066352f Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 9 Dec 2009 12:13:32 -0500
Subject: better selector of ignored questions, split javascript tag_selector
 into separate file, fixed question counter messages in the english lang file

---
 forum/management/commands/send_email_alerts.py  |   4 +-
 forum/models.py                                 |   4 +-
 forum/views.py                                  |  84 +--
 locale/en/LC_MESSAGES/django.mo                 | Bin 25611 -> 26686 bytes
 locale/en/LC_MESSAGES/django.po                 | 854 +++++++++++++++---------
 templates/content/js/com.cnprog.post.js         | 166 -----
 templates/content/js/com.cnprog.tag_selector.js | 168 +++++
 templates/index.html                            |   2 +-
 templates/questions.html                        |   6 +-
 9 files changed, 732 insertions(+), 556 deletions(-)
 create mode 100644 templates/content/js/com.cnprog.tag_selector.js

diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index 563aab69..4a636e87 100644
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -41,11 +41,11 @@ class Command(NoArgsCommand):
     #todo: still need to add back individually selected and other questions....
     #these may be filtered out by tags
     if user.tag_filter_setting == 'ignored':
-        ignored_tags = user.markedtag_set.filter(reason='bad').values_list('tag', flat=True).distinct()
+        ignored_tags = Tag.objects.filter(user_selections___reason='bad',user_selections__user=user)
         Q_set1 = Q_set1.exclude( tags__in=ignored_tags )
         logging.debug('removed ignored tags')
     else:
-        selected_tags = user.markedtag_set.filter(reason='good').values_list('tag', flat=True).distinct()
+        selected_tags = Tag.objects.filter(user_selections___reason='good',user_selections__user=user)
         Q_set1 = Q_set1.filter( tags__in=selected_tags )
         logging.debug('filtered for only selected tags')
         
diff --git a/forum/models.py b/forum/models.py
index 8873fd87..b031b0c8 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -346,8 +346,8 @@ class FavoriteQuestion(models.Model):
 
 class MarkedTag(models.Model):
     TAG_MARK_REASONS = (('good',_('interesting')),('bad',_('ignored')))
-    tag = models.ForeignKey(Tag)
-    user = models.ForeignKey(User)
+    tag = models.ForeignKey(Tag, related_name='user_selections')
+    user = models.ForeignKey(User, related_name='tag_selections')
     reason = models.CharField(max_length=16, choices=TAG_MARK_REASONS)
 
 class QuestionRevision(models.Model):
diff --git a/forum/views.py b/forum/views.py
index f1eb4d0c..c76abf3b 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -205,6 +205,16 @@ def questions(request, tagname=None, unanswered=False):
                                   + 'AND forum_markedtag.reason = "good" '
                                   + 'AND question_tags.question_id = question.id'
                             ),
+                                ]),
+                        select_params = (uid_str,),
+                     )
+        if request.user.hide_ignored_questions:
+            ignored_tags = Tag.objects.filter(user_selections__reason='bad',
+                                            user_selections__user = request.user)
+            qs = qs.exclude(tags__in=ignored_tags)
+        else:
+            qs = qs.extra(
+                        select = SortedDict([
                             (
                                 'ignored_score', 
                                 'SELECT COUNT(1) FROM forum_markedtag, question_tags '
@@ -214,81 +224,13 @@ def questions(request, tagname=None, unanswered=False):
                                   + 'AND question_tags.question_id = question.id'
                             )
                                 ]),
-                        select_params = (uid_str, uid_str)
+                        select_params = (uid_str, )
                      )
-        #if request.user.hide_ignored_questions:
-        #    qs = qs.extra(where=['ignored_score=0']) #this doesn't work, 
-                                                      #no way to filter on ignored_score!
 
     qs = qs.select_related(depth=1).order_by(orderby)
 
-    #don't know how to get around this - maybe have to use raw sql?
-    #the probjem is that it seems to be impossible to exclude ingored questions
-    #from the query set - 'the django way'
-    #the erzatz paginator below compensates for the current lack of proper SQL statement
-    class DummyQuerySet(list):
-        def __init__(self,items):
-            super(DummyQuerySet, self).__init__(items)
-        def count(self):
-            return len(self)
-
-    class DummyPage(list):
-        def __init__(self,items,num=1,has_next=True):
-            self.object_list = DummyQuerySet(items)
-            self.num = num
-            self.has_next_page = has_next
-        def count(self):
-            return len(self.object_list)
-        def has_next(self):
-            return self.has_next_page
-        def has_previous(self):
-            return (self.num > 1)
-        def previous_page_number(self):
-            if self.has_previous():
-                return self.num - 1
-            return self.num
-        def next_page_number(self):
-            if self.has_next():
-                return self.num + 1
-            return self.num
-
-    class HidingIgnoredPaginator(object):
-        def __init__(self,query_set,page_size):
-            self.query_set = list(query_set)#force db hit
-            self.page_size = page_size
-            self.pages = []
-            self.count = 0
-            cpage = []
-            for q in self.query_set:
-                if self.count % page_size == 0:
-                    if len(cpage) > 0:
-                        self.pages.append(cpage)
-                        cpage = []
-                if q.ignored_score == 0:
-                    cpage.append(q) 
-                    self.count += 1
-            if cpage not in self.pages and len(cpage) > 0:
-                self.pages.append(cpage)
-            self.num_pages = len(self.pages)
-
-        def page(self,num):
-            if self.num_pages == 0:
-                return DummyPage([],num=1,has_next=False)
-            elif num >= self.num_pages:
-                page_content = self.pages[-1]
-                num = self.num_pages
-                has_next = False
-            else:
-                page_content = self.pages[num-1]
-                has_next = True
-            return DummyPage(page_content,num=num,has_next=has_next)
-
-    if request.user.is_authenticated() and request.user.hide_ignored_questions:
-        objects_list = HidingIgnoredPaginator(qs, pagesize)
-        questions = objects_list.page(page)
-    else: #otherwise just use the paginator
-        objects_list = Paginator(qs, pagesize)
-        questions = objects_list.page(page)
+    objects_list = Paginator(qs, pagesize)
+    questions = objects_list.page(page)
 
     # Get related tags from this page objects
     if questions.object_list.count() > 0:
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 502c1075..16f3554d 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 18eb61b1..15385964 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 19:00-0800\n"
+"POT-Creation-Date: 2009-12-09 08:54-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,87 +60,95 @@ msgstr ""
 msgid "this email is already used by someone else, please choose another"
 msgstr ""
 
-#: django_authopenid/forms.py:163 django_authopenid/views.py:117
+#: django_authopenid/forms.py:163 django_authopenid/views.py:118
 msgid "i-names are not supported"
 msgstr ""
 
-#: django_authopenid/forms.py:239
+#: django_authopenid/forms.py:219
+msgid "Account with this name already exists on the forum"
+msgstr ""
+
+#: django_authopenid/forms.py:220
+msgid "can't have two logins to the same account yet, sorry."
+msgstr ""
+
+#: django_authopenid/forms.py:242
 msgid "Please enter valid username and password (both are case-sensitive)."
 msgstr ""
 
-#: django_authopenid/forms.py:242 django_authopenid/forms.py:292
+#: django_authopenid/forms.py:245 django_authopenid/forms.py:295
 msgid "This account is inactive."
 msgstr ""
 
-#: django_authopenid/forms.py:244
+#: django_authopenid/forms.py:247
 msgid "Login failed."
 msgstr ""
 
-#: django_authopenid/forms.py:246
+#: django_authopenid/forms.py:249
 msgid "Please enter username and password"
 msgstr ""
 
-#: django_authopenid/forms.py:248
+#: django_authopenid/forms.py:251
 msgid "Please enter your password"
 msgstr ""
 
-#: django_authopenid/forms.py:250
+#: django_authopenid/forms.py:253
 msgid "Please enter user name"
 msgstr ""
 
-#: django_authopenid/forms.py:288
+#: django_authopenid/forms.py:291
 msgid ""
 "Please enter a valid                     username and password. Note that "
 "both fields are                     case-sensitive."
 msgstr ""
 
-#: django_authopenid/forms.py:310
+#: django_authopenid/forms.py:313
 msgid "choose password"
 msgstr "Password"
 
-#: django_authopenid/forms.py:311
+#: django_authopenid/forms.py:314
 msgid "password is required"
 msgstr ""
 
-#: django_authopenid/forms.py:314
+#: django_authopenid/forms.py:317
 msgid "retype password"
 msgstr "Password <i>(please retype)</i>"
 
-#: django_authopenid/forms.py:315
+#: django_authopenid/forms.py:318
 msgid "please, retype your password"
 msgstr ""
 
-#: django_authopenid/forms.py:316
+#: django_authopenid/forms.py:319
 msgid "sorry, entered passwords did not match, please try again"
 msgstr ""
 
-#: django_authopenid/forms.py:341
+#: django_authopenid/forms.py:344
 msgid "Current password"
 msgstr ""
 
-#: django_authopenid/forms.py:343
+#: django_authopenid/forms.py:346
 msgid "New password"
 msgstr ""
 
-#: django_authopenid/forms.py:345
+#: django_authopenid/forms.py:348
 msgid "Retype new password"
 msgstr ""
 
-#: django_authopenid/forms.py:356
+#: django_authopenid/forms.py:359
 msgid ""
 "Old password is incorrect.                     Please enter the correct "
 "password."
 msgstr ""
 
-#: django_authopenid/forms.py:368
+#: django_authopenid/forms.py:371
 msgid "new passwords do not match"
 msgstr ""
 
-#: django_authopenid/forms.py:432
+#: django_authopenid/forms.py:435
 msgid "Your user name (<i>required</i>)"
 msgstr ""
 
-#: django_authopenid/forms.py:447
+#: django_authopenid/forms.py:450
 msgid "Incorrect username."
 msgstr "sorry, there is no such user name"
 
@@ -218,87 +226,87 @@ msgstr ""
 msgid "openid/"
 msgstr ""
 
-#: django_authopenid/urls.py:30 forum/urls.py:43 forum/urls.py:47
+#: django_authopenid/urls.py:30 forum/urls.py:44 forum/urls.py:48
 msgid "delete/"
 msgstr ""
 
-#: django_authopenid/views.py:123
+#: django_authopenid/views.py:124
 #, python-format
 msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:531
+#: django_authopenid/views.py:532
 msgid "Welcome email subject line"
 msgstr "Welcome to the Q&A forum"
 
-#: django_authopenid/views.py:626
+#: django_authopenid/views.py:627
 msgid "Password changed."
 msgstr ""
 
-#: django_authopenid/views.py:638 django_authopenid/views.py:644
+#: django_authopenid/views.py:639 django_authopenid/views.py:645
 #, python-format
 msgid "your email needs to be validated see %(details_url)s"
 msgstr ""
 "Your email needs to be validated. Please see details <a "
 "id='validate_email_alert' href='%(details_url)s'>here</a>."
 
-#: django_authopenid/views.py:665
+#: django_authopenid/views.py:666
 msgid "Email verification subject line"
 msgstr "Verification Email from Q&A forum"
 
-#: django_authopenid/views.py:751
+#: django_authopenid/views.py:752
 msgid "your email was not changed"
 msgstr ""
 
-#: django_authopenid/views.py:798 django_authopenid/views.py:950
+#: django_authopenid/views.py:799 django_authopenid/views.py:951
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr ""
 
-#: django_authopenid/views.py:802 django_authopenid/views.py:957
+#: django_authopenid/views.py:803 django_authopenid/views.py:958
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr ""
 
-#: django_authopenid/views.py:810
+#: django_authopenid/views.py:811
 msgid "Email Changed."
 msgstr ""
 
-#: django_authopenid/views.py:885
+#: django_authopenid/views.py:886
 msgid "This OpenID is already associated with another account."
 msgstr ""
 
-#: django_authopenid/views.py:890
+#: django_authopenid/views.py:891
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr ""
 
-#: django_authopenid/views.py:960
+#: django_authopenid/views.py:961
 msgid "Account deleted."
 msgstr ""
 
-#: django_authopenid/views.py:1003
+#: django_authopenid/views.py:1004
 msgid "Request for new password"
 msgstr ""
 
-#: django_authopenid/views.py:1016
+#: django_authopenid/views.py:1017
 msgid "A new password and the activation link were sent to your email address."
 msgstr ""
 
-#: django_authopenid/views.py:1046
+#: django_authopenid/views.py:1047
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
 "registered."
 msgstr ""
 
-#: django_authopenid/views.py:1055
+#: django_authopenid/views.py:1056
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
 msgstr ""
 
-#: django_authopenid/views.py:1064
+#: django_authopenid/views.py:1065
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr ""
@@ -351,90 +359,102 @@ msgstr ""
 msgid "spam or advertising"
 msgstr ""
 
-#: forum/const.py:56
+#: forum/const.py:57
 msgid "question"
 msgstr ""
 
-#: forum/const.py:57 templates/book.html:110
+#: forum/const.py:58 templates/book.html:110
 msgid "answer"
 msgstr ""
 
-#: forum/const.py:58
+#: forum/const.py:59
 msgid "commented question"
 msgstr ""
 
-#: forum/const.py:59
+#: forum/const.py:60
 msgid "commented answer"
 msgstr ""
 
-#: forum/const.py:60
+#: forum/const.py:61
 msgid "edited question"
 msgstr ""
 
-#: forum/const.py:61
+#: forum/const.py:62
 msgid "edited answer"
 msgstr ""
 
-#: forum/const.py:62
+#: forum/const.py:63
 msgid "received award"
 msgstr "received badge"
 
-#: forum/const.py:63
+#: forum/const.py:64
 msgid "marked best answer"
 msgstr ""
 
-#: forum/const.py:64
+#: forum/const.py:65
 msgid "upvoted"
 msgstr ""
 
-#: forum/const.py:65
+#: forum/const.py:66
 msgid "downvoted"
 msgstr ""
 
-#: forum/const.py:66
+#: forum/const.py:67
 msgid "canceled vote"
 msgstr ""
 
-#: forum/const.py:67
+#: forum/const.py:68
 msgid "deleted question"
 msgstr ""
 
-#: forum/const.py:68
+#: forum/const.py:69
 msgid "deleted answer"
 msgstr ""
 
-#: forum/const.py:69
+#: forum/const.py:70
 msgid "marked offensive"
 msgstr ""
 
-#: forum/const.py:70
+#: forum/const.py:71
 msgid "updated tags"
 msgstr ""
 
-#: forum/const.py:71
+#: forum/const.py:72
 msgid "selected favorite"
 msgstr ""
 
-#: forum/const.py:72
+#: forum/const.py:73
 msgid "completed user profile"
 msgstr ""
 
-#: forum/const.py:83
+#: forum/const.py:74
+msgid "email update sent to user"
+msgstr ""
+
+#: forum/const.py:85
 msgid "[closed]"
 msgstr ""
 
-#: forum/const.py:84
+#: forum/const.py:86
 msgid "[deleted]"
 msgstr ""
 
-#: forum/const.py:85
+#: forum/const.py:87 forum/views.py:849 forum/views.py:868
 msgid "initial version"
 msgstr ""
 
-#: forum/const.py:86
+#: forum/const.py:88
 msgid "retagged"
 msgstr ""
 
+#: forum/const.py:92
+msgid "exclude ignored tags"
+msgstr ""
+
+#: forum/const.py:92
+msgid "allow only interesting tags"
+msgstr ""
+
 #: forum/feed.py:18
 msgid " - "
 msgstr ""
@@ -443,10 +463,8 @@ msgstr ""
 msgid "latest questions"
 msgstr ""
 
-#: forum/feed.py:19 forum/urls.py:32 forum/urls.py:33 forum/urls.py:34
-#: forum/urls.py:35 forum/urls.py:36 forum/urls.py:37 forum/urls.py:38
-#: forum/urls.py:39 forum/urls.py:40 forum/urls.py:41 forum/urls.py:43
-msgid "questions/"
+#: forum/feed.py:19 forum/urls.py:52
+msgid "question/"
 msgstr ""
 
 #: forum/forms.py:16 templates/answer_edit_tips.html:35
@@ -471,7 +489,7 @@ msgstr ""
 msgid "question content must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:47 templates/header.html:29 templates/header.html.py:63
+#: forum/forms.py:47 templates/header.html:28 templates/header.html.py:62
 msgid "tags"
 msgstr ""
 
@@ -498,11 +516,11 @@ msgid ""
 "characters '.-_#'"
 msgstr ""
 
-#: forum/forms.py:79 templates/index.html:59 templates/index.html.py:71
+#: forum/forms.py:79 templates/index.html:61 templates/index.html.py:73
 #: templates/post_contributor_info.html:7
 #: templates/question_summary_list_roll.html:26
-#: templates/question_summary_list_roll.html:38 templates/questions.html:59
-#: templates/questions.html.py:71 templates/unanswered.html:51
+#: templates/question_summary_list_roll.html:38 templates/questions.html:92
+#: templates/questions.html.py:104 templates/unanswered.html:51
 #: templates/unanswered.html.py:63
 msgid "community wiki"
 msgstr ""
@@ -544,119 +562,139 @@ msgid "this email does not have to be linked to gravatar"
 msgstr ""
 
 #: forum/forms.py:198
-msgid "Real name"
+msgid "Screen name"
 msgstr ""
 
 #: forum/forms.py:199
-msgid "Website"
+msgid "Real name"
 msgstr ""
 
 #: forum/forms.py:200
-msgid "Location"
+msgid "Website"
 msgstr ""
 
 #: forum/forms.py:201
+msgid "Location"
+msgstr ""
+
+#: forum/forms.py:202
 msgid "Date of birth"
 msgstr ""
 
-#: forum/forms.py:201
+#: forum/forms.py:202
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr ""
 
-#: forum/forms.py:202 templates/authopenid/settings.html:21
+#: forum/forms.py:203 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr ""
 
-#: forum/forms.py:229 forum/forms.py:230
+#: forum/forms.py:231 forum/forms.py:232
 msgid "this email has already been registered, please use another one"
 msgstr ""
 
-#: forum/forms.py:234 forum/forms.py:235
+#: forum/forms.py:238
+msgid "Choose email tag filter"
+msgstr ""
+
+#: forum/forms.py:245 forum/forms.py:246
 msgid "weekly"
 msgstr ""
 
-#: forum/forms.py:234 forum/forms.py:235
+#: forum/forms.py:245 forum/forms.py:246
 msgid "no email"
 msgstr ""
 
-#: forum/forms.py:235
+#: forum/forms.py:246
 msgid "daily"
 msgstr ""
 
-#: forum/forms.py:250 forum/models.py:46
-msgid "Entire forum"
-msgstr ""
-
-#: forum/forms.py:253
+#: forum/forms.py:261
 msgid "Asked by me"
 msgstr ""
 
-#: forum/forms.py:256
+#: forum/forms.py:264
 msgid "Answered by me"
 msgstr ""
 
-#: forum/forms.py:259
+#: forum/forms.py:267
 msgid "Individually selected"
 msgstr ""
 
-#: forum/models.py:47
+#: forum/forms.py:270
+msgid "Entire forum (tag filtered)"
+msgstr ""
+
+#: forum/models.py:51
+msgid "Entire forum"
+msgstr ""
+
+#: forum/models.py:52
 msgid "Questions that I asked"
 msgstr ""
 
-#: forum/models.py:48
+#: forum/models.py:53
 msgid "Questions that I answered"
 msgstr ""
 
-#: forum/models.py:49
+#: forum/models.py:54
 msgid "Individually selected questions"
 msgstr ""
 
-#: forum/models.py:52
+#: forum/models.py:57
 msgid "Weekly"
 msgstr ""
 
-#: forum/models.py:53
+#: forum/models.py:58
 msgid "Daily"
 msgstr ""
 
-#: forum/models.py:54
+#: forum/models.py:59
 msgid "No email"
 msgstr ""
 
-#: forum/models.py:289
+#: forum/models.py:301
 #, python-format
 msgid "%(author)s modified the question"
 msgstr ""
 
-#: forum/models.py:293
+#: forum/models.py:305
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr ""
 
-#: forum/models.py:298
+#: forum/models.py:310
 #, python-format
 msgid "%(people)s commented the question"
 msgstr ""
 
-#: forum/models.py:303
+#: forum/models.py:315
 #, python-format
 msgid "%(people)s commented answers"
 msgstr ""
 
-#: forum/models.py:305
+#: forum/models.py:317
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr ""
 
-#: forum/models.py:493 templates/badges.html:53
+#: forum/models.py:348
+msgid "interesting"
+msgstr ""
+
+#: forum/models.py:348
+msgid "ignored"
+msgstr ""
+
+#: forum/models.py:511 templates/badges.html:53
 msgid "gold"
 msgstr ""
 
-#: forum/models.py:494 templates/badges.html:61
+#: forum/models.py:512 templates/badges.html:61
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:495 templates/badges.html:68
+#: forum/models.py:513 templates/badges.html:68
 msgid "bronze"
 msgstr ""
 
@@ -680,15 +718,15 @@ msgstr ""
 msgid "logout/"
 msgstr ""
 
-#: forum/urls.py:29 forum/urls.py:30 forum/urls.py:31 forum/urls.py:47
+#: forum/urls.py:29 forum/urls.py:30 forum/urls.py:31 forum/urls.py:48
 msgid "answers/"
 msgstr ""
 
-#: forum/urls.py:29 forum/urls.py:41 forum/urls.py:43 forum/urls.py:47
+#: forum/urls.py:29 forum/urls.py:41 forum/urls.py:44 forum/urls.py:48
 msgid "comments/"
 msgstr ""
 
-#: forum/urls.py:30 forum/urls.py:35 forum/urls.py:56
+#: forum/urls.py:30 forum/urls.py:35 forum/urls.py:70
 #: templates/user_info.html:45
 msgid "edit/"
 msgstr ""
@@ -697,7 +735,13 @@ msgstr ""
 msgid "revisions/"
 msgstr ""
 
-#: forum/urls.py:33 forum/urls.py:66
+#: forum/urls.py:32 forum/urls.py:33 forum/urls.py:34 forum/urls.py:35
+#: forum/urls.py:36 forum/urls.py:37 forum/urls.py:38 forum/urls.py:39
+#: forum/urls.py:40 forum/urls.py:41 forum/urls.py:44
+msgid "questions/"
+msgstr ""
+
+#: forum/urls.py:33 forum/urls.py:80
 msgid "ask/"
 msgstr ""
 
@@ -721,55 +765,71 @@ msgstr ""
 msgid "vote/"
 msgstr ""
 
-#: forum/urls.py:51
-msgid "question/"
+#: forum/urls.py:42
+msgid "command/"
 msgstr ""
 
-#: forum/urls.py:52 forum/urls.py:53
+#: forum/urls.py:53 forum/urls.py:54
 msgid "tags/"
 msgstr ""
 
-#: forum/urls.py:54 forum/urls.py:56 forum/urls.py:57
+#: forum/urls.py:56 forum/urls.py:60
+msgid "mark-tag/"
+msgstr ""
+
+#: forum/urls.py:56
+msgid "interesting/"
+msgstr ""
+
+#: forum/urls.py:60
+msgid "ignored/"
+msgstr ""
+
+#: forum/urls.py:64
+msgid "unmark-tag/"
+msgstr ""
+
+#: forum/urls.py:68 forum/urls.py:70 forum/urls.py:71
 msgid "users/"
 msgstr ""
 
-#: forum/urls.py:55
+#: forum/urls.py:69
 msgid "moderate-user/"
 msgstr ""
 
-#: forum/urls.py:58 forum/urls.py:59
+#: forum/urls.py:72 forum/urls.py:73
 msgid "badges/"
 msgstr ""
 
-#: forum/urls.py:60
+#: forum/urls.py:74
 msgid "messages/"
 msgstr ""
 
-#: forum/urls.py:60
+#: forum/urls.py:74
 msgid "markread/"
 msgstr ""
 
-#: forum/urls.py:62
+#: forum/urls.py:76
 msgid "nimda/"
 msgstr ""
 
-#: forum/urls.py:64
+#: forum/urls.py:78
 msgid "upload/"
 msgstr ""
 
-#: forum/urls.py:65 forum/urls.py:66 forum/urls.py:67
+#: forum/urls.py:79 forum/urls.py:80 forum/urls.py:81
 msgid "books/"
 msgstr ""
 
-#: forum/urls.py:68
+#: forum/urls.py:82
 msgid "search/"
 msgstr ""
 
-#: forum/urls.py:69
+#: forum/urls.py:83
 msgid "feedback/"
 msgstr ""
 
-#: forum/urls.py:70
+#: forum/urls.py:84
 msgid "account/"
 msgstr ""
 
@@ -857,118 +917,144 @@ msgstr ""
 msgid "profile - email subscriptions"
 msgstr ""
 
-#: forum/views.py:126
+#: forum/views.py:141
 msgid "Q&A forum feedback"
 msgstr ""
 
-#: forum/views.py:127
+#: forum/views.py:142
 msgid "Thanks for the feedback!"
 msgstr ""
 
-#: forum/views.py:135
+#: forum/views.py:150
 msgid "We look forward to hearing your feedback! Please, give it next time :)"
 msgstr ""
 
-#: forum/views.py:1014
+#: forum/views.py:1150
 #, python-format
 msgid "subscription saved, %(email)s needs validation, see %(details_url)s"
 msgstr ""
 "Your subscription is saved, but email address %(email)s needs to be "
 "validated, please see <a href='%(details_url)s'>more details here</a>"
 
-#: forum/views.py:1022
+#: forum/views.py:1158
 msgid "email update frequency has been set to daily"
 msgstr ""
 
-#: forum/views.py:1826
+#: forum/views.py:2032
 msgid "changes saved"
 msgstr ""
 
-#: forum/views.py:1832
+#: forum/views.py:2038
 msgid "email updates canceled"
 msgstr ""
 
-#: forum/views.py:1999
+#: forum/views.py:2207
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr "sorry, file uploading requires karma >60"
 
-#: forum/views.py:2001
+#: forum/views.py:2209
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:2003
+#: forum/views.py:2211
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:2005
+#: forum/views.py:2213
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
 msgstr ""
 
-#: forum/management/commands/send_email_alerts.py:71
+#: forum/management/commands/send_email_alerts.py:160
 msgid "email update message subject"
 msgstr "news from Q&A forum"
 
-#: forum/management/commands/send_email_alerts.py:72
+#: forum/management/commands/send_email_alerts.py:161
 #, python-format
 msgid "%(name)s, this is an update message header for a question"
 msgid_plural "%(name)s, this is an update message header for %(num)d questions"
-msgstr[0] "<p>Dear %(name)s,</p></p>The following question has been updated on the Q&A forum:</p>"
-msgstr[1] "<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on the Q&A forum:</p>"
+msgstr[0] ""
+"<p>Dear %(name)s,</p></p>The following question has been updated on the Q&A "
+"forum:</p>"
+msgstr[1] ""
+"<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on "
+"the Q&A forum:</p>"
+
+#: forum/management/commands/send_email_alerts.py:172
+msgid "new question"
+msgstr ""
+
+#: forum/management/commands/send_email_alerts.py:182
+#, python-format
+msgid "There is also one question which was recently "
+msgid_plural ""
+"There are also %(num)d more questions which were recently updated "
+msgstr[0] ""
+msgstr[1] ""
+
+#: forum/management/commands/send_email_alerts.py:187
+msgid ""
+"Perhaps you could look up previously sent forum reminders in your mailbox."
+msgstr ""
 
-#: forum/management/commands/send_email_alerts.py:81
+#: forum/management/commands/send_email_alerts.py:191
 #, python-format
 msgid ""
 "go to %(link)s to change frequency of email updates or %(email)s "
 "administrator"
 msgstr ""
-"<p>Please remember that you can always <a href='%(link)s'>adjust</a> frequency of the "
-"email updates or turn them off entirely.<br/>If you believe that this message "
-"was sent in an error, please email about it the forum administrator at %(email)"
-"s.</p>"
-"<p>Sincerely,</p><p>Your friendly Q&A forum server.</p>"
+"<p>Please remember that you can always <a href='%(link)s'>adjust</a> "
+"frequency of the email updates or turn them off entirely.<br/>If you believe "
+"that this message was sent in an error, please email about it the forum "
+"administrator at %(email)s.</p><p>Sincerely,</p><p>Your friendly Q&A forum "
+"server.</p>"
 
-#: forum/templatetags/extra_tags.py:160 forum/templatetags/extra_tags.py:189
-#: templates/header.html:34
+#: forum/templatetags/extra_tags.py:163 forum/templatetags/extra_tags.py:192
+#: templates/header.html:33
 msgid "badges"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:161 forum/templatetags/extra_tags.py:188
+#: forum/templatetags/extra_tags.py:164 forum/templatetags/extra_tags.py:191
 msgid "reputation points"
 msgstr "karma"
 
-#: forum/templatetags/extra_tags.py:244
+#: forum/templatetags/extra_tags.py:247
 msgid "%b %d at %H:%M"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:246
+#: forum/templatetags/extra_tags.py:249
 msgid "%b %d '%y at %H:%M"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:248
+#: forum/templatetags/extra_tags.py:251
 msgid "2 days ago"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:250
+#: forum/templatetags/extra_tags.py:253
 msgid "yesterday"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:252
+#: forum/templatetags/extra_tags.py:255
 #, python-format
 msgid "%(hr)d hour ago"
 msgid_plural "%(hr)d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: forum/templatetags/extra_tags.py:254
+#: forum/templatetags/extra_tags.py:257
 #, python-format
 msgid "%(min)d min ago"
 msgid_plural "%(min)d mins ago"
 msgstr[0] ""
 msgstr[1] ""
 
+#: middleware/anon_user.py:33
+#, python-format
+msgid "first time greeting with %(url)s"
+msgstr ""
+
 #: templates/404.html:24
 msgid "Sorry, could not find the page you requested."
 msgstr ""
@@ -1035,13 +1121,46 @@ msgstr ""
 msgid "About"
 msgstr ""
 
+#: templates/about.html:21
+msgid ""
+"<strong>CNPROG <span class=\"orange\">Q&amp;A</span></strong> is a "
+"collaboratively edited question\n"
+"            and answer site created for the <strong>CNPROG</strong> "
+"community.\n"
+"    "
+msgstr ""
+
+#: templates/about.html:25
+msgid ""
+"Here you can <strong>ask</strong> and <strong>answer</strong> questions, "
+"<strong>comment</strong>\n"
+"    and <strong>vote</strong> for the questions of others and their answers. "
+"Both questions and answers\n"
+"    <strong>can be revised</strong> and improved. Questions can be "
+"<strong>tagged</strong> with\n"
+"    the relevant keywords to simplify future access and organize the "
+"accumulated material."
+msgstr ""
+
+#: templates/about.html:31
+msgid ""
+"This <span class=\"orange\">Q&amp;A</span> site is moderated by its members, "
+"hopefully - including yourself!\n"
+"    Moderation rights are gradually assigned to the site users based on the "
+"accumulated <strong>\"reputation\"</strong>\n"
+"    points. These points are added to the users account when others vote for "
+"his/her questions or answers.\n"
+"    These points (very) roughly reflect the level of trust of the community."
+msgstr ""
+
 #: templates/answer_edit.html:5 templates/answer_edit.html.py:48
 msgid "Edit answer"
 msgstr ""
 
 #: templates/answer_edit.html:25 templates/answer_edit.html.py:28
 #: templates/ask.html:26 templates/ask.html.py:29 templates/question.html:45
-#: templates/question.html.py:48 templates/question_edit.html:28
+#: templates/question.html.py:48 templates/question_edit.html:25
+#: templates/question_edit.html.py:28
 msgid "hide preview"
 msgstr ""
 
@@ -1051,13 +1170,13 @@ msgid "show preview"
 msgstr ""
 
 #: templates/answer_edit.html:48 templates/question_edit.html:66
-#: templates/question_retag.html:53 templates/revisions_answer.html:36
-#: templates/revisions_question.html:36
+#: templates/question_retag.html:53 templates/revisions_answer.html:38
+#: templates/revisions_question.html:38
 msgid "back"
 msgstr ""
 
 #: templates/answer_edit.html:53 templates/question_edit.html:71
-#: templates/revisions_answer.html:50 templates/revisions_question.html:50
+#: templates/revisions_answer.html:52 templates/revisions_question.html:52
 msgid "revision"
 msgstr ""
 
@@ -1083,7 +1202,7 @@ msgstr ""
 #: templates/answer_edit.html:73 templates/close.html:29
 #: templates/feedback.html:50 templates/question_edit.html:119
 #: templates/question_retag.html:75 templates/reopen.html:30
-#: templates/user_edit.html:83 templates/authopenid/changeemail.html:40
+#: templates/user_edit.html:87 templates/authopenid/changeemail.html:40
 msgid "Cancel"
 msgstr ""
 
@@ -1315,8 +1434,8 @@ msgstr ""
 msgid "number of times"
 msgstr ""
 
-#: templates/book.html:105 templates/index.html:47
-#: templates/question_summary_list_roll.html:14 templates/questions.html:47
+#: templates/book.html:105 templates/index.html:49
+#: templates/question_summary_list_roll.html:14 templates/questions.html:80
 #: templates/unanswered.html:39 templates/users_questions.html:32
 msgid "votes"
 msgstr ""
@@ -1325,17 +1444,17 @@ msgstr ""
 msgid "the answer has been accepted to be correct"
 msgstr ""
 
-#: templates/book.html:115 templates/index.html:48
-#: templates/question_summary_list_roll.html:15 templates/questions.html:48
+#: templates/book.html:115 templates/index.html:50
+#: templates/question_summary_list_roll.html:15 templates/questions.html:81
 #: templates/unanswered.html:40 templates/users_questions.html:40
 msgid "views"
 msgstr ""
 
-#: templates/book.html:125 templates/index.html:103
+#: templates/book.html:125 templates/index.html:105
 #: templates/question.html:480 templates/question_summary_list_roll.html:52
-#: templates/questions.html:103 templates/questions.html.py:171
-#: templates/tags.html:49 templates/unanswered.html:95
-#: templates/unanswered.html.py:122 templates/users_questions.html:52
+#: templates/questions.html:136 templates/tags.html:49
+#: templates/unanswered.html:95 templates/unanswered.html.py:122
+#: templates/users_questions.html:52
 msgid "using tags"
 msgstr ""
 
@@ -1343,7 +1462,7 @@ msgstr ""
 msgid "subscribe to book RSS feed"
 msgstr ""
 
-#: templates/book.html:147 templates/index.html:152
+#: templates/book.html:147 templates/index.html:156
 msgid "subscribe to the questions feed"
 msgstr ""
 
@@ -1453,7 +1572,7 @@ msgid ""
 "type of moderation task."
 msgstr ""
 
-#: templates/faq.html:53 templates/user_votes.html:14
+#: templates/faq.html:53 templates/user_votes.html:15
 msgid "upvote"
 msgstr ""
 
@@ -1465,7 +1584,7 @@ msgstr ""
 msgid "add comments"
 msgstr ""
 
-#: templates/faq.html:66 templates/user_votes.html:16
+#: templates/faq.html:66 templates/user_votes.html:17
 msgid "downvote"
 msgstr ""
 
@@ -1580,11 +1699,11 @@ msgstr ""
 "Please <a href='%(ask_question_url)s'>ask</a> your question, help make our "
 "community better!"
 
-#: templates/faq.html:128 templates/header.html:28 templates/header.html.py:62
+#: templates/faq.html:128 templates/header.html:27 templates/header.html.py:61
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:128 templates/index.html:157
+#: templates/faq.html:128 templates/index.html:161
 msgid "."
 msgstr ""
 
@@ -1646,32 +1765,28 @@ msgstr ""
 msgid "Message body:"
 msgstr ""
 
-#: templates/footer.html:8 templates/header.html:14 templates/index.html:117
+#: templates/footer.html:8 templates/header.html:13 templates/index.html:119
 msgid "about"
 msgstr ""
 
-#: templates/footer.html:9 templates/header.html:15 templates/index.html:118
+#: templates/footer.html:9 templates/header.html:14 templates/index.html:120
 #: templates/question_edit_tips.html:17
 msgid "faq"
 msgstr ""
 
 #: templates/footer.html:10
-msgid "wiki"
-msgstr ""
-
-#: templates/footer.html:11
 msgid "blog"
 msgstr ""
 
-#: templates/footer.html:12
+#: templates/footer.html:11
 msgid "contact us"
 msgstr ""
 
-#: templates/footer.html:13
+#: templates/footer.html:12
 msgid "privacy policy"
 msgstr ""
 
-#: templates/footer.html:22
+#: templates/footer.html:21
 msgid "give feedback"
 msgstr ""
 
@@ -1683,31 +1798,31 @@ msgstr ""
 msgid "login"
 msgstr ""
 
-#: templates/header.html:22
+#: templates/header.html:21
 msgid "back to home page"
 msgstr ""
 
-#: templates/header.html:30 templates/header.html.py:64
+#: templates/header.html:29 templates/header.html.py:63
 msgid "users"
 msgstr ""
 
-#: templates/header.html:32
+#: templates/header.html:31
 msgid "books"
 msgstr ""
 
-#: templates/header.html:35
+#: templates/header.html:34
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:39
+#: templates/header.html:38
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:43
+#: templates/header.html:42
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:58
+#: templates/header.html:57
 msgid "search"
 msgstr ""
 
@@ -1715,115 +1830,114 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: templates/index.html:23 templates/questions.html:8
+#: templates/index.html:25 templates/questions.html:8
 msgid "Questions"
 msgstr ""
 
-#: templates/index.html:25
+#: templates/index.html:27
 msgid "last updated questions"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:26
+#: templates/index.html:27 templates/questions.html:47
 #: templates/unanswered.html:21
 msgid "newest"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:28 templates/questions.html:49
 msgid "hottest questions"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:28 templates/questions.html:49
 msgid "hottest"
 msgstr ""
 
-#: templates/index.html:27 templates/questions.html:29
+#: templates/index.html:29 templates/questions.html:50
 msgid "most voted questions"
 msgstr ""
 
-#: templates/index.html:27 templates/questions.html:29
+#: templates/index.html:29 templates/questions.html:50
 msgid "most voted"
 msgstr ""
 
-#: templates/index.html:28
+#: templates/index.html:30
 msgid "all questions"
 msgstr ""
 
-#: templates/index.html:46 templates/question_summary_list_roll.html:13
-#: templates/questions.html:46 templates/unanswered.html:38
+#: templates/index.html:48 templates/question_summary_list_roll.html:13
+#: templates/questions.html:79 templates/unanswered.html:38
 #: templates/users_questions.html:36
 msgid "answers"
 msgstr ""
 
-#: templates/index.html:78 templates/index.html.py:92
-#: templates/questions.html:78 templates/questions.html.py:92
+#: templates/index.html:80 templates/index.html.py:94
+#: templates/questions.html:111 templates/questions.html.py:125
 #: templates/unanswered.html:70 templates/unanswered.html.py:84
 msgid "Posted:"
 msgstr ""
 
-#: templates/index.html:81 templates/index.html.py:86
-#: templates/questions.html:81 templates/questions.html.py:86
+#: templates/index.html:83 templates/index.html.py:88
+#: templates/questions.html:114 templates/questions.html.py:119
 #: templates/unanswered.html:73 templates/unanswered.html.py:78
 msgid "Updated:"
 msgstr ""
 
-#: templates/index.html:103 templates/question.html:480
-#: templates/question_summary_list_roll.html:52 templates/questions.html:103
-#: templates/questions.html.py:171 templates/tags.html:49
-#: templates/unanswered.html:95 templates/unanswered.html.py:122
-#: templates/users_questions.html:52
+#: templates/index.html:105 templates/question.html:480
+#: templates/question_summary_list_roll.html:52 templates/questions.html:136
+#: templates/tags.html:49 templates/unanswered.html:95
+#: templates/unanswered.html.py:122 templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr ""
 
-#: templates/index.html:114
+#: templates/index.html:116
 msgid "welcome to website"
 msgstr "Welcome to Q&amp;A forum"
 
-#: templates/index.html:123
+#: templates/index.html:127
 msgid "Recent tags"
 msgstr ""
 
-#: templates/index.html:128 templates/question.html:135
+#: templates/index.html:132 templates/question.html:135
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
-#: templates/index.html:131 templates/index.html.py:157
+#: templates/index.html:135 templates/index.html.py:161
 msgid "popular tags"
 msgstr "tags"
 
-#: templates/index.html:136
+#: templates/index.html:140
 msgid "Recent awards"
 msgstr "Recent badges"
 
-#: templates/index.html:142
+#: templates/index.html:146
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:147
+#: templates/index.html:151
 msgid "all awards"
 msgstr "all badges"
 
-#: templates/index.html:152
+#: templates/index.html:156
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:157
+#: templates/index.html:161
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:157
+#: templates/index.html:161
 msgid "complete list of questions"
 msgstr "list of all questions"
 
-#: templates/index.html:157 templates/authopenid/signup.html:18
+#: templates/index.html:161 templates/authopenid/signup.html:18
 msgid "or"
 msgstr ""
 
-#: templates/index.html:157
+#: templates/index.html:161
 msgid "Please help us answer"
 msgstr ""
 
-#: templates/index.html:157
+#: templates/index.html:161
 msgid "list of unanswered questions"
 msgstr "unanswered questions"
 
@@ -1836,8 +1950,8 @@ msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
-"Clicking <strong>Logout</strong> will log you out from the forum"
-"but will not sign you off from your OpenID provider.</p><p>If you wish to sign off "
+"Clicking <strong>Logout</strong> will log you out from the forumbut will not "
+"sign you off from your OpenID provider.</p><p>If you wish to sign off "
 "completely - please make sure to log out from your OpenID provider as well."
 
 #: templates/logout.html:20
@@ -1881,17 +1995,19 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/post_contributor_info.html:19 templates/revisions_answer.html:66
-#: templates/revisions_question.html:66
+#: templates/post_contributor_info.html:19
 msgid "asked"
 msgstr ""
 
-#: templates/post_contributor_info.html:21
+#: templates/post_contributor_info.html:22
 msgid "answered"
 msgstr ""
 
-#: templates/post_contributor_info.html:37 templates/revisions_answer.html:68
-#: templates/revisions_question.html:68
+#: templates/post_contributor_info.html:24
+msgid "posted"
+msgstr ""
+
+#: templates/post_contributor_info.html:45
 msgid "updated"
 msgstr ""
 
@@ -1902,10 +2018,9 @@ msgstr ""
 #: templates/privacy.html:15
 msgid "general message about privacy"
 msgstr ""
-"Respecting users privacy is an important core principle "
-"of this Q&amp;A forum. "
-"Information on this page details how this forum protects your privacy, "
-"and what type of information is collected."
+"Respecting users privacy is an important core principle of this Q&amp;A "
+"forum. Information on this page details how this forum protects your "
+"privacy, and what type of information is collected."
 
 #: templates/privacy.html:18
 msgid "Site Visitors"
@@ -1914,9 +2029,9 @@ msgstr ""
 #: templates/privacy.html:20
 msgid "what technical information is collected about visitors"
 msgstr ""
-"Information on question views, revisions of questions and answers - both times "
-"and content are recorded for each user in order to correctly count number of views, "
-"maintain data integrity and report relevant updates."
+"Information on question views, revisions of questions and answers - both "
+"times and content are recorded for each user in order to correctly count "
+"number of views, maintain data integrity and report relevant updates."
 
 #: templates/privacy.html:23
 msgid "Personal Information"
@@ -1925,8 +2040,8 @@ msgstr ""
 #: templates/privacy.html:25
 msgid "details on personal information policies"
 msgstr ""
-"Members of this community may choose to display personally identifiable information "
-"in their profiles. Forum will never display such information "
+"Members of this community may choose to display personally identifiable "
+"information in their profiles. Forum will never display such information "
 "without a request from the user."
 
 #: templates/privacy.html:28
@@ -1936,15 +2051,15 @@ msgstr ""
 #: templates/privacy.html:30
 msgid "details on sharing data with third parties"
 msgstr ""
-"None of the data that is not openly shown on the forum by the choice of the user "
-"is shared with any third party."
+"None of the data that is not openly shown on the forum by the choice of the "
+"user is shared with any third party."
 
 #: templates/privacy.html:35
 msgid "cookie policy details"
 msgstr ""
-"Forum software relies on the internet cookie technology to "
-"keep track of user sessions. Cookies must be enabled "
-"in your browser so that forum can work for you."
+"Forum software relies on the internet cookie technology to keep track of "
+"user sessions. Cookies must be enabled in your browser so that forum can "
+"work for you."
 
 #: templates/privacy.html:37
 msgid "Policy Changes"
@@ -1953,9 +2068,9 @@ msgstr ""
 #: templates/privacy.html:38
 msgid "how privacy policies can be changed"
 msgstr ""
-"These policies may be adjusted to improve protection of "
-"user's privacy. Whenever such changes occur, users will be "
-"notified via the internal messaging system. "
+"These policies may be adjusted to improve protection of user's privacy. "
+"Whenever such changes occur, users will be notified via the internal "
+"messaging system. "
 
 #: templates/question.html:77 templates/question.html.py:78
 #: templates/question.html:94 templates/question.html.py:96
@@ -1981,31 +2096,31 @@ msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 
 #: templates/question.html:140 templates/question.html.py:294
-#: templates/revisions_answer.html:56 templates/revisions_question.html:56
+#: templates/revisions_answer.html:58 templates/revisions_question.html:58
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:144 templates/question.html.py:301
-msgid "delete"
-msgstr ""
-
-#: templates/question.html:149
+#: templates/question.html:145
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:153
+#: templates/question.html:149
 msgid "close"
 msgstr ""
 
-#: templates/question.html:159 templates/question.html.py:308
+#: templates/question.html:155 templates/question.html.py:299
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 
-#: templates/question.html:160 templates/question.html.py:309
+#: templates/question.html:156 templates/question.html.py:300
 msgid "flag offensive"
 msgstr ""
 
+#: templates/question.html:164 templates/question.html.py:311
+msgid "delete"
+msgstr ""
+
 #: templates/question.html:182 templates/question.html.py:331
 msgid "delete this comment"
 msgstr ""
@@ -2115,7 +2230,7 @@ msgstr ""
 msgid "permanent link"
 msgstr "link"
 
-#: templates/question.html:301
+#: templates/question.html:311
 msgid "undelete"
 msgstr ""
 
@@ -2287,40 +2402,61 @@ msgstr ""
 msgid "tag editors receive special awards from the community"
 msgstr ""
 
-#: templates/questions.html:24
+#: templates/questions.html:29
 msgid "Found by tags"
 msgstr "Tagged questions"
 
-#: templates/questions.html:24
+#: templates/questions.html:33
+msgid "Search results"
+msgstr ""
+
+#: templates/questions.html:35
 msgid "Found by title"
 msgstr ""
 
-#: templates/questions.html:24
+#: templates/questions.html:39 templates/unanswered.html:8
+#: templates/unanswered.html.py:19
+msgid "Unanswered questions"
+msgstr ""
+
+#: templates/questions.html:41
 msgid "All questions"
 msgstr ""
 
-#: templates/questions.html:26 templates/unanswered.html:21
+#: templates/questions.html:47 templates/unanswered.html:21
 msgid "most recently asked questions"
 msgstr ""
 
-#: templates/questions.html:27
+#: templates/questions.html:48
 msgid "most recently updated questions"
 msgstr ""
 
-#: templates/questions.html:27
+#: templates/questions.html:48
 msgid "active"
 msgstr ""
 
-#: templates/questions.html:126
+#: templates/questions.html:144
+msgid "Did not find anything?"
+msgstr ""
+
+#: templates/questions.html:147
+msgid "Did not find what you were looking for?"
+msgstr ""
+
+#: templates/questions.html:149
+msgid "Please, post your question!"
+msgstr ""
+
+#: templates/questions.html:163
 #, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
-"\t\t\t"
+"            have total %(q_num)s questions tagged %(tagname)s\n"
+"            "
 msgid_plural ""
 "\n"
-"\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
-"\t\t\t"
+"            have total %(q_num)s questions tagged %(tagname)s\n"
+"            "
 msgstr[0] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>question tagged</p><p><span "
@@ -2330,16 +2466,41 @@ msgstr[1] ""
 "<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
 "class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
 
-#: templates/questions.html:133
+#: templates/questions.html:171
 #, python-format
 msgid ""
 "\n"
-"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t\t"
+"                    have total %(q_num)s questions containing %(searchtitle)"
+"s in full text\n"
+"                    "
 msgid_plural ""
 "\n"
-"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t\t"
+"                    have total %(q_num)s questions containing %(searchtitle)"
+"s in full text\n"
+"                    "
+msgstr[0] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>question "
+"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
+"p>"
+msgstr[1] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions "
+"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
+"p>"
+
+#: templates/questions.html:177
+#, python-format
+msgid ""
+"\n"
+"                    have total %(q_num)s questions containing %(searchtitle)"
+"s\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    have total %(q_num)s questions containing %(searchtitle)"
+"s\n"
+"                    "
 msgstr[0] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>question with title "
@@ -2351,55 +2512,80 @@ msgstr[1] ""
 "containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
 "p>"
 
-#: templates/questions.html:139
+#: templates/questions.html:185
+#, python-format
+msgid ""
+"\n"
+"                    have total %(q_num)s unanswered questions\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    have total %(q_num)s unanswered questions\n"
+"                    "
+msgstr[0] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>question without an "
+"accepted answer</p>"
+msgstr[1] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions without an "
+"accepted answer</p>"
+
+#: templates/questions.html:191
 #, python-format
 msgid ""
 "\n"
-"\t\t\t\thave total %(q_num)s questions\n"
-"\t\t\t\t"
+"                    have total %(q_num)s questions\n"
+"                    "
 msgid_plural ""
 "\n"
-"\t\t\t\thave total %(q_num)s questions\n"
-"\t\t\t\t"
+"                    have total %(q_num)s questions\n"
+"                    "
 msgstr[0] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>question</p>"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions<p>"
 
-#: templates/questions.html:148
+#: templates/questions.html:201
 msgid "latest questions info"
 msgstr "<strong>Newest</strong> questions are shown first."
 
-#: templates/questions.html:152
+#: templates/questions.html:205
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 
-#: templates/questions.html:153
+#: templates/questions.html:206
 msgid "Most recently answered ones are shown first."
 msgstr "<strong>Most recently answered</strong> questions are shown first."
 
-#: templates/questions.html:157
+#: templates/questions.html:210
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Questions sorted by the <strong>number of answers</strong>."
 
-#: templates/questions.html:158
+#: templates/questions.html:211
 msgid "Most answered questions are shown first."
 msgstr " "
 
-#: templates/questions.html:162
+#: templates/questions.html:215
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr ""
 
-#: templates/questions.html:163
+#: templates/questions.html:216
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:168 templates/unanswered.html:118
+#: templates/questions.html:224 templates/unanswered.html:118
 msgid "Related tags"
 msgstr "Tags"
 
+#: templates/questions.html:227 templates/tag_selector.html:10
+#: templates/tag_selector.html.py:27
+#, python-format
+msgid "see questions tagged '%(tag_name)s'"
+msgstr ""
+
 #: templates/reopen.html:6 templates/reopen.html.py:16
 msgid "Reopen question"
 msgstr ""
@@ -2428,15 +2614,41 @@ msgstr ""
 msgid "Reopen this question"
 msgstr ""
 
-#: templates/revisions_answer.html:7 templates/revisions_answer.html.py:36
-#: templates/revisions_question.html:8 templates/revisions_question.html:36
+#: templates/revisions_answer.html:7 templates/revisions_answer.html.py:38
+#: templates/revisions_question.html:8 templates/revisions_question.html:38
 msgid "Revision history"
 msgstr ""
 
-#: templates/revisions_answer.html:48 templates/revisions_question.html:48
+#: templates/revisions_answer.html:50 templates/revisions_question.html:50
 msgid "click to hide/show revision"
 msgstr ""
 
+#: templates/tag_selector.html:4
+msgid "Interesting tags"
+msgstr ""
+
+#: templates/tag_selector.html:14
+#, python-format
+msgid "remove '%(tag_name)s' from the list of interesting tags"
+msgstr ""
+
+#: templates/tag_selector.html:20 templates/tag_selector.html.py:37
+msgid "Add"
+msgstr ""
+
+#: templates/tag_selector.html:21
+msgid "Ignored tags"
+msgstr ""
+
+#: templates/tag_selector.html:31
+#, python-format
+msgid "remove '%(tag_name)s' from the list of ignored tags"
+msgstr ""
+
+#: templates/tag_selector.html:40
+msgid "keep ingored questions hidden"
+msgstr ""
+
 #: templates/tags.html:6 templates/tags.html.py:30
 msgid "Tag list"
 msgstr ""
@@ -2469,10 +2681,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr ""
 
-#: templates/unanswered.html:8 templates/unanswered.html.py:19
-msgid "Unanswered questions"
-msgstr ""
-
 #: templates/unanswered.html:114
 #, python-format
 msgid "have %(num_q)s unanswered questions"
@@ -2501,7 +2709,7 @@ msgstr "<a href='%(gravatar_faq_url)s'>gravatar</a>"
 msgid "Registered user"
 msgstr ""
 
-#: templates/user_edit.html:82 templates/user_email_subscriptions.html:17
+#: templates/user_edit.html:86 templates/user_email_subscriptions.html:20
 msgid "Update"
 msgstr ""
 
@@ -2518,7 +2726,7 @@ msgstr ""
 "receive emails - select 'no email' on all items below.<br/>Updates are only "
 "sent when there is any new activity on selected items."
 
-#: templates/user_email_subscriptions.html:18
+#: templates/user_email_subscriptions.html:21
 msgid "Stop sending email"
 msgstr "Stop Email"
 
@@ -2662,10 +2870,11 @@ msgstr[1] ""
 
 #: templates/user_stats.html:100
 #, python-format
-msgid "see other questions tagged '%(tag)s' "
+msgid ""
+"see other questions with %(view_user)s's contributions tagged '%(tag_name)s' "
 msgstr ""
 
-#: templates/user_stats.html:114
+#: templates/user_stats.html:115
 #, python-format
 msgid ""
 "\n"
@@ -2762,12 +2971,11 @@ msgstr ""
 msgid "here is why email is required, see %(gravatar_faq_url)s"
 msgstr ""
 "<span class='strong big'>Please enter your email address in the box below.</"
-"span> Valid email address is required on this Q&amp;"
-"A forum. If you like, you can <strong>receive updates</strong> on "
-"interesting questions or entire forum via email. Also, your email is used to "
-"create a unique <a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a> "
-"image for your account. Email addresses are never shown or otherwise shared "
-"with anybody else."
+"span> Valid email address is required on this Q&amp;A forum. If you like, "
+"you can <strong>receive updates</strong> on interesting questions or entire "
+"forum via email. Also, your email is used to create a unique <a href='%"
+"(gravatar_faq_url)s'><strong>gravatar</strong></a> image for your account. "
+"Email addresses are never shown or otherwise shared with anybody else."
 
 #: templates/authopenid/changeemail.html:31
 msgid "Your new Email"
@@ -2795,8 +3003,8 @@ msgstr ""
 "<span class=\"strong big\">An email with a validation link has been sent to %"
 "(email)s.</span> Please <strong>follow the emailed link</strong> with your "
 "web browser. Email validation is necessary to help insure the proper use of "
-"email on <span class=\"orange\">Q&amp;A</span>. If you would like "
-"to use <strong>another email</strong>, please <a href='%(change_email_url)"
+"email on <span class=\"orange\">Q&amp;A</span>. If you would like to use "
+"<strong>another email</strong>, please <a href='%(change_email_url)"
 "s'><strong>change it again</strong></a>."
 
 #: templates/authopenid/changeemail.html:57
@@ -2917,14 +3125,13 @@ msgid ""
 "                        "
 msgstr ""
 "<p><span class='strong big'>Oops... looks like screen name %(username)s is "
-"already used in another account.</span></p><p>Please choose another screen name "
-"to use with your %(provider)s login. Also, a valid email address is "
-"required on the <span class='orange'>Q&amp;A</span> forum. Your "
-"email is used to create a unique <a href='%(gravatar_faq_url)"
-"s'><strong>gravatar</strong></a> image for your account. If you like, "
-"you can <strong>receive updates</strong> on the interesting questions or "
-"entire forum by email. Email addresses are never shown or otherwise shared "
-"with anybody else.</p>"
+"already used in another account.</span></p><p>Please choose another screen "
+"name to use with your %(provider)s login. Also, a valid email address is "
+"required on the <span class='orange'>Q&amp;A</span> forum. Your email is "
+"used to create a unique <a href='%(gravatar_faq_url)s'><strong>gravatar</"
+"strong></a> image for your account. If you like, you can <strong>receive "
+"updates</strong> on the interesting questions or entire forum by email. "
+"Email addresses are never shown or otherwise shared with anybody else.</p>"
 
 #: templates/authopenid/complete.html:35
 #, python-format
@@ -2962,32 +3169,36 @@ msgstr ""
 msgid "receive updates motivational blurb"
 msgstr ""
 "<strong>Receive forum updates by email</strong> - this will help our "
-"community grow and become more useful.<br/>By default "
-"<span class='orange'>Q&amp;A</span> forum sends up to <strong>one "
-"email digest per week</strong>  - only when there is anything new.<br/>If "
-"you like, please adjust this now or any time later from your user account."
+"community grow and become more useful.<br/>By default <span "
+"class='orange'>Q&amp;A</span> forum sends up to <strong>one email digest per "
+"week</strong>  - only when there is anything new.<br/>If you like, please "
+"adjust this now or any time later from your user account."
 
 #: templates/authopenid/complete.html:91
+msgid "Tag filter tool will be your right panel, once you log in."
+msgstr ""
+
+#: templates/authopenid/complete.html:92
 msgid "create account"
 msgstr "Signup"
 
-#: templates/authopenid/complete.html:100
+#: templates/authopenid/complete.html:101
 msgid "Existing account"
 msgstr ""
 
-#: templates/authopenid/complete.html:101
+#: templates/authopenid/complete.html:102
 msgid "user name"
 msgstr ""
 
-#: templates/authopenid/complete.html:102
+#: templates/authopenid/complete.html:103
 msgid "password"
 msgstr ""
 
-#: templates/authopenid/complete.html:107
+#: templates/authopenid/complete.html:108
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:108 templates/authopenid/signin.html:140
+#: templates/authopenid/complete.html:109 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr ""
 
@@ -3080,6 +3291,10 @@ msgstr ""
 msgid "Traditional login information"
 msgstr ""
 
+#: templates/authopenid/external_legacy_login_info.html:12
+msgid "how to login with password through external login website"
+msgstr ""
+
 #: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:7
 msgid "Send new password"
 msgstr "Recover password"
@@ -3274,3 +3489,18 @@ msgstr ""
 #: templates/authopenid/signup.html:19
 msgid "return to OpenID login"
 msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\t\t\t\thave total %(q_num)s questions\n"
+#~ "\t\t\t\t"
+#~ msgid_plural ""
+#~ "\n"
+#~ "\t\t\t\thave total %(q_num)s questions\n"
+#~ "\t\t\t\t"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "<div class=\"questions-count\">%(q_num)s</div><p>question</p>"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index 0d4c52d3..33df1e21 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -670,178 +670,12 @@ function createComments(type) {
     };
 }
 
-function pickedTags(){
-
-    var sendAjax = function(tagname, reason, action, callback){
-        url = scriptUrl;
-        if (action == 'add'){
-            url += $.i18n._('mark-tag/');
-            if (reason == 'good'){
-                url += $.i18n._('interesting/');
-            }
-            else {
-                url += $.i18n._('ignored/');
-            }
-        }
-        else {
-            url += $.i18n._('unmark-tag/');
-        }
-        url = url + tagname + '/';
-
-        call_settings = {
-            type:'POST',
-            url:url
-        }
-        if (callback != false){
-            call_settings['success'] = callback;
-        }
-        $.ajax(call_settings);
-    }
-
-
-    var unpickTag = function(from_target ,tagname, reason, send_ajax){
-        //send ajax request to delete tag
-        var deleteTagLocally = function(){
-            from_target[tagname].remove();
-            delete from_target[tagname];
-        }
-        if (send_ajax){
-            sendAjax(tagname,reason,'remove',deleteTagLocally);
-        }
-        else {
-            deleteTagLocally();
-        }
-
-    }
-
-    var setupTagDeleteEvents = function(obj,tag_store,tagname,reason,send_ajax){
-        obj.unbind('mouseover').bind('mouseover', function(){
-            $(this).attr('src', scriptUrl + 'content/images/close-small-hover.png');
-        });
-        obj.unbind('mouseout').bind('mouseout', function(){
-            $(this).attr('src', scriptUrl + 'content/images/close-small-dark.png');
-        });
-        obj.click( function(){
-            unpickTag(tag_store,tagname,reason,send_ajax);
-        });
-    }
-
-    var handlePickedTag = function(obj,reason){
-        var tagname = $.trim($(obj).prev().attr('value'));
-        to_target = interestingTags;
-        from_target = ignoredTags;
-        if (reason == 'bad'){
-            to_target = ignoredTags;
-            from_target = interestingTags;
-            to_tag_container = $('div .tags.ignored');
-        }
-        else if (reason != 'good'){
-            return;
-        }
-        else {
-            to_tag_container = $('div .tags.interesting');
-        }
-
-        if (tagname in from_target){
-            unpickTag(from_target,tagname,reason,false);
-        }
-
-        if (!(tagname in to_target)){
-            //send ajax request to pick this tag
-
-            sendAjax(tagname,reason,'add',function(){
-                new_tag = $('<span></span>');
-                new_tag.addClass('deletable-tag');
-                tag_link = $('<a></a>');
-                tag_link.attr('rel','tag');
-                tag_link.attr('href', scriptUrl + $.i18n._('tags/') + tagname);
-                tag_link.html(tagname);
-                del_link = $('<img></img>');
-                del_link.addClass('delete-icon');
-                del_link.attr('src', scriptUrl + 'content/images/close-small-dark.png');
-
-                setupTagDeleteEvents(del_link, to_target, tagname, reason, true);
-
-                new_tag.append(tag_link);
-                new_tag.append(del_link);
-                to_tag_container.append(new_tag);
-
-                to_target[tagname] = new_tag;
-            });
-        }
-    }
-
-    var collectPickedTags = function(){
-        var good_prefix = 'interesting-tag-';
-        var bad_prefix = 'ignored-tag-';
-        var good_re = RegExp('^' + good_prefix);
-        var bad_re = RegExp('^' + bad_prefix);
-        interestingTags = {};
-        ignoredTags = {};
-        $('.deletable-tag').each(
-            function(i,item){
-                item_id = $(item).attr('id')
-                if (good_re.test(item_id)){
-                    tag_name = item_id.replace(good_prefix,'');
-                    tag_store = interestingTags;
-                    reason = 'good';
-                }
-                else if (bad_re.test(item_id)){
-                    tag_name = item_id.replace(bad_prefix,'');
-                    tag_store = ignoredTags;
-                    reason = 'bad';
-                } 
-                else {
-                    return;
-                }
-                tag_store[tag_name] = $(item);
-                setupTagDeleteEvents($(item).find('img'),tag_store,tag_name,reason,true)
-            }
-        );
-    }
-
-    var setupHideIgnoredQuestionsControl = function(){
-        $('#hideIgnoredTagsCb').unbind('click').click(function(){
-            $.ajax({
-                        type: 'POST',
-                        dataType: 'json',
-                        cache: false,
-                        url: scriptUrl + $.i18n._('command/'),
-                        data: {command:'toggle-ignored-questions'}
-                    });
-        });
-    }
-    return {
-        init: function(){
-            collectPickedTags();
-            setupHideIgnoredQuestionsControl();
-            $("#interestingTagInput, #ignoredTagInput").autocomplete(tags, {
-                minChars: 1,
-                matchContains: true,
-                max: 20,
-                multiple: true,
-                multipleSeparator: " ",
-                formatItem: function(row, i, max) {
-                    return row.n + " ("+ row.c +")";
-                },
-                formatResult: function(row, i, max){
-                    return row.n;
-                }
-
-            });
-            $("#interestingTagAdd").click(function(){handlePickedTag(this,'good')});
-            $("#ignoredTagAdd").click(function(){handlePickedTag(this,'bad')});
-        }
-    };
-}
-
 var questionComments = createComments('question');
 var answerComments = createComments('answer');
 
 $().ready(function() {
     questionComments.init();
     answerComments.init();
-    pickedTags().init();
 });
 
 var commentsFactory = {'question' : questionComments, 'answer' : answerComments};
diff --git a/templates/content/js/com.cnprog.tag_selector.js b/templates/content/js/com.cnprog.tag_selector.js
new file mode 100644
index 00000000..f6c16c9c
--- /dev/null
+++ b/templates/content/js/com.cnprog.tag_selector.js
@@ -0,0 +1,168 @@
+function pickedTags(){
+
+    var sendAjax = function(tagname, reason, action, callback){
+        url = scriptUrl;
+        if (action == 'add'){
+            url += $.i18n._('mark-tag/');
+            if (reason == 'good'){
+                url += $.i18n._('interesting/');
+            }
+            else {
+                url += $.i18n._('ignored/');
+            }
+        }
+        else {
+            url += $.i18n._('unmark-tag/');
+        }
+        url = url + tagname + '/';
+
+        call_settings = {
+            type:'POST',
+            url:url
+        }
+        if (callback != false){
+            call_settings['success'] = callback;
+        }
+        $.ajax(call_settings);
+    }
+
+
+    var unpickTag = function(from_target ,tagname, reason, send_ajax){
+        //send ajax request to delete tag
+        var deleteTagLocally = function(){
+            from_target[tagname].remove();
+            delete from_target[tagname];
+        }
+        if (send_ajax){
+            sendAjax(tagname,reason,'remove',deleteTagLocally);
+        }
+        else {
+            deleteTagLocally();
+        }
+
+    }
+
+    var setupTagDeleteEvents = function(obj,tag_store,tagname,reason,send_ajax){
+        obj.unbind('mouseover').bind('mouseover', function(){
+            $(this).attr('src', scriptUrl + 'content/images/close-small-hover.png');
+        });
+        obj.unbind('mouseout').bind('mouseout', function(){
+            $(this).attr('src', scriptUrl + 'content/images/close-small-dark.png');
+        });
+        obj.click( function(){
+            unpickTag(tag_store,tagname,reason,send_ajax);
+        });
+    }
+
+    var handlePickedTag = function(obj,reason){
+        var tagname = $.trim($(obj).prev().attr('value'));
+        to_target = interestingTags;
+        from_target = ignoredTags;
+        if (reason == 'bad'){
+            to_target = ignoredTags;
+            from_target = interestingTags;
+            to_tag_container = $('div .tags.ignored');
+        }
+        else if (reason != 'good'){
+            return;
+        }
+        else {
+            to_tag_container = $('div .tags.interesting');
+        }
+
+        if (tagname in from_target){
+            unpickTag(from_target,tagname,reason,false);
+        }
+
+        if (!(tagname in to_target)){
+            //send ajax request to pick this tag
+
+            sendAjax(tagname,reason,'add',function(){
+                new_tag = $('<span></span>');
+                new_tag.addClass('deletable-tag');
+                tag_link = $('<a></a>');
+                tag_link.attr('rel','tag');
+                tag_link.attr('href', scriptUrl + $.i18n._('tags/') + tagname);
+                tag_link.html(tagname);
+                del_link = $('<img></img>');
+                del_link.addClass('delete-icon');
+                del_link.attr('src', scriptUrl + 'content/images/close-small-dark.png');
+
+                setupTagDeleteEvents(del_link, to_target, tagname, reason, true);
+
+                new_tag.append(tag_link);
+                new_tag.append(del_link);
+                to_tag_container.append(new_tag);
+
+                to_target[tagname] = new_tag;
+            });
+        }
+    }
+
+    var collectPickedTags = function(){
+        var good_prefix = 'interesting-tag-';
+        var bad_prefix = 'ignored-tag-';
+        var good_re = RegExp('^' + good_prefix);
+        var bad_re = RegExp('^' + bad_prefix);
+        interestingTags = {};
+        ignoredTags = {};
+        $('.deletable-tag').each(
+            function(i,item){
+                item_id = $(item).attr('id')
+                if (good_re.test(item_id)){
+                    tag_name = item_id.replace(good_prefix,'');
+                    tag_store = interestingTags;
+                    reason = 'good';
+                }
+                else if (bad_re.test(item_id)){
+                    tag_name = item_id.replace(bad_prefix,'');
+                    tag_store = ignoredTags;
+                    reason = 'bad';
+                } 
+                else {
+                    return;
+                }
+                tag_store[tag_name] = $(item);
+                setupTagDeleteEvents($(item).find('img'),tag_store,tag_name,reason,true)
+            }
+        );
+    }
+
+    var setupHideIgnoredQuestionsControl = function(){
+        $('#hideIgnoredTagsCb').unbind('click').click(function(){
+            $.ajax({
+                        type: 'POST',
+                        dataType: 'json',
+                        cache: false,
+                        url: scriptUrl + $.i18n._('command/'),
+                        data: {command:'toggle-ignored-questions'}
+                    });
+        });
+    }
+    return {
+        init: function(){
+            collectPickedTags();
+            setupHideIgnoredQuestionsControl();
+            $("#interestingTagInput, #ignoredTagInput").autocomplete(tags, {
+                minChars: 1,
+                matchContains: true,
+                max: 20,
+                multiple: true,
+                multipleSeparator: " ",
+                formatItem: function(row, i, max) {
+                    return row.n + " ("+ row.c +")";
+                },
+                formatResult: function(row, i, max){
+                    return row.n;
+                }
+
+            });
+            $("#interestingTagAdd").click(function(){handlePickedTag(this,'good')});
+            $("#ignoredTagAdd").click(function(){handlePickedTag(this,'bad')});
+        }
+    };
+}
+
+$(document).ready( function(){
+    pickedTags().init();
+});
diff --git a/templates/index.html b/templates/index.html
index 68a13197..4041b863 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -18,7 +18,7 @@
            });
        </script>
        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
-       <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+       <script type='text/javascript' src='{% href "/content/js/com.cnprog.tag_selector.js" %}'></script>
 {% endblock %}
 {% block content %}
 <div class="tabBar">
diff --git a/templates/questions.html b/templates/questions.html
index 63026dc3..9387b345 100644
--- a/templates/questions.html
+++ b/templates/questions.html
@@ -20,7 +20,7 @@
            });
        </script>
        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
-       <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
+       <script type='text/javascript' src='{% href "/content/js/com.cnprog.tag_selector.js" %}'></script>
 {% endblock %}
 {% block content %}
 <div class="tabBar">
@@ -57,8 +57,10 @@
             {% if question.interesting_score > 0 %}
                     style="background:#ffff99;"
             {% else %}
-                {% if question.ignored_score > 0 %}
+                {% if not request.user.hide_ignored_questions %}
+                    {% if question.ignored_score > 0 %}
                     style="background:#f3f3f3;"
+                    {% endif %}
                 {% endif %}
             {% endif %}
         {% endif %}
-- 
cgit v1.2.3-1-g7c22


From fdac57838a27f3837b0ef187a9a3f86f293d29b1 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 9 Dec 2009 19:57:49 -0500
Subject: added sitemap at /sitemap.xml and fixed per tag subscription
 (hopefully)

---
 .gitignore                                     |   2 +-
 forum/const.py                                 |   2 +-
 forum/forms.py                                 |   8 ++
 forum/management/commands/send_email_alerts.py | 145 ++++++++++++-------------
 forum/models.py                                |   5 +
 forum/sitemap.py                               |  11 ++
 forum/urls.py                                  |   5 +
 forum/views.py                                 |  21 ++--
 settings.py                                    |   1 +
 templates/about.html                           |  26 ++---
 templates/unanswered.html                      | 132 ----------------------
 11 files changed, 127 insertions(+), 231 deletions(-)
 create mode 100644 forum/sitemap.py
 delete mode 100644 templates/unanswered.html

diff --git a/.gitignore b/.gitignore
index b217d5cc..69133c46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.pyc
 *.swp
 *.log
-settings_local.py
 nbproject
+settings_local.py
diff --git a/forum/const.py b/forum/const.py
index 91b6f5e5..76fd4a24 100644
--- a/forum/const.py
+++ b/forum/const.py
@@ -89,4 +89,4 @@ CONST = {
 }
 
 #how to filter questions by tags in email digests?
-TAG_EMAIL_FILTER_CHOICES = (('ignored', _('exclude ignored tags')),('interesting',_('allow only interesting tags')))
+TAG_EMAIL_FILTER_CHOICES = (('ignored', _('exclude ignored tags')),('interesting',_('allow only selected tags')))
diff --git a/forum/forms.py b/forum/forms.py
index ecdd9c95..ad2c5bac 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -241,6 +241,14 @@ class TagFilterSelectionForm(forms.ModelForm):
         model = User
         fields = ('tag_filter_setting',)
 
+    def save(self):
+        before = self.instance.tag_filter_setting
+        super(TagFilterSelectionForm, self).save()
+        after = self.instance.tag_filter_setting #User.objects.get(pk=self.instance.id).tag_filter_setting
+        if before != after:
+            return True
+        return False
+
 class EditUserEmailFeedsForm(forms.Form):
     WN = (('w',_('weekly')),('n',_('no email')))
     DWN = (('d',_('daily')),('w',_('weekly')),('n',_('no email')))
diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index 4a636e87..777381ec 100644
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -38,84 +38,79 @@ class Command(NoArgsCommand):
                                   ).exclude(
                                         closed=True
                                   )
-    #todo: still need to add back individually selected and other questions....
-    #these may be filtered out by tags
-    if user.tag_filter_setting == 'ignored':
-        ignored_tags = Tag.objects.filter(user_selections___reason='bad',user_selections__user=user)
-        Q_set1 = Q_set1.exclude( tags__in=ignored_tags )
-        logging.debug('removed ignored tags')
-    else:
-        selected_tags = Tag.objects.filter(user_selections___reason='good',user_selections__user=user)
-        Q_set1 = Q_set1.filter( tags__in=selected_tags )
-        logging.debug('filtered for only selected tags')
-        
-    user_feeds = EmailFeedSetting.objects.filter(subscriber=user).exclude(frequency='n')
-    for feed in user_feeds:
-        cutoff_time = now - EmailFeedSetting.DELTA_TABLE[feed.frequency]
-        if feed.reported_at == None or feed.reported_at <= cutoff_time:
-            Q_set = Q_set1.exclude(last_activity_at__gt=cutoff_time)#report these excluded later
-            feed.reported_at = now
-            feed.save()#may not actually report anything, depending on filters below
-            if feed.feed_type == 'q_sel':
-                q_sel = Q_set.filter(followed_by=user)
-                q_sel.cutoff_time = cutoff_time #store cutoff time per query set
-            elif feed.feed_type == 'q_ask':
-                q_ask = Q_set.filter(author=user)
-                q_ask.cutoff_time = cutoff_time
-            elif feed.feed_type == 'q_ans':
-                q_ans = Q_set.filter(answers__author=user)
-                q_ans.cutoff_time = cutoff_time
-            elif feed.feed_type == 'q_all':
-                q_all = Q_set
-                q_all.cutoff_time = cutoff_time
-    #build list in this order
-    q_list = OrderedDict()
-    def extend_question_list(src, dst):
-        """src is a query set with questions
-           or an empty list
-            dst - is an ordered dictionary
-        """
-        if src is None:
-            return #will not do anything if subscription of this type is not used
-        cutoff_time = src.cutoff_time
-        for q in src:
-            if q in dst:
-                if cutoff_time < dst[q]['cutoff_time']:
-                    dst[q]['cutoff_time'] = cutoff_time
-            else:
-                #initialise a questions metadata dictionary to use for email reporting
-                dst[q] = {'cutoff_time':cutoff_time}
+            
+        user_feeds = EmailFeedSetting.objects.filter(subscriber=user).exclude(frequency='n')
+        for feed in user_feeds:
+            cutoff_time = now - EmailFeedSetting.DELTA_TABLE[feed.frequency]
+            if feed.reported_at == None or feed.reported_at <= cutoff_time:
+                Q_set = Q_set1.exclude(last_activity_at__gt=cutoff_time)#report these excluded later
+                feed.reported_at = now
+                feed.save()#may not actually report anything, depending on filters below
+                if feed.feed_type == 'q_sel':
+                    q_sel = Q_set.filter(followed_by=user)
+                    q_sel.cutoff_time = cutoff_time #store cutoff time per query set
+                elif feed.feed_type == 'q_ask':
+                    q_ask = Q_set.filter(author=user)
+                    q_ask.cutoff_time = cutoff_time
+                elif feed.feed_type == 'q_ans':
+                    q_ans = Q_set.filter(answers__author=user)
+                    q_ans.cutoff_time = cutoff_time
+                elif feed.feed_type == 'q_all':
+                    if user.tag_filter_setting == 'ignored':
+                        ignored_tags = Tag.objects.filter(user_selections___reason='bad',user_selections__user=user)
+                        q_all = Q_set.exclude( tags__in=ignored_tags )
+                    else:
+                        selected_tags = Tag.objects.filter(user_selections___reason='good',user_selections__user=user)
+                        q_all = Q_set.filter( tags__in=selected_tags )
+                    q_all.cutoff_time = cutoff_time
+        #build list in this order
+        q_list = OrderedDict()
+        def extend_question_list(src, dst):
+            """src is a query set with questions
+               or an empty list
+                dst - is an ordered dictionary
+            """
+            if src is None:
+                return #will not do anything if subscription of this type is not used
+            cutoff_time = src.cutoff_time
+            for q in src:
+                if q in dst:
+                    if cutoff_time < dst[q]['cutoff_time']:
+                        dst[q]['cutoff_time'] = cutoff_time
+                else:
+                    #initialise a questions metadata dictionary to use for email reporting
+                    dst[q] = {'cutoff_time':cutoff_time}
 
-    extend_question_list(q_sel, q_list)
-    extend_question_list(q_ask, q_list)
-    extend_question_list(q_ans, q_list)
-    extend_question_list(q_all, q_list)
+        extend_question_list(q_sel, q_list)
+        extend_question_list(q_ask, q_list)
+        extend_question_list(q_ans, q_list)
+        extend_question_list(q_all, q_list)
 
-    ctype = ContentType.objects.get_for_model(Question)
-    EMAIL_UPDATE_ACTIVITY = const.TYPE_ACTIVITY_QUESTION_EMAIL_UPDATE_SENT
-    for q, meta_data in q_list.items():
-        #todo use Activity, but first start keeping more Activity records
-        #act = Activity.objects.filter(content_type=ctype, object_id=q.id)
-        #because currently activity is not fully recorded to through
-        #revision records to see what kind modifications were done on
-        #the questions and answers
-        try:
-            update_info = Activity.objects.get(content_type=ctype, 
-                                                object_id=q.id,
-                                                activity_type=EMAIL_UPDATE_ACTIVITY)
-            emailed_at = update_info.active_at
-        except Activity.DoesNotExist:
-            update_info = Activity(user=user, content_object=q, activity_type=EMAIL_UPDATE_ACTIVITY)
-            emailed_at = datetime.datetime(1970,1,1)#long time ago
-        except Activity.MultipleObjectsReturned:
-            raise Exception('server error - multiple question email activities found per user-question pair')
+        ctype = ContentType.objects.get_for_model(Question)
+        EMAIL_UPDATE_ACTIVITY = const.TYPE_ACTIVITY_QUESTION_EMAIL_UPDATE_SENT
+        for q, meta_data in q_list.items():
+            #todo use Activity, but first start keeping more Activity records
+            #act = Activity.objects.filter(content_type=ctype, object_id=q.id)
+            #because currently activity is not fully recorded to through
+            #revision records to see what kind modifications were done on
+            #the questions and answers
+            try:
+                update_info = Activity.objects.get(content_type=ctype, 
+                                                    object_id=q.id,
+                                                    activity_type=EMAIL_UPDATE_ACTIVITY)
+                emailed_at = update_info.active_at
+            except Activity.DoesNotExist:
+                update_info = Activity(user=user, content_object=q, activity_type=EMAIL_UPDATE_ACTIVITY)
+                emailed_at = datetime.datetime(1970,1,1)#long time ago
+            except Activity.MultipleObjectsReturned:
+                raise Exception('server error - multiple question email activities found per user-question pair')
 
-        q_rev = QuestionRevision.objects.filter(question=q,\
-                                                revised_at__lt=cutoff_time,\
-                                                revised_at__gt=emailed_at)
-        q_rev = q_rev.exclude(author=user)
-        meta_data['q_rev'] = len(q_rev)
-        if len(q_rev) > 0 and q.added_at == q_rev[0].revised_at:
+            q_rev = QuestionRevision.objects.filter(question=q,\
+                                                    revised_at__lt=cutoff_time,\
+                                                    revised_at__gt=emailed_at)
+            q_rev = q_rev.exclude(author=user)
+            meta_data['q_rev'] = len(q_rev)
+            if len(q_rev) > 0 and q.added_at == q_rev[0].revised_at:
                 meta_data['q_rev'] = 0
                 meta_data['new_q'] = True
             else:
diff --git a/forum/models.py b/forum/models.py
index b031b0c8..eb3650f8 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -13,6 +13,7 @@ from django.template.defaultfilters import slugify
 from django.db.models.signals import post_delete, post_save, pre_save
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
+from django.contrib.sitemaps import ping_google
 import django.dispatch
 import settings
 import logging
@@ -208,6 +209,10 @@ class Question(models.Model):
         """
         initial_addition = (self.id is None)
         super(Question, self).save(**kwargs)
+        try:
+            ping_google()
+        except Exception:
+            logging.debug('problem pinging google did you register you sitemap with google?')
         if initial_addition:
             tags = Tag.objects.get_or_create_multiple(self.tagname_list(),
                                                       self.author)
diff --git a/forum/sitemap.py b/forum/sitemap.py
new file mode 100644
index 00000000..dc97a009
--- /dev/null
+++ b/forum/sitemap.py
@@ -0,0 +1,11 @@
+from django.contrib.sitemaps import Sitemap
+from forum.models import Question
+
+class QuestionsSitemap(Sitemap):
+    changefreq = 'daily'
+    priority = 0.5
+    def items(self):
+        return Question.objects.exclude(deleted=True)
+
+    def lastmod(self, obj):
+        return obj.last_activity_at
diff --git a/forum/urls.py b/forum/urls.py
index 927e149c..62e70161 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -3,16 +3,21 @@ from django.conf.urls.defaults import *
 from django.contrib import admin
 from forum import views as app
 from forum.feed import RssLastestQuestionsFeed
+from forum.sitemap import QuestionsSitemap
 from django.utils.translation import ugettext as _
 
 admin.autodiscover()
 feeds = {
     'rss': RssLastestQuestionsFeed
 }
+sitemaps = {
+    'questions': QuestionsSitemap
+}
 
 APP_PATH = os.path.dirname(os.path.dirname(__file__))
 urlpatterns = patterns('',
     url(r'^$', app.index, name='index'),
+    url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
     (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.ico'}),
     (r'^favicon\.gif$', 'django.views.generic.simple.redirect_to', {'url': '/content/images/favicon.gif'}),
     (r'^content/(?P<path>.*)$', 'django.views.static.serve',
diff --git a/forum/views.py b/forum/views.py
index c76abf3b..20ca2f6a 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -876,7 +876,8 @@ def tags(request):
                                                 'previous': tags.previous_page_number(),
                                                 'next': tags.next_page_number(),
                                                 'base_url' : reverse('tags') + '?sort=%s&' % sortby
-                                            }})
+                                            }
+                                }, context_instance=RequestContext(request))
 
 def tag(request, tag):
     return questions(request, tagname=tag)
@@ -1886,12 +1887,14 @@ def user_reputation(request, user_id, user_view):
                                           params=[user.id]
                                           ).values('positive', 'negative', 'question_id', 'title', 'reputed_at', 'reputation')
         reputation.query.group_by = ['question_id']
+
     rep_list = []
     for rep in Repute.objects.filter(user=user).order_by('reputed_at'):
         dic = '[%s,%s]' % (calendar.timegm(rep.reputed_at.timetuple()) * 1000, rep.reputation)
         rep_list.append(dic)
     reps = ','.join(rep_list)
     reps = '[%s]' % reps
+
     return render_to_response(user_view.template_file, {
                               "tab_name": user_view.id,
                               "tab_description": user_view.tab_description,
@@ -1957,19 +1960,21 @@ def user_email_subscriptions(request, user_id, user_view):
         email_feeds_form = EditUserEmailFeedsForm(request.POST)
         tag_filter_form = TagFilterSelectionForm(request.POST, instance=user)
         if email_feeds_form.is_valid() and tag_filter_form.is_valid():
-            tag_filter_form.save()
+
+            action_status = None
+            tag_filter_saved = tag_filter_form.save()
+            if tag_filter_saved:
+                action_status = _('changes saved')
             if 'save' in request.POST:
-                saved = email_feeds_form.save(user)
-                if saved:
+                feeds_saved = email_feeds_form.save(user)
+                if feeds_saved:
                     action_status = _('changes saved')
             elif 'stop_email' in request.POST:
-                saved = email_feeds_form.reset().save(user)
+                email_stopped = email_feeds_form.reset().save(user)
                 initial_values = EditUserEmailFeedsForm.NO_EMAIL_INITIAL
                 email_feeds_form = EditUserEmailFeedsForm(initial=initial_values)
-                if saved:
+                if email_stopped:
                     action_status = _('email updates canceled')
-            if not saved:
-                action_status = None
     else:
         email_feeds_form = EditUserEmailFeedsForm()
         email_feeds_form.set_initial_values(user)
diff --git a/settings.py b/settings.py
index a32b2303..6310ce41 100644
--- a/settings.py
+++ b/settings.py
@@ -59,6 +59,7 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.humanize',
+    'django.contrib.sitemaps',
     'forum',
     'django_authopenid',
     'djangosphinx',
diff --git a/templates/about.html b/templates/about.html
index 671964cc..2ca75500 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -12,31 +12,29 @@
 </div>
 
 <div class="content">
-    <!-- default text
-	<p>edit file templates/about.html. Below are just suggestions of what can go here</p>
-	<p>what is your site for?</p>
-	<p>how does it work? what are roles of members?</p>
-	<p>is there a place to find out more about this website?</p>
-    -->
-    <p>{% blocktrans %}<strong>CNPROG <span class="orange">Q&amp;A</span></strong> is a collaboratively edited question
-            and answer site created for the <strong>CNPROG</strong> community.
-    {% endblocktrans %}
+    <p><strong>NMR Wiki <span class="orange">Q&amp;A</span></strong> is a collaboratively edited question
+            and answer site created for the <strong>Magnetic Resonance</strong> community, i.e. those people who
+            work in the fields of <strong>NMR</strong>, <strong>EPR</strong>, <strong>MRI</strong></strong>, etc.
+            NMR Wiki Q&amp;A is affiliated with <strong><a href="http://nmrwiki.org">NMR Wiki</a></strong> -
+            the public wiki knowledge base about the Magnetic Resonance, which currently counts ~300 registered users. The most useful information collected here
+            will be further distilled on the wiki site.
     </p>
-    <p>{% blocktrans %}Here you can <strong>ask</strong> and <strong>answer</strong> questions, <strong>comment</strong>
+    <p>Here you can <strong>ask</strong> and <strong>answer</strong> questions, <strong>comment</strong>
     and <strong>vote</strong> for the questions of others and their answers. Both questions and answers
     <strong>can be revised</strong> and improved. Questions can be <strong>tagged</strong> with
-    the relevant keywords to simplify future access and organize the accumulated material.{% endblocktrans %}
+    the relevant keywords to simplify future access and organize the accumulated material.
     </p>
 
-    <p>{% blocktrans %}This <span class="orange">Q&amp;A</span> site is moderated by its members, hopefully - including yourself!
+    <p>This <span class="orange">Q&amp;A</span> site is moderated by its members, hopefully - including yourself!
     Moderation rights are gradually assigned to the site users based on the accumulated <strong>"reputation"</strong>
     points. These points are added to the users account when others vote for his/her questions or answers.
-    These points (very) roughly reflect the level of trust of the community.{% endblocktrans %}
+    These points (very) roughly reflect the level of trust of the community.
     </p>
     <p>No points are necessary to ask or answer the questions - so please -
     <strong><a href="{% url user_signin %}">join us!</a></strong>
     </p>
-    <p>If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
+    <p>
+            If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
     </p>
 </div>
 {% endblock %}
diff --git a/templates/unanswered.html b/templates/unanswered.html
deleted file mode 100644
index 80a23631..00000000
--- a/templates/unanswered.html
+++ /dev/null
@@ -1,132 +0,0 @@
-{% extends "base.html" %}
-<!-- unanswered.html -->
-{% load extra_tags %}
-{% load i18n %}
-{% load humanize %}
-{% load extra_filters %}
-{% load smart_if %}
-{% block title %}{% spaceless %}{% trans "Unanswered questions" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $("#nav_unanswered").attr('className',"on");
-        });
-         
-        </script>
-{% endblock %}
-{% block content %}
-<div class="tabBar">
-    <span class="headQuestions">{% trans "Unanswered questions" %}</span>
-    <div class="tabsA">
-        <a id="latest" href="{% url unanswered %}?sort=latest" class="on" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a> 
-    </div>
-</div>
-<div id="listA">
-    {% for question in questions.object_list %}
-    <div class="qstA">
-        <h2>
-            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
-        </h2>
-        <div class="stat">
-            <table>
-                <tr>
-                    <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
-                    <td><span class="num">{{ question.score|intcomma }}</span> </td>
-                    <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-                </tr>  
-                <tr>
-                    <td><span class="unit">{% trans "answers" %}</span></td>
-                    <td><span class="unit">{% trans "votes" %}</span></td>
-                    <td><span class="unit">{% trans "views" %}</span></td>
-                </tr> 
-            </table>
-        </div>
-        
-        <div class="summary">
-            {{ question.summary }}...                
-        </div>
-        
-        {% ifequal tab_id 'active'%}
-        {% if question.wiki and settings.WIKI_ON %}
-        <span class="from wiki">{% trans "community wiki" %}</span>
-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-        {% else %}
-        <div class="from">
-            {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
-            <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
-            <span class="score">{% get_score_badge question.last_activity_by %} </span>
-            <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
-        </div>
-        {% endif %}
-        {% else %}
-        {% if question.wiki and settings.WIKI_ON %}
-        <span class="from wiki">{% trans "community wiki" %}</span>
-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-        {% else %}
-        <div class="from">
-            {% comment %}{% gravatar question.author 24 %}{% endcomment %}
-            {% if question.last_activity_at != question.added_at %}
-                {% if question.author.id != question.last_activity_by.id %}
-                    {% trans "Posted:" %}
-                    <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
-                    <span class="score">{% get_score_badge question.author %} </span>
-                    / {% trans "Updated:" %}
-                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
-                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
-                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
-                {% else %}
-                    {% trans "Updated:" %}
-                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
-                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
-                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
-                {% endif %}
-            {% else %}
-                {% trans "Posted:" %}
-                <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
-                <span class="score">{% get_score_badge question.author %} </span>
-                <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-            {% endif %}
-        </div>
-        {% endif %}
-        {% endifequal %}
-        
-        <div class="tags">
-        {% for tag in question.tagname_list %}
-        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
-        {% endfor %}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endblock %}
-
-{% block tail %}
-	<div class="pager">
-		{% cnprog_paginator context %}
-	</div>
-	<div class="pagesize">
-		{% cnprog_pagesize context %}
-	</div>
-{% endblock %}
-
-{% block sidebar %}
-<div class="boxC">
-    {% blocktrans with questions_count|intcomma as num_q %}have {{num_q}} unanswered questions{% endblocktrans %}
-    <!---<p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>-->
-</div>
-<div class="boxC">
-	<h3 class="subtitle">{% trans "Related tags" %}</h3>
-    <div class="body">
-    <div class="tags">
-        {% for tag in tags %}
-            <a rel="tag" title="{% trans "see questions tagged"%}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
-            <span class="tag-number"> &#215; {{ tag.used_count|intcomma }}</span>
-            <br/>
-        {% endfor %}
-        <br/>
-    </div>
-    </div>
-</div>
-
-{% endblock %}
-<!-- end unanswered.html -->
-- 
cgit v1.2.3-1-g7c22


From 82d35490db90878f013523c4d1a5ec3af2df8b23 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 9 Dec 2009 20:21:34 -0500
Subject: made google sitemap reader ping on every question/answer and comment
 save and question delete

---
 INSTALL         | 15 +++++++++++++--
 forum/models.py | 22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index e071f9a7..7de10871 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,7 +8,8 @@ B. INSTALLATION
    4. Installation under Apache/WSGI
    5. Full text search
    6. Email subscriptions
-   7. Miscellaneous
+   7. Sitemap
+   8. Miscellaneous
 C. CONFIGURATION PARAMETERS (settings_local.py)
 D. CUSTOMIZATION
 
@@ -212,7 +213,17 @@ WSGIPythonEggs /var/python/eggs #must be readable and writable by apache
    subscription sender may be tested manually in shell 
    by calling cron/send_email_alerts
 
-7. Miscellaneous
+7. Sitemap
+Sitemap will be available at /<settings_local.FORUM_SCRIPT_ALIAS>sitemap.xml
+e.g yoursite.com/forum/sitemap.xml
+
+google will be pinged each time question, answer or 
+comment is saved or a question deleted
+
+for this to be useful - do register you sitemap with Google at 
+https://www.google.com/webmasters/tools/
+
+8. Miscellaneous
 
 There are some demo scripts under sql_scripts folder, 
 including badges and test accounts for CNProg.com. You 
diff --git a/forum/models.py b/forum/models.py
index eb3650f8..bceced1a 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -102,6 +102,14 @@ class Comment(models.Model):
     class Meta:
         ordering = ('-added_at',)
         db_table = u'comment'
+
+    def save(self,**kwargs):
+        super(Comment,self).save(**kwargs)
+        try:
+            ping_google()
+        except Exception:
+            logging.debug('problem pinging google did you register you sitemap with google?')
+
     def __unicode__(self):
         return self.comment
 
@@ -199,6 +207,13 @@ class Question(models.Model):
 
     objects = QuestionManager()
 
+    def delete(self):
+        super(Question, self).delete()
+        try:
+            ping_google()
+        except Exception:
+            logging.debug('problem pinging google did you register you sitemap with google?')
+
     def save(self, **kwargs):
         """
         Overridden to manually manage addition of tags when the object
@@ -458,6 +473,13 @@ class Answer(models.Model):
     get_comments = get_object_comments
     get_last_update_info = post_get_last_update_info
 
+    def save(self,**kwargs):
+        super(Answer,self).save(**kwargs)
+        try: 
+            ping_google()
+        except Exception:
+            logging.debug('problem pinging google did you register you sitemap with google?')
+
     def get_user_vote(self, user):
         votes = self.votes.filter(user=user)
         if votes.count() > 0:
-- 
cgit v1.2.3-1-g7c22