Merge branch 'evgenyfadeev/master'

Conflicts:
	.gitignore
	INSTALL
	TODO
	cnprog.wsgi
	django_authopenid/urls.py
	django_authopenid/views.py
	drop-all-tables.sh
	forum/auth.py
	forum/managers.py
	forum/models.py
	forum/templatetags/extra_tags.py
	forum/views.py
	locale/es/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.po
	settings.py
	settings_local.py.dist
	sql_scripts/update_2009_01_25_001.sql
	sql_scripts/update_2009_02_26_001.sql
	sql_scripts/update_2009_04_10_001.sql
	templates/authopenid/confirm_email.txt
	templates/authopenid/sendpw_email.txt
	templates/content/js/compress.bat
	templates/content/js/flot-build.bat
	templates/content/style/style.css
	templates/footer.html
	templates/question.html
	templates/user_reputation.html
	templates/user_stats.html
	templates/user_votes.html
	templates/users_questions.html
	urls.py

1 files changed, 16 insertions, 18 deletions

diff --git a/templates/users_questions.html b/templates/users_questions.html
index 7a00d82d..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="{{ question.get_absolute_url}}">
-            <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 question question.id%}{{question.title|slugify}}">{{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 %}