From c6c6b1c66dd35f269b32000f0d2d6f46a7b69d3f Mon Sep 17 00:00:00 2001
From: guimoz <guillaume.goessel@supelec.fr>
Date: Mon, 30 Jan 2017 02:27:08 +0100
Subject: [PATCH] Revert "Correction de l'emplacement du script"

This reverts commit 78f7253f1138b3f955175955bad03dcba4b24cfe.
---
 templates/banned.html             | 46 -------------------------------
 templates/down.html               | 45 ------------------------------
 templates/home.html               | 45 ------------------------------
 templates/layout.html             | 46 +++++++++++++++++++++++++++++++
 templates/layout_banned.html      | 45 ++++++++++++++++++++++++++++++
 templates/layout_precampagne.html | 45 ++++++++++++++++++++++++++++++
 templates/not_subscribed.html     | 45 ------------------------------
 templates/play.html               | 45 ------------------------------
 8 files changed, 136 insertions(+), 226 deletions(-)

diff --git a/templates/banned.html b/templates/banned.html
index 7ed539e..d893915 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -22,50 +22,4 @@ window.onload = function () {
 };
 </script>
 
-<script type="text/javascript">
-
-$(function () {
-    Highcharts.chart('container', {
-        chart: {
-            plotBackgroundColor: null,
-            plotBorderWidth: 0,
-            plotShadow: false
-        },
-        title: {
-            text: 'Etat du Rezo',
-            align: 'center',
-            verticalAlign: 'middle',
-            y: 40
-        },
-        tooltip: {
-            pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
-        },
-        plotOptions: {
-            pie: {
-                dataLabels: {
-                    enabled: true,
-                    distance: -50,
-                    style: {
-                        fontWeight: 'bold',
-                        color: 'white'
-                    }
-                },
-                startAngle: -90,
-                endAngle: 90,
-                center: ['50%', '75%']
-            },
-        },
-        series: [{
-            type: 'pie',
-            name: 'Etat du Rezo',
-            innerSize: '50%',
-            data: [
-                ['Tranchés',   {{ stats[0] }}],
-                ['Vivants',    {{ stats[1] }}]
-            ]
-        }]
-    });
-});
-</script>
-
 {% endblock %}
diff --git a/templates/down.html b/templates/down.html
index 65c869b..4a41f65 100644
--- a/templates/down.html
+++ b/templates/down.html
@@ -18,50 +18,5 @@
 <p>
     Rien pour l'instant
 </p>
-<script type="text/javascript">
-
-$(function () {
-    Highcharts.chart('container', {
-        chart: {
-            plotBackgroundColor: null,
-            plotBorderWidth: 0,
-            plotShadow: false
-        },
-        title: {
-            text: 'Etat du Rezo',
-            align: 'center',
-            verticalAlign: 'middle',
-            y: 40
-        },
-        tooltip: {
-            pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
-        },
-        plotOptions: {
-            pie: {
-                dataLabels: {
-                    enabled: true,
-                    distance: -50,
-                    style: {
-                        fontWeight: 'bold',
-                        color: 'white'
-                    }
-                },
-                startAngle: -90,
-                endAngle: 90,
-                center: ['50%', '75%']
-            },
-        },
-        series: [{
-            type: 'pie',
-            name: 'Etat du Rezo',
-            innerSize: '50%',
-            data: [
-                ['Tranchés',   {{ stats[0] }}],
-                ['Vivants',    {{ stats[1] }}]
-            ]
-        }]
-    });
-});
-</script>
 {% endif %}
 {% endblock %}
diff --git a/templates/home.html b/templates/home.html
index 7c93871..dd93226 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -20,49 +20,4 @@
   </p>
 
   {% endif %}
