From 6c87ed10c183e37c7f36addbbaa00d359da9d0c3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 4 Oct 2017 21:51:30 -0400
Subject: [PATCH 1/3] add a notice when javascript is turned off

---
 web/skins/classic/includes/functions.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 963286f5b..edacb880f 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -154,6 +154,7 @@ if ( file_exists( "skins/$skin/css/$css/graphics/favicon.ico" ) ) {
 } // end function xhtmlHeaders( $file, $title )
 
 function getNavBarHTML() {
+
   $versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':'';
 
 
@@ -166,6 +167,12 @@ function getNavBarHTML() {
   global $bwArray;
   global $view;
 ?>
+<noscript>
+<div style="background-color:red;color:white;font-size:x-large;">
+ZoneMinder requires Javascript. Please enable Javascript in your browser for this site.
+</div>
+</noscript>
+
 <div class="navbar navbar-inverse navbar-static-top">
 	<div class="container-fluid">
 		<div class="navbar-header">

From b2426321b09ff7c2deb2af19ae8277cb4c4df8ba Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 4 Oct 2017 21:53:47 -0400
Subject: [PATCH 2/3] increase the length of MonitorIds in Groups

---
 db/zm_create.sql.in     | 2 +-
 db/zm_update-1.31.7.sql | 1 +
 version                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 db/zm_update-1.31.7.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index daa164d63..654c45ad4 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -265,7 +265,7 @@ CREATE TABLE `Groups` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
   `ParentId` int(10) unsigned,
-  `MonitorIds` tinytext NOT NULL,
+  `MonitorIds` text NOT NULL default '',
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
diff --git a/db/zm_update-1.31.7.sql b/db/zm_update-1.31.7.sql
new file mode 100644
index 000000000..5c64bd17b
--- /dev/null
+++ b/db/zm_update-1.31.7.sql
@@ -0,0 +1 @@
+ALTER TABLE Groups MODIFY `MonitorIds` text NOT NULL default '';
diff --git a/version b/version
index deade24a7..c26dc9697 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.31.6
+1.31.7

From 20087e69e66e81f14bd678f18afae9c4f78b0f66 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 4 Oct 2017 22:22:28 -0400
Subject: [PATCH 3/3] TEXT cannot have a default value

---
 db/zm_create.sql.in     | 2 +-
 db/zm_update-1.31.7.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 654c45ad4..6e6f127c3 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -265,7 +265,7 @@ CREATE TABLE `Groups` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
   `ParentId` int(10) unsigned,
-  `MonitorIds` text NOT NULL default '',
+  `MonitorIds` text NOT NULL,
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
diff --git a/db/zm_update-1.31.7.sql b/db/zm_update-1.31.7.sql
index 5c64bd17b..6634caf5f 100644
--- a/db/zm_update-1.31.7.sql
+++ b/db/zm_update-1.31.7.sql
@@ -1 +1 @@
-ALTER TABLE Groups MODIFY `MonitorIds` text NOT NULL default '';
+ALTER TABLE Groups MODIFY `MonitorIds` text NOT NULL;