diff --git a/.env.local b/.env.local index 75c94ee7..e89f45b1 100644 --- a/.env.local +++ b/.env.local @@ -11,44 +11,34 @@ NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459 //Dev oauth //CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015 //CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY - -// dev //RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/ //RELAYURI = "dev-pedw-ns.servicebus.windows.net" //RELAYPATH = "dev-pedw-hc" -//SASKEY = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y=" -//SASKEYNAME = "devpedwnspolicy" //Test Oauth -//CLIENT_ID = 6619ad85-c908-490d-811b-de8c93c0f2aa -//CLIENT_SECRET = qKo7Q~5QvLEplbwnBbint_I5lXqx_-kDm8Vj- +CLIENT_ID = 6619ad85-c908-490d-811b-de8c93c0f2aa +CLIENT_SECRET = qKo7Q~5QvLEplbwnBbint_I5lXqx_-kDm8Vj- +RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/ +RELAYURI = "test-pedw-ns.servicebus.windows.net" +RELAYPATH = "test-pedw-hc" -//test -//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/ -//RELAYURI = "test-pedw-ns.servicebus.windows.net" -//RELAYPATH = "test-pedw-hc" -//SASKEY = "kTLrs9UHwuW9Msc9uNfjf+89qLYT6ly80lK0zdTYJW4=" -//SASKEYNAME = "testpedwhcpolicy" //Preprod Oauth -CLIENT_ID = 75594242-8773-45c7-a3da-85e62485b2f3 -CLIENT_SECRET = UDF7Q~OwTLIV7LXPHlIYHSWbJunlBD53ieLt- +//CLIENT_ID = 75594242-8773-45c7-a3da-85e62485b2f3 +//CLIENT_SECRET = UDF7Q~OwTLIV7LXPHlIYHSWbJunlBD53ieLt- +//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/ +//RELAYURI = "pp-pedw-ns.servicebus.windows.net" +//RELAYPATH = "pp-pedw-hc" -//preprod -RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/ -RELAYURI = "pp-pedw-ns.servicebus.windows.net" -RELAYPATH = "pp-pedw-hc" -//SASKEY = "JzrOYfMTsGBD1cZHH2nkzqsbfDCqg0brO6jyiIDNVPo=" -//SASKEYNAME = "pppedwnspolicy" - //Prod Oauth //CLIENT_ID = 01904c07-9035-4cf9-a535-3945f6e470d2 //CLIENT_SECRET = PRo7Q~GQoKSdARRqF-NOXQDx2Ka8UCINyvagk - - +//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ +//RELAYURI = "prod-pedw-ns.servicebus.windows.net" +//RELAYPATH = "prod-pedw-hc" GOOGLE_TAG_MANAGER = GTM-T78CBC3 @@ -63,4 +53,12 @@ I18N_DOMAIN = "cymru.local" //I18N_DOMAIN ="dev-gwaithcynllunio.gwasanaeth.llyw.cymru" //I18N_DOMAIN ="stage-gwaithcynllunio.gwasanaeth.llyw.cymru" //I18N_DOMAIN ="pp-gwaithcynllunio.gwasanaeth.llyw.cymru"s -//I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru" \ No newline at end of file +//I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru" + + +//gov gateway +GG_PROVIDER_CONFIG_ENDPOINT = "https://api.ete.access.service.gov.uk/.well-known/openid-configuration" +GG_ClIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ +GG_CLIENT_SECRET = z1PGLAKPxIhjMBegTdzX22AayIORc1GsCbMQZ6mieBn7zChjzzxup5lkIByEmsYS +GG_REDIRECT_URI = "https://pp-planningcasework.service.gov.wales" + diff --git a/components/footerDocs/accessibility_cy.js b/components/footerDocs/accessibility_cy.js index d1b3854f..fe4e85cb 100644 --- a/components/footerDocs/accessibility_cy.js +++ b/components/footerDocs/accessibility_cy.js @@ -101,7 +101,7 @@ export default function AccessibilityCY() {
  • Anfonwch neges e-bost at:{" "} PEDW.GwaithAchos@llyw.cymru @@ -110,7 +110,7 @@ export default function AccessibilityCY() {
  • Ffoniwch:{" "} 03000 604400 @@ -128,7 +128,7 @@ export default function AccessibilityCY() { ffoniwch ni neu anfonwch neges e-bost atom i gael cyfarwyddiadau;{" "} Cysylltwch â Ni @@ -174,9 +174,14 @@ export default function AccessibilityCY() {

    Statws cydymffurfio

    - Mae’r wefan hon yn cydymffurfio’n rhannol â Chanllawiau - Hygyrchedd Cynnwys y We (WCAG) fersiwn 2.1 – safon Lefel AA, - o ganlyniad i’r ‘achosion o ddiffyg + Mae’r wefan hon yn cydymffurfio’n rhannol â{" "} + + Chanllawiau Hygyrchedd Cynnwys y We (WCAG) fersiwn 2.1 + {" "} + – safon Lefel AA, o ganlyniad i’r ‘achosion o ddiffyg cydymffurfio’/’eithriadau’ neu’r ‘achosion o ddiffyg cydymffurfio ac eithriadau’] a restrir isod.

    @@ -184,26 +189,23 @@ export default function AccessibilityCY() {

    Diffyg cydymffurfio â’r rheoliadau hygyrchedd

    - Nid oes testun amgen ar gyfer rhai delweddau, felly ni all - pobl sy’n defnyddio rhaglen darllen sgrin gael at y - wybodaeth. Mae hyn yn methu maen prawf llwyddiant 1.1.1 - (cynnwys nad yw’n destun). -

    -

    - Bwriadwn ychwanegu testun amgen at yr holl ddelweddau erbyn - mis Medi 2020. Pan fyddwn yn cyhoeddi cynnwys newydd, byddwn - yn sicrhau bod ein defnydd o ddelweddau’n bodloni safonau - hygyrchedd. + Mae rhai o’r dogfennau a gyhoeddir ar-lein trwy’r gwasanaeth + hwn yn cynnwys diagramau cynllunio sy’n dechnegol eu natur i + raddau helaeth. Er y cydnabyddwn efallai na fydd pob agwedd + ar gynnwys o’r fath yn gwbl hygyrch, rydym wedi ceisio eu + gwella trwy gynyddu maint y testun sylfaenol lle y bo’n + bosibl, ac ychwanegu disgrifiadau testun ystyrlon i ategu + unrhyw wybodaeth weledol bwysig.

    Paratoi’r datganiad hygyrchedd hwn

    - Paratowyd y datganiad hwn ar [TBC]. Fe’i hadolygwyd - ddiwethaf ar [TBC when signed off]. + Paratowyd y datganiad hwn ar 22/11/2021. Fe’i hadolygwyd + ddiwethaf ar 02/12/2021.

    -

    + {/*

    Profwyd y wefan hon ddiwethaf ar [TBC]. Cynhaliwyd y prawf gan [add name of organisation that carried out test, or indicate that you did your own testing]. @@ -217,8 +219,8 @@ export default function AccessibilityCY() {

    Gallwch ddarllen yr adroddiad llawn ar y prawf hygyrchedd - [add link to report]. -

    + [add link to report]. +

    */} ); diff --git a/components/footerDocs/accessibility_en.js b/components/footerDocs/accessibility_en.js index f01a939b..e3cdf56b 100644 --- a/components/footerDocs/accessibility_en.js +++ b/components/footerDocs/accessibility_en.js @@ -96,7 +96,7 @@ export default function AccessibilityEN() {
  • Email:{" "} PEDW.Casework@gov.wales @@ -105,7 +105,7 @@ export default function AccessibilityEN() {
  • Call:{" "} 03000 604400 @@ -150,7 +150,7 @@ export default function AccessibilityEN() {

    Find out how to{" "} contact us @@ -171,33 +171,37 @@ export default function AccessibilityEN() {

    Compliance status

    - This website is partially compliant with the Web Content - Accessibility Guidelines version 2.1 – Level AA standard, - due to the non-compliances’/‘the exemptions’ or ‘the - non-compliances and exemptions’] listed below. + This website is partially compliant with the{" "} + + Web Content Accessibility Guidelines version 2.1 + + – Level AA standard, due to the non-compliances listed + below.

    Non-compliance with the accessibility regulations

    - Some images do not have a text alternative, so people using - a screen reader cannot access the information. This fails - WCAG 2.1 success criterion 1.1.1 (non-text content). -

    -

    - We plan to add text alternatives for all images by September - 2020. When we publish new content we’ll make sure our use of - images meets accessibility standards. + Some documents published online via this service contain + planning diagrams that are largely technical in nature. + While we acknowledge that all aspects of such content may + not be fully accessible, we have endeavoured to improve them + by increasing the base text size where possible, and adding + meaningful text descriptions to supplement any important + visual information.

    Preparation of this accessibility statement

    - This statement was prepared on [TBC]. It was last reviewed - on [TBC when signed off]. + This statement was prepared on 22/11/2021. It was last + reviewed on 02/12/2021.

    -

    + {/*

    This website was last tested on [TBC]. The test was carried out by [add name of organisation that carried out test, or indicate that you did your own testing]. @@ -212,7 +216,7 @@ export default function AccessibilityEN() {

    You can read the full accessibility test report [add link to report]. -

    +

    */} ); diff --git a/locales/cy/common.json b/locales/cy/common.json index 0d21bb48..eb7bc9f5 100644 --- a/locales/cy/common.json +++ b/locales/cy/common.json @@ -19,7 +19,7 @@ "footer-terms-conditions-link-label": "Telerau ac amodau", "footer-terms-conditions-link": "https://llyw.cymru/telerau-ac-amodau", "footer-privacy-link-label": "Preifatrwydd", - "footer-privacy-link": "/preifatrwydd", + "footer-privacy-link": "https://llyw.cymru/gwaith-achos-cynllunio-hysbysiad-preifatrwydd", "footer-cookies-link": "Cwcis", "footer-accessibility-link-label": "Hygyrchedd", "footer-accessibility-link": "/hygyrchedd", diff --git a/locales/en/common.json b/locales/en/common.json index 3d26ccf2..cf3ee23a 100644 --- a/locales/en/common.json +++ b/locales/en/common.json @@ -19,7 +19,7 @@ "footer-terms-conditions-link-label": "Terms and conditions", "footer-terms-conditions-link": "https://gov.wales/terms-and-conditions", "footer-privacy-link-label": "Privacy", - "footer-privacy-link": "/privacy", + "footer-privacy-link": "https://gov.wales/planning-casework-privacy-notice", "footer-cookies-link": "Cookies", "footer-accessibility-link-label": "Accessibility", "footer-accessibility-link": "/accessibility", diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss index 5620a2de..adbb7a78 100644 --- a/styles/sass/welshgov/_application.scss +++ b/styles/sass/welshgov/_application.scss @@ -15,6 +15,7 @@ html { .govuk-header-m, .govuk-header__link, .govuk-footer__link, +.govuk-link, .govuk-button, .govuk-label, .govuk-select,