full screen frame also has a title now, configurable using ?title= query

argument

diff --git a/src/handlers.py b/src/handlers.py
index 1b9782e2773bbcb2426861851dd96e819deff588..225ae1b45aef737c1964a5a49edb7a0b969fbcc1 100644 (file)
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -719,7 +719,8 @@ class PictureHandler(BaseHandler):
         
         self.render('frame.html',
                 camera_id=camera_id,
-                camera_config=camera_config)
+                camera_config=camera_config,
+                title=self.get_argument('title', camera_config['@name']))
 
     @BaseHandler.auth()
     def download(self, camera_id, filename):

diff --git a/templates/frame.html b/templates/frame.html
index ee0d3d365674edef50f8e11916012feca29031fb..386f15c3296b5886d1ec53a968ea052427362bec 100644 (file)
--- a/templates/frame.html
+++ b/templates/frame.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block title %}{{title}}{% endblock %}
+
 {% block style %}
     {{super()}}
     <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}css/frame.css" />