From ef03f89ebd8d3428d4032d227e22f6aff8bf8cae Mon Sep 17 00:00:00 2001 From: Adolfo Fitoria Date: Mon, 17 Oct 2011 15:59:40 -0300 Subject: Moved avatar Deleted macros folder moved into a single file moved one and two column_body moved authopenid --- .../templates/authopenid/authopenid_macros.html | 58 ++ .../common/templates/authopenid/changeemail.html | 80 +++ .../common/templates/authopenid/complete.html | 84 +++ .../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 | 241 ++++++++ .../templates/authopenid/signup_with_password.html | 58 ++ 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/one_column_body.html | 8 + askbot/skins/common/templates/two_column_body.html | 12 + askbot/skins/default/templates/answer_edit.html | 2 +- askbot/skins/default/templates/ask.html | 2 +- .../default/templates/authopenid/changeemail.html | 80 --- .../default/templates/authopenid/complete.html | 84 --- .../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 | 241 -------- .../templates/authopenid/signup_with_password.html | 58 -- 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/badge.html | 2 +- .../skins/default/templates/blocks/ask_form.html | 2 +- askbot/skins/default/templates/blocks/header.html | 2 +- .../skins/default/templates/blocks/paginator.html | 2 +- askbot/skins/default/templates/macros.html | 635 +++++++++++++++++++++ .../templates/macros/authopenid_macros.html | 58 -- askbot/skins/default/templates/macros/macros.html | 635 --------------------- .../skins/default/templates/main_page/content.html | 2 +- .../default/templates/main_page/headline.html | 2 +- .../default/templates/main_page/paginator.html | 2 +- .../skins/default/templates/main_page/sidebar.html | 2 +- .../skins/default/templates/main_page/tab_bar.html | 2 +- .../skins/default/templates/one_column_body.html | 8 - .../skins/default/templates/question/content.html | 2 +- .../skins/default/templates/question/sidebar.html | 2 +- askbot/skins/default/templates/question_edit.html | 2 +- askbot/skins/default/templates/question_retag.html | 2 +- askbot/skins/default/templates/revisions.html | 2 +- .../default/templates/subscribe_for_tags.html | 2 +- askbot/skins/default/templates/tags.html | 2 +- .../skins/default/templates/two_column_body.html | 12 - .../default/templates/user_profile/user_edit.html | 2 +- .../default/templates/user_profile/user_inbox.html | 2 +- .../default/templates/user_profile/user_info.html | 2 +- .../templates/user_profile/user_network.html | 2 +- .../default/templates/user_profile/user_stats.html | 2 +- .../templates/user_profile/users_questions.html | 2 +- askbot/skins/default/templates/users.html | 2 +- .../templates/widgets/question_summary.html | 2 +- .../default/templates/widgets/tag_selector.html | 2 +- .../skins/default/templates/widgets/user_list.html | 2 +- 58 files changed, 1370 insertions(+), 1370 deletions(-) create mode 100644 askbot/skins/common/templates/authopenid/authopenid_macros.html create mode 100644 askbot/skins/common/templates/authopenid/changeemail.html create mode 100644 askbot/skins/common/templates/authopenid/complete.html create mode 100644 askbot/skins/common/templates/authopenid/confirm_email.txt create mode 100644 askbot/skins/common/templates/authopenid/email_validation.txt create mode 100644 askbot/skins/common/templates/authopenid/logout.html create mode 100644 askbot/skins/common/templates/authopenid/providers_javascript.html create mode 100644 askbot/skins/common/templates/authopenid/signin.html create mode 100644 askbot/skins/common/templates/authopenid/signup_with_password.html create mode 100644 askbot/skins/common/templates/avatar/add.html create mode 100644 askbot/skins/common/templates/avatar/change.html create mode 100644 askbot/skins/common/templates/avatar/confirm_delete.html create mode 100644 askbot/skins/common/templates/one_column_body.html create mode 100644 askbot/skins/common/templates/two_column_body.html delete mode 100644 askbot/skins/default/templates/authopenid/changeemail.html delete mode 100644 askbot/skins/default/templates/authopenid/complete.html delete mode 100644 askbot/skins/default/templates/authopenid/confirm_email.txt delete mode 100644 askbot/skins/default/templates/authopenid/email_validation.txt delete mode 100644 askbot/skins/default/templates/authopenid/logout.html delete mode 100644 askbot/skins/default/templates/authopenid/providers_javascript.html delete mode 100644 askbot/skins/default/templates/authopenid/signin.html delete mode 100644 askbot/skins/default/templates/authopenid/signup_with_password.html delete mode 100644 askbot/skins/default/templates/avatar/add.html delete mode 100644 askbot/skins/default/templates/avatar/change.html delete mode 100644 askbot/skins/default/templates/avatar/confirm_delete.html create mode 100644 askbot/skins/default/templates/macros.html delete mode 100644 askbot/skins/default/templates/macros/authopenid_macros.html delete mode 100644 askbot/skins/default/templates/macros/macros.html delete mode 100644 askbot/skins/default/templates/one_column_body.html delete mode 100644 askbot/skins/default/templates/two_column_body.html diff --git a/askbot/skins/common/templates/authopenid/authopenid_macros.html b/askbot/skins/common/templates/authopenid/authopenid_macros.html new file mode 100644 index 00000000..477d277c --- /dev/null +++ b/askbot/skins/common/templates/authopenid/authopenid_macros.html @@ -0,0 +1,58 @@ +{% 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 + ) +%} +
+ + +
+ +{% endmacro %} diff --git a/askbot/skins/common/templates/authopenid/changeemail.html b/askbot/skins/common/templates/authopenid/changeemail.html new file mode 100644 index 00000000..1316a048 --- /dev/null +++ b/askbot/skins/common/templates/authopenid/changeemail.html @@ -0,0 +1,80 @@ +{% 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 %}change {{email}} info{% endtrans %} + {% else %} + {% trans %}here is why email is required, see {{gravatar_faq_url}}{% endtrans %} + {% endif %} +

