From 1d65ee19842e44237605b8a343eebe9dae682222 Mon Sep 17 00:00:00 2001
From: Corentin Chary <corentincj@iksaif.net>
Date: Mon, 5 Mar 2012 11:27:53 +0100
Subject: [PATCH] euscanwww: add charts bellow menu on herd/category/maintainer

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 euscanwww/media/css/style.css              | 16 ++++++++---
 euscanwww/templates/_base.html             |  2 +-
 euscanwww/templates/euscan/category.html   | 33 ++++++++++++++++++----
 euscanwww/templates/euscan/herd.html       | 31 ++++++++++++++++----
 euscanwww/templates/euscan/maintainer.html | 32 +++++++++++++++++----
 5 files changed, 91 insertions(+), 23 deletions(-)

diff --git a/euscanwww/media/css/style.css b/euscanwww/media/css/style.css
index b66a058..22d2c5f 100644
--- a/euscanwww/media/css/style.css
+++ b/euscanwww/media/css/style.css
@@ -69,29 +69,37 @@ a:hover, a:active
     border-radius: 10px;
 }
 
-#menu {
+.menu {
     -webkit-border-radius: 10px;
     -moz-border-radius: 10px;
     border-radius: 10px;
     border: 1px solid #67539B;
 }
 
-#menu, #menu_dl {
+.menu {
     width:100%;
     margin-top: 75px;
     background: #8076A1;
     color: #FFF;
 }
 
-#menu a {
+.menu a {
     color: #fff;
 }
 
-#menu li
+.menu li
 {
   list-style-type: none;
  }
 
+.menu dl {
+    margin-left: 15px;
+}
+
+.menu dd {
+    border: none;
+}
+
 #menus {
     width: 200px;
     position:absolute;
diff --git a/euscanwww/templates/_base.html b/euscanwww/templates/_base.html
index a2eacdf..fa52f67 100644
--- a/euscanwww/templates/_base.html
+++ b/euscanwww/templates/_base.html
@@ -24,7 +24,7 @@
     </div>
     <div id="menus">
       {% block menus %}
-      <div id="menu">
+      <div class="menu">
 	<ul>
 	  {% block menu %}
 	  <li><a href="{% url euscan.views.index %}">Home</a></li>
diff --git a/euscanwww/templates/euscan/category.html b/euscanwww/templates/euscan/category.html
index d2f8857..2c12423 100644
--- a/euscanwww/templates/euscan/category.html
+++ b/euscanwww/templates/euscan/category.html
@@ -16,17 +16,38 @@
 
 {% block content %}
 <h2>Category: {{ category }}</h2>
+
 {% packages packages %}
 
 <h3>Statistics</h2>
 <h4>Current statistics</h4>
-<img src="{% url euscan.views.chart_category category 'pie-versions' %}" />
-<img src="{% url euscan.views.chart_category category 'pie-packages' %}" />
+<p>
+  <img src="{% url euscan.views.chart_category category 'pie-versions' %}" />
+  <img src="{% url euscan.views.chart_category category 'pie-packages' %}" />
+</p>
 
 <h4>All Time</h4>
-<img src="{% url euscan.views.chart_category category 'versions-weekly' %}" />
-<img src="{% url euscan.views.chart_category category 'versions-monthly' %}" />
-<img src="{% url euscan.views.chart_category category 'packages-weekly' %}" />
-<img src="{% url euscan.views.chart_category category 'packages-monthly' %}" />
+<p>
+  <img src="{% url euscan.views.chart_category category 'versions-weekly' %}" />
+  <img src="{% url euscan.views.chart_category category 'versions-monthly' %}" />
+</p>
+
+<p>
+  <img src="{% url euscan.views.chart_category category 'packages-weekly' %}" />
+  <img src="{% url euscan.views.chart_category category 'packages-monthly' %}" />
+</p>
+
+{% endblock %}
+
+{% block menus %}
+{{ block.super }}
+<div class="menu">
+  <dl>
+    <dt>Versions</dt>
+    <dd><img src="{% url euscan.views.chart_category category 'versions-monthly-small' %}" /></dd>
+    <dt>Packages</dt>
+    <dd><img src="{% url euscan.views.chart_category category 'packages-monthly-small' %}" /></dd>
+    </dl>
+</div>
 
 {% endblock %}
