Merge branch 'master' into Release-DLS-2023.22

Author: kevwhitt-hee

DigitalLearningSolutions.Data.Migrations/2023090611401334_updateCookiePolicyContentHtml.cs

@@ -7,13 +7,13 @@
 
 namespace DigitalLearningSolutions.Data.Migrations
 {
-    [Migration(202309191452)]
+    [Migration(202309221452)]
 
     public class UpdateCookiePolicyContentHtml : Migration
     {
         public override void Up()
         {
-            var CookiePolicyContentHtml = Properties.Resources.TD_1943_CookiesPolicyContentHtml;
+            var CookiePolicyContentHtml = Properties.Resources.TD_1943_CookiePolicyContentHtml;
 
             Execute.Sql(
                 @"UPDATE Config SET  ConfigText =N'" + CookiePolicyContentHtml + "' " +

DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs

@@ -304,7 +304,7 @@
   <data name="TD_1943_CookiePolicyContentHtmlOldRecord" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TD_1943_CookiePolicyContentHtmlOldRecord.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="TD_1943_CookiesPolicyContentHtml" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TD_1943_CookiesPolicyContentHtml.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  <data name="TD_1943_CookiePolicyContentHtml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TD_1943_CookiePolicyContentHtml.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
 </root>

DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx

@@ -102,7 +102,7 @@ When you close the browser (if you do not use the banner) or 1 year (if you use
 <p><a href=http://www.dls.nhs.uk/ data-cke-saved-href=http://www.dls.nhs.uk/ title=http://www.dls.nhs.uk>www.dls.nhs.uk</a></td>
 <td class="nhsuk-table__cell" data-label="Purpose" role="cell">
 <span class="nhsuk-table-responsive__heading">Purpose</span>
-<p><div>Several of these are used to remember your filter selections when using the application. Including:<p>
+<div><p>Several of these are used to remember your filter selections when using the application. Including:<p>
 <ul><li>AdminFilter<li>DelegateFilter<li>DelegateGroupsFilter<li>CourseFilter</ul></div></td>
 <td class="nhsuk-table__cell" data-label="Expiry" role="cell">
 <span class="nhsuk-table-responsive__heading">Expiry</span>5 months </td>
@@ -127,7 +127,7 @@ Legacy tracking system cookies</td>
 <p><a href=http://www.dls.nhs.uk/ data-cke-saved-href=http://www.dls.nhs.uk/ title=http://www.dls.nhs.uk>www.dls.nhs.uk</a></td>
 <td class="nhsuk-table__cell" data-label="Purpose" role="cell">
 <span class="nhsuk-table-responsive__heading">Purpose</span>
-<p><div>Several of these are used to remember your grid search, filter and sort selections when using the legacy applications. Including:<p><ul><li>cms_courses_aspx_MainContent_<ul><li>bsgvCourses</ul><li>tracking_tickets_aspx_MainContent_<ul><li>bsgvTickets<li>bsgvCentreDelegates<li>bsgvCustomisations<li>bsgvAdminUsers<li>bsgvSuperviseDelegates</ul></ul></div></td>
+<div><p>Several of these are used to remember your grid search, filter and sort selections when using the legacy applications. Including:<p><ul><li>cms_courses_aspx_MainContent_<ul><li>bsgvCourses</ul><li>tracking_tickets_aspx_MainContent_<ul><li>bsgvTickets<li>bsgvCentreDelegates<li>bsgvCustomisations<li>bsgvAdminUsers<li>bsgvSuperviseDelegates</ul></ul></div></td>
 <td class="nhsuk-table__cell" data-label="Expiry" role="cell"><span class="nhsuk-table-responsive__heading">Expiry</span>12 months</td>
 </tr>
 <tr class="nhsuk-table__row" role="row">
@@ -173,7 +173,7 @@ Google analytics cookies</td>
 <a href=http://www.dls.nhs.uk/ data-cke-saved-href=http://www.dls.nhs.uk/ title=http://www.dls.nhs.uk>www.dls.nhs.uk</a></td>
 <td class="nhsuk-table__cell" data-label="Purpose" role="cell">
 <span class="nhsuk-table-responsive__heading">Purpose</span>
-<p><div>These cookies are used to collect information about how visitors use our site, which we use to help improve it. The cookies collect information in an anonymous form, including the number of visitors to the site, where visitors have come to the site from and the pages they visited.<p>These cookies may also be identified as originating from england.nhs.uk<p>These include cookies with names starting "_ga"<p><a href=http://www.google.com/intl/en-GB/policies/technologies/cookies/ >More information about Google cookies</a>.</div></td>
+<div><p>These cookies are used to collect information about how visitors use our site, which we use to help improve it. The cookies collect information in an anonymous form, including the number of visitors to the site, where visitors have come to the site from and the pages they visited.<p>These cookies may also be identified as originating from england.nhs.uk<p>These include cookies with names starting "_ga"<p><a href=http://www.google.com/intl/en-GB/policies/technologies/cookies/ >More information about Google cookies</a>.</div></td>
 <td class="nhsuk-table__cell" data-label="Expiry" role="cell"><span class="nhsuk-table-responsive__heading">Expiry</span>13 months</td>
 </tr>
 <tr class="nhsuk-table__row" role="row">
@@ -185,7 +185,7 @@ Hotjar cookies</td>
 <a href=http://www.dls.nhs.uk/ data-cke-saved-href=http://www.dls.nhs.uk/ title=http://www.dls.nhs.uk>www.dls.nhs.uk</a></td>
 <td class="nhsuk-table__cell" data-label="Purpose" role="cell">
 <span class="nhsuk-table-responsive__heading">Purpose</span>
-<p><div>Hotjar Tracking Code cookies are set on a visitor''s browser when they visit a website that loads the Hotjar Tracking Code. These cookies allow the Hotjar Tracking Code to function correctly. Apart from cookies, the Hotjar Tracking Code uses local and session storage as well.<p>These include cookies with names starting "_hj".<p><a href=https://help.hotjar.com/hc/en-us/articles/6952777582999-Cookies-Set-by-the-Hotjar-Tracking-Code>More information about Hotjar cookies</a>.</div></td>
+<div><p>Hotjar Tracking Code cookies are set on a visitor''s browser when they visit a website that loads the Hotjar Tracking Code. These cookies allow the Hotjar Tracking Code to function correctly. Apart from cookies, the Hotjar Tracking Code uses local and session storage as well.<p><p>These include cookies with names starting "_hj".<p><a href=https://help.hotjar.com/hc/en-us/articles/6952777582999-Cookies-Set-by-the-Hotjar-Tracking-Code>More information about Hotjar cookies</a>.</div></td>
 <td class="nhsuk-table__cell" data-label="Expiry" role="cell">
 <span class="nhsuk-table-responsive__heading">Expiry</span>1 year</td>
 </tr>