+ {% if msg %} +

{{ msg }}

+ {% endif %} +
+
{% csrf_token %} + {% if next %} + + {% endif %} +
+ + {% if form.email.errors %} +

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

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

+ {% trans %}validate {{email}} info or go to {{change_email_url}}{% endtrans %} +

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

+ {% trans %}old {{email}} kept, if you like go to {{change_email_url}}{% endtrans %} +

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

+ {% trans %}your current {{email}} can be used for this{% endtrans %} +

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

+ {% trans %}thanks for verifying email{% endtrans %} +

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

+ {% trans %}email key not sent {{email}} change email here {{change_link}}{% endtrans %} +

+{% endif %} +{% endblock %} + diff --git a/askbot/skins/common/templates/authopenid/complete.html b/askbot/skins/common/templates/authopenid/complete.html new file mode 100644 index 00000000..969a173f --- /dev/null +++ b/askbot/skins/common/templates/authopenid/complete.html @@ -0,0 +1,84 @@ +{% 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 +* email_feeds_form forum.forms.SimpleEmailSubscribeForm +* openid_username_exists +#} +{% block head %}{% endblock %} +{% block title %}{% spaceless %}{% trans %}Registration{% endtrans %}{% endspaceless %}{% endblock %} +{% block content %} +

{% trans %}Registration{% endtrans %}

+
+
+ {% if login_type=='openid' %} + {% trans %}register new {{provider}} account info, see {{gravatar_faq_url}}{% endtrans %} + {% elif login_type=='legacy' %} + {% if external_login_name_is_taken %} + {% trans %}{{username}} already exists, choose another name for + {{provider}}. Email is required too, see {{gravatar_faq_url}} + {% endtrans %} + {% else %} + {% trans %}register new external {{provider}} account info, see {{gravatar_faq_url}}{% endtrans %} + {% endif %} + {% else %} + {% trans %}register new Facebook connect account info, see {{gravatar_faq_url}}{% endtrans %} + {% endif %} +
+

{% trans %}This account already exists, please use another.{% 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 }} +
+

