From d145eb02d1dfa413477048e54a11d13cef31821b Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 19 Jun 2011 15:24:20 -0400
Subject: fixed a styling bug where question view, vote and answer counts were
 pushed to the left when user name is long

---
 askbot/skins/default/media/js/live_search.js | 17 ++++++++-------
 askbot/skins/default/media/style/style.css   |  2 +-
 askbot/skins/default/templates/macros.html   | 32 ++++++++++++++--------------
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/askbot/skins/default/media/js/live_search.js b/askbot/skins/default/media/js/live_search.js
index 39ed2d14..d367ceac 100644
--- a/askbot/skins/default/media/js/live_search.js
+++ b/askbot/skins/default/media/js/live_search.js
@@ -213,10 +213,10 @@ var liveSearch = function(){
         '<div class="short-summary">' + 
             '<div class="counts">' +
                 render_counter(
-                    question['votes'],
-                    question['votes_word'],
-                    'votes',
-                    question['votes_class']
+                    question['views'],
+                    question['views_word'],
+                    'views',
+                    question['views_class']
                 ) +
                 render_counter(
                     question['answers'],
@@ -225,11 +225,12 @@ var liveSearch = function(){
                     question['answers_class']
                 ) +
                 render_counter(
-                    question['views'],
-                    question['views_word'],
-                    'views',
-                    question['views_class']
+                    question['votes'],
+                    question['votes_word'],
+                    'votes',
+                    question['votes_class']
                 ) +
+                '<div style="clear:both"></div>' +
                 render_user_info(question) +
             '</div>' + 
             render_title(question) +
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index a3a4f079..ffa15009 100755
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -591,7 +591,7 @@ ul#search-tags {
     margin: 0 3px;
     padding: 4px 2px 0px 2px;
     width: 46px;
-    float: left;
+    float: right;
     -moz-border-radius: 5px;
     -khtml-border-radius: 5px;
     -webkit-border-radius: 5px;
diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html
index 58fd986c..969052ba 100644
--- a/askbot/skins/default/templates/macros.html
+++ b/askbot/skins/default/templates/macros.html
@@ -395,15 +395,15 @@ poor design of the data or methods on data objects #}
 {%- macro question_summary(question, extra_class=None) -%}
     <div class="short-summary{% if extra_class %} {{extra_class}}{% endif %}">
         <div class="counts">
-            <div class="votes 
-                        {% if question.score == 0 -%}
-                            no-votes
-                        {% else -%}
-                            some-votes
-                        {%- endif -%}">
-                <span class="item-count">{{question.score|humanize_counter}}</span>
+            <div class="views
+                 {% if question.view_count == 0 -%}
+                    no-views
+                 {% else -%}
+                    some-views
+                 {%- endif -%}">
+                 <span class="item-count">{{question.view_count|humanize_counter}}</span>
                 <div>
-                {% trans cnt=question.score %}vote{% pluralize %}votes{% endtrans %}
+                {% trans cnt=question.view_count %}view{% pluralize %}views{% endtrans %}
                 </div>
             </div>
             <div class="answers
@@ -423,15 +423,15 @@ poor design of the data or methods on data objects #}
                 {% trans cnt=question.answer_count %}answer{% pluralize %}answers{% endtrans %}
                 </div>
             </div>
-            <div class="views
-                 {% if question.view_count == 0 -%}
-                    no-views
-                 {% else -%}
-                    some-views
-                 {%- endif -%}">
-                 <span class="item-count">{{question.view_count|humanize_counter}}</span>
+            <div class="votes 
+                        {% if question.score == 0 -%}
+                            no-votes
+                        {% else -%}
+                            some-votes
+                        {%- endif -%}">
+                <span class="item-count">{{question.score|humanize_counter}}</span>
                 <div>
-                {% trans cnt=question.view_count %}view{% pluralize %}views{% endtrans %}
+                {% trans cnt=question.score %}vote{% pluralize %}votes{% endtrans %}
                 </div>
             </div>
             <div style="clear:both"></div>
-- 
cgit v1.2.3-1-g7c22