Merge pull request #66 from NHSLeadership/develop

v1.3.7
NHSLeadership · Nov 28, 2024 · 4d6002a · 4d6002a
2 parents 3385c75 + a042b21
commit 4d6002a
Show file tree

Hide file tree

Showing 10 changed files with 446 additions and 299 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "nhsleadership/nightingale-companion",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "dist": {
     "url": "https://github.com/NHSLeadership/nightingale-companion/archive/master.zip",
     "type": "zip"

diff --git a/display/js/fontawsome.js b/display/js/fontawsome.js
diff --git a/display/js/jquery.socialfloating.js b/display/js/jquery.socialfloating.js
diff --git a/display/partials/emergency-alert.php b/display/partials/emergency-alert.php
@@ -13,21 +13,37 @@
  */
 
 ?>
-<div class="nhsuk-global-alert" id="nhsuk-global-alert">
+<div role="alert" aria-label="Global Alert" class="nhsuk-global-alert" id="nhsuk-global-alert">
 	<div class="nhsuk-width-container">
 		<div class="nhsuk-grid-row">
 			<div class="nhsuk-grid-column-full">
 				<div class="nhsuk-global-alert__content">
 					<h2 class="nhsuk-global-alert__heading">
 						<span class="nhsuk-u-visually-hidden">Alert: </span><?php echo esc_html( get_theme_mod( 'emergency_heading' ) ); ?>
 					</h2>
-					<p class="nhsuk-global-alert__message"><?php echo esc_html( get_theme_mod( 'emergency_content' ) ); ?>
-						<a href="<?php echo esc_html( get_theme_mod( 'emergency_link' ) ); ?>"><?php echo esc_html( get_theme_mod( 'emergency_link_title' ) ); ?></a>
+					<p class="nhsuk-global-alert__message">
+						<?php
+						echo esc_html( get_theme_mod( 'emergency_content' ) );
+						$emergency_link       = get_theme_mod( 'emergency_link' );
+						$emergency_link_title = get_theme_mod( 'emergency_link_title' );
+						if ( ! empty( $emergency_link ) ) {
+						?>
+						<a href="<?php echo esc_html( $emergency_link ); ?>">
+							<?php
+							echo ! empty( $emergency_link_title ) ? ( esc_html( $emergency_link_title ) ) : 'Further Info';
+							?>
+						</a>
+						<?php
+						}
+						?>
 					</p>
 					<?php
 					if ( ( get_theme_mod( 'emergency_date_on' ) === 'yes' ) && ( get_theme_mod( 'emergency_date' ) !== 'dd/mm/yyyy' ) ) {
 						$date = strtotime( get_theme_mod( 'emergency_date' ) );
-						echo '<p class="nhsuk-global-alert__updated">Last Updated ' . esc_html( date( 'jS F Y', esc_attr( $date ) ) ) . '</p>';
+						if ( empty( $date ) ) {
+							$date = strtotime( gmdate( 'Y-m-d' ) );
+						}
+						echo '<p class="nhsuk-global-alert__updated">Last Updated ' . esc_html( gmdate( 'jS F Y', esc_attr( $date ) ) ) . '</p>';
 					}
 					?>
 				</div>