{% trans %}receive updates motivational blurb{% endtrans %}

+
+ {{email_feeds_form.subscribe}} + {% if email_feeds_form.errors %} +

{% trans %}please select one of the options above{% endtrans %}

+ {% endif %} +
+

{% trans %}Tag filter tool will be your right panel, once you log in.{% endtrans %}

+
+
+
+{% endblock %} + diff --git a/askbot/skins/common/templates/authopenid/confirm_email.txt b/askbot/skins/common/templates/authopenid/confirm_email.txt new file mode 100644 index 00000000..1a0f4e63 --- /dev/null +++ b/askbot/skins/common/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, +Forum Administrator{% endtrans %} diff --git a/askbot/skins/common/templates/authopenid/email_validation.txt b/askbot/skins/common/templates/authopenid/email_validation.txt new file mode 100644 index 00000000..9c5baa8a --- /dev/null +++ b/askbot/skins/common/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 beleive that this message was sent in mistake - +no further action is needed. Just ingore this email, we apologize +for any inconvenience{% endtrans %} + +{% trans %}Sincerely, +Forum Administrator{% endtrans %} diff --git a/askbot/skins/common/templates/authopenid/logout.html b/askbot/skins/common/templates/authopenid/logout.html new file mode 100644 index 00000000..a07b78d1 --- /dev/null +++ b/askbot/skins/common/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/common/templates/authopenid/providers_javascript.html b/askbot/skins/common/templates/authopenid/providers_javascript.html new file mode 100644 index 00000000..0fe72eb3 --- /dev/null +++ b/askbot/skins/common/templates/authopenid/providers_javascript.html @@ -0,0 +1,55 @@ + + + +{% 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 new file mode 100644 index 00000000..f10d0cd0 --- /dev/null +++ b/askbot/skins/common/templates/authopenid/signin.html @@ -0,0 +1,241 @@ +{% extends "two_column_body.html" %} +{% import "authopenid/authopenid_macros.html" as login_macros %} + +{% 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, summary=answer.summary %} + Your answer to {{title}} {{summary}} will be posted once you log in + {% endtrans %} +
+ {% endif %} + {% if question %} +
+ {% trans title=question.title, summary=question.summary %}Your question + {{title}} {{summary}} will be posted once you log in + {% endtrans %} +
+ {% endif %} +

+ {% if view_subtype == 'default' and have_buttons %} + {% trans %}Take a pick of your favorite service below to sign in using secure OpenID or similar technology. Your external service password always stays confidential and you don't have to rememeber or create another one.{% endtrans %} + {% elif 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 %} +

+ {% 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() + ) + }} + {% 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 sidebar %} + {% if have_buttons %} +
+

{% trans %}Why use OpenID?{% endtrans %}

+ +

+ {% trans %}Find out more{% endtrans %} »
+ {% trans %}Get OpenID{% endtrans %} » +

