diff --git a/www/camera.php b/www/camera.php index f8c062b385742fb76714e897d6b2553ff3163e9d..12bdb92f0380969a07250b31bc8ed82187f1f912 100644 --- a/www/camera.php +++ b/www/camera.php @@ -1,12 +1,14 @@ <?php $camera = 'nocamera'; if (isset($_GET['camera'])) - $camera=$_GET['camera']; - $imagelocation="../"; + $camera=$_GET['camera']; + $imagelocation="../../"; $file = $imagelocation.strtolower($camera).".jpg"; + //echo $file; header("Expires: ".gmdate("D, d M Y H:i:s", time())." GMT"); - if (!is_readable($file)) + if (!is_readable($file)) { $file="nocamera.jpg"; + } header("Content-Type: image/jpeg"); header("Content-Length: ".filesize($file)); header("Last-Modified: ".gmdate("D, d M Y H:i:s", filectime($file))." GMT"); diff --git a/www/webcam-overrides.css b/www/webcam-overrides.css index 8fda5cba2680cab50e8b5a7b59d6fca1c3d6001e..98eb295bb8ead2decd817eb995cde18a47257695 100644 --- a/www/webcam-overrides.css +++ b/www/webcam-overrides.css @@ -23,15 +23,19 @@ } .camSection { - margin-left:auto; - margin-right:auto; - text-align: center; + margin-left:auto; + margin-right:auto; + text-align: center; } body { padding-bottom: 4.5em; } +.offline { + opacity: 0.1; +} + /* Haven't touched anything below this */ /*the navigation stuff for the archives page*/ diff --git a/www/webcams.js b/www/webcams.js index 8d91a798d7e98db4ad07580d9c9f2edd222ce7b9..22b966d1c5ab135ee93f0b69a2d0b00b7dd34627 100644 --- a/www/webcams.js +++ b/www/webcams.js @@ -8,7 +8,7 @@ function updateWebcam (webcamid, webcamurl) { var date = new Date (); var fullwebcamurl = webcamurl + "&t" + date.getTime (); - var img = document.getElementById (webcamid); + var img = document.getElementById(webcamid); // get an XML HTTP Request object var req = false; @@ -40,27 +40,11 @@ function updateWebcam (webcamid, webcamurl) if (Math.abs (imgdate.getTime () - servdate.getTime ()) > 1000 * 60 * 2) { // this image is out of date - img.style.opacity = 0.75; - if (iambob) - { - img.style.border = "0px solid red"; - } - else - { - img.style.border = "4px solid red"; - } + img.classList.add('offline'); } else { - img.style.opacity = 1.0; - if (iambob) - { - img.style.border = "0px solid transparent"; - } - else - { - img.style.border = "4px solid transparent"; - } + img.classList.remove('offline'); } } } @@ -84,4 +68,4 @@ function updateTime() updateWebcam ("ipcamera4", "camera.php?camera=ipcamera4"); updateWebcam ("ipcamera5", "camera.php?camera=ipcamera5"); updateWebcam ("ipcamera6", "camera.php?camera=ipcamera6"); -} \ No newline at end of file +}