adjusted css for the question page

3 files changed, 29 insertions, 7 deletions

diff --git a/askbot/skins/default/media/js/live_search.js b/askbot/skins/default/media/js/live_search.js
index b36d400d..1a66d6e2 100644
--- a/askbot/skins/default/media/js/live_search.js
+++ b/askbot/skins/default/media/js/live_search.js
@@ -179,9 +179,9 @@ $(document).ready(function(){
 
     var render_tags = function(tags){
         var tags_html = '<div class="tags">';
-        for (var i=0; i<tags.length; i++){
-            tags_html += render_tag(tags[i]);
-        }
+        $.each(tags, function(idx, item){
+            tags_html += render_tag(item);
+        });
         tags_html += '</div>';
         return tags_html;
     };
@@ -264,6 +264,12 @@ $(document).ready(function(){
         $('#question-count').html(count_html);
     };
 
+    var render_search_tags = function(tags){
+        var html = $('#question-count').html();
+        var tags_html = render_tags(tags);
+        $('#question-count').html(html + tags_html);
+    };
+
     var create_relevance_tab = function(){
         relevance_tab = $('<a></a>');
         relevance_tab.attr('href', '?sort=relevance-desc');
@@ -331,6 +337,7 @@ $(document).ready(function(){
             new_list.attr('id', q_list_sel);
             render_paginator(data['paginator']);
             set_question_count(data['question_counter']);
+            render_search_tags(data['query_data']['tags']);
             render_faces(data['faces']);
             render_related_tags(data['related_tags']);
             render_relevance_sort_tab();
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index b98a033d..76f89628 100755
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -428,7 +428,8 @@ blockquote {
 }
 
 #question-table {
-    margin-bottom: 10px; /*border-bottom:1px solid #888a85;*/
+    margin: 2px 0 10px 0;
+    border-spacing: 0px;
 }
 
 .evenMore {
@@ -534,6 +535,10 @@ blockquote {
     margin-top: 5px;
 }
 
+#question-count .tags {
+    display: inline;
+}
+
 .tags a {
     white-space: nowrap;
     font-size: 11px;
@@ -697,7 +702,7 @@ a:hover.medal {
 }
 
 .question-body {
-    min-height: 100px;
+    min-height: 39px;
     font-size: 13px;
     line-height: 20px;
 }
@@ -709,6 +714,7 @@ a:hover.medal {
 .vote-buttons {
     float: left;
     text-align: center;
+    padding-top: 3px;
 }
 
 .vote-buttons IMG {
@@ -796,7 +802,7 @@ a:hover.medal {
     background: url(../images/gray-up-arrow-h18px.png) no-repeat;
     width: 100%;
     padding-left: 12px;
-    margin: 3px 0 20px 0;
+    margin: 3px 0 20px 5px;
 }
 
 .comments textarea {
@@ -878,7 +884,7 @@ div.comments {
 
 /*回答*/
 .answer-body {
-    min-height: 80px;
+    min-height: 39px;
     font-size: 13px;
     line-height: 20px;
 }
@@ -1718,6 +1724,7 @@ ul.form-horizontal-rows li input {
     font-size: 11px;
     line-height: 12px;
     min-width: 200px;
+    padding-left: 5px;
     margin-bottom: 5px;
 }
 
diff --git a/askbot/views/readers.py b/askbot/views/readers.py
index 889f716c..feb0e60b 100644
--- a/askbot/views/readers.py
+++ b/askbot/views/readers.py
@@ -150,9 +150,17 @@ def questions(request):
             paginator_html = paginator_tpl.render(Context(data))
         else:
             paginator_html = ''
+        search_tags = list()
+        if search_state.tags:
+            search_tags = list(search_state.tags)
+        query_data = {
+            'tags': search_tags,
+            'sort_order': search_state.sort
+        }
         ajax_data = {
             #current page is 1 by default now
             #because ajax is only called by update in the search button
+            'query_data': query_data,
             'paginator': paginator_html,
             'question_counter': question_counter,
             'questions': list(),