+
+ {% 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 new file mode 100644 index 00000000..43571c20 --- /dev/null +++ b/askbot/skins/common/templates/authopenid/signup_with_password.html @@ -0,0 +1,58 @@ +{% 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 %}

+

{% trans %}Traditional signup info{% endtrans %}

+{%endif%} +
{% csrf_token %} + {{form.login_provider}} + +

{% trans %}receive updates motivational blurb{% endtrans %}

+
+ {{email_feeds_form.subscribe}} + {% if email_feeds_form.errors %} +

{% trans %}please select one of the options above{% endtrans %}

+ {% endif %} +
+ {% 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/avatar/add.html b/askbot/skins/common/templates/avatar/add.html new file mode 100644 index 00000000..68a188ef --- /dev/null +++ b/askbot/skins/common/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/common/templates/avatar/change.html b/askbot/skins/common/templates/avatar/change.html new file mode 100644 index 00000000..7921a662 --- /dev/null +++ b/askbot/skins/common/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/common/templates/avatar/confirm_delete.html b/askbot/skins/common/templates/avatar/confirm_delete.html new file mode 100644 index 00000000..ee3d10d7 --- /dev/null +++ b/askbot/skins/common/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/common/templates/one_column_body.html b/askbot/skins/common/templates/one_column_body.html new file mode 100644 index 00000000..852f8fe5 --- /dev/null +++ b/askbot/skins/common/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/common/templates/two_column_body.html b/askbot/skins/common/templates/two_column_body.html new file mode 100644 index 00000000..4c3193be --- /dev/null +++ b/askbot/skins/common/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/answer_edit.html b/askbot/skins/default/templates/answer_edit.html index fbab0bc9..e8cbc7ae 100644 --- a/askbot/skins/default/templates/answer_edit.html +++ b/askbot/skins/default/templates/answer_edit.html @@ -1,5 +1,5 @@ {% extends "two_column_body.html" %} -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %} {% block title %}{% spaceless %}{% trans %}Edit answer{% endtrans %}{% endspaceless %}{% endblock %} {% block forestyle %} diff --git a/askbot/skins/default/templates/ask.html b/askbot/skins/default/templates/ask.html index eaf840bb..9aaa7e8c 100644 --- a/askbot/skins/default/templates/ask.html +++ b/askbot/skins/default/templates/ask.html @@ -1,5 +1,5 @@ {% extends "two_column_body.html" %} -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %} {% block title %}{% spaceless %}{% trans %}Ask a question{% endtrans %}{% endspaceless %}{% endblock %} {% block forestyle %} diff --git a/askbot/skins/default/templates/authopenid/changeemail.html b/askbot/skins/default/templates/authopenid/changeemail.html deleted file mode 100644 index 1316a048..00000000 --- a/askbot/skins/default/templates/authopenid/changeemail.html +++ /dev/null @@ -1,80 +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 %}change {{email}} info{% endtrans %} - {% else %} - {% trans %}here is why email is required, see {{gravatar_faq_url}}{% endtrans %} - {% endif %} -

- {% if msg %} -

{{ msg }}

- {% endif %} -
-
{% csrf_token %} - {% if next %} - - {% endif %} -
- - {% if form.email.errors %} -

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

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

- {% trans %}validate {{email}} info or go to {{change_email_url}}{% endtrans %} -

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

- {% trans %}old {{email}} kept, if you like go to {{change_email_url}}{% endtrans %} -

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

- {% trans %}your current {{email}} can be used for this{% endtrans %} -

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

- {% trans %}thanks for verifying email{% endtrans %} -

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

- {% trans %}email key not sent {{email}} change email here {{change_link}}{% endtrans %} -

-{% endif %} -{% endblock %} - diff --git a/askbot/skins/default/templates/authopenid/complete.html b/askbot/skins/default/templates/authopenid/complete.html deleted file mode 100644 index 969a173f..00000000 --- a/askbot/skins/default/templates/authopenid/complete.html +++ /dev/null @@ -1,84 +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 -* email_feeds_form forum.forms.SimpleEmailSubscribeForm -* openid_username_exists -#} -{% block head %}{% endblock %} -{% block title %}{% spaceless %}{% trans %}Registration{% endtrans %}{% endspaceless %}{% endblock %} -{% block content %} -

{% trans %}Registration{% endtrans %}

-
-
- {% if login_type=='openid' %} - {% trans %}register new {{provider}} account info, see {{gravatar_faq_url}}{% endtrans %} - {% elif login_type=='legacy' %} - {% if external_login_name_is_taken %} - {% trans %}{{username}} already exists, choose another name for - {{provider}}. Email is required too, see {{gravatar_faq_url}} - {% endtrans %} - {% else %} - {% trans %}register new external {{provider}} account info, see {{gravatar_faq_url}}{% endtrans %} - {% endif %} - {% else %} - {% trans %}register new Facebook connect account info, see {{gravatar_faq_url}}{% endtrans %} - {% endif %} -
-

