From fb1b8000ec18986400fd970345b89df36b3ce600 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 6 May 2016 15:24:20 -0400
Subject: [PATCH 1/2] fix the use of  when specifying a skin

---
 web/skins/classic/includes/functions.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 78dbc4556..236714f20 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -24,7 +24,8 @@ $bad_views = array('monitor', 'log');
 
 function xhtmlHeaders( $file, $title )
 {
-    global  $css;
+    global $css;
+    global $skin;
     $skinCssFile = getSkinFile( 'css/'.$css.'/skin.css' );
     $skinCssPhpFile = getSkinFile( 'css/'.$css.'/skin.css.php' );
 
@@ -79,16 +80,16 @@ function xhtmlHeaders( $file, $title )
 <?php if ( !in_array($basename, $bad_views) ) { ?>
   <script type="text/javascript" src="js/logger.js"></script>
   <script type="text/javascript" src="js/overlay.js"></script>
-  <script type="text/javascript" src="/skins/<?php echo $css; ?>/js/jquery-1.11.3.js"></script>
-  <script type="text/javascript" src="/skins/<?php echo $css; ?>/js/bootstrap.min.js"></script>
+  <script type="text/javascript" src="/skins/<?php echo $skin; ?>/js/jquery-1.11.3.js"></script>
+  <script type="text/javascript" src="/skins/<?php echo $skin; ?>/js/bootstrap.min.js"></script>
   <script type="text/javascript">
   //<![CDATA[
   <!--
-<?php include("skins/$css/views/js/state.js.php")?>
+<?php include("skins/$skin/views/js/state.js.php")?>
   //-->
   //]]>
 </script>
-  <script type="text/javascript" src="/skins/<?php echo $css; ?>/views/js/state.js"></script>
+  <script type="text/javascript" src="/skins/<?php echo $skin; ?>/views/js/state.js"></script>
 <?php } ?>
 <?php if ( $title == 'Login' && (defined('ZM_OPT_USE_GOOG_RECAPTCHA') && ZM_OPT_USE_GOOG_RECAPTCHA) ) { ?>
   <script src='https://www.google.com/recaptcha/api.js'></script>

From f4df9e053dfbc82b5487faa53b8006cf95bdbfb3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 6 May 2016 15:30:10 -0400
Subject: [PATCH 2/2] port sidebar css over from classic to flat

---
 web/skins/classic/css/flat/skin.css | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/web/skins/classic/css/flat/skin.css b/web/skins/classic/css/flat/skin.css
index 528eb6e4b..dd9e0a08b 100644
--- a/web/skins/classic/css/flat/skin.css
+++ b/web/skins/classic/css/flat/skin.css
@@ -491,5 +491,26 @@ input[type=submit]:disabled {
     background-color: #f2f2f2;  
 }
 
+.sidebar {
+    position: fixed;
+    top: 51px;
+    bottom: 0;
+    left: 0;
+    z-index: 1000;
+    display: block;
+    padding: 20px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    background-color: #f5f5f5;
+    border-right: 1px solid #eeeeee;
+}
+
+.sidebar ul {
+margin-right: -21px;
+margin-bottom: 20px;
+margin-left: -20px;
+}
+
+