Fixes OSQA 413, 414, 415, 416, 417 (patches from mathieu Lafon) and 420 /patch by...

Thanks to for the patches.

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

diff --git a/forum/skins/default/media/js/osqa.main.js b/forum/skins/default/media/js/osqa.main.js
index c701b05883003826cfa8507309abb54abff91da2..c5d0a43e2c6f56e82a0ffa69eec70323c183ebc7 100644 (file)
--- a/forum/skins/default/media/js/osqa.main.js
+++ b/forum/skins/default/media/js/osqa.main.js
@@ -549,7 +549,8 @@ function pickedTags(){
 \r
         var call_settings = {\r
             type:'POST',\r
-            url:url\r
+            url:url,\r
+            data: ''\r
         };\r
         if (callback !== false){\r
             call_settings.success = callback;\r

diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css
index dc35e8a089f498c48dbbc414e491fde50c0b31f2..9b844c5cc2cc78b1e40d229c94e268372477c3a6 100644 (file)
--- a/forum/skins/default/media/style/style.css
+++ b/forum/skins/default/media/style/style.css
@@ -58,6 +58,12 @@ a {
     text-decoration: none;
 }
 
+.clear {
+  clear: both;
+  width: 0px;
+  height: 0px;
+}
+
 .badges a {
     color: #763333;
     text-decoration: underline;
@@ -150,9 +156,6 @@ blockquote {
 }
 
 #roof {
-    background: none repeat scroll 0 0 #FFFFFF;
-    margin-top: 0;
-    position: relative;
     width: 990px;
 }
 
@@ -189,13 +192,10 @@ blockquote {
 }
 
 #top {
+    float: right;
     background-color: #FFFFFF;
-    height: 20px;
     padding: 3px;
-    position: absolute;
-    right: 0;
     text-align: right;
-    top: 0;
     width: 500px;
 }
 
@@ -209,20 +209,17 @@ blockquote {
 }
 
 #logo {
+    float: left;
     padding: 5px 0 0;
 }
 
-#navBar {
-    display: block;
-    position: relative;
-    width: 990px;
-}
-
-#navBar .nav {
-    margin: 20px 0 0 16px;
+#nav {
+    float: right;
+    margin: 35px 0px 0px 0px;
+    width: 750px;
 }
 
-#navBar .nav a {
+#nav a {
     background-color: #E5EBF8;
     border-color: #888888 #888888 -moz-use-text-color;
     border-style: solid solid none;
@@ -239,11 +236,11 @@ blockquote {
     text-decoration: none;
 }
 
-#navBar .nav a:hover {
+#nav a:hover {
     text-decoration: underline;
 }
 
-#navBar .nav a.on {
+#nav a.on {
     background: none repeat scroll 0 0 #356FCB;
     border: 1px solid #356FCB;
     color: #FFFFFF;
@@ -253,23 +250,24 @@ blockquote {
     text-decoration: none;
 }
 
-#navBar .nav a.special {
+#nav a#nav_ask {
+    float: right;
     color: #B02B2C;
     font-size: 14px;
     font-weight: bold;
     text-decoration: none;
 }
 
-#navBar .nav a.special:hover {
+#nav a#nav_ask:hover {
     text-decoration: underline;
 }
 
-#navBar .nav div.focus {
-    float: right;
-    padding-right: 0;
+#nav a#nav_ask.on {
+   color: #FFFFFF;
 }
 
 #searchBar {
+    text-align: center;
     background-color: #B6C4E2;
     border-color: #EEEEEC #A9ACA5 #BABDB6 #EEEEEC;
     border-style: solid;
@@ -282,6 +280,8 @@ blockquote {
 }
 
 #searchBar .searchInput {
+    border: 0px;
+    padding: 3px;
     font-size: 13px;
     height: 18px;
     width: 400px;

diff --git a/forum/skins/default/templates/auth/complete.html b/forum/skins/default/templates/auth/complete.html
index b40cb280206d7d81c8d62c57663cbd108907351f..c5a3c9ee2266d84d2cc260e751cdf000b80bc209 100644 (file)
--- a/forum/skins/default/templates/auth/complete.html
+++ b/forum/skins/default/templates/auth/complete.html
@@ -58,6 +58,15 @@
                     {{ form1.password2 }}
                 </div>
             {% endif %}