{% trans %}This account already exists, please use another.{% 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 }} -
-

{% trans %}receive updates motivational blurb{% endtrans %}

-
- {{email_feeds_form.subscribe}} - {% if email_feeds_form.errors %} -

{% trans %}please select one of the options above{% endtrans %}

- {% endif %} -
-

{% trans %}Tag filter tool will be your right panel, once you log in.{% endtrans %}

-
-
-
-{% endblock %} - diff --git a/askbot/skins/default/templates/authopenid/confirm_email.txt b/askbot/skins/default/templates/authopenid/confirm_email.txt deleted file mode 100644 index 1a0f4e63..00000000 --- a/askbot/skins/default/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, -Forum Administrator{% endtrans %} diff --git a/askbot/skins/default/templates/authopenid/email_validation.txt b/askbot/skins/default/templates/authopenid/email_validation.txt deleted file mode 100644 index 9c5baa8a..00000000 --- a/askbot/skins/default/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 beleive that this message was sent in mistake - -no further action is needed. Just ingore this email, we apologize -for any inconvenience{% endtrans %} - -{% trans %}Sincerely, -Forum Administrator{% endtrans %} diff --git a/askbot/skins/default/templates/authopenid/logout.html b/askbot/skins/default/templates/authopenid/logout.html deleted file mode 100644 index a07b78d1..00000000 --- a/askbot/skins/default/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/default/templates/authopenid/providers_javascript.html b/askbot/skins/default/templates/authopenid/providers_javascript.html deleted file mode 100644 index 0fe72eb3..00000000 --- a/askbot/skins/default/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/default/templates/authopenid/signin.html b/askbot/skins/default/templates/authopenid/signin.html deleted file mode 100644 index 554fcd3c..00000000 --- a/askbot/skins/default/templates/authopenid/signin.html +++ /dev/null @@ -1,241 +0,0 @@ -{% extends "two_column_body.html" %} -{% import "macros/authopenid_macros.html" as login_macros %} - -{% 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, summary=answer.summary %} - Your answer to {{title}} {{summary}} will be posted once you log in - {% endtrans %} -
- {% endif %} - {% if question %} -
- {% trans title=question.title, summary=question.summary %}Your question - {{title}} {{summary}} will be posted once you log in - {% endtrans %} -
- {% endif %} -

- {% if view_subtype == 'default' and have_buttons %} - {% trans %}Take a pick of your favorite service below to sign in using secure OpenID or similar technology. Your external service password always stays confidential and you don't have to rememeber or create another one.{% endtrans %} - {% elif 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 %} -

- {% 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() - ) - }} - {% 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 sidebar %} - {% if have_buttons %} -
-

{% trans %}Why use OpenID?{% endtrans %}

- -

- {% trans %}Find out more{% endtrans %} »
- {% trans %}Get OpenID{% endtrans %} » -

