From 7e4f1d542e00b4d3121da6ae5524e95867f2371b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 13 Nov 2009 20:18:55 -0500 Subject: better comments, email subscriptions, corrected view counter, some ie7 issues, wiki optional with settings.WIKI_ON, site can be mounted on arbitrary url prefix, english language improvements, added feedback form, versioned css and js files to force browser cache reload when settings.RESOURCE_REVISION is incremented , other fixes --- templates/404.html | 2 +- templates/about.html | 25 + templates/answer_edit.html | 13 +- templates/answer_edit_tips.html | 8 +- templates/ask.html | 19 +- templates/authopenid/changeemail.html | 45 +- templates/authopenid/changeopenid.html | 2 +- templates/authopenid/changepw.html | 33 +- templates/authopenid/complete.html | 82 ++- templates/authopenid/confirm_email.txt | 2 +- templates/authopenid/delete.html | 3 +- .../authopenid/external_legacy_login_info.html | 16 + templates/authopenid/sendpw.html | 30 +- templates/authopenid/sendpw_email.txt | 11 +- templates/authopenid/settings.html | 2 +- templates/authopenid/signin.html | 70 +-- templates/authopenid/signup.html | 59 +- templates/badges.html | 6 +- templates/base.html | 17 +- templates/base_content.html | 17 +- templates/book.html | 6 +- templates/content/images/blue-up-arrow-h18px.png | Bin 0 -> 593 bytes templates/content/images/cnprog_logo_200_56.gif | Bin 2114 -> 0 bytes templates/content/images/gray-up-arrow-h18px.png | Bin 0 -> 383 bytes templates/content/images/logo.gif | Bin 0 -> 2114 bytes templates/content/images/logo.png | Bin 3631 -> 1902 bytes templates/content/jquery-openid/jquery.openid.js | 8 +- templates/content/jquery-openid/openid.css | 36 +- templates/content/js/com.cnprog.admin.js | 13 + templates/content/js/com.cnprog.i18n.js | 31 +- templates/content/js/com.cnprog.post.js | 314 ++++++---- templates/content/js/com.cnprog.utils.js | 7 +- templates/content/js/jquery.form.js | 654 +++++++++++++++++++++ templates/content/js/wmd/wmd.js | 2 +- templates/content/style/default.css | 27 +- templates/content/style/jquery.autocomplete.css | 2 +- templates/content/style/style.css | 469 ++++++++++++--- templates/edit_user_email_feeds_form.html | 4 + templates/faq.html | 6 +- templates/feedback.html | 55 ++ templates/feedback_email.txt | 19 + templates/footer.html | 52 +- templates/header.html | 28 +- templates/index.html | 60 +- templates/logout.html | 1 - templates/post_contributor_info.html | 55 ++ templates/question.html | 587 +++++++++--------- templates/question_edit.html | 15 +- templates/question_edit_tips.html | 9 +- templates/question_retag.html | 13 +- templates/question_summary_list_roll.html | 55 ++ templates/questions.html | 45 +- templates/revisions_answer.html | 41 +- templates/revisions_question.html | 41 +- templates/tags.html | 2 +- templates/unanswered.html | 66 ++- templates/upfiles/1245715031297631.png | Bin 3863 -> 0 bytes templates/upfiles/12457157052552259.png | Bin 3863 -> 0 bytes templates/user.html | 30 +- templates/user_edit.html | 4 +- templates/user_email_subscriptions.html | 23 + templates/user_favorites.html | 1 - templates/user_info.html | 42 +- templates/user_preferences.html | 24 - templates/user_recent.html | 1 - templates/user_reputation.html | 4 +- templates/user_stats.html | 70 ++- templates/user_tabs.html | 6 +- templates/user_votes.html | 4 +- templates/users.html | 8 +- templates/users_questions.html | 34 +- 71 files changed, 2407 insertions(+), 1029 deletions(-) create mode 100644 templates/authopenid/external_legacy_login_info.html create mode 100644 templates/content/images/blue-up-arrow-h18px.png delete mode 100644 templates/content/images/cnprog_logo_200_56.gif create mode 100644 templates/content/images/gray-up-arrow-h18px.png create mode 100644 templates/content/images/logo.gif create mode 100644 templates/content/js/com.cnprog.admin.js create mode 100644 templates/content/js/jquery.form.js create mode 100644 templates/edit_user_email_feeds_form.html create mode 100644 templates/feedback.html create mode 100644 templates/feedback_email.txt create mode 100644 templates/post_contributor_info.html create mode 100644 templates/question_summary_list_roll.html delete mode 100755 templates/upfiles/1245715031297631.png delete mode 100755 templates/upfiles/12457157052552259.png create mode 100644 templates/user_email_subscriptions.html delete mode 100644 templates/user_preferences.html (limited to 'templates') diff --git a/templates/404.html b/templates/404.html index 2fa38f99..227de3ae 100644 --- a/templates/404.html +++ b/templates/404.html @@ -33,7 +33,7 @@ diff --git a/templates/about.html b/templates/about.html index eaf0d591..6d5f3060 100644 --- a/templates/about.html +++ b/templates/about.html @@ -12,10 +12,35 @@
+ +