-  <script type="text/javascript">
-
-  $(function () {
-      Highcharts.chart('container', {
-          chart: {
-              plotBackgroundColor: null,
-              plotBorderWidth: 0,
-              plotShadow: false
-          },
-          title: {
-              text: 'Etat du Rezo',
-              align: 'center',
-              verticalAlign: 'middle',
-              y: 40
-          },
-          tooltip: {
-              pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
-          },
-          plotOptions: {
-              pie: {
-                  dataLabels: {
-                      enabled: true,
-                      distance: -50,
-                      style: {
-                          fontWeight: 'bold',
-                          color: 'white'
-                      }
-                  },
-                  startAngle: -90,
-                  endAngle: 90,
-                  center: ['50%', '75%']
-              },
-          },
-          series: [{
-              type: 'pie',
-              name: 'Etat du Rezo',
-              innerSize: '50%',
-              data: [
-                  ['Tranchés',   {{ stats[0] }}],
-                  ['Vivants',    {{ stats[1] }}]
-              ]
-          }]
-      });
-  });
-  </script>
 {% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
index 58b02cb..a454c5a 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -40,7 +40,53 @@
     <div id="content_bottomright" class="corner">
     </div>
     <div id="footer">contact technique : <a href="mailto:roulette@metzquetaires.fr">roulette@metzquetaires.fr</a></div>
+		<div id="container" style="min-width: 310px; max-width: 600px; margin: 0 auto; height: auto"></div>
     </div>
   </div>
+<script type="text/javascript">
+
+$(function () {
+    Highcharts.chart('container', {
+        chart: {
+            plotBackgroundColor: null,
+            plotBorderWidth: 0,
+            plotShadow: false
+        },
+        title: {
+            text: 'Etat du Rezo',
+            align: 'center',
+            verticalAlign: 'middle',
+            y: 40
+        },
+        tooltip: {
+            pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
+        },
+        plotOptions: {
+            pie: {
+                dataLabels: {
+                    enabled: true,
+                    distance: -50,
+                    style: {
+                        fontWeight: 'bold',
+                        color: 'white'
+                    }
+                },
+                startAngle: -90,
+                endAngle: 90,
+                center: ['50%', '75%']
+            },
+        },
+        series: [{
+            type: 'pie',
+            name: 'Etat du Rezo',
+            innerSize: '50%',
+            data: [
+                ['Tranchés',   {{ stats[0] }}],
+                ['Vivants',    {{ stats[1] }}]
+            ]
+        }]
+    });
+});
+</script>
 </body>
 </html>
diff --git a/templates/layout_banned.html b/templates/layout_banned.html
index 15bb958..e71bcca 100644
--- a/templates/layout_banned.html
+++ b/templates/layout_banned.html
@@ -42,5 +42,50 @@
 		<div id="container" style="min-width: 310px; max-width: 600px; margin: 0 auto"></div>
     </div>
   </div>
+<script type="text/javascript">
+
+$(function () {
+    Highcharts.chart('container', {
+        chart: {
+            plotBackgroundColor: null,
+            plotBorderWidth: 0,
+            plotShadow: false
+        },
+        title: {
+            text: 'Etat du Rezo',
+            align: 'center',
+            verticalAlign: 'middle',
+            y: 40
+        },
+        tooltip: {
+            pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
+        },
+        plotOptions: {
+            pie: {
+                dataLabels: {
+                    enabled: true,
+                    distance: -50,
+                    style: {
+                        fontWeight: 'bold',
+                        color: 'white'
+                    }
+                },
+                startAngle: -90,
+                endAngle: 90,
+                center: ['50%', '75%']
+            },
+        },
+        series: [{
+            type: 'pie',
+            name: 'Etat du Rezo',
+            innerSize: '50%',
+            data: [
+                ['Tranchés',   {{ stats[0] }}],
+                ['Vivants',    {{ stats[1] }}]
+            ]
+        }]
+    });
+});
+</script>
 </body>
 </html>
diff --git a/templates/layout_precampagne.html b/templates/layout_precampagne.html
index 8133223..e4e7a9d 100644
--- a/templates/layout_precampagne.html
+++ b/templates/layout_precampagne.html
@@ -40,5 +40,50 @@
 		<div id="container" style="min-width: 310px; max-width: 600px; margin: 0 auto"></div>
     </div>
   </div>
+<script type="text/javascript">
+
+$(function () {
+    Highcharts.chart('container', {
+        chart: {
+            plotBackgroundColor: null,
+            plotBorderWidth: 0,
+            plotShadow: false
+        },
+        title: {
+            text: 'Etat du Rezo',
+            align: 'center',
+            verticalAlign: 'middle',
+            y: 40
+        },
+        tooltip: {
+            pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
+        },
+        plotOptions: {
+            pie: {
+                dataLabels: {
+                    enabled: true,
+                    distance: -50,
+                    style: {
+                        fontWeight: 'bold',
+                        color: 'white'
+                    }
+                },
+                startAngle: -90,
+                endAngle: 90,
+                center: ['50%', '75%']
+            },
+        },
+        series: [{
+            type: 'pie',
+            name: 'Etat du Rezo',
+            innerSize: '50%',
+            data: [
+                ['Tranchés',   {{ stats[0] }}],
+                ['Vivants',    {{ stats[1] }}]
+            ]
+        }]
+    });
+});
+</script>
 </body>
 </html>
diff --git a/templates/not_subscribed.html b/templates/not_subscribed.html
index 50afe21..824b5d7 100644
--- a/templates/not_subscribed.html
+++ b/templates/not_subscribed.html
@@ -6,49 +6,4 @@
     envoyer un email au contact technique.
     (Vous ne pouvez pas jouer depuis Supélec)
 </p>
-<script type="text/javascript">
-
-$(function () {
-    Highcharts.chart('container', {
-        chart: {
-            plotBackgroundColor: null,
-            plotBorderWidth: 0,
-            plotShadow: false
-        },
-        title: {
-            text: 'Etat du Rezo',
-            align: 'center',
-            verticalAlign: 'middle',
-            y: 40
-        },
-        tooltip: {
-            pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
-        },
-        plotOptions: {
-            pie: {
-                dataLabels: {
-                    enabled: true,
-                    distance: -50,
-                    style: {
-                        fontWeight: 'bold',
-                        color: 'white'
-                    }
-                },
-                startAngle: -90,
-                endAngle: 90,
-                center: ['50%', '75%']
-            },
-        },
-        series: [{
-            type: 'pie',
-            name: 'Etat du Rezo',
-            innerSize: '50%',
-            data: [
-                ['Tranchés',   {{ stats[0] }}],
-                ['Vivants',    {{ stats[1] }}]
-            ]
-        }]
-    });
-});
-</script>
 {% endblock %}
diff --git a/templates/play.html b/templates/play.html
index 84d7687..f07db4b 100644
--- a/templates/play.html
+++ b/templates/play.html
@@ -19,49 +19,4 @@
 <p>
 <a href="{{ url_for('home') }}">&laquo; retour à l'accueil</a>
 </p>
-<script type="text/javascript">
-
-$(function () {
-    Highcharts.chart('container', {
-        chart: {
-            plotBackgroundColor: null,
-            plotBorderWidth: 0,
-            plotShadow: false
-        },
-        title: {
-            text: 'Etat du Rezo',
-            align: 'center',
-            verticalAlign: 'middle',
-            y: 40
-        },
-        tooltip: {
-            pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
-        },
-        plotOptions: {
-            pie: {
-                dataLabels: {
-                    enabled: true,
-                    distance: -50,
-                    style: {
-                        fontWeight: 'bold',
-                        color: 'white'
-                    }
-                },
-                startAngle: -90,
-                endAngle: 90,
-                center: ['50%', '75%']
-            },
-        },
-        series: [{
-            type: 'pie',
-            name: 'Etat du Rezo',
-            innerSize: '50%',
-            data: [
-                ['Tranchés',   {{ stats[0] }}],
-                ['Vivants',    {{ stats[1] }}]
-            ]
-        }]
-    });
-});
-</script>
 {% endblock %}