From a990d415fb751be768f63c4f3d65b27498eb0e1a Mon Sep 17 00:00:00 2001 From: Jim Tittsler Date: Fri, 18 May 2012 10:19:09 +1200 Subject: spelling, duplicate character --- askbot/skins/default/templates/faq_static.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/askbot/skins/default/templates/faq_static.html b/askbot/skins/default/templates/faq_static.html index 2b81006f..600f6e0f 100644 --- a/askbot/skins/default/templates/faq_static.html +++ b/askbot/skins/default/templates/faq_static.html @@ -4,7 +4,7 @@ {% block content %}

{% trans %}Frequently Asked Questions {% endtrans %}({% trans %}FAQ{% endtrans %})

{% trans %}What kinds of questions can I ask here?{% endtrans %}

-

{% trans %}Most importanly - questions should be relevant to this community.{% endtrans %} +

{% trans %}Most importantly - questions should be relevant to this community.{% endtrans %} {% trans %}Before you ask - please make sure to search for a similar question. You can search questions by their title or tags.{% endtrans %}

{% trans %}What kinds of questions should be avoided?{% endtrans %}

@@ -69,7 +69,7 @@

{% trans %}How to change my picture (gravatar) and what is gravatar?{% endtrans %}

{% trans %}

The picture that appears on the users profiles is called gravatar (which means globally recognized avatar).

Here is how it works: a cryptographic key (unbreakable code) is calculated from your email address. You upload your picture (or your favorite alter ego image) the website gravatar.com from where we later retreive your image using the key.

This way all the websites you trust can show your image next to your posts and your email address remains private.

Please personalize your account with an image - just register at gravatar.com (just please be sure to use the same email address that you used to register with us). Default image that looks like a kitchen tile is generated automatically.

{% endtrans %}

{% trans %}To register, do I need to create new password?{% endtrans %}

-

{% trans %}No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc."{% endtrans %} +

{% trans %}No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc.{% endtrans %} {% trans %}"Login now!"{% endtrans %} »

{% trans %}Why other people can edit my questions/answers?{% endtrans %}

-- cgit v1.2.3-1-g7c22 From 6fea571057d6fa9a3e25dff7a535c8b26fdafc2c Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 17 May 2012 21:13:12 -0400 Subject: improved copy and styling of the tag_selector.html --- .../skins/common/templates/widgets/tag_selector.html | 20 +++++++++++++++----- askbot/skins/default/media/style/style.less | 5 ++--- askbot/skins/default/templates/faq_static.html | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/askbot/skins/common/templates/widgets/tag_selector.html b/askbot/skins/common/templates/widgets/tag_selector.html index 2413a9c3..7c6fe92e 100644 --- a/askbot/skins/common/templates/widgets/tag_selector.html +++ b/askbot/skins/common/templates/widgets/tag_selector.html @@ -15,7 +15,7 @@ format(tag_name = tag_name) #}
-   +

{% trans %}Ignored tags{% endtrans %}

@@ -32,7 +32,7 @@ format(tag_name = tag_name) #}
-   +
{% if settings.SUBSCRIBED_TAG_SELECTOR_ENABLED %} @@ -50,11 +50,11 @@ format(tag_name = tag_name) #}
-   +
{% endif %} -

{% trans %}Display tag filter{% endtrans%}

+

{% trans %}Show only questions from{% endtrans%}

{{ macros.radio_select( @@ -65,7 +65,7 @@ }}
{% if settings.SUBSCRIBED_TAG_SELECTOR_ENABLED %} -

{% trans %}Email tag filter{% endtrans%}

+

{% trans %}Send me email alerts for{% endtrans%}

{{ macros.radio_select( @@ -74,6 +74,16 @@ choices = email_tag_filter_strategy_choices ) }} + {% if request.user.is_authenticated() %} +

+ {% trans %}Change frequency of emails{% endtrans %} +

+ {% endif %}
{% endif %} diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index c3423418..4d758cea 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -587,13 +587,13 @@ body.anon { #ignoredTagInput, #subscribedTagInput, #ab-tag-search { - width:153px; + width:156px; padding-left:5px; border:#c9c9b5 1px solid; height:25px; } #ab-tag-search { - width: 135px; + width: 138px; } #interestingTagAdd, #ignoredTagAdd, @@ -612,7 +612,6 @@ body.anon { } #ab-tag-search-add { width: 47px; - margin-left: 3px; } } diff --git a/askbot/skins/default/templates/faq_static.html b/askbot/skins/default/templates/faq_static.html index 2b81006f..f143a8cf 100644 --- a/askbot/skins/default/templates/faq_static.html +++ b/askbot/skins/default/templates/faq_static.html @@ -77,7 +77,7 @@ {% trans %}If this approach is not for you, we respect your choice.{% endtrans %}

{% trans %}Still have questions?{% endtrans %}

-

{% trans %}Please ask your question, help make our community better!{% endtrans %} +

{% trans %}Please ask your question, help make our community better!{% endtrans %}