From 88df9c59a6bf6d929b09a0ceb4487c1a1780142b Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 19 Sep 2012 18:26:25 -0400 Subject: moved all templates from common skin to default --- .../templates/authopenid/authopenid_macros.html | 69 ------ .../common/templates/authopenid/changeemail.html | 112 ---------- .../common/templates/authopenid/complete.html | 63 ------ .../common/templates/authopenid/confirm_email.txt | 12 -- .../templates/authopenid/email_validation.txt | 14 -- .../skins/common/templates/authopenid/logout.html | 31 --- .../templates/authopenid/providers_javascript.html | 55 ----- .../skins/common/templates/authopenid/signin.html | 231 --------------------- .../templates/authopenid/signup_with_password.html | 55 ----- .../common/templates/authopenid/verify_email.html | 14 -- askbot/skins/common/templates/avatar/add.html | 15 -- askbot/skins/common/templates/avatar/change.html | 24 --- .../common/templates/avatar/confirm_delete.html | 15 -- askbot/skins/common/templates/debug_header.html | 27 --- askbot/skins/common/templates/one_column_body.html | 8 - .../templates/question/answer_author_info.html | 8 - .../common/templates/question/answer_comments.html | 10 - .../common/templates/question/answer_controls.html | 69 ------ .../templates/question/answer_vote_buttons.html | 10 - .../templates/question/closed_question_info.html | 5 - .../templates/question/question_author_info.html | 8 - .../templates/question/question_comments.html | 10 - .../templates/question/question_controls.html | 39 ---- .../common/templates/question/question_tags.html | 8 - .../templates/question/question_vote_buttons.html | 1 - .../common/templates/question/share_buttons.html | 5 - askbot/skins/common/templates/two_column_body.html | 12 -- .../skins/common/templates/widgets/edit_post.html | 115 ---------- .../common/templates/widgets/related_tags.html | 28 --- .../skins/common/templates/widgets/search_bar.html | 46 ---- .../common/templates/widgets/tag_selector.html | 89 -------- .../templates/authopenid/authopenid_macros.html | 69 ++++++ .../default/templates/authopenid/changeemail.html | 112 ++++++++++ .../default/templates/authopenid/complete.html | 63 ++++++ .../default/templates/authopenid/confirm_email.txt | 12 ++ .../templates/authopenid/email_validation.txt | 14 ++ .../skins/default/templates/authopenid/logout.html | 31 +++ .../templates/authopenid/providers_javascript.html | 55 +++++ .../skins/default/templates/authopenid/signin.html | 231 +++++++++++++++++++++ .../templates/authopenid/signup_with_password.html | 55 +++++ .../default/templates/authopenid/verify_email.html | 14 ++ askbot/skins/default/templates/avatar/add.html | 15 ++ askbot/skins/default/templates/avatar/change.html | 24 +++ .../default/templates/avatar/confirm_delete.html | 15 ++ askbot/skins/default/templates/debug_header.html | 27 +++ .../skins/default/templates/one_column_body.html | 8 + .../templates/question/answer_author_info.html | 8 + .../templates/question/answer_comments.html | 10 + .../templates/question/answer_controls.html | 69 ++++++ .../templates/question/answer_vote_buttons.html | 10 + .../templates/question/closed_question_info.html | 5 + .../templates/question/question_author_info.html | 8 + .../templates/question/question_comments.html | 10 + .../templates/question/question_controls.html | 39 ++++ .../default/templates/question/question_tags.html | 8 + .../templates/question/question_vote_buttons.html | 1 + .../default/templates/question/share_buttons.html | 5 + .../skins/default/templates/two_column_body.html | 12 ++ .../skins/default/templates/widgets/edit_post.html | 115 ++++++++++ .../default/templates/widgets/related_tags.html | 28 +++ .../default/templates/widgets/search_bar.html | 46 ++++ .../default/templates/widgets/tag_selector.html | 89 ++++++++ 62 files changed, 1208 insertions(+), 1208 deletions(-) delete mode 100644 askbot/skins/common/templates/authopenid/authopenid_macros.html delete mode 100644 askbot/skins/common/templates/authopenid/changeemail.html delete mode 100644 askbot/skins/common/templates/authopenid/complete.html delete mode 100644 askbot/skins/common/templates/authopenid/confirm_email.txt delete mode 100644 askbot/skins/common/templates/authopenid/email_validation.txt delete mode 100644 askbot/skins/common/templates/authopenid/logout.html delete mode 100644 askbot/skins/common/templates/authopenid/providers_javascript.html delete mode 100644 askbot/skins/common/templates/authopenid/signin.html delete mode 100644 askbot/skins/common/templates/authopenid/signup_with_password.html delete mode 100644 askbot/skins/common/templates/authopenid/verify_email.html delete mode 100644 askbot/skins/common/templates/avatar/add.html delete mode 100644 askbot/skins/common/templates/avatar/change.html delete mode 100644 askbot/skins/common/templates/avatar/confirm_delete.html delete mode 100644 askbot/skins/common/templates/debug_header.html delete mode 100644 askbot/skins/common/templates/one_column_body.html delete mode 100644 askbot/skins/common/templates/question/answer_author_info.html delete mode 100644 askbot/skins/common/templates/question/answer_comments.html delete mode 100644 askbot/skins/common/templates/question/answer_controls.html delete mode 100644 askbot/skins/common/templates/question/answer_vote_buttons.html delete mode 100644 askbot/skins/common/templates/question/closed_question_info.html delete mode 100644 askbot/skins/common/templates/question/question_author_info.html delete mode 100644 askbot/skins/common/templates/question/question_comments.html delete mode 100644 askbot/skins/common/templates/question/question_controls.html delete mode 100644 askbot/skins/common/templates/question/question_tags.html delete mode 100644 askbot/skins/common/templates/question/question_vote_buttons.html delete mode 100644 askbot/skins/common/templates/question/share_buttons.html delete mode 100644 askbot/skins/common/templates/two_column_body.html delete mode 100644 askbot/skins/common/templates/widgets/edit_post.html delete mode 100644 askbot/skins/common/templates/widgets/related_tags.html delete mode 100644 askbot/skins/common/templates/widgets/search_bar.html delete mode 100644 askbot/skins/common/templates/widgets/tag_selector.html create mode 100644 askbot/skins/default/templates/authopenid/authopenid_macros.html create mode 100644 askbot/skins/default/templates/authopenid/changeemail.html create mode 100644 askbot/skins/default/templates/authopenid/complete.html create mode 100644 askbot/skins/default/templates/authopenid/confirm_email.txt create mode 100644 askbot/skins/default/templates/authopenid/email_validation.txt create mode 100644 askbot/skins/default/templates/authopenid/logout.html create mode 100644 askbot/skins/default/templates/authopenid/providers_javascript.html create mode 100644 askbot/skins/default/templates/authopenid/signin.html create mode 100644 askbot/skins/default/templates/authopenid/signup_with_password.html create mode 100644 askbot/skins/default/templates/authopenid/verify_email.html create mode 100644 askbot/skins/default/templates/avatar/add.html create mode 100644 askbot/skins/default/templates/avatar/change.html create mode 100644 askbot/skins/default/templates/avatar/confirm_delete.html create mode 100644 askbot/skins/default/templates/debug_header.html create mode 100644 askbot/skins/default/templates/one_column_body.html create mode 100644 askbot/skins/default/templates/question/answer_author_info.html create mode 100644 askbot/skins/default/templates/question/answer_comments.html create mode 100644 askbot/skins/default/templates/question/answer_controls.html create mode 100644 askbot/skins/default/templates/question/answer_vote_buttons.html create mode 100644 askbot/skins/default/templates/question/closed_question_info.html create mode 100644 askbot/skins/default/templates/question/question_author_info.html create mode 100644 askbot/skins/default/templates/question/question_comments.html create mode 100644 askbot/skins/default/templates/question/question_controls.html create mode 100644 askbot/skins/default/templates/question/question_tags.html create mode 100644 askbot/skins/default/templates/question/question_vote_buttons.html create mode 100644 askbot/skins/default/templates/question/share_buttons.html create mode 100644 askbot/skins/default/templates/two_column_body.html create mode 100644 askbot/skins/default/templates/widgets/edit_post.html create mode 100644 askbot/skins/default/templates/widgets/related_tags.html create mode 100644 askbot/skins/default/templates/widgets/search_bar.html create mode 100644 askbot/skins/default/templates/widgets/tag_selector.html diff --git a/askbot/skins/common/templates/authopenid/authopenid_macros.html b/askbot/skins/common/templates/authopenid/authopenid_macros.html deleted file mode 100644 index 9d35ac6f..00000000 --- a/askbot/skins/common/templates/authopenid/authopenid_macros.html +++ /dev/null @@ -1,69 +0,0 @@ -{% macro login_provider_input(login_provider) %} - -{% endmacro %} - -{% macro provider_buttons( - login_form = None, - major_login_providers = None, - minor_login_providers = None, - hide_local_login = False, - settings = None, - logged_in = False, - show_buttons = True - ) -%} - {% if show_buttons == True %}{# a hack #} -
- {% if major_login_providers %} - - {% endif %} - {% if minor_login_providers %} - - {% endif %} -
- - {% endif %} -{% endmacro %} diff --git a/askbot/skins/common/templates/authopenid/changeemail.html b/askbot/skins/common/templates/authopenid/changeemail.html deleted file mode 100644 index 8afa9c49..00000000 --- a/askbot/skins/common/templates/authopenid/changeemail.html +++ /dev/null @@ -1,112 +0,0 @@ -{% extends "one_column_body.html" %} -{% block title %}{% spaceless %}{% trans %}Change Email{% endtrans %}{% endspaceless %}{% endblock %} -{% block content %} - -{% if action_type=="change" %} -

- {% if user.email %} - {% trans %}Change Email{% endtrans %} - {% else %} - {% trans %}Save your email address{% endtrans %} - {% endif %} -

-

- {% if user.email %} - {% trans %}Enter your new email into the box below if -you'd like to use another email for update subscriptions. -
Currently you are using %(email)s{% endtrans %} - {% else %} - {% trans %}Please enter your email address in the box below. -Valid email address is required on this Q&A forum. If you like, -you can receive updates on interesting questions or entire -forum via email. Also, your email is used to create a unique -gravatar image for your -account. Email addresses are never shown or otherwise shared with anybody -else.{% endtrans %} - {% endif %} -

- {% if msg %} -

{{ msg }}

- {% endif %} -
-
{% csrf_token %} - {% if next %} - - {% endif %} -
-
-
- - {% if user.email %} - - {% endif %} -
-
-
-{% elif action_type=="validate" %} -
- {% trans %}Validate email{% endtrans %} -
-

- {% trans %}An email with a validation link has been sent to -%(email)s. Please follow the emailed link with your -web browser. Email validation is necessary to help insure the proper use of -email on Q&A. If you would like to use -another email, please change it again.{% endtrans %} -

-{% elif action_type=="keep" %} -
- {% trans %}Email not changed{% endtrans %} -
-

- {% trans %}Your email address %(email)s has not been changed. - If you decide to change it later - you can always do it by editing -it in your user profile or by using the previous form again.{% endtrans %} -

-{% elif action_type=="done_novalidate" %} -
- {% trans %}Email changed{% endtrans %} -
-

- {% trans %} -Your email address is now set to %(email)s. -Updates on the questions that you like most will be sent to this address. -Email notifications are sent once a day or less frequently - only when there -are any news.{% endtrans %} -

-{% elif action_type=="validation_complete" %} -
- {% trans %}Email verified{% endtrans %} -
-

- {% trans %}Thank you for verifying your email! Now -you can ask and answer questions. Also if -you find a very interesting question you can subscribe for the -updates - then will be notified about changes once a day -or less frequently.{% endtrans %} -

-{% elif action_type=="key_not_sent" %} -
- {% trans %}Validation email not sent{% endtrans %} -
-

- {% trans %}Your current email address %(email)s has been -validated before so the new key was not sent. You can change email used for update subscriptions if -necessary.{% endtrans %} -

-{% endif %} -{% endblock %} - diff --git a/askbot/skins/common/templates/authopenid/complete.html b/askbot/skins/common/templates/authopenid/complete.html deleted file mode 100644 index c9afedee..00000000 --- a/askbot/skins/common/templates/authopenid/complete.html +++ /dev/null @@ -1,63 +0,0 @@ -{% extends "one_column_body.html" %} - -{# -views calling this template: -* django_authopenid.views.register with login_type='openid' -* django_authopenid.views.signin - with login_type='legacy' - -purpose of this template is to allow user enter his/her name -email and sign up for email alerts at the initial registratio - -parameters: -* provider -* login_type openid|legacy -* username (same as screen name or username in the models, and nickname in openid sreg) -* openid_register_form -* openid_verify_form - not clear what this form is supposed to do, not used for legacy -* openid_username_exists -#} -{% block head %}{% endblock %} -{% block title %}{% spaceless %}{% trans %}Registration{% endtrans %}{% endspaceless %}{% endblock %} -{% block content %} -

{% trans %}User registration{% endtrans %}

- {% if openid_register_form.errors %} - - {% endif %} -
- {% if login_type=='openid' %} -
{% csrf_token %} - {% elif login_type=='facebook' %} - {% csrf_token %} - {% else %} - {% csrf_token %} - {% endif %} - {{ openid_register_form.next }} -
- - {% if openid_register_form.username.errors %} -

{{ openid_register_form.username.errors|join(", ") }}

- {% endif %} - {{ openid_register_form.username }} -
-
- - {% if openid_register_form.email.errors %} -

{{ openid_register_form.email.errors|join(", ") }}

- {% endif %} - {{ openid_register_form.email }} -
-
-
-
-{% endblock %} - diff --git a/askbot/skins/common/templates/authopenid/confirm_email.txt b/askbot/skins/common/templates/authopenid/confirm_email.txt deleted file mode 100644 index 5cab7c4c..00000000 --- a/askbot/skins/common/templates/authopenid/confirm_email.txt +++ /dev/null @@ -1,12 +0,0 @@ -{% trans %}Thank you for registering at our Q&A forum!{% endtrans %} - -{% trans %}Your account details are:{% endtrans %} - -{% trans %}Username:{% endtrans %} {{ username }} -{% trans %}Password:{% endtrans %} {{ password }} - -{% trans %}Please sign in here:{% endtrans %} -{{signup_url}} - -{% trans %}Sincerely, -Q&A Forum Administrator{% endtrans %} diff --git a/askbot/skins/common/templates/authopenid/email_validation.txt b/askbot/skins/common/templates/authopenid/email_validation.txt deleted file mode 100644 index bd68c61a..00000000 --- a/askbot/skins/common/templates/authopenid/email_validation.txt +++ /dev/null @@ -1,14 +0,0 @@ -{% trans %}Greetings from the Q&A forum{% endtrans %}, - -{% trans %}To make use of the Forum, please follow the link below:{% endtrans %} - -{{validation_link}} - -{% trans %}Following the link above will help us verify your email address.{% endtrans %} - -{% trans %}If you believe that this message was sent in mistake - -no further action is needed. Just ignore this email, we apologize -for any inconvenience{% endtrans %} - -{% trans %}Sincerely, -Q&A Forum Administrator{% endtrans %} diff --git a/askbot/skins/common/templates/authopenid/logout.html b/askbot/skins/common/templates/authopenid/logout.html deleted file mode 100644 index 1ac6705c..00000000 --- a/askbot/skins/common/templates/authopenid/logout.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "one_column_body.html" %} - -{% block title %}{% spaceless %}{% trans %}Logout{% endtrans %}{% endspaceless %}{% endblock %} -{% block content %} -

{% trans %}You have successfully logged out{% endtrans %}

-{% if have_federated_login_methods %} -

{% trans %}However, you still may be logged in to your OpenID provider. Please logout of your provider if you wish to do so.{% endtrans %}

- {% if settings.FACEBOOK_KEY and settings.FACEBOOK_SECRET %} -
- - - {% endif %} -{% endif %} -{% endblock %} -{% block endjs %} - -{% endblock %} - diff --git a/askbot/skins/common/templates/authopenid/providers_javascript.html b/askbot/skins/common/templates/authopenid/providers_javascript.html deleted file mode 100644 index cd9f56b6..00000000 --- a/askbot/skins/common/templates/authopenid/providers_javascript.html +++ /dev/null @@ -1,55 +0,0 @@ - - - -{% if settings.FACEBOOK_KEY and settings.FACEBOOK_SECRET %} -
- - -{% endif %} diff --git a/askbot/skins/common/templates/authopenid/signin.html b/askbot/skins/common/templates/authopenid/signin.html deleted file mode 100644 index c5a5c47f..00000000 --- a/askbot/skins/common/templates/authopenid/signin.html +++ /dev/null @@ -1,231 +0,0 @@ -{% extends "two_column_body.html" %} -{% import "authopenid/authopenid_macros.html" as login_macros %} -{% from "macros.html" import timeago %} - -{% block title %}{% spaceless %}{% trans %}User login{% endtrans %}{% endspaceless %}{% endblock %} -{% block forestyle %} - -{% endblock %} -{% block content %} -{% if have_buttons or view_subtype == 'email_sent' %} -

{{page_title}}

-{% endif %} - {% if answer %} -
- {% trans title=answer.question.title|escape, summary=answer.summary|escape %} - Your answer to {{title}} {{summary}} will be posted once you log in - {% endtrans %} -
- {% endif %} - {% if question %} -
- {% trans title=question.title|escape, summary=question.summary|escape %}Your question - {{title}} {{summary}} will be posted once you log in - {% endtrans %} -
- {% endif %} - {% if not (view_subtype == 'default' and have_buttons) %} -

- {% if view_subtype == 'add_openid' and have_buttons %} - {% if existing_login_methods %} - {% trans %}It's a good idea to make sure that your existing login methods still work, or add a new one. Please click any of the icons below to check/change or add new login methods.{% endtrans %} - {% else %} - {% trans %}Please add a more permanent login method by clicking one of the icons below, to avoid logging in via email each time.{% endtrans %} - {% endif %} - {% elif view_subtype == 'change_openid' and have_buttons %} - {% if existing_login_methods %} - {% trans %}Click on one of the icons below to add a new login method or re-validate an existing one.{% endtrans %} - {% else %} - {% trans %}You don't have a method to log in right now, please add one or more by clicking any of the icons below.{% endtrans %} - {% endif %} - {% elif view_subtype == 'email_sent' %} - {% trans %}Please check your email and visit the enclosed link to re-connect to your account{% endtrans %} - {% endif %} -

- {% endif %} - {% if openid_error_message %} -

{{ openid_error_message }}

- {% endif %} - {% if view_subtype != 'email_sent' and view_subtype != 'bad_key' %} -
{% csrf_token %} - {# in this branch - the real signin view we display the login icons - here we hide the local login button only if admin - wants to always show the password login form - then - the button is useless. - #} - {{ login_form.login_provider_name }} - {{ login_form.next }} - {{ - login_macros.provider_buttons( - login_form = login_form, - major_login_providers = major_login_providers, - minor_login_providers = minor_login_providers, - hide_local_login = settings.SIGNIN_ALWAYS_SHOW_LOCAL_LOGIN, - settings = settings, - logged_in = user.is_authenticated(), - show_buttons = have_buttons - ) - }} - {% if use_password_login == True %} - - {% endif %} -
- {% if user.is_authenticated() and existing_login_methods and settings.ALLOW_ADD_REMOVE_LOGIN_METHODS %} - - {% endif %} - {% endif %} - {% if view_subtype != 'email_sent' or view_subtype == 'bad_key' %} - {% if user.is_anonymous() and settings.ALLOW_ACCOUNT_RECOVERY_BY_EMAIL %} -
{% csrf_token %} - {% if view_subtype != 'bad_key' %} -

{% trans %}Still have trouble signing in?{% endtrans %}

- {% endif %} -

- - {% if view_subtype == 'bad_key' %} - {% trans %}Please, enter your email address below and obtain a new key{% endtrans %} - {% else %} - {% trans %}Please, enter your email address below to recover your account{% endtrans %} - {% endif %} - - -

-
- {% if account_recovery_form.email.errors %} -

{{account_recovery_form.email.errors[0]}}

- {% endif %} - {{ account_recovery_form.email }} - -
-
- {% endif %} - {% endif %} -{% endblock %} -{% block endjs %} -{% include "authopenid/providers_javascript.html" %} -{% endblock %} - diff --git a/askbot/skins/common/templates/authopenid/signup_with_password.html b/askbot/skins/common/templates/authopenid/signup_with_password.html deleted file mode 100644 index e5a8f633..00000000 --- a/askbot/skins/common/templates/authopenid/signup_with_password.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends "one_column_body.html" %} -{% import "authopenid/authopenid_macros.html" as login_macros %} - -{% block title %}{% spaceless %}{% trans %}Signup{% endtrans %}{% endspaceless %}{% endblock %} -{% block forestyle %} - -{% endblock %} -{% block content %} -{% if settings.PASSWORD_REGISTER_SHOW_PROVIDER_BUTTONS == True %} -

{% trans %}Please register by clicking on any of the icons below{% endtrans %}

-
{% csrf_token %} - {# hide_local_login == True because it is password reg form #} - {{ - login_macros.provider_buttons( - login_form = login_form, - major_login_providers = major_login_providers, - minor_login_providers = minor_login_providers, - hide_local_login = True, - settings = settings - ) - }} -
-

{% trans %}or create a new user name and password here{% endtrans %}

-{% else %} -

{% trans %}Create login name and password{% endtrans %}

- -{%endif%} -
{% csrf_token %} - {{form.login_provider}} - - {% if settings.USE_RECAPTCHA %} - - {{form.recaptcha}} - {% endif %} -
- {% if settings.PASSWORD_REGISTER_SHOW_PROVIDER_BUTTONS == False %} - {% trans %}or{% endtrans %} - {% trans %}return to OpenID login{% endtrans %} - {% endif %} -
-
-{% endblock %} -{%block endjs%} -{%include "authopenid/providers_javascript.html" %} -{%endblock%} - diff --git a/askbot/skins/common/templates/authopenid/verify_email.html b/askbot/skins/common/templates/authopenid/verify_email.html deleted file mode 100644 index 613ca589..00000000 --- a/askbot/skins/common/templates/authopenid/verify_email.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "one_column_body.html" %} -{% block title %}{% spaceless %}{% trans %}Confirm email address{% endtrans %}{% endspaceless %}{% endblock %} -{% block content %} -

{% trans %}Confirm email address{% endtrans %}

- -
{% csrf_token %} - - -
-{% endblock %} - diff --git a/askbot/skins/common/templates/avatar/add.html b/askbot/skins/common/templates/avatar/add.html deleted file mode 100644 index 68a188ef..00000000 --- a/askbot/skins/common/templates/avatar/add.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "user_profile/user.html" %} -{% import "macros.html" as macros %} -{% block profilesection %}{% trans %}add avatar{% endtrans %}{% endblock %} -{% block usercontent %} -

