From 0ce85137dceeec193d705466671d6ca029cd85f4 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 8 Apr 2016 13:39:31 -0400 Subject: [PATCH 1/3] remove points. Don't need them here --- web/skins/classic/views/zones.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php index 785cff8f3..4553201d8 100644 --- a/web/skins/classic/views/zones.php +++ b/web/skins/classic/views/zones.php @@ -53,12 +53,6 @@ xhtmlHeaders(__FILE__, translate('Zones') ); ?> - - Sorry, your browser does not support inline SVG From f749ff47ead942d4ffa0846daf35689f4f1c60f7 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 8 Apr 2016 13:40:32 -0400 Subject: [PATCH 2/3] convert to monitor object --- web/skins/classic/views/js/zone.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php index 7e3145378..3ed7b1669 100644 --- a/web/skins/classic/views/js/zone.js.php +++ b/web/skins/classic/views/js/zone.js.php @@ -46,8 +46,8 @@ zone['Points'][] = { 'x': -var maxX = ; -var maxY = ; +var maxX = Width()-1 ?>; +var maxY = Height()-1 ?>; var selfIntersecting = ; var selfIntersectingString = ''; From 22f207602b2a681ba352660d024d88ac8b03d512 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 8 Apr 2016 13:43:00 -0400 Subject: [PATCH 3/3] add css for the svg zones --- web/skins/classic/css/classic/views/zone.css | 20 +++++++++++++++++++ web/skins/classic/css/classic/views/zones.css | 20 +++++++++++++++++++ web/skins/classic/css/dark/views/zone.css | 20 +++++++++++++++++++ web/skins/classic/css/dark/views/zones.css | 20 +++++++++++++++++++ web/skins/classic/css/flat/views/zone.css | 20 +++++++++++++++++++ web/skins/classic/css/flat/views/zones.css | 20 +++++++++++++++++++ 6 files changed, 120 insertions(+) create mode 100644 web/skins/classic/css/classic/views/zones.css create mode 100644 web/skins/classic/css/dark/views/zones.css create mode 100644 web/skins/classic/css/flat/views/zones.css diff --git a/web/skins/classic/css/classic/views/zone.css b/web/skins/classic/css/classic/views/zone.css index a86c5d1e4..52611f5ea 100644 --- a/web/skins/classic/css/classic/views/zone.css +++ b/web/skins/classic/css/classic/views/zone.css @@ -93,3 +93,23 @@ #zonePoints table a { margin: 0 2px; } +.zones polygon { + fill-opacity: 0.25; + stroke-width: 2px; +} +.Active { + stroke: #ff0000; + fill: #ff0000; +} +.Inclusive { + stroke: #FFA500; + fill: #FFA500; +} +.Exclusive { + stroke: #800080; + fill: #800080; +} +.Preclusive { + stroke: #0000FF; + fill: #0000FF; +} diff --git a/web/skins/classic/css/classic/views/zones.css b/web/skins/classic/css/classic/views/zones.css new file mode 100644 index 000000000..9952e5db4 --- /dev/null +++ b/web/skins/classic/css/classic/views/zones.css @@ -0,0 +1,20 @@ +.zones polygon { + fill-opacity: 0.25; + stroke-width: 2px; +} +.Active { + stroke: #ff0000; + fill: #ff0000; +} +.Inclusive { + stroke: #FFA500; + fill: #FFA500; +} +.Exclusive { + stroke: #800080; + fill: #800080; +} +.Preclusive { + stroke: #0000FF; + fill: #0000FF; +} diff --git a/web/skins/classic/css/dark/views/zone.css b/web/skins/classic/css/dark/views/zone.css index a86c5d1e4..52611f5ea 100644 --- a/web/skins/classic/css/dark/views/zone.css +++ b/web/skins/classic/css/dark/views/zone.css @@ -93,3 +93,23 @@ #zonePoints table a { margin: 0 2px; } +.zones polygon { + fill-opacity: 0.25; + stroke-width: 2px; +} +.Active { + stroke: #ff0000; + fill: #ff0000; +} +.Inclusive { + stroke: #FFA500; + fill: #FFA500; +} +.Exclusive { + stroke: #800080; + fill: #800080; +} +.Preclusive { + stroke: #0000FF; + fill: #0000FF; +} diff --git a/web/skins/classic/css/dark/views/zones.css b/web/skins/classic/css/dark/views/zones.css new file mode 100644 index 000000000..9952e5db4 --- /dev/null +++ b/web/skins/classic/css/dark/views/zones.css @@ -0,0 +1,20 @@ +.zones polygon { + fill-opacity: 0.25; + stroke-width: 2px; +} +.Active { + stroke: #ff0000; + fill: #ff0000; +} +.Inclusive { + stroke: #FFA500; + fill: #FFA500; +} +.Exclusive { + stroke: #800080; + fill: #800080; +} +.Preclusive { + stroke: #0000FF; + fill: #0000FF; +} diff --git a/web/skins/classic/css/flat/views/zone.css b/web/skins/classic/css/flat/views/zone.css index a86c5d1e4..52611f5ea 100644 --- a/web/skins/classic/css/flat/views/zone.css +++ b/web/skins/classic/css/flat/views/zone.css @@ -93,3 +93,23 @@ #zonePoints table a { margin: 0 2px; } +.zones polygon { + fill-opacity: 0.25; + stroke-width: 2px; +} +.Active { + stroke: #ff0000; + fill: #ff0000; +} +.Inclusive { + stroke: #FFA500; + fill: #FFA500; +} +.Exclusive { + stroke: #800080; + fill: #800080; +} +.Preclusive { + stroke: #0000FF; + fill: #0000FF; +} diff --git a/web/skins/classic/css/flat/views/zones.css b/web/skins/classic/css/flat/views/zones.css new file mode 100644 index 000000000..9952e5db4 --- /dev/null +++ b/web/skins/classic/css/flat/views/zones.css @@ -0,0 +1,20 @@ +.zones polygon { + fill-opacity: 0.25; + stroke-width: 2px; +} +.Active { + stroke: #ff0000; + fill: #ff0000; +} +.Inclusive { + stroke: #FFA500; + fill: #FFA500; +} +.Exclusive { + stroke: #800080; + fill: #800080; +} +.Preclusive { + stroke: #0000FF; + fill: #0000FF; +}