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