-
- {% 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 deleted file mode 100644 index 5009cb2c..00000000 --- a/askbot/skins/default/templates/authopenid/signup_with_password.html +++ /dev/null @@ -1,58 +0,0 @@ -{% extends "one_column_body.html" %} -{% import "macros/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 %}

-

{% trans %}Traditional signup info{% endtrans %}

-{%endif%} -
{% csrf_token %} - {{form.login_provider}} - -

{% trans %}receive updates motivational blurb{% endtrans %}

-
- {{email_feeds_form.subscribe}} - {% if email_feeds_form.errors %} -

{% trans %}please select one of the options above{% endtrans %}

- {% endif %} -
- {% 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/avatar/add.html b/askbot/skins/default/templates/avatar/add.html deleted file mode 100644 index 491efd0e..00000000 --- a/askbot/skins/default/templates/avatar/add.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "user_profile/user.html" %} -{% import "macros/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 deleted file mode 100644 index 5af33945..00000000 --- a/askbot/skins/default/templates/avatar/change.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "user_profile/user.html" %} -{% import "macros/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 deleted file mode 100644 index ee3d10d7..00000000 --- a/askbot/skins/default/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/default/templates/badge.html b/askbot/skins/default/templates/badge.html index cf79df9b..ee7f5360 100644 --- a/askbot/skins/default/templates/badge.html +++ b/askbot/skins/default/templates/badge.html @@ -1,5 +1,5 @@ {% extends "two_column_body.html" %} -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %} {% block title %}{% spaceless %}{% trans name=badge.name %}{{name}}{% endtrans %} - {% trans %}Badge{% endtrans %}{% endspaceless %}{% endblock %} {% block content %} diff --git a/askbot/skins/default/templates/blocks/ask_form.html b/askbot/skins/default/templates/blocks/ask_form.html index 802228f3..606aef78 100644 --- a/askbot/skins/default/templates/blocks/ask_form.html +++ b/askbot/skins/default/templates/blocks/ask_form.html @@ -1,4 +1,4 @@ -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %}
{% csrf_token %}
diff --git a/askbot/skins/default/templates/blocks/header.html b/askbot/skins/default/templates/blocks/header.html index 5d00f19d..ad0ae4a2 100644 --- a/askbot/skins/default/templates/blocks/header.html +++ b/askbot/skins/default/templates/blocks/header.html @@ -1,5 +1,5 @@ -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %} -{%- endmacro -%} - -{%- macro edit_post( - post_form, - post_type = None, - mandatory_tags = None, - edit_title = False - ) --%} -{%include "widgets/edit_post.html" %} -{%- endmacro -%} - -{%- macro tag_autocomplete_js(id = '#id_tags') -%} - var tagAc = new AutoCompleter({ - url: '{% url "get_tag_list" %}', - preloadData: true, - minChars: 1, - useCache: true, - matchInside: true, - maxCacheLength: 100, - delay: 10 - }); - tagAc.decorate($("{{ id }}")); -{%- endmacro -%} - -{%- macro answer_classes(answer, question) -%} -answer {% if answer.accepted %}accepted-answer{% endif %} {% if answer.author_id==question.author_id %} answered-by-owner{% endif %} {% if answer.deleted %}deleted{% endif -%} -{%- endmacro -%} - -{%- macro user_score_and_badge_summary(user) -%} - {%include "widgets/user_long_score_and_badge_summary.html"%} -{%- endmacro -%} - -{%- macro follow_toggle(follow, name, alias, id) -%} - {# follow - boolean; name - object type name; alias - e.g. users name; id - object id #} - -{%- endmacro -%} - -{%- macro follow_user_toggle(visitor = None, subject = None) -%} - {% if visitor.is_anonymous() %} - {{ follow_toggle(True, 'user', subject.username, subject.id) }} - {% else %} - {% if visitor != subject %} - {% if visitor.is_following(subject) %} - {{ follow_toggle(False, 'user', subject.username, subject.id) }} - {% else %} - {{ follow_toggle(True, 'user', subject.username, subject.id) }} - {% endif %} - {% endif %} - {% endif %} -{%- endmacro -%} - -{%- macro user_long_score_and_badge_summary(user) -%} - {% include "widgets/user_long_score_and_badge_summary.html" %} -{%- endmacro -%} - -{%- macro user_country_flag(user) -%} - {% if user.country and user.show_country %} - {% trans - country=user.country.name - %}flag of {{country}}{% - endtrans %} - {% endif %} -{%- endmacro -%} - -{%- macro user_country_name_and_flag(user) -%} - {% if user.country and user.show_country %} - {{ user.country.name }} - {{ user_country_flag(user) }} - {% endif %} -{%- endmacro -%} - -{%- macro user_full_location(user) -%} - {% if user.location %} - {{ user.location }}, - {% endif %} - {{ user_country_name_and_flag(user) }} -{%- endmacro -%} - -{%- macro user_list(users, profile_section = None) -%} -{% include "widgets/user_list.html"%} -{%- endmacro -%} - -{#todo: rename this to avatar #} -{%- macro gravatar(user, size) -%} -{% spaceless %} -{% trans username=user.username %}{{username}} gravatar image{% endtrans %} -{% endspaceless %} -{%- endmacro -%} - -{%- macro user_website_link(user, max_display_length=25) -%} - {% if user.website %} - - {{user.website|truncate(length=max_display_length, killwords=True, end='...')}} - - {% endif %} -{%- endmacro -%} - -{%- macro paginator(p, position='left') -%}{# p is paginator context dictionary #} -{% spaceless %} - {% if p.is_paginated %} -
- {% if p.has_previous %} - - « {% trans %}previous{% endtrans %} - {% endif %} - {% if not p.in_leading_range %} - {% for num in p.pages_outside_trailing_range %} - {{ num }} - {% endfor %} - ... - {% endif %} - - {% for num in p.page_numbers %} - {% if num == p.page and p.pages != 1%} - {{ num }} - {% else %} - {{ num }} - {% endif %} - {% endfor %} - - {% if not p.in_trailing_range %} - ... - {% for num in p.pages_outside_leading_range|reverse %} - {{ num }} - {% endfor %} - {% endif %} - {% if p.has_next %} - {% trans %}next page{% endtrans %} » - {% endif %} -
- {% endif %} -{% endspaceless %} -{%- endmacro -%} - -{%- macro pagesize_switch(p, position='left') -%}{# p is paginator context #} -{% spaceless %} -{% if p.is_paginated %} -
- {% trans %}posts per page{% endtrans %} - {% if p.page_size == 10 %} - 10 - {% else %} - 10 - {% endif %} - - {% if p.page_size == 30 %} - 30 - {% else %} - 30 - {% endif %} - - {% if p.page_size == 50 %} - 50 - {% else %} - 50 - {% endif %} -
-{% endif %} -{% endspaceless %} -{%- endmacro -%} - -{%- macro inbox_link(user) -%} - {% if user.new_response_count > 0 or user.seen_response_count > 0 %} - - {% trans username=user.username %}responses for {{username}}{% endtrans %} 0 %} - src="{{ "/images/mail-envelope-full.png"|media }}" - title="{% trans response_count=user.new_response_count %}you have a new response{% pluralize %}you have {{response_count}} new responses{% endtrans %}" - {% elif user.seen_response_count > 0 %} - src="{{ "/images/mail-envelope-empty.png"|media }}" - title="{% trans %}no new responses yet{% endtrans %}" - {% endif %} - /> - - {% endif %} -{%- endmacro -%} - -{%- macro moderation_items_link(user, moderation_items) -%} - {% if moderation_items %} - - {% if moderation_items['new_count'] > 0 %} - 0 %} - alt="{% trans new=moderation_items['new_count'], seen=moderation_items['seen_count']%}{{new}} new flagged posts and {{seen}} previous{% endtrans %}" - title="{% trans new=moderation_items['new_count'], seen=moderation_items['seen_count']%}{{new}} new flagged posts and {{seen}} previous{% endtrans %}" - {% else %} - alt="{% trans new=moderation_items['new_count'] %}{{new}} new flagged posts{% endtrans %}" - title="{% trans new=moderation_items['new_count'] %}{{new}} new flagged posts{% endtrans %}" - {% endif %} - /> - {% elif moderation_items['seen_count'] > 0 %} - {% trans seen=moderation_items['seen_count'] %}{{seen}} flagged posts{% endtrans %} - {% endif %} - - {% endif %} -{%- endmacro -%} diff --git a/askbot/skins/default/templates/main_page/content.html b/askbot/skins/default/templates/main_page/content.html index 521b1e6a..9b00e63b 100644 --- a/askbot/skins/default/templates/main_page/content.html +++ b/askbot/skins/default/templates/main_page/content.html @@ -1,4 +1,4 @@ -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %}
{% cache 0 "questions" questions search_tags scope sort query context.page context.page_size language_code %} {% for question in questions.object_list %} diff --git a/askbot/skins/default/templates/main_page/headline.html b/askbot/skins/default/templates/main_page/headline.html index 49ba93da..baca27b9 100644 --- a/askbot/skins/default/templates/main_page/headline.html +++ b/askbot/skins/default/templates/main_page/headline.html @@ -1,4 +1,4 @@ -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %} {% if questions_count > 0 %}

