From 2c0d3ce5ba9e6e7cd64570028683be4bdb52f52a Mon Sep 17 00:00:00 2001 From: hernani Date: Sat, 24 Jul 2010 17:27:21 +0000 Subject: [PATCH] Fixes OSQA 413, 414, 415, 416, 417 (patches from mathieu Lafon) and 420 /patch by Sandeep Ghael). Thanks to for the patches. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@551 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/skins/default/media/js/osqa.main.js | 3 +- forum/skins/default/media/style/style.css | 46 +++++----- .../default/templates/auth/complete.html | 9 ++ forum/skins/default/templates/header.html | 91 ++++++++----------- .../default/templates/markdown_help.html | 6 +- .../skins/default/templates/users/stats.html | 10 +- forum/utils/html.py | 2 +- 7 files changed, 83 insertions(+), 84 deletions(-) diff --git a/forum/skins/default/media/js/osqa.main.js b/forum/skins/default/media/js/osqa.main.js index c701b05..c5d0a43 100644 --- a/forum/skins/default/media/js/osqa.main.js +++ b/forum/skins/default/media/js/osqa.main.js @@ -549,7 +549,8 @@ function pickedTags(){ var call_settings = { type:'POST', - url:url + url:url, + data: '' }; if (callback !== false){ call_settings.success = callback; diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css index dc35e8a..9b844c5 100644 --- 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 b40cb28..c5a3c9e 100644 --- a/forum/skins/default/templates/auth/complete.html +++ b/forum/skins/default/templates/auth/complete.html @@ -58,6 +58,15 @@ {{ form1.password2 }} {% endif %} + {% if form1.recaptcha %} +
+ + {% if form1.recaptcha.errors %} +

{{ form1.recaptcha.errors|join:", " }}

+ {% endif %} + {{ form1.recaptcha }} +
+ {% endif %}

{% trans "receive updates motivational blurb" %}

{{email_feeds_form.subscribe}} diff --git a/forum/skins/default/templates/header.html b/forum/skins/default/templates/header.html index bf5160b..5e6e10f 100644 --- 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 %}
- @@ -247,4 +247,4 @@
{% 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, go to the Markdown page where it all started.{% endblocktrans %}
-{% 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 7acacbd..b2659ca 100644 --- a/forum/skins/default/templates/users/stats.html +++ b/forum/skins/default/templates/users/stats.html @@ -11,7 +11,7 @@ {% spaceless %}

{% blocktrans count questions.paginator.count as counter %} - 1 Question + {{counter}} Question {% plural %} {{counter}} Questions {% endblocktrans %} @@ -33,7 +33,7 @@ {% spaceless %}

{% blocktrans count answers.paginator.count as counter %} - 1 Answer + {{counter}} Answer {% plural %} {{counter}} Answers {% endblocktrans %} @@ -65,7 +65,7 @@ {% spaceless %}

{% blocktrans count total_votes as cnt %} - 1 Vote + {{cnt}} Vote {% plural %} {{cnt}} Votes {% endblocktrans %} @@ -91,7 +91,7 @@ {% spaceless %}

{% blocktrans count user_tags|length as counter %} - 1 Tag + {{counter}} Tag {% plural %} {{counter}} Tags {% endblocktrans %} @@ -119,7 +119,7 @@ {% spaceless %}

{% blocktrans count total_awards as counter %} - 1 Badge + {{counter}} Badge {% plural %} {{counter}} Badges {% endblocktrans %} diff --git a/forum/utils/html.py b/forum/utils/html.py index 70fe1b3..86a4ef9 100644 --- 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' % (name, " ".join('%s="%s"' % i for i in attrs.items()), str(content), name)) + return mark_safe('<%s %s>%s' % (name, " ".join('%s="%s"' % i for i in attrs.items()), unicode(content), name)) def hyperlink(url, title, **attrs): return mark_safe('%s' % (url, " ".join('%s="%s"' % i for i in attrs.items()), title)) -- 2.45.2