From d8af65433801da932a610a22e729a324fc7fd747 Mon Sep 17 00:00:00 2001
From: digital-gnome <31593470+digital-gnome@users.noreply.github.com>
Date: Sat, 18 Nov 2017 14:05:11 -0500
Subject: [PATCH 1/4] Fix dvrControls on watch view

---
 web/includes/functions.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 8dcab3b42..0dd3c2c23 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -2198,6 +2198,7 @@ function getStreamMode( ) {
     $streamMode = 'single';
     Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.' );
   }
+  return $streamMode;
 } // end function getStreamMode
 
 function folder_size($dir) {

From 73d6b0e198646c472806e224bf2d153333d6842c Mon Sep 17 00:00:00 2001
From: digital-gnome <31593470+digital-gnome@users.noreply.github.com>
Date: Sun, 19 Nov 2017 09:14:19 -0500
Subject: [PATCH 2/4] Fix sidebar in dark theme

Sidebar in dark theme had a scrollbar when main content was shorter than menu content
---
 web/skins/classic/css/dark/skin.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/skins/classic/css/dark/skin.css b/web/skins/classic/css/dark/skin.css
index 51703babf..1cef117e2 100644
--- a/web/skins/classic/css/dark/skin.css
+++ b/web/skins/classic/css/dark/skin.css
@@ -518,7 +518,6 @@ input[type=submit]:disabled {
 .sidebar {
   position: absolute;
   top: 0;
-  bottom: 0;
   left: 0;
   z-index: 1000;
   display: block;

From b58efe6a36154f32505c439ca2e73a1b36a305b3 Mon Sep 17 00:00:00 2001
From: digital-gnome <31593470+digital-gnome@users.noreply.github.com>
Date: Sun, 19 Nov 2017 18:49:10 -0500
Subject: [PATCH 3/4] Fix classic/dark dvr buttons centering

---
 web/skins/classic/css/classic/views/event.css | 6 +++---
 web/skins/classic/css/dark/views/event.css    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/skins/classic/css/classic/views/event.css b/web/skins/classic/css/classic/views/event.css
index 1a9ed51fa..c855311f4 100644
--- a/web/skins/classic/css/classic/views/event.css
+++ b/web/skins/classic/css/classic/views/event.css
@@ -149,9 +149,9 @@ span.noneCue {
 }
 
 .dvrControls input {
-    height: 20px;
-    width: 28px;
-    padding-bottom: 3px;
+    height: 1.5em;
+    width: 2em;
+    padding: 0 ;
     margin: 0 3px;
 }
 
diff --git a/web/skins/classic/css/dark/views/event.css b/web/skins/classic/css/dark/views/event.css
index 9e98507d1..299f711e0 100644
--- a/web/skins/classic/css/dark/views/event.css
+++ b/web/skins/classic/css/dark/views/event.css
@@ -131,9 +131,9 @@ span.noneCue {
 }
 
 .dvrControls input {
-    height: 20px;
-    width: 28px;
-    padding-bottom: 3px;
+    height: 1.5em;
+    width: 2em;
+    padding: 0;
     margin: 0 3px;
 }
 

From b655689f4767c68976e6776af4e292586add5257 Mon Sep 17 00:00:00 2001
From: digital-gnome <31593470+digital-gnome@users.noreply.github.com>
Date: Mon, 20 Nov 2017 12:27:20 -0500
Subject: [PATCH 4/4] Fix cache_bust

Cache busting was preventing changing css due to leaving symlinks behind.  Adding the css name to each symlink prevents the need for a forced refresh since mtime is the same on unchanged files but filename does not change between css sets.
---
 web/includes/functions.php          | 2 +-
 web/skins/classic/views/options.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 0dd3c2c23..0980b4e80 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -2067,7 +2067,7 @@ function cache_bust( $file ) {
   # Use the last modified timestamp to create a link that gets a different filename
   # To defeat caching.  Should probably use md5 hash
   $parts = pathinfo($file);
-  $cacheFile = 'cache/'.$parts['filename'].'-'.filemtime($file).'.'.$parts['extension'];
+  $cacheFile = 'cache/'.$parts['filename'].'-'.$_COOKIE['zmCSS'].'-'.filemtime($file).'.'.$parts['extension'];
   if ( file_exists( ZM_PATH_WEB.'/'.$cacheFile ) or symlink( ZM_PATH_WEB.'/'.$file, ZM_PATH_WEB.'/'.$cacheFile ) ) {
     return $cacheFile;
   } else {
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 889057f93..1c1d56cea 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -65,6 +65,7 @@ if ( $tab == 'skins' ) {
   $current_css = $_COOKIE['zmCSS'];
   if ( isset($_GET['css-choice']) and ( $_GET['css-choice'] != $current_css ) ) {
     setcookie('zmCSS',$_GET['css-choice'], time()+3600*24*30*12*10 );
+    array_map('unlink', glob(ZM_PATH_WEB.'/cache/*')); //cleanup symlinks from cache_bust
     //header("Location: index.php?view=options&tab=skins&reset_parent=1");
     $reload = true;
   }