ndr_ui 3.2.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 948171552053d8201249a7ad4d0b1aff5743a844c01339dfac66f7458307e03f
-  data.tar.gz: 27d8fa3cc83c56584f3c5a2caf786216143794b3632d867f1cb8fd25412b76fc
+  metadata.gz: c3d037bd898369731168a9fe37f0be2ead33c97ab278619c12cbad62d1ba1007
+  data.tar.gz: 8b11286d91c841ce6df6eefd25f8c59439b284815452625e765b0b7dd445eb7b
 SHA512:
-  metadata.gz: d3c9dd26dc4dec27e06208b20f8c606466dd0fff4570e32874b76fd44a9a9b65eba252449f66aeb322f0cb6f00584dd4b7650f8780897b157c2c809a95131c7f
-  data.tar.gz: 32d327a35c5656866922cdcf7c0f2a9badcfa47ca53f5a064b85eed5f507ec6c3b76ae1a247072cea612dcc5c2695480130d4ad27a7ffa2cb511e368c13eaaa0
+  metadata.gz: 7ab10ccc52cdc85b3df3f646b7e37ecbb5e88ae63c90098fabc0549ffaea286c60ec934d743e5984ef01f306ed92e703cc73f8ccfcc8afe5b49d687b13583827
+  data.tar.gz: 2b0d73fe9eb3b3afc5e9f0da71b0df4e02cabcc476394388219b1ea975c20cbcbd115ff3a8ee64570dd0f095d7d6a142b5e6f2408abce269cc92efae74ec192f

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Public Health England
+Copyright (c) 2015-2022 NHS Digital
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,6 @@
-# NdrUi [![Build Status](https://github.com/publichealthengland/ndr_ui/workflows/Test/badge.svg)](https://github.com/publichealthengland/ndr_ui/actions?query=workflow%3Atest) [![Gem Version](https://badge.fury.io/rb/ndr_ui.svg)](https://rubygems.org/gems/ndr_ui) [![Documentation](https://img.shields.io/badge/ndr_ui-docs-blue.svg)](https://www.rubydoc.info/gems/ndr_ui)
+# NdrUi [![Build Status](https://github.com/NHSDigital/ndr_ui/workflows/Test/badge.svg)](https://github.com/NHSDigital/ndr_ui/actions?query=workflow%3Atest) [![Gem Version](https://badge.fury.io/rb/ndr_ui.svg)](https://rubygems.org/gems/ndr_ui) [![Documentation](https://img.shields.io/badge/ndr_ui-docs-blue.svg)](https://www.rubydoc.info/gems/ndr_ui)
 
-This is the Public Health England (PHE) National Disease Registration (NDR) User Interface rubygem,
+This is the NHS Digital (NHS-D) National Disease Registration (NDR) User Interface rubygem,
 providing a set of core features:
 
 1. jQuery
@@ -108,6 +108,22 @@ end
 
 Use `<%= timeago_tag(some_time) %>` in your views (see the helper method documentation for more details).
 
