From 142557bb429e97bcfed67999eaf0d0bbed6c7de9 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 21 May 2015 09:20:51 -0400
Subject: [PATCH] Rearanged some fields again. :)

---
 simple-wp-membership/view.php | 124 +++++++++++++++-------------------
 1 file changed, 55 insertions(+), 69 deletions(-)

diff --git a/simple-wp-membership/view.php b/simple-wp-membership/view.php
index 52b2e54..a840f4d 100644
--- a/simple-wp-membership/view.php
+++ b/simple-wp-membership/view.php
@@ -21,6 +21,7 @@
 					text-align: left;
 					font-style: italic;
 					color: #BBB;
+					margin-left: 1em;
 				}
 				.fieldPrompt {
 					font-weight: bold;
@@ -75,157 +76,142 @@
 		foreach($this->items as $m) {
 		    if ($m['first_name'].$m['last_name'] != '') {
 			echo '
-				<!-- First, Last name -->
+<!-- First, Last name -->
 				<div class="row">
 				        <div class="small-12 columns memberName"><h3>'.$m['first_name'].' '.$m['last_name'].'</h3></div>
 				</div>
+<!-- Summer -->
 				<div class="row"><div class="small-12 columns sectionTitle">Summer</div></div>
-			    '.($m['data']['Summer mailing address (P.O Box)']->value != '' ? '
+			'.($m['data']['Summer mailing address (P.O Box)']->value != '' ? '
 				<div class="row">
 					<!-- Summer Mailing Address -->
 					<div class="small-12 columns end fieldValue">'.$m['data']['Summer mailing address (P.O Box)']->value.'</div>
 				</div>
-			    ' : '').'
-			    '.($m['data']['Summer City']->value != '' ? '
+			' : '').'
+	<!-- Summer City, State, ZIP -->
+			'.($m['data']['Summer City']->value != '' ? '
 				<div class="row">
-					<!-- Summer City, State, ZIP -->
 					<div class="small-12 columns end fieldValue">
 						'.$m['data']['Summer City']->value.($m['data']['Summer State']->value != '' ? ', '.$m['data']['Summer State']->value : '').'
 						'.$m['data']['Summer ZIP/Postal Code']->value.'
 					</div>
 				</div>
-			    ' : '').'
-			    '.($m['data']['Summer Home 1']->value != '' ? '
+			' : '').'
+	<!-- Summer Home 1 -->
+			'.($m['data']['Summer Home 1']->value != '' ? '
 				<div class="row">
-					<!-- Summer Home 1 -->
 					<div class="small-12 columns end fieldValue">'.$m['data']['Summer Home 1']->value.'</div>
 				</div>
-		              '.($m['data']['Summer Phone 1']->value != '' ? '
+			' : '').'
+	<!-- Summer Phone 1 -->
+			'.($m['data']['Summer Phone 1']->value != '' ? '
 				<div class="row">
-					<!-- Summer Phone 1 -->
 					<div class="small-12 columns end fieldValue">'.$m['data']['Summer Phone 1']->value.'</div>
 				</div>
-			      ' : '').'
-			    ' : '').'
-			    '.($m['data']['Summer Home 2']->value != '' ? '
+			' : '').'
+	<!-- Summer Home 2 -->
+			'.($m['data']['Summer Home 2']->value != '' ? '
 				<div class="row">
-					<!-- Summer Home 2 -->
 					<div class="small-12 columns end fieldValue">'.$m['data']['Summer Home 2']->value.'</div>
 				</div>
-		              '.($m['data']['Summer Phone 2']->value != '' ? '
+			' : '').'
+	<!-- Summer Phone 2 -->
+			'.($m['data']['Summer Phone 2']->value != '' ? '
 				<div class="row">
-					<!-- Summer Phone 2 -->
 					<div class="small-12 columns end fieldValue">'.$m['data']['Summer Phone 2']->value.'</div>
 				</div>
-			      ' : '').'
-			    ' : '').'
-			    '.($m['data']['Summer Home 3']->value != '' ? '
+			' : '').'
+	<!-- Summer Home 3 -->
+			'.($m['data']['Summer Home 3']->value != '' ? '
 				<div class="row">
-					<!-- Summer Home 3 -->
 					<div class="small-12 columns end fieldValue">'.$m['data']['Summer Home 3']->value.'</div>
 				</div>
-		              '.($m['data']['Summer Phone 3']->value != '' ? '
+			' : '').'
+	<!-- Summer Phone 3 -->
+		        '.($m['data']['Summer Phone 3']->value != '' ? '
 				<div class="row">
-					<!-- Summer Phone 3 -->
 					<div class="small-12 columns end fieldValue">'.$m['data']['Summer Phone 3']->value.'</div>
 				</div>
-			      ' : '').'
-			    ' : '').'
-
-
-			'.($m['data']['Home Address']->value != '' ? '
-				<div class="minorBreak"> </div>
+			' : '').'
+<!-- Home -->
 				<div class="row"><div class="small-12 columns sectionTitle">Home</div></div>
+	<!-- Home Address -->
+			'.($m['data']['Home Address']->value != '' ? '
 				<div class="row">
-					<!-- Home Address -->
 					<div class="small-12 columns end fieldValue">
 						'.$m['data']['Home Address']->value.'
 					</div>
 				</div>
-			    '.($m['data']['Home City']->value != '' ? '
+			' : '').'
+	<!-- Home City, State, ZIP -->
+			'.($m['data']['Home City']->value != '' ? '
 				<div class="row">
-					<!-- Home City, State, ZIP -->
 					<div class="small-12 columns end fieldValue">
 						'.$m['data']['Home City']->value.($m['data']['Home State']->value != '' ? ', '.$m['data']['Home State']->value : '').'
 						'.$m['data']['Home ZIP']->value.'
 					</div>
 				</div>
-			    ' : '').'
-			    '.($m['data']['Home Phone']->value != '' ? '
+			' : '').'
+	<!-- Home Phone -->
+			'.($m['data']['Home Phone']->value != '' ? '
 				<div class="row">
-					<!-- Home Phone -->
 					<div class="small-12 columns end fieldValue">
 						'.$m['data']['Home Phone']->value.'
 					</div>
 				</div>
-			    ' : '').'
 			' : '').'
-			'.($m['data']['Winter mailing address']->value != '' ? '
+<!-- Winter -->
 				<div class="row"><div class="small-12 columns sectionTitle">Winter</div></div>
+	<!-- Winter Mailing Address -->
+			'.($m['data']['Winter mailing address']->value != '' ? '
 				<div class="row">
-					<!-- Winter Mailing Address -->
 					<div class="small-12 columns end fieldValue">
 						'.$m['data']['Winter mailing address']->value.'
 					</div>
 				</div>
+	<!-- Winter City, State, ZIP -->
 			    '.($m['data']['Winter City']->value != '' ? '
 				<div class="row">
-					<!-- Winter City, State, ZIP -->
 					<div class="small-12 columns end fieldValue">
 						'.$m['data']['Winter City']->value.($m['data']['Winter State']->value != '' ? ', '.$m['data']['Winter State']->value : '').'
 						'.$m['data']['Winter ZIP/Postal Code']->value.'
 					</div>
 				</div>
 			    ' : '').'
-			    '.($m['data']['Winter phone']->value != '' ? '
+			' : '').'
+	<!-- Winter Phone -->
+			'.($m['data']['Winter phone']->value != '' ? '
 				<div class="row">
-					<!-- Winter Phone -->
 					<div class="small-12 columns end fieldValue">
 						'.$m['data']['Winter phone']->value.'
 					</div>
 				</div>
-			    ' : '').'
 			' : '').'
-
-
-				<div class="minorBreak"> </div>
+<!-- Personal -->
 				<div class="row"><div class="small-12 columns sectionTitle">Personal</div></div>
-			'.($m['Primary name'] != '' ? '
+	<!-- Primary Email -->
+			'.($m['data']['Primary email']->value != '' ? '
 				<div class="row">
-					<!-- Primary name -->
-					<div class="small-12 columns end fieldValue">'.$m['Primary name'].'</div>
+					<div class="small-12 columns end fieldValue">'.$m['data']['Primary email']->value.'</div>
 				</div>
 			' : '').'
-			'.($m['Primary email'] != '' ? '
+	<!-- Primary phone -->
+			'.($m['data']['Primary phone']->value != '' ? '
 				<div class="row">
-					<!-- Primary Email -->
-					<div class="small-12 columns end fieldValue">'.$m['Primary email'].'</div>
+					<div class="small-12 columns end fieldValue">'.$m['data']['Primary phone']->value.'</div>
 				</div>
 			' : '').'
-			'.($m['phone'] != '' ? '
+	<!-- Spouse Email -->
+			'.($m['data']['Spouse email']->value != '' ? '
 				<div class="row">
-					<!-- Cell Phone / Primary phone -->
-					<div class="small-12 columns end fieldValue">'.$m['phone'].'</div>
-				</div>
-			' : '').'
-			'.($m['data']['Spouse name']->value != '' ? '
-				<div class="minorBreak"> </div>
-				<div class="row">
-					<!-- Spouse Name -->
-					<div class="small-12 columns end fieldValue">'.$m['data']['Spouse name']->value.'</div>
-				</div>
-			    '.($m['data']['Spouse email']->value != '' ? '
-				<div class="row">
-					<!-- Spouse Email -->
 					<div class="small-12 columns end fieldValue">'.$m['data']['Spouse email']->value.'</div>
 				</div>
-			    ' : '').'
-			    '.($m['data']['Spouse cell phone']->value != '' ? '
+			' : '').'
+	<!-- Spouse name -->
+			'.($m['data']['Spouse phone']->value != '' ? '
 				<div class="row">
-					<!-- Spouse Cell Phone -->
-					<div class="small-12 columns end fieldValue">'.$m['data']['Spouse cell phone']->value.'</div>
+					<div class="small-12 columns end fieldValue">'.$m['data']['Spouse phone']->value.'</div>
 				</div>
-			    ' : '').'
 			' : '').'
 
 
-- 
2.17.1