Applys patches by Sandeep Ghael to fix OSQA-355, OSQA-324, OSQA-411 and OSQA 149.

Thanks Sanddep

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@534 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css
index 77ef96d44feb2e338da5f40ddf60ebc52d930ee7..3d7ee23601ebc9655d893936c704faf16bf49880 100644 (file)
--- a/forum/skins/default/media/style/style.css
+++ b/forum/skins/default/media/style/style.css
@@ -1,6 +1,8 @@
 @import "jquery.autocomplete.css";
 
 body {
 @import "jquery.autocomplete.css";
 
 body {

+    overflow-y: scroll;
+    height: 100%;

     background: none repeat scroll 0 0 #FFFFFF;
     color: #000000;
     font-family: sans-serif;
     background: none repeat scroll 0 0 #FFFFFF;
     color: #000000;
     font-family: sans-serif;


@@ -357,6 +359,11 @@ blockquote {
     font-weight: bold;
 }
 
     font-weight: bold;
 }
 

+.short-summary .question-summary-wrapper {
+  float: right;
+  width: 565px;
+}
+

 .short-summary .votes, .short-summary .status, .short-summary .views {
     -moz-border-radius: 5px 5px 5px 5px;
     border-bottom: 1px solid #CCCCCC;
 .short-summary .votes, .short-summary .status, .short-summary .views {
     -moz-border-radius: 5px 5px 5px 5px;
     border-bottom: 1px solid #CCCCCC;


@@ -1740,4 +1747,4 @@ div.dialog.prompt .dialog-content select, div.dialog.prompt .dialog-content text
     width: 14px;
     height: 14px;
     display: inline-block;
     width: 14px;
     height: 14px;
     display: inline-block;

-}
\ No newline at end of file
+}

diff --git a/forum/skins/default/templates/question_list/item.html b/forum/skins/default/templates/question_list/item.html
index 7d6a117238bd69dd4c3f60e4e3138c99abbb8006..19cbb36fd860a7f1471d05ab1e7284aa7fdcb77e 100644 (file)
--- a/forum/skins/default/templates/question_list/item.html
+++ b/forum/skins/default/templates/question_list/item.html
@@ -5,27 +5,31 @@
             <span class="favorite-mark{% if question.favourite_count %} on{% endif %}"></span>\r
             <div class="item-count">{{question.favourite_count|intcomma}}</div>\r
         </div>\r
             <span class="favorite-mark{% if question.favourite_count %} on{% endif %}"></span>\r
             <div class="item-count">{{question.favourite_count|intcomma}}</div>\r
         </div>\r

-        {% endif %}<div class="votes">\r
+        {% endif %}\r
+        <div class="votes">\r

             <div class="item-count">{{question.score|intcomma}}</div>\r
             <div class="item-count">{{question.score|intcomma}}</div>\r

-            <div>{% trans "votes" %}</div>\r
+            <div>{% ifequal question.score 1 %}{% trans "vote" %}{% else %}{% trans "votes" %}{% endifequal %}</div>\r

         </div >\r
         <div {% if question.accepted_count %}title="{% trans "this question has an accepted answer" %}"{% endif %} class="status {% if question.accepted_count %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">\r
             <div class="item-count">{{question.answer_count|intcomma}}</div>\r
         </div >\r
         <div {% if question.accepted_count %}title="{% trans "this question has an accepted answer" %}"{% endif %} class="status {% if question.accepted_count %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">\r
             <div class="item-count">{{question.answer_count|intcomma}}</div>\r

-            <div>{% trans "answers" %}</div>\r
+            <div>{% ifequal question.answer_count 1 %}{% trans "answer" %}{% else %}{% trans "answers" %}{% endifequal %}</div>\r

         </div>\r
         <div class="views">\r
              <div class="item-count">{{question.view_count|cnprog_intword|safe}}</div>\r
         </div>\r
         <div class="views">\r
              <div class="item-count">{{question.view_count|cnprog_intword|safe}}</div>\r

-             <div>{% trans "views" %}</div>\r
+             <div>{% ifequal question.view_count 1 %}{% trans "view" %}{% else %}{% trans "views" %}{% endifequal %}</div>\r

         </div>\r
     </div>\r
 \r
         </div>\r
     </div>\r
 \r

-    <h2><a title="{{ question.summary }}" href="{{ question.get_absolute_url }}">{{question.headline}}</a></h2>\r
-    <div class="userinfo">\r
-        <span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>\r
-        {% if question.last_activity_by %}{% user_signature question.last_activity_by signature_type %}{% endif %}\r
-    </div>\r
+    <div class="question-summary-wrapper">\r
+        <h2><a title="{{ question.summary }}" href="{{ question.get_absolute_url }}">{{question.headline}}</a></h2>\r
+        <div class="userinfo">\r
+            <span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>\r
+            {% if question.last_activity_by %}{% user_signature question.last_activity_by signature_type %}{% endif %}\r
+        </div>\r

 \r
 \r

-    <div class="tags">{% for tag in question.tagname_list %}\r
-        <a href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>{% endfor %}\r
+        <div class="tags">{% for tag in question.tagname_list %}\r
+            <a href="{% url tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>{% endfor %}\r
+        </div>\r

     </div>\r
     </div>\r

+\r

 </div>
\ No newline at end of file
 </div>
\ No newline at end of file

diff --git a/forum/skins/default/templates/users/stats.html b/forum/skins/default/templates/users/stats.html
index 547f01eee51cde637e370c75d9801aff22de53b1..22b32cf17310680635d73f1e998018f8610ddf31 100644 (file)
--- a/forum/skins/default/templates/users/stats.html
+++ b/forum/skins/default/templates/users/stats.html
@@ -99,8 +99,8 @@
         {% endspaceless %}
         <div class="user-stats-table">
             <table class="tags">
         {% endspaceless %}
         <div class="user-stats-table">
             <table class="tags">

-                <tr>
-                    <td width="180" valign="top">
+                <tr style="vertical-align: top;">
+                    <td valign="top" style="padding-right: 20px;">

                         {% for tag in user_tags%}
                         <a rel="tag" 
                                                        title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}" 
                         {% for tag in user_tags%}
                         <a rel="tag" 
                                                        title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}" 


@@ -127,8 +127,8 @@
         {% endspaceless %}
         <div class="user-stats-table">
             <table>
         {% endspaceless %}
         <div class="user-stats-table">
             <table>

-                <tr>
-                    <td width="180" style="line-height:35px">
+                <tr style="vertical-align: top;">
+                    <td style="line-height:35px; padding-right: 20px;">

                         {% for award, count in awards %}
                             <a href="{% url badges %}{{award.id}}/{{award.name|slugify}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> &#215; {{ count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"6" %}
                         {% for award, count in awards %}
                             <a href="{% url badges %}{{award.id}}/{{award.name|slugify}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> &#215; {{ count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"6" %}