diff options
Diffstat (limited to 'hyperkitty/templates')
| -rw-r--r-- | hyperkitty/templates/base.html | 6 | ||||
| -rw-r--r-- | hyperkitty/templates/message.html | 2 | ||||
| -rw-r--r-- | hyperkitty/templates/messages/like_form.html | 2 | ||||
| -rw-r--r-- | hyperkitty/templates/messages/message.html | 8 | ||||
| -rw-r--r-- | hyperkitty/templates/month_view.html | 135 | ||||
| -rw-r--r-- | hyperkitty/templates/paginator.html | 24 | ||||
| -rw-r--r-- | hyperkitty/templates/recent_activities.html | 2 | ||||
| -rw-r--r-- | hyperkitty/templates/search.html | 102 | ||||
| -rw-r--r-- | hyperkitty/templates/thread.html | 6 | ||||
| -rw-r--r-- | hyperkitty/templates/thread_list.html | 55 | ||||
| -rw-r--r-- | hyperkitty/templates/threads/month_list.html | 6 | ||||
| -rw-r--r-- | hyperkitty/templates/threads/right_col.html | 4 | ||||
| -rw-r--r-- | hyperkitty/templates/threads/summary_thread.html | 6 | ||||
| -rw-r--r-- | hyperkitty/templates/threads/summary_thread_large.html | 67 | ||||
| -rw-r--r-- | hyperkitty/templates/threads/tags.html | 2 |
15 files changed, 149 insertions, 278 deletions
diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index f8eb95e..d645dbe 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -36,13 +36,13 @@ <ul class="nav"> - <li {% if not list_address %} class="active"{% endif %}> + <li {% if not mlist %} class="active"{% endif %}> <a href="{% url root %}">All lists</a> </li> - {% if list_address %} + {% if mlist %} <li id="list_name" class="active"> - <a href="{% url list_overview mlist_fqdn=list_address %}">{{list_address}}</a> + <a href="{% url list_overview mlist_fqdn=mlist.name %}">{{mlist.name}}</a> </li> {% endif %} diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html index 10e71ec..3a19268 100644 --- a/hyperkitty/templates/message.html +++ b/hyperkitty/templates/message.html @@ -18,7 +18,7 @@ <div class="message-header"> <a class="thread-back" - href="{% url thread threadid=message.thread_id, mlist_fqdn=list_address %}#{{message.message_id_hash}}"> + href="{% url thread threadid=message.thread_id, mlist_fqdn=mlist.name %}#{{message.message_id_hash}}"> </a> {# the background image will be a "back to thread" button #} <h1>{{ message.subject }}</h1> </div> diff --git a/hyperkitty/templates/messages/like_form.html b/hyperkitty/templates/messages/like_form.html index 39f5c6d..7896fed 100644 --- a/hyperkitty/templates/messages/like_form.html +++ b/hyperkitty/templates/messages/like_form.html @@ -1,5 +1,5 @@ <form method="post" class="likeform" - action="{% url message_vote mlist_fqdn=list_address, message_id_hash=message_id_hash %}"> + action="{% url message_vote mlist_fqdn=mlist.name, message_id_hash=message_id_hash %}"> {% csrf_token %} <span class="likestatus {{ object.likestatus }}"> +<span class="likecount">{{ object.likes }}</span>/-<span class="dislikecount">{{ object.dislikes }}</span> diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html index 4e37290..f8417d7 100644 --- a/hyperkitty/templates/messages/message.html +++ b/hyperkitty/templates/messages/message.html @@ -21,7 +21,7 @@ {% gravatar email.sender_email 40 %} </div> <div class="email-author inline-block"> - <span class="name"><a href="{% url message_index mlist_fqdn=list_address, message_id_hash=email.message_id_hash %}">{{email.sender_name|escapeemail}}</a></span> + <span class="name"><a href="{% url message_index mlist_fqdn=mlist.name, message_id_hash=email.message_id_hash %}">{{email.sender_name|escapeemail}}</a></span> {% if use_mockups %} <br /> <span class="rank"> @@ -39,7 +39,7 @@ <p class="attachments">Attachments:</p> <ul class="attachments-list"> {% for attachment in email.attachments %} - <li><a href="{% url message_attachment mlist_fqdn=list_address, message_id_hash=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a> + <li><a href="{% url message_attachment mlist_fqdn=mlist.name, message_id_hash=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a> ({{attachment.content_type}} — {{attachment.size|filesizeformat}}) </li> {% endfor %} @@ -54,14 +54,14 @@ <a class="attachments" href="#attachments">{{ email.attachments|count }} attachment(s)</a> <ul class="attachments-list"> {% for attachment in email.attachments %} - <li><a href="{% url message_attachment mlist_fqdn=list_address, message_id_hash=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a> + <li><a href="{% url message_attachment mlist_fqdn=mlist.name, message_id_hash=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a> ({{attachment.content_type}} — {{attachment.size|filesizeformat}}) </li> {% endfor %} </ul> </div> {% endif %} - {% include "messages/reply_form.html" with mlist_fqdn=list_address message_id_hash=email.message_id_hash %} + {% include "messages/reply_form.html" with mlist_fqdn=mlist.name message_id_hash=email.message_id_hash %} </div> </div> diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html deleted file mode 100644 index 595a71b..0000000 --- a/hyperkitty/templates/month_view.html +++ /dev/null @@ -1,135 +0,0 @@ -{% extends "base.html" %} -{% load gravatar %} -{% load hk_generic %} -{% load storm %} - - -{% block title %} -{{ month|date:"F Y"|capfirst }} - {{ mlist.display_name|default:mlist.name|escapeemail }} - {{ app_name|title }} -{% endblock %} - -{% block content %} - -<div class="row-fluid"> - -{% include 'threads/month_list.html' %} - - <div id="month-view" class="span8"> - - <div class="month-header page-header"> - <h1>{{ mlist.display_name|default:mlist.name|escapeemail }} - <small>{{ month|date:"F Y"|capfirst }}</small> - </h1> - <ul class="month-info"> - {% if mlist.display_name %} - <li class="list-address"> - {{ list_address|escapeemail }} - </li> - {% endif %} - <li class="participant"> - {{ month_participants }} participants - </li> - <li class="discussion"> - {{ month_discussions }} discussions - </li> - </ul> - </div> - - {% for thread in threads %} - <!-- New thread --> - <div class="thread"> - <div class="{% if thread.favorite %}saved{% else %}notsaved{% endif %}"> - <span class="thread_title"><a name="{{thread.thread_id}}" - href="{% url thread threadid=thread.thread_id, mlist_fqdn=list_address %}" - >{{ thread.starting_email.subject|strip_subject:mlist }}</a></span> - <span class="thread_date">{{thread.date_active|timesince }}</span> - </div> - <div class="thread_content"> - {% if thread.category_tag %} - <div class="inline-block type type_{{thread.category_tag}}"> - <a href="{% url search_tag mlist_fqdn=list_address, tag=thread.category_tag %}" - >{{thread.category}}</a> - </div> - {% endif %} - {% if thread.category %} - <div class="inline-block type type_{{thread.category|lower}}"> - <a href="{% url search_tag mlist_fqdn=list_address, tag=thread.category|lower %}" - >{{thread.category}}</a> - </div> - {% endif %} - <div class="gravatar"> - {% if thread.starting_email.sender_email %} - {% gravatar thread.starting_email.sender_email 40 %} - <br /> - {% endif %} - {{ thread.starting_email.sender_name|escapeemail }} - </div> - <div class="thread_email"> - <span class="expander collapsed"> - {{ thread.starting_email.content|urlizetrunc:76|escapeemail }} - </span> - </div> - </div> - <div class="thread_info"> - <ul class="tags inline"> - {% if thread.tags|length %} - <li> - Tags: - </li> - {% for tag in thread.tags %} - <li> - <a href="{% url search_tag mlist_fqdn=list_address, tag=tag %}">{{tag}}</a> - </li> - {% endfor %} - {% endif %} - </ul> - <ul class="inline-block"> - <li class="participant"> - {{ thread.participants|length }} participants - </li> - <li class="discussion"> - {{ thread|length }} comments - </li> - </ul> - <ul class="inline-block"> - {% include "messages/like_form.html" with message_id_hash=thread.starting_email.message_id_hash object=thread %} - </ul> - <a href="{% url thread threadid=thread.thread_id, mlist_fqdn=list_address %}" - class="btn">Show discussion</a> - </div> - </div> - <!-- End of thread --> - {% empty %} - Sorry no emails could be found for this month. - {% endfor %} - - {% include "paginator.html" %} - - </div> - -</div> - -{% endblock %} - -{% block additionaljs %} -<script src="{{ STATIC_URL }}libs/jquery.expander.js"></script> -<script> - $(document).ready(function() { - $('span.expander').expander({ - slicePoint: 500, - userCollapseText : '\nView Less', - expandText : '\nView More', - beforeExpand: function() { - $(this).removeClass("collapsed"); - $(this).addClass("expanded"); - }, - onCollapse: function() { - $(this).removeClass("expanded"); - $(this).addClass("collapsed"); - } - }); - }); -</script> -{% endblock %} - -{# vim: set noet: #} diff --git a/hyperkitty/templates/paginator.html b/hyperkitty/templates/paginator.html index 7978f06..1b3ad90 100644 --- a/hyperkitty/templates/paginator.html +++ b/hyperkitty/templates/paginator.html @@ -1,26 +1,12 @@ {% load i18n %} <ul class="pager"> - <li{% if not has_previous %} class="disabled"{% endif %}> - <a href="?page={{ previous }}">← Newer</a> + <li{% if not pager.has_previous %} class="disabled"{% endif %}> + <a href="?page={{ pager.previous_page_number }}">← Newer</a> </li> - {% if show_first %} - <li class="page"><a href="?page=1">1</a></li> - <li class="ellipsis">...</li> - {% endif %} - {% for linkpage in page_numbers %} - {% ifequal linkpage page %} - <li class="current">{{ page }}</li> - {% else %} - <li class="page"><a href="?page={{ linkpage }}">{{ linkpage }}</a></li> - {% endifequal %} - {% endfor %} - {% if show_last %} - <li class="ellipsis">...</li> - <li class="page"><a href="?page=last">{{ pages }}</a></li> - {% endif %} - - <li{% if not has_next %} class="disabled"{% endif %}><a href="?page={{ next }}">Older →</a></li> + <li{% if not pager.has_next %} class="disabled"{% endif %}> + <a href="?page={{ pager.next_page_number }}">Older →</a> + </li> </ul> {# vim: set noet: #} diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html index 711e0c5..0daa6e3 100644 --- a/hyperkitty/templates/recent_activities.html +++ b/hyperkitty/templates/recent_activities.html @@ -24,7 +24,7 @@ activity_graph( ["{{days|join:'","'}}"], {{evolution}}, - "{% url archives_latest mlist_fqdn=list_address %}" + "{% url archives_latest mlist_fqdn=mlist.name %}" ); </script> </div> diff --git a/hyperkitty/templates/search.html b/hyperkitty/templates/search.html deleted file mode 100644 index facc733..0000000 --- a/hyperkitty/templates/search.html +++ /dev/null @@ -1,102 +0,0 @@ -{% extends "base.html" %} -{% load hk_generic %} -{% load gravatar %} - - -{% block title %} -{{ search_type }} - {{ app_name|title }} -{% endblock %} - -{% block content %} - -<div class="row-fluid"> - -{% if threads.object_list %} -<div class="pagination"> - <span class="step-links"> {% if threads.has_previous %} <a href="{{full_path|strip_page}}/{{ threads.previous_page_number }}">previous</a> {% endif %} <span class="current"> Page {{ threads.number }} of {{ threads.paginator.num_pages }}. </span> {% if threads.has_next %} <a href="{{full_path|strip_page}}/{{ threads.next_page_number }}">next</a> {% endif %} </span> -</div> -{% endif %} - -{% for email in threads.object_list %} -<!-- New thread --> -<div class="thread"> - <div class="notsaved"> - <a href="{% url thread threadid=email.thread_id, mlist_fqdn=list_address %}"> <span class="thread_title">{{email.subject}}</span> </a> - <span class="thread_date">{{email.date}}</span> - </div> - <div class="thread_content"> - {% if email.category_tag %} - <div class="inline-block type type_{{email.category_tag}}"> - <a href="{% url search_tag mlist_fqdn=list_address, tag=email.category_tag %}">{{email.category}}</a> - </div> - {% endif %} - {% if email.category %} - <div class="inline-block type type_{{email.category|lower}}"> - <a href="{% url search_tag mlist_fqdn=list_address, tag=email.category|lower %}">{{email.category}}</a> - </div> - {% endif %} - <div class="inline-block gravatar"> - {% if email.sender_email %} - {% gravatar email.sender_email 40 %} - <br /> - {% endif %} - {{email.sender_name}} - </div> - <div class="inline-block thread_email"> - <span class="expander"> - {{email.content|wordwrap:90|urlizetrunc:76|escapeemail}} - </span> - </div> - </div> - <div class="thread_info"> - <ul class="tags inline"> - <li> - Tags: - </li> - {% for tag in email.tags %} - <li> - <a href="{% url search_tag mlist_fqdn=list_address, tag=tag %}">{{tag}}</a> - </li> - {% endfor %} - </ul> - <ul class="inline-block"> - <li class="participant"> - {{email.participants|length}} participants - </li> - <li class="discussion"> - {{email.answers}} comments - </li> - </ul> - <ul class="inline-block"> - {% include "messages/like_form.html" with message_id_hash=email.message_id_hash object=email %} - </ul> - </div> -</div> -<!-- End of thread --> -{% empty %} -Sorry no emails could be found for your search. -{% endfor %} - -{% if threads.object_list %} -<div class="pagination"> - <span class="step-links"> {% if threads.has_previous %} <a href="{{ threads.previous_page_number }}">previous</a> {% endif %} <span class="current"> Page {{ threads.number }} of {{ threads.paginator.num_pages }}. </span> {% if threads.has_next %} <a href="{{ threads.next_page_number }}">next</a> {% endif %} </span> -</div> -{% endif %} - -</div> - -{% endblock %} - -{% block additionaljs %} -<script src="{{ STATIC_URL }}libs/jquery.expander.js"></script> -<script> - $(document).ready(function() { - $('span.expander').expander({ - userCollapseText : 'View Less', - expandText : 'View More' - }); - }); -</script> -{% endblock %} - -{# vim: set noet: #} diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html index 71e9da2..41cee97 100644 --- a/hyperkitty/templates/thread.html +++ b/hyperkitty/templates/thread.html @@ -21,7 +21,7 @@ {% for thread in neighbors %} {% if thread %} <a class="thread-{% ifequal forloop.counter 1 %}older{% else %}newer{% endifequal %}" - href="{% url thread threadid=thread.thread_id, mlist_fqdn=list_address %}" + href="{% url thread threadid=thread.thread_id, mlist_fqdn=mlist.name %}" >{{ thread.subject|strip_subject:mlist|truncatesmart:"22" }}</a> {% endif %} {% endfor %} @@ -40,10 +40,10 @@ <p class="sort-mode"> {% if sort_mode == "date" %} - <a href="{% url thread threadid=threadid, mlist_fqdn=list_address %}?sort=thread" + <a href="{% url thread threadid=threadid, mlist_fqdn=mlist.name %}?sort=thread" >Show replies by thread</a> {% else %} - <a href="{% url thread threadid=threadid, mlist_fqdn=list_address %}?sort=date" + <a href="{% url thread threadid=threadid, mlist_fqdn=mlist.name %}?sort=date" >Show replies by date</a> {% endif %} </p> diff --git a/hyperkitty/templates/thread_list.html b/hyperkitty/templates/thread_list.html new file mode 100644 index 0000000..c7857c8 --- /dev/null +++ b/hyperkitty/templates/thread_list.html @@ -0,0 +1,55 @@ +{% extends "base.html" %} +{% load gravatar %} +{% load hk_generic %} + + +{% block title %} +{{ list_title }} - {{ mlist.display_name|default:mlist.name|escapeemail }} - {{ app_name|title }} +{% endblock %} + +{% block content %} + +<div class="row-fluid"> + +{% include 'threads/month_list.html' %} + + <div id="thread-list" class="span8"> + + <div class="thread-list-header page-header"> + <h1>{{ mlist.display_name|default:mlist.name|escapeemail }} + <small>{{ list_title }}</small> + </h1> + <ul class="thread-list-info"> + {% if mlist.display_name %} + <li class="list-address"> + {{ mlist.name|escapeemail }} + </li> + {% endif %} + <li class="participant"> + {{ participants }} participants + </li> + <li class="discussion"> + {{ threads.paginator.count }} discussions + </li> + </ul> + </div> + + {% for thread in threads %} + {% include "threads/summary_thread_large.html" %} + {% empty %} + <p>Sorry no email threads could be found {{ no_results_text }}.</p> + {% endfor %} + + {% include "paginator.html" with pager=threads %} + + </div> + +</div> + +{% endblock %} + +{% block additionaljs %} +<script src="{{ STATIC_URL }}libs/jquery.expander.js"></script> +{% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/threads/month_list.html b/hyperkitty/templates/threads/month_list.html index 75b72d4..f7178af 100644 --- a/hyperkitty/templates/threads/month_list.html +++ b/hyperkitty/templates/threads/month_list.html @@ -1,12 +1,12 @@ {% load hk_generic %} <div id="months-list" class="span2"> - {% for year, months in archives_length|sort %} + {% for year, months in months_list|sort %} <h3>{{ year }}</h3> <ul> {% for ar_month in months %} - <li class="{% if year == month.year and ar_month == month.month %}current{% endif %}"> - <a href="{% url archives_with_month year=year, mlist_fqdn=list_address, month=ar_month %}" + <li class="{% if month and year == month.year and ar_month == month.month %}current{% endif %}"> + <a href="{% url archives_with_month year=year, mlist_fqdn=mlist.name, month=ar_month %}" >{{ ar_month|monthtodate:year|date:"F" }}</a> </li> {% endfor %} diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html index 355663d..15a5fec 100644 --- a/hyperkitty/templates/threads/right_col.html +++ b/hyperkitty/templates/threads/right_col.html @@ -23,7 +23,7 @@ </div> </div> <form id="fav_form" name="favorite" method="post" class="favorite" - action="{% url favorite mlist_fqdn=list_address, threadid=threadid %}"> + action="{% url favorite mlist_fqdn=mlist.name, threadid=threadid %}"> {% csrf_token %} <input type="hidden" name="action" value="{{ fav_action }}" /> <p> @@ -37,7 +37,7 @@ </div> <div id="add_tag"> <form id="add_tag_form" name="addtag" method="post" - action="{% url add_tag mlist_fqdn=list_address, threadid=threadid %}"> + action="{% url add_tag mlist_fqdn=mlist.name, threadid=threadid %}"> {% csrf_token %} {{ addtag_form.as_p }} </form> diff --git a/hyperkitty/templates/threads/summary_thread.html b/hyperkitty/templates/threads/summary_thread.html index 16b6804..578b051 100644 --- a/hyperkitty/templates/threads/summary_thread.html +++ b/hyperkitty/templates/threads/summary_thread.html @@ -4,19 +4,19 @@ <div class="thread"> <span class="thread_id">#{{counter}}</span> <span class="thread_title"><a name="{{thread.thread_id}}" - href="{% url thread threadid=thread.thread_id, mlist_fqdn=list_address %}" + href="{% url thread threadid=thread.thread_id, mlist_fqdn=mlist.name %}" >{{ thread.subject|strip_subject:mlist }}</a></span> <div class="thread_stats"> <ul class="inline-block"> {% if thread.category_tag %} <li class="type type_{{thread.category_tag}}"> - <a href="{% url search_tag mlist_fqdn=list_address, tag=thread.category_tag %}" + <a href="{% url search_tag mlist_fqdn=mlist.name, tag=thread.category_tag %}" >{{thread.category}}</a> </li> {% endif %} {% if thread.category %} <li class="type type_{{thread.category|lower}}"> - <a href="{% url search_tag mlist_fqdn=list_address, tag=thread.category|lower %}" + <a href="{% url search_tag mlist_fqdn=mlist.name, tag=thread.category|lower %}" >{{thread.category}}</a> </li> {% endif %} diff --git a/hyperkitty/templates/threads/summary_thread_large.html b/hyperkitty/templates/threads/summary_thread_large.html new file mode 100644 index 0000000..43e7d10 --- /dev/null +++ b/hyperkitty/templates/threads/summary_thread_large.html @@ -0,0 +1,67 @@ +{% load gravatar %} +{% load hk_generic %} +{% load storm %} + + <div class="thread"> + <div class="{% if thread.favorite %}saved{% else %}notsaved{% endif %}"> + <span class="thread_title"><a name="{{thread.thread_id}}" + href="{% url thread threadid=thread.thread_id, mlist_fqdn=mlist.name %}" + >{{ thread.starting_email.subject|strip_subject:mlist }}</a></span> + <span class="thread_date">{{thread.date_active|timesince }}</span> + </div> + <div class="thread_content"> + {% if thread.category_tag %} + <div class="inline-block type type_{{thread.category_tag}}"> + <a href="{% url search_tag mlist_fqdn=mlist.name, tag=thread.category_tag %}" + >{{thread.category}}</a> + </div> + {% endif %} + {% if thread.category %} + <div class="inline-block type type_{{thread.category|lower}}"> + <a href="{% url search_tag mlist_fqdn=mlist.name, tag=thread.category|lower %}" + >{{thread.category}}</a> + </div> + {% endif %} + <div class="gravatar"> + {% if thread.starting_email.sender_email %} + {% gravatar thread.starting_email.sender_email 40 %} + <br /> + {% endif %} + {{ thread.starting_email.sender_name|escapeemail }} + </div> + <div class="thread_email"> + <span class="expander collapsed"> + {{ thread.starting_email.content|urlizetrunc:76|escapeemail }} + </span> + </div> + </div> + <div class="thread_info"> + <ul class="tags inline"> + {% if thread.tags|length %} + <li> + Tags: + </li> + {% for tag in thread.tags %} + <li> + <a href="{% url search_tag mlist_fqdn=mlist.name, tag=tag %}">{{tag}}</a> + </li> + {% endfor %} + {% endif %} + </ul> + <ul class="inline-block"> + <li class="participant"> + {{ thread.participants|length }} participants + </li> + <li class="discussion"> + {{ thread|length }} comments + </li> + </ul> + <ul class="inline-block"> + {% include "messages/like_form.html" with message_id_hash=thread.starting_email.message_id_hash object=thread %} + </ul> + <a href="{% url thread threadid=thread.thread_id, mlist_fqdn=mlist.name %}" + class="btn">Show discussion</a> + </div> + </div> + +{# vim: set noet: #} diff --git a/hyperkitty/templates/threads/tags.html b/hyperkitty/templates/threads/tags.html index ce162ed..6307d1f 100644 --- a/hyperkitty/templates/threads/tags.html +++ b/hyperkitty/templates/threads/tags.html @@ -3,7 +3,7 @@ <ul class="inline"> {% for tag in tags %} <li> - <a href="{% url search_tag mlist_fqdn=list_address, tag=tag.tag %}" >{{ tag.tag }}</a> + <a href="{% url search_tag mlist_fqdn=mlist.name, tag=tag.tag %}" >{{ tag.tag }}</a> {% if not forloop.last %} | {% endif %} </li> {% endfor %} |