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

---
 templates/content/js/com.cnprog.i18n.js | 2 +-
 templates/question_edit.html            | 2 +-
 templates/user_edit.html                | 4 ++++
 templates/user_votes.html               | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'templates')

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>          
-- 
cgit v1.2.3-1-g7c22