From 14776f49a3d960096a0d43e7de269439f6aa157a Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 20 Jan 2013 22:37:56 -0300 Subject: added a macro for country flag --- askbot/templates/macros.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/askbot/templates/macros.html b/askbot/templates/macros.html index 02a97cc7..fefdb3d8 100644 --- a/askbot/templates/macros.html +++ b/askbot/templates/macros.html @@ -591,6 +591,14 @@ answer {% if answer.accepted() %}accepted-answer{% endif %} {% if answer.author_ {%- include "widgets/user_long_score_and_badge_summary.html" -%} {%- endmacro -%} +{%- macro country_flag(country_code, flag_label) -%} + {{ flag_label }} +{%- endmacro -%} + {%- macro user_country_flag(user) -%} {% if user.country and user.show_country %} Date: Tue, 22 Jan 2013 13:04:17 -0300 Subject: small fixes in the user inbox --- askbot/media/style/style.less | 9 +++--- askbot/templates/macros.html | 33 +++++++++++++--------- .../templates/user_inbox/responses_and_flags.html | 4 +-- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less index c2e20577..0411d4e3 100644 --- a/askbot/media/style/style.less +++ b/askbot/media/style/style.less @@ -3780,6 +3780,10 @@ p.signup_p { clear:both; line-height:18px; margin-bottom:15px; + h2 { + margin: 0; + padding: 0; + } } #responses div.face { @@ -3791,7 +3795,7 @@ p.signup_p { } .response-parent { - margin-top: 18px; + margin-top: 8px; } .response-parent strong{ @@ -3807,9 +3811,6 @@ p.signup_p { #responses input { float:left; } -#re_tools { - margin-bottom:10px; -} #re_sections { margin-bottom:6px; } diff --git a/askbot/templates/macros.html b/askbot/templates/macros.html index fefdb3d8..f94fc12d 100644 --- a/askbot/templates/macros.html +++ b/askbot/templates/macros.html @@ -12,20 +12,25 @@
{{ gravatar(response.user, 48) }}
- {{ response.user.username|escape }} - - {{ response.response_type }} - ({{ timeago(response.timestamp) }}):
- {% if inbox_section != 'flags' %} - {{ response.response_snippet }} - {% endif %} - - {% if inbox_section == 'flags' %} - - -
{{ response.response_content }}
- - {% endif %} +
+ {{ response.user.username|escape }} + + {{ response.response_type }} + ({{ timeago(response.timestamp) }}):
+ {% if inbox_section != 'flags' %} + {{ response.response_snippet }} + {% endif %} + + {% if inbox_section == 'flags' %} + + +
{{ response.response_content }}
+ + {% endif %} +
{%- endmacro -%} diff --git a/askbot/templates/user_inbox/responses_and_flags.html b/askbot/templates/user_inbox/responses_and_flags.html index c889bb0a..16599c1d 100644 --- a/askbot/templates/user_inbox/responses_and_flags.html +++ b/askbot/templates/user_inbox/responses_and_flags.html @@ -28,9 +28,7 @@
{% for response in responses %}
-

- "{{ response.response_title.strip()|escape}}" -

+

"{{ response.response_title.strip()|escape}}"

{{ macros.inbox_post_snippet(response, inbox_section) }} {% for nested_response in response.nested_responses %} {{ macros.inbox_post_snippet(nested_response, inbox_section) }} -- cgit v1.2.3-1-g7c22 From b569cee0c2e9a1d0516a23f1de63cf5d757466b7 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 22 Jan 2013 15:38:20 -0300 Subject: fixed language parameter in the language navigation --- askbot/templates/widgets/language_nav.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/askbot/templates/widgets/language_nav.html b/askbot/templates/widgets/language_nav.html index 7db6d559..a8b4c8d9 100644 --- a/askbot/templates/widgets/language_nav.html +++ b/askbot/templates/widgets/language_nav.html @@ -1,8 +1,8 @@ - {{ settings.LANGUAGES_DICT[language_code] }} + {{ settings.LANGUAGES_DICT[current_language_code] }}
{% if not request.user.is_authenticated() %} diff --git a/askbot/views/writers.py b/askbot/views/writers.py index 17f806df..f77ed58c 100644 --- a/askbot/views/writers.py +++ b/askbot/views/writers.py @@ -266,10 +266,7 @@ def ask(request):#view used to ask a new question return HttpResponseRedirect(url_utils.get_login_url()) if request.method == 'GET': - form = forms.AskForm( - user=request.user, - initial={'language': get_language()} - ) + form = forms.AskForm(user=request.user) draft_title = '' draft_text = '' @@ -283,12 +280,13 @@ def ask(request):#view used to ask a new question draft_tagnames = draft.tagnames form.initial = { - 'title': request.REQUEST.get('title', draft_title), - 'text': request.REQUEST.get('text', draft_text), + 'ask_anonymously': request.REQUEST.get('ask_anonymousy', False), 'tags': request.REQUEST.get('tags', draft_tagnames), + 'text': request.REQUEST.get('text', draft_text), + 'title': request.REQUEST.get('title', draft_title), + 'post_privately': request.REQUEST.get('post_privately', False), + 'language': get_language(), 'wiki': request.REQUEST.get('wiki', False), - 'ask_anonymously': request.REQUEST.get('ask_anonymousy', False), - 'post_privately': request.REQUEST.get('post_privately', False) } if 'group_id' in request.REQUEST: try: -- cgit v1.2.3-1-g7c22 From 51078cf8bfffa3b9e3ce1a339345eb07d0c3a9ff Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 23 Jan 2013 17:20:27 -0300 Subject: fixed default language on the ask page and made small css adjustments --- askbot/media/style/style.less | 4 +++- askbot/templates/question_edit.html | 2 ++ askbot/templates/widgets/ask_form.html | 2 ++ askbot/views/writers.py | 14 ++++++-------- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less index cb9648ae..c86ed8b5 100644 --- a/askbot/media/style/style.less +++ b/askbot/media/style/style.less @@ -1611,6 +1611,9 @@ ul#related-tags li { width: 100%; max-width: 395px; } + .lang-selector { + margin: 1px 0 0 5px; + } } .ask-page, @@ -1754,7 +1757,6 @@ ul#related-tags li { .wmd-container { border:#cce6ec 3px solid; - min-height: 250px; textarea { border: none; } diff --git a/askbot/templates/question_edit.html b/askbot/templates/question_edit.html index 653d351e..d8053e45 100644 --- a/askbot/templates/question_edit.html +++ b/askbot/templates/question_edit.html @@ -45,8 +45,10 @@ {{ macros.checkbox_in_div(form.post_privately) }} {% endif %} {% if settings.MULTILINGUAL %} +
{{ form.language }} +
{% endif %}
  diff --git a/askbot/templates/widgets/ask_form.html b/askbot/templates/widgets/ask_form.html index 080931ec..1ecab359 100644 --- a/askbot/templates/widgets/ask_form.html +++ b/askbot/templates/widgets/ask_form.html @@ -47,8 +47,10 @@ {{ macros.checkbox_in_div(form.post_privately) }} {% endif %} {% if settings.MULTILINGUAL %} +
{{ form.language }} +
{% endif %} {% if not request.user.is_authenticated() %} diff --git a/askbot/views/writers.py b/askbot/views/writers.py index 17f806df..f77ed58c 100644 --- a/askbot/views/writers.py +++ b/askbot/views/writers.py @@ -266,10 +266,7 @@ def ask(request):#view used to ask a new question return HttpResponseRedirect(url_utils.get_login_url()) if request.method == 'GET': - form = forms.AskForm( - user=request.user, - initial={'language': get_language()} - ) + form = forms.AskForm(user=request.user) draft_title = '' draft_text = '' @@ -283,12 +280,13 @@ def ask(request):#view used to ask a new question draft_tagnames = draft.tagnames form.initial = { - 'title': request.REQUEST.get('title', draft_title), - 'text': request.REQUEST.get('text', draft_text), + 'ask_anonymously': request.REQUEST.get('ask_anonymousy', False), 'tags': request.REQUEST.get('tags', draft_tagnames), + 'text': request.REQUEST.get('text', draft_text), + 'title': request.REQUEST.get('title', draft_title), + 'post_privately': request.REQUEST.get('post_privately', False), + 'language': get_language(), 'wiki': request.REQUEST.get('wiki', False), - 'ask_anonymously': request.REQUEST.get('ask_anonymousy', False), - 'post_privately': request.REQUEST.get('post_privately', False) } if 'group_id' in request.REQUEST: try: -- cgit v1.2.3-1-g7c22 From efb3120e2c752f4e55d49fd09e5c7584905ad09c Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 23 Jan 2013 18:55:50 -0300 Subject: fixed reputation bug on flagging posts --- askbot/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/askbot/auth.py b/askbot/auth.py index 846445b4..2d8f5d43 100644 --- a/askbot/auth.py +++ b/askbot/auth.py @@ -111,7 +111,7 @@ def onUnFlaggedItem(post, user, timestamp=None): flagged_user = post.author flagged_user.receive_reputation( - - askbot_settings.REP_LOSS_FOR_RECEIVING_FLAG + askbot_settings.REP_LOSS_FOR_RECEIVING_FLAG ) flagged_user.save() -- cgit v1.2.3-1-g7c22 From fabf880b47cfbb1d97895303343361befdca9563 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 24 Jan 2013 01:46:17 -0300 Subject: added .all() method to the RelatedObjectSimulator --- askbot/models/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 1193ffbd..e019826f 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -134,6 +134,9 @@ class RelatedObjectSimulator(object): self.user = user self.model_class = model_class + def all(self): + return self.model_class.objects.all() + def count(self, **kwargs): kwargs['user'] = self.user return self.model_class.objects.filter(**kwargs).count() -- cgit v1.2.3-1-g7c22