diff options
Diffstat (limited to 'hyperkitty')
40 files changed, 386 insertions, 193 deletions
diff --git a/hyperkitty/context_processors.py b/hyperkitty/context_processors.py index 5c39319..d8f11ab 100644 --- a/hyperkitty/context_processors.py +++ b/hyperkitty/context_processors.py @@ -17,9 +17,9 @@ # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # # Author: Aamir Khan <syst3m.w0rm@gmail.com> -# +# from django.conf import settings def app_name(context): - return {'app_name' : settings.APP_NAME}
\ No newline at end of file + return {'app_name' : settings.APP_NAME} diff --git a/hyperkitty/lib/__init__.py b/hyperkitty/lib/__init__.py index 1ab04cd..b260c3a 100644 --- a/hyperkitty/lib/__init__.py +++ b/hyperkitty/lib/__init__.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU General Public License along with # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# import urllib from hashlib import md5 diff --git a/hyperkitty/lib/archiver.py b/hyperkitty/lib/archiver.py index 05e084e..b8437a8 100644 --- a/hyperkitty/lib/archiver.py +++ b/hyperkitty/lib/archiver.py @@ -1,4 +1,24 @@ # -*- coding: utf-8 -*- +# Copyright (C) 1998-2012 by the Free Software Foundation, Inc. +# +# This file is part of HyperKitty. +# +# HyperKitty is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# HyperKitty is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# HyperKitty. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# + """ Class implementation of Mailman's IArchiver interface """ diff --git a/hyperkitty/lib/compat.py b/hyperkitty/lib/compat.py index cb0a864..92306c8 100644 --- a/hyperkitty/lib/compat.py +++ b/hyperkitty/lib/compat.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU General Public License along with # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# import re import datetime diff --git a/hyperkitty/lib/mockup.py b/hyperkitty/lib/mockup.py index 6dfe298..29ed2e4 100644 --- a/hyperkitty/lib/mockup.py +++ b/hyperkitty/lib/mockup.py @@ -1,5 +1,23 @@ -#-*- coding: utf-8 -*- - +# -*- coding: utf-8 -*- +# Copyright (C) 1998-2012 by the Free Software Foundation, Inc. +# +# This file is part of HyperKitty. +# +# HyperKitty is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# HyperKitty is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# HyperKitty. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Aamir Khan <syst3m.w0rm@gmail.com> +# class Email(object): """ Email class containing the information needed to store and diff --git a/hyperkitty/lib/store.py b/hyperkitty/lib/store.py index 607475c..da18ffc 100644 --- a/hyperkitty/lib/store.py +++ b/hyperkitty/lib/store.py @@ -1,3 +1,24 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 1998-2012 by the Free Software Foundation, Inc. +# +# This file is part of HyperKitty. +# +# HyperKitty is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# HyperKitty is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# HyperKitty. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# + """ WSGI and Django middlewares for KittyStore diff --git a/hyperkitty/middleware.py b/hyperkitty/middleware.py index d53dfb8..4952db2 100644 --- a/hyperkitty/middleware.py +++ b/hyperkitty/middleware.py @@ -17,7 +17,7 @@ # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # # Author: Aamir Khan <syst3m.w0rm@gmail.com> -# +# class PaginationMiddleware(object): """ diff --git a/hyperkitty/models.py b/hyperkitty/models.py index 10334d2..40eb9e3 100644 --- a/hyperkitty/models.py +++ b/hyperkitty/models.py @@ -17,7 +17,7 @@ # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # # Author: Aamir Khan <syst3m.w0rm@gmail.com> -# +# from django.db import models from django.contrib.auth.models import User @@ -40,7 +40,7 @@ class Rating(models.Model): def __unicode__(self): """Unicode representation""" if self.vote == 1: - return u'id = %s : %s voted up %s' % (self.id, unicode(self.user), self.messageid) + return u'id = %s : %s voted up %s' % (self.id, unicode(self.user), self.messageid) else: return u'id = %s : %s voted down %s' % (self.id, unicode(self.user), self.messageid) diff --git a/hyperkitty/static/js/hyperkitty.js b/hyperkitty/static/js/hyperkitty.js index 2b6a818..fdafd26 100644 --- a/hyperkitty/static/js/hyperkitty.js +++ b/hyperkitty/static/js/hyperkitty.js @@ -1,5 +1,4 @@ /* - * -*- coding: utf-8 -*- * Copyright (C) 1998-2012 by the Free Software Foundation, Inc. * * This file is part of HyperKitty. diff --git a/hyperkitty/templates/404.html b/hyperkitty/templates/404.html index 6f321aa..8b819d4 100644 --- a/hyperkitty/templates/404.html +++ b/hyperkitty/templates/404.html @@ -35,3 +35,5 @@ </div> {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/500.html b/hyperkitty/templates/500.html index 3932daf..e8687f4 100644 --- a/hyperkitty/templates/500.html +++ b/hyperkitty/templates/500.html @@ -35,3 +35,5 @@ </div> {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/api.html b/hyperkitty/templates/api.html index c6e2b85..763574b 100644 --- a/hyperkitty/templates/api.html +++ b/hyperkitty/templates/api.html @@ -1,73 +1,71 @@ {% extends "base.html" %} {% block content %} - <h2>REST API</h2> - <p> - HyperKitty comes with a small REST API allowing you to programatically retrieve - emails and information. - </p> - - <div class="odd" style="padding-left: 1em"> - <h3>Formats</h3> - <p> - This REST API can return the information into several formats. - The default format is html to allow human readibility.<br /> - To change the format, just add - <span style="font-style:italic">?format=<FORMAT></span> to the url - </p> - <p>The list of available formats is:</p> - <ul> - <li>json <a>(?format=json)</a></li> - <li>json-p <a>(?format=json-p)</a></li> - <li>txt <a>(?format=txt)</a></li> - <li>xml <a>(?format=xml)</a></li> - <li>html <a>(?format=html)</a></li> - <li>xhtml <a>(?format=xhtml)</a></li> - </ul> - </div> - - <div class="even" style="padding-left: 1em"> - <h3>Emails <a>/api/email/<list name>/<Message-ID></a></h3> - <p> + <h2>REST API</h2> + <p> + HyperKitty comes with a small REST API allowing you to programatically retrieve + emails and information. + </p> + + <div class="odd" style="padding-left: 1em"> + <h3>Formats</h3> + <p> + This REST API can return the information into several formats. + The default format is html to allow human readibility.<br /> + To change the format, just add + <span style="font-style:italic">?format=<FORMAT></span> to the url + </p> + <p>The list of available formats is:</p> + <ul> + <li>json <a>(?format=json)</a></li> + <li>json-p <a>(?format=json-p)</a></li> + <li>txt <a>(?format=txt)</a></li> + <li>xml <a>(?format=xml)</a></li> + <li>html <a>(?format=html)</a></li> + <li>xhtml <a>(?format=xhtml)</a></li> + </ul> + </div> + + <div class="even" style="padding-left: 1em"> + <h3>Emails <a>/api/email/<list name>/<Message-ID></a></h3> + <p> Using the address /api/email/<list name>/<Message-ID> you will be able to retrieve the information known about a specific email on the specified mailing-list. - </p> - <p> For example: <a href="{% url api_email mlist_fqdn='devel@fp.o', hashid='13129854572893334' %}"> - {% url api_email mlist_fqdn='devel@fp.o', hashid='13129854572893334' %} - </a> - </p> - </div> - <div class="odd" style="padding-left: 1em"> - <h3>Threads <a>/api/thread/<list name>/<ThreadID></a></h3> - <p> - </p> - <p> + </p> + <p> For example: <a href="{% url api_email mlist_fqdn='devel@fp.o', hashid='13129854572893334' %}"> + {% url api_email mlist_fqdn='devel@fp.o', hashid='13129854572893334' %} + </a> + </p> + </div> + <div class="odd" style="padding-left: 1em"> + <h3>Threads <a>/api/thread/<list name>/<ThreadID></a></h3> + <p> Using the address /api/thread/<list name>/<Message-ID> you will be able to retrieve the all the email for a specific thread on the specified mailing-list. - </p> - <p> For example: <a href="{% url api_thread mlist_fqdn='devel@fp.o', threadid='13129854572893334' %}"> - {% url api_thread mlist_fqdn='devel@fp.o', threadid='13129854572893334' %} - </a> - </p> - </div> - <div class="even" style="padding-left: 1em"> - <h3>Search <a>/api/search/<list name>/<field>/<keyword></a></h3> - <p> - </p> - <p> + </p> + <p> For example: <a href="{% url api_thread mlist_fqdn='devel@fp.o', threadid='13129854572893334' %}"> + {% url api_thread mlist_fqdn='devel@fp.o', threadid='13129854572893334' %} + </a> + </p> + </div> + <div class="even" style="padding-left: 1em"> + <h3>Search <a>/api/search/<list name>/<field>/<keyword></a></h3> + <p> Using the address /api/search/<list name>/<field>/<keyword> you will be able to search for all emails of the specified mailing-list containing the provided keyword in the given field. - </p> - <p>The list of available field is:</p> - <ul> - <li>From</li> - <li>Subject</li> - <li>Content</li> - <li>SubjectContent</li> - </ul> - <p> For example: <a href="{% url api_search mlist_fqdn='devel@fp.o', field='From', keyword='pingoured' %}"> - {% url api_search mlist_fqdn='devel@fp.o', field='From', keyword='pingoured' %} - </a> - </p> - </div> + </p> + <p>The list of available field is:</p> + <ul> + <li>From</li> + <li>Subject</li> + <li>Content</li> + <li>SubjectContent</li> + </ul> + <p> For example: <a href="{% url api_search mlist_fqdn='devel@fp.o', field='From', keyword='pingoured' %}"> + {% url api_search mlist_fqdn='devel@fp.o', field='From', keyword='pingoured' %} + </a> + </p> + </div> {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index 1a69fae..cd00a0f 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -19,7 +19,7 @@ <div class="navbar-inner"> <div class="container"> - <ul class="nav auth"> + <ul class="nav auth"> {% if user.is_authenticated %} <li><a class="mm_logout" href="{% url user_logout %}">Logout</a></li> <li><a href="{% url user_profile %}">{{ user.username }}</a></li> @@ -27,7 +27,7 @@ <li><a class="mm_user" href="{% url user_login %}">Login</a></li> <li><a href="{% url user_registration %}"> Sign Up </a></li> {% endif %} - </ul> + </ul> <ul class="nav"> @@ -60,3 +60,5 @@ </body> </html> + +{# vim: set noet: #} diff --git a/hyperkitty/templates/index.html b/hyperkitty/templates/index.html index 637a85f..4318495 100644 --- a/hyperkitty/templates/index.html +++ b/hyperkitty/templates/index.html @@ -18,3 +18,5 @@ </table> {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/login.html b/hyperkitty/templates/login.html index 2ffdbd2..6b6cb77 100644 --- a/hyperkitty/templates/login.html +++ b/hyperkitty/templates/login.html @@ -56,3 +56,5 @@ </script> <!-- end browserid stuff --> {% endblock additionaljs %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html index 25983ec..1425218 100644 --- a/hyperkitty/templates/message.html +++ b/hyperkitty/templates/message.html @@ -6,10 +6,10 @@ {% block content %} <div class="message-header"> - <a class="thread-back" - href="{% url thread threadid=message.thread_id, mlist_fqdn=list_address %}"> - </a> - <h1>{{ message.subject }}</h1> + <a class="thread-back" + href="{% url thread threadid=message.thread_id, mlist_fqdn=list_address %}"> + </a> {# the background image will be a "back to thread" button #} + <h1>{{ message.subject }}</h1> </div> <section id="thread_content"> @@ -17,3 +17,5 @@ </section> {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/messages/first_email.html b/hyperkitty/templates/messages/first_email.html index 36c8468..50e0371 100644 --- a/hyperkitty/templates/messages/first_email.html +++ b/hyperkitty/templates/messages/first_email.html @@ -3,3 +3,5 @@ <div class="first_email"> {% include 'messages/message.html' with email=first_mail unfolded='True' %} </div> + +{# vim: set noet: #} diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html index 7281f7d..9f5498d 100644 --- a/hyperkitty/templates/messages/message.html +++ b/hyperkitty/templates/messages/message.html @@ -15,17 +15,17 @@ {% if unfolded %}<br />{% endif %} <span class="time" title="Sender's time: {{email|sender_date|date:"l, j F H:i:s"}}">{{email|viewer_date|date:"H:i:s"}}</span> </div> - <div class="gravatar{% if use_mockups %} pull-left{% endif %}"> - {% gravatar email.sender_email 40 %} - </div> + <div class="gravatar{% if use_mockups %} pull-left{% endif %}"> + {% gravatar email.sender_email 40 %} + </div> <div class="email_author inline-block"> <span class="name"><a href="{% url message_index mlist_fqdn=list_address, hashid=email.message_id_hash %}">{{email.sender_name|escapeemail}}</a></span> - {% if use_mockups %} + {% if use_mockups %} <br /> <span class="rank"> - Rank 8 + Rank 8 </span> - {% endif %} + {% endif %} </div> </div> @@ -36,9 +36,9 @@ <p class="attachments">Attachments:</p> <ul class="attachments-list"> {% for attachment in email.attachments %} - <li><a href="{% url message_attachment mlist_fqdn=list_address, hashid=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a> - ({{attachment.content_type}} — {{attachment.size|filesizeformat}}) - </li> + <li><a href="{% url message_attachment mlist_fqdn=list_address, hashid=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a> + ({{attachment.content_type}} — {{attachment.size|filesizeformat}}) + </li> {% endfor %} </ul> {% endif %} @@ -60,17 +60,17 @@ </form> {% endif %} {% if not unfolded and email.attachments|count %} - <li class="attachments"> - <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, hashid=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a> - ({{attachment.content_type}} — {{attachment.size|filesizeformat}}) - </li> - {% endfor %} - </ul> - </li> + <li class="attachments"> + <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, hashid=email.message_id_hash, counter=attachment.counter, filename=attachment.name %}">{{attachment.name}}</a> + ({{attachment.content_type}} — {{attachment.size|filesizeformat}}) + </li> + {% endfor %} + </ul> + </li> {% endif %} </ul> - +{# vim: set noet: #} diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html index f08a9f2..4e98e4a 100644 --- a/hyperkitty/templates/month_view.html +++ b/hyperkitty/templates/month_view.html @@ -7,23 +7,23 @@ <div id="month-view"> - <div class="month-header"> - <div class="list-name">{{ mlist.display_name|default:mlist.name|escapeemail }}</div> - <div class="month-name">{{ month|date:"F Y"|capfirst }}</div> - <ul class="month-info"> - <li class="participant"> - {{ month_participants }} participants - </li> - <li class="discussion"> - {{ month_discussions }} discussions - </li> - </ul> - {% if mlist.display_name %} - <p class="list-address"> - {{ list_address|escapeemail }} - </p> - {% endif %} - </div> + <div class="month-header"> + <div class="list-name">{{ mlist.display_name|default:mlist.name|escapeemail }}</div> + <div class="month-name">{{ month|date:"F Y"|capfirst }}</div> + <ul class="month-info"> + <li class="participant"> + {{ month_participants }} participants + </li> + <li class="discussion"> + {{ month_discussions }} discussions + </li> + </ul> + {% if mlist.display_name %} + <p class="list-address"> + {{ list_address|escapeemail }} + </p> + {% endif %} + </div> {% for thread in threads %} <!-- New thread --> @@ -126,3 +126,5 @@ }); </script> {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/paginator.html b/hyperkitty/templates/paginator.html index 170d8b4..1b8bfd6 100644 --- a/hyperkitty/templates/paginator.html +++ b/hyperkitty/templates/paginator.html @@ -1,27 +1,29 @@ {% load i18n %} <div class="pager"> - {% if has_previous %} - <span class="page"> - <a href="?page={{ previous }}">< Prev</a> - </span> - {% endif %} + {% if has_previous %} + <span class="page"> + <a href="?page={{ previous }}">< Prev</a> + </span> + {% endif %} - {% if show_first %} - <span class="page"><a href="?page=1">1</a></span> - <span class="ellipsis">...</span> - {% endif %} - {% for linkpage in page_numbers %} - {% ifequal linkpage page %} - <span class="current">{{ page }}</span> - {% else %} - <span class="page"><a href="?page={{ linkpage }}">{{ linkpage }}</a></span> - {% endifequal %} - {% endfor %} - {% if show_last %} - <span class="ellipsis">...</span> - <span class="page"><a href="?page=last">{{ pages }}</a></span> - {% endif %} - {% if has_next %} - <span class="page"><a href="?page={{ next }}">Next ></a></span> - {% endif %} + {% if show_first %} + <span class="page"><a href="?page=1">1</a></span> + <span class="ellipsis">...</span> + {% endif %} + {% for linkpage in page_numbers %} + {% ifequal linkpage page %} + <span class="current">{{ page }}</span> + {% else %} + <span class="page"><a href="?page={{ linkpage }}">{{ linkpage }}</a></span> + {% endifequal %} + {% endfor %} + {% if show_last %} + <span class="ellipsis">...</span> + <span class="page"><a href="?page=last">{{ pages }}</a></span> + {% endif %} + {% if has_next %} + <span class="page"><a href="?page={{ next }}">Next ></a></span> + {% endif %} </div> + +{# vim: set noet: #} diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html index dd9d4bc..089ca1f 100644 --- a/hyperkitty/templates/recent_activities.html +++ b/hyperkitty/templates/recent_activities.html @@ -212,8 +212,10 @@ <script src="{{ STATIC_URL }}js/libs/protovis-d3.1.js"></script> <script src="{{ STATIC_URL }}js/libs/jquery-ui-1.9.1.custom.min.js"></script> <script> - $(document).ready(function() { - $("#archives").accordion({navigation: true}); - }); + $(document).ready(function() { + $("#archives").accordion({navigation: true}); + }); </script> {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/register.html b/hyperkitty/templates/register.html index 1e96907..2e033b5 100644 --- a/hyperkitty/templates/register.html +++ b/hyperkitty/templates/register.html @@ -15,3 +15,5 @@ </form> {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/search.html b/hyperkitty/templates/search.html index 18d2710..3db0b1c 100644 --- a/hyperkitty/templates/search.html +++ b/hyperkitty/templates/search.html @@ -23,7 +23,7 @@ <a href="{% url search_tag mlist_fqdn=list_address, tag=email.category_tag %}">{{email.category}}</a> </div> {% endif %} - {% if email.category %} + {% 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> @@ -95,3 +95,5 @@ Sorry no emails could be found for your search. }); </script> {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html index e2a0524..3ac059d 100644 --- a/hyperkitty/templates/thread.html +++ b/hyperkitty/templates/thread.html @@ -6,16 +6,16 @@ {% block content %} - <div class="thread-header"> - {% 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 %}" - >{{ thread.subject|strip_subject:mlist|truncatesmart:"22" }}</a> - {% endif %} - {% endfor %} - <h1>{{ subject }}</h1> - </div> + <div class="thread-header"> + {% 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 %}" + >{{ thread.subject|strip_subject:mlist|truncatesmart:"22" }}</a> + {% endif %} + {% endfor %} + <h1>{{ subject }}</h1> + </div> {% include 'threads/right_col.html' %} @@ -52,3 +52,5 @@ </script> {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/threads/add_tag_form.html b/hyperkitty/templates/threads/add_tag_form.html index 2d7f02f..44b5f76 100644 --- a/hyperkitty/templates/threads/add_tag_form.html +++ b/hyperkitty/templates/threads/add_tag_form.html @@ -11,3 +11,5 @@ </button> </form> {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templates/threads/month_list.html b/hyperkitty/templates/threads/month_list.html index 85af7b6..4781ec4 100644 --- a/hyperkitty/templates/threads/month_list.html +++ b/hyperkitty/templates/threads/month_list.html @@ -3,13 +3,15 @@ <div id="archives"> {% for year, months in archives_length|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 %}" - >{{ ar_month|monthtodate:year|date:"F" }}</a> - </li> - {% endfor %} - </ul> + <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 %}" + >{{ ar_month|monthtodate:year|date:"F" }}</a> + </li> + {% endfor %} + </ul> {% endfor %} </div> + +{# vim: set noet: #} diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html index 33ed790..7fa1743 100644 --- a/hyperkitty/templates/threads/right_col.html +++ b/hyperkitty/templates/threads/right_col.html @@ -22,11 +22,11 @@ old </div> </div> - {% if use_mockups %} + {% if use_mockups %} <p id="add_to_fav"> <a href="#AddFav" class="notsaved">Add to favorite discussions</a> </p> - {% endif %} + {% endif %} <!-- End dates --> <hr id="grey"/> <div id="tags"> @@ -52,4 +52,4 @@ </div> </section> - +{# vim: set noet: #} diff --git a/hyperkitty/templates/user_profile.html b/hyperkitty/templates/user_profile.html index 11c8292..675f7fa 100644 --- a/hyperkitty/templates/user_profile.html +++ b/hyperkitty/templates/user_profile.html @@ -3,40 +3,40 @@ {% load hk_generic %} {% block content %} - <h1>User Profile <span>- {{ user }}</span></h1> + <h1>User Profile <span>- {{ user }}</span></h1> - <table class="table table-bordered table-striped mm_userData"> - <tbody> - <tr> - <th>{% trans 'User name' %}</th> - <td>{{ user.username}}</td> - </tr> - <tr> - <th>{% trans 'Firstname' %}</th> - <td>{{ user.first_name }}</td> - </tr> - <tr> - <th>{% trans 'Lastname' %}</th> - <td>{{ user.last_name }}</td> - </tr> + <table class="table table-bordered table-striped mm_userData"> + <tbody> + <tr> + <th>{% trans 'User name' %}</th> + <td>{{ user.username}}</td> + </tr> + <tr> + <th>{% trans 'Firstname' %}</th> + <td>{{ user.first_name }}</td> + </tr> + <tr> + <th>{% trans 'Lastname' %}</th> + <td>{{ user.last_name }}</td> + </tr> <tr> - <th>{% trans 'Email' %}</th> - <td>{{ user.email }}</td> - </tr> + <th>{% trans 'Email' %}</th> + <td>{{ user.email }}</td> + </tr> <tr> - <th>{% trans 'Karma' %}</th> - <td>{{ user_profile.karma }}</td> - </tr> + <th>{% trans 'Karma' %}</th> + <td>{{ user_profile.karma }}</td> + </tr> <tr> - <th>{% trans 'Date Joined' %}</th> - <td>{{ user.date_joined }}</td> - </tr> - </tbody> - </table> + <th>{% trans 'Date Joined' %}</th> + <td>{{ user.date_joined }}</td> + </tr> + </tbody> + </table> - {% if use_mockups %} + {% if use_mockups %} - <h3> Up Votes : </h3> + <h3> Up Votes : </h3> <ul> {% for vote in votes_up %} <li> @@ -66,7 +66,9 @@ {% endfor %} </ul> - {% endif %} + {% endif %} {% endblock %} + +{# vim: set noet: #} diff --git a/hyperkitty/templatetags/hk_generic.py b/hyperkitty/templatetags/hk_generic.py index 18d397f..fd6897f 100644 --- a/hyperkitty/templatetags/hk_generic.py +++ b/hyperkitty/templatetags/hk_generic.py @@ -1,3 +1,24 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 1998-2012 by the Free Software Foundation, Inc. +# +# This file is part of HyperKitty. +# +# HyperKitty is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# HyperKitty is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# HyperKitty. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# + import datetime import re diff --git a/hyperkitty/templatetags/storm.py b/hyperkitty/templatetags/storm.py index 5725b90..b2112d2 100644 --- a/hyperkitty/templatetags/storm.py +++ b/hyperkitty/templatetags/storm.py @@ -1,3 +1,25 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 1998-2012 by the Free Software Foundation, Inc. +# +# This file is part of HyperKitty. +# +# HyperKitty is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# HyperKitty is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# HyperKitty. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# + + from django import template from hyperkitty.lib import stripped_subject diff --git a/hyperkitty/tests/test_views.py b/hyperkitty/tests/test_views.py index 8141b5b..13ad0d8 100644 --- a/hyperkitty/tests/test_views.py +++ b/hyperkitty/tests/test_views.py @@ -17,7 +17,7 @@ # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # # Author: Aamir Khan <syst3m.w0rm@gmail.com> -# +# from django.test import TestCase from django.test.client import Client diff --git a/hyperkitty/urls.py b/hyperkitty/urls.py index 5969b61..355455c 100644 --- a/hyperkitty/urls.py +++ b/hyperkitty/urls.py @@ -1,3 +1,25 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 1998-2012 by the Free Software Foundation, Inc. +# +# This file is part of HyperKitty. +# +# HyperKitty is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# HyperKitty is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# HyperKitty. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Aamir Khan <syst3m.w0rm@gmail.com> +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# + from django.conf.urls.defaults import patterns, include, url from django.conf import settings from django.views.generic.simple import direct_to_template diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py index 3dcfa2e..01edb63 100644 --- a/hyperkitty/views/accounts.py +++ b/hyperkitty/views/accounts.py @@ -17,7 +17,7 @@ # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # # Author: Aamir Khan <syst3m.w0rm@gmail.com> -# +# import re import sys diff --git a/hyperkitty/views/api.py b/hyperkitty/views/api.py index c88923d..d7d18b6 100644 --- a/hyperkitty/views/api.py +++ b/hyperkitty/views/api.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU General Public License along with # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # +# Author: Aamir Khan <syst3m.w0rm@gmail.com> +# import re import os diff --git a/hyperkitty/views/compat.py b/hyperkitty/views/compat.py index dea2174..bbfa367 100644 --- a/hyperkitty/views/compat.py +++ b/hyperkitty/views/compat.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU General Public License along with # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# from __future__ import with_statement diff --git a/hyperkitty/views/forms.py b/hyperkitty/views/forms.py index 8e458d0..ab16215 100644 --- a/hyperkitty/views/forms.py +++ b/hyperkitty/views/forms.py @@ -1,3 +1,24 @@ +#-*- coding: utf-8 -*- +# Copyright (C) 1998-2012 by the Free Software Foundation, Inc. +# +# This file is part of HyperKitty. +# +# HyperKitty is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# HyperKitty is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# HyperKitty. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Aamir Khan <syst3m.w0rm@gmail.com> +# + from django import forms from django.core import validators from django.contrib.auth.models import User diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py index f44379a..97044ed 100644 --- a/hyperkitty/views/list.py +++ b/hyperkitty/views/list.py @@ -16,6 +16,9 @@ # You should have received a copy of the GNU General Public License along with # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # +# Author: Aamir Khan <syst3m.w0rm@gmail.com> +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# import re import os diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py index 8f5679c..ab30447 100644 --- a/hyperkitty/views/message.py +++ b/hyperkitty/views/message.py @@ -16,6 +16,9 @@ # You should have received a copy of the GNU General Public License along with # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # +# Author: Aamir Khan <syst3m.w0rm@gmail.com> +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# import re import os diff --git a/hyperkitty/views/pages.py b/hyperkitty/views/pages.py index a61f17f..c444cfd 100644 --- a/hyperkitty/views/pages.py +++ b/hyperkitty/views/pages.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU General Public License along with # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # +# Author: Aamir Khan <syst3m.w0rm@gmail.com> +# import re import os diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py index 1375d9f..afe389b 100644 --- a/hyperkitty/views/thread.py +++ b/hyperkitty/views/thread.py @@ -16,6 +16,9 @@ # You should have received a copy of the GNU General Public License along with # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # +# Author: Aamir Khan <syst3m.w0rm@gmail.com> +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# import datetime |