introduce chosen to use it to make the filtering dropdowns awesome

2017-12-13 16:15:03 -05:00 · 2017-12-13 16:15:03 -05:00 · abad266c5b
parent 4a1a9c48d5
commit abad266c5b
27 changed files with 7079 additions and 102 deletions
--- a/web/includes/Group.php
+++ b/web/includes/Group.php
@ -141,6 +141,7 @@ public $defaults = array(
    $depth = 0;
    $groups = array();
    $parent_group_ids = null;
+    session_start();
    while(1) {
      $Groups = Group::find_all( array('ParentId'=>$parent_group_ids) );
      if ( ! count( $Groups ) )
@ -148,10 +149,10 @@ public $defaults = array(

      $parent_group_ids = array();
      $selected_group_id = 0;
-      if ( isset($_REQUEST['group'.$depth]) and $_REQUEST['group'.$depth] > 0 ) {
-        $selected_group_id = $group_id = $_REQUEST['group'.$depth];
-      } else if ( isset($_COOKIE['zmGroup'.$depth] ) and $_COOKIE['zmGroup'.$depth] > 0 ) {
-        $selected_group_id = $group_id = $_COOKIE['zmGroup'.$depth];
+      if ( isset($_REQUEST['group'.$depth]) ) {
+        $selected_group_id = $group_id = $_SESSION['group'.$depth] = $_REQUEST['group'.$depth];
+      } else if ( isset($_REQUEST['filtering']) ) {
+        unset($_SESSION['group'.$depth]);
      }

      foreach ( $Groups as $Group ) {
@ -163,10 +164,11 @@ public $defaults = array(
          $parent_group_ids[] = $Group->Id();
      }

-      echo htmlSelect( 'group'.$depth, $groups[$depth], $selected_group_id, "changeGroup(this,$depth);" );
+      echo htmlSelect( 'group'.$depth, $groups[$depth], $selected_group_id, "this.form.submit();" );
      if ( ! count($parent_group_ids) ) break;
      $depth += 1;
    }
+    session_write_close();

    return $group_id;
  } # end public static function get_group_dropdowns()
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@ -96,6 +96,8 @@ if ( file_exists( "skins/$skin/css/$css/graphics/favicon.ico" ) ) {
  <script type="text/javascript" src="skins/<?php echo $skin; ?>/js/jquery.js"></script>
  <script type="text/javascript" src="skins/<?php echo $skin; ?>/js/jquery-ui.js"></script>
  <script type="text/javascript" src="skins/<?php echo $skin; ?>/js/bootstrap.min.js"></script>
+  <script type="text/javascript" src="skins/<?php echo $skin; ?>/js/chosen/chosen.jquery.min.js"></script>
+  <link href="skins/<?php echo $skin ?>/js/chosen/chosen.min.css" rel="stylesheet">
  <script type="text/javascript">
  //<![CDATA[
  <!--
@ -329,7 +331,11 @@ if ( canEdit('System') ) {
 <?php
 }
 ?>
-</body></html>
+</body>
+<script type="text/javascript">
+$j('.chosen').chosen();
+</script>
+</html>
 <?php
 } // end xhtmlFooter

--- a/web/skins/classic/js/chosen/bower.json
+++ b/web/skins/classic/js/chosen/bower.json
@ -0,0 +1,42 @@
+{
+  "name": "chosen",
+  "description": "Chosen is a JavaScript plugin that makes select boxes user-friendly. It is currently available in both jQuery and Prototype flavors.",
+  "keywords": [
+    "select",
+    "multiselect",
+    "dropdown",
+    "form",
+    "input",
+    "ui"
+  ],
+  "homepage": "https://harvesthq.github.io/chosen/",
+  "license": "https://github.com/harvesthq/chosen/blob/master/LICENSE.md",
+  "authors": [
+    {
+      "name": "Patrick Filler",
+      "url": "https://github.com/pfiller"
+    },
+    {
+      "name": "Christophe Coevoet",
+      "url": "https://github.com/stof"
+    },
+    {
+      "name": "Ken Earley",
+      "url": "https://github.com/kenearley"
+    },
+    {
+      "name": "Koen Punt",
+      "url": "https://github.com/koenpunt"
+    }
+  ],
+  "dependencies": {},
+  "main": [
+    "chosen.jquery.js",
+    "chosen.css"
+  ],
+  "ignore": [],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/harvesthq/chosen.git"
+  }
+}
--- a/web/skins/classic/js/chosen/chosen-sprite.png
+++ b/web/skins/classic/js/chosen/chosen-sprite.png
--- a/web/skins/classic/js/chosen/chosen-sprite@2x.png
+++ b/web/skins/classic/js/chosen/chosen-sprite@2x.png
--- a/web/skins/classic/js/chosen/chosen.css
+++ b/web/skins/classic/js/chosen/chosen.css
@ -0,0 +1,490 @@
+/*!
+Chosen, a Select Box Enhancer for jQuery and Prototype
+by Patrick Filler for Harvest, http://getharvest.com
+
+Version 1.8.2
+Full source at https://github.com/harvesthq/chosen
+Copyright (c) 2011-2017 Harvest http://getharvest.com
+
+MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+This file is generated by `grunt build`, do not edit it by hand.
+*/
+
+/* @group Base */
+.chosen-container {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  font-size: 13px;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+}
+
+.chosen-container * {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.chosen-container .chosen-drop {
+  position: absolute;
+  top: 100%;
+  z-index: 1010;
+  width: 100%;
+  border: 1px solid #aaa;
+  border-top: 0;
+  background: #fff;
+  -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
+          box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
+  clip: rect(0, 0, 0, 0);
+}
+
+.chosen-container.chosen-with-drop .chosen-drop {
+  clip: auto;
+}
+
+.chosen-container a {
+  cursor: pointer;
+}
+
+.chosen-container .search-choice .group-name, .chosen-container .chosen-single .group-name {
+  margin-right: 4px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-weight: normal;
+  color: #999999;
+}
+
+.chosen-container .search-choice .group-name:after, .chosen-container .chosen-single .group-name:after {
+  content: ":";
+  padding-left: 2px;
+  vertical-align: top;
+}
+
+/* @end */
+/* @group Single Chosen */
+.chosen-container-single .chosen-single {
+  position: relative;
+  display: block;
+  overflow: hidden;
+  padding: 0 0 0 8px;
+  height: 25px;
+  border: 1px solid #aaa;
+  border-radius: 5px;
+  background-color: #fff;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(20%, #fff), color-stop(50%, #f6f6f6), color-stop(52%, #eee), to(#f4f4f4));
+  background: linear-gradient(#fff 20%, #f6f6f6 50%, #eee 52%, #f4f4f4 100%);
+  background-clip: padding-box;
+  -webkit-box-shadow: 0 0 3px #fff inset, 0 1px 1px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 0 3px #fff inset, 0 1px 1px rgba(0, 0, 0, 0.1);
+  color: #444;
+  text-decoration: none;
+  white-space: nowrap;
+  line-height: 24px;
+}
+
+.chosen-container-single .chosen-default {
+  color: #999;
+}
+
+.chosen-container-single .chosen-single span {
+  display: block;
+  overflow: hidden;
+  margin-right: 26px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.chosen-container-single .chosen-single-with-deselect span {
+  margin-right: 38px;
+}
+
+.chosen-container-single .chosen-single abbr {
+  position: absolute;
+  top: 6px;
+  right: 26px;
+  display: block;
+  width: 12px;
+  height: 12px;
+  background: url("chosen-sprite.png") -42px 1px no-repeat;
+  font-size: 1px;
+}
+
+.chosen-container-single .chosen-single abbr:hover {
+  background-position: -42px -10px;
+}
+
+.chosen-container-single.chosen-disabled .chosen-single abbr:hover {
+  background-position: -42px -10px;
+}
+
+.chosen-container-single .chosen-single div {
+  position: absolute;
+  top: 0;
+  right: 0;
+  display: block;
+  width: 18px;
+  height: 100%;
+}
+
+.chosen-container-single .chosen-single div b {
+  display: block;
+  width: 100%;
+  height: 100%;
+  background: url("chosen-sprite.png") no-repeat 0px 2px;
+}
+
+.chosen-container-single .chosen-search {
+  position: relative;
+  z-index: 1010;
+  margin: 0;
+  padding: 3px 4px;
+  white-space: nowrap;
+}
+
+.chosen-container-single .chosen-search input[type="text"] {
+  margin: 1px 0;
+  padding: 4px 20px 4px 5px;
+  width: 100%;
+  height: auto;
+  outline: 0;
+  border: 1px solid #aaa;
+  background: url("chosen-sprite.png") no-repeat 100% -20px;
+  font-size: 1em;
+  font-family: sans-serif;
+  line-height: normal;
+  border-radius: 0;
+}
+
+.chosen-container-single .chosen-drop {
+  margin-top: -1px;
+  border-radius: 0 0 4px 4px;
+  background-clip: padding-box;
+}
+
+.chosen-container-single.chosen-container-single-nosearch .chosen-search {
+  position: absolute;
+  clip: rect(0, 0, 0, 0);
+}
+
+/* @end */
+/* @group Results */
+.chosen-container .chosen-results {
+  color: #444;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+  margin: 0 4px 4px 0;
+  padding: 0 0 0 4px;
+  max-height: 240px;
+  -webkit-overflow-scrolling: touch;
+}
+
+.chosen-container .chosen-results li {
+  display: none;
+  margin: 0;
+  padding: 5px 6px;
+  list-style: none;
+  line-height: 15px;
+  word-wrap: break-word;
+  -webkit-touch-callout: none;
+}
+
+.chosen-container .chosen-results li.active-result {
+  display: list-item;
+  cursor: pointer;
+}
+
+.chosen-container .chosen-results li.disabled-result {
+  display: list-item;
+  color: #ccc;
+  cursor: default;
+}
+
+.chosen-container .chosen-results li.highlighted {
+  background-color: #3875d7;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(20%, #3875d7), color-stop(90%, #2a62bc));
+  background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
+  color: #fff;
+}
+
+.chosen-container .chosen-results li.no-results {
+  color: #777;
+  display: list-item;
+  background: #f4f4f4;
+}
+
+.chosen-container .chosen-results li.group-result {
+  display: list-item;
+  font-weight: bold;
+  cursor: default;
+}
+
+.chosen-container .chosen-results li.group-option {
+  padding-left: 15px;
+}
+
+.chosen-container .chosen-results li em {
+  font-style: normal;
+  text-decoration: underline;
+}
+
+/* @end */
+/* @group Multi Chosen */
+.chosen-container-multi .chosen-choices {
+  position: relative;
+  overflow: hidden;
+  margin: 0;
+  padding: 0 5px;
+  width: 100%;
+  height: auto;
+  border: 1px solid #aaa;
+  background-color: #fff;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(1%, #eee), color-stop(15%, #fff));
+  background-image: linear-gradient(#eee 1%, #fff 15%);
+  cursor: text;
+}
+
+.chosen-container-multi .chosen-choices li {
+  float: left;
+  list-style: none;
+}
+
+.chosen-container-multi .chosen-choices li.search-field {
+  margin: 0;
+  padding: 0;
+  white-space: nowrap;
+}
+
+.chosen-container-multi .chosen-choices li.search-field input[type="text"] {
+  margin: 1px 0;
+  padding: 0;
+  height: 25px;
+  outline: 0;
+  border: 0 !important;
+  background: transparent !important;
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  color: #999;
+  font-size: 100%;
+  font-family: sans-serif;
+  line-height: normal;
+  border-radius: 0;
+  width: 25px;
+}
+
+.chosen-container-multi .chosen-choices li.search-choice {
+  position: relative;
+  margin: 3px 5px 3px 0;
+  padding: 3px 20px 3px 5px;
+  border: 1px solid #aaa;
+  max-width: 100%;
+  border-radius: 3px;
+  background-color: #eeeeee;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), to(#eee));
+  background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  background-size: 100% 19px;
+  background-repeat: repeat-x;
+  background-clip: padding-box;
+  -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+          box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  color: #333;
+  line-height: 13px;
+  cursor: default;
+}
+
+.chosen-container-multi .chosen-choices li.search-choice span {
+  word-wrap: break-word;
+}
+
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
+  position: absolute;
+  top: 4px;
+  right: 3px;
+  display: block;
+  width: 12px;
+  height: 12px;
+  background: url("chosen-sprite.png") -42px 1px no-repeat;
+  font-size: 1px;
+}
+
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover {
+  background-position: -42px -10px;
+}
+
+.chosen-container-multi .chosen-choices li.search-choice-disabled {
+  padding-right: 5px;
+  border: 1px solid #ccc;
+  background-color: #e4e4e4;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), to(#eee));
+  background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+  color: #666;
+}
+
+.chosen-container-multi .chosen-choices li.search-choice-focus {
+  background: #d4d4d4;
+}
+
+.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close {
+  background-position: -42px -10px;
+}
+
+.chosen-container-multi .chosen-results {
+  margin: 0;
+  padding: 0;
+}
+
+.chosen-container-multi .chosen-drop .result-selected {
+  display: list-item;
+  color: #ccc;
+  cursor: default;
+}
+
+/* @end */
+/* @group Active  */
+.chosen-container-active .chosen-single {
+  border: 1px solid #5897fb;
+  -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+          box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
+
+.chosen-container-active.chosen-with-drop .chosen-single {
+  border: 1px solid #aaa;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(20%, #eee), color-stop(80%, #fff));
+  background-image: linear-gradient(#eee 20%, #fff 80%);
+  -webkit-box-shadow: 0 1px 0 #fff inset;
+          box-shadow: 0 1px 0 #fff inset;
+}
+
+.chosen-container-active.chosen-with-drop .chosen-single div {
+  border-left: none;
+  background: transparent;
+}
+
+.chosen-container-active.chosen-with-drop .chosen-single div b {
+  background-position: -18px 2px;
+}
+
+.chosen-container-active .chosen-choices {
+  border: 1px solid #5897fb;
+  -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+          box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
+
+.chosen-container-active .chosen-choices li.search-field input[type="text"] {
+  color: #222 !important;
+}
+
+/* @end */
+/* @group Disabled Support */
+.chosen-disabled {
+  opacity: 0.5 !important;
+  cursor: default;
+}
+
+.chosen-disabled .chosen-single {
+  cursor: default;
+}
+
+.chosen-disabled .chosen-choices .search-choice .search-choice-close {
+  cursor: default;
+}
+
+/* @end */
+/* @group Right to Left */
+.chosen-rtl {
+  text-align: right;
+}
+
+.chosen-rtl .chosen-single {
+  overflow: visible;
+  padding: 0 8px 0 0;
+}
+
+.chosen-rtl .chosen-single span {
+  margin-right: 0;
+  margin-left: 26px;
+  direction: rtl;
+}
+
+.chosen-rtl .chosen-single-with-deselect span {
+  margin-left: 38px;
+}
+
+.chosen-rtl .chosen-single div {
+  right: auto;
+  left: 3px;
+}
+
+.chosen-rtl .chosen-single abbr {
+  right: auto;
+  left: 26px;
+}
+
+.chosen-rtl .chosen-choices li {
+  float: right;
+}
+
+.chosen-rtl .chosen-choices li.search-field input[type="text"] {
+  direction: rtl;
+}
+
+.chosen-rtl .chosen-choices li.search-choice {
+  margin: 3px 5px 3px 0;
+  padding: 3px 5px 3px 19px;
+}
+
+.chosen-rtl .chosen-choices li.search-choice .search-choice-close {
+  right: auto;
+  left: 4px;
+}
+
+.chosen-rtl.chosen-container-single .chosen-results {
+  margin: 0 0 4px 4px;
+  padding: 0 4px 0 0;
+}
+
+.chosen-rtl .chosen-results li.group-option {
+  padding-right: 15px;
+  padding-left: 0;
+}
+
+.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div {
+  border-right: none;
+}
+
+.chosen-rtl .chosen-search input[type="text"] {
+  padding: 4px 5px 4px 20px;
+  background: url("chosen-sprite.png") no-repeat -30px -20px;
+  direction: rtl;
+}
+
+.chosen-rtl.chosen-container-single .chosen-single div b {
+  background-position: 6px 2px;
+}
+
+.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b {
+  background-position: -12px 2px;
+}
+
+/* @end */
+/* @group Retina compatibility */
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi), only screen and (min-resolution: 1.5dppx) {
+  .chosen-rtl .chosen-search input[type="text"],
+  .chosen-container-single .chosen-single abbr,
+  .chosen-container-single .chosen-single div b,
+  .chosen-container-single .chosen-search input[type="text"],
+  .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
+  .chosen-container .chosen-results-scroll-down span,
+  .chosen-container .chosen-results-scroll-up span {
+    background-image: url("chosen-sprite@2x.png") !important;
+    background-size: 52px 37px !important;
+    background-repeat: no-repeat !important;
+  }
+}
+
+/* @end */
--- a/web/skins/classic/js/chosen/chosen.jquery.js
+++ b/web/skins/classic/js/chosen/chosen.jquery.js
--- a/web/skins/classic/js/chosen/chosen.jquery.min.js
+++ b/web/skins/classic/js/chosen/chosen.jquery.min.js
--- a/web/skins/classic/js/chosen/chosen.min.css
+++ b/web/skins/classic/js/chosen/chosen.min.css
--- a/web/skins/classic/js/chosen/chosen.proto.js
+++ b/web/skins/classic/js/chosen/chosen.proto.js
--- a/web/skins/classic/js/chosen/chosen.proto.min.js
+++ b/web/skins/classic/js/chosen/chosen.proto.min.js
--- a/web/skins/classic/js/chosen/docsupport/chosen.png
+++ b/web/skins/classic/js/chosen/docsupport/chosen.png
--- a/web/skins/classic/js/chosen/docsupport/init.js
+++ b/web/skins/classic/js/chosen/docsupport/init.js
@ -0,0 +1,11 @@
+var config = {
+  '.chosen-select'           : {},
+  '.chosen-select-deselect'  : { allow_single_deselect: true },
+  '.chosen-select-no-single' : { disable_search_threshold: 10 },
+  '.chosen-select-no-results': { no_results_text: 'Oops, nothing found!' },
+  '.chosen-select-rtl'       : { rtl: true },
+  '.chosen-select-width'     : { width: '95%' }
+}
+for (var selector in config) {
+  $(selector).chosen(config[selector]);
+}
--- a/web/skins/classic/js/chosen/docsupport/init.proto.js
+++ b/web/skins/classic/js/chosen/docsupport/init.proto.js
@ -0,0 +1,16 @@
+document.observe('dom:loaded', function(evt) {
+  var config = {
+    '.chosen-select'           : {},
+    '.chosen-select-deselect'  : { allow_single_deselect: true },
+    '.chosen-select-no-single' : { disable_search_threshold: 10 },
+    '.chosen-select-no-results': { no_results_text: 'Oops, nothing found!' },
+    '.chosen-select-rtl'       : { rtl: true },
+    '.chosen-select-width'     : { width: '95%' }
+  }
+  
+  for (var selector in config) {
+    $$(selector).each(function(element) {
+      new Chosen(element, config[selector]);
+    });
+  }
+});
--- a/web/skins/classic/js/chosen/docsupport/oss-credit.png
+++ b/web/skins/classic/js/chosen/docsupport/oss-credit.png
--- a/web/skins/classic/js/chosen/docsupport/prism.css
+++ b/web/skins/classic/js/chosen/docsupport/prism.css
@ -0,0 +1,108 @@
+/**
+ * okaidia theme for JavaScript, CSS and HTML
+ * Loosely based on Monokai textmate theme by http://www.monokai.nl/
+ * @author ocodia
+ */
+
+code[class*="language-"],
+pre[class*="language-"] {
+	color: #f8f8f2;
+	text-shadow: 0 1px rgba(0,0,0,0.3);
+	font-family: Consolas, Monaco, 'Andale Mono', monospace;
+	direction: ltr;
+	text-align: left;
+	white-space: pre;
+	word-spacing: normal;
+	
+	-moz-tab-size: 4;
+	-o-tab-size: 4;
+	tab-size: 4;
+	
+	-webkit-hyphens: none;
+	-moz-hyphens: none;
+	-ms-hyphens: none;
+	hyphens: none;
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+	padding: 1em;
+	margin: .5em 0;
+	overflow: auto;	
+	border-radius: 0.3em;
+}
+
+:not(pre) > code[class*="language-"],
+pre[class*="language-"] {
+	background: #272822;
+}
+
+/* Inline code */
+:not(pre) > code[class*="language-"] {
+	padding: .1em;
+	border-radius: .3em;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+	color: slategray;
+}
+
+.token.punctuation {
+	color: #f8f8f2;
+}
+
+.namespace {
+	opacity: .7;
+}
+
+.token.property,
+.token.tag {
+	color: #f92672;
+}
+
+.token.boolean,
+.token.number{
+	color: #ae81ff;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string {
+	color: #a6e22e;
+}
+
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+	color: #f8f8f2;
+}
+
+.token.atrule,
+.token.attr-value
+{
+	color: #e6db74;
+}
+
+
+.token.keyword{
+color: #66d9ef;
+}
+
+.token.regex,
+.token.important {
+	color: #fd971f;
+}
+
+.token.important {
+	font-weight: bold;
+}
+
+.token.entity {
+	cursor: help;
+}
--- a/web/skins/classic/js/chosen/docsupport/prism.js
+++ b/web/skins/classic/js/chosen/docsupport/prism.js
@ -0,0 +1,9 @@
+/**
+ * Prism: Lightweight, robust, elegant syntax highlighting
+ * MIT license http://www.opensource.org/licenses/mit-license.php/
+ * @author Lea Verou http://lea.verou.me
+ */(function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={util:{type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var r={};for(var i in e)e.hasOwnProperty(i)&&(r[i]=t.util.clone(e[i]));return r;case"Array":return e.slice()}return e}},languages:{extend:function(e,n){var r=t.util.clone(t.languages[e]);for(var i in n)r[i]=n[i];return r},insertBefore:function(e,n,r,i){i=i||t.languages;var s=i[e],o={};for(var u in s)if(s.hasOwnProperty(u)){if(u==n)for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);o[u]=s[u]}return i[e]=o},DFS:function(e,n){for(var r in e){n.call(e,r,e[r]);t.util.type(e)==="Object"&&t.languages.DFS(e[r],n)}}},highlightAll:function(e,n){var r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');for(var i=0,s;s=r[i++];)t.highlightElement(s,e===!0,n)},highlightElement:function(r,i,s){var o,u,a=r;while(a&&!e.test(a.className))a=a.parentNode;if(a){o=(a.className.match(e)||[,""])[1];u=t.languages[o]}if(!u)return;r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+o;a=r.parentNode;/pre/i.test(a.nodeName)&&(a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+o);var f=r.textContent;if(!f)return;f=f.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ");var l={element:r,language:o,grammar:u,code:f};t.hooks.run("before-highlight",l);if(i&&self.Worker){var c=new Worker(t.filename);c.onmessage=function(e){l.highlightedCode=n.stringify(JSON.parse(e.data),o);t.hooks.run("before-insert",l);l.element.innerHTML=l.highlightedCode;s&&s.call(l.element);t.hooks.run("after-highlight",l)};c.postMessage(JSON.stringify({language:l.language,code:l.code}))}else{l.highlightedCode=t.highlight(l.code,l.grammar,l.language);t.hooks.run("before-insert",l);l.element.innerHTML=l.highlightedCode;s&&s.call(r);t.hooks.run("after-highlight",l)}},highlight:function(e,r,i){return n.stringify(t.tokenize(e,r),i)},tokenize:function(e,n,r){var i=t.Token,s=[e],o=n.rest;if(o){for(var u in o)n[u]=o[u];delete n.rest}e:for(var u in n){if(!n.hasOwnProperty(u)||!n[u])continue;var a=n[u],f=a.inside,l=!!a.lookbehind,c=0;a=a.pattern||a;for(var h=0;h<s.length;h++){var p=s[h];if(s.length>e.length)break e;if(p instanceof i)continue;a.lastIndex=0;var d=a.exec(p);if(d){l&&(c=d[1].length);var v=d.index-1+c,d=d[0].slice(c),m=d.length,g=v+m,y=p.slice(0,v+1),b=p.slice(g+1),w=[h,1];y&&w.push(y);var E=new i(u,f?t.tokenize(d,f):d);w.push(E);b&&w.push(b);Array.prototype.splice.apply(s,w)}}}return s},hooks:{all:{},add:function(e,n){var r=t.hooks.all;r[e]=r[e]||[];r[e].push(n)},run:function(e,n){var r=t.hooks.all[e];if(!r||!r.length)return;for(var i=0,s;s=r[i++];)s(n)}}},n=t.Token=function(e,t){this.type=e;this.content=t};n.stringify=function(e,r,i){if(typeof e=="string")return e;if(Object.prototype.toString.call(e)=="[object Array]")return e.map(function(t){return n.stringify(t,r,e)}).join("");var s={type:e.type,content:n.stringify(e.content,r,i),tag:"span",classes:["token",e.type],attributes:{},language:r,parent:i};s.type=="comment"&&(s.attributes.spellcheck="true");t.hooks.run("wrap",s);var o="";for(var u in s.attributes)o+=u+'="'+(s.attributes[u]||"")+'"';return"<"+s.tag+' class="'+s.classes.join(" ")+'" '+o+">"+s.content+"</"+s.tag+">"};if(!self.document){self.addEventListener("message",function(e){var n=JSON.parse(e.data),r=n.language,i=n.code;self.postMessage(JSON.stringify(t.tokenize(i,t.languages[r])));self.close()},!1);return}var r=document.getElementsByTagName("script");r=r[r.length-1];if(r){t.filename=r.src;document.addEventListener&&!r.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)}})();;
+Prism.languages.markup={comment:/&lt;!--[\w\W]*?-->/g,prolog:/&lt;\?.+?\?>/,doctype:/&lt;!DOCTYPE.+?>/,cdata:/&lt;!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/&lt;\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi,inside:{tag:{pattern:/^&lt;\/?[\w:-]+/i,inside:{punctuation:/^&lt;\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/gi,inside:{punctuation:/=|>|"/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&amp;#?[\da-z]{1,8};/gi};Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&amp;/,"&"))});;
+Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*{))/gi,inside:{punctuation:/[;:]/g}},url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/g,property:/(\b|\B)[\w-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(&lt;|<)style[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/style(>|&gt;)/ig,inside:{tag:{pattern:/(&lt;|<)style[\w\W]*?(>|&gt;)|(&lt;|<)\/style(>|&gt;)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}});;
+Prism.languages.clike={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/ig,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,"function":{pattern:/[a-z0-9_]+\(/ig,inside:{punctuation:/\(/}}, number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,operator:/[-+]{1,2}|!|&lt;=?|>=?|={1,3}|(&amp;){1,2}|\|?\||\?|\*|\/|\~|\^|\%/g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g};;
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|catch|finally|null|break|continue)\b/g,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?|NaN|-?Infinity)\b/g});Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0}});Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(&lt;|<)script[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/script(>|&gt;)/ig,inside:{tag:{pattern:/(&lt;|<)script[\w\W]*?(>|&gt;)|(&lt;|<)\/script(>|&gt;)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}});;
--- a/web/skins/classic/js/chosen/docsupport/style.css
+++ b/web/skins/classic/js/chosen/docsupport/style.css
@ -0,0 +1,219 @@
+/* Reset */
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, time, mark, audio, video { margin: 0; padding: 0; border: 0; font-size: 100%; font: inherit; vertical-align: baseline; }
+
+article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { display: block; }
+
+blockquote, q { quotes: none; }
+blockquote:before, blockquote:after, q:before, q:after { content: ""; content: none; }
+ins { background-color: #ff9; color: #000; text-decoration: none; }
+mark { background-color: #ff9; color: #000; font-style: italic; font-weight: bold; }
+del { text-decoration: line-through; }
+abbr[title], dfn[title] { border-bottom: 1px dotted; cursor: help; }
+table { border-collapse: collapse; border-spacing: 0; }
+hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
+input, select { vertical-align: middle; }
+
+body { font:13px/1.231 sans-serif; *font-size:small; } /* Hack retained to preserve specificity */
+select, input, textarea, button { font:99% sans-serif; }
+pre, code, kbd, samp { font-family: monospace, sans-serif; }
+
+
+body { background: #EEE; color: #444; line-height: 1.4em; }
+
+header h1 { color: black; font-size: 2em; line-height: 1.1em; display: inline-block; height: 27px; margin: 20px 0 25px; }
+header h1 small { font-size: 0.6em; }
+
+div#content { background: white; border: 1px solid #ccc; border-width: 0 1px 1px; margin: 0 auto; padding: 40px 50px 40px; width: 738px; }
+
+footer { color: #999; padding-top: 40px; font-size: 0.8em; text-align: center; }
+
+body { font-family: sans-serif; font-size: 1em; }
+
+p { margin: 0 0 .7em; max-width: 700px; }
+table+p { margin-top: 1em; }
+
+h2 { border-bottom: 1px solid #ccc; font-size: 1.2em; margin: 3em 0 1em 0; font-weight: bold;}
+h3 { font-weight: bold; }
+
+h2.intro { border-bottom: none; font-size: 1em; font-weight: normal; margin-top:0; }
+
+ul li { list-style: disc; margin-left: 1em; margin-bottom: 1.25em; }
+ol li { margin-left: 1.25em; }
+ol ul, ul ul { margin: .25em 0 0; }
+ol ul li, ul ul li { list-style-type: circle; margin: 0 0 .25em 1em; }
+
+li > p { margin-top: .25em; }
+
+div.side-by-side { width: 100%; margin-bottom: 1em; }
+div.side-by-side > div { float: left; width: 49%; }
+div.side-by-side > div > em { margin-bottom: 10px; display: block; }
+
+.faqs em { display: block; }
+
+.clearfix:after {
+  content: "\0020";
+  display: block;
+  height: 0;
+  clear: both;
+  overflow: hidden;
+  visibility: hidden;
+}
+
+a { color: #F36C00; outline: none; text-decoration: none; }
+a:hover { text-decoration: underline; }
+
+ul.credits li { margin-bottom: .25em; }
+
+strong { font-weight: bold; }
+i { font-style: italic; }
+
+.button {
+  background: #fafafa;
+  background: -webkit-linear-gradient(top, #ffffff, #eeeeee);
+  background: -moz-linear-gradient(top, #ffffff, #eeeeee);
+  background: -o-linear-gradient(top, #ffffff, #eeeeee);
+  background: linear-gradient(to bottom, #ffffff, #eeeeee);
+  border: 1px solid #bbbbbb;
+  border-radius: 4px;
+  box-shadow: inset 0 1px 1px rgba(255, 255, 255, 0.2);
+  color: #555555;
+  cursor: pointer;
+  display: inline-block;
+  font-family: "Helvetica Neue", Arial, Verdana, "Nimbus Sans L", sans-serif;
+  font-size: 13px;
+  font-weight: 500;
+  height: 31px;
+  line-height: 28px;
+  outline: none;
+  padding: 0 13px;
+  text-shadow: 0 1px 0 white;
+  text-decoration: none;
+  vertical-align: middle;
+  white-space: nowrap;
+  -webkit-font-smoothing: antialiased;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+.button-blue {
+  background: #1385e5;
+  background: -webkit-linear-gradient(top, #53b2fc, #1385e5);
+  background: -moz-linear-gradient(top, #53b2fc, #1385e5);
+  background: -o-linear-gradient(top, #53b2fc, #1385e5);
+  background: linear-gradient(to bottom, #53b2fc, #1385e5);
+  border-color: #075fa9;
+  color: white;
+  font-weight: bold;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.4);
+}
+
+
+/* Tweak navbar brand link to be super sleek
+-------------------------------------------------- */
+.oss-bar {
+  top: 0;
+  right: 20px;
+  position: fixed;
+  z-index: 1030;
+}
+.oss-bar ul {
+  float: right;
+  margin: 0;
+  list-style: none;
+}
+.oss-bar ul li {
+  list-style: none;
+  float: left;
+  line-height: 0;
+  margin: 0;
+}
+.oss-bar ul li a {
+   -moz-box-sizing:    border-box;
+  -webkit-box-sizing: border-box;
+  -ms-box-sizing:     border-box;
+   box-sizing:        border-box;
+  border: 0;
+  margin-top: -10px;
+  display: block;
+  height: 58px;
+  background: #F36C00 url(oss-credit.png) no-repeat 20px 22px;
+  padding: 22px 20px 12px 20px;
+  text-indent: 120%; /* stupid padding */
+  white-space: nowrap;
+  overflow: hidden;
+  -webkit-transition: all 0.10s ease-in-out;
+  -moz-transition: all 0.10s ease-in-out;
+  transition: all 0.15s ease-in-out;
+}
+.oss-bar ul li a:hover {
+  margin-top: 0px;
+}
+.oss-bar a.harvest {
+  width: 196px;
+  background-color: #F36C00;
+  background-position: -142px 22px;
+  padding-right: 22px; /* optical illusion */
+}
+.oss-bar a.fork {
+  width: 162px;
+  background-color: #333333;
+}
+
+.docs-table th, .docs-table td {
+  border: 1px solid #000;
+  padding: 4px 6px;
+  white-space: nowrap;
+}
+
+.docs-table td:last-child {
+  white-space: normal;
+}
+
+.docs-table th {
+  font-weight: bold;
+  text-align: left;
+}
+
+#content pre[class*=language-] {
+  font-size: 14px;
+  margin-bottom: 20px;
+}
+
+#content pre[class*=language-] code {
+  font-size: 14px;
+  padding: 0;
+}
+
+#content code[class*=language-] {
+  font-size: 12px;
+  padding: 2px 4px;
+}
+
+.anchor {
+  color: inherit;
+  position: relative;
+}
+
+.anchor:hover {
+  background: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSI3Ij48ZyBmaWxsPSIjNDE0MDQyIj48cGF0aCBkPSJNOS44IDdoLS45bC0uOS0uMWMtLjctLjMtMS40LS43LTEuOC0xLjMtLjItLjEtLjMtLjMtLjMtLjVsLS4zLS40Yy0uMS0uNC0uMi0uOC0uMi0xLjIgMC0uNC4xLS44LjItMS4yaDEuN2MtLjMuNC0uNC44LS40IDEuMiAwIC40LjEuOC4zIDEuMS4xLjIuMi4zLjQuNC4xLjEuMi4yLjQuMy4zLjIuNy4zIDEgLjNoMy40YzEuMiAwIDIuMi0uOSAyLjItMi4xcy0xLTIuMS0yLjItMi4xaC0xLjRjLS4zLS42LS43LTEtMS4yLTEuNGgyLjZjMiAwIDMuNiAxLjYgMy42IDMuNXMtMS42IDMuNS0zLjYgMy41aC0yLjZ6TTguNCAyYy0uMS0uMS0uMi0uMy0uNC0uMy0uMy0uMi0uNy0uMy0xLS4zaC0zLjRjLTEuMiAwLTIuMi45LTIuMiAyLjEgMCAxLjIgMSAyLjEgMi4yIDIuMWgxLjRjLjMuNS43IDEgMS4yIDEuNGgtMi42Yy0yIDAtMy42LTEuNi0zLjYtMy41czEuNi0zLjUgMy42LTMuNWgzLjUwMDAwMDAwMDAwMDAwMDRsLjkuMWMuNy4yIDEuNC43IDEuOCAxLjMuMS4xLjIuMy4zLjUuMS4xLjIuMy4yLjUuMS40LjIuOC4yIDEuMiAwIC40LS4xLjgtLjIgMS4yaC0xLjZjLjMtLjUuNC0uOS40LTEuM3MtLjEtLjgtLjMtMS4xYy0uMS0uMi0uMi0uMy0uNC0uNHoiLz48L2c+PC9zdmc+) 0 50% no-repeat;
+  background-size: 21px 9px;
+  margin-left: -27px;
+  padding-left: 27px;
+  text-decoration: none;
+}
+
+.select,
+.chosen-select,
+.chosen-select-no-single,
+.chosen-select-no-results,
+.chosen-select-deselect,
+.chosen-select-rtl,
+.chosen-select-width {
+  width: 350px;
+}
+
+.jquery-version-refer {
+  margin-top: 40px;
+  font-style: italic;
+}
--- a/web/skins/classic/js/chosen/index.html
+++ b/web/skins/classic/js/chosen/index.html
--- a/web/skins/classic/js/chosen/index.proto.html
+++ b/web/skins/classic/js/chosen/index.proto.html
--- a/web/skins/classic/js/chosen/options.html
+++ b/web/skins/classic/js/chosen/options.html
@ -0,0 +1,306 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Chosen: A jQuery Plugin by Harvest to Tame Unwieldy Select Boxes</title>
+  <link rel="stylesheet" href="docsupport/style.css">
+  <link rel="stylesheet" href="docsupport/prism.css">
+  <link rel="stylesheet" href="chosen.css">
+  <style type="text/css" media="all">
+    /* fix rtl for demo */
+    .chosen-rtl .chosen-drop { left: -9000px; }
+  </style>
+</head>
+<body>
+  <div id="container">
+    <div id="content">
+      <header>
+        <h1>Chosen <small>(<span id="latest-version">v1.8.2</span>)</small></h1>
+      </header>
+      <p>Chosen has a number of options and attributes that allow you to have full control of your select boxes.</p>
+
+      <h2><a name="options" class="anchor" href="#options">Options</a></h2>
+      <p>The following options are available to pass into Chosen on instantiation.</p>
+
+      <h3>Example:</h3>
+<pre>
+  <code class="language-javascript">$(".my_select_box").chosen({
+    disable_search_threshold: 10,
+    no_results_text: "Oops, nothing found!",
+    width: "95%"
+  });</code>
+</pre>
+
+      <table class="docs-table">
+        <tr>
+          <th>Option</th><th>Default</th><th>Description</th>
+        </tr>
+        <tr>
+          <td>allow_single_deselect</td>
+          <td>false</td>
+          <td>When set to <code class="language-javascript">true</code> on a single select, Chosen adds a UI element which selects the first element (if it is blank).</td>
+        </tr>
+        <tr>
+          <td>disable_search</td>
+          <td>false</td>
+          <td>When set to <code class="language-javascript">true</code>, Chosen will not display the search field (single selects only).</td>
+        </tr>
+        <tr>
+          <td>disable_search_threshold</td>
+          <td>0</td>
+          <td>Hide the search input on single selects if there are <i>n</i> or fewer options.</td>
+        </tr>
+        <tr>
+          <td>enable_split_word_search</td>
+          <td>true</td>
+          <td>By default, searching will match on any word within an option tag. Set this option to <code class="language-javascript">false</code> if you want to only match on the entire text of an option tag.</td>
+        </tr>
+        <tr>
+          <td>inherit_select_classes</td>
+          <td>false</td>
+          <td>When set to <code class="language-javascript">true</code>, Chosen will grab any classes on the original select field and add them to Chosen’s container div.</td>
+        </tr>
+        <tr>
+          <td>max_selected_options</td>
+          <td>Infinity</td>
+          <td>Limits how many options the user can select. When the limit is reached, the <code class="language-javascript">chosen:maxselected</code> event is triggered.</td>
+        </tr>
+        <tr>
+          <td>no_results_text</td>
+          <td>"No results match"</td>
+          <td>The text to be displayed when no matching results are found. The current search is shown at the end of the text (<i>e.g.</i>,
+           No results match "Bad Search").</td>
+        </tr>
+        <tr>
+          <td>placeholder_text_multiple</td>
+          <td>"Select Some Options"</td>
+          <td>The text to be displayed as a placeholder when no options are selected for a multiple select.</td>
+        </tr>
+        <tr>
+          <td>placeholder_text_single</td>
+          <td>"Select an Option"</td>
+          <td>The text to be displayed as a placeholder when no options are selected for a single select.</td>
+        </tr>
+        <tr>
+          <td>search_contains</td>
+          <td>false</td>
+          <td>By default, Chosen’s search matches starting at the beginning of a word. Setting this option to <code class="language-javascript">true</code> allows matches starting from anywhere within a word. This is especially useful for options that include a lot of special characters or phrases in ()s and []s.</td>
+        </tr>
+        <tr>
+          <td>single_backstroke_delete</td>
+          <td>true</td>
+          <td>By default, pressing delete/backspace on multiple selects will remove a selected choice. When <code class="language-javascript">false</code>, pressing delete/backspace will highlight the last choice, and a second press deselects it.</td>
+        </tr>
+        <tr>
+          <td>width</td>
+          <td>Original select width.</td>
+          <td>The width of the Chosen select box. By default, Chosen attempts to match the width of the select box you are replacing. If your select is hidden when Chosen is instantiated, you must specify a width or the select will show up with a width of 0.</td>
+        </tr>
+        <tr>
+          <td>display_disabled_options</td>
+          <td>true</td>
+          <td>By default, Chosen includes disabled options in search results with a special styling. Setting this option to false will hide disabled results and exclude them from searches.</td>
+        </tr>
+        <tr>
+          <td>display_selected_options</td>
+          <td>true</td>
+          <td>
+            <p>By default, Chosen includes selected options in search results with a special styling. Setting this option to false will hide selected results and exclude them from searches.</p>
+            <p><strong>Note:</strong> this is for multiple selects only. In single selects, the selected result will always be displayed.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>include_group_label_in_selected</td>
+          <td>false</td>
+          <td>
+            <p>By default, Chosen only shows the text of a selected option. Setting this option to <code class="language-javascript">true</code> will show the text and group (if any) of the selected option.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>max_shown_results</td>
+          <td>Infinity</td>
+          <td>
+            <p>Only show the first (n) matching options in the results. This can be used to increase performance for selects with very many options.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>case_sensitive_search</td>
+          <td>false</td>
+          <td>
+            <p>By default Chosen's search is case-insensitive. Setting this option to <code class="language-javascript">true</code> makes the search case-sensitive.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>hide_results_on_select</td>
+          <td>true</td>
+          <td>
+            <p>By default Chosen's results are hidden after a option is selected. Setting this option to <code class="language-javascript">false</code> will keep the results open after selection. This only applies to multiple selects.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>rtl</td>
+          <td>false</td>
+          <td>
+            <p>Chosen supports right-to-left text in select boxes. Set this option to <code class="language-javascript">true</code> to support right-to-left text options.</p>
+            <p><strong>Note:</strong> <a href="#classes">the <code class="language-javascript">chosen-rtl</code> class</a> on the select has precedence over this option. However, the classname approach is deprecated and will be removed in future versions of Chosen.</p>
+          </td>
+        </tr>
+      </table>
+
+      <h2><a name="attributes" class="anchor" href="#attributes">Attributes</a></h2>
+      <p>Certain attributes placed on the select tag or its options can be used to configure Chosen.</p>
+
+      <h3>Example:</h3>
+
+<pre>
+  <code class="language-markup">&lt;select class="my_select_box" data-placeholder="Select Your Options"&gt;
+    &lt;option value="1"&gt;Option 1&lt;/option&gt;
+    &lt;option value="2" selected&gt;Option 2&lt;/option&gt;
+    &lt;option value="3" disabled&gt;Option 3&lt;/option&gt;
+  &lt;/select&gt;</code>
+</pre>
+
+      <table class="docs-table">
+        <tr>
+          <th>Attribute</th><th>Description</th>
+        </tr>
+        <tr>
+          <td>data-placeholder</td>
+          <td>
+            <p>The text to be displayed as a placeholder when no options are selected for a select. Defaults to "Select an Option" for single selects or "Select Some Options" for multiple selects.</p>
+            <p><strong>Note:</strong>This attribute overrides anything set in the <code class="language-javascript">placeholder_text_multiple</code> or <code class="language-javascript">placeholder_text_single</code> options.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>multiple</td>
+          <td>The attribute <code class="language-html">multiple</code> on your select box dictates whether Chosen will render a multiple or single select.</td>
+        </tr>
+        <tr>
+          <td>selected, disabled</td>
+          <td>Chosen automatically highlights selected options and disables disabled options.</td>
+        </tr>
+      </table>
+
+      <h2><a name="classes" class="anchor" href="#classes">Classes</a></h2>
+      <p>Classes placed on the select tag can be used to configure Chosen.</p>
+
+      <h3>Example:</h3>
+
+<pre>
+  <code class="language-markup">&lt;select class="my_select_box chosen-rtl"&gt;
+    &lt;option value="1"&gt;Option 1&lt;/option&gt;
+    &lt;option value="2"&gt;Option 2&lt;/option&gt;
+    &lt;option value="3"&gt;Option 3&lt;/option&gt;
+  &lt;/select&gt;</code>
+</pre>
+
+      <table class="docs-table">
+        <tr>
+          <th>Classname</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>chosen-rtl</td>
+          <td>
+            <p>Chosen supports right-to-left text in select boxes. Add the class <code class="language-html">chosen-rtl</code> to your select tag to support right-to-left text options.</p>
+            <p><strong>Note:</strong> The <code class="language-html">chosen-rtl</code> class will pass through to the Chosen select even when the <code class="language-javascript">inherit_select_classes</code> option is set to <code class="language-javascript">false</code>.</p>
+            <p><strong>Note:</strong> This is deprecated in favor of using the <code class="language-javascript">rtl: true</code> option (see the <a href="#options">Options section</a>).</p>
+          </td>
+        </tr>
+      </table>
+
+      <h2><a name="triggered-events" class="anchor" href="#triggered-events">Triggered Events</a></h2>
+      <p>Chosen triggers a number of standard and custom events on the original select field.</p>
+
+      <h3>Example:</h3>
+
+<pre>
+  <code class="language-javascript">$('.my_select_box').on('change', function(evt, params) {
+    do_something(evt, params);
+  });</code>
+</pre>
+
+      <table class="docs-table">
+        <tr>
+          <th>Event</th><th>Description</th>
+        </tr>
+        <tr>
+          <td>change</td>
+          <td>
+            <p>Chosen triggers the standard DOM event whenever a selection is made (it also sends a <code class="language-javascript">selected</code> or <code class="language-javascript">deselected</code> parameter that tells you which option was changed).</p>
+            <p><strong>Note:</strong> The selected and deselected parameters are not available for Prototype.</p>
+          </td>
+        </tr>
+        <tr>
+          <td>chosen:ready</td>
+          <td>Triggered after Chosen has been fully instantiated.</td>
+        </tr>
+        <tr>
+          <td>chosen:maxselected</td>
+          <td>Triggered if <code class="language-javascript">max_selected_options</code> is set and that total is broken.</td>
+        </tr>
+        <tr>
+          <td>chosen:showing_dropdown</td>
+          <td>Triggered when Chosen’s dropdown is opened.</td>
+        </tr>
+        <tr>
+          <td>chosen:hiding_dropdown</td>
+          <td>Triggered when Chosen’s dropdown is closed.</td>
+        </tr>
+        <tr>
+          <td>chosen:no_results</td>
+          <td>Triggered when a search returns no matching results.</td>
+        </tr>
+      </table>
+
+      <p>
+        <strong>Note:</strong> all custom Chosen events (those that begin with <code class="language-javascript">chosen:</code>) also include the <code class="language-javascript">chosen</code> object as a parameter.
+      </p>
+
+      <h2><a name="triggerable-events" class="anchor" href="#triggerable-events">Triggerable Events</a></h2>
+      <p>You can trigger several events on the original select field to invoke a behavior in Chosen.</p>
+
+      <h3>Example:</h3>
+
+<pre>
+  <code class="language-javascript">// tell Chosen that a select has changed
+  $('.my_select_box').trigger('chosen:updated');</code>
+</pre>
+
+      <table class="docs-table">
+        <tr>
+          <th>Event</th><th>Description</th>
+        </tr>
+        <tr>
+          <td>chosen:updated</td>
+          <td>This event should be triggered whenever Chosen’s underlying select element changes (such as a change in selected options).</td>
+        </tr>
+        <tr>
+          <td>chosen:activate</td>
+          <td>This is the equivalant of focusing a standard HTML select field. When activated, Chosen will capure keypress events as if you had clicked the field directly.</td>
+        </tr>
+        <tr>
+          <td>chosen:open</td>
+          <td>This event activates Chosen and also displays the search results.</td>
+        </tr>
+        <tr>
+          <td>chosen:close</td>
+          <td>This event deactivates Chosen and hides the search results.</td>
+        </tr>
+      </table>
+
+      <footer>
+        &copy; 2011&ndash;2016 <a href="http://www.getharvest.com/">Harvest</a>. Chosen is licensed under the <a href="https://github.com/harvesthq/chosen/blob/master/LICENSE.md">MIT license</a>.
+      </footer>
+
+    </div>
+  </div>
+  <div class="oss-bar">
+    <ul>
+      <li><a class="fork" href="https://github.com/harvesthq/chosen">Fork on Github</a></li>
+      <li><a class="harvest" href="http://www.getharvest.com/">Built by Harvest</a></li>
+    </ul>
+  </div>
+  <script src="docsupport/prism.js" type="text/javascript" charset="utf-8"></script>
+</body>
+</html>
--- a/web/skins/classic/js/chosen/package.json
+++ b/web/skins/classic/js/chosen/package.json
@ -0,0 +1,50 @@
+{
+  "name": "chosen-js",
+  "version": "1.8.1",
+  "description": "Chosen is a JavaScript plugin that makes select boxes user-friendly. It is currently available in both jQuery and Prototype flavors.",
+  "keywords": [
+    "select",
+    "multiselect",
+    "dropdown",
+    "form",
+    "input",
+    "ui"
+  ],
+  "homepage": "https://harvesthq.github.io/chosen/",
+  "bugs": "https://github.com/harvesthq/chosen/issues",
+  "license": "MIT",
+  "contributors": [
+    {
+      "name": "Patrick Filler",
+      "url": "https://github.com/pfiller"
+    },
+    {
+      "name": "Christophe Coevoet",
+      "url": "https://github.com/stof"
+    },
+    {
+      "name": "Ken Earley",
+      "url": "https://github.com/kenearley"
+    },
+    {
+      "name": "Koen Punt",
+      "url": "https://github.com/koenpunt"
+    }
+  ],
+  "dependencies": {},
+  "files": [
+    "chosen.jquery.js",
+    "chosen.jquery.min.js",
+    "chosen.proto.js",
+    "chosen.proto.min.js",
+    "chosen.css",
+    "chosen.min.css",
+    "chosen-sprite@2x.png",
+    "chosen-sprite.png"
+  ],
+  "main": "chosen.jquery.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/harvesthq/chosen.git"
+  }
+}
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@ -335,21 +335,6 @@ function addVideoTimingTrack(video, LabelFormat, monitorName, duration, startTim
 }
 */

-function changeGroup( e, depth ) {
-  var group_id = $('group'+depth).get('value');
-  Cookie.write( 'zmGroup'+depth, group_id, { duration: 10*365 } );
-  window.location = window.location;
-}
-function changeMonitor( e ) {
-  var monitor_id = e.value;
-  Cookie.write( 'MonitorId', monitor_id, { duration: 10*365 } );
-  window.location = window.location;
-}
-function changeFilter( e ) {
-  Cookie.write( e.name, e.value, { duration: 10*365 } );
-  window.location = window.location;
-}
-
 var resizeTimer;

 function endOfResize(e) {
--- a/web/skins/classic/views/_monitor_filters.php
+++ b/web/skins/classic/views/_monitor_filters.php
@ -24,19 +24,15 @@ foreach ( $servers as $S ) {
  $ServersById[$S->Id()] = $S;
 }
 session_start();
-foreach ( array('ServerFilter','StorageFilter','StatusFilter','MonitorId') as $var ) {
+foreach ( array('ServerId','StorageId','Status','MonitorId') as $var ) {
  if ( isset( $_REQUEST[$var] ) ) {
    if ( $_REQUEST[$var] != '' ) {
      $_SESSION[$var] = $_REQUEST[$var];
    } else {
      unset( $_SESSION[$var] );
    }
-  } else if ( isset( $_COOKIE[$var] ) ) {
-    if ( $_COOKIE[$var] != '' ) {
-      $_SESSION[$var] = $_COOKIE[$var];
-    } else {
-      unset($_SESSION[$var]);
-    }
+  } else if ( isset( $_REQUEST['filtering'] ) ) {
+    unset( $_SESSION[$var] );
  }
 }
 session_write_close();
@ -49,6 +45,7 @@ foreach ( $storage_areas as $S ) {

 ?>
 <div class="controlHeader">
+<input type="hidden" name="filtering" value="" />
  <span id="groupControl"><label><?php echo translate('Group') ?>:</label>
 <?php
 # This will end up with the group_id of the deepest selection
@ -59,23 +56,26 @@ $groupSql = Group::get_group_sql( $group_id );
  <span id="monitorControl"><label><?php echo translate('Monitor') ?>:</label>
 <?php

-  $monitor_id = isset($_SESSION['MonitorId']) ? $_SESSION['MonitorId'] : 0;
-
-  # Used to determine if the Cycle button should be made available
+$selected_monitor_ids = isset($_SESSION['MonitorId']) ? $_SESSION['MonitorId'] : array();
+if ( ! is_array( $selected_monitor_ids ) ) {
+  Warning("Turning selected_monitor_ids into an array $selected_monitor_ids");
+  $selected_monitor_ids = array( $selected_monitor_ids );
+}

  $conditions = array();
  $values = array();

  if ( $groupSql )
    $conditions[] = $groupSql;
-  if ( isset($_SESSION['ServerFilter']) ) {
-    $conditions[] = 'ServerId=?';
-    $values[] = $_SESSION['ServerFilter'];
-  }
-  if ( isset($_SESSION['StorageFilter']) ) {
-    $conditions[] = 'StorageId=?';
-    $values[] = $_SESSION['StorageFilter'];
-  }
+  foreach ( array('ServerId','StorageId','Status') as $filter ) {
+    if ( isset($_SESSION[$filter]) ) {
+      if ( is_array($_SESSION[$filter]) ) 
+        $conditions[] = $filter . ' IN ('.implode(',', array_map(function(){return '?';}, $_SESSION[$filter] ) ). ')';
+      else
+        $conditions[] = $filter . '=?';
+      $values[] = $_SESSION[$filter];
+    }
+  } # end foreach filter
  if ( ! empty( $user['MonitorIds'] ) ) {
    $ids = explode(',', $user['MonitorIds'] );
    $conditions[] = 'Id IN ('.implode(',',array_map( function(){return '?';}, $ids) ).')';
@ -85,22 +85,22 @@ $groupSql = Group::get_group_sql( $group_id );
  $sql = 'SELECT * FROM Monitors' . ( count($conditions) ? ' WHERE ' . implode(' AND ', $conditions ) : '' ).' ORDER BY Sequence ASC';
  $monitors = dbFetchAll( $sql, null, $values );
  $displayMonitors = array();
-  $monitors_dropdown = array(''=>'All');
+  $monitors_dropdown = array();

  # Check to see if the selected monitor_id is in the results.
-  if ( $monitor_id ) {
+  if ( count($selected_monitor_ids) ) {
    $found_selected_monitor = false;

    for ( $i = 0; $i < count($monitors); $i++ ) {
      if ( !visibleMonitor( $monitors[$i]['Id'] ) ) {
        continue;
      }
-      if ( $monitors[$i]['Id'] == $monitor_id ) {
+      if ( in_array( $monitors[$i]['Id'], $selected_monitor_ids ) ) {
        $found_selected_monitor = true;
      }
    } // end foreach monitor
    if ( ! $found_selected_monitor ) {
-      $monitor_id = '';
+      $selected_monitor_ids = array();
    }
  } // end if a monitor was specified

@ -111,7 +111,7 @@ $groupSql = Group::get_group_sql( $group_id );
    }
    $monitors_dropdown[$monitors[$i]['Id']] = $monitors[$i]['Name'];

-    if ( $monitor_id and ( $monitors[$i]['Id'] != $monitor_id ) ) {
+    if ( count($selected_monitor_ids) and ! in_array( $monitors[$i]['Id'], $selected_monitor_ids ) ) {
      continue;
    }
    if ( isset($_SESSION['StatusFilter']) ) {
@ -121,7 +121,13 @@ $groupSql = Group::get_group_sql( $group_id );
    }
    $displayMonitors[] = $monitors[$i];
  }
-  echo htmlSelect( 'MonitorId', $monitors_dropdown, $monitor_id, array('onchange'=>'changeFilter(this);') );
+  echo htmlSelect( 'MonitorId[]', $monitors_dropdown, $selected_monitor_ids,
+    array(
+      'onchange'=>'this.form.submit();',
+      'class'=>'chosen',
+      'multiple'=>'multiple',
+      'data-placeholder'=>'All',
+    ) );
 ?>
 </span>
 <?php
@ -129,7 +135,15 @@ if ( count($ServersById) > 1 ) {
 ?>
 <span class="ServerFilter"><label><?php echo translate('Server')?>:</label>
 <?php
-echo htmlSelect( 'ServerFilter', array(''=>'All')+$ServersById, (isset($_SESSION['ServerFilter'])?$_SESSION['ServerFilter']:''), array('onchange'=>'changeFilter(this);') );
+  echo htmlSelect( 'ServerId[]', $ServersById,
+    (isset($_SESSION['ServerId'])?$_SESSION['ServerId']:''),
+    array(
+      'onchange'=>'this.form.submit();',
+      'class'=>'chosen',
+      'multiple'=>'multiple',
+      'data-placeholder'=>'All',
+    )
+  );
 ?>
 </span>
 <?php 
@ -137,7 +151,14 @@ echo htmlSelect( 'ServerFilter', array(''=>'All')+$ServersById, (isset($_SESSION
 if ( count($StorageById) > 1 ) { ?>
  <span class="StorageFilter"><label><?php echo translate('Storage')?>:</label>
 <?php
-echo htmlSelect( 'StorageFilter', array(''=>'All')+$StorageById, (isset($_SESSION['StorageFilter'])?$_SESSION['StorageFilter']:''), array('onchange'=>'changeFilter(this);') );
+  echo htmlSelect( 'StorageId[]',$StorageById,
+    (isset($_SESSION['StorageId'])?$_SESSION['StorageId']:''),
+    array(
+      'onchange'=>'this.form.submit();',
+      'class'=>'chosen',
+      'multiple'=>'multiple',
+      'data-placeholder'=>'All',
+    ) );
 ?>
  </span>
 <?php
@ -146,12 +167,18 @@ echo htmlSelect( 'StorageFilter', array(''=>'All')+$StorageById, (isset($_SESSIO
  <span class="StatusFilter"><label><?php echo translate('Status')?>:</label>
 <?php
 $status_options = array(
-    ''=>'All',
    'Unknown' => translate('Unknown'),
    'NotRunning' => translate('NotRunning'),
    'Running' => translate('Running'),
    );
-echo htmlSelect( 'StatusFilter', $status_options, ( isset($_SESSION['StatusFilter']) ? $_SESSION['StatusFilter'] : '' ), array('onchange'=>'changeFilter(this);') );
+echo htmlSelect( 'Status[]', $status_options,
+  ( isset($_SESSION['Status']) ? $_SESSION['Status'] : '' ),
+  array(
+    'onchange'=>'this.form.submit();',
+    'class'=>'chosen',
+    'multiple'=>'multiple',
+    'data-placeholder'=>'All'
+  ) );
 ?>
  </span>
 </div>
--- a/web/skins/classic/views/js/montagereview.js.php
+++ b/web/skins/classic/views/js/montagereview.js.php
@ -42,60 +42,62 @@ $index = 0;
 $anyAlarms = false;

 if ( ! $initialModeIsLive ) {
+Warning($eventsSql);
+  $result = dbQuery( $eventsSql );
+  if ( ! $result ) {
+    Fatal('SQL-ERR');
+    return;
+  }

-$result = dbQuery( $eventsSql );
-if ( ! $result ) {
-  Fatal('SQL-ERR');
-  return;
-}
+  while( $event = $result->fetch( PDO::FETCH_ASSOC ) ) {

-while( $event = $result->fetch( PDO::FETCH_ASSOC ) ) {
-
-  if ( $minTimeSecs > $event['StartTimeSecs'] )   $minTimeSecs = $event['StartTimeSecs'];
-  if ( $maxTimeSecs < $event['CalcEndTimeSecs'] ) $maxTimeSecs = $event['CalcEndTimeSecs'];
-    echo "
+    if ( $minTimeSecs > $event['StartTimeSecs'] )   $minTimeSecs = $event['StartTimeSecs'];
+    if ( $maxTimeSecs < $event['CalcEndTimeSecs'] ) $maxTimeSecs = $event['CalcEndTimeSecs'];
+      echo "
 eMonId[$index]=" . $event['MonitorId'] . ";
 eId[$index]=" . $event['Id'] . ";
 eStartSecs[$index]=" . $event['StartTimeSecs'] . ";
 eEndSecs[$index]=" . $event['CalcEndTimeSecs'] . ";
 eventFrames[$index]=" . $event['Frames'] . ";

-";
+  ";

-  $index = $index + 1;
-  if ( $event['MaxScore'] > 0 )
-    $anyAlarms = true;
-}
-
-// if there is no data set the min/max to the passed in values
-if ( $index == 0 ) {
-  if ( isset($minTime) && isset($maxTime) ) {
-    $minTimeSecs = strtotime($minTime);
-    $maxTimeSecs = strtotime($maxTime);
-  } else {
-    // this is the case of no passed in times AND no data -- just set something arbitrary
-    $minTimeSecs = strtotime('1950-06-01 01:01:01');  // random time so there's something to display
-    $maxTimeSecs = time() + 86400;
+    $index = $index + 1;
+    if ( $event['MaxScore'] > 0 )
+      $anyAlarms = true;
  }
-}

-// We only reset the calling time if there was no calling time
-if ( !isset($minTime) || !isset($maxTime) ) {
-  $maxTime = strftime($maxTimeSecs);
-  $minTime = strftime($minTimeSecs);
-} else {
-  $minTimeSecs = strtotime($minTime);
+  // if there is no data set the min/max to the passed in values
+  if ( $index == 0 ) {
+    if ( isset($minTime) && isset($maxTime) ) {
+      $minTimeSecs = strtotime($minTime);
+      $maxTimeSecs = strtotime($maxTime);
+    } else {
+      // this is the case of no passed in times AND no data -- just set something arbitrary
+      $minTimeSecs = strtotime('1950-06-01 01:01:01');  // random time so there's something to display
+      $maxTimeSecs = time() + 86400;
+    }
+  }

-  $maxTimeSecs = strtotime($maxTime);
-}
+  // We only reset the calling time if there was no calling time
+  if ( !isset($minTime) || !isset($maxTime) ) {
+    $maxTime = strftime($maxTimeSecs);
+    $minTime = strftime($minTimeSecs);
+  } else {
+    $minTimeSecs = strtotime($minTime);

-// If we had any alarms in those events, this builds the list of all alarm frames, but consolidated down to (nearly) contiguous segments 
-// comparison in else governs how aggressively it consolidates
+    $maxTimeSecs = strtotime($maxTime);
+  }

-echo "var fMonId = [];\n";
-echo "var fTimeFromSecs = [];\n";
-echo "var fTimeToSecs = [];\n";
-echo "var fScore = [];\n";
+  // If we had any alarms in those events, this builds the list of all alarm frames, but consolidated down to (nearly) contiguous segments 
+  // comparison in else governs how aggressively it consolidates
+
+  echo "
+var fMonId = [];
+var fTimeFromSecs = [];
+var fTimeToSecs = [];
+var fScore = [];
+";
 $maxScore=0;
 $index=0;
 $mId=-1;
@ -115,10 +117,11 @@ if ( $anyAlarms && $result = dbQuery( $frameSql ) ) {
      // dump this one start a new
      $index++;
      echo "
-  fMonId[$index]= $mId;
-  fTimeFromSecs[$index]= $fromSecs;
-  fTimeToSecs[$index]= $toSecs;
-  fScore[$index]= $maxScore;
+
+fMonId[$index]= $mId;
+fTimeFromSecs[$index]= $fromSecs;
+fTimeToSecs[$index]= $toSecs;
+fScore[$index]= $maxScore;
 ";
      $mId = $frame['MonitorId'];
      $fromSecs = $frame['TimeStampSecs'];
@ -140,7 +143,7 @@ if ( $mId > 0 ) {
 ";
 }

-echo "var maxScore=$maxScore;\n";  // used to skip frame load if we find no alarms.
+  echo "var maxScore=$maxScore;\n";  // used to skip frame load if we find no alarms.
 } // end if initialmodeislive
 echo "var monitorName = [];\n";
 echo "var monitorLoading = [];\n";
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@ -153,7 +153,10 @@ if ( $showZones ) {
 }
 ?>
      </div>
+<form method="get">
+<input type="hidden" name="view" value="montage"/>
      <?php echo $filterbar ?>
+</form>
      <div id="sizeControl">
        <form action="index.php?view=montage" method="post">
          <input type="hidden" name="object" value="MontageLayout"/>
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@ -68,10 +68,9 @@ if (isset($_REQUEST['minTime']) && isset($_REQUEST['maxTime']) && count($display
        )
      ),
    );
-  if (isset($_SESSION['MonitorId'])) {
-    $filter['Query']['terms'][] = (array('attr' => 'MonitorId', 'op' => '=', 'val' => $_SESSION['MonitorId'], 'cnj' => 'and'));
-  }
-  if (( $group_id != 0 || isset($_SESSION['ServerFilter']) || isset($_SESSION['StorageFilter']) || isset($_SESSION['StatusFilter']) ) && !isset($_SESSION['MonitorId'])) {
+  if (count($selected_monitor_ids ) ) {
+    $filter['Query']['terms'][] = (array('attr' => 'MonitorId', 'op' => 'IN', 'val' => $selected_monitor_ids, 'cnj' => 'and'));
+  } else if ( ( $group_id != 0 || isset($_SESSION['ServerFilter']) || isset($_SESSION['StorageFilter']) || isset($_SESSION['StatusFilter']) ) ) {
    for ($i=0; $i < count($displayMonitors); $i++) {
      if ($i == '0') {
        $filter['Query']['terms'][] = array('attr' => 'MonitorId', 'op' => '=', 'val' => $displayMonitors[$i]['Id'], 'cnj' => 'and', 'obr' => '1');
@ -122,9 +121,10 @@ if ( ! empty( $user['MonitorIds'] ) ) {
  $eventsSql .= ' AND M.Id IN ('.$user['MonitorIds'].')';
  $frameSql  .= ' AND E.MonitorId IN ('.$user['MonitorIds'].')';
 }
-if ( $monitor_id ) {
-  $eventsSql .= ' AND M.Id='.$monitor_id;
-  $frameSql  .= ' AND E.MonitorId='.$monitor_id;
+if ( count($selected_monitor_ids) ) {
+  $monitor_ids_sql = ' IN (' . implode(',',$selected_monitor_ids).')';
+  $eventsSql .= ' AND M.Id '.$monitor_ids_sql;
+  $frameSql  .= ' AND E.MonitorId '.$monitor_ids_sql;
 }

 // Parse input parameters -- note for future, validate/clean up better in case we don't get called from self.
@ -199,7 +199,7 @@ if ( isset($minTime) && isset($maxTime) ) {
 $frameSql .= ' GROUP BY E.Id, E.MonitorId, F.TimeStamp, F.Delta ORDER BY E.MonitorId, F.TimeStamp ASC';

 $monitors = array();
-foreach( $displayMonitors as &$row ) {
+foreach( $displayMonitors as $row ) {
  if ( $row['Function'] == 'None' )
    continue;
  $Monitor = new Monitor( $row );