From 0073410e3f8d42d70967bc36ce4f8e22244fa79c Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 13 Mar 2012 18:42:46 +0100 Subject: [PATCH] add postman templates --- telemeta/templates/postman/archives.html | 8 +++ telemeta/templates/postman/base.html | 18 ++++++ telemeta/templates/postman/base_folder.html | 62 +++++++++++++++++++ telemeta/templates/postman/base_write.html | 23 +++++++ telemeta/templates/postman/email_user.txt | 20 ++++++ .../templates/postman/email_user_subject.txt | 1 + telemeta/templates/postman/email_visitor.txt | 22 +++++++ .../postman/email_visitor_subject.txt | 1 + telemeta/templates/postman/inbox.html | 7 +++ .../templates/postman/inc_subject_ex.html | 22 +++++++ telemeta/templates/postman/reply.html | 4 ++ telemeta/templates/postman/sent.html | 7 +++ telemeta/templates/postman/trash.html | 11 ++++ telemeta/templates/postman/view.html | 39 ++++++++++++ telemeta/templates/postman/write.html | 3 + telemeta/templates/telemeta/base.html | 12 +++- telemeta/templatetags/telemeta_utils.py | 3 + 17 files changed, 262 insertions(+), 1 deletion(-) create mode 100644 telemeta/templates/postman/archives.html create mode 100644 telemeta/templates/postman/base.html create mode 100644 telemeta/templates/postman/base_folder.html create mode 100644 telemeta/templates/postman/base_write.html create mode 100644 telemeta/templates/postman/email_user.txt create mode 100644 telemeta/templates/postman/email_user_subject.txt create mode 100644 telemeta/templates/postman/email_visitor.txt create mode 100644 telemeta/templates/postman/email_visitor_subject.txt create mode 100644 telemeta/templates/postman/inbox.html create mode 100644 telemeta/templates/postman/inc_subject_ex.html create mode 100644 telemeta/templates/postman/reply.html create mode 100644 telemeta/templates/postman/sent.html create mode 100644 telemeta/templates/postman/trash.html create mode 100644 telemeta/templates/postman/view.html create mode 100644 telemeta/templates/postman/write.html diff --git a/telemeta/templates/postman/archives.html b/telemeta/templates/postman/archives.html new file mode 100644 index 00000000..ab3d94a2 --- /dev/null +++ b/telemeta/templates/postman/archives.html @@ -0,0 +1,8 @@ +{% extends "postman/base_folder.html" %} +{% load i18n %} +{% block pm_folder_title %}{% trans "Archived Messages" %}{% endblock %} +{% block pm_archive_button %}{% endblock %} +{% block pm_undelete_button %}{% endblock %} +{% block pm_footer_info %} +

{% trans "Messages in this folder will never be removed. You can use this folder for long term storage." %}

+{% endblock %} \ No newline at end of file diff --git a/telemeta/templates/postman/base.html b/telemeta/templates/postman/base.html new file mode 100644 index 00000000..b0061a35 --- /dev/null +++ b/telemeta/templates/postman/base.html @@ -0,0 +1,18 @@ +{% extends "telemeta/base.html" %} +{% load i18n %}{% load postman_tags %} + +{% block title %} +item +{% trans "Messages"%} +{% endblock %} + +{% block title_buttons %} +
+{% postman_unread as unread_count %} +{% trans "Inbox" %}{% if unread_count %} ({{ unread_count }}){% endif %} +{% trans "Sent Messages" %} +{% trans "Write" %} +{% trans "Archives" %} +{% trans "Trash" %} +
+{% endblock %} \ No newline at end of file diff --git a/telemeta/templates/postman/base_folder.html b/telemeta/templates/postman/base_folder.html new file mode 100644 index 00000000..7728819d --- /dev/null +++ b/telemeta/templates/postman/base_folder.html @@ -0,0 +1,62 @@ +{% extends "postman/base.html" %} +{% load i18n postman_tags %}{% load pagination_tags %} +{% block content %} +
+

{% block pm_folder_title %}{% endblock %}

+{% autopaginate pm_messages %} +{% if invalid_page %} +

{% trans "Sorry, this page number is invalid." %}

+{% else %} +{% if pm_messages %} +