diff --git a/euscanwww/templates/euscan/herd.html b/euscanwww/templates/euscan/herd.html
index 4949cdb..446ca0b 100644
--- a/euscanwww/templates/euscan/herd.html
+++ b/euscanwww/templates/euscan/herd.html
@@ -20,13 +20,32 @@
 
 <h3>Statistics</h2>
 <h4>Current statistics</h4>
-<img src="{% url euscan.views.chart_herd herd.herd 'pie-versions' %}" />
-<img src="{% url euscan.views.chart_herd herd.herd 'pie-packages' %}" />
+<p>
+  <img src="{% url euscan.views.chart_herd herd.herd 'pie-versions' %}" />
+  <img src="{% url euscan.views.chart_herd herd.herd 'pie-packages' %}" />
+</p>
 
 <h4>All Time</h4>
-<img src="{% url euscan.views.chart_herd herd.herd 'versions-weekly' %}" />
-<img src="{% url euscan.views.chart_herd herd.herd 'versions-monthly' %}" />
-<img src="{% url euscan.views.chart_herd herd.herd 'packages-weekly' %}" />
-<img src="{% url euscan.views.chart_herd herd.herd 'packages-monthly' %}" />
+<p>
+  <img src="{% url euscan.views.chart_herd herd.herd 'versions-weekly' %}" />
+  <img src="{% url euscan.views.chart_herd herd.herd 'versions-monthly' %}" />
+<p>
+</p>
+  <img src="{% url euscan.views.chart_herd herd.herd 'packages-weekly' %}" />
+  <img src="{% url euscan.views.chart_herd herd.herd 'packages-monthly' %}" />
+</p>
+
+{% endblock %}
+
+{% block menus %}
+{{ block.super }}
+<div class="menu">
+  <dl>
+    <dt>Versions</dt>
+    <dd><img src="{% url euscan.views.chart_herd herd.herd 'versions-monthly-small' %}" /></dd>
+    <dt>Packages</dt>
+    <dd><img src="{% url euscan.views.chart_herd herd.herd 'packages-monthly-small' %}" /></dd>
+    </dl>
+</div>
 
 {% endblock %}
diff --git a/euscanwww/templates/euscan/maintainer.html b/euscanwww/templates/euscan/maintainer.html
index e805c43..ed60264 100644
--- a/euscanwww/templates/euscan/maintainer.html
+++ b/euscanwww/templates/euscan/maintainer.html
@@ -20,13 +20,33 @@
 
 <h3>Statistics</h2>
 <h4>Current statistics</h4>
-<img src="{% url euscan.views.chart_maintainer maintainer.id 'pie-versions' %}" />
-<img src="{% url euscan.views.chart_maintainer maintainer.id 'pie-packages' %}" />
+<p>
+  <img src="{% url euscan.views.chart_maintainer maintainer.id 'pie-versions' %}" />
+  <img src="{% url euscan.views.chart_maintainer maintainer.id 'pie-packages' %}" />
+</p>
 
 <h4>All Time</h4>
-<img src="{% url euscan.views.chart_maintainer maintainer.id 'versions-weekly' %}" />
-<img src="{% url euscan.views.chart_maintainer maintainer.id 'versions-monthly' %}" />
-<img src="{% url euscan.views.chart_maintainer maintainer.id 'packages-weekly' %}" />
-<img src="{% url euscan.views.chart_maintainer maintainer.id 'packages-monthly' %}" />
+<p>
+  <img src="{% url euscan.views.chart_maintainer maintainer.id 'versions-weekly' %}" />
+  <img src="{% url euscan.views.chart_maintainer maintainer.id 'versions-monthly' %}" />
+</p>
+
+<p>
+  <img src="{% url euscan.views.chart_maintainer maintainer.id 'packages-weekly' %}" />
+  <img src="{% url euscan.views.chart_maintainer maintainer.id 'packages-monthly' %}" />
+</p>
+{% endblock %}
+
+{% block menus %}
+{{ block.super }}
+<div class="menu">
+  <dl>
+    <dt>Versions</dt>
+    <dd><img src="{% url euscan.views.chart_maintainer maintainer.id 'versions-monthly-small' %}" /></dd>
+    <dt>Packages</dt>
+    <dd><img src="{% url euscan.views.chart_maintainer maintainer.id 'packages-monthly-small' %}" /></dd>
+    </dl>
+</div>
 
 {% endblock %}
+5A