remove all possibile hard links to 8080 port wip #79

Author: previ

camera.py

@@ -48,7 +48,6 @@ class Camera(object):
 
     _instance = None
     _img_template = image.Image.load("coderdojo-logo.png")
-    stream_port = 8080
 
     @classmethod
     def get_instance(cls):

main.py

@@ -84,10 +84,8 @@ def get_locale():
 
 @app.route("/")
 def handle_home():
-    stream_port = cam.stream_port if cam else ""
     return render_template('main.html',
                            host=request.host[:request.host.find(':')],
-                           stream_port=stream_port,
                            locale=get_locale(),
                            config=app.bot_config,
                            program_level=app.bot_config.get("prog_level", "std"),
@@ -113,7 +111,7 @@ def handle_wifi():
     if mode == "ap":
         return "http://coder.bot:8080"
     else:
-        return "http://coderbot.locali:8080"
+        return "http://coderbot.local:8080"
 
 @app.route("/update", methods=["GET"])
 def handle_update():

templates/config_params.html

@@ -5,7 +5,6 @@
 var CODERBOT_MOV_TR_DEF_ELAPSE={{config.move_tr_elapse}};
 var CODERBOT_PROG_MOVE_MOTION="{{config.prog_move_motion}}"=="yes";
 var CODERBOT_PROG_MOVE_MPU="{{config.prog_move_mpu}}"=="yes";
-var CODERBOT_STREAM_URL="http://{{host}}:{{stream_port}}/stream"
 var CODERBOT_PROG_LEVEL="{{config.prog_level}}";
 var CODERBOT_PROG_SCROLLBARS="{{config.prog_scrollbars}}"=="true";
 var CODERBOT_PROG_MAXBLOCKS={{config.prog_maxblocks}}<=0?Infinity:{{config.prog_maxblocks}};
@@ -38,13 +37,13 @@
 </script>
 <style>
 .ui-content-stream {
-background:url('http://{{host}}:{{stream_port}}/video/stream') no-repeat;
+background:url('/video/stream') no-repeat;
 background-size: auto 100% !important;
 background-position: center;
 padding:0px;
 }
 .ui-content-stream-program {
-background:url('http://{{host}}:{{stream_port}}/video/stream') no-repeat;
+background:url('/video/stream') no-repeat;
 background-size: auto auto !important;
 background-position: center;
 }