From 76a38d4aa13149ba6c15c61932cc8b26c082fe61 Mon Sep 17 00:00:00 2001
From: guimoz <guillaume.goessel@supelec.fr>
Date: Mon, 30 Jan 2017 11:12:24 +0100
Subject: [PATCH] Improved layout

---
 roulette.py                   | 27 +++++++++++++--------------
 templates/banned.html         |  2 +-
 templates/down.html           |  2 +-
 templates/home.html           |  2 +-
 templates/not_subscribed.html |  2 +-
 templates/play.html           |  2 +-
 templates/precampagne.html    |  2 +-
 7 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/roulette.py b/roulette.py
index 1a77e06..2dd3c00 100644
--- a/roulette.py
+++ b/roulette.py
@@ -321,8 +321,7 @@ def statistiques():
                 else:
                     n_tranchés += 1
 
-    stats = (tranchés,n_tranchés)
-    return stats
+    return (tranchés,n_tranchés)
 
 
 @app.route('/banned_ip')
@@ -364,20 +363,20 @@ def home():
             reverse=True)
 
     bans_hist = []
-    for banned in bans:
-        date = strftime('%Hh%M (%A)', localtime(banned['time']))
-        source = get_player(banned['player_id'])
-        target = get_player(banned['target_id'])
+    for banned_user in bans:
+        date = strftime('%Hh%M (%A)', localtime(banned_user['time']))
+        source = get_player(banned_user['player_id'])
+        target = get_player(banned_user['target_id'])
 
         if target['id'] == player['id']:
-            if banned['success']:
+            if banned_user['success']:
                 entry = ('ban', u'%s : %s %s a réussi à t\'avoir.' \
                         % (date, source['firstname'], source['name']))
             else:
                 entry = ('warn', u'%s : %s %s a essayé de te trancher, en vain.' \
                         % (date, source['firstname'], source['name']))
         else:
-            if banned['success']:
+            if banned_user['success']:
                 entry = ('ok', u'%s : Tu as tranché %s %s avec succès.' \
                         % (date, target['firstname'], target['name']))
             else:
@@ -403,20 +402,20 @@ def play():
                 reverse=True)
 
         bans_hist = []
-        for banned in bans:
-            date = strftime('%Hh%M (%A)', localtime(banned['time']))
-            source = get_player(banned['player_id'])
-            target = get_player(banned['target_id'])
+        for banned_user in bans:
+            date = strftime('%Hh%M (%A)', localtime(banned_user['time']))
+            source = get_player(banned_user['player_id'])
+            target = get_player(banned_user['target_id'])
 
             if target['id'] == player['id']:
-                if banned['success']:
+                if banned_user['success']:
                     entry = ('ban', u'%s : %s %s a réussi à t\'avoir.' \
                             % (date, source['firstname'], source['name']))
                 else:
                     entry = ('warn', u'%s : %s %s a essayé de te trancher, en vain.' \
                             % (date, source['firstname'], source['name']))
             else:
-                if banned['success']:
+                if banned_user['success']:
                     entry = ('ok', u'%s : Tu as tranché %s %s avec succès.' \
                             % (date, target['firstname'], target['name']))
                 else:
diff --git a/templates/banned.html b/templates/banned.html
index 5d13426..651a526 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -32,7 +32,7 @@ $(function () {
             text: 'Etat du Rezo',
             align: 'center',
             verticalAlign: 'middle',
-            y: 40
+            y: 60
         },
         tooltip: {
             pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
diff --git a/templates/down.html b/templates/down.html
index 3adb575..31bfda7 100644
--- a/templates/down.html
+++ b/templates/down.html
@@ -34,7 +34,7 @@ $(function () {
             text: 'Etat du Rezo',
             align: 'center',
             verticalAlign: 'middle',
-            y: 40
+            y: 60
         },
         tooltip: {
             pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
diff --git a/templates/home.html b/templates/home.html
index 8314846..28944c1 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -34,7 +34,7 @@
               text: 'Etat du Rezo',
               align: 'center',
               verticalAlign: 'middle',
-              y: 40
+              y: 60
           },
           tooltip: {
               pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
diff --git a/templates/not_subscribed.html b/templates/not_subscribed.html
index 47c19fa..fc1e47b 100644
--- a/templates/not_subscribed.html
+++ b/templates/not_subscribed.html
@@ -20,7 +20,7 @@ $(function () {
             text: 'Etat du Rezo',
             align: 'center',
             verticalAlign: 'middle',
-            y: 40
+            y: 60
         },
         tooltip: {
             pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
diff --git a/templates/play.html b/templates/play.html
index af58d85..6253f1c 100644
--- a/templates/play.html
+++ b/templates/play.html
@@ -33,7 +33,7 @@ $(function () {
             text: 'Etat du Rezo',
             align: 'center',
             verticalAlign: 'middle',
-            y: 40
+            y: 60
         },
         tooltip: {
             pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
diff --git a/templates/precampagne.html b/templates/precampagne.html
index 7015d3f..ce1d4d6 100644
--- a/templates/precampagne.html
+++ b/templates/precampagne.html
@@ -17,7 +17,7 @@ $(function () {
             text: 'Etat du Rezo',
             align: 'center',
             verticalAlign: 'middle',
-            y: 40
+            y: 60
         },
         tooltip: {
             pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'