{% trans %}Change avatar{% endtrans %} -

{% trans %}Your current avatar: {% endtrans %}

- {{ macros.gravatar(user, 128) }} - {% if not avatars %} -

{% trans %}You haven't uploaded an avatar yet. Please upload one now.{% endtrans %}

- {% endif %} -
{% csrf_token %} - {{ upload_avatar_form.as_p() }} -

-
-{% endblock %} diff --git a/askbot/skins/common/templates/avatar/change.html b/askbot/skins/common/templates/avatar/change.html deleted file mode 100644 index 7921a662..00000000 --- a/askbot/skins/common/templates/avatar/change.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "user_profile/user.html" %} -{% import "macros.html" as macros %} -{% block profilesection %} - {% trans %}change avatar{% endtrans %} -{% endblock %} -{% block usercontent %} -

{% trans %}Your current avatar: {% endtrans %}
- {{ macros.gravatar(user, 128) }} -

- {% if not avatars %} -

{% trans %}You haven't uploaded an avatar yet. Please upload one now.{% endtrans %}

- {% else %} -
{% csrf_token %} -
    - {{ primary_avatar_form.as_ul() }} -
-

-
- {% endif %} -
{% csrf_token %} - {{ upload_avatar_form.as_p() }} -

-
-{% endblock %} diff --git a/askbot/skins/common/templates/avatar/confirm_delete.html b/askbot/skins/common/templates/avatar/confirm_delete.html deleted file mode 100644 index ee3d10d7..00000000 --- a/askbot/skins/common/templates/avatar/confirm_delete.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "user_profile/user.html" %} -{% block profilesection %}{% trans %}delete avatar{% endtrans %}{% endblock %} -{% block usercontent %} -