+            {% if form1.recaptcha %}
+                <div class="form-row-vertical margin-bottom">
+                <label for="recaptcha_id">{{ form1.recaptcha.label }}</label>
+                {% if form1.recaptcha.errors %} 
+                    <p class="error">{{ form1.recaptcha.errors|join:", " }}</p>
+                {% endif %}
+                {{ form1.recaptcha }}
+                </div>
+            {% endif %}
             <p>{% trans "receive updates motivational blurb" %}</p>
             <div class='simple-subscribe-options'>
             {{email_feeds_form.subscribe}}

diff --git a/forum/skins/default/templates/header.html b/forum/skins/default/templates/header.html
index bf5160bf4c5dee337d35c7e496f52666f2d4f1e0..5e6e10fdd8d24e81fc9c369cdb5de7590d51da74 100644 (file)
--- a/forum/skins/default/templates/header.html
+++ b/forum/skins/default/templates/header.html
@@ -2,57 +2,46 @@
 {% load extra_tags ui_registry i18n extra_filters markup %}
 
        <div id="roof">
-               <div id="navBar">
-                       <div id="top">
-                           {% loadregistry header_links %}{% endloadregistry %}
-                       </div>
-                       <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                         <tr>
-                               <td width="23%">
-                                       <div id="logo">
-                                               <a href="{% url index %}">
-                                                       <img src="{{ settings.APP_LOGO }}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>
-                                               </a>
-                                       </div>
-               </td>
-                               <td width="77%" valign="bottom">
-                <div class="nav">
-                    {% loopregistry page_top_tabs %}{% spaceless %}
-                        <a id="nav_{{ tab_name }}"{% ifequal tab tab_name %} class="on"{% endifequal %} href="{{ tab_url }}" >{{ tab_title }}</a>
-                    {% endspaceless %}{% endloopregistry %}
-                    <div class="focus">
-                    <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
-                    </div>
-                </div>
-
-              </td>
-                         </tr>
-                       </table>
+         
+               <div id="logo">
+                       <a href="{% url index %}">
+                               <img src="{{ settings.APP_LOGO }}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>
+                       </a>
                </div>
-               <div id="searchBar">
-                       <table width="100%" border="0" cellpadding="0" cellspacing="0" class="content">
-            <tr>
-                <td align="center" valign="middle">
-                    <form action="{% url search %}" method="get">
-                        <div>
-                            <input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" />
-                            <input type="submit" name="Submit" value="{% trans "search" %}" class="searchBtn" />
-                        </div>
-                        <div class="options">
-                            <input id="type-question" type="radio" value="question" name="t" 
-                                checked="checked" /><label for="type-question">{% trans "questions" %}</label>
-                            <input id="type-tag" type="radio" value="tag" name="t" /><label for="type-tag">{% trans "tags" %}</label>
-                            <input id="type-user" type="radio" value="user" name="t" /><label for="type-user">{% trans "users" %}</label>
-                        </div>
-                    </form>
-                </td>
-            </tr>
-                       </table>
+         
+               <div id="top">
+                   {% loadregistry header_links %}{% endloadregistry %}
                </div>
-               {% if settings.USE_ANNOUNCEMENT_BAR|or_preview:request %}
-        <div id="announcement">
-            {{ settings.ANNOUNCEMENT_BAR|or_preview:request|markdown:"settingsparser" }}
+
+    <div id="nav">
+        {% loopregistry page_top_tabs %}{% spaceless %}
+            <a id="nav_{{ tab_name }}"{% ifequal tab tab_name %} class="on"{% endifequal %} href="{{ tab_url }}" >{{ tab_title }}</a>
+        {% endspaceless %}{% endloopregistry %}
+        <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
+    </div>
+  </div>
+
+  <div class="clear"></div>
+  
+       <div id="searchBar">
+    <form action="{% url search %}" method="get">
+        <div>
+            <input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" />
+            <input type="submit" name="Submit" value="{% trans "search" %}" class="searchBtn" />
         </div>
-        {% endif %}
-       </div>                 
-<!-- end template header.html -->
+        <div class="options">
+            <input id="type-question" type="radio" value="question" name="t" 
+                checked="checked" /><label for="type-question">{% trans "questions" %}</label>
+            <input id="type-tag" type="radio" value="tag" name="t" /><label for="type-tag">{% trans "tags" %}</label>
+            <input id="type-user" type="radio" value="user" name="t" /><label for="type-user">{% trans "users" %}</label>
+        </div>
+    </form>    
+       </div>
+
+       {% if settings.USE_ANNOUNCEMENT_BAR|or_preview:request %}
+  <div id="announcement">
+      {{ settings.ANNOUNCEMENT_BAR|or_preview:request|markdown:"settingsparser" }}
+  </div>
+  {% endif %}
+
+<!-- end template header.html -->
\ No newline at end of file

