summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-07-12 11:21:46 +0200
committerAurélien Bompard <aurelien@bompard.org>2013-07-12 11:21:46 +0200
commit90fdcd33d03c5df3127e3d3d9bbffb9bf4c59a71 (patch)
treeebce6ce241817e52b57e1ac063aa96cdb8a98c52
parent579bd91b14f8d2926f64aa6032b41145f90b46fe (diff)
downloadhyperkitty-90fdcd33d03c5df3127e3d3d9bbffb9bf4c59a71.tar.gz
hyperkitty-90fdcd33d03c5df3127e3d3d9bbffb9bf4c59a71.tar.xz
hyperkitty-90fdcd33d03c5df3127e3d3d9bbffb9bf4c59a71.zip
Reorder widgets on the overview page
-rw-r--r--hyperkitty/templates/recent_activities.html63
1 files changed, 33 insertions, 30 deletions
diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html
index 64d3db8..9ceb6fb 100644
--- a/hyperkitty/templates/recent_activities.html
+++ b/hyperkitty/templates/recent_activities.html
@@ -53,6 +53,39 @@
</div>
<div class="row-fluid">
+
+ <div class="span6">
+ <section id="popular-threads" class="widget">
+ <h3>Most popular discussions</h3>
+ {% for thread in pop_threads %}
+ {% include "threads/summary_thread.html" with counter=forloop.counter %}
+ {% empty %}
+ <p>No vote has been cast this month (yet).</p>
+ {% endfor %}
+ </section>
+ </div>
+
+ <div class="span6">
+ <section id="discussion-by-category" class="widget">
+ <h3>Discussion by category</h3>
+ {% for category, threads in threads_by_category.items %}
+ <h4 class="label{% if forloop.first %} first{% endif %}"
+ style="background-color:{{category.color}}"
+ >{{ category.name|upper }}
+ </h4>
+ {% for thread in threads %}
+ {% include "threads/summary_thread.html" %}
+ {% endfor %}
+ {% empty %}
+ <p>No category has been set this month (yet).</p>
+ {% endfor %}
+ </section>
+ </div>
+
+ </div>
+
+ <div class="row-fluid">
+
<div class="span6">
<section id="discussion-maker" class="widget">
<h3>Most active posters</h3>
@@ -74,19 +107,7 @@
{% endfor %}
</section>
</div>
- <div class="span6">
- <section id="popular-threads" class="widget">
- <h3>Most popular discussions</h3>
- {% for thread in pop_threads %}
- {% include "threads/summary_thread.html" with counter=forloop.counter %}
- {% empty %}
- <p>No votes this month (yet).</p>
- {% endfor %}
- </section>
- </div>
- </div>
- <div class="row-fluid">
<div class="span6">
{% if top_author %}
<section id="discussion-maker" class="widget">
@@ -117,24 +138,6 @@
{% endif %}
</div>
-
- <div class="span6">
- {% if threads_by_category %}
- <section id="discussion-by-category" class="widget">
- <h3>Discussion by category</h3>
- {% for category, threads in threads_by_category.items %}
- <h4 class="label{% if forloop.first %} first{% endif %}"
- style="background-color:{{category.color}}"
- >{{ category.name|upper }}
- </h4>
- {% for thread in threads %}
- {% include "threads/summary_thread.html" %}
- {% endfor %}
- {% endfor %}
- </section>
- {% endif %}
- </div>
-
</div>
</section>