{% trans %}Please select the avatars that you would like to delete.{% endtrans %}

- {% if not avatars %} -

{% trans avatar_change_url="avatar_change"|url %}You have no avatars to delete. Please upload one now.{% endtrans %}

- {% else %} -
{% csrf_token %} -
    - {{ delete_avatar_form.as_ul() }} -
-

-
- {% endif %} -{% endblock %} diff --git a/askbot/skins/common/templates/debug_header.html b/askbot/skins/common/templates/debug_header.html deleted file mode 100644 index e1230265..00000000 --- a/askbot/skins/common/templates/debug_header.html +++ /dev/null @@ -1,27 +0,0 @@ -{% if settings.USING_RUNSERVER %} - {% if settings.DEBUG == False %} -
-

- You are seeing this message because you are using Django runserver - and DEBUG_MODE is False. Runserver should not be used in production. -

-

- To serve static media in production - please run: - 

python manage.py collectstatic
-

-

- If you do not see page styling - set DEBUG_MODE = True. -

-
- {% endif %} -{% else %} - {% if settings.DEBUG == True %} -
-

- Debug mode is on, do not use it in production. - To turn it off, use DEBUG = False in your - settings.py file. -

-
- {% endif %} -{% endif %} diff --git a/askbot/skins/common/templates/one_column_body.html b/askbot/skins/common/templates/one_column_body.html deleted file mode 100644 index 852f8fe5..00000000 --- a/askbot/skins/common/templates/one_column_body.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "base.html" %} -{% block body_class %}one-col{% endblock %} -{% block body %} -
- {% block content%} - {% endblock%} -
-{% endblock %} diff --git a/askbot/skins/common/templates/question/answer_author_info.html b/askbot/skins/common/templates/question/answer_author_info.html deleted file mode 100644 index 1c729b51..00000000 --- a/askbot/skins/common/templates/question/answer_author_info.html +++ /dev/null @@ -1,8 +0,0 @@ -{{ - macros.post_last_updater_and_creator_info( - answer, - settings.MIN_REP_TO_EDIT_WIKI, - karma_mode = settings.KARMA_MODE, - badges_mode = settings.BADGES_MODE - ) -}} diff --git a/askbot/skins/common/templates/question/answer_comments.html b/askbot/skins/common/templates/question/answer_comments.html deleted file mode 100644 index e6b5e1c5..00000000 --- a/askbot/skins/common/templates/question/answer_comments.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ - macros.post_comments_widget( - post = answer, - show_post = show_post, - show_comment = show_comment, - show_comment_position = show_comment_position, - user = request.user, - max_comments = settings.MAX_COMMENTS_TO_SHOW - ) -}} diff --git a/askbot/skins/common/templates/question/answer_controls.html b/askbot/skins/common/templates/question/answer_controls.html deleted file mode 100644 index 4efc7247..00000000 --- a/askbot/skins/common/templates/question/answer_controls.html +++ /dev/null @@ -1,69 +0,0 @@ -{# - {% trans %}swap with question{% endtrans %} -uncomment if needed#} - - - {% trans %}link{% endtrans %} - - - - {% if answer.id in published_answer_ids %} - {% trans %}unpublish{% endtrans %} - {% else %} - {% trans %}publish{% endtrans %} - {% endif %} - - - {% if answer.deleted %}{% trans %}undelete{% endtrans %}{% else %}{% trans %}delete{% endtrans %}{% endif %} - -{% if answer.offensive_flag_count > 0 %} - - {% trans %}remove flag{% endtrans %} - - - {% trans %}flag offensive{% endtrans %} ({{ answer.offensive_flag_count }}) - -{% else %} - - {% trans %}flag offensive{% endtrans %} - -{% endif %} - - {% trans %}edit{% endtrans %} - - -
- {% csrf_token %} - - -
- - diff --git a/askbot/skins/common/templates/question/answer_vote_buttons.html b/askbot/skins/common/templates/question/answer_vote_buttons.html deleted file mode 100644 index 242bf2be..00000000 --- a/askbot/skins/common/templates/question/answer_vote_buttons.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ macros.post_vote_buttons(post = answer) }} -
diff --git a/askbot/skins/common/templates/question/closed_question_info.html b/askbot/skins/common/templates/question/closed_question_info.html deleted file mode 100644 index f6f3f557..00000000 --- a/askbot/skins/common/templates/question/closed_question_info.html +++ /dev/null @@ -1,5 +0,0 @@ -
-

