Adding subtemplates and beginning of styling

assets/css/ascribe.css

@@ -2223,6 +2223,18 @@ header + .chevron-divider {
   position: relative;
   z-index: -1;
 }
+.short-descriptions .short-description {
+  display: inline-block;
+  vertical-align: top;
+  padding-right: 30px;
+  font-size: 15px;
+  width: 33.33333333%;
+}
+@media screen and (max-width: 570px) {
+  .short-descriptions .short-description {
+    width: 100%;
+  }
+}
 .blog .column-container {
   width: calc(100% + 70px);
 }

assets/css/less/ascribe.less

@@ -779,6 +779,11 @@ header + .chevron-divider {
 		z-index:-1;
 	}
 }
+.short-descriptions {
+	.short-description {
+		.ttl-columns.column-3;
+	}
+}
 
 // BLOG
 .blog .column-container {

controller/classes/Subtemplate.php

@@ -26,15 +26,32 @@ class Subtemplate {
 					case 'featurecirclesicons':
 						$result .= $this->featureCirclesIcons($subtemplateTitle);
 						break;
+					case 'featurecircles':
+						$result .= $this->featureCircles($subtemplateTitle);
+						break;
 					case 'casestudies':
 						$result .= $this->caseStudies($subtemplateTitle);
 						break;
+					case 'slides':
+						$result .= $this->slides($subtemplateTitle);
+						break;
 					case 'oldnew':
 						$result .= $this->oldNew($subtemplateTitle);
 						break;
+					case 'existingnew':
+						$result .= $this->existingNew($subtemplateTitle);
+						break;
+					case 'threecolumn':
+						$result .= $this->columns($subtemplateTitle);
+						break;
+
 					case 'productoverview':
 						$result .= $this->productOverview($subtemplateTitle);
 						break;
+					case 'getstartedfast':
+						$result .= $this->startedFast($subtemplateTitle);
+						break;
+
 					case 'bluebox':
 						$result .= $this->blueBox($subtemplateTitle);
 						break;
@@ -50,15 +67,22 @@ class Subtemplate {
 					case 'mediafeature':
 						$result .= $this->galleries($subtemplateTitle);
 						break;
+					case 'content':
+						$result .= $this->content($subtemplateTitle);
+						break;
+					case 'contentBoxed':
+						$result .= $this->contentBoxed($subtemplateTitle);
+						break;
 					case 'team':
 						$result .= $this->team($subtemplateTitle);
 						break;
+					case 'pricing':
+						$result .= $this->pricing($subtemplateTitle);
+						break;
+
 					case 'teamGeneral':
 						$result .= $this->teamGeneral($subtemplateTitle);
 						break;
-					case 'content':
-						$result .= $this->content($subtemplateTitle);
-						break;
 					case 'image':
 						$result .= $this->image($subtemplateTitle);
 						break;
@@ -113,6 +137,48 @@ class Subtemplate {
 
 		return $result;
 	}
+	public function featureCircles($subtemplateTitle) {
+
+		$featureCircles = '';
+		if (have_rows('feature_circles_w_icon')) {
+			while (have_rows('feature_circles_w_icon')) {
+				the_row();
+
+				$title          = get_sub_field('title');
+				$description    = get_sub_field('description');
+
+				$featureCircles .= "<article class='surround-circle'>
+										<h1>{$title}</h1>
+										<div class='description'>{$description}</div>
+									</article>";
+			}
+		}
+
+		$result = "<section class='subtemplate feature-circles'><div class='centered-header'><div class='column-container'>{$featureCircles}</div></div></section>";
+
+		return $result;
+	}
+	public function columns($subtemplateTitle) {
+
+		$descriptiveColumns = '';
+		if (have_rows('short_description')) {
+			while (have_rows('short_description')) {
+				the_row();
+
+				$title          = get_sub_field('title');
+				$content        = get_sub_field('content');
+
+				$descriptiveColumns .= "<article class='short-description'>
+										<h1>{$title}</h1>
+										<div class='description'>{$content}</div>
+									</article>";
+			}
+		}
+
+		$result = "<section class='subtemplate short-descriptions'><div class='centered-content'><div class='column-container'>{$descriptiveColumns}</div></div></section>";
+
+		return $result;
+	}
 	public function caseStudies($subtemplateTitle) {
 		$caseStudies = '';
 		if (have_rows('case_study')) {
@@ -134,6 +200,29 @@ class Subtemplate {
 
 		return $result;
 	}
+	public function slides($subtemplateTitle) {
+		$caseStudies = '';
+		if (have_rows('slides')) {
+			while (have_rows('slides')) {
+				the_row();
+
+				$content          = get_sub_field('content');
+				$image          = get_sub_field('image')['url'];
+				$imageAlt       = get_sub_field('image')['alt'];
+
+				$caseStudies .= "<article class='case-study'>
+									<div class='centered-header'>
+									<img src='{$image}' alt='{$imageAlt}'>
+									<div class='description'>{$content}</div>
+									</div>
+								</article>";
+			}
+		}
+
+		$result = "<section class='subtemplate slides'><div class='slide-container'>{$caseStudies}</div><div class='slider-action' id='back'></div><div class='slider-action' id='forward'></div></section>";
+
+		return $result;
+	}
 	public function oldNew($subtemplateTitle) {
 		$oldNewRows = '';
 		if (have_rows('old_way__new_way')) {
@@ -164,16 +253,17 @@ class Subtemplate {
 	}
 	public function productOverview($subtemplateTitle) {
 
-		$imageUrl      = get_sub_field('image')['url'];
+		$imageUrl       = get_sub_field('image')['url'];
-		$imageAlt      = get_sub_field('image')['alt'];
+		$imageAlt       = get_sub_field('image')['alt'];
+		$headingSize    = get_sub_field('heading_size');
 
 		$content    = get_sub_field('content');
 
-		$result = "<section class='subtemplate product-overview'>
+		$result = "<section class='subtemplate product-overview {$headingSize}'>
 						<div class='centered-prodFeat'>
 							<img src='{$imageUrl}' alt='{$imageAlt}'>
 							<div class='text-column'>
-								<h1>{$subtemplateTitle}</h1>
+								<h1 class='{$headingSize}'>{$subtemplateTitle}</h1>
 								<div>{$content}</div>
 							</div>
 						</div>
@@ -432,6 +522,21 @@ class Subtemplate {
 
 		return $result;
 	}
+	public function contentBoxed($subtemplateTitle) {
+
+		$content = get_sub_field('content');
+
+		$result = "<section class='subtemplate content-boxed'>
+						<div class='centered-content-padding'>
+						<div class='centered-content'>
+						<h1>{$subtemplateTitle}</h1>
+						<div>{$content}</div>
+						</div>
+						</div>
+					</section>";
+
+		return $result;
+	}
 	public function image($subtemplateTitle) {
 
 		$image = get_sub_field('image')['url'];
@@ -743,5 +848,60 @@ class Subtemplate {
 
 		return $result;
 	}
+	public function existingNew($subtemplateTitle) {
 
+		$existing   = get_sub_field('existing_marketplace_content');
+		$new        = get_sub_field('new_marketplace_content');
+
+		$result = "<section class='subtemplate existing-new'>
+						<div class='centered-content'>
+						<h1>{$subtemplateTitle}</h1>
+						<div id='existing-tab'>Existing Marketplace</div>
+						<div id='new-tab'>New Marketplace</div>
+						<div id='existing'>{$existing}</div>
+						<div id='new'>{$new}</div>
+						</div>
+					</section>";
+
+		return $result;
+	}
+	public function startedFast($subtemplateTitle) {
+
+		$content   = get_sub_field('content');
+		$apiImg    = get_sub_field('api_image')['url'];
+		$whiteImg  = get_sub_field('white_label_marketplace_image')['url'];
+
+		$result = "<section class='subtemplate get-started'>
+						<div class='centered-content'>
+						<h1>{$subtemplateTitle}</h1>
+						<div class='description'>{$content}</div>
+						<div class='api'>
+							<h1>API</h1>
+							<img src='{$apiImg}' alt='API'>
+						</div>
+						<div class='white-label'>
+							<h1>White Label Marketplace</h1>
+							<img src='{$whiteImg}' alt='White Label Marketplace'>
+						</div>
+						</div>
+					</section>";
+
+		return $result;
+	}
+	public function pricing($subtemplateTitle) {
+
+		$bgImg      = get_sub_field('background_image')['url'];
+		$rightPricing   = get_sub_field('right_pricing_text');
+		$leftPricing    = get_sub_field('left_pricing_text');
+
+		$result = "<section class='subtemplate pricing' style='background-image:url({$bgImg})'>
+						<div class='centered-content'>
+						<h1>{$subtemplateTitle}</h1>
+							<div class='left-pricing'>{$leftPricing}</div>
+							<div class='right-pricing'>{$rightPricing}</div>
+						</div>
+					</section>";
+
+		return $result;
+	}
 }

functions.php

@@ -40,7 +40,7 @@ remove_action( 'wp_print_styles', 'print_emoji_styles' );
 remove_action( 'admin_print_styles', 'print_emoji_styles' );
 //
 ////ACF Collapser temp fix
-//add_filter('acf/compatibility/field_wrapper_class', '__return_true');
+add_filter('acf/compatibility/field_wrapper_class', '__return_true');
 
 // TURN ON ACF SETTINGS PAGE
 if( function_exists('acf_add_options_page') ) {

sftpCache.json

@@ -1 +1 @@
-{"/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.css":"2015-10-02T17:16:07.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.min.css":"2015-10-02T17:16:07.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//readme.md":"2015-09-17T22:31:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//less/ascribe.less":"2015-10-02T17:15:59.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.js":"2015-09-24T23:54:44.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.min.js":"2015-09-24T23:54:44.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//src/ascribe.js":"2015-09-24T23:53:14.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//vendor/readme.md":"2015-09-17T22:31:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//helpers/helpers.less":"2015-09-26T02:06:45.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//less/branding.less":"2015-09-26T01:45:23.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/colorbox.css":"2015-08-30T20:38:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/normalize.less":"2015-08-25T22:42:14.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/print.less":"2015-07-02T21:25:38.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//vendor/retina/retina.min.js":"2015-08-18T23:30:10.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//controller.inc.php":"2015-09-17T22:47:24.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//init.php":"2015-09-21T22:45:13.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//classes/Subtemplate.php":"2015-09-24T23:27:17.000Z"}
+{"/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.css":"2015-10-13T03:25:19.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//ascribe.min.css":"2015-10-13T03:25:19.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//readme.md":"2015-09-17T22:31:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//less/ascribe.less":"2015-10-13T03:25:15.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.js":"2015-09-24T23:54:44.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//ascribe.min.js":"2015-09-24T23:54:44.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//src/ascribe.js":"2015-09-24T23:53:14.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//vendor/readme.md":"2015-09-17T22:31:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//helpers/helpers.less":"2015-09-26T02:06:45.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//less/branding.less":"2015-09-26T01:45:23.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/colorbox.css":"2015-08-30T20:38:35.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/normalize.less":"2015-08-25T22:42:14.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/css//vendor/print.less":"2015-07-02T21:25:38.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/assets/js//vendor/retina/retina.min.js":"2015-08-18T23:30:10.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//controller.inc.php":"2015-09-17T22:47:24.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//init.php":"2015-09-21T22:45:13.000Z","/Users/sarahetter/Dropbox/_shared/sarahetter/ascribe/controller//classes/Subtemplate.php":"2015-09-24T23:27:17.000Z"}