Merge pull request #66 from NHSLeadership/develop

v1.3.7

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"

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>

display/social-sharing.php

@@ -40,6 +40,8 @@ function nightingale_companion_sharing_caring( $content ) {
 			$content = $content . $output;
 		} elseif ( 'both' === $position ) {
 			$content = $output . $content . $output;
+		} else {
+			$output = false;
 		}
 		if ( ! empty( $output ) ) {
 			$content = $content . '<script async src="https://static.addtoany.com/menu/page.js"></script>';

nightingale-companion.php

@@ -6,8 +6,8 @@
 * Author: Nick Summerfield, NHS Leadership Academy
 * License: GPL v3
 * Requires at least: 5.0
-* Tested up to: 6.0
-* Version: 1.3.6
+* Tested up to: 6.5
+* Version: 1.3.7
 *
 * @package nightingale-companion
 */

package.json

@@ -1,14 +1,14 @@
 {
   "name": "nightingale-companion",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "license": "GPL-3.0-or-later",
   "main": "nightingale-companion.php",
   "scripts": {
     "zip": "zip -r nightingale-companion.zip ./ -x .git .gitignore *.git/* .distignore .wordpress-org node_modules .DS_Store package.json composer.json package-lock.json nightingale-companion.zip hookdoc-conf.json README.md CONTRIBUTING.md LICENSE.md .wordpress-org/**\\* .ds_store vendor/**\\* node_modules/**\\* hookdocs/**\\* .github/**\\* src/**\\* n",
     "build:docs": "rm -rf hookdocs/ && jsdoc -c hookdoc-conf.json"
   },
   "devDependencies": {
-    "jsdoc": "^3.6.7",
+    "jsdoc": "^4.0.4",
     "wp-hookdoc": "^0.2.0"
   }
 }

readme.txt

@@ -3,8 +3,8 @@ Contributors: Nick-Summerfield, tblacker7
 Tags: theme, nightingale, nhs
 Plugin Name:: Nightingale Companion
 Requires at least: 5.0
-Tested up to: 6.0
-Stable tag: 1.3.6
+Tested up to: 6.5
+Stable tag: 1.3.7
 Requires PHP: 5.6
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -68,6 +68,13 @@ with sample content on a site running the Nightingale theme, this plgin and the
 
  == Changelog ==
 
+ = 1.3.7 =
+
+ -Fix for floating social icons
+ -Security update
+ -Fixed emergency alert when last updated date not set
+ -Accessibilty improvemnt in emergency alert
+
  = 1.3.6 =
 
  -Removed InstantPage