Merge pull request #4322 from IgorA100/patch-152539

Replace old style layouts with new style layouts + added "24 Wide" & "48 Wide" Layouts (montage page)

Author: connortechnology

db/zm_create.sql.in

@@ -1194,16 +1194,17 @@ CREATE TABLE MontageLayouts (
   PRIMARY KEY (`Id`)
 );
 
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('Freeform', '{ "default":{"float":"left","left":"0px","right":"0px","top":"0px","bottom":"0px","width":"auto"} }' );
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('2 Wide', '{ "default":{"float":"left", "width":"50%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-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"} }' );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('Auto', NULL );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('1 Wide', NULL );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('2 Wide', NULL );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('3 Wide', NULL );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('4 Wide', NULL );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('6 Wide', NULL );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('8 Wide', NULL );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('12 Wide', NULL );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('16 Wide', NULL );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('24 Wide', NULL );
+INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('48 Wide', NULL );
 
 CREATE TABLE Sessions (
   id char(32) not null,

web/skins/classic/views/montage.php

@@ -77,12 +77,18 @@
   '6 Wide',
   '8 Wide',
   '12 Wide',
-  '16 Wide'
+  '16 Wide',
+  '24 Wide',
+  '48 Wide'
 );
 
 /* Create an array "Name"=>layouts to make it easier to find IDs by name */
 $layoutsByName = array();
 foreach ($layouts as $l) {
+  /* IMPORTANT! 
+  * Before GridStack integration, instead of the layer name "Auto", we used "Freeform" in the DB.
+  * Before deleting this check, you need to replace "Freeform" with "Auto" in the DB of already installed ZM !!!
+  */
   if ($l->Name() == 'Freeform') $l->Name('Auto');
   $layoutsByName[$l->Name()] = $l;
 }