diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-01-26 19:35:23 -0300 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-01-26 19:35:23 -0300 |
commit | b9f2b91d1de36bf7ee3623cbf4a39610ffe36ab5 (patch) | |
tree | 5e33ccdecbb30a5917928e955dd68e827f7a8f4d /askbot | |
parent | 5768de932d9e8fdc7f9b999b91a82a7fbf0396c8 (diff) | |
download | askbot-b9f2b91d1de36bf7ee3623cbf4a39610ffe36ab5.tar.gz askbot-b9f2b91d1de36bf7ee3623cbf4a39610ffe36ab5.tar.bz2 askbot-b9f2b91d1de36bf7ee3623cbf4a39610ffe36ab5.zip |
added help page with the intention to eventually replace faq
Diffstat (limited to 'askbot')
-rw-r--r-- | askbot/doc/source/changelog.rst | 1 | ||||
-rw-r--r-- | askbot/skins/default/templates/base.html | 2 | ||||
-rw-r--r-- | askbot/skins/default/templates/help.html | 33 | ||||
-rw-r--r-- | askbot/skins/default/templates/widgets/footer.html | 2 | ||||
-rw-r--r-- | askbot/skins/default/templates/widgets/user_navigation.html | 2 | ||||
-rw-r--r-- | askbot/urls.py | 1 | ||||
-rw-r--r-- | askbot/views/meta.py | 7 |
7 files changed, 46 insertions, 2 deletions
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst index c6d29ea8..e2056b61 100644 --- a/askbot/doc/source/changelog.rst +++ b/askbot/doc/source/changelog.rst @@ -9,6 +9,7 @@ Development version (not released yet) * Askbot now respects django's staticfiles app (Radim Řehůřek, Evgeny) * Fixed the url translation bug (Evgeny) * Added left sidebar option (Evgeny) +* Added "help" page and links to in the header and the footer (Evgeny) 0.7.39 (Jan 11, 2012) --------------------- diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html index 348ab23a..bd19f707 100644 --- a/askbot/skins/default/templates/base.html +++ b/askbot/skins/default/templates/base.html @@ -27,7 +27,7 @@ {% include "widgets/secondary_header.html" %} {# Scope selector, search input and ask button #} {% if settings.ENABLE_LEADING_SIDEBAR %} <div id="leading-sidebar"> - {{ settings.LEADING_SIDEBAR|safe }} + {{ settings.LEADING_SIDEBAR }} </div> {% endif %} <div class="content-wrapper"> diff --git a/askbot/skins/default/templates/help.html b/askbot/skins/default/templates/help.html new file mode 100644 index 00000000..7dc58f5d --- /dev/null +++ b/askbot/skins/default/templates/help.html @@ -0,0 +1,33 @@ +{% extends "two_column_body.html" %} +{% block title %}{% trans %}Help{% endtrans %}{% endblock %} +{% block content %} +<h1 class='section-title'>{% trans %}Help{% endtrans %}</h1> +<p> + {% if request.user.is_authenticated() %} + {% trans username = request.user.username %}Welcome {{username}},{% endtrans %} + {% else %} + {% trans %}Welcome,{% endtrans %} + {% endif %} +</p> +<p> + {% trans %}Thank you for using {{app_name}}, here is how it works.{% endtrans %} +</p> +<p> + {% trans %}This site is for asking and answering questions, not for open-ended discussions.{% endtrans %} + {% trans %}We encourage everyone to use “question” space for asking and “answer” for answering.{% endtrans %} +</p> +<p> + {% trans %}Despite that, each question and answer can be commented – + the comments are good for the limited discussions.{% endtrans %} +</p> +<p> + {% trans %}Voting in {{app_name}} helps to select best answers and thank most helpful users.{% endtrans %} +</p> + {% trans %}Please vote when you find helpful information, + it really helps the {{app_name}} community.{% endtrans %} + + {% trans %}Besides, you can @mention users anywhere in the text to point their attention, + follow users and conversations and report inappropriate content by flagging it.{% endtrans %} +</p> +<p>{% trans %}Enjoy.{% endtrans %}</p> +{% endblock %} diff --git a/askbot/skins/default/templates/widgets/footer.html b/askbot/skins/default/templates/widgets/footer.html index 14f18786..6eb3afc2 100644 --- a/askbot/skins/default/templates/widgets/footer.html +++ b/askbot/skins/default/templates/widgets/footer.html @@ -37,6 +37,8 @@ <div class="footer-links" > <a href="{% url about %}">{% trans %}about{% endtrans %}</a><span class="link-separator"> |</span> <a href="{% url faq %}">{% trans %}faq{% endtrans %}</a><span class="link-separator"> |</span> + <a href="{% url help %}" title="{% trans %}help{% endtrans %}">{% trans %}help{% endtrans %}</a> + <span class="link-separator"> |</span> <a href="{% url privacy %}">{% trans %}privacy policy{% endtrans %}</a><span class="link-separator"> |</span> {% spaceless %} <a href= diff --git a/askbot/skins/default/templates/widgets/user_navigation.html b/askbot/skins/default/templates/widgets/user_navigation.html index 761bc88e..8d6dc330 100644 --- a/askbot/skins/default/templates/widgets/user_navigation.html +++ b/askbot/skins/default/templates/widgets/user_navigation.html @@ -11,7 +11,7 @@ {% elif settings.USE_ASKBOT_LOGIN_SYSTEM %} <a href="{{ settings.LOGIN_URL }}?next={{request.path|clean_login_url}}">{% trans %}login{% endtrans %}</a> {% endif %} - {% if request.user.is_authenticated() and request.user.is_administrator() %} <a href="{% url site_settings %}">{% trans %}settings{% endtrans %}</a> {% endif %} + <a href="{% url "help" %}" title="{% trans %}help{% endtrans %}">{% trans %}help{% endtrans %}</a> diff --git a/askbot/urls.py b/askbot/urls.py index 3d17ed1b..640cb51e 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -41,6 +41,7 @@ urlpatterns = patterns('', url(r'^%s$' % _('about/'), views.meta.about, name='about'), url(r'^%s$' % _('faq/'), views.meta.faq, name='faq'), url(r'^%s$' % _('privacy/'), views.meta.privacy, name='privacy'), + url(r'^%s$' % _('help/'), views.meta.help, name='help'), url( r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('edit/')), views.writers.edit_answer, diff --git a/askbot/views/meta.py b/askbot/views/meta.py index 884ec5e4..ac06b7e0 100644 --- a/askbot/views/meta.py +++ b/askbot/views/meta.py @@ -47,6 +47,13 @@ def page_not_found(request, template='404.html'): def server_error(request, template='500.html'): return generic_view(request, template) +def help(request): + data = { + 'app_name': askbot_settings.APP_SHORT_NAME, + 'page_class': 'meta' + } + return render_into_skin('help.html', data, request) + def faq(request): if askbot_settings.FORUM_FAQ.strip() != '': return render_into_skin( |