# HG changeset patch
# User Edouard Tisserant
# Date 1336472337 -7200
# Node ID db54ccc96309ed5b6942c2b20e588610dce1bb66
# Parent  5d4dc150b956d794a868cb3b3def5ef5d55152ce
refactoring

diff -r 5d4dc150b956 -r db54ccc96309 Beremiz_service.py
--- a/Beremiz_service.py	Mon May 07 19:19:08 2012 +0200
+++ b/Beremiz_service.py	Tue May 08 12:18:57 2012 +0200
@@ -607,7 +607,7 @@
         
         def __init__(self, plcState=False, *a, **kw):
             super(WebInterface, self).__init__(*a, **kw)
-            self.jsModules.mapping[u'WebInterface'] = util.sibpath(__file__, 'webinterface.js')
+            self.jsModules.mapping[u'WebInterface'] = util.sibpath(__file__, os.path.join('runtime', 'webinterface.js'))
             self.plcState = plcState
             self.MainPage.setPLCState(plcState)
 
diff -r 5d4dc150b956 -r db54ccc96309 runtime/webinterface.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/runtime/webinterface.js	Tue May 08 12:18:57 2012 +0200
@@ -0,0 +1,24 @@
+// import Nevow.Athena
+
+function init() {
+  Nevow.Athena.Widget.fromAthenaID(1).callRemote('HMIexec', 'HMIinitialisation');
+}
+
+WebInterface.PLC = Nevow.Athena.Widget.subclass('WebInterface.PLC');
+WebInterface.PLC.method(
+	 'updateHMI',
+	 function (self, data) {
+	   d = self.callRemote('getPLCElement');
+	   d.addCallback(
+			 function liveElementReceived(le) {
+				d2 = self.addChildWidgetFromWidgetInfo(le);
+				d2.addCallback(
+						function childAdded(widget) {
+						var node = self.nodeById('content');
+						node.replaceChild(widget.node, node.getElementsByTagName('div')[0]);
+						init();
+						});
+				});
+	   });
+
+Divmod.Base.addLoadEvent(init);
\ No newline at end of file
diff -r 5d4dc150b956 -r db54ccc96309 webinterface.js
--- a/webinterface.js	Mon May 07 19:19:08 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-// import Nevow.Athena
-
-function init() {
-  Nevow.Athena.Widget.fromAthenaID(1).callRemote('HMIexec', 'HMIinitialisation');
-}
-
-WebInterface.PLC = Nevow.Athena.Widget.subclass('WebInterface.PLC');
-WebInterface.PLC.method(
-	 'updateHMI',
-	 function (self, data) {
-	   d = self.callRemote('getPLCElement');
-	   d.addCallback(
-			 function liveElementReceived(le) {
-				d2 = self.addChildWidgetFromWidgetInfo(le);
-				d2.addCallback(
-						function childAdded(widget) {
-						var node = self.nodeById('content');
-						node.replaceChild(widget.node, node.getElementsByTagName('div')[0]);
-						init();
-						});
-				});
-	   });
-
-Divmod.Base.addLoadEvent(init);
\ No newline at end of file