From fde39f3ce9f1c1b454f97f54e32a065f103d6336 Mon Sep 17 00:00:00 2001 From: sidya82 Date: Sat, 1 Mar 2014 21:53:32 +0100 Subject: [PATCH] =?UTF-8?q?=09renomm=C3=A9:=20=20=20=20=20=20=20=20=20fich?= =?UTF-8?q?ier/autorise=20->=20m/fichier/autorise=20=09renomm=C3=A9:=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20fichier/conf=20->=20m/fichier/conf=20=09re?= =?UTF-8?q?nomm=C3=A9:=20=20=20=20=20=20=20=20=20fichier/log=20->=20m/fich?= =?UTF-8?q?ier/log=20=09renomm=C3=A9:=20=20=20=20=20=20=20=20=20loadConf.p?= =?UTF-8?q?y=20->=20m/loadConf.py=20=09renomm=C3=A9:=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20login.py=20->=20m/login.py=20=09modifi=C3=A9:=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20superTornado.py=20=09renomm=C3=A9:=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20illegal.html=20->=20v/illegal.html=20=09renomm?= =?UTF-8?q?=C3=A9:=20=20=20=20=20=20=20=20=20images/iut.jpg=20->=20v/image?= =?UTF-8?q?s/iut.jpg=20=09renomm=C3=A9:=20=20=20=20=20=20=20=20=20index.ht?= =?UTF-8?q?ml=20->=20v/index.html=20=09renomm=C3=A9:=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20js/jquery-2.1.0.min.js=20->=20v/js/jquery-2.1.0.min.js=20?= =?UTF-8?q?=09renomm=C3=A9:=20=20=20=20=20=20=20=20=20style/styles.css=20-?= =?UTF-8?q?>=20v/style/styles.css=20=09renomm=C3=A9:=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20video.html=20->=20v/video.html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {fichier => m/fichier}/autorise | 0 {fichier => m/fichier}/conf | 0 {fichier => m/fichier}/log | 0 loadConf.py => m/loadConf.py | 0 login.py => m/login.py | 0 superTornado.py | 12 +++--------- illegal.html => v/illegal.html | 0 {images => v/images}/iut.jpg | Bin index.html => v/index.html | 0 {js => v/js}/jquery-2.1.0.min.js | 0 {style => v/style}/styles.css | 0 video.html => v/video.html | 0 12 files changed, 3 insertions(+), 9 deletions(-) rename {fichier => m/fichier}/autorise (100%) rename {fichier => m/fichier}/conf (100%) rename {fichier => m/fichier}/log (100%) rename loadConf.py => m/loadConf.py (100%) rename login.py => m/login.py (100%) rename illegal.html => v/illegal.html (100%) rename {images => v/images}/iut.jpg (100%) rename index.html => v/index.html (100%) rename {js => v/js}/jquery-2.1.0.min.js (100%) rename {style => v/style}/styles.css (100%) rename video.html => v/video.html (100%) diff --git a/fichier/autorise b/m/fichier/autorise similarity index 100% rename from fichier/autorise rename to m/fichier/autorise diff --git a/fichier/conf b/m/fichier/conf similarity index 100% rename from fichier/conf rename to m/fichier/conf diff --git a/fichier/log b/m/fichier/log similarity index 100% rename from fichier/log rename to m/fichier/log diff --git a/loadConf.py b/m/loadConf.py similarity index 100% rename from loadConf.py rename to m/loadConf.py diff --git a/login.py b/m/login.py similarity index 100% rename from login.py rename to m/login.py diff --git a/superTornado.py b/superTornado.py index 30f41bc..3260535 100644 --- a/superTornado.py +++ b/superTornado.py @@ -10,9 +10,7 @@ from urllib import urlopen from tornado.ioloop import PeriodicCallback -from session import * -from loadConf import * -from login import * +from m import * import os dirname = os.path.dirname(__file__) @@ -25,7 +23,7 @@ class BaseHandler(tornado.web.RequestHandler): class MainHandler(BaseHandler): def get(self): - self.render("index.html") + self.render("v/index.html") def post(self): iden = self.get_argument("id","") mdp = self.get_argument("mdp","") @@ -49,7 +47,7 @@ class VideoHandler(BaseHandler): class UnauthorizedHandler(BaseHandler): def get(self): - self.render("illegal.html") + self.render("v/illegal.html") def post(self): force = self.get_argument("illegalAccess","") if force == "1" : @@ -134,10 +132,6 @@ class WSocketHandler(BaseHandler,tornado.websocket.WebSocketHandler): print 'maison.request("GET", "micom/lamp.php?room=salon1&order=0")' print"->"+iden+" Deconnection" - - - - application = tornado.web.Application([ (r"/", MainHandler), (r"/video", VideoHandler), diff --git a/illegal.html b/v/illegal.html similarity index 100% rename from illegal.html rename to v/illegal.html diff --git a/images/iut.jpg b/v/images/iut.jpg similarity index 100% rename from images/iut.jpg rename to v/images/iut.jpg diff --git a/index.html b/v/index.html similarity index 100% rename from index.html rename to v/index.html diff --git a/js/jquery-2.1.0.min.js b/v/js/jquery-2.1.0.min.js similarity index 100% rename from js/jquery-2.1.0.min.js rename to v/js/jquery-2.1.0.min.js diff --git a/style/styles.css b/v/style/styles.css similarity index 100% rename from style/styles.css rename to v/style/styles.css diff --git a/video.html b/v/video.html similarity index 100% rename from video.html rename to v/video.html