diff options
| -rw-r--r-- | askbot/media/style/style.less | 4 | ||||
| -rw-r--r-- | askbot/templates/question_edit.html | 2 | ||||
| -rw-r--r-- | askbot/templates/widgets/ask_form.html | 2 | ||||
| -rw-r--r-- | 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 %} + <div class="lang-selector"> <label for="id_language">{% trans %}Change language{% endtrans %}</label> {{ form.language }} + </div> {% endif %} </div> <input id="edit_post_form_submit_button" type="submit" value="{% trans %}Save edit{% endtrans %}" class="submit" /> 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 %} + <div class="lang-selector"> <label for="id_language">{% trans %}Select language{% endtrans %}</label> {{ form.language }} + </div> {% endif %} </div> {% 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: |