+### NDRS Styling
+
+To use the NDRS Styling:
+
+require it after ndr_ui and after any bootstrap styling. For example:
+
+In `app/assets/stylesheets/application.scss`:
+
+```scss
+/*
+*= require bootstrap-table
+*= require ndr_ui
+*= require ndr_ui/ndrs_styling
+*/
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -116,7 +132,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/PublicHealthEngland/ndr_ui.
+Bug reports and pull requests are welcome on GitHub at https://github.com/NHSDigital/ndr_ui.
 
 This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org/) code of conduct.
 

data/app/assets/images/ndr_ui/logo-partition.svg

@@ -0,0 +1 @@
+<svg id="ezIUOJaEbk41" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1 55" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" width="1" height="55" style="background-color:#D5DADE"/>

data/app/assets/images/ndr_ui/ndrs-logo-without-text.svg

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="62" height="36" version="1.2" viewBox="0 0 46.5 27" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>ndrs-logo-without-text</title>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title>ndrs-logo-without-text</dc:title>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs>
+  <symbol id="glyph0-1" overflow="visible">
+   <path d="m169.73-177.86v177.86h-16.969c-2.625 0-4.8203-0.42578-6.5781-1.2812-1.7617-0.86328-3.4648-2.3203-5.1094-4.375l-92.859-118.58c0.48828 5.418 0.73438 10.422 0.73438 15.016v109.22h-29.156v-177.86h17.344c1.3945 0 2.6016 0.0625 3.625 0.1875 1.0312 0.125 1.9375 0.375 2.7188 0.75 0.78125 0.36718 1.5352 0.89843 2.2656 1.5938 0.73828 0.6875 1.5625 1.6094 2.4688 2.7656l93.234 119.06c-0.25-2.875-0.46093-5.7031-0.625-8.4844-0.15625-2.7891-0.23437-5.375-0.23437-7.75v-108.12z"/>
+  </symbol>
+  <symbol id="glyph0-2" overflow="visible">
+   <path d="m177.73-88.922c0 13.031-2.1719 25-6.5156 35.906s-10.453 20.297-18.328 28.172-17.352 13.984-28.422 18.328c-11.062 4.3438-23.359 6.5156-36.891 6.5156h-67.781v-177.86h67.781c13.531 0 25.828 2.1953 36.891 6.5781 11.07 4.3867 20.547 10.496 28.422 18.328 7.875 7.8359 13.984 17.203 18.328 28.109s6.5156 22.883 6.5156 35.922zm-33.953 0c0-9.7578-1.293-18.516-3.875-26.266-2.5859-7.75-6.3125-14.305-11.188-19.672-4.875-5.375-10.781-9.4922-17.719-12.359-6.9297-2.875-14.734-4.3125-23.422-4.3125h-34.562v125.2h34.562c8.6875 0 16.492-1.4297 23.422-4.2969 6.9375-2.875 12.844-6.9922 17.719-12.359 4.875-5.375 8.6016-11.938 11.188-19.688 2.582-7.75 3.875-16.5 3.875-26.25z"/>
+  </symbol>
+  <symbol id="glyph0-3" overflow="visible">
+   <path d="m73.547-93.234c6.2383 0 11.672-0.77344 16.297-2.3281 4.6328-1.5625 8.4453-3.7188 11.438-6.4688 3-2.75 5.2344-6.0078 6.7031-9.7812 1.4766-3.7695 2.2188-7.9102 2.2188-12.422 0-9.0195-2.9766-15.945-8.9219-20.781-5.9375-4.8438-15.016-7.2656-27.234-7.2656h-21.156v59.047zm85.125 93.234h-29.891c-5.6562 0-9.7578-2.2109-12.297-6.6406l-37.391-56.953c-1.3984-2.125-2.9375-3.6406-4.625-4.5469-1.6797-0.90625-4.1562-1.3594-7.4375-1.3594h-14.141v69.5h-33.094v-177.86h54.25c12.051 0 22.398 1.25 31.047 3.75 8.6562 2.5 15.75 6.0078 21.281 10.516 5.5391 4.5117 9.625 9.9062 12.25 16.188 2.625 6.2734 3.9375 13.18 3.9375 20.719 0 5.9922-0.88672 11.652-2.6562 16.984-1.7617 5.3242-4.3047 10.156-7.625 14.5-3.3125 4.3438-7.4141 8.1562-12.297 11.438-4.875 3.2812-10.434 5.8672-16.672 7.75 2.1328 1.2305 4.1016 2.6875 5.9062 4.375 1.8125 1.6797 3.4531 3.6641 4.9219 5.9531z"/>
+  </symbol>
+  <symbol id="glyph0-4" overflow="visible">
+   <path d="m114.52-145.52c-0.99219 1.7305-2.0391 2.9844-3.1406 3.7656-1.1055 0.77344-2.4805 1.1562-4.125 1.1562-1.7188 0-3.5859-0.63281-5.5938-1.9062-2.0117-1.2695-4.4141-2.6797-7.2031-4.2344-2.7812-1.5625-6.0391-2.9766-9.7656-4.25-3.7305-1.2695-8.1367-1.9062-13.219-1.9062-4.5938 0-8.6172 0.55859-12.062 1.6719-3.4375 1.1055-6.3281 2.6406-8.6719 4.6094-2.3359 1.9688-4.0781 4.3281-5.2344 7.0781-1.1484 2.7422-1.7188 5.75-1.7188 9.0312 0 4.1797 1.1641 7.6641 3.5 10.453 2.3438 2.793 5.4414 5.1719 9.2969 7.1406 3.8516 1.9609 8.2383 3.7188 13.156 5.2812 4.9258 1.5625 9.9727 3.2266 15.141 4.9844 5.1641 1.7617 10.207 3.8125 15.125 6.1563 4.9141 2.3359 9.3008 5.2891 13.156 8.8594 3.8516 3.5625 6.9453 7.9297 9.2812 13.094 2.3438 5.168 3.5156 11.438 3.5156 18.812 0 8.0312-1.375 15.559-4.125 22.578-2.75 7.0117-6.7734 13.121-12.062 18.328-5.2812 5.1992-11.734 9.2969-19.359 12.297-7.625 2.9883-16.359 4.4844-26.203 4.4844-5.6562 0-11.234-0.55859-16.734-1.6719-5.4922-1.1016-10.758-2.6758-15.797-4.7188-5.043-2.0508-9.7773-4.5078-14.203-7.375-4.4297-2.875-8.3672-6.0781-11.812-9.6094l9.7188-15.859c0.82031-1.1445 1.8906-2.1094 3.2031-2.8906s2.7031-1.1719 4.1719-1.1719c2.0508 0 4.2656 0.84375 6.6406 2.5312 2.3828 1.6797 5.2109 3.543 8.4844 5.5938 3.2812 2.043 7.1133 3.9062 11.5 5.5938 4.3945 1.6797 9.6641 2.5156 15.812 2.5156 9.4258 0 16.723-2.2344 21.891-6.7031 5.1641-4.4688 7.75-10.883 7.75-19.25 0-4.6758-1.168-8.4883-3.5-11.438-2.3359-2.9453-5.4297-5.4258-9.2812-7.4375-3.8555-2.0078-8.2461-3.7109-13.172-5.1094-4.918-1.3945-9.918-2.9102-15-4.5469-5.0859-1.6445-10.09-3.6133-15.016-5.9062-4.918-2.2891-9.3047-5.2812-13.156-8.9688-3.8555-3.6953-6.9492-8.3125-9.2812-13.844-2.3359-5.5391-3.5-12.367-3.5-20.484 0-6.4766 1.2852-12.789 3.8594-18.938 2.582-6.1562 6.332-11.609 11.25-16.359 4.9258-4.7578 11-8.5703 18.219-11.438 7.2188-2.875 15.5-4.3125 24.844-4.3125 10.5 0 20.176 1.6406 29.031 4.9219 8.8516 3.2812 16.395 7.875 22.625 13.781z"/>
+  </symbol>
+ </defs>
+ <g transform="matrix(.070234 0 0 .070234 -19.571 -13.281)">
+  <g>
+   <path d="m693.1 318.14c-13.078-67.527-70.176-118.36-138.63-118.36-68.461 0-125.55 50.832-138.64 118.36z" fill="#45b0e8"/>
+   <path d="m777.11 318.14c-13.078-67.527-70.176-118.36-138.64-118.36-68.457 0-125.55 50.832-138.63 118.36z" fill="#4abf87"/>
+   <path d="m693.1 318.14c-10.285-53.098-47.785-95.879-96.633-111.73-48.844 15.855-86.344 58.637-96.629 111.73z" fill="#28a6a8"/>
+  </g>
+  <g fill="#333">
+   <use x="269.53809" y="558.05151" width="100%" height="100%" xlink:href="#glyph0-1"/>
+   <use x="458.9581" y="558.05151" width="100%" height="100%" xlink:href="#glyph0-2"/>
+   <use x="645.91809" y="558.05151" width="100%" height="100%" xlink:href="#glyph0-3"/>
+   <use x="804.09613" y="558.05151" width="100%" height="100%" xlink:href="#glyph0-4"/>
+  </g>
+ </g>
+</svg>

data/app/assets/images/ndr_ui/nhs-digital-logo_nhs-blue_left.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="96" height="75" data-name="Layer 4" version="1.1" viewBox="0 0 96 75" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title>nhs-digital-logo_nhs-blue_rgb-01a</dc:title>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <title>nhs-digital-logo_nhs-blue_rgb-01a</title>
+ <g transform="matrix(.27994 0 0 .27994 -17.059 -16.737)">
+  <rect x="71.05" y="69.9" width="321.92" height="120.92" fill="#fff"/>
+  <g fill="#231f20">
+   <path d="m64.51 237.33h18.22c20.41 0 38.45 6.86 38.45 33.3s-18 33.29-38.45 33.29h-18.22zm13.35 56.1h7.43c11.17 0 21.95-8.3 21.95-22.88s-10.78-22.88-21.95-22.88h-7.43z"/>
+   <path d="m130.63 233.62h12.77v12.21h-12.77zm0 21.24h12.77v49.14h-12.77z"/>
+   <path d="m200.14 254.8v44.37c0 13.35-5.34 25.95-25.95 25.95a43.36 43.36 0 0 1-17-3.27l1-10.89c3.9 2.1 10.31 4.3 14.31 4.3 14.12 0 14.71-10.59 14.71-19.08h-0.21c-2.39 4.19-8.17 7.82-15.27 7.82-14.49 0-20-11.63-20-24.8 0-11.83 6.11-25.48 20.8-25.48 6.54 0 11.54 2.19 15.07 7.83h0.2v-6.69h12.3zm-12.78 24c0-8.4-3.27-15.27-10.69-15.27-8.67 0-11.43 8-11.43 15.56 0 6.68 3.53 14.89 10.88 14.89 7.92 0 11.18-7 11.18-15.18z"/>
+   <path d="m211.58 233.62h12.78v12.21h-12.78zm0 21.24h12.78v49.14h-12.78z"/>
+   <path d="m242.06 264.15h-9.45v-9.35h9.45v-9.8l12.77-4.1v13.93h11.36v9.34h-11.36v22.83c0 4.2 1.15 8.17 6 8.17a11.46 11.46 0 0 0 5.82-1.34l0.35 10.17a33.82 33.82 0 0 1-9.44 1.14c-10 0-15.56-6.19-15.56-15.93v-25z"/>
+   <path d="m279.07 257.36a44 44 0 0 1 17.07-3.72c15 0 21.25 6.19 21.25 20.7v6.36c0 4.9 0.1 8.68 0.19 12.3s0.3 7.16 0.58 11h-11.26a58.38 58.38 0 0 1-0.57-7.35h-0.2a17.54 17.54 0 0 1-15.13 8.46c-8.67 0-17.17-5.24-17.17-14.59 0-7.35 3.53-11.63 8.4-14s11.16-2.86 16.5-2.86h7.06c0-7.92-3.53-10.59-11.06-10.59a25.7 25.7 0 0 0-15.16 5.35zm15 38.36a10.83 10.83 0 0 0 9-4.4 16.31 16.31 0 0 0 2.67-10.11h-5.54c-5.72 0-14.22 0.94-14.22 8.49-0.05 4.2 3.48 6.02 8.07 6.02z"/>
+   <path d="m328.3 232.38h12.78v71.56h-12.78z"/>
+  </g>
+  <path d="m387.72 79.43-7.06 21.66a55.34 55.34 0 0 0-24.12-4.9c-11.58 0-21 1.64-21 10.44 0 15.43 42.49 9.68 42.49 42.74 0 30.08-28.06 37.89-53.44 37.89a122.71 122.71 0 0 1-33.84-5.62l6.9-22.14c5.78 3.76 17.38 6.24 26.94 6.24 9.11 0 23.36-1.72 23.36-12.94 0-17.47-42.49-10.92-42.49-41.62 0-28.08 24.77-36.49 48.74-36.49 13.49 0 26.15 1.42 33.54 4.9m-84.18-3.15-22.73 108.83h-29.3l9.73-46.62h-34.65l-9.7 46.62h-29.32l22.73-108.83h29.3l-8.62 41.63h34.63l8.62-41.63zm-104 0-23.23 108.84h-36.33l-22.92-75.28h-0.28l-15.23 75.31h-27.57l23.34-108.87h36.5l22.42 75.49h0.31l15.37-75.49zm200.74-13.08h-335.79v135.26h335.79z" fill="#005eb8"/>
+ </g>
+</svg>

data/app/assets/stylesheets/ndr_ui/ndrs_styling.scss

@@ -0,0 +1,185 @@
+:root {
+  --ndrs-nav-height: 102px;
+  --ndrs-nav-bar-padding:40px 10px; /* This is for the navbar alignment */
+  --ndrs-nav-collapsed-height: 40px;
+  --ndrs-nav-bar-collapsed-padding:10px; /* This is for the navbar alignment */
+  --ndrs-footer-height:2.5rem;
+  --bright-navy-coal-20-tint:#87D8DD;
+  --black:#353535;
+}
+
+.navbar-ndrs {
+  border-color: #D5DADE;
+  background-color: white;
+}
+.navbar-default, .navbar-ndrs .open a {
+  background-image: none !important;
+}
+
+#page-container-ndrs {
+  position: relative;
+  min-height: 75vh;
+}
+
+#content-wrap {
+  padding-bottom: var(--ndrs-footer-height);
+}
+
+.ndrs-logo {
+  margin: 2rem 0;
+  height: 36px;
+  width: 62px;
+  display: flex;
+  position: relative;
+  justify-content: center;
+  align-items: center;
+  order: 1;
+  z-index: 101;
+}
+
+.navbar-header .navbar-brand {
+  height: var(--ndrs-nav-height);
+}
+
+.navbar-brand {
+  font-weight: 750;
+}
+
+.navbar-ndrs .navbar-brand-ndrs {
+  color: #218183;
+  height: var(--ndrs-nav-height);
+  padding: var(--ndrs-nav-bar-padding);
+  text-align: center;
+}
+
+.navbar-ndrs .navbar-brand-ndrs:active,
+.navbar-ndrs .navbar-brand-ndrs:focus,
+.navbar-ndrs .navbar-brand-ndrs:hover {
+  background-color: var(--bright-navy-coal-20-tint);
+  color: var(--black);
+  border-bottom: 2px solid #231f20;
+}
+
+.navbar-ndrs .container .navbar-brand {
+  margin-left: 0px;
+}
+
+.navbar-ndrs .navbar-nav > li > a {
+  height: var(--ndrs-nav-height);
+  padding: var(--ndrs-nav-bar-padding);
+  text-align: center;
+}
+
+.navbar-ndrs div[aria-expanded="true"] li a {
+  height: var(--ndrs-nav-collapsed-height);
+  padding: var(--ndrs-nav-bar-collapsed-padding);
+}
+
+.navbar-ndrs .navbar-nav li a {
+  color: #218183;
+  font-weight: bold;
+}
+.navbar-ndrs .navbar-nav li a:active,
+.navbar-ndrs .navbar-nav li a:focus,
+.navbar-ndrs .navbar-nav li a:hover {
+  background-color: var(--bright-navy-coal-20-tint);
+  color: var(--black);
+  border-bottom: 2px solid #231f20;
+}
+
+.navbar-ndrs .navbar-nav li a:active .ndrs-a-navbar-item-label,
+.navbar-ndrs .navbar-nav li a:focus .ndrs-a-navbar-item-label,
+.navbar-ndrs .navbar-nav li a:hover .ndrs-a-navbar-item-label {
+  background-color: var(--bright-navy-coal-20-tint);
+  color: var(--black);
+  border-bottom: 2px solid #231f20;
+}
+.navbar-ndrs .navbar-nav .open .dropdown-menu > li > a {
+  color: #218183;
+  font-weight: bold;
+}
+.navbar-ndrs .navbar-nav .open .dropdown-menu > li > a:active,
+.navbar-ndrs .navbar-nav .open .dropdown-menu > li > a:focus,
+.navbar-ndrs .navbar-nav .open .dropdown-menu > li > a:hover {
+  background-color: var(--bright-navy-coal-20-tint);
+  color: var(--black);
+  border-bottom: 2px solid #231f20;
+}
+.navbar-ndrs .navbar-nav > .open > a {
+  color: #218183;
+  font-weight: bold;
+  background-color: var(--bright-navy-coal-20-tint);
+}
+.navbar-ndrs .navbar-nav > .open > a:active,
+.navbar-ndrs .navbar-nav > .open > a:focus,
+.navbar-ndrs .navbar-nav > .open > a:hover {
+  background-color: var(--bright-navy-coal-20-tint);
+  color: var(--black);
+  border-bottom: 2px solid #231f20;
+}
+.nav .open > a,
+.nav .open > a:active,
+.nav .open > a:focus,
+.nav .open > a:hover {
+  background-color: var(--bright-navy-coal-20-tint);
+  color: var(--black);
+  border-bottom: 2px solid #231f20;
+}
+.navbar-ndrs .dropdown-menu > .active > a {
+  background-color: var(--bright-navy-coal-20-tint);
+  color: var(--black);
+  border-bottom: 2px solid #231f20;
+}
+
+.navbar-ndrs .navbar-toggle {
+  /* (102px - button height 34px) / 2 = 34px */
+  margin-top: 34px;
+  padding: 9px 10px !important;
+}
+
+.footer-ndrs-link {
+  color: var(--black);
+  border-bottom: 2px solid #231f20;
+}
+
+#footer {
+  position: absolute;
+  bottom: 0;
+  width: 90%;
+  height: var(--ndrs-footer-height);
+}
+
+#footer-ndrs-logo {
+  height: 64px;
+  width: 110px;
+}
+
+#footer-logo-partition {
+  height: 55px;
+  margin: 0px 20px;
+}
+
+#footer-nhsd-logo {
+  height: 96px;
+  width: 73px;
+}
+
+#working-together {
+  display: block;
+  font-size: 1.5em;
+  margin-top: 0.83em;
+  margin-bottom: 0.83em;
+  margin-left: 0;
+  margin-right: 0;
+  font-weight: bold;
+}
+
+#legal {
+  display: block;
+  font-size: 1.5em;
+  margin-top: 0.83em;
+  margin-bottom: 0.83em;
+  margin-left: 0;
+  margin-right: 0;
+  font-weight: bold;
+}

data/app/builders/ndr_ui/bootstrap/datepicker.rb

@@ -23,7 +23,7 @@ module NdrUi
       #       </span>
       #
       def datepicker_field(method, options = {})
-        date_value = object.send(method).try(:to_date).try(:to_s, :ui)
+        date_value = object.send(method).try(:to_date).try(:to_formatted_s, :ui)
 
         defaults = {
           value:          date_value,

data/lib/ndr_ui/engine.rb

@@ -1,5 +1,6 @@
 require 'bootstrap-sass/engine'
 require 'jquery-rails'
+require 'sprockets/railtie'
 
 module NdrUi
   # This is where we define the base class for the engine
@@ -11,7 +12,7 @@ module NdrUi
     # directly by templates without issue, rather than needing to go via
     # an asset manifest in the host.
     initializer 'ndr_ui.assets.precompile' do |app|
-      app.config.assets.precompile += %w(*.scss *.js *.gif)
+      app.config.assets.precompile += %w[*.scss *.js *.gif *.svg]
     end
 
     # We configure the generator of the host app

data/lib/ndr_ui/version.rb

@@ -2,5 +2,5 @@
 
 # This stores the current version of the NdrUi gem. Use semantic versioning http://semver.org
 module NdrUi
-  VERSION = '3.2.0'.freeze
+  VERSION = '3.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_ui
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.1
 platform: ruby
 authors:
 - NDR Development Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,62 +16,76 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.1
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -87,21 +101,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: ndr_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: net-smtp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,21 +143,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ndr_dev_support
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.10.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.10.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,21 +171,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -182,11 +210,15 @@ files:
 - Rakefile
 - app/assets/images/ndr_ui/indicator-danger.gif
 - app/assets/images/ndr_ui/indicator-white.gif
+- app/assets/images/ndr_ui/logo-partition.svg
+- app/assets/images/ndr_ui/ndrs-logo-without-text.svg
+- app/assets/images/ndr_ui/nhs-digital-logo_nhs-blue_left.svg
 - app/assets/javascripts/ndr_ui/datepicker.js
 - app/assets/javascripts/ndr_ui/index.js
 - app/assets/javascripts/ndr_ui/timeago.js
 - app/assets/stylesheets/ndr_ui/datepicker.scss
 - app/assets/stylesheets/ndr_ui/index.scss
+- app/assets/stylesheets/ndr_ui/ndrs_styling.scss
 - app/builders/ndr_ui/bootstrap/datepicker.rb
 - app/builders/ndr_ui/bootstrap/error_and_warning_alert_boxes.rb
 - app/builders/ndr_ui/bootstrap/form_control_class.rb
@@ -363,11 +395,11 @@ files:
 - vendor/assets/jquery-timeago-1.5.3/locales/jquery.timeago.vi.js
 - vendor/assets/jquery-timeago-1.5.3/locales/jquery.timeago.zh-CN.js
 - vendor/assets/jquery-timeago-1.5.3/locales/jquery.timeago.zh-TW.js
-homepage: https://github.com/PublicHealthEngland/ndr_ui
+homepage: https://github.com/NHSDigital/ndr_ui
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -375,15 +407,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: NDR UI Rails Engine
 test_files: []