Merge from git
This commit is contained in:
+128
-53
@@ -27,6 +27,13 @@ export default function Footer(props) {
|
||||
: setShowShareState(true);
|
||||
};
|
||||
|
||||
//console.log(router.asPath);
|
||||
const shareBodyStr = t("common:gov-wales-link") + router.asPath;
|
||||
const shareSubjectStr =
|
||||
t("common:social-shared-from") +
|
||||
" " +
|
||||
t("common:gov-wales-label").toLowerCase();
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="sharebar" id="sharebar">
|
||||
@@ -60,7 +67,10 @@ export default function Footer(props) {
|
||||
>
|
||||
<li>
|
||||
<a
|
||||
href="https://twitter.com/intent/tweet?url=https%3A//gov.wales/"
|
||||
href={
|
||||
"https://twitter.com/intent/tweet?url=" +
|
||||
shareBodyStr
|
||||
}
|
||||
className="twitter"
|
||||
>
|
||||
<span className="vo_hidden">
|
||||
@@ -73,7 +83,10 @@ export default function Footer(props) {
|
||||
</li>
|
||||
<li>
|
||||
<a
|
||||
href="https://www.facebook.com/sharer/sharer.php?u=https%3A//gov.wales/"
|
||||
href={
|
||||
"https://www.facebook.com/sharer/sharer.php?u=" +
|
||||
shareBodyStr
|
||||
}
|
||||
className="facebook"
|
||||
>
|
||||
<span className="vo_hidden">
|
||||
@@ -84,7 +97,12 @@ export default function Footer(props) {
|
||||
</li>
|
||||
<li>
|
||||
<a
|
||||
href="mailto:?body=https%3A//gov.wales/&subject=Shared%20from%20gov.wales"
|
||||
href={
|
||||
"mailto:?body=" +
|
||||
shareBodyStr +
|
||||
"&subject=" +
|
||||
shareSubjectStr
|
||||
} //</li>https%3A//gov.wales/&subject=Shared%20from%20gov.wales"
|
||||
className="email"
|
||||
>
|
||||
<span className="vo_hidden">
|
||||
@@ -117,68 +135,125 @@ export default function Footer(props) {
|
||||
role="navigation"
|
||||
aria-labelledby="footer_links"
|
||||
>
|
||||
<ul className="govuk-footer__inline-list">
|
||||
<li className="govuk-footer__inline-list-item govuk-!-font-weight-bold govuk-!-margin-right-7">
|
||||
<a
|
||||
href={t(
|
||||
"common:footer-guidance-link"
|
||||
)}
|
||||
className="nav-link"
|
||||
>
|
||||
{t(
|
||||
"common:footer-guidance-link-label"
|
||||
)}
|
||||
</a>
|
||||
</li>
|
||||
<li className="govuk-footer__inline-list-item govuk-!-font-weight-bold">
|
||||
<a
|
||||
href={t(
|
||||
"common:footer-contact-us-link"
|
||||
)}
|
||||
className="govuk-footer__link"
|
||||
id="aAccess"
|
||||
>
|
||||
{t(
|
||||
"common:footer-contact-us-link-label"
|
||||
)}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
<ul
|
||||
className="govuk-footer__inline-list"
|
||||
id="footer_links"
|
||||
>
|
||||
<li className="govuk-footer__inline-list-item">
|
||||
<a
|
||||
href="http://www.gov.uk/government/publications/appeals-casework-portal-documentation"
|
||||
href={t(
|
||||
"common:footer-accessibility-link"
|
||||
)}
|
||||
className="govuk-footer__link"
|
||||
id="aAccess"
|
||||
>
|
||||
{t(
|
||||
"common:footer-accessibility-link-label"
|
||||
)}
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li className="govuk-footer__inline-list-item">
|
||||
<Link
|
||||
href={
|
||||
router.locale == "cy"
|
||||
? "/help/cwcis"
|
||||
: "/help/cookies"
|
||||
}
|
||||
>
|
||||
<a
|
||||
id="aCookies"
|
||||
className="govuk-footer__link"
|
||||
>
|
||||
{t(
|
||||
"common:footer-cookies-link"
|
||||
)}
|
||||
</a>
|
||||
</Link>
|
||||
</li>
|
||||
<li className="govuk-footer__inline-list-item">
|
||||
<a
|
||||
href={t(
|
||||
"common:footer-copyright-link"
|
||||
)}
|
||||
className="govuk-footer__link"
|
||||
id="aAccess"
|
||||
>
|
||||
{t(
|
||||
"common:footer-copyright-link-label"
|
||||
)}
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li className="govuk-footer__inline-list-item">
|
||||
<a
|
||||
href={t(
|
||||
"common:footer-privacy-link"
|
||||
)}
|
||||
id="aPrivacy"
|
||||
className="govuk-footer__link"
|
||||
>
|
||||
{t(
|
||||
"common:footer-privacy-link-label"
|
||||
)}
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li className="govuk-footer__inline-list-item">
|
||||
<a
|
||||
href={t(
|
||||
"common:footer-terms-conditions-link"
|
||||
)}
|
||||
id="aTermsConds"
|
||||
className="govuk-footer__link"
|
||||
>
|
||||
{t(
|
||||
"common:footer-terms-conditions-link-label"
|
||||
)}
|
||||
</a>
|
||||
</li>
|
||||
{/* <li className="govuk-footer__inline-list-item">
|
||||
<a
|
||||
href={t(
|
||||
"common:footer-alternative-languages-link"
|
||||
)}
|
||||
id="aTermsConds"
|
||||
className="govuk-footer__link"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
>
|
||||
{t(
|
||||
"common:footer-terms-conditions-link"
|
||||
"common:footer-alternative-languages-link-label"
|
||||
)}
|
||||
</a>
|
||||
</li>
|
||||
<li className="govuk-footer__inline-list-item">
|
||||
<a
|
||||
href="https://www.gov.uk/government/publications/planning-inspectorate-privacy-notices"
|
||||
id="aPrivacy"
|
||||
className="govuk-footer__link"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
>
|
||||
{t("common:footer-privacy-link")}
|
||||
</a>
|
||||
</li>
|
||||
<li className="govuk-footer__inline-list-item">
|
||||
<a
|
||||
href="https://www.gov.uk/guidance/appeals-casework-portal-privacy-cookies"
|
||||
id="aCookies"
|
||||
className="govuk-footer__link"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
>
|
||||
{t("common:footer-cookies-link")}
|
||||
</a>
|
||||
</li>
|
||||
<li className="govuk-footer__inline-list-item">
|
||||
<a
|
||||
href="http://www.gov.uk/government/publications/appeals-casework-portal-documentation"
|
||||
className="govuk-footer__link"
|
||||
id="aAccess"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
>
|
||||
{t(
|
||||
"common:footer-accessibility-link"
|
||||
)}
|
||||
</a>
|
||||
</li>
|
||||
<li className="govuk-footer__inline-list-item">
|
||||
<a
|
||||
href="http://www.gov.uk/guidance/feedback"
|
||||
id="feedback"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
>
|
||||
{t("common:footer-feedback-link")}
|
||||
</a>
|
||||
</li>
|
||||
</li> */}
|
||||
</ul>
|
||||
</nav>
|
||||
<div
|
||||
@@ -186,12 +261,12 @@ export default function Footer(props) {
|
||||
id="footer_logo"
|
||||
>
|
||||
<a
|
||||
href="https://gov.wales/"
|
||||
href={t("common:gov-wales-link")}
|
||||
className="footer__logo"
|
||||
id="footerlogo"
|
||||
>
|
||||
<span className="visually-hidden">
|
||||
Home
|
||||
{t("common:gov-wales-label")}
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user