Skip to content

Commit

Permalink
modified: persistent_messages/api.py
Browse files Browse the repository at this point in the history
	modified:   persistent_messages/templates/persistent_messages/message/includes/messages.html
  • Loading branch information
samluescher committed Oct 1, 2010
1 parent 78bdcb3 commit a5eb788
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
19 changes: 19 additions & 0 deletions persistent_messages/api.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,27 @@
from persistent_messages import notify
from persistent_messages import constants

def add_message(request, level, message, extra_tags='', fail_silently=False, subject='', user=None, email=False, from_user=None, expires=None, close_timeout=None):
"""
"""
if email:
notify.email(level, message, extra_tags, subject, user, from_user)
return request._messages.add(level, message, extra_tags, subject, user, from_user, expires, close_timeout)

def info(request, message, extra_tags='', fail_silently=False, subject='', user=None, email=False, from_user=None, expires=None, close_timeout=None):
"""
"""
level = constants.INFO
return add_message(request, level, message, extra_tags, fail_silently, subject, user, email, from_user, expires, close_timeout)

def warning(request, message, extra_tags='', fail_silently=False, subject='', user=None, email=False, from_user=None, expires=None, close_timeout=None):
"""
"""
level = constants.WARNING
return add_message(request, level, message, extra_tags, fail_silently, subject, user, email, from_user, expires, close_timeout)

def debug(request, message, extra_tags='', fail_silently=False, subject='', user=None, email=False, from_user=None, expires=None, close_timeout=None):
"""
"""
level = constants.DEBUG
return add_message(request, level, message, extra_tags, fail_silently, subject, user, email, from_user, expires, close_timeout)
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,16 @@
{% for message in messages %}
<li id="message-{{ message.pk }}" {% if message.tags %} class="{{ message.tags }}"{% endif %}>
{% if message.subject %}<strong>{{ message.subject }}</strong><br />{% endif %}
{{ message.message|truncatewords:20 }}{% if message.message != message.message|truncatewords:20 %} <a class="message-more" href="{% url message_detail message.pk %}">more</a>{% endif %}<br />
{% if message.is_persistent or jquery %}<a class="message-close" href="{% if message.is_persistent %}{% url message_mark_read message.pk %}{% else %}#{% endif %}"><span>Close</span></a>{% endif %}
{% if message.is_persistent or jquery %}
{% with 32 as max_words %}
{{ message.message|truncatewords:max_words }}{% if message.message != message.message|truncatewords:max_words %} <a class="message-more" href="{% if message.is_persistent %}{% url message_detail message.pk %}{% else %}#{% endif %}">more</a>{% endif %}<br />
{% endwith %}
{% else %}
{{ message }}
{% endif %}
{% if message.is_persistent or jquery %}
<a class="message-close" href="{% if message.is_persistent %}{% url message_mark_read message.pk %}{% else %}#{% endif %}"><span>Close</span></a>
{% endif %}
</li>
{% endfor %}
</ul>
Expand Down

0 comments on commit a5eb788

Please sign in to comment.