From 46d37ead3892cf841091f7e7bc5cd13ab44da64d Mon Sep 17 00:00:00 2001
From: Charles Coleman <charles@rapidfyre.com>
Date: Sun, 30 Sep 2018 23:29:02 -0700
Subject: [PATCH] [TASK] Make sure colPos is present for flux:grid.column

---
 Resources/Private/Templates/Content/Accordion.html   |  2 +-
 Resources/Private/Templates/Content/Carousel.html    |  2 +-
 Resources/Private/Templates/Content/FourColumn.html  |  8 ++++----
 Resources/Private/Templates/Content/Row.html         |  2 +-
 Resources/Private/Templates/Content/SixColumn.html   | 12 ++++++------
 Resources/Private/Templates/Content/Tabs.html        |  2 +-
 Resources/Private/Templates/Content/ThreeColumn.html |  9 ++++++---
 Resources/Private/Templates/Content/TwoColumn.html   |  8 ++++----
 8 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/Resources/Private/Templates/Content/Accordion.html b/Resources/Private/Templates/Content/Accordion.html
index 6dd6092..3e1b321 100644
--- a/Resources/Private/Templates/Content/Accordion.html
+++ b/Resources/Private/Templates/Content/Accordion.html
@@ -19,7 +19,7 @@
 				<v:condition.type.isArray value="{panels}">
 					<f:for each="{panels}" as="panel" iteration="iteration">
 						<flux:grid.row>
-                            <flux:grid.column name="content.{iteration.index}" label="{f:if(condition: panel.panel.title, then: panel.panel.title, else: 'Content, panel #{iteration.cycle} ({panel.panel.id})')}" />
+                            <flux:grid.column colPos="1" name="content.{iteration.index}" label="{f:if(condition: panel.panel.title, then: panel.panel.title, else: 'Content, panel #{iteration.cycle} ({panel.panel.id})')}" />
 						</flux:grid.row>
 					 </f:for>
 				</v:condition.type.isArray>
diff --git a/Resources/Private/Templates/Content/Carousel.html b/Resources/Private/Templates/Content/Carousel.html
index 1e7e37f..4c28a29 100644
--- a/Resources/Private/Templates/Content/Carousel.html
+++ b/Resources/Private/Templates/Content/Carousel.html
@@ -21,7 +21,7 @@
 						<f:for each="{element}" key="elementType" as="elementData">
 							<f:if condition="{0: elementType} == {0: 'content'}">
 								<flux:grid.row>
-									<flux:grid.column name="{elementData.id}" label="{v:l(key: 'flux.carousel.label.grid.column.prefix')}: {elementData.id}" />
+									<flux:grid.column colPos="1" name="{elementData.id}" label="{v:l(key: 'flux.carousel.label.grid.column.prefix')}: {elementData.id}" />
 								</flux:grid.row>
 							</f:if>
 						</f:for>
diff --git a/Resources/Private/Templates/Content/FourColumn.html b/Resources/Private/Templates/Content/FourColumn.html
index 58909c5..de7755e 100644
--- a/Resources/Private/Templates/Content/FourColumn.html
+++ b/Resources/Private/Templates/Content/FourColumn.html
@@ -22,10 +22,10 @@ <h3><v:l key="flux.grid4.label.customize.column.settings"/>:</h3>
 				</f:if>
 				<flux:grid>
 					<flux:grid.row>
-						<flux:grid.column style="width: 25%;border-right: 1px dotted #999;" name="column1"  />
-						<flux:grid.column style="width: 25%;border-right: 1px dotted #999;" name="column2"  />
-						<flux:grid.column style="width: 25%;border-right: 1px dotted #999;" name="column3"  />
-						<flux:grid.column style="width: 25%;" name="column4"  />
+						<flux:grid.column colPos="1" style="width: 25%;border-right: 1px dotted #999;" name="column1"  />
+						<flux:grid.column colPos="2" style="width: 25%;border-right: 1px dotted #999;" name="column2"  />
+						<flux:grid.column colPos="3" style="width: 25%;border-right: 1px dotted #999;" name="column3"  />
+						<flux:grid.column colPos="4" style="width: 25%;" name="column4"  />
 					</flux:grid.row>
 				</flux:grid>
 			</flux:form.sheet>
