From b522371080db5a27edd03d9dff785ca710c8d527 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 2 Aug 2016 12:02:07 -0400
Subject: [PATCH 1/2] include polygons for the other zones.

---
 web/skins/classic/views/zone.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index a61e549d4..c16a3edf5 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -217,6 +217,21 @@ xhtmlHeaders(__FILE__, translate('Zone') );
             <div id="imageFrame" style="position: relative; width: <?php echo reScale( $monitor->Width(), $scale ) ?>px; height: <?php echo reScale( $monitor->Height(), $scale ) ?>px;">
                 <?php echo $StreamHTML; ?>
                 <svg id="zoneSVG" class="zones" style="position: absolute; top: 0; left: 0; width: <?php echo reScale( $monitor->Width(), $scale ) ?>px; height: <?php echo reScale( $monitor->Height(), $scale ) ?>px; background: none;">
+<?php
+if ( $zone['Id'] ) {
+  $other_zones = dbFetchAll( 'SELECT * FROM Zones WHERE MonitorId = ? AND Id != ?', NULL, array( $monitor->Id(), $zone['Id'] ) );
+} else {
+  $other_zones = dbFetchAll( 'SELECT * FROM Zones WHERE MonitorId = ?', NULL, array( $monitor->Id() ) );
+}
+if ( count( $other_zones ) ) {
+  $html = '';
+  foreach( $other_zones as $other_zone ) {
+    $other_zone['AreaCoords'] = preg_replace( '/\s+/', ',', $other_zone['Coords'] );
+    $html .= '<polygon id="zonePoly'.$other_zone['Id'].'" points="'. $other_zone['AreaCoords'] .'" class="'. $other_zone['Type'] .'"/>';
+  }
+  echo $html;
+}
+?>
                   <polygon id="zonePoly" points="<?php echo $zone['AreaCoords'] ?>" class="<?php echo $zone['Type'] ?>"/>
                   Sorry, your browser does not support inline SVG
                 </svg>

From 8093470a2e5e27287fd459d9a02f6cb9644c30ff Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 2 Aug 2016 12:19:55 -0400
Subject: [PATCH 2/2] make only the editing polygon have a border.  Set default
 for Type when creating a new zone

---
 web/skins/classic/css/classic/views/zone.css | 3 +++
 web/skins/classic/css/dark/views/zone.css    | 5 ++++-
 web/skins/classic/css/flat/views/zone.css    | 3 +++
 web/skins/classic/views/zone.php             | 5 +++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/css/classic/views/zone.css b/web/skins/classic/css/classic/views/zone.css
index 52611f5ea..897ee50ee 100644
--- a/web/skins/classic/css/classic/views/zone.css
+++ b/web/skins/classic/css/classic/views/zone.css
@@ -95,6 +95,9 @@
 }
 .zones polygon {
 	fill-opacity: 0.25;
+  stroke-width: 0;
+}
+.zones polygon.Editing {
 	stroke-width: 2px;
 }
 .Active {
diff --git a/web/skins/classic/css/dark/views/zone.css b/web/skins/classic/css/dark/views/zone.css
index 52611f5ea..884c8dbe0 100644
--- a/web/skins/classic/css/dark/views/zone.css
+++ b/web/skins/classic/css/dark/views/zone.css
@@ -95,7 +95,10 @@
 }
 .zones polygon {
 	fill-opacity: 0.25;
-	stroke-width: 2px;
+	stroke-width: 0;
+}
+.zones polygon.Editing {
+  stroke-width: 2px;
 }
 .Active {
 	stroke: #ff0000;
diff --git a/web/skins/classic/css/flat/views/zone.css b/web/skins/classic/css/flat/views/zone.css
index 52611f5ea..54ea4eabf 100644
--- a/web/skins/classic/css/flat/views/zone.css
+++ b/web/skins/classic/css/flat/views/zone.css
@@ -95,6 +95,9 @@
 }
 .zones polygon {
 	fill-opacity: 0.25;
+	stroke-width: 0;
+}
+.zones polygon.Editing {
 	stroke-width: 2px;
 }
 .Active {
diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index c16a3edf5..c7875e08a 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -75,8 +75,9 @@ if ( !isset($newZone) )
     else
     {
         $zone = array(
-            'Name' => translate('New'),
             'Id' => 0,
+            'Name' => translate('New'),
+            'Type'  =>  'Active',
             'MonitorId' => $monitor->Id(),
             'NumCoords' => 4,
             'Coords' => sprintf( "%d,%d %d,%d, %d,%d %d,%d", $minX, $minY, $maxX, $minY, $maxX, $maxY, $minX, $maxY ),
@@ -232,7 +233,7 @@ if ( count( $other_zones ) ) {
   echo $html;
 }
 ?>
-                  <polygon id="zonePoly" points="<?php echo $zone['AreaCoords'] ?>" class="<?php echo $zone['Type'] ?>"/>
+                  <polygon id="zonePoly" points="<?php echo $zone['AreaCoords'] ?>" class="Editing <?php echo $zone['Type'] ?>"/>
                   Sorry, your browser does not support inline SVG
                 </svg>
             </div>