-
+ {% for message in messages %}
+
- {{ message }} + {% endfor %} +
diff --git a/roulette.py b/roulette.py
index 38fa42c..94d9991 100644
--- a/roulette.py
+++ b/roulette.py
@@ -306,11 +306,11 @@ def banned():
def banned_ip():
#Actualisation de l'etat de la roulette
with open(STATE_FILE, 'r') as f:
- global STATE
+ global STATE
STATE = f.read()
if DEBUG :
print(STATE)
-
+
# Liste des ip pour récupération par babel et plop
if not DEBUG:
if get_ip() not in ['10.7.0.254']:
@@ -367,7 +367,26 @@ def home():
bans_hist.append(entry)
- return render_template('home.html', bans_hist=bans_hist)
+ con = connect_sqlite()
+ cur = con.cursor()
+
+ cur.execute("""select firstname,name,ban_end from players""", [time()])
+
+ rows = cur.fetchall()
+ con.close()
+ tranchés = 0
+ n_tranchés = 0
+ with open(IMMUNITY_FILE, 'r') as f:
+ immunity = f.read()
+ for row in rows:
+ if row[0]+' '+row[1] not in immunity:
+ if row[2] > time():
+ tranchés += 1
+ else:
+ n_tranchés += 1
+
+ stats = (tranchés,n_tranchés)
+ return render_template('home.html', bans_hist=bans_hist, stats=stats)
else:
return render_template('precampagne.html', user=player)
diff --git a/static/highcharts-custom.js b/static/highcharts-custom.js
new file mode 100644
index 0000000..a146470
--- /dev/null
+++ b/static/highcharts-custom.js
@@ -0,0 +1,290 @@
+/*
+ Highcharts JS v5.0.7 custom build (2017-01-29)
+
+ (c) 2009-2016 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(Q,a){"object"===typeof module&&module.exports?module.exports=Q.document?a(Q):a:Q.Highcharts=a(Q)})("undefined"!==typeof window?window:this,function(Q){Q=function(){var a=window,y=a.document,I=a.navigator&&a.navigator.userAgent||"",E=y&&y.createElementNS&&!!y.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect,K=/(edge|msie|trident)/i.test(I)&&!window.opera,c=!E,d=/Firefox/.test(I),p=d&&4>parseInt(I.split("Firefox/")[1],10);return a.Highcharts?a.Highcharts.error(16,!0):{product:"Highcharts",
+version:"5.0.7 custom build",deg2rad:2*Math.PI/360,doc:y,hasBidiBug:p,hasTouch:y&&void 0!==y.documentElement.ontouchstart,isMS:K,isWebKit:/AppleWebKit/.test(I),isFirefox:d,isTouchDevice:/(Mobile|Android|Windows Phone)/.test(I),SVG_NS:"http://www.w3.org/2000/svg",chartCount:0,seriesTypes:{},symbolSizes:{},svg:E,vml:c,win:a,charts:[],marginNames:["plotTop","marginRight","marginBottom","plotLeft"],noop:function(){}}}();(function(a){var y=[],I=a.charts,E=a.doc,K=a.win;a.error=function(c,d){c=a.isNumber(c)?
+"Highcharts error #"+c+": www.highcharts.com/errors/"+c:c;if(d)throw Error(c);K.console&&console.log(c)};a.Fx=function(a,d,p){this.options=d;this.elem=a;this.prop=p};a.Fx.prototype={dSetter:function(){var a=this.paths[0],d=this.paths[1],p=[],r=this.now,n=a.length,t;if(1===r)p=this.toD;else if(n===d.length&&1>r)for(;n--;)t=parseFloat(a[n]),p[n]=isNaN(t)?a[n]:r*parseFloat(d[n]-t)+t;else p=d;this.elem.attr("d",p,null,!0)},update:function(){var a=this.elem,d=this.prop,p=this.now,r=this.options.step;if(this[d+
+"Setter"])this[d+"Setter"]();else a.attr?a.element&&a.attr(d,p,null,!0):a.style[d]=p+this.unit;r&&r.call(a,p,this)},run:function(a,d,p){var c=this,n=function(a){return n.stopped?!1:c.step(a)},t;this.startTime=+new Date;this.start=a;this.end=d;this.unit=p;this.now=this.start;this.pos=0;n.elem=this.elem;n.prop=this.prop;n()&&1===y.push(n)&&(n.timerId=setInterval(function(){for(t=0;t
- Voici la rezo-roulette metzquetaire.
-
- Jouer
-
+ Jouer
+
- Rien pour l'instant
-
+ Rien pour l'instant
+
Si vous désirez participer malgré les risques que le jeu comporte, veuillez
- envoyer un email à q+A&&(d=q+A),this.hasDragged=Math.sqrt(Math.pow(f-e,2)+Math.pow(l-d,2)),10
Toi aussi, joue au rézoman !
-Historique personnel
+Toi aussi, joue au rézoman avec la rezo-roulette Les Metzquetaires !
+
{% endif %}
{% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
index fbdd17b..7098c32 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -7,6 +7,7 @@
content="text/html;charset=utf-8" />
+
diff --git a/templates/layout_precampagne.html b/templates/layout_precampagne.html
new file mode 100644
index 0000000..35c1e5b
--- /dev/null
+++ b/templates/layout_precampagne.html
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+Historique personnel
-{% if bans_hist != [] %}
-
- {% for entry in bans_hist %}
-
-{% else %}
-
+ {% for entry in bans_hist %}
+
+ {% else %}
+
+ {% for message in messages %}
+
+ {% endif %}
+ {% endwith %}
+ {% block content %}{% endblock %}
+ Vous n'êtes pas inscrit