diff --git a/askbot/skins/default/templates/main_page/paginator.html b/askbot/skins/default/templates/main_page/paginator.html index e556e422..b7fd9501 100644 --- a/askbot/skins/default/templates/main_page/paginator.html +++ b/askbot/skins/default/templates/main_page/paginator.html @@ -1,4 +1,4 @@ -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %} {% if questions_count > 10 %}{# todo: remove magic number #}
{{ macros.paginator(context|setup_paginator, position='left') }} diff --git a/askbot/skins/default/templates/main_page/sidebar.html b/askbot/skins/default/templates/main_page/sidebar.html index b7722b02..c89d62f4 100644 --- a/askbot/skins/default/templates/main_page/sidebar.html +++ b/askbot/skins/default/templates/main_page/sidebar.html @@ -1,4 +1,4 @@ -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %} {{ settings.SIDEBAR_MAIN_HEADER }} diff --git a/askbot/skins/default/templates/main_page/tab_bar.html b/askbot/skins/default/templates/main_page/tab_bar.html index 302b0ed4..49e12204 100644 --- a/askbot/skins/default/templates/main_page/tab_bar.html +++ b/askbot/skins/default/templates/main_page/tab_bar.html @@ -1,4 +1,4 @@ -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %} {% cache 0 "scope_sort_tabs" search_tags request.user scope sort query context.page context.page_size language_code %}
diff --git a/askbot/skins/default/templates/one_column_body.html b/askbot/skins/default/templates/one_column_body.html deleted file mode 100644 index 852f8fe5..00000000 --- a/askbot/skins/default/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/default/templates/question/content.html b/askbot/skins/default/templates/question/content.html index 8fdeb1d8..a2589628 100644 --- a/askbot/skins/default/templates/question/content.html +++ b/askbot/skins/default/templates/question/content.html @@ -1,4 +1,4 @@ -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %} {% include "question/question_card.html" %} {% if question.closed %} {% include "question/closed_question_info.html" %} diff --git a/askbot/skins/default/templates/question/sidebar.html b/askbot/skins/default/templates/question/sidebar.html index 4b9de05d..3923f06c 100644 --- a/askbot/skins/default/templates/question/sidebar.html +++ b/askbot/skins/default/templates/question/sidebar.html @@ -1,4 +1,4 @@ -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %} {{ settings.SIDEBAR_QUESTION_HEADER }}

{% trans %}Question tools{% endtrans %}

diff --git a/askbot/skins/default/templates/question_edit.html b/askbot/skins/default/templates/question_edit.html index 77a20e70..feee2521 100644 --- a/askbot/skins/default/templates/question_edit.html +++ b/askbot/skins/default/templates/question_edit.html @@ -1,5 +1,5 @@ {% extends "two_column_body.html" %} -{% import "macros/macros.html" as macros %} +{% import "macros.html" as macros %} {% block title %}{% spaceless %}{% trans %}Edit question{% endtrans %}{% endspaceless %}{% endblock %} {% block forestyle %} diff --git a/askbot/skins/default/templates/question_retag.html b/askbot/skins/default/templates/question_retag.html index be27f5de..883dc3aa 100644 --- a/askbot/skins/default/templates/question_retag.html +++ b/askbot/skins/default/templates/question_retag.html @@ -44,7 +44,7 @@