diff options
-rw-r--r-- | askbot/skins/common/templates/widgets/tag_selector.html | 20 | ||||
-rw-r--r-- | askbot/skins/default/media/style/style.less | 5 | ||||
-rw-r--r-- | 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) #} <div class="inputs"> - <input id="interestingTagInput" autocomplete="off" type="text"/> + <input id="interestingTagInput" autocomplete="off" type="text"/> <input id="interestingTagAdd" type="submit" value="{% trans %}add{% endtrans %}"/> </div> <h2>{% trans %}Ignored tags{% endtrans %}</h2> @@ -32,7 +32,7 @@ format(tag_name = tag_name) #} <div class="inputs"> - <input id="ignoredTagInput" autocomplete="off" type="text"/> + <input id="ignoredTagInput" autocomplete="off" type="text"/> <input id="ignoredTagAdd" type="submit" value="{% trans %}add{% endtrans%}"/> </div> {% if settings.SUBSCRIBED_TAG_SELECTOR_ENABLED %} @@ -50,11 +50,11 @@ format(tag_name = tag_name) #} <div class="inputs"> - <input id="subscribedTagInput" autocomplete="off" type="text"/> + <input id="subscribedTagInput" autocomplete="off" type="text"/> <input id="subscribedTagAdd" type="submit" value="{% trans %}add{% endtrans%}"/> </div> {% endif %} - <h3>{% trans %}Display tag filter{% endtrans%}</h3> + <h3>{% trans %}Show only questions from{% endtrans%}</h3> <div id="displayTagFilterControl"> {{ macros.radio_select( @@ -65,7 +65,7 @@ }} </div> {% if settings.SUBSCRIBED_TAG_SELECTOR_ENABLED %} - <h3>{% trans %}Email tag filter{% endtrans%}</h3> + <h3>{% trans %}Send me email alerts for{% endtrans%}</h3> <div id="emailTagFilterControl"> {{ macros.radio_select( @@ -74,6 +74,16 @@ choices = email_tag_filter_strategy_choices ) }} + {% if request.user.is_authenticated() %} + <p> + <a + href="{% + url user_profile + request.user.id, request.user.username|slugify + %}?sort=email_subscriptions" + >{% trans %}Change frequency of emails{% endtrans %}</a> + </p> + {% endif %} </div> {% endif %} </div> 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 %} </p> <h2>{% trans %}Still have questions?{% endtrans %}</h2> -<p>{% trans %}Please <a href='%(ask_question_url)s'>ask</a> your question, help make our community better!{% endtrans %} +<p>{% trans %}Please <a href='{{ask_question_url}}'>ask</a> your question, help make our community better!{% endtrans %} </p> </div> <script type="text/javascript"> |