diff --git a/forum/skins/default/templates/markdown_help.html b/forum/skins/default/templates/markdown_help.html
index dfdd33a39a4293126edb1930a3b78e2a023c5413..78e11ce71b97b2e07e616b85212862cf7d904312 100644 (file)
--- a/forum/skins/default/templates/markdown_help.html
+++ b/forum/skins/default/templates/markdown_help.html
@@ -158,7 +158,7 @@
                     <code>***{% trans "This is bold and italics" %}***</code>
                 </td>
                 <td>
-                    <strong><i>{% trans "This is italics" %}</i></strong>
+                    <strong><i>{% trans "This is bold and italics" %}</i></strong>
                 </td>
             </tr></table>
             <table class="section-example"><tr>
@@ -166,7 +166,7 @@
                     <code>___{% trans "This is also bold and italics" %}___</code>
                 </td>
                 <td>
-                    <strong><i>{% trans "This is italics" %}</i></strong>
+                    <strong><i>{% trans "This is also bold and italics" %}</i></strong>
                 </td>
             </tr></table>
         </div>
@@ -247,4 +247,4 @@
             <div class="section-description">{% blocktrans %}There's a lot more to the Markdown syntax than is mentioned here.  But for creative writers, this covers a lot of the necessities.  To find out more about Markdown than you'd ever want to really know, <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank" rel="nofollow">go to the Markdown page where it all started</a>.{% endblocktrans %}</div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

diff --git a/forum/skins/default/templates/users/stats.html b/forum/skins/default/templates/users/stats.html
index 7acacbd6db260740b200151db4133a9f40339046..b2659ca661f8c2b576d28f279ade4f241a411ad3 100644 (file)
--- a/forum/skins/default/templates/users/stats.html
+++ b/forum/skins/default/templates/users/stats.html
@@ -11,7 +11,7 @@
         {% spaceless %}
             <h2>
                 {% blocktrans count questions.paginator.count as counter %}
-                <span class="count">1</span> Question
+                <span class="count">{{counter}}</span> Question
                 {% plural %}
                 <span class="count">{{counter}}</span> Questions
                 {% endblocktrans %}
@@ -33,7 +33,7 @@
         {% spaceless %}
             <h2>
                 {% blocktrans count answers.paginator.count as counter %}
-                <span class="count">1</span> Answer
+                <span class="count">{{counter}}</span> Answer
                 {% plural %}
                 <span class="count">{{counter}}</span> Answers
                 {% endblocktrans %}
@@ -65,7 +65,7 @@
         {% spaceless %}
             <h2>
                 {% blocktrans count total_votes as cnt %}
-                    <span class="count">1</span> Vote
+                    <span class="count">{{cnt}}</span> Vote
                 {% plural %}
                     <span class="count">{{cnt}}</span> Votes
                 {% endblocktrans %}
@@ -91,7 +91,7 @@
         {% spaceless %}
             <h2>
                 {% blocktrans count user_tags|length as counter %}
-                    <span class="count">1</span> Tag
+                    <span class="count">{{counter}}</span> Tag
                 {% plural %}
                     <span class="count">{{counter}}</span> Tags
                 {% endblocktrans %}
@@ -119,7 +119,7 @@
         {% spaceless %}
         <h2>
             {% blocktrans count total_awards as counter %}
-            <span class="count">1</span> Badge
+            <span class="count">{{counter}}</span> Badge
             {% plural %}
             <span class="count">{{counter}}</span> Badges
             {% endblocktrans %}

diff --git a/forum/utils/html.py b/forum/utils/html.py
index 70fe1b38c9fcbd8cf52f9151ab8af0626b690fee..86a4ef9119cf417f876d1ceb25c7c04460640ba7 100644 (file)
--- a/forum/utils/html.py
+++ b/forum/utils/html.py
@@ -58,7 +58,7 @@ def html2text(s, ignore_tags=(), indent_width=4, page_width=80):
     return mark_safe(parser.result)
 
 def buildtag(name, content, **attrs):
-    return mark_safe('<%s %s>%s</%s>' % (name, " ".join('%s="%s"' % i for i in attrs.items()), str(content), name))
+    return mark_safe('<%s %s>%s</%s>' % (name, " ".join('%s="%s"' % i for i in attrs.items()), unicode(content), name))
 
 def hyperlink(url, title, **attrs):
     return mark_safe('<a href="%s" %s>%s</a>' % (url, " ".join('%s="%s"' % i for i in attrs.items()), title))