Merge pull request #319 from crandall-endeavor/cta-support-in-third-p…

…arty-180-block Adding support for cta button in third party 180 section wrapper block
cygnusb2b · Dec 27, 2021 · c0fb83f · c0fb83f
2 parents d3662d6 + 6e13eec
commit c0fb83f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/packages/common/components/style-a/blocks/marko.json b/packages/common/components/style-a/blocks/marko.json
@@ -35,7 +35,7 @@
     "@content-link-style": "object",
     "@fallback-label": {
       "type": "boolean",
-      "default-value":false
+      "default-value": false
     }
   },
   "<common-style-a-third-party-featured-section-wrapper-block>": {
@@ -102,7 +102,7 @@
     "@content-link-style": "object",
     "@fallback-label": {
       "type": "boolean",
-      "default-value":false
+      "default-value": false
     }
   },
   "<common-style-a-card-section-wrapper-block>": {
@@ -141,11 +141,11 @@
     "@content-link-style": "object",
     "@fallback-label": {
       "type": "boolean",
-      "default-value":false
+      "default-value": false
     },
     "@displayImage": {
       "type": "boolean",
-      "default-value":true
+      "default-value": true
     }
   },
   "<common-style-a-full-third-two-thirds-section-wrapper-block>": {
@@ -280,7 +280,7 @@
     "@content-link-style": "object",
     "@fallback-label": {
       "type": "boolean",
-      "default-value":true
+      "default-value": true
     }
   },
   "<common-style-a-third-party-content-180-section-wrapper-block>": {
@@ -316,7 +316,11 @@
     "@button-style": "string",
     "@button-text-style": "object",
     "@main-table-style": "string",
-    "@content-link-style": "object"
+    "@content-link-style": "object",
+    "@show-button": {
+      "type": "boolean",
+      "default-value": false
+    }
   },
   "<common-style-a-list-section-wrapper-block>": {
     "template": "./list-section-wrapper.marko",
@@ -424,11 +428,11 @@
     "@button-text-style": "object",
     "@fallback-label": {
       "type": "boolean",
-      "default-value":false
+      "default-value": false
     },
-    "@display-image" : {
+    "@display-image": {
       "type": "boolean",
-      "default-value":true
+      "default-value": true
     }
   },
   "<common-style-a-simple-card-full-block>": {
@@ -454,9 +458,9 @@
     "@teaser-style": "object",
     "@button-style": "string",
     "@button-text-style": "object",
-    "@display-image" : {
+    "@display-image": {
       "type": "boolean",
-      "default-value":true
+      "default-value": true
     }
   },
   "<common-style-a-simple-card-third-two-thirds-block>": {
@@ -550,7 +554,7 @@
     "@button-text-style": "object",
     "@fallback-label": {
       "type": "boolean",
-      "default-value":true
+      "default-value": true
     }
   },
   "<common-style-a-third-party-content-180-block>": {
@@ -627,11 +631,11 @@
     "@teaser-style": "object",
     "@fallback-label": {
       "type": "boolean",
-      "default-value":true
+      "default-value": true
     },
-    "@display-image" : {
+    "@display-image": {
       "type": "boolean",
-      "default-value":true
+      "default-value": true
     }
   },
   "<common-style-a-promotion-full-block>": {
@@ -653,11 +657,11 @@
     "@teaser-style": "object",
     "@fallback-label": {
       "type": "boolean",
-      "default-value":true
+      "default-value": true
     },
-    "@display-image" : {
+    "@display-image": {
       "type": "boolean",
-      "default-value":true
+      "default-value": true
     }
   },
   "<common-style-a-special-edition-full-wrapper-block>": {

diff --git a/packages/common/components/style-a/blocks/third-party-content-180-section-wrapper.marko b/packages/common/components/style-a/blocks/third-party-content-180-section-wrapper.marko
@@ -11,7 +11,8 @@ $ const {
   skip,
   buttonStyle,
   buttonTextStyle,
-  teaserStyle
+  teaserStyle,
+  showButton
 } = input;
 $ const titleTableStyle = defaultValue(input.titleTableStyle, "font: 400 13px/21px Garamond, serif; margin: 0; table-layout: fixed; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100% !important; color: #00b398; background-color: #ffffff; border-bottom: 3px solid #d7d7d7; border-top: 4px solid #00b398;");
 $ const titleStyle = defaultValue(input.titleStyle, "font:700 15px/23px Arial, 'Helvetica Neue', Helvetica, sans-serif; margin-top: 9px; margin-left: 20px; margin-bottom: 9px;");
@@ -57,6 +58,7 @@ $ const contentLinkStyle = defaultValue(input.contentLinkStyle, {
                   button-text-style=buttonTextStyle
                   teaser-style=teaserStyle
                   show-title=true
+                  show-button=showButton
                 />
                 <if(!isLast(nodes, index))>
                   <common-table width="100%" style="border-collapse:collapse;" align="center" class="main" padding=0 spacing=0>

diff --git a/tenants/electronicdesign/templates/test-measurement-news.marko b/tenants/electronicdesign/templates/test-measurement-news.marko
@@ -71,6 +71,7 @@ $ const buttonTextStyle = {
             main-table-style=mainTableStyle
             content-link-style=contentLinkStyle
             button-style=buttonStyle
+            show-button=true
             button-text-style=buttonTextStyle
           />