]> jspc29.x-matter.uni-frankfurt.de Git - mvd_epics.git/commitdiff
jspc29 / mvd_epics.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d481011)
DASH: template cleanup / new blocks: header, js_end_of_page
authorPhilipp Klaus <klaus@physik.uni-frankfurt.de>
Mon, 21 Aug 2017 12:15:18 +0000 (14:15 +0200)
committerPhilipp Klaus <klaus@physik.uni-frankfurt.de>
Mon, 21 Aug 2017 12:15:18 +0000 (14:15 +0200)
python_suite/dashboard/views/base.jinja2 patch | blob | history
python_suite/dashboard/views/gview.jinja2 patch | blob | history
python_suite/dashboard/views/pv_overview.jinja2 patch | blob | history

diff --git a/python_suite/dashboard/views/base.jinja2 b/python_suite/dashboard/views/base.jinja2
index c8f5d743e32957048fa87665e3aaf0f33fe477fd..22141c6c1e0a2fde164cc779e77f0f046deeb2a9 100644 (file)
--- a/python_suite/dashboard/views/base.jinja2
+++ b/python_suite/dashboard/views/base.jinja2
@@ -1,8 +1,9 @@
 <html>
        <head>
                <title>{% block title %}OVERVIEW{% endblock %} - PRESTO</title>
-               <meta http-equiv="refresh" content="5">
                <link rel="stylesheet" href="/static/css/style.css">
+               {% block header %}
+               {% endblock %}
        </head>
 
        <body>
@@ -27,7 +28,12 @@
                </div>
        </div>  
        <script type="text/javascript" src="/static/js/script.js"></script>
-               </body>
+
+       <script type="text/javascript">
+               {% block js_end_of_page %}
+               {% endblock %}
+       </script>
+       </body>
 
 </html>
 
diff --git a/python_suite/dashboard/views/gview.jinja2 b/python_suite/dashboard/views/gview.jinja2
index 0243fcf5f0446c478e983ced8729e5c0a299af30..f6a1c9328bf1106259d7a347d3eaa8c9f1b2da15 100644 (file)
--- a/python_suite/dashboard/views/gview.jinja2
+++ b/python_suite/dashboard/views/gview.jinja2
@@ -8,10 +8,10 @@
                Your browser doesn't support SVG
                </object>
        </div>
+{% endblock %}
 
-<script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"> </script>
-<script>
 
+{% block js_end_of_page %}
 var update_every_ms = 2050;
 
 function updateStatus() {
@@ -31,15 +31,6 @@ function updateStatus() {
       else if (pvField == "EGU")
         el.textContent = pv.unit
     });
-    // ----------
-    /*
-    var svgItem = svgDoc.getElementById("CBM-MVD-COOLING-CC405-FLOW-IN-Flow_VAL");
-    svgItem.textContent = pv.value.toFixed(pv.precision);
-    // ----------
-    var pv = data.PVs[data.PV_lookup["CBM:MVD:COOLING:CC405:BathTemperatureMom"]];
-    var svgItem = svgDoc.getElementById("CBM-MVD-COOLING-CC405-BathTemperatureMom_VAL");
-    svgItem.textContent = pv.value.toFixed(pv.precision);
-    */
   });
 };
 
@@ -57,8 +48,4 @@ $(function() {
     timedUpdate();
   }, update_every_ms);
 });
-
-</script>
-
-
 {% endblock %}
diff --git a/python_suite/dashboard/views/pv_overview.jinja2 b/python_suite/dashboard/views/pv_overview.jinja2
index b70536f0991cdaa725803b61f1d1d373f8ad745f..ac40c002887bbd8ecd4ce9362403d9ca1625d9f2 100644 (file)
--- a/python_suite/dashboard/views/pv_overview.jinja2
+++ b/python_suite/dashboard/views/pv_overview.jinja2
@@ -2,6 +2,10 @@
 
 {% block title %}{{ config.pages[req_page].name }}{% endblock %}
 
+{% block header %}
+<meta http-equiv="refresh" content="5">
+{% endblock %}
+
 {% block content %}
                <div id="PVs">
                        {% set page = config.pages[req_page] %}
Epics in Frankfurt labs