{% trans close_reason=thread.get_close_reason_display() %}The question has been closed for the following reason "{{ close_reason }}" by{% endtrans %} - {{ thread.closed_by.username|escape }}
- {% trans closed_at=thread.closed_at %}close date {{closed_at}}{% endtrans %}

-
diff --git a/askbot/skins/common/templates/question/question_author_info.html b/askbot/skins/common/templates/question/question_author_info.html deleted file mode 100644 index c25b7d84..00000000 --- a/askbot/skins/common/templates/question/question_author_info.html +++ /dev/null @@ -1,8 +0,0 @@ -{{ - macros.post_last_updater_and_creator_info( - question, - settings.MIN_REP_TO_EDIT_WIKI, - karma_mode = settings.KARMA_MODE, - badges_mode = settings.BADGES_MODE - ) -}} diff --git a/askbot/skins/common/templates/question/question_comments.html b/askbot/skins/common/templates/question/question_comments.html deleted file mode 100644 index e9d3f724..00000000 --- a/askbot/skins/common/templates/question/question_comments.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ - macros.post_comments_widget( - post = question, - show_post = show_post, - show_comment = show_comment, - show_comment_position = show_comment_position, - user = request.user, - max_comments = settings.MAX_COMMENTS_TO_SHOW - ) -}} diff --git a/askbot/skins/common/templates/question/question_controls.html b/askbot/skins/common/templates/question/question_controls.html deleted file mode 100644 index c782d9ad..00000000 --- a/askbot/skins/common/templates/question/question_controls.html +++ /dev/null @@ -1,39 +0,0 @@ -{% if question.deleted %}{% trans %}undelete{% endtrans %}{% else %}{% trans %}delete{% endtrans %}{% endif %} -{% if thread.closed %} - {% trans %}reopen{% endtrans %} -{% else %} - {% trans %}close{% endtrans %} -{% endif %} -{% if question.offensive_flag_count > 0 %} - - {% trans %}remove flag{% endtrans %} - - - {% trans %}flag offensive{% endtrans %} ({{ question.offensive_flag_count }}) - -{% else %} - - {% trans %}flag offensive{% endtrans %} - -{% endif %} - -{% trans %}retag{% endtrans %} -{% trans %}edit{% endtrans %} - diff --git a/askbot/skins/common/templates/question/question_tags.html b/askbot/skins/common/templates/question/question_tags.html deleted file mode 100644 index 4b01be81..00000000 --- a/askbot/skins/common/templates/question/question_tags.html +++ /dev/null @@ -1,8 +0,0 @@ -{{ - macros.tag_list_widget( - tags = thread.get_tag_names(), - id = 'question-tags', - css_class = 'post-tags tags', - tag_css_class = 'post-tag' - ) -}} diff --git a/askbot/skins/common/templates/question/question_vote_buttons.html b/askbot/skins/common/templates/question/question_vote_buttons.html deleted file mode 100644 index 6b8774cc..00000000 --- a/askbot/skins/common/templates/question/question_vote_buttons.html +++ /dev/null @@ -1 +0,0 @@ -{{ macros.post_vote_buttons(post = question) }} diff --git a/askbot/skins/common/templates/question/share_buttons.html b/askbot/skins/common/templates/question/share_buttons.html deleted file mode 100644 index 5b4fc7ac..00000000 --- a/askbot/skins/common/templates/question/share_buttons.html +++ /dev/null @@ -1,5 +0,0 @@ -{% if settings.ENABLE_SHARING_TWITTER %}{{ macros.share(site = 'twitter', icon = True) }}{% endif %} -{% if settings.ENABLE_SHARING_FACEBOOK %}{{ macros.share(site = 'facebook', icon = True) }}{% endif %} -{% if settings.ENABLE_SHARING_LINKEDIN %}{{ macros.share(site = 'linkedin', icon = True) }}{% endif %} -{% if settings.ENABLE_SHARING_IDENTICA %}{{ macros.share(site = 'identica', icon = True) }}{% endif %} -{% if settings.ENABLE_SHARING_GOOGLE %}{% endif %} diff --git a/askbot/skins/common/templates/two_column_body.html b/askbot/skins/common/templates/two_column_body.html deleted file mode 100644 index 4c3193be..00000000 --- a/askbot/skins/common/templates/two_column_body.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "base.html" %} -{% block body_class %}two-col{% endblock %} -{% block body %} -
- {% block content%} - {% endblock%} -
-
- {% block sidebar%} - {% endblock%} -
-{% endblock %} diff --git a/askbot/skins/common/templates/widgets/edit_post.html b/askbot/skins/common/templates/widgets/edit_post.html deleted file mode 100644 index b9bfa1e3..00000000 --- a/askbot/skins/common/templates/widgets/edit_post.html +++ /dev/null @@ -1,115 +0,0 @@ -{% if edit_title %} -
-
- {{ post_form.title }} {{ post_form.title.errors }} -
- {{ post_form.title.help_text }} -
-
-{% endif %} -{% if editor_type == 'markdown' %} -
-
- {{ post_form.text }}{# this element is resizable and will be wrapped by js #} -
-{% else %} -
- {{ post_form.media }} - {{ post_form.text }} -
- -{% endif %} -
- -

-
-{# need label element for resizable input, b/c form validation won't find span #} -{% if post_type == 'question' %} -
- {% if use_category_selector %} - {% include "widgets/three_column_category_selector.html" %} -
{% trans %}Tags{% endtrans %}
- {% include "widgets/tag_editor.html" %} - {% else %} - {% if tags_are_required %} - - {% else %} - {% trans %}tags:{% endtrans %} - {% endif %} - {{ post_form.tags.errors }}
- {{ post_form.tags }} -
- {{ post_form.tags.help_text }} -
- {% endif %} -
-{% endif %} -{% if 'summary' in post_form['fields'] %} -
- {{ post_form.summary.label_tag() }}
- {{ post_form.summary }} -
- {{ post_form.summary.help_text }} -
-
{{ post_form.summary.errors }}
-
-{% endif %} - -{% if editor_type == 'markdown' %} -
- - [{% trans %}hide preview{% endtrans %}] - -
-
-{% endif %} - -{% if user and user.is_authenticated() and user.is_administrator() %} - {# admin can post answers or questions on behalf of anyone. #} - - - - - - - - - - -{% endif %} diff --git a/askbot/skins/common/templates/widgets/related_tags.html b/askbot/skins/common/templates/widgets/related_tags.html deleted file mode 100644 index 05520998..00000000 --- a/askbot/skins/common/templates/widgets/related_tags.html +++ /dev/null @@ -1,28 +0,0 @@ -{% cache 0 "tags" tags search_tags scope sort query context.page language_code %} -
-

{% trans %}Tags{% endtrans %}

- {% if tag_list_type == 'list' %} - - {% else %} - {{ - macros.tag_cloud( - tags = tags, - font_sizes = font_size, - search_state = search_state - ) - }} - {% endif %} -
-{% endcache %} diff --git a/askbot/skins/common/templates/widgets/search_bar.html b/askbot/skins/common/templates/widgets/search_bar.html deleted file mode 100644 index 59c4fd58..00000000 --- a/askbot/skins/common/templates/widgets/search_bar.html +++ /dev/null @@ -1,46 +0,0 @@ -{% if active_tab != "ask" %} -{% spaceless %} - -{% endspaceless %} -{% endif %} diff --git a/askbot/skins/common/templates/widgets/tag_selector.html b/askbot/skins/common/templates/widgets/tag_selector.html deleted file mode 100644 index 7c6fe92e..00000000 --- a/askbot/skins/common/templates/widgets/tag_selector.html +++ /dev/null @@ -1,89 +0,0 @@ -{# todo - maybe disable navigation from ignored tags here when "hide" is on - with js? #} -{% import "macros.html" as macros %} -
-

{% trans %}Interesting tags{% endtrans %}

- {{ - macros.tag_list_widget( - interesting_tag_names, - deletable = True, - css_class = 'interesting marked-tags', - search_state = search_state - ) - }} - {# todo - add this via js - "remove '%(tag_name)s' from the list of interesting tags"| - format(tag_name = tag_name) - #} -
- - -
-

{% trans %}Ignored tags{% endtrans %}

- {{ - macros.tag_list_widget( - ignored_tag_names, - deletable = True, - css_class = 'ignored marked-tags', - search_state = search_state - ) - }} - {# todo: add this via javascript - "remove '%(tag_name)s' from the list of ignored tags"| - format(tag_name = tag_name) - #} -
- - -
- {% if settings.SUBSCRIBED_TAG_SELECTOR_ENABLED %} -

{% trans %}Subscribed tags{% endtrans %}

- {{ - macros.tag_list_widget( - subscribed_tag_names, - deletable = True, - css_class = 'subscribed marked-tags', - search_state = search_state - ) - }} - {# todo: add this via javascript - "remove '%(tag_name)s' from the list of ignored tags"| - format(tag_name = tag_name) - #} -
- - -
- {% endif %} -

{% trans %}Show only questions from{% endtrans%}

-
- {{ - macros.radio_select( - name = "display_tag_filter_strategy", - value = request.user.display_tag_filter_strategy, - choices = display_tag_filter_strategy_choices - ) - }} -
- {% if settings.SUBSCRIBED_TAG_SELECTOR_ENABLED %} -

{% trans %}Send me email alerts for{% endtrans%}

-
- {{ - macros.radio_select( - name = "email_tag_filter_strategy", - value = request.user.email_tag_filter_strategy, - 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/templates/authopenid/authopenid_macros.html b/askbot/skins/default/templates/authopenid/authopenid_macros.html new file mode 100644 index 00000000..9d35ac6f --- /dev/null +++ b/askbot/skins/default/templates/authopenid/authopenid_macros.html @@ -0,0 +1,69 @@ +{% macro login_provider_input(login_provider) %} + +{% endmacro %} + +{% macro provider_buttons( + login_form = None, + major_login_providers = None, + minor_login_providers = None, + hide_local_login = False, + settings = None, + logged_in = False, + show_buttons = True + ) +%} + {% if show_buttons == True %}{# a hack #} +
+ {% if major_login_providers %} + + {% endif %} + {% if minor_login_providers %} + + {% endif %} +
+ + {% endif %} +{% endmacro %} diff --git a/askbot/skins/default/templates/authopenid/changeemail.html b/askbot/skins/default/templates/authopenid/changeemail.html new file mode 100644 index 00000000..8afa9c49 --- /dev/null +++ b/askbot/skins/default/templates/authopenid/changeemail.html @@ -0,0 +1,112 @@ +{% extends "one_column_body.html" %} +{% block title %}{% spaceless %}{% trans %}Change Email{% endtrans %}{% endspaceless %}{% endblock %} +{% block content %} + +{% if action_type=="change" %} +

+ {% if user.email %} + {% trans %}Change Email{% endtrans %} + {% else %} + {% trans %}Save your email address{% endtrans %} + {% endif %} +

+

+ {% if user.email %} + {% trans %}Enter your new email into the box below if +you'd like to use another email for update subscriptions. +
Currently you are using %(email)s{% endtrans %} + {% else %} + {% trans %}Please enter your email address in the box below. +Valid email address is required on this Q&A forum. If you like, +you can receive updates on interesting questions or entire +forum via email. Also, your email is used to create a unique +gravatar image for your +account. Email addresses are never shown or otherwise shared with anybody +else.{% endtrans %} + {% endif %} +

+ {% if msg %} +

{{ msg }}

+ {% endif %} +
+
{% csrf_token %} + {% if next %} + + {% endif %} +
+
+
+ + {% if user.email %} + + {% endif %} +
+
+
+{% elif action_type=="validate" %} +
+ {% trans %}Validate email{% endtrans %} +
+

+ {% trans %}An email with a validation link has been sent to +%(email)s. Please follow the emailed link with your +web browser. Email validation is necessary to help insure the proper use of +email on Q&A. If you would like to use +another email, please change it again.{% endtrans %} +

+{% elif action_type=="keep" %} +
+ {% trans %}Email not changed{% endtrans %} +
+

+ {% trans %}Your email address %(email)s has not been changed. + If you decide to change it later - you can always do it by editing +it in your user profile or by using the previous form again.{% endtrans %} +

+{% elif action_type=="done_novalidate" %} +
+ {% trans %}Email changed{% endtrans %} +
+

+ {% trans %} +Your email address is now set to %(email)s. +Updates on the questions that you like most will be sent to this address. +Email notifications are sent once a day or less frequently - only when there +are any news.{% endtrans %} +

+{% elif action_type=="validation_complete" %} +
+ {% trans %}Email verified{% endtrans %} +
+

+ {% trans %}Thank you for verifying your email! Now +you can ask and answer questions. Also if +you find a very interesting question you can subscribe for the +updates - then will be notified about changes once a day +or less frequently.{% endtrans %} +

+{% elif action_type=="key_not_sent" %} +
+ {% trans %}Validation email not sent{% endtrans %} +
+

+ {% trans %}Your current email address %(email)s has been +validated before so the new key was not sent. You can change email used for update subscriptions if +necessary.{% endtrans %} +

+{% endif %} +{% endblock %} + diff --git a/askbot/skins/default/templates/authopenid/complete.html b/askbot/skins/default/templates/authopenid/complete.html new file mode 100644 index 00000000..c9afedee --- /dev/null +++ b/askbot/skins/default/templates/authopenid/complete.html @@ -0,0 +1,63 @@ +{% extends "one_column_body.html" %} + +{# +views calling this template: +* django_authopenid.views.register with login_type='openid' +* django_authopenid.views.signin - with login_type='legacy' + +purpose of this template is to allow user enter his/her name +email and sign up for email alerts at the initial registratio + +parameters: +* provider +* login_type openid|legacy +* username (same as screen name or username in the models, and nickname in openid sreg) +* openid_register_form +* openid_verify_form - not clear what this form is supposed to do, not used for legacy +* openid_username_exists +#} +{% block head %}{% endblock %} +{% block title %}{% spaceless %}{% trans %}Registration{% endtrans %}{% endspaceless %}{% endblock %} +{% block content %} +

{% trans %}User registration{% endtrans %}

+ {% if openid_register_form.errors %} + + {% endif %} +
+ {% if login_type=='openid' %} +
{% csrf_token %} + {% elif login_type=='facebook' %} + {% csrf_token %} + {% else %} + {% csrf_token %} + {% endif %} + {{ openid_register_form.next }} +
+ + {% if openid_register_form.username.errors %} +

{{ openid_register_form.username.errors|join(", ") }}

+ {% endif %} + {{ openid_register_form.username }} +
+
+ + {% if openid_register_form.email.errors %} +

{{ openid_register_form.email.errors|join(", ") }}

+ {% endif %} + {{ openid_register_form.email }} +
+
+
+
+{% endblock %} + diff --git a/askbot/skins/default/templates/authopenid/confirm_email.txt b/askbot/skins/default/templates/authopenid/confirm_email.txt new file mode 100644 index 00000000..5cab7c4c --- /dev/null +++ b/askbot/skins/default/templates/authopenid/confirm_email.txt @@ -0,0 +1,12 @@ +{% trans %}Thank you for registering at our Q&A forum!{% endtrans %} + +{% trans %}Your account details are:{% endtrans %} + +{% trans %}Username:{% endtrans %} {{ username }} +{% trans %}Password:{% endtrans %} {{ password }} + +{% trans %}Please sign in here:{% endtrans %} +{{signup_url}} + +{% trans %}Sincerely, +Q&A Forum Administrator{% endtrans %} diff --git a/askbot/skins/default/templates/authopenid/email_validation.txt b/askbot/skins/default/templates/authopenid/email_validation.txt new file mode 100644 index 00000000..bd68c61a --- /dev/null +++ b/askbot/skins/default/templates/authopenid/email_validation.txt @@ -0,0 +1,14 @@ +{% trans %}Greetings from the Q&A forum{% endtrans %}, + +{% trans %}To make use of the Forum, please follow the link below:{% endtrans %} + +{{validation_link}} + +{% trans %}Following the link above will help us verify your email address.{% endtrans %} + +{% trans %}If you believe that this message was sent in mistake - +no further action is needed. Just ignore this email, we apologize +for any inconvenience{% endtrans %} + +{% trans %}Sincerely, +Q&A Forum Administrator{% endtrans %} diff --git a/askbot/skins/default/templates/authopenid/logout.html b/askbot/skins/default/templates/authopenid/logout.html new file mode 100644 index 00000000..1ac6705c --- /dev/null +++ b/askbot/skins/default/templates/authopenid/logout.html @@ -0,0 +1,31 @@ +{% extends "one_column_body.html" %} + +{% block title %}{% spaceless %}{% trans %}Logout{% endtrans %}{% endspaceless %}{% endblock %} +{% block content %} +

{% trans %}You have successfully logged out{% endtrans %}

+{% if have_federated_login_methods %} +

{% trans %}However, you still may be logged in to your OpenID provider. Please logout of your provider if you wish to do so.{% endtrans %}

+ {% if settings.FACEBOOK_KEY and settings.FACEBOOK_SECRET %} +
+ + + {% endif %} +{% endif %} +{% endblock %} +{% block endjs %} + +{% endblock %} + diff --git a/askbot/skins/default/templates/authopenid/providers_javascript.html b/askbot/skins/default/templates/authopenid/providers_javascript.html new file mode 100644 index 00000000..cd9f56b6 --- /dev/null +++ b/askbot/skins/default/templates/authopenid/providers_javascript.html @@ -0,0 +1,55 @@ + + + +{% if settings.FACEBOOK_KEY and settings.FACEBOOK_SECRET %} +
+ + +{% endif %} diff --git a/askbot/skins/default/templates/authopenid/signin.html b/askbot/skins/default/templates/authopenid/signin.html new file mode 100644 index 00000000..c5a5c47f --- /dev/null +++ b/askbot/skins/default/templates/authopenid/signin.html @@ -0,0 +1,231 @@ +{% extends "two_column_body.html" %} +{% import "authopenid/authopenid_macros.html" as login_macros %} +{% from "macros.html" import timeago %} + +{% block title %}{% spaceless %}{% trans %}User login{% endtrans %}{% endspaceless %}{% endblock %} +{% block forestyle %} + +{% endblock %} +{% block content %} +{% if have_buttons or view_subtype == 'email_sent' %} +

{{page_title}}

+{% endif %} + {% if answer %} +
+ {% trans title=answer.question.title|escape, summary=answer.summary|escape %} + Your answer to {{title}} {{summary}} will be posted once you log in + {% endtrans %} +
+ {% endif %} + {% if question %} +
+ {% trans title=question.title|escape, summary=question.summary|escape %}Your question + {{title}} {{summary}} will be posted once you log in + {% endtrans %} +
+ {% endif %} + {% if not (view_subtype == 'default' and have_buttons) %} +

+ {% if view_subtype == 'add_openid' and have_buttons %} + {% if existing_login_methods %} + {% trans %}It's a good idea to make sure that your existing login methods still work, or add a new one. Please click any of the icons below to check/change or add new login methods.{% endtrans %} + {% else %} + {% trans %}Please add a more permanent login method by clicking one of the icons below, to avoid logging in via email each time.{% endtrans %} + {% endif %} + {% elif view_subtype == 'change_openid' and have_buttons %} + {% if existing_login_methods %} + {% trans %}Click on one of the icons below to add a new login method or re-validate an existing one.{% endtrans %} + {% else %} + {% trans %}You don't have a method to log in right now, please add one or more by clicking any of the icons below.{% endtrans %} + {% endif %} + {% elif view_subtype == 'email_sent' %} + {% trans %}Please check your email and visit the enclosed link to re-connect to your account{% endtrans %} + {% endif %} +

+ {% endif %} + {% if openid_error_message %} +

{{ openid_error_message }}

+ {% endif %} + {% if view_subtype != 'email_sent' and view_subtype != 'bad_key' %} +
{% csrf_token %} + {# in this branch - the real signin view we display the login icons + here we hide the local login button only if admin + wants to always show the password login form - then + the button is useless. + #} + {{ login_form.login_provider_name }} + {{ login_form.next }} + {{ + login_macros.provider_buttons( + login_form = login_form, + major_login_providers = major_login_providers, + minor_login_providers = minor_login_providers, + hide_local_login = settings.SIGNIN_ALWAYS_SHOW_LOCAL_LOGIN, + settings = settings, + logged_in = user.is_authenticated(), + show_buttons = have_buttons + ) + }} + {% if use_password_login == True %} + + {% endif %} +
+ {% if user.is_authenticated() and existing_login_methods and settings.ALLOW_ADD_REMOVE_LOGIN_METHODS %} + + {% endif %} + {% endif %} + {% if view_subtype != 'email_sent' or view_subtype == 'bad_key' %} + {% if user.is_anonymous() and settings.ALLOW_ACCOUNT_RECOVERY_BY_EMAIL %} +
{% csrf_token %} + {% if view_subtype != 'bad_key' %} +

{% trans %}Still have trouble signing in?{% endtrans %}

+ {% endif %} +

+ + {% if view_subtype == 'bad_key' %} + {% trans %}Please, enter your email address below and obtain a new key{% endtrans %} + {% else %} + {% trans %}Please, enter your email address below to recover your account{% endtrans %} + {% endif %} + + +

+
+ {% if account_recovery_form.email.errors %} +

{{account_recovery_form.email.errors[0]}}

+ {% endif %} + {{ account_recovery_form.email }} + +
+
+ {% endif %} + {% endif %} +{% endblock %} +{% block endjs %} +{% include "authopenid/providers_javascript.html" %} +{% endblock %} + diff --git a/askbot/skins/default/templates/authopenid/signup_with_password.html b/askbot/skins/default/templates/authopenid/signup_with_password.html new file mode 100644 index 00000000..e5a8f633 --- /dev/null +++ b/askbot/skins/default/templates/authopenid/signup_with_password.html @@ -0,0 +1,55 @@ +{% extends "one_column_body.html" %} +{% import "authopenid/authopenid_macros.html" as login_macros %} + +{% block title %}{% spaceless %}{% trans %}Signup{% endtrans %}{% endspaceless %}{% endblock %} +{% block forestyle %} + +{% endblock %} +{% block content %} +{% if settings.PASSWORD_REGISTER_SHOW_PROVIDER_BUTTONS == True %} +

{% trans %}Please register by clicking on any of the icons below{% endtrans %}

+
{% csrf_token %} + {# hide_local_login == True because it is password reg form #} + {{ + login_macros.provider_buttons( + login_form = login_form, + major_login_providers = major_login_providers, + minor_login_providers = minor_login_providers, + hide_local_login = True, + settings = settings + ) + }} +
+

{% trans %}or create a new user name and password here{% endtrans %}

+{% else %} +

{% trans %}Create login name and password{% endtrans %}

+ +{%endif%} +
{% csrf_token %} + {{form.login_provider}} + + {% if settings.USE_RECAPTCHA %} + + {{form.recaptcha}} + {% endif %} +
+ {% if settings.PASSWORD_REGISTER_SHOW_PROVIDER_BUTTONS == False %} + {% trans %}or{% endtrans %} + {% trans %}return to OpenID login{% endtrans %} + {% endif %} +
+
+{% endblock %} +{%block endjs%} +{%include "authopenid/providers_javascript.html" %} +{%endblock%} + diff --git a/askbot/skins/default/templates/authopenid/verify_email.html b/askbot/skins/default/templates/authopenid/verify_email.html new file mode 100644 index 00000000..613ca589 --- /dev/null +++ b/askbot/skins/default/templates/authopenid/verify_email.html @@ -0,0 +1,14 @@ +{% extends "one_column_body.html" %} +{% block title %}{% spaceless %}{% trans %}Confirm email address{% endtrans %}{% endspaceless %}{% endblock %} +{% block content %} +

{% trans %}Confirm email address{% endtrans %}

+ +
{% csrf_token %} + + +
+{% endblock %} + diff --git a/askbot/skins/default/templates/avatar/add.html b/askbot/skins/default/templates/avatar/add.html new file mode 100644 index 00000000..68a188ef --- /dev/null +++ b/askbot/skins/default/templates/avatar/add.html @@ -0,0 +1,15 @@ +{% extends "user_profile/user.html" %} +{% import "macros.html" as macros %} +{% block profilesection %}{% trans %}add avatar{% endtrans %}{% endblock %} +{% block usercontent %} +

{% trans %}Change avatar{% endtrans %} +

{% trans %}Your current avatar: {% endtrans %}

+ {{ macros.gravatar(user, 128) }} + {% if not avatars %} +

{% trans %}You haven't uploaded an avatar yet. Please upload one now.{% endtrans %}

+ {% endif %} +
{% csrf_token %} + {{ upload_avatar_form.as_p() }} +

+
+{% endblock %} diff --git a/askbot/skins/default/templates/avatar/change.html b/askbot/skins/default/templates/avatar/change.html new file mode 100644 index 00000000..7921a662 --- /dev/null +++ b/askbot/skins/default/templates/avatar/change.html @@ -0,0 +1,24 @@ +{% extends "user_profile/user.html" %} +{% import "macros.html" as macros %} +{% block profilesection %} + {% trans %}change avatar{% endtrans %} +{% endblock %} +{% block usercontent %} +

{% trans %}Your current avatar: {% endtrans %}
+ {{ macros.gravatar(user, 128) }} +

+ {% if not avatars %} +

{% trans %}You haven't uploaded an avatar yet. Please upload one now.{% endtrans %}

+ {% else %} +
{% csrf_token %} +
    + {{ primary_avatar_form.as_ul() }} +
+

+
+ {% endif %} +
{% csrf_token %} + {{ upload_avatar_form.as_p() }} +

+
+{% endblock %} diff --git a/askbot/skins/default/templates/avatar/confirm_delete.html b/askbot/skins/default/templates/avatar/confirm_delete.html new file mode 100644 index 00000000..ee3d10d7 --- /dev/null +++ b/askbot/skins/default/templates/avatar/confirm_delete.html @@ -0,0 +1,15 @@ +{% extends "user_profile/user.html" %} +{% block profilesection %}{% trans %}delete avatar{% endtrans %}{% endblock %} +{% block usercontent %} +

{% trans %}Please select the avatars that you would like to delete.{% endtrans %}

+ {% if not avatars %} +

{% trans avatar_change_url="avatar_change"|url %}You have no avatars to delete. Please upload one now.{% endtrans %}

+ {% else %} +
{% csrf_token %} +
    + {{ delete_avatar_form.as_ul() }} +
+

+
+ {% endif %} +{% endblock %} diff --git a/askbot/skins/default/templates/debug_header.html b/askbot/skins/default/templates/debug_header.html new file mode 100644 index 00000000..e1230265 --- /dev/null +++ b/askbot/skins/default/templates/debug_header.html @@ -0,0 +1,27 @@ +{% if settings.USING_RUNSERVER %} + {% if settings.DEBUG == False %} +
+

+ You are seeing this message because you are using Django runserver + and DEBUG_MODE is False. Runserver should not be used in production. +

+

+ To serve static media in production - please run: + 

python manage.py collectstatic
+

+

+ If you do not see page styling - set DEBUG_MODE = True. +

+
+ {% endif %} +{% else %} + {% if settings.DEBUG == True %} +
+

+ Debug mode is on, do not use it in production. + To turn it off, use DEBUG = False in your + settings.py file. +

+
+ {% endif %} +{% endif %} diff --git a/askbot/skins/default/templates/one_column_body.html b/askbot/skins/default/templates/one_column_body.html new file mode 100644 index 00000000..852f8fe5 --- /dev/null +++ b/askbot/skins/default/templates/one_column_body.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} +{% block body_class %}one-col{% endblock %} +{% block body %} +
+ {% block content%} + {% endblock%} +
+{% endblock %} diff --git a/askbot/skins/default/templates/question/answer_author_info.html b/askbot/skins/default/templates/question/answer_author_info.html new file mode 100644 index 00000000..1c729b51 --- /dev/null +++ b/askbot/skins/default/templates/question/answer_author_info.html @@ -0,0 +1,8 @@ +{{ + macros.post_last_updater_and_creator_info( + answer, + settings.MIN_REP_TO_EDIT_WIKI, + karma_mode = settings.KARMA_MODE, + badges_mode = settings.BADGES_MODE + ) +}} diff --git a/askbot/skins/default/templates/question/answer_comments.html b/askbot/skins/default/templates/question/answer_comments.html new file mode 100644 index 00000000..e6b5e1c5 --- /dev/null +++ b/askbot/skins/default/templates/question/answer_comments.html @@ -0,0 +1,10 @@ +{{ + macros.post_comments_widget( + post = answer, + show_post = show_post, + show_comment = show_comment, + show_comment_position = show_comment_position, + user = request.user, + max_comments = settings.MAX_COMMENTS_TO_SHOW + ) +}} diff --git a/askbot/skins/default/templates/question/answer_controls.html b/askbot/skins/default/templates/question/answer_controls.html new file mode 100644 index 00000000..4efc7247 --- /dev/null +++ b/askbot/skins/default/templates/question/answer_controls.html @@ -0,0 +1,69 @@ +{# + {% trans %}swap with question{% endtrans %} +uncomment if needed#} + + + {% trans %}link{% endtrans %} + + + + {% if answer.id in published_answer_ids %} + {% trans %}unpublish{% endtrans %} + {% else %} + {% trans %}publish{% endtrans %} + {% endif %} + + + {% if answer.deleted %}{% trans %}undelete{% endtrans %}{% else %}{% trans %}delete{% endtrans %}{% endif %} + +{% if answer.offensive_flag_count > 0 %} + + {% trans %}remove flag{% endtrans %} + + + {% trans %}flag offensive{% endtrans %} ({{ answer.offensive_flag_count }}) + +{% else %} + + {% trans %}flag offensive{% endtrans %} + +{% endif %} + + {% trans %}edit{% endtrans %} + + +
+ {% csrf_token %} + + +
+ + diff --git a/askbot/skins/default/templates/question/answer_vote_buttons.html b/askbot/skins/default/templates/question/answer_vote_buttons.html new file mode 100644 index 00000000..242bf2be --- /dev/null +++ b/askbot/skins/default/templates/question/answer_vote_buttons.html @@ -0,0 +1,10 @@ +{{ macros.post_vote_buttons(post = answer) }} +
diff --git a/askbot/skins/default/templates/question/closed_question_info.html b/askbot/skins/default/templates/question/closed_question_info.html new file mode 100644 index 00000000..f6f3f557 --- /dev/null +++ b/askbot/skins/default/templates/question/closed_question_info.html @@ -0,0 +1,5 @@ +
+

{% trans close_reason=thread.get_close_reason_display() %}The question has been closed for the following reason "{{ close_reason }}" by{% endtrans %} + {{ thread.closed_by.username|escape }}
+ {% trans closed_at=thread.closed_at %}close date {{closed_at}}{% endtrans %}

+
diff --git a/askbot/skins/default/templates/question/question_author_info.html b/askbot/skins/default/templates/question/question_author_info.html new file mode 100644 index 00000000..c25b7d84 --- /dev/null +++ b/askbot/skins/default/templates/question/question_author_info.html @@ -0,0 +1,8 @@ +{{ + macros.post_last_updater_and_creator_info( + question, + settings.MIN_REP_TO_EDIT_WIKI, + karma_mode = settings.KARMA_MODE, + badges_mode = settings.BADGES_MODE + ) +}} diff --git a/askbot/skins/default/templates/question/question_comments.html b/askbot/skins/default/templates/question/question_comments.html new file mode 100644 index 00000000..e9d3f724 --- /dev/null +++ b/askbot/skins/default/templates/question/question_comments.html @@ -0,0 +1,10 @@ +{{ + macros.post_comments_widget( + post = question, + show_post = show_post, + show_comment = show_comment, + show_comment_position = show_comment_position, + user = request.user, + max_comments = settings.MAX_COMMENTS_TO_SHOW + ) +}} diff --git a/askbot/skins/default/templates/question/question_controls.html b/askbot/skins/default/templates/question/question_controls.html new file mode 100644 index 00000000..c782d9ad --- /dev/null +++ b/askbot/skins/default/templates/question/question_controls.html @@ -0,0 +1,39 @@ +{% if question.deleted %}{% trans %}undelete{% endtrans %}{% else %}{% trans %}delete{% endtrans %}{% endif %} +{% if thread.closed %} + {% trans %}reopen{% endtrans %} +{% else %} + {% trans %}close{% endtrans %} +{% endif %} +{% if question.offensive_flag_count > 0 %} + + {% trans %}remove flag{% endtrans %} + + + {% trans %}flag offensive{% endtrans %} ({{ question.offensive_flag_count }}) + +{% else %} + + {% trans %}flag offensive{% endtrans %} + +{% endif %} + +{% trans %}retag{% endtrans %} +{% trans %}edit{% endtrans %} + diff --git a/askbot/skins/default/templates/question/question_tags.html b/askbot/skins/default/templates/question/question_tags.html new file mode 100644 index 00000000..4b01be81 --- /dev/null +++ b/askbot/skins/default/templates/question/question_tags.html @@ -0,0 +1,8 @@ +{{ + macros.tag_list_widget( + tags = thread.get_tag_names(), + id = 'question-tags', + css_class = 'post-tags tags', + tag_css_class = 'post-tag' + ) +}} diff --git a/askbot/skins/default/templates/question/question_vote_buttons.html b/askbot/skins/default/templates/question/question_vote_buttons.html new file mode 100644 index 00000000..6b8774cc --- /dev/null +++ b/askbot/skins/default/templates/question/question_vote_buttons.html @@ -0,0 +1 @@ +{{ macros.post_vote_buttons(post = question) }} diff --git a/askbot/skins/default/templates/question/share_buttons.html b/askbot/skins/default/templates/question/share_buttons.html new file mode 100644 index 00000000..5b4fc7ac --- /dev/null +++ b/askbot/skins/default/templates/question/share_buttons.html @@ -0,0 +1,5 @@ +{% if settings.ENABLE_SHARING_TWITTER %}{{ macros.share(site = 'twitter', icon = True) }}{% endif %} +{% if settings.ENABLE_SHARING_FACEBOOK %}{{ macros.share(site = 'facebook', icon = True) }}{% endif %} +{% if settings.ENABLE_SHARING_LINKEDIN %}{{ macros.share(site = 'linkedin', icon = True) }}{% endif %} +{% if settings.ENABLE_SHARING_IDENTICA %}{{ macros.share(site = 'identica', icon = True) }}{% endif %} +{% if settings.ENABLE_SHARING_GOOGLE %}{% endif %} diff --git a/askbot/skins/default/templates/two_column_body.html b/askbot/skins/default/templates/two_column_body.html new file mode 100644 index 00000000..4c3193be --- /dev/null +++ b/askbot/skins/default/templates/two_column_body.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} +{% block body_class %}two-col{% endblock %} +{% block body %} +
+ {% block content%} + {% endblock%} +
+
+ {% block sidebar%} + {% endblock%} +
+{% endblock %} diff --git a/askbot/skins/default/templates/widgets/edit_post.html b/askbot/skins/default/templates/widgets/edit_post.html new file mode 100644 index 00000000..b9bfa1e3 --- /dev/null +++ b/askbot/skins/default/templates/widgets/edit_post.html @@ -0,0 +1,115 @@ +{% if edit_title %} +
+
+ {{ post_form.title }} {{ post_form.title.errors }} +
+ {{ post_form.title.help_text }} +
+
+{% endif %} +{% if editor_type == 'markdown' %} +
+
+ {{ post_form.text }}{# this element is resizable and will be wrapped by js #} +
+{% else %} +
+ {{ post_form.media }} + {{ post_form.text }} +
+ +{% endif %} +
+ +

+
+{# need label element for resizable input, b/c form validation won't find span #} +{% if post_type == 'question' %} +
+ {% if use_category_selector %} + {% include "widgets/three_column_category_selector.html" %} +
{% trans %}Tags{% endtrans %}
+ {% include "widgets/tag_editor.html" %} + {% else %} + {% if tags_are_required %} + + {% else %} + {% trans %}tags:{% endtrans %} + {% endif %} + {{ post_form.tags.errors }}
+ {{ post_form.tags }} +
+ {{ post_form.tags.help_text }} +
+ {% endif %} +
+{% endif %} +{% if 'summary' in post_form['fields'] %} +
+ {{ post_form.summary.label_tag() }}
+ {{ post_form.summary }} +
+ {{ post_form.summary.help_text }} +
+
{{ post_form.summary.errors }}
+
+{% endif %} + +{% if editor_type == 'markdown' %} +
+ + [{% trans %}hide preview{% endtrans %}] + +
+
+{% endif %} + +{% if user and user.is_authenticated() and user.is_administrator() %} + {# admin can post answers or questions on behalf of anyone. #} + + + + + + + + + + +{% endif %} diff --git a/askbot/skins/default/templates/widgets/related_tags.html b/askbot/skins/default/templates/widgets/related_tags.html new file mode 100644 index 00000000..05520998 --- /dev/null +++ b/askbot/skins/default/templates/widgets/related_tags.html @@ -0,0 +1,28 @@ +{% cache 0 "tags" tags search_tags scope sort query context.page language_code %} +
+

{% trans %}Tags{% endtrans %}

+ {% if tag_list_type == 'list' %} + + {% else %} + {{ + macros.tag_cloud( + tags = tags, + font_sizes = font_size, + search_state = search_state + ) + }} + {% endif %} +
+{% endcache %} diff --git a/askbot/skins/default/templates/widgets/search_bar.html b/askbot/skins/default/templates/widgets/search_bar.html new file mode 100644 index 00000000..59c4fd58 --- /dev/null +++ b/askbot/skins/default/templates/widgets/search_bar.html @@ -0,0 +1,46 @@ +{% if active_tab != "ask" %} +{% spaceless %} + +{% endspaceless %} +{% endif %} diff --git a/askbot/skins/default/templates/widgets/tag_selector.html b/askbot/skins/default/templates/widgets/tag_selector.html new file mode 100644 index 00000000..7c6fe92e --- /dev/null +++ b/askbot/skins/default/templates/widgets/tag_selector.html @@ -0,0 +1,89 @@ +{# todo - maybe disable navigation from ignored tags here when "hide" is on - with js? #} +{% import "macros.html" as macros %} +
+

{% trans %}Interesting tags{% endtrans %}

+ {{ + macros.tag_list_widget( + interesting_tag_names, + deletable = True, + css_class = 'interesting marked-tags', + search_state = search_state + ) + }} + {# todo - add this via js + "remove '%(tag_name)s' from the list of interesting tags"| + format(tag_name = tag_name) + #} +
+ + +
+

{% trans %}Ignored tags{% endtrans %}

+ {{ + macros.tag_list_widget( + ignored_tag_names, + deletable = True, + css_class = 'ignored marked-tags', + search_state = search_state + ) + }} + {# todo: add this via javascript + "remove '%(tag_name)s' from the list of ignored tags"| + format(tag_name = tag_name) + #} +
+ + +
+ {% if settings.SUBSCRIBED_TAG_SELECTOR_ENABLED %} +

{% trans %}Subscribed tags{% endtrans %}

+ {{ + macros.tag_list_widget( + subscribed_tag_names, + deletable = True, + css_class = 'subscribed marked-tags', + search_state = search_state + ) + }} + {# todo: add this via javascript + "remove '%(tag_name)s' from the list of ignored tags"| + format(tag_name = tag_name) + #} +
+ + +
+ {% endif %} +

{% trans %}Show only questions from{% endtrans%}

+
+ {{ + macros.radio_select( + name = "display_tag_filter_strategy", + value = request.user.display_tag_filter_strategy, + choices = display_tag_filter_strategy_choices + ) + }} +
+ {% if settings.SUBSCRIBED_TAG_SELECTOR_ENABLED %} +

{% trans %}Send me email alerts for{% endtrans%}

+
+ {{ + macros.radio_select( + name = "email_tag_filter_strategy", + value = request.user.email_tag_filter_strategy, + choices = email_tag_filter_strategy_choices + ) + }} + {% if request.user.is_authenticated() %} +

+ {% trans %}Change frequency of emails{% endtrans %} +

+ {% endif %} +
+ {% endif %} +
-- cgit v1.2.3-1-g7c22