From abb2cc0561135360e2ad1bb057338667ba620fcb Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Wed, 19 Mar 2014 19:01:12 +0100 Subject: Changes to form --- public/cam.html | 3 ++- public/css/cam.css | 19 +++++++++---------- public/js/cctv-control.js | 4 ++-- server.js | 34 +++++++++++++++++----------------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/public/cam.html b/public/cam.html index 4149c77..d899172 100644 --- a/public/cam.html +++ b/public/cam.html @@ -12,6 +12,7 @@
+

Untersuchungsprotokoll

Personalkennzeichnung:    Zeitpunkt:

Analyse der Aufnahme:
@@ -21,7 +22,7 @@ Persönliche Bemerkungen:

 
-   +
diff --git a/public/css/cam.css b/public/css/cam.css index dd4959c..4ea21f3 100644 --- a/public/css/cam.css +++ b/public/css/cam.css @@ -80,17 +80,16 @@ body { font-size: 1.1em; } +p.header { + text-align: center; + font-weight: bolder; + font-size: 1.1em; +} #printButton { - width: 200px; - height: 100px; - display: block; - margin: 10px auto; - background-image: url('../img/print_button.png'); - text-decoration: none; + width: 300px; + height: 50px; + font-weight: bold; + font-size: 1.1em; } -#printButton:hover { - background-image: url('../img/print_button_highlight.png'); - -} diff --git a/public/js/cctv-control.js b/public/js/cctv-control.js index 8ac8b0c..ccd77c9 100644 --- a/public/js/cctv-control.js +++ b/public/js/cctv-control.js @@ -193,8 +193,8 @@ function completeForm() { return setError("Analyse der Aufnahme unzureichend!"); if (formAnalysis2.value.length < 3) return setError("Bemerkungen zum Untersuchungsverlauf unzureichend!"); -/* if (formAnalysis3.value.length < 3) - return setError("Analyse der Aufnahme unzureichend!");*/ + if (formAnalysis3.value.length < 3) + return setError("Persönliche Bemerkungen fehlen!"); // unfocus and disable button //otherwise next enter press will trigger print-function diff --git a/server.js b/server.js index 46e3cda..9d421af 100644 --- a/server.js +++ b/server.js @@ -15,37 +15,37 @@ var storage_dir = '/home/untersuchung/storage'; var cameras = [ { - baseurl: 'http://admin:123456@192.168.1.10', - model: 'conceptronic' + baseurl: 'http://192.168.1.20:8080/cam/0', + model: 'mjpegplexer' }, { - baseurl: 'http://admin:123456@192.168.1.11', - model: 'conceptronic' + baseurl: 'http://192.168.1.20:8080/cam/1', + model: 'mjpegplexer' }, { - baseurl: 'http://admin:123456@192.168.1.12', - model: 'conceptronic' + baseurl: 'http://192.168.1.20:8080/cam/2', + model: 'mjpegplexer' }, { - baseurl: 'http://admin:123456@192.168.1.14', - model: 'conceptronic' + baseurl: 'http://192.168.1.20:8080/cam/3', + model: 'mjpegplexer' }, { - baseurl: 'http://admin:123456@192.168.1.15', - model: 'conceptronic' + baseurl: 'http://192.168.1.20:8080/cam/4', + model: 'mjpegplexer' }, { - baseurl: 'http://admin:123456@192.168.1.16', - model: 'conceptronic' + baseurl: 'http://192.168.1.20:8080/cam/5', + model: 'mjpegplexer' }, { - baseurl: 'http://admin:123456@192.168.1.17', - model: 'conceptronic' + baseurl: 'http://192.168.1.20:8080/cam/6', + model: 'mjpegplexer' }, { - baseurl: 'http://admin:123456@192.168.1.18', - model: 'conceptronic' - } + baseurl: 'http://192.168.1.20:8080/cam/7', + model: 'mjpegplexer' + }, ]; var still_frames = [ -- cgit v1.2.1