diff --git a/Resources/Private/Templates/Content/Row.html b/Resources/Private/Templates/Content/Row.html
index 210f42f..25bc1ce 100644
--- a/Resources/Private/Templates/Content/Row.html
+++ b/Resources/Private/Templates/Content/Row.html
@@ -24,7 +24,7 @@
 						<f:for each="{columns}" as="sectionObject" iteration="iteration">
 							<v:variable.set name="width" value="{sectionObject.column.class -> v:format.substring(start: 7)}" />
 							<v:variable.set name="percent" value="{width  -> v:math.division(b: numberOfColumns) -> v:math.product(b: 100) -> v:math.round(decimals: 2)}" />
-							<flux:grid.column style="width: {percent}%" name="column{iteration.cycle}" label="{percent}%" />
+							<flux:grid.column colPos="1" style="width: {percent}%" name="column{iteration.cycle}" label="{percent}%" />
 						</f:for>
 					</v:condition.type.isArray>
 				</flux:grid.row>
diff --git a/Resources/Private/Templates/Content/SixColumn.html b/Resources/Private/Templates/Content/SixColumn.html
index df4d664..caccd4e 100644
--- a/Resources/Private/Templates/Content/SixColumn.html
+++ b/Resources/Private/Templates/Content/SixColumn.html
@@ -22,12 +22,12 @@ <h3><v:l key="flux.grid6.label.customize.column.settings"/>:</h3>
 				</f:if>
 				<flux:grid>
 					<flux:grid.row>
-						<flux:grid.column style="width: 16%;border-right: 1px dotted #999;" name="column1"  />
-						<flux:grid.column style="width: 16%;border-right: 1px dotted #999;" name="column2"  />
-						<flux:grid.column style="width: 16%;border-right: 1px dotted #999;" name="column3"  />
-						<flux:grid.column style="width: 16%;border-right: 1px dotted #999;" name="column4"  />
-						<flux:grid.column style="width: 16%;border-right: 1px dotted #999;" name="column5"  />
-						<flux:grid.column style="width: 16%;" name="column6"  />
+						<flux:grid.column colPos="1" style="width: 16%;border-right: 1px dotted #999;" name="column1"  />
+						<flux:grid.column colPos="2" style="width: 16%;border-right: 1px dotted #999;" name="column2"  />
+						<flux:grid.column colPos="3" style="width: 16%;border-right: 1px dotted #999;" name="column3"  />
+						<flux:grid.column colPos="4" style="width: 16%;border-right: 1px dotted #999;" name="column4"  />
+						<flux:grid.column colPos="5" style="width: 16%;border-right: 1px dotted #999;" name="column5"  />
+						<flux:grid.column colPos="6" style="width: 16%;" name="column6"  />
 					</flux:grid.row>
 				</flux:grid>
 			</flux:form.sheet>
diff --git a/Resources/Private/Templates/Content/Tabs.html b/Resources/Private/Templates/Content/Tabs.html
index b449398..6c11157 100644
--- a/Resources/Private/Templates/Content/Tabs.html
+++ b/Resources/Private/Templates/Content/Tabs.html
@@ -27,7 +27,7 @@
 					<f:if condition="{tabs}">
 						<v:condition.type.isArray value="{tabs}">
 							<f:for each="{tabs}" as="tab" iteration="iteration">
-								<flux:grid.column style="width: {v:math.division(b: '{tabs -> f:count()}', a: 100)}%"
+								<flux:grid.column colPos="1" style="width: {v:math.division(b: '{tabs -> f:count()}', a: 100)}%"
 												  name="content.{iteration.index}" label="{tab.tab.title}" />
 							</f:for>
 						</v:condition.type.isArray>
