From 86336eafaf09829ac68945ecb567c32a7296ba26 Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Fri, 12 Jul 2013 11:54:02 +0200 Subject: rename recent_activities to overview --- .../static/hyperkitty/css/hyperkitty-overview.css | 14 +- hyperkitty/templates/overview.html | 162 +++++++++++++++++++++ hyperkitty/templates/recent_activities.html | 162 --------------------- hyperkitty/views/list.py | 2 +- 4 files changed, 170 insertions(+), 170 deletions(-) create mode 100644 hyperkitty/templates/overview.html delete mode 100644 hyperkitty/templates/recent_activities.html (limited to 'hyperkitty') diff --git a/hyperkitty/static/hyperkitty/css/hyperkitty-overview.css b/hyperkitty/static/hyperkitty/css/hyperkitty-overview.css index ff43917..02f866a 100644 --- a/hyperkitty/static/hyperkitty/css/hyperkitty-overview.css +++ b/hyperkitty/static/hyperkitty/css/hyperkitty-overview.css @@ -1,13 +1,13 @@ /* Summary page */ -#recent-activities h2 { +#overview h2 { font-size: 22px; line-height: 32px; margin-bottom: 0.5em; text-align: center; } -#recent-activities h3 { +#overview h3 { font-size: 20px; line-height: 28px; margin-bottom: 0.5em; @@ -39,12 +39,12 @@ } -#recent-activities p.thread-new { +#overview p.thread-new { text-align: center; } -#recent-activities .widget { +#overview .widget { padding: 1em; padding-bottom: 0; border: 1px solid #ddd; @@ -54,13 +54,13 @@ margin: 1em 0; } -#recent-activities .thread-stats { +#overview .thread-stats { margin-left: 3em; } -#recent-activities .thread-stats ul { +#overview .thread-stats ul { margin: 0; } -#recent-activities .thread-stats .category { +#overview .thread-stats .category { margin-right: 2em; } diff --git a/hyperkitty/templates/overview.html b/hyperkitty/templates/overview.html new file mode 100644 index 0000000..065bfc9 --- /dev/null +++ b/hyperkitty/templates/overview.html @@ -0,0 +1,162 @@ +{% extends "base.html" %} + +{% load url from future %} +{% load hk_generic %} +{% load gravatar %} +{% load storm %} + + +{% block title %} +{{ mlist.display_name|default:mlist.name|escapeemail }} - {{ app_name|title }} +{% endblock %} + + +{% block content %} + +
+ +{% include 'threads/month_list.html' %} + +
+ +
+

Activities on the list over the last 30 days

+
+
+ +

+ + Start a new thread +

+ +
+ +
+
+

Recently active discussions

+ {% for thread in most_active_threads %} + {% include "threads/summary_thread.html" with counter=forloop.counter %} + {% endfor %} +
+
+ +
+
+

Most active discussions

+ {% for thread in top_threads %} + {% include "threads/summary_thread.html" with counter=forloop.counter %} + {% endfor %} +
+
+ +
+ +
+ +
+ +
+ +
+
+

Discussion by category

+ {% for category, threads in threads_by_category.items %} +

{{ category.name|upper }} +

+ {% for thread in threads %} + {% include "threads/summary_thread.html" %} + {% endfor %} + {% empty %} +

No category has been set this month (yet).

+ {% endfor %} +
+
+ +
+ +
+ +
+
+

Most active posters

+ {% for poster in top_posters %} +
+
+ #{{forloop.counter}} +
+
+ {% gravatar poster.email 40 %} +
+
+
+ {{ poster.name }} +
+ {{ poster.count }} posts +
+
+ {% endfor %} +
+
+ +
+ {% if top_author %} +
+

Prominent discussion maker

+ {% for author in top_author %} + +
+
+ #{{forloop.counter}} +
+
+ {% if author.email %} + {% gravatar author.email 40 %} +
+ {% endif %} +
+
+ {{author.name}} +
+ +{{author.kudos}} kudos +
+
+ + {% endfor %} + +

Tag cloud

+
+ {% endif %} +
+ +
+ +
+ +
+ +{% endblock %} + +{% block additionaljs %} + + + +{% endblock %} diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html deleted file mode 100644 index 9ceb6fb..0000000 --- a/hyperkitty/templates/recent_activities.html +++ /dev/null @@ -1,162 +0,0 @@ -{% extends "base.html" %} - -{% load url from future %} -{% load hk_generic %} -{% load gravatar %} -{% load storm %} - - -{% block title %} -{{ mlist.display_name|default:mlist.name|escapeemail }} - {{ app_name|title }} -{% endblock %} - - -{% block content %} - -
- -{% include 'threads/month_list.html' %} - -
- -
-

Activities on the list over the last 30 days

-
-
- -

- + Start a new thread -

- -
- -
-
-

Recently active discussions

- {% for thread in most_active_threads %} - {% include "threads/summary_thread.html" with counter=forloop.counter %} - {% endfor %} -
-
- -
-
-

Most active discussions

- {% for thread in top_threads %} - {% include "threads/summary_thread.html" with counter=forloop.counter %} - {% endfor %} -
-
- -
- -
- -
- -
- -
-
-

Discussion by category

- {% for category, threads in threads_by_category.items %} -

{{ category.name|upper }} -

- {% for thread in threads %} - {% include "threads/summary_thread.html" %} - {% endfor %} - {% empty %} -

No category has been set this month (yet).

- {% endfor %} -
-
- -
- -
- -
-
-

Most active posters

- {% for poster in top_posters %} -
-
- #{{forloop.counter}} -
-
- {% gravatar poster.email 40 %} -
-
-
- {{ poster.name }} -
- {{ poster.count }} posts -
-
- {% endfor %} -
-
- -
- {% if top_author %} -
-

Prominent discussion maker

- {% for author in top_author %} - -
-
- #{{forloop.counter}} -
-
- {% if author.email %} - {% gravatar author.email 40 %} -
- {% endif %} -
-
- {{author.name}} -
- +{{author.kudos}} kudos -
-
- - {% endfor %} - -

Tag cloud

-
- {% endif %} -
- -
- -
- -
- -{% endblock %} - -{% block additionaljs %} - - - -{% endblock %} diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py index 50c1aff..510d53b 100644 --- a/hyperkitty/views/list.py +++ b/hyperkitty/views/list.py @@ -250,4 +250,4 @@ def overview(request, mlist_fqdn=None): 'days': days, 'archives_baseurl': archives_baseurl, } - return render(request, "recent_activities.html", context) + return render(request, "overview.html", context) -- cgit