{% blocktrans %}CNPROG Q&A is a collaboratively edited question + and answer site created for the CNPROG community. + {% endblocktrans %} +

+

{% blocktrans %}Here you can ask and answer questions, comment + and vote for the questions of others and their answers. Both questions and answers + can be revised and improved. Questions can be tagged with + the relevant keywords to simplify future access and organize the accumulated material.{% endblocktrans %} +

+ +

{% blocktrans %}This Q&A site is moderated by its members, hopefully - including yourself! + Moderation rights are gradually assigned to the site users based on the accumulated "reputation" + points. These points are added to the users account when others vote for his/her questions or answers. + These points (very) roughly reflect the level of trust of the community.{% endblocktrans %} +

+

{% blocktrans %}No points are necessary to ask or answer the questions - so please - + join us!{% endblocktrans %} +

+

+ {% blocktrans %} + If you would like to find out more about this site - please see frequently asked questions. + {% endblocktrans %} +

{% endblock %} diff --git a/templates/answer_edit.html b/templates/answer_edit.html index 8baa7c1e..cd247a3c 100644 --- a/templates/answer_edit.html +++ b/templates/answer_edit.html @@ -1,14 +1,15 @@ {% extends "base.html" %} {% load i18n %} +{% load extra_tags %} {% block title %}{% spaceless %}{% trans "Edit answer" %}{% endspaceless %}{% endblock %} {% block forejs %} - - - - - - + + + + + + - - - - - + + + + + + + - - + +
  • - icon + icon http://{your-openid-url}
  • - icon + icon http://username.myopenid.com/
  • - icon + icon http://flickr.com/username/
  • - icon + icon http://technorati.com/people/technorati/username/
  • - icon + icon http://username.wordpress.com
  • - icon + icon http://username.blogspot.com/
  • - icon + icon http://username.livejournal.com
  • - icon + icon http://claimid.com/username
  • - icon + icon http://username.myvidoop.com/
  • - icon + icon http://username.pip.verisignlabs.com/
    • @@ -125,27 +127,17 @@

    {% trans 'Enter your login name and password' %}

    - {% if form1.errors %} -

    - {% trans "Sorry, looks like we have some errors:" %}
    -

    -

    - {% endif %} -
    - {{form1.username}}
    - - {{form1.password}}
    + {% if form1.errors %} + {{form1.non_field_errors.as_ul}} + {% endif %} +
    +

    {% trans "Create account" %}
    - {% trans "I forgot my password" %} + {% trans "Forgot your password?" %}

    @@ -170,9 +162,9 @@ -

    - {% trans "Find out more" %} »
    - {% trans "Get OpenID" %} » +

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

    {% endblock%} diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html index 5e405d3f..45dfb51b 100644 --- a/templates/authopenid/signup.html +++ b/templates/authopenid/signup.html @@ -1,53 +1,22 @@ -{% extends "base.html" %} +{% extends "base_content.html" %} {% load i18n %} {% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %} {% block content %} -
    -

    {% trans "Signup" %}

    - -
    -
    -

    {% trans "We support two types of user registration: conventional username/password, and" %} {% trans "the OpenID method" %}.

    - - {% if form.errors %} - -

    - {% trans "Sorry, looks like we have some errors" %}
    -

    -

    - {% endif %} +
    + {% trans "Create login name and password" %}
    -
    -
    - {% trans "Conventional registration" %} -

    {{ form.username }}
    - -

    {{ form.email }}
    -

    {{ form.password1 }}
    -

    {{ form.password2 }}
    -
    - {% trans "back to login" %}
    -
    -
    -
    - -
    -
    {{ form2.openid_url }}
    -
    -
    -
    +

    {% trans "Traditional signup info" %}

    +
    +
      + {{form.as_ul}} +
    +

    {% trans "receive updates motivational blurb" %}

    + {% include "edit_user_email_feeds_form.html" %} +
    + {% trans "or" %} + {% trans "return to OpenID login" %}
    +
    {% endblock %} diff --git a/templates/badges.html b/templates/badges.html index 4a1ba091..1902a3b0 100644 --- a/templates/badges.html +++ b/templates/badges.html @@ -19,7 +19,9 @@

    {% trans "Community gives you awards for your questions, answers and votes." %}
    - {% trans "Below is the list of available badges and number of times each type of badge has been awarded." %} + {% blocktrans %}Below is the list of available badges and number + of times each type of badge has been awarded. Give us feedback at {{feedback_faq_url}}. + {% endblocktrans %}

    {% for badge in badges %} @@ -32,7 +34,7 @@ {% endfor %}
    - ● {{ badge.name }} ✕ {{ badge.awarded_count|intcomma }} + ● {{ badge.name }} × {{ badge.awarded_count|intcomma }}

    {{ badge.description }} diff --git a/templates/base.html b/templates/base.html index 0f568f73..2b933c4a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,7 @@ {% load extra_filters %} +{% load extra_tags %} {% load i18n %} @@ -12,16 +13,16 @@ {% if settings.GOOGLE_SITEMAP_CODE %} {% endif %} - - + + - - - + + + - {% if messages %} + {% if user_messages %} @@ -57,8 +58,8 @@