diff --git a/Resources/Private/Templates/Content/ThreeColumn.html b/Resources/Private/Templates/Content/ThreeColumn.html
index 907919f..6cce333 100644
--- a/Resources/Private/Templates/Content/ThreeColumn.html
+++ b/Resources/Private/Templates/Content/ThreeColumn.html
@@ -24,9 +24,9 @@ <h3><v:l key="flux.grid3.label.customize.column.settings"/>:</h3>
 					<f:else>
 						<flux:grid>
 							<flux:grid.row>
-								<flux:grid.column style="width: 33.333%;border-right: 1px dotted #999;" name="column1"/>
-								<flux:grid.column style="width: 33.333%;border-right: 1px dotted #999;" name="column2"/>
-								<flux:grid.column style="width: 33.333%;" name="column3"/>
+								<flux:grid.column colPos="1" style="width: 33.333%;border-right: 1px dotted #999;" name="column1"/>
+								<flux:grid.column colPos="2" style="width: 33.333%;border-right: 1px dotted #999;" name="column2"/>
+								<flux:grid.column colPos="3" style="width: 33.333%;" name="column3"/>
 							</flux:grid.row>
 						</flux:grid>
 					</f:else>
@@ -72,12 +72,15 @@ <h3><v:l key="flux.grid3.label.customize.column.settings"/>:</h3>
 		<flux:grid>
 			<flux:grid.row>
 				<flux:grid.column
+						colPos="1"
 						style="width: 33.333%;border-right: 1px dotted #999;" name="column1"
 						label="{v:l(key: 'flux.grid3.columns.column1')} ({settings.grid3.col1width})"/>
 				<flux:grid.column
+						colPos="2"
 						style="width: 33.333%;border-right: 1px dotted #999;" name="column2"
 						label="{v:l(key: 'flux.grid3.columns.column2')} ({settings.grid3.col2width})"/>
 				<flux:grid.column
+						colPos="3"
 						style="width: 33.333%;" name="column3"
 						label="{v:l(key: 'flux.grid3.columns.column3')} ({settings.grid3.col3width})"/>
 			</flux:grid.row>
diff --git a/Resources/Private/Templates/Content/TwoColumn.html b/Resources/Private/Templates/Content/TwoColumn.html
index bf402fd..099cc94 100644
--- a/Resources/Private/Templates/Content/TwoColumn.html
+++ b/Resources/Private/Templates/Content/TwoColumn.html
@@ -24,8 +24,8 @@ <h3><v:l key="flux.grid2.label.customize.column.settings"/>:</h3>
 					<f:else>
 						<flux:grid>
 							<flux:grid.row>
-								<flux:grid.column style="width: 50%;border-right: 1px dotted #999;" name="column1"/>
-								<flux:grid.column style="width: 50%;" name="column2"/>
+								<flux:grid.column colPos="1" style="width: 50%;border-right: 1px dotted #999;" name="column1"/>
+								<flux:grid.column colPos="2" style="width: 50%;" name="column2"/>
 							</flux:grid.row>
 						</flux:grid>
 					</f:else>
@@ -55,8 +55,8 @@ <h3><v:l key="flux.grid2.label.customize.column.settings"/>:</h3>
 						   default="col-sm-6" />
 		<flux:grid>
 			<flux:grid.row>
-				<flux:grid.column style="width: 50%;border-right: 1px dotted #999;" name="column1" label="{v:l(key: 'flux.grid2.columns.column1')} ({settings.grid2.col1width})" />
-				<flux:grid.column style="width: 50%;" name="column2" label="{v:l(key: 'flux.grid2.columns.column2')} ({settings.grid2.col2width})" />
+				<flux:grid.column colPos="1" style="width: 50%;border-right: 1px dotted #999;" name="column1" label="{v:l(key: 'flux.grid2.columns.column1')} ({settings.grid2.col1width})" />
+				<flux:grid.column colPos="2" style="width: 50%;" name="column2" label="{v:l(key: 'flux.grid2.columns.column2')} ({settings.grid2.col2width})" />
 			</flux:grid.row>
 		</flux:grid>
 	</f:section>