Merge branch 'evgenyfadeev/master'

Conflicts:
	locale/en/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.po

1 files changed, 19 insertions, 17 deletions

diff --git a/templates/users_questions.html b/templates/users_questions.html
index 7b00fd3f..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 %}
@@ -23,27 +25,27 @@
             <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}}">
-            <div class="stats">
-                <div class="votes">
-                    <div class="vote-count-post">{{question.vote_count|intcomma}}</div> 
+        <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> 
                     {% 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>
-                <a title="{{question.summary|collapse}}" 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,12 +57,12 @@
             <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>
     </div>
-    <br clear="both"/>
+    <br clear="all"/>
     {% endfor %}
 </div>
 <!-- end users_questions.html -->