From af650981ca44a6d86e1ce6b2295ede1452e5b076 Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Fri, 18 Jul 2014 11:46:39 +0900 Subject: Removed redundant closing td tag A redundant ` tag is added if screen names are editable. This fixes the issue. Also, matched the blocks indentation with that of the rest of the file. --- askbot/templates/user_profile/user_edit.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/askbot/templates/user_profile/user_edit.html b/askbot/templates/user_profile/user_edit.html index fa9ecfdd..7b819a8e 100644 --- a/askbot/templates/user_profile/user_edit.html +++ b/askbot/templates/user_profile/user_edit.html @@ -36,15 +36,15 @@ - {% trans %}Screen Name{% endtrans %}: - - {% if settings.EDITABLE_SCREEN_NAME %} - {{ form.username }} - {{ form.username.errors }} - {% else %} - {{ view_user.username|escape }} - {% endif %} - + {% trans %}Screen Name{% endtrans %}: + + {% if settings.EDITABLE_SCREEN_NAME %} + {{ form.username }} + {{ form.username.errors }} + {% else %} + {{ view_user.username|escape }} + {% endif %} + @@ -118,7 +118,7 @@ $().ready(function(){ $("#nav_profile").attr('className',"on"); $("#cancel").bind('click', function(){history.go(-1);}) - }); + }); {% block userjs %} {% endblock %} -- cgit v1.2.3-1-g7c22 From b9c806e09cd6db0f56476e9e539a75a04e7b2d2b Mon Sep 17 00:00:00 2001 From: Prof Gra Date: Fri, 18 Jul 2014 20:21:56 +0200 Subject: misplaced parenthese in forms.py --- askbot/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/askbot/forms.py b/askbot/forms.py index e7e869cd..1bc7aa89 100644 --- a/askbot/forms.py +++ b/askbot/forms.py @@ -511,8 +511,8 @@ class SummaryField(forms.CharField): self.label = _('update summary:') self.help_text = _( 'enter a brief summary of your revision (e.g. ' - 'fixed spelling, grammar, improved style, this ' - 'field is optional)' + 'fixed spelling, grammar, improved style...), this ' + 'field is optional' ) class EditorForm(forms.Form): -- cgit v1.2.3-1-g7c22 From ddec605e875b99a0e3cd7e952bc98249ecafe5e5 Mon Sep 17 00:00:00 2001 From: Prof Gra Date: Sat, 19 Jul 2014 19:04:54 +0200 Subject: Whitespace needed in LDAP msg string. --- askbot/conf/ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/askbot/conf/ldap.py b/askbot/conf/ldap.py index 7d384516..0b50352d 100644 --- a/askbot/conf/ldap.py +++ b/askbot/conf/ldap.py @@ -83,7 +83,7 @@ settings.register( default = '', help_text = _( 'Usually base DN mirrors domain name of your organization, ' - 'e.g. "dn=example,dn=com" when your site url is "example.com".' + 'e.g. "dn=example,dn=com" when your site url is "example.com". ' 'This value is the "root" address of your LDAP directory.' ) ) -- cgit v1.2.3-1-g7c22 From 86c01ffe3751c90b2bd01d01ac544583ad4b422b Mon Sep 17 00:00:00 2001 From: Prof Gra Date: Sat, 19 Jul 2014 19:49:50 +0200 Subject: Rephrasing a msg string about OpenId Not sure about the hidden meaning of this sentence! --- askbot/conf/login_providers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/askbot/conf/login_providers.py b/askbot/conf/login_providers.py index beb56a72..f4a5a24d 100644 --- a/askbot/conf/login_providers.py +++ b/askbot/conf/login_providers.py @@ -113,7 +113,9 @@ settings.register( 'SIGNIN_CUSTOM_OPENID_ENDPOINT', default='http://example.com', description=_('Custom OpenID endpoint'), - help_text=_('Important: with the "username" mode must have a %%(username)s placeholder e.g. http://example.com/%%(username)s/'), + help_text=_('Important: with the "username" mode there must be a ' + '%%(username)s placeholder e.g. ' + 'http://example.com/%%(username)s/'), ) ) -- cgit v1.2.3-1-g7c22 From 584a0506f24e044abd3735c823ba19787623f4c6 Mon Sep 17 00:00:00 2001 From: Prof Gra Date: Sat, 19 Jul 2014 21:34:44 +0200 Subject: Whitespace needed in sidebar_question msg string. --- askbot/conf/sidebar_question.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/askbot/conf/sidebar_question.py b/askbot/conf/sidebar_question.py index fbd6b19e..4bdedcee 100644 --- a/askbot/conf/sidebar_question.py +++ b/askbot/conf/sidebar_question.py @@ -76,7 +76,7 @@ settings.register( description = _('Custom sidebar header'), default = '', help_text = _( - 'Use this area to enter content at the TOP of the sidebar' + 'Use this area to enter content at the TOP of the sidebar ' 'in HTML format. When using this option ' '(as well as the sidebar footer), please ' 'use the HTML validation service to make sure that ' -- cgit v1.2.3-1-g7c22 From 6049799fe2e80ce2361e72a5e8255d65eb866975 Mon Sep 17 00:00:00 2001 From: Prof Gra Date: Sat, 19 Jul 2014 22:03:38 +0200 Subject: words.py queston -> question --- askbot/conf/words.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/askbot/conf/words.py b/askbot/conf/words.py index be4eb191..5e12b111 100644 --- a/askbot/conf/words.py +++ b/askbot/conf/words.py @@ -224,7 +224,7 @@ settings.register( WORDS, 'WORDS_QUESTIONS_COUNTABLE_FORMS', default='question\nquestions', - description=_('Countable plural forms for "queston"'), + description=_('Countable plural forms for "question"'), help_text=_('Enter one form per line, pay attention') ) ) -- cgit v1.2.3-1-g7c22