+{% block pm_by_modes %}{% endblock pm_by_modes %} +
+ +
{% csrf_token %} + + + + + +{% block pm_sender_header %} {% endblock %} +{% block pm_recipient_header %} {% endblock %} + + + + + {% for message in pm_messages %} + + +{% block pm_sender_cell %} {% endblock %} +{% block pm_recipient_cell %} {% endblock %} + + + {% endfor %} + +
{% trans "Action" %}{% trans "Sender" %}{% trans "Recipient" %}{% trans "Subject" %}{% block pm_date %}{% trans "Date" %}{% endblock %}
{{ message.obfuscated_sender|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{{ message.obfuscated_recipient|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{% if message.is_new %}{% endif %}{% if message.is_replied %}{% endif %} +{% block pm_subject %} + + {% include "postman/inc_subject_ex.html" %} + +{% endblock %} + {% if message.is_replied %}{% endif %}{% if message.is_new %}{% endif %}{{ message.sent_at|compact_date:_("g:i A,M j,n/j/y") }}
+ +
+{% block pm_form_buttons %} +{% block pm_delete_button %}{% endblock %} +{% block pm_archive_button %}{% endblock %} +{% block pm_undelete_button %}{% endblock %} +{% endblock %} + +
+{% paginate %} +{% else %} +

{% trans "No messages." %}

+{% endif %} +{% endif %} +{% block pm_footer_info %}{% endblock %} +
+{% endblock content %} \ No newline at end of file diff --git a/telemeta/templates/postman/base_write.html b/telemeta/templates/postman/base_write.html new file mode 100644 index 00000000..d454e9e1 --- /dev/null +++ b/telemeta/templates/postman/base_write.html @@ -0,0 +1,23 @@ +{% extends "postman/base.html" %} +{% load i18n %} +{% block extrahead %}{{ block.super }} +{% if is_autocompleted %} +{# using the available admin jQuery is enough #} + +{# #} + + +{% endif %} +{% endblock %} +{% block content %} +
+

{% block pm_write_title %}{% endblock %}

+
{% csrf_token %} + +{% block pm_write_recipient %}{% endblock %} +{{ form.as_table }} +
+ +
+
+{% endblock %} \ No newline at end of file diff --git a/telemeta/templates/postman/email_user.txt b/telemeta/templates/postman/email_user.txt new file mode 100644 index 00000000..c62111bb --- /dev/null +++ b/telemeta/templates/postman/email_user.txt @@ -0,0 +1,20 @@ +{% load i18n %}{% autoescape off %}{% trans "Dear user," %} +{% if action == 'rejection' %} +{% blocktrans with object.sent_at|date:"DATETIME_FORMAT" as date and object.obfuscated_recipient as recipient %}On {{ date }}, you asked to send a message to the user '{{ recipient }}'.{% endblocktrans %} + +{% trans "Your message has been rejected by the moderator" %}{% if object.moderation_reason %}{% trans ", for the following reason:" %} + {{ object.moderation_reason }}{% else %}.{% endif %} + +{% else %}{# 'acceptance' #} +{% if object.parent_id %}{% if object.parent.sender_id == object.recipient_id %}{% blocktrans with object.parent.sent_at|date:"DATETIME_FORMAT" as date and object.obfuscated_sender as sender %}On {{ date }}, you sent a message to the user '{{ sender }}'.{% endblocktrans %} +{% trans "Your correspondent has given you an answer." %} +{% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a copy of a response from the user '{{ sender }}'.{% endblocktrans %} +{% endif %} +{% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a message from the user '{{ sender }}'.{% endblocktrans %} +{% endif %} +{% endif %}{# 'acceptance' #} +{% trans "Thank you again for your interest in our services." %} +{% trans "The site administrator" %} + +{% blocktrans %}Note: This message is issued by an automated system. +Do not reply, this would not be taken into account.{% endblocktrans %}{% endautoescape %} \ No newline at end of file diff --git a/telemeta/templates/postman/email_user_subject.txt b/telemeta/templates/postman/email_user_subject.txt new file mode 100644 index 00000000..cace60c0 --- /dev/null +++ b/telemeta/templates/postman/email_user_subject.txt @@ -0,0 +1 @@ +{% load i18n %}{% autoescape off %}{% blocktrans with object.subject as subject and site.name as sitename %}Message "{{ subject }}" on the site {{ sitename }}{% endblocktrans %}{% endautoescape %} \ No newline at end of file diff --git a/telemeta/templates/postman/email_visitor.txt b/telemeta/templates/postman/email_visitor.txt new file mode 100644 index 00000000..23e18a91 --- /dev/null +++ b/telemeta/templates/postman/email_visitor.txt @@ -0,0 +1,22 @@ +{% load i18n %}{% autoescape off %}{% trans "Dear visitor," %} +{% if action == 'rejection' %} +{% blocktrans with object.sent_at|date:"DATETIME_FORMAT" as date and object.recipient as recipient %}On {{ date }}, you asked to send a message to the user '{{ recipient }}'.{% endblocktrans %} + +{% trans "Your message has been rejected by the moderator" %}{% if object.moderation_reason %}{% trans ", for the following reason:" %} + {{ object.moderation_reason }}{% else %}.{% endif %} + +{% trans "As a reminder, please find below the content of your message." %} +{% else %}{# 'acceptance' #} +{% blocktrans with object.parent.sent_at|date:"DATETIME_FORMAT" as date and object.sender as sender %}On {{ date }}, you sent a message to the user '{{ sender }}'.{% endblocktrans %} +{% trans "Please find below the answer from your correspondent." %} +{% endif %} + +{% trans "Thank you again for your interest in our services." %} +{% trans "For more comfort, we encourage you to open an account on the site." %} +{% trans "The site administrator" %} + +{% blocktrans %}Note: This message is issued by an automated system. +Do not reply, this would not be taken into account.{% endblocktrans %} +------------------------------------------------------- +{{ object.body }} +-------------------------------------------------------{% endautoescape %} \ No newline at end of file diff --git a/telemeta/templates/postman/email_visitor_subject.txt b/telemeta/templates/postman/email_visitor_subject.txt new file mode 100644 index 00000000..cace60c0 --- /dev/null +++ b/telemeta/templates/postman/email_visitor_subject.txt @@ -0,0 +1 @@ +{% load i18n %}{% autoescape off %}{% blocktrans with object.subject as subject and site.name as sitename %}Message "{{ subject }}" on the site {{ sitename }}{% endblocktrans %}{% endautoescape %} \ No newline at end of file diff --git a/telemeta/templates/postman/inbox.html b/telemeta/templates/postman/inbox.html new file mode 100644 index 00000000..6da9d25a --- /dev/null +++ b/telemeta/templates/postman/inbox.html @@ -0,0 +1,7 @@ +{% extends "postman/base_folder.html" %} +{% load i18n %} +{% block pm_folder_title %}{% trans "Received Messages" %}{% endblock %} +{% block pm_undelete_button %}{% endblock %} +{% block pm_recipient_header %}{% endblock %} +{% block pm_date %}{% trans "Received" %}{% endblock %} +{% block pm_recipient_cell %}{% endblock %} diff --git a/telemeta/templates/postman/inc_subject_ex.html b/telemeta/templates/postman/inc_subject_ex.html new file mode 100644 index 00000000..9ef1c3c2 --- /dev/null +++ b/telemeta/templates/postman/inc_subject_ex.html @@ -0,0 +1,22 @@ +{% comment %} +This file is intended to be included, such as in postman/base_folder.html: + {% include "postman/inc_subject_ex.html" %} + +It provides an extended subject, as a replacement to a simple {{ message.subject }} tag. +Enhancements are: +* limit the subject length to a few words +* if there is still room up to a maximum number of words, then add the very first words of the body, + in a grey style. + +Examples: +With a total of at most 12 words, and 5 words of subject. +With body: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod." + +With subject: "a subject of great interest for you": +"a subject of great interest ... - Lorem ipsum dolor sit amet, consectetur ..." + +With subject: "a great interest": +"a great interest - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed ..." + +{% endcomment %}{% load postman_tags %}{% with message.subject|truncatewords:5 as truncated_subject %}{{ truncated_subject }} +{% with truncated_subject|wordcount as subject_wc %}{% with 12|sub:subject_wc as wc %}{% if message.body and wc > 0 %} - {{ message.body|truncatewords:wc }}{% endif %}{% endwith %}{% endwith %}{% endwith %} \ No newline at end of file diff --git a/telemeta/templates/postman/reply.html b/telemeta/templates/postman/reply.html new file mode 100644 index 00000000..1c270768 --- /dev/null +++ b/telemeta/templates/postman/reply.html @@ -0,0 +1,4 @@ +{% extends "postman/base_write.html" %} +{% load i18n %} +{% block pm_write_title %}{% trans "Reply"%}{% endblock %} +{% block pm_write_recipient %}{{ recipient }}{% endblock %} \ No newline at end of file diff --git a/telemeta/templates/postman/sent.html b/telemeta/templates/postman/sent.html new file mode 100644 index 00000000..0480f6a0 --- /dev/null +++ b/telemeta/templates/postman/sent.html @@ -0,0 +1,7 @@ +{% extends "postman/base_folder.html" %} +{% load i18n %} +{% block pm_folder_title %}{% trans "Sent Messages" %}{% endblock %} +{% block pm_undelete_button %}{% endblock %} +{% block pm_sender_header %}{% endblock %} +{% block pm_date %}{% trans "Sent" %}{% endblock %} +{% block pm_sender_cell %}{% endblock %} diff --git a/telemeta/templates/postman/trash.html b/telemeta/templates/postman/trash.html new file mode 100644 index 00000000..8982ea32 --- /dev/null +++ b/telemeta/templates/postman/trash.html @@ -0,0 +1,11 @@ +{% extends "postman/base_folder.html" %} +{% load i18n %} +{% block pm_folder_title %}{% trans "Deleted Messages" %}{% endblock %} +{% block pm_delete_button %}{% endblock %} +{% block pm_archive_button %}{% endblock %} +{% block pm_subject %}{# no link #} + {% include "postman/inc_subject_ex.html" %} +{% endblock %} +{% block pm_footer_info %} +

{% trans "Messages in this folder can be removed from time to time. For long term storage, use instead the archive folder." %}

+{% endblock %} \ No newline at end of file diff --git a/telemeta/templates/postman/view.html b/telemeta/templates/postman/view.html new file mode 100644 index 00000000..23c7264c --- /dev/null +++ b/telemeta/templates/postman/view.html @@ -0,0 +1,39 @@ +{% extends "postman/base.html" %} +{% load i18n %}{% load postman_tags %} +{% block content %} +
+

{% if pm_messages|length > 1 %}{% trans "Conversation" %}{% else %}{% trans "Message" %}{% endif %}

+

+{% for message in pm_messages %} +
+
+ {{ message.obfuscated_sender|or_me:user }} » + {{ message.obfuscated_recipient|or_me:user }} | + {{ message.sent_at|date:"DATETIME_FORMAT"}} | + {{ message.subject }} +{% if message.is_rejected %}
{% trans "Rejected" %}{% if message.moderation_reason %}{% trans ":" %} {{ message.moderation_reason }}{% endif %}
{% endif %} +
+
+
{{ message.body|linebreaksbr }}
+
+
+{% if forloop.last %} +
{% csrf_token %} + +{% trans "Back" %} + + +{% if not archived %}{% endif %} + +{% if reply_to_pk %}{% trans "Reply" %}{% endif %} +
+{% if reply_to_pk %}
+

{% trans 'Reply' %}

+
{% csrf_token %} +
{{ form.body }}
+ +
{% endif %} +{% endif %} +{% endfor %} +
+{% endblock %} \ No newline at end of file diff --git a/telemeta/templates/postman/write.html b/telemeta/templates/postman/write.html new file mode 100644 index 00000000..1d52b03c --- /dev/null +++ b/telemeta/templates/postman/write.html @@ -0,0 +1,3 @@ +{% extends "postman/base_write.html" %} +{% load i18n %} +{% block pm_write_title %}{% trans "Write"%}{% endblock %} \ No newline at end of file diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html index de4719d8..02d703a4 100644 --- a/telemeta/templates/telemeta/base.html +++ b/telemeta/templates/telemeta/base.html @@ -84,6 +84,11 @@
  • {% trans "Desk" %} @@ -128,11 +133,16 @@

    {% block title %}{% endblock %}

    {% block title_buttons %}{% endblock %} -{% block content %}{% endblock %} + {% block content %} + {% endblock %}
    + {% block delete %}{% endblock %} +{% block body %} +{% endblock body %} + {% block footer %}