From 0a8e5ee78fb231606a0b43f6688aca47e941d91c Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Mon, 10 Dec 2012 12:25:38 +0100 Subject: Non-code changes (license texts, indentation, etc.) --- hyperkitty/templates/404.html | 2 + hyperkitty/templates/500.html | 2 + hyperkitty/templates/api.html | 124 ++++++++++++------------- hyperkitty/templates/base.html | 6 +- hyperkitty/templates/index.html | 2 + hyperkitty/templates/login.html | 2 + hyperkitty/templates/message.html | 10 +- hyperkitty/templates/messages/first_email.html | 2 + hyperkitty/templates/messages/message.html | 40 ++++---- hyperkitty/templates/month_view.html | 36 +++---- hyperkitty/templates/paginator.html | 48 +++++----- hyperkitty/templates/recent_activities.html | 8 +- hyperkitty/templates/register.html | 2 + hyperkitty/templates/search.html | 4 +- hyperkitty/templates/thread.html | 22 +++-- hyperkitty/templates/threads/add_tag_form.html | 2 + hyperkitty/templates/threads/month_list.html | 18 ++-- hyperkitty/templates/threads/right_col.html | 6 +- hyperkitty/templates/user_profile.html | 60 ++++++------ 19 files changed, 213 insertions(+), 183 deletions(-) (limited to 'hyperkitty/templates') 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 @@ {% 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 @@ {% 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 %} -

REST API

-

- HyperKitty comes with a small REST API allowing you to programatically retrieve - emails and information. -

- -
-

Formats

-

- This REST API can return the information into several formats. - The default format is html to allow human readibility.
- To change the format, just add - ?format=<FORMAT> to the url -

-

The list of available formats is:

- -
- -
-

Emails /api/email/<list name>/<Message-ID>

-

+

REST API

+

+ HyperKitty comes with a small REST API allowing you to programatically retrieve + emails and information. +

+ +
+

Formats

+

+ This REST API can return the information into several formats. + The default format is html to allow human readibility.
+ To change the format, just add + ?format=<FORMAT> to the url +

+

The list of available formats is:

+ +
+ +
+

Emails /api/email/<list name>/<Message-ID>

+

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. -

-

For example: - {% url api_email mlist_fqdn='devel@fp.o', hashid='13129854572893334' %} - -

-
-
-

Threads /api/thread/<list name>/<ThreadID>

-

-

-

+

+

For example: + {% url api_email mlist_fqdn='devel@fp.o', hashid='13129854572893334' %} + +

+
+
+

Threads /api/thread/<list name>/<ThreadID>

+

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. -

-

For example: - {% url api_thread mlist_fqdn='devel@fp.o', threadid='13129854572893334' %} - -

-
-
-

Search /api/search/<list name>/<field>/<keyword>

-

-

-

+

+

For example: + {% url api_thread mlist_fqdn='devel@fp.o', threadid='13129854572893334' %} + +

+
+
+

Search /api/search/<list name>/<field>/<keyword>

+

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. -

-

The list of available field is:

-
    -
  • From
    • -
  • Subject
    • -
  • Content
    • -
  • SubjectContent
    • -
-

For example: - {% url api_search mlist_fqdn='devel@fp.o', field='From', keyword='pingoured' %} - -

-
+

+

The list of available field is:

+ +

For example: + {% url api_search mlist_fqdn='devel@fp.o', field='From', keyword='pingoured' %} + +

+
{% 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 @@
-
    @@ -60,3 +60,5 @@ + +{# 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 @@ {% 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 @@ {% 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 %}
    - - -

    {{ message.subject }}

    + + {# the background image will be a "back to thread" button #} +

    {{ message.subject }}

    @@ -17,3 +17,5 @@
    {% 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 @@
    {% include 'messages/message.html' with email=first_mail unfolded='True' %}
    + +{# 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 %}
    {% endif %} {{email|viewer_date|date:"H:i:s"}}
-
- {% gravatar email.sender_email 40 %} -
+
+ {% gravatar email.sender_email 40 %} +
@@ -36,9 +36,9 @@

Attachments:

{% endif %} @@ -60,17 +60,17 @@ {% endif %} {% if not unfolded and email.attachments|count %} -
  • - {{ email.attachments|count }} attachment(s) - -
    • +
  • + {{ email.attachments|count }} attachment(s) + +
    • {% endif %} - +{# 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 @@
    -
    -
    {{ mlist.display_name|default:mlist.name|escapeemail }}
    -
    {{ month|date:"F Y"|capfirst }}
    -
      -
    • - {{ month_participants }} participants -
      • -
    • - {{ month_discussions }} discussions -
      • -
    - {% if mlist.display_name %} -

    - {{ list_address|escapeemail }} -

    - {% endif %} -
    +
    +
    {{ mlist.display_name|default:mlist.name|escapeemail }}
    +
    {{ month|date:"F Y"|capfirst }}
    +
      +
    • + {{ month_participants }} participants +
      • +
    • + {{ month_discussions }} discussions +
      • +
    + {% if mlist.display_name %} +

    + {{ list_address|escapeemail }} +

    + {% endif %} +
    {% for thread in threads %} @@ -126,3 +126,5 @@ }); {% 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 %}
    - {% if has_previous %} - - < Prev - - {% endif %} + {% if has_previous %} + + < Prev + + {% endif %} - {% if show_first %} - 1 - ... - {% endif %} - {% for linkpage in page_numbers %} - {% ifequal linkpage page %} - {{ page }} - {% else %} - {{ linkpage }} - {% endifequal %} - {% endfor %} - {% if show_last %} - ... - {{ pages }} - {% endif %} - {% if has_next %} - Next > - {% endif %} + {% if show_first %} + 1 + ... + {% endif %} + {% for linkpage in page_numbers %} + {% ifequal linkpage page %} + {{ page }} + {% else %} + {{ linkpage }} + {% endifequal %} + {% endfor %} + {% if show_last %} + ... + {{ pages }} + {% endif %} + {% if has_next %} + Next > + {% endif %}
    + +{# 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 @@ {% 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 @@ {% 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 @@ {{email.category}}
    {% endif %} - {% if email.category %} + {% if email.category %}
    {{email.category}}
    @@ -95,3 +95,5 @@ Sorry no emails could be found for your search. }); {% 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 %} -
    - {% for thread in neighbors %} - {% if thread %} - {{ thread.subject|strip_subject:mlist|truncatesmart:"22" }} - {% endif %} - {% endfor %} -

    {{ subject }}

    -
    +
    + {% for thread in neighbors %} + {% if thread %} + {{ thread.subject|strip_subject:mlist|truncatesmart:"22" }} + {% endif %} + {% endfor %} +

    {{ subject }}

    +
    {% include 'threads/right_col.html' %} @@ -52,3 +52,5 @@ {% 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 @@ {% 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 @@
    {% for year, months in archives_length|sort %}

    {{ year }}

    - + {% endfor %}
    + +{# 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 - {% if use_mockups %} + {% if use_mockups %}

    Add to favorite discussions

    - {% endif %} + {% endif %}
    @@ -52,4 +52,4 @@
    - +{# 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 %} -

    User Profile - {{ user }}

    +

    User Profile - {{ user }}

    - - - - - - - - - - - - - - +
    {% trans 'User name' %}{{ user.username}}
    {% trans 'Firstname' %}{{ user.first_name }}
    {% trans 'Lastname' %}{{ user.last_name }}
    + + + + + + + + + + + + + - - - + + + - - - + + + - - - - -
    {% trans 'User name' %}{{ user.username}}
    {% trans 'Firstname' %}{{ user.first_name }}
    {% trans 'Lastname' %}{{ user.last_name }}
    {% trans 'Email' %}{{ user.email }}
    {% trans 'Email' %}{{ user.email }}
    {% trans 'Karma' %}{{ user_profile.karma }}
    {% trans 'Karma' %}{{ user_profile.karma }}
    {% trans 'Date Joined' %}{{ user.date_joined }}
    + {% trans 'Date Joined' %} + {{ user.date_joined }} + + + - {% if use_mockups %} + {% if use_mockups %} -

    Up Votes :

    +

    Up Votes :

    - {% endif %} + {% endif %} {% endblock %} + +{# vim: set noet: #} -- cgit