From 86ab0c296e53a5e78d2727d8314545271557fca0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 16 Jan 2024 11:52:28 -0500
Subject: [PATCH] Add 6,7,8,9,10 wide montage layouts.

---
 db/zm_create.sql.in            |  5 +++++
 db/zm_update-1.37.50.sql       | 41 ++++++++++++++++++++++++++++++++++
 distros/redhat/zoneminder.spec |  2 +-
 version.txt                    |  2 +-
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 db/zm_update-1.37.50.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 4c9403fb3..3c3b6aacd 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -1182,6 +1182,11 @@ INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('2 Wide', '{ "default":{
 INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('3 Wide', '{ "default":{"float":"left", "width":"33%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
 INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('4 Wide', '{ "default":{"float":"left", "width":"25%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
 INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('5 Wide', '{ "default":{"float":"left", "width":"20%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('6 Wide', '{ "default":{"float":"left", "width":"16.6%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('7 Wide', '{ "default":{"float":"left", "width":"14.2%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('8 Wide', '{ "default":{"float":"left", "width":"12.5%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('9 Wide', '{ "default":{"float":"left", "width":"11.1%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('10 Wide', '{ "default":{"float":"left", "width":"10%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
 
 CREATE TABLE Sessions (
   id char(32) not null,
diff --git a/db/zm_update-1.37.50.sql b/db/zm_update-1.37.50.sql
new file mode 100644
index 000000000..0f7a96e28
--- /dev/null
+++ b/db/zm_update-1.37.50.sql
@@ -0,0 +1,41 @@
+
+SET @s = ( SELECT IF(
+    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='6 Wide') > 0,
+      "SELECT '6 Wide already in layouts'",
+'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'6 Wide\', \'{ "default":{"float":"left", "width":"16.6%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }\' );'
+) );
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = ( SELECT IF(
+    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='7 Wide') > 0,
+      "SELECT '7 Wide already in layouts'",
+'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'7 Wide\', \'{ "default":{"float":"left", "width":"14.2%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }\' );'
+) );
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = ( SELECT IF(
+    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='8 Wide') > 0,
+      "SELECT '8 Wide already in layouts'",
+'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'8 Wide\', \'{ "default":{"float":"left", "width":"12.5%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }\' );'
+) );
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = ( SELECT IF(
+    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='9 Wide') > 0,
+      "SELECT '9 Wide already in layouts'",
+'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'9 Wide\', \'{ "default":{"float":"left", "width":"11.1%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }\' );'
+) );
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = ( SELECT IF(
+    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='10 Wide') > 0,
+      "SELECT '10 Wide already in layouts'",
+'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'10 Wide\', \'{ "default":{"float":"left", "width":"10%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }\' );'
+) );
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 19739a8e0..a7ed063df 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -18,7 +18,7 @@
 %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
 
 Name: zoneminder
-Version: 1.37.49
+Version: 1.37.50
 Release: 2%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
diff --git a/version.txt b/version.txt
index db1626771..310be82fc 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.37.49
+1.37.50