From fb5df6041fc7bf97429bfe689e26fdc08e7e307f Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Sun, 15 Mar 2015 23:59:14 +0100
Subject: A new test for the history page.

---
 pyaggr3g470r/templates/history.html | 89 +++++++------------------------------
 1 file changed, 17 insertions(+), 72 deletions(-)

(limited to 'pyaggr3g470r/templates/history.html')

diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html
index 0194cb89..6216f616 100644
--- a/pyaggr3g470r/templates/history.html
+++ b/pyaggr3g470r/templates/history.html
@@ -1,74 +1,19 @@
- {% extends "layout.html" %}
- {% block head %}
-{{ super() }}
-<script type="text/javascript" src="http://d3js.org/d3.v3.min.js"></script>
-<style type="text/css">
-rect {
-        fill:  purple ;
-        padding: 7px;
-        margin: 2px;
-        color: white;
-    }
-rect:hover
-    {
-        opacity : 0.5;
-    }
-</style>
-{% endblock %}
-
+{% extends "layout.html" %}
 {% block content %}
 <div class="container">
-<h1>History</h1>
-<div align="center" id="pie_chart">
-    <div class="chart">
- </div>
-
-
-<script type="text/javascript">
-function createGraph(dataset, w, h) {
-    var barPadding = 1;
-
-    //Create SVG element
-    var svg = d3.select("#pie_chart .chart")
-                .append("svg")
-                .attr("width", w)
-                .attr("height", h);
-
-    svg.selectAll("rect")
-        .data(dataset)
-        .enter()
-        .append("rect")
-        .on("click", clickEvent)
-        .attr("x", function(d, i) {
-            return i * (w / dataset.length);
-        })
-        .attr("y", function(d) {
-            return h - (d * 4);
-        })
-        .attr("width", w / dataset.length - barPadding)
-        .attr("height", function(d) {
-            return d * 4;
-        });
-}
-
-function clickEvent(d){
-        //var op = prompt("Please enter the value", "");
-        alert(d);
-
-};
-
-
-
-var w = 800;
-var h = 100;
-var dataset = [ 12, 10, 13, 19, 21, 25, 22, 18, 15, 13,
-                    11, 12, 15, 20, 18, 17, 16, 18, 23, 25 ];
-
-createGraph(dataset, w, h);
-
-
-</script>
-
-
-</div>
-{% endblock %}
\ No newline at end of file
+    <h1>{{ _('History') }}</h1>
+    <ul class="list-group">
+    {% for article in articles_counter %}
+        {% if year == None %}
+            <li class="list-group-item"><a href="/history/{{ article }}">{{ article }}</a> : {{ articles_counter[article] }} articles</li>
+        {% elif month == None %}
+            <li class="list-group-item"><a href="/history/{{ year }}/{{ article }}">{{ article }}</a> : {{ articles_counter[article] }} articles</li>
+        {% else %}
+            {% for article in articles %}
+                <li class="list-group-item"><a href="/article/{{ article.id }}">{{ article.title | safe }}</a></li>
+            {% endfor %}
+        {% endif %}
+     {% endfor %}
+     </ul>
+</div><!-- /.container -->
+{% endblock %}
-- 
cgit 


From 8d0fea82761f2fdc1ea93687429990eefa851fc8 Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Mon, 16 Mar 2015 07:22:52 +0100
Subject: Improvements and fixes for the history() function.

---
 pyaggr3g470r/templates/history.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pyaggr3g470r/templates/history.html')

diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html
index 6216f616..2d64da98 100644
--- a/pyaggr3g470r/templates/history.html
+++ b/pyaggr3g470r/templates/history.html
@@ -10,7 +10,7 @@
             <li class="list-group-item"><a href="/history/{{ year }}/{{ article }}">{{ article }}</a> : {{ articles_counter[article] }} articles</li>
         {% else %}
             {% for article in articles %}
-                <li class="list-group-item"><a href="/article/{{ article.id }}">{{ article.title | safe }}</a></li>
+                <li class="list-group-item">{{ article.date }} - <a href="/article/{{ article.id }}">{{ article.title | safe }}</a></li>
             {% endfor %}
         {% endif %}
      {% endfor %}
-- 
cgit 


From f322fba75c8ca3dd4296a11bda688d63b2a547d2 Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Mon, 16 Mar 2015 07:36:11 +0100
Subject: Added a new Jinja filter to get month name from number.

---
 pyaggr3g470r/templates/history.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pyaggr3g470r/templates/history.html')

diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html
index 2d64da98..3b9412a3 100644
--- a/pyaggr3g470r/templates/history.html
+++ b/pyaggr3g470r/templates/history.html
@@ -7,7 +7,7 @@
         {% if year == None %}
             <li class="list-group-item"><a href="/history/{{ article }}">{{ article }}</a> : {{ articles_counter[article] }} articles</li>
         {% elif month == None %}
-            <li class="list-group-item"><a href="/history/{{ year }}/{{ article }}">{{ article }}</a> : {{ articles_counter[article] }} articles</li>
+            <li class="list-group-item"><a href="/history/{{ year }}/{{ article }}">{{ article | month_name  }}</a> : {{ articles_counter[article] }} articles</li>
         {% else %}
             {% for article in articles %}
                 <li class="list-group-item">{{ article.date }} - <a href="/article/{{ article.id }}">{{ article.title | safe }}</a></li>
-- 
cgit 


From 3cb61e31e6642cba163604893efcca98b46f4b68 Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Mon, 16 Mar 2015 13:30:02 +0100
Subject: Improvements to the 'history' page.

---
 pyaggr3g470r/templates/history.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'pyaggr3g470r/templates/history.html')

diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html
index 3b9412a3..c4d6c9a6 100644
--- a/pyaggr3g470r/templates/history.html
+++ b/pyaggr3g470r/templates/history.html
@@ -2,6 +2,13 @@
 {% block content %}
 <div class="container">
     <h1>{{ _('History') }}</h1>
+    {% if month != None %}
+        <h2><a href="/history/{{ year }}"><span class="glyphicon glyphicon-chevron-left"></span> {{ year }}</a></h2>
+        <h3>{{ month | month_name }}</h3>
+    {% elif year != None %}
+        <h2><a href="/history"><span class="glyphicon glyphicon-chevron-left"></span>&nbsp{{ _('all years') }}</a></h2>
+        <h3>{{ year }}</h3>
+    {% endif %}
     <ul class="list-group">
     {% for article in articles_counter %}
         {% if year == None %}
@@ -9,7 +16,7 @@
         {% elif month == None %}
             <li class="list-group-item"><a href="/history/{{ year }}/{{ article }}">{{ article | month_name  }}</a> : {{ articles_counter[article] }} articles</li>
         {% else %}
-            {% for article in articles %}
+            {% for article in articles | sort(attribute="date") %}
                 <li class="list-group-item">{{ article.date }} - <a href="/article/{{ article.id }}">{{ article.title | safe }}</a></li>
             {% endfor %}
         {% endif %}
-- 
cgit 


From 264c916b1e83a3f429c87a14d69c45e87a5afbd0 Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Tue, 17 Mar 2015 06:56:38 +0100
Subject: Reverse the sort of articles.

---
 pyaggr3g470r/templates/history.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pyaggr3g470r/templates/history.html')

diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html
index c4d6c9a6..b01ca032 100644
--- a/pyaggr3g470r/templates/history.html
+++ b/pyaggr3g470r/templates/history.html
@@ -16,7 +16,7 @@
         {% elif month == None %}
             <li class="list-group-item"><a href="/history/{{ year }}/{{ article }}">{{ article | month_name  }}</a> : {{ articles_counter[article] }} articles</li>
         {% else %}
-            {% for article in articles | sort(attribute="date") %}
+            {% for article in articles | sort(attribute="date", reverse = True) %}
                 <li class="list-group-item">{{ article.date }} - <a href="/article/{{ article.id }}">{{ article.title | safe }}</a></li>
             {% endfor %}
         {% endif %}
-- 
cgit 


From c351b29b2181aabfdd115476ffa68df0c05a3a09 Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Thu, 19 Mar 2015 11:54:08 +0100
Subject: Format the date with the adequat Babel filter.

---
 pyaggr3g470r/templates/history.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pyaggr3g470r/templates/history.html')

diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html
index b01ca032..6be54d71 100644
--- a/pyaggr3g470r/templates/history.html
+++ b/pyaggr3g470r/templates/history.html
@@ -17,7 +17,7 @@
             <li class="list-group-item"><a href="/history/{{ year }}/{{ article }}">{{ article | month_name  }}</a> : {{ articles_counter[article] }} articles</li>
         {% else %}
             {% for article in articles | sort(attribute="date", reverse = True) %}
-                <li class="list-group-item">{{ article.date }} - <a href="/article/{{ article.id }}">{{ article.title | safe }}</a></li>
+                <li class="list-group-item">{{ article.date | datetime }} - <a href="/article/{{ article.id }}">{{ article.title | safe }}</a></li>
             {% endfor %}
         {% endif %}
      {% endfor %}
-- 
cgit