Merge branch 'develop' into stage

equalizedigital · May 23, 2024 · 83e920f · 83e920f
2 parents 0e2db52 + 7dd7dff
commit 83e920f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/template-parts/blocks/calculator-signup-block/calculator-signup.php b/template-parts/blocks/calculator-signup-block/calculator-signup.php
@@ -58,11 +58,13 @@
 			if ( ! empty( $block_link ) ) {
 				$url              = $link['url'];
 				$calculator_title = $link['title'];
-				echo '<span class="content">';
-				echo '<a href="' . esc_url( $url ) . '" class="btn btn-dark-bg">';
-					echo esc_html( $calculator_title );
-				echo '</a>';
-				echo '</span>';
+				if( $link['url'] ) {
+					echo '<span class="content">';
+					echo '<a href="' . esc_url( $url ) . '" class="btn btn-dark-bg">';
+						echo esc_html( $calculator_title );
+					echo '</a>';
+					echo '</span>';
+				}
 			}
 			?>
 			<?php

diff --git a/template-parts/blocks/resource-links/resource-links.php b/template-parts/blocks/resource-links/resource-links.php
@@ -132,7 +132,7 @@
 						<?php if ( $row['manual_link'] ) : ?>
 							<a class="resource-links-container-links-link-button" href="<?php echo esc_url( $manual_link_url ); ?>">
 								<?php
-								echo $icon ? '<img src="' . esc_url( $icon ) . '" aria-hidden="true" />' : '';
+								echo $icon ? '<img src="' . esc_url( $icon ) . '" aria-hidden="true" alt="" />' : '';
 								echo $manual_link_text ? '<span class="text">' . esc_html( $manual_link_text ) . '</span>' : '';
 								?>
 							</a>
@@ -149,7 +149,7 @@
 	<div class="resource-links-loop-container">
 
 		<?php 
-			$links = get_field( 'links' );
+		$links = get_field( 'links' );
 		if ( $links ) {
 			foreach ( $links as $key => $row ) {
 				if ( ! empty( $row['link'] ) ) {
@@ -165,6 +165,9 @@
 				if ( ! empty( $row['selected_posts'] ) ) {
 					$selected_posts = $row['selected_posts'];
 				}
+				if( 'link' === get_field( 'type_of_button' ) ) {
+					continue;
+				}
 
 				?>
 					<div id="resource-link-<?php echo esc_attr( $key ); ?>" role="tabpanel" aria-labelledby="button-tab-<?php echo esc_attr( $key ); ?>" class="resource-links-loop-container-item <?php echo 0 === $key ? 'resource-links-loop-container-item--active' : ''; ?>">
@@ -182,7 +185,7 @@
 
 							<div class="resource-links-loop-container-content-loop">
 								<header class="resource-links-loop-container-header">
-									<h3 class="title" tabindex="0"><?php echo esc_url( $loop_container_link ); ?></h3>
+									<h3 class="title" tabindex="0"><?php echo esc_html( $loop_container_link ); ?></h3>
 								</header>
 								<ul class="resource-links-loop-container-content-loop-ul">
 							<?php