From f2b36a4fcbc8c5688e599bc3fabc1c60a1b657c3 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 10 May 2012 11:41:58 -0400 Subject: fixed timezone bug on edit comment --- askbot/views/writers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/askbot/views/writers.py b/askbot/views/writers.py index 7727eb04..8b02adfb 100644 --- a/askbot/views/writers.py +++ b/askbot/views/writers.py @@ -603,11 +603,12 @@ def edit_comment(request): is_deletable = template_filters.can_delete_comment(comment_post.author, comment_post) is_editable = template_filters.can_edit_comment(comment_post.author, comment_post) + tz = template_filters.TIMEZONE_STR return { 'id' : comment_post.id, 'object_id': comment_post.parent.id, - 'comment_added_at': str(comment_post.added_at.replace(microsecond = 0)), + 'comment_added_at': str(comment_post.added_at.replace(microsecond = 0)) + tz, 'html': comment_post.html, 'user_display_name': comment_post.author.username, 'user_url': comment_post.author.get_profile_url(), -- cgit v1.2.3-1-g7c22 From 6f853b5c6398a4f8458b90ceddf65cb96c89646d Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 10 May 2012 11:53:48 -0400 Subject: touched up on timzone issue again and added cache invalidation to comment editing --- askbot/models/__init__.py | 1 + askbot/views/writers.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 3eca3c0e..5e41a07a 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -1420,6 +1420,7 @@ def user_edit_comment( edited_by = self, by_email = by_email ) + comment_post.thread.invalidate_cached_data() def user_edit_post(self, post = None, diff --git a/askbot/views/writers.py b/askbot/views/writers.py index 8b02adfb..935b7cfa 100644 --- a/askbot/views/writers.py +++ b/askbot/views/writers.py @@ -540,7 +540,7 @@ def __generate_comments_json(obj, user):#non-view generates json data for the po comment_owner = comment.author - tz = template_filters.TIMEZONE_STR + tz = ' ' + template_filters.TIMEZONE_STR comment_data = {'id' : comment.id, 'object_id': obj.id, 'comment_added_at': str(comment.added_at.replace(microsecond = 0)) + tz, @@ -603,7 +603,7 @@ def edit_comment(request): is_deletable = template_filters.can_delete_comment(comment_post.author, comment_post) is_editable = template_filters.can_edit_comment(comment_post.author, comment_post) - tz = template_filters.TIMEZONE_STR + tz = ' ' + template_filters.TIMEZONE_STR return { 'id' : comment_post.id, -- cgit v1.2.3-1-g7c22 From 25f89f0d8d3c013aca95354b5198fa058d0b247e Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 10 May 2012 13:02:26 -0400 Subject: fixed save/cancel buttons for comment edits immediately after making the post --- askbot/skins/common/media/js/post.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index 0f349fd8..294c5f41 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -1215,6 +1215,7 @@ EditCommentForm.prototype.attachTo = function(comment, mode){ this._submit_btn.html(gettext('save comment')); } this.getElement().show(); + this.enableButtons(); this.focus(); putCursorAtEnd(this._textarea); }; @@ -1342,13 +1343,13 @@ EditCommentForm.prototype.createDom = function(){ }; EditCommentForm.prototype.enableButtons = function(){ - this._submit_btn.attr('disabled', ''); - this._cancel_btn.attr('disabled', ''); + this._submit_btn.attr('disabled', false); + this._cancel_btn.attr('disabled', false); }; EditCommentForm.prototype.disableButtons = function(){ - this._submit_btn.attr('disabled', 'disabled'); - this._cancel_btn.attr('disabled', 'disabled'); + this._submit_btn.attr('disabled', true); + this._cancel_btn.attr('disabled', true); }; EditCommentForm.prototype.reset = function(){ -- cgit v1.2.3-1-g7c22 From 4d576186a76f87ee0967f7aa4ddd7cf77841083b Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 10 May 2012 13:18:49 -0400 Subject: fixed an iexact selector on the group query in the lamson ASK handler --- askbot/lamson_handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/askbot/lamson_handlers.py b/askbot/lamson_handlers.py index 34f93a7b..9062594c 100644 --- a/askbot/lamson_handlers.py +++ b/askbot/lamson_handlers.py @@ -130,7 +130,7 @@ def ASK(message, host = None, addr = None): try: group_tag = Tag.group_tags.get( deleted = False, - name_iexact = addr + name__iexact = addr ) mail.process_emailed_question( from_address, subject, parts, tags = [group_tag.name, ] -- cgit v1.2.3-1-g7c22 From d7335c1e439ec703dc03fd4c9c9505680f3273f3 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 10 May 2012 13:36:45 -0400 Subject: fixed another source of "blank tags" --- askbot/utils/mail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/askbot/utils/mail.py b/askbot/utils/mail.py index 37245b5a..aa4df320 100644 --- a/askbot/utils/mail.py +++ b/askbot/utils/mail.py @@ -281,7 +281,7 @@ def process_emailed_question(from_address, subject, parts, tags = None): user.post_question( title = title, - tags = tagnames, + tags = tagnames.strip(), body_text = body_text, by_email = True, email_address = from_address -- cgit v1.2.3-1-g7c22 From a5940fc6b0fcfc68dd49a629242ce6248a6b458e Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 10 May 2012 14:05:46 -0400 Subject: fixed a bug in PostRevision.needs_moderation --- askbot/models/post.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/askbot/models/post.py b/askbot/models/post.py index daf7757b..a0fdc4ff 100644 --- a/askbot/models/post.py +++ b/askbot/models/post.py @@ -1743,8 +1743,8 @@ class PostRevision(models.Model): return False #if sent by email to group and group does not want moderation - if self.by_email and self.email: - group_name = self.email.split('@')[0] + if self.by_email and self.email_address: + group_name = self.email_address.split('@')[0] try: group = Tag.objects.get(name = group_name, deleted = False) return group.group.profile.moderate_email -- cgit v1.2.3-1-g7c22 From ac9602d72863d3655e32fca31d3b3f2c8ebe80d5 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 10 May 2012 14:32:03 -0400 Subject: hopefully fixed the error of email not being sent to the author of rejected post --- askbot/utils/decorators.py | 2 +- askbot/views/commands.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/askbot/utils/decorators.py b/askbot/utils/decorators.py index 940c3654..0042df8f 100644 --- a/askbot/utils/decorators.py +++ b/askbot/utils/decorators.py @@ -87,7 +87,7 @@ def ajax_only(view_func): if data is None: data = {} except Exception, e: - if isinstance(e, Exception): + if hasattr(e, 'messages'): if len(e.messages) > 1: message = u'
    ' + \ u''.join( diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 2cad834e..6938f3a6 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -110,7 +110,7 @@ def manage_inbox(request): mail.send_mail( subject_line = _('your post was not accepted'), body_text = unicode(body_text), - recipient_list = [post.author,] + recipient_list = [post.author.email,] ) memo.delete() -- cgit v1.2.3-1-g7c22 From 3a81c047b75dde308424a64a3d84ff80ac651928 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 10 May 2012 14:38:13 -0400 Subject: fixed a bug in an assert statement --- askbot/views/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/askbot/views/commands.py b/askbot/views/commands.py index 6938f3a6..6fd493cc 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -589,7 +589,7 @@ def set_tag_filter_strategy(request): """ filter_type = request.POST['filter_type'] filter_value = int(request.POST['filter_value']) - assert(filter_type in 'display', 'email') + assert(filter_type in ('display', 'email')) if filter_type == 'display': assert(filter_value in dict(const.TAG_DISPLAY_FILTER_STRATEGY_CHOICES)) request.user.display_tag_filter_strategy = filter_value -- cgit v1.2.3-1-g7c22 From 81d64e494eeaf184d3dc7e6105b2815486e93053 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 10 May 2012 14:55:57 -0400 Subject: fixed style for the list of similar questions in the ask page --- askbot/skins/default/media/style/style.less | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 09d008d2..69cdede0 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -1299,7 +1299,7 @@ ul#related-tags li { #askFormBar { display:inline-block; - padding: 4px 7px 5px 0px; + padding: 4px 7px 0px 0px; margin-top:0px; p{ @@ -1322,10 +1322,8 @@ ul#related-tags li { .ask-page, .edit-question-page { div#question-list { - float: none; border-bottom:#f0f0ec 1px solid; - float:left; - margin-bottom:10px; + float: none; a{ line-height:30px; } @@ -1372,6 +1370,7 @@ ul#related-tags li { .title-desc { color: @info-text; font-size: 13px; + margin-bottom: 5px; } #fmanswer input.submit, -- cgit v1.2.3-1-g7c22 From cbebe08a0cc993693a7a90cbd1ddc82bb89c4194 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 16 May 2012 18:17:44 -0400 Subject: added the YanoneKaffeesatz font to the media files and an settings.py option ASKBOT_USE_LOCAL_FONTS for use on the intranet or development offline --- askbot/context.py | 11 ++- askbot/doc/source/index.rst | 1 + askbot/doc/source/intranet-setup.rst | 14 ++++ .../default/media/bootstrap/css/bootstrap.css | 12 --- askbot/skins/default/media/images/OFL.txt | 93 +++++++++++++++++++++ .../default/media/images/YanoneKaffeesatz-Bold.ttf | Bin 0 -> 73000 bytes .../media/images/YanoneKaffeesatz-ExtraLight.ttf | Bin 0 -> 77024 bytes .../media/images/YanoneKaffeesatz-Light.ttf | Bin 0 -> 77296 bytes .../media/images/YanoneKaffeesatz-Regular.ttf | Bin 0 -> 76588 bytes .../default/media/images/Yanone_Kaffeesatz.zip | Bin 0 -> 154362 bytes askbot/skins/default/media/style/style.less | 4 +- askbot/skins/default/templates/meta/fonts.html | 20 +++++ .../templates/meta/html_head_stylesheets.html | 6 +- 13 files changed, 145 insertions(+), 16 deletions(-) create mode 100644 askbot/doc/source/intranet-setup.rst create mode 100644 askbot/skins/default/media/images/OFL.txt create mode 100644 askbot/skins/default/media/images/YanoneKaffeesatz-Bold.ttf create mode 100644 askbot/skins/default/media/images/YanoneKaffeesatz-ExtraLight.ttf create mode 100644 askbot/skins/default/media/images/YanoneKaffeesatz-Light.ttf create mode 100644 askbot/skins/default/media/images/YanoneKaffeesatz-Regular.ttf create mode 100644 askbot/skins/default/media/images/Yanone_Kaffeesatz.zip create mode 100644 askbot/skins/default/templates/meta/fonts.html diff --git a/askbot/context.py b/askbot/context.py index ea10a890..03a2d1d8 100644 --- a/askbot/context.py +++ b/askbot/context.py @@ -26,7 +26,16 @@ def application_settings(request): my_settings['LANGUAGE_CODE'] = getattr(request, 'LANGUAGE_CODE', settings.LANGUAGE_CODE) my_settings['ASKBOT_URL'] = settings.ASKBOT_URL my_settings['STATIC_URL'] = settings.STATIC_URL - my_settings['ASKBOT_CSS_DEVEL'] = getattr(settings, 'ASKBOT_CSS_DEVEL', False) + my_settings['ASKBOT_CSS_DEVEL'] = getattr( + settings, + 'ASKBOT_CSS_DEVEL', + False + ) + my_settings['USE_LOCAL_FONTS'] = getattr( + settings, + 'ASKBOT_USE_LOCAL_FONTS', + False + ) my_settings['DEBUG'] = settings.DEBUG my_settings['USING_RUNSERVER'] = 'runserver' in sys.argv my_settings['ASKBOT_VERSION'] = askbot.get_version() diff --git a/askbot/doc/source/index.rst b/askbot/doc/source/index.rst index 81f21fcc..353b9105 100644 --- a/askbot/doc/source/index.rst +++ b/askbot/doc/source/index.rst @@ -26,6 +26,7 @@ at the forum_ or by email at admin@askbot.org Appendix C: Optional modules Appendix D: Askbot as reusable Django application Appendix E: Customizing skin in askbot + Appendix F: Intranet setup Footnotes Contributors Changelog diff --git a/askbot/doc/source/intranet-setup.rst b/askbot/doc/source/intranet-setup.rst new file mode 100644 index 00000000..224ffb89 --- /dev/null +++ b/askbot/doc/source/intranet-setup.rst @@ -0,0 +1,14 @@ +========================================================== +Setting up Askbot for use on the closed network (Intranet) +========================================================== + +When using Askbot on the Intranet (for example - within your +Company network), it will be useful to disable references to +all external resources - such as custom fonts, gravatars. + +Please change the following settings in your ``settings.py`` file:: + + ASKBOT_USE_LOCAL_FONTS=True + +In addition, in the "live settings": +* disable gravatar in "settings->User settings" diff --git a/askbot/skins/default/media/bootstrap/css/bootstrap.css b/askbot/skins/default/media/bootstrap/css/bootstrap.css index 9447a9a2..3e829732 100644 --- a/askbot/skins/default/media/bootstrap/css/bootstrap.css +++ b/askbot/skins/default/media/bootstrap/css/bootstrap.css @@ -918,18 +918,6 @@ input, textarea, select, .uneditable-input { - display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; - color: #555555; - border: 1px solid #cccccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; } .uneditable-textarea { width: auto; diff --git a/askbot/skins/default/media/images/OFL.txt b/askbot/skins/default/media/images/OFL.txt new file mode 100644 index 00000000..3bc11311 --- /dev/null +++ b/askbot/skins/default/media/images/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2010, Jan Gerner (post@yanone.de) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/askbot/skins/default/media/images/YanoneKaffeesatz-Bold.ttf b/askbot/skins/default/media/images/YanoneKaffeesatz-Bold.ttf new file mode 100644 index 00000000..c693c4b3 Binary files /dev/null and b/askbot/skins/default/media/images/YanoneKaffeesatz-Bold.ttf differ diff --git a/askbot/skins/default/media/images/YanoneKaffeesatz-ExtraLight.ttf b/askbot/skins/default/media/images/YanoneKaffeesatz-ExtraLight.ttf new file mode 100644 index 00000000..b59e4894 Binary files /dev/null and b/askbot/skins/default/media/images/YanoneKaffeesatz-ExtraLight.ttf differ diff --git a/askbot/skins/default/media/images/YanoneKaffeesatz-Light.ttf b/askbot/skins/default/media/images/YanoneKaffeesatz-Light.ttf new file mode 100644 index 00000000..5026d3bd Binary files /dev/null and b/askbot/skins/default/media/images/YanoneKaffeesatz-Light.ttf differ diff --git a/askbot/skins/default/media/images/YanoneKaffeesatz-Regular.ttf b/askbot/skins/default/media/images/YanoneKaffeesatz-Regular.ttf new file mode 100644 index 00000000..808ce0d0 Binary files /dev/null and b/askbot/skins/default/media/images/YanoneKaffeesatz-Regular.ttf differ diff --git a/askbot/skins/default/media/images/Yanone_Kaffeesatz.zip b/askbot/skins/default/media/images/Yanone_Kaffeesatz.zip new file mode 100644 index 00000000..55e9731a Binary files /dev/null and b/askbot/skins/default/media/images/Yanone_Kaffeesatz.zip differ diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 5967817d..c3423418 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -1812,7 +1812,7 @@ ul#related-tags li { button{ line-height:25px; margin-bottom:5px; - .button-style(100px,27px,12px); + .button-style(100px, 27px, 12px); font-family:@body-font; font-weight:bold; } @@ -2354,7 +2354,7 @@ a:hover.medal { font-weight:bold; line-height:26px; margin-top:-2px; - .button-style(100px,26px,12px); + .button-style(100px,26px,14px); } .follow-toggle:hover, .submit:hover { diff --git a/askbot/skins/default/templates/meta/fonts.html b/askbot/skins/default/templates/meta/fonts.html new file mode 100644 index 00000000..f55d567c --- /dev/null +++ b/askbot/skins/default/templates/meta/fonts.html @@ -0,0 +1,20 @@ + diff --git a/askbot/skins/default/templates/meta/html_head_stylesheets.html b/askbot/skins/default/templates/meta/html_head_stylesheets.html index 14f3c106..0d2ba463 100644 --- a/askbot/skins/default/templates/meta/html_head_stylesheets.html +++ b/askbot/skins/default/templates/meta/html_head_stylesheets.html @@ -4,7 +4,11 @@ {% endif %} - +{% if settings.USE_LOCAL_FONTS %} + {% include "meta/fonts.html" %} +{% else %} + +{% endif %} {{ skin.get_extra_css_link() }} {% if settings.USE_CUSTOM_CSS %} 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 %}