robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged PR 1083: accessibility amends

Browse Source 
Related work items: #10350, #10445, #10446, #10447, #10448
This commit is contained in:
Robert Bond
2024-02-21 17:22:55 +00:00
parent 401dcbceac dcdda6eb6e
commit 5596c8d570
72 changed files with 1508 additions and 1730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions/index.js
-1
View File
@@ -878,7 +878,6 @@ export const getPortalModuleDetails = (appealType, caseReference) => {
export const getPortalModuleDetailsProxy = (appealType, caseReference) => {
return axios
.get(
BASE_URL +
"/api/endpoint/getportalmoduledetailsproxy_api?appealType=" +
appealType +
"&caseReference=" +
components/account/personaldetails.js
+11 -15
View File
@@ -161,14 +161,11 @@ const RenderPickList = ({
: "govuk-form-group "
}
>
<label className="govuk-label" htmlFor="sort">
<label className="govuk-label" htmlFor={datafieldname}>
{label}
</label>
{touched && error && (
<span
id="passport-issued-error"
className="govuk-error-message"
>
<span id={name + "-error"} className="govuk-error-message">
<span className="govuk-visually-hidden">Error:</span>{" "}
{errorMsg}
</span>
@@ -178,8 +175,8 @@ const RenderPickList = ({
<select
{...input}
className="govuk-select "
id={name}
name={name}
id={datafieldname}
name={datafieldname}
>
<option>Select...</option>
{Object.keys(optionsArr).map((key, index) => {
@@ -237,7 +234,8 @@ let PersonalDetails = (props) => {
setPersonalDetailsComplete(true);
};
return <>
return (
<>
{props.accountUpdatedComplete == false ? (
props.personalDetailsComplete == false ? (
<form onSubmit={handleSubmit(onHandleSubmit)}>
@@ -258,11 +256,10 @@ let PersonalDetails = (props) => {
}
</span>
</div>
<Field
name="pinswg_preferredlanguage"
component={RenderPickList}
datafieldname="pinswg_preferredlanguage"
datafieldname={"pinswg_preferredlanguage"}
optionsArr={["English", "Welsh"]}
className="govuk-input govuk-input--width-20 govuk-radios--inline"
validate={[required]}
@@ -311,7 +308,6 @@ let PersonalDetails = (props) => {
validate={[required, phoneNumber]}
label={t("account:account-telephone-label")}
/>
<Field
name="company"
id="company"
@@ -396,10 +392,9 @@ let PersonalDetails = (props) => {
"/myportal?q=" +
props.props.accountDetails.loggedinUserId
}
className="govuk-link">
className="govuk-link"
>
{t("common:cancel-link")}
</Link>
</div>
</form>
@@ -419,7 +414,8 @@ let PersonalDetails = (props) => {
) : (
<PersonalDetailsComplete props={props} />
)}
</>;
</>
);
};
const mapStateToProps = (state) => {
components/case/documents.js
+5 -2
View File
@@ -59,7 +59,10 @@ const DocumentDetails = (props) => {
className="govuk-grid-row govuk-!-margin-left-0"
>
<div className="govuk-form-group">
<label className="govuk-label-s " htmlFor="sort">
<label
className="govuk-label-s "
htmlFor="showDocumentType"
>
{t("case:documents-show-label")}
<select
onChange={(e) => {
@@ -114,7 +117,7 @@ const DocumentDetails = (props) => {
<div className="govuk-form-group">
<label
className="govuk-label-s "
htmlFor="sort"
htmlFor="showNumberOfRecords"
>
{t(
"search:searchresults-show-records-label-a"
components/case/representation/index.js
+7 -420
View File
@@ -489,6 +489,8 @@ let MakeRepresentation = (props) => {
? router.query.state == "edit"
? props.props.myRepresentations.myRepresentations
: props.props.searchResultsObj.searchDetailsObj
: props.currentType == "watchedCases"
? props.props.watchedCases.watchedCasesDetails
: props.props.searchResultsObj.searchDetailsObj;
router.query.hasOwnProperty("state") &&
@@ -706,11 +708,11 @@ let MakeRepresentation = (props) => {
{" "}
<div className="card">
<div className="card-body">
<h4 className="govuk-heading-s">
<h2 className="govuk-heading-s">
{t(
"myrepresentations:timetable-title"
)}
</h4>
</h2>
<div className="govuk-summary-list">
<div className="govuk-body-s">
{t(
@@ -751,8 +753,7 @@ let MakeRepresentation = (props) => {
</div>
</div>
</div>
{
formObj.hasOwnProperty(
{formObj.hasOwnProperty(
"representationForm"
) &&
formObj[
@@ -763,424 +764,10 @@ let MakeRepresentation = (props) => {
].values.hasOwnProperty(
"representationType"
) &&
formObj["representationForm"]
.values
formObj["representationForm"].values
.representationType ==
"Questionnaire" &&
whichProgress()
// <nav
// role="navigation"
// aria-labelledby="progress-list"
// className="at-nav"
// >
// <div
// id="step-by-step-navigation"
// data-module="gemstepnav"
// className="app-step-nav app-step-nav--active"
// data-id="e01e924b-9c7c-4c71-8241-66a575c2f61f"
// data-show-text="show"
// data-hide-text="hide"
// data-show-all-text="Show all"
// data-hide-all-text="Hide all"
// >
// <ol className="app-step-nav__steps">
// <li
// className={
// "app-step-nav__step js-step app-step-nav__step--active" +
// (showQuestionnaireSection >=
// 1
// ? " sectionComplete"
// : " sectionIncomplete")
// }
// aria-current="step"
// data-show=""
// id="check-youre-allowed-to-drive"
// >
// <div
// className="app-step-nav__header js-toggle-panel "
// data-position="1"
// >
// <h3 className="app-step-nav__title ">
// <span className="app-step-nav__circle app-step-nav__circle--number">
// <span className="app-step-nav__circle-inner">
// <span className="app-step-nav__circle-background">
// <span className="app-step-nav__circle-step-label govuk-visually-hidden">
// Step
// </span>{" "}
// 1
// <span
// className="app-step-nav__circle-step-colon govuk-visually-hidden"
// aria-hidden="true"
// >
// :
// </span>
// </span>
// </span>
// </span>
// <span className="js-step-title">
// <a
// href="#"
// onClick={() => {
// setShowQuestionnaireSection(
// 1
// );
// }}
// className="app-step-nav__button app-step-nav__button--title js-step-title-button"
// aria-expanded="false"
// aria-controls="step-panel-check-youre-allowed-to-drive-1"
// >
// <span className="js-step-title-text govuk-!-font-size-16">
// {t(
// "myrepresentations:s78-section-heading-one"
// )}
// aaa
// </span>
// </a>
// </span>
// </h3>
// </div>
// </li>
// <li
// className={
// "app-step-nav__step js-step app-step-nav__step--active" +
// (showQuestionnaireSection >=
// 2
// ? " sectionComplete"
// : " sectionIncomplete")
// }
// aria-current="step"
// data-show=""
// id="check-youre-allowed-to-drive"
// >
// <div
// className="app-step-nav__header js-toggle-panel "
// data-position="1"
// >
// <h3 className="app-step-nav__title ">
// <span className="app-step-nav__circle app-step-nav__circle--number">
// <span className="app-step-nav__circle-inner">
// <span className="app-step-nav__circle-background">
// <span className="app-step-nav__circle-step-label govuk-visually-hidden">
// Step
// </span>{" "}
// 2
// <span
// className="app-step-nav__circle-step-colon govuk-visually-hidden"
// aria-hidden="true"
// >
// :
// </span>
// </span>
// </span>
// </span>
// <span className="js-step-title">
// <a
// href="#"
// onClick={() => {
// setShowQuestionnaireSection(
// 2
// );
// }}
// className="app-step-nav__button app-step-nav__button--title js-step-title-button"
// aria-expanded="false"
// aria-controls="step-panel-check-youre-allowed-to-drive-1"
// >
// <span className="js-step-title-text govuk-!-font-size-16">
// {t(
// "myrepresentations:s78-section-heading-two"
// )}
// </span>
// </a>
// </span>
// </h3>
// </div>
// </li>
// <li
// className={
// "app-step-nav__step js-step app-step-nav__step--active" +
// (showQuestionnaireSection >=
// 3
// ? " sectionComplete"
// : " sectionIncomplete")
// }
// aria-current="step"
// data-show=""
// id="check-youre-allowed-to-drive"
// >
// <div
// className="app-step-nav__header js-toggle-panel "
// data-position="1"
// >
// <h3 className="app-step-nav__title ">
// <span className="app-step-nav__circle app-step-nav__circle--number">
// <span className="app-step-nav__circle-inner">
// <span className="app-step-nav__circle-background">
// <span className="app-step-nav__circle-step-label govuk-visually-hidden">
// Step
// </span>{" "}
// 3
// <span
// className="app-step-nav__circle-step-colon govuk-visually-hidden"
// aria-hidden="true"
// >
// :
// </span>
// </span>
// </span>
// </span>
// <span className="js-step-title">
// <a
// href="#"
// onClick={() => {
// setShowQuestionnaireSection(
// 3
// );
// }}
// className="app-step-nav__button app-step-nav__button--title js-step-title-button"
// aria-expanded="false"
// aria-controls="step-panel-check-youre-allowed-to-drive-1"
// >
// <span className="js-step-title-text govuk-!-font-size-16">
// {t(
// "myrepresentations:s78-section-heading-three"
// )}
// </span>
// </a>
// </span>
// </h3>
// </div>
// </li>
// <li
// className={
// "app-step-nav__step js-step app-step-nav__step--active" +
// (showQuestionnaireSection >=
// 4
// ? " sectionComplete"
// : " sectionIncomplete")
// }
// aria-current="step"
// data-show=""
// id="check-youre-allowed-to-drive"
// >
// <div
// className="app-step-nav__header js-toggle-panel "
// data-position="1"
// >
// <h3 className="app-step-nav__title ">
// <span className="app-step-nav__circle app-step-nav__circle--number">
// <span className="app-step-nav__circle-inner">
// <span className="app-step-nav__circle-background">
// <span className="app-step-nav__circle-step-label govuk-visually-hidden">
// Step
// </span>{" "}
// 4
// <span
// className="app-step-nav__circle-step-colon govuk-visually-hidden"
// aria-hidden="true"
// >
// :
// </span>
// </span>
// </span>
// </span>
// <span className="js-step-title">
// <a
// href="#"
// onClick={() => {
// setShowQuestionnaireSection(
// 4
// );
// }}
// className="app-step-nav__button app-step-nav__button--title js-step-title-button"
// aria-expanded="false"
// aria-controls="step-panel-check-youre-allowed-to-drive-1"
// >
// <span className="js-step-title-text govuk-!-font-size-16">
// {t(
// "myrepresentations:s78-section-heading-four"
// )}
// </span>
// </a>
// </span>
// </h3>
// </div>
// </li>
// <li
// className={
// "app-step-nav__step js-step app-step-nav__step--active" +
// (showQuestionnaireSection >=
// 5
// ? " sectionComplete"
// : " sectionIncomplete")
// }
// aria-current="step"
// data-show=""
// id="check-youre-allowed-to-drive"
// >
// <div
// className="app-step-nav__header js-toggle-panel "
// data-position="1"
// >
// <h3 className="app-step-nav__title ">
// <span className="app-step-nav__circle app-step-nav__circle--number">
// <span className="app-step-nav__circle-inner">
// <span className="app-step-nav__circle-background">
// <span className="app-step-nav__circle-step-label govuk-visually-hidden">
// Step
// </span>{" "}
// 5
// <span
// className="app-step-nav__circle-step-colon govuk-visually-hidden"
// aria-hidden="true"
// >
// :
// </span>
// </span>
// </span>
// </span>
// <span className="js-step-title">
// <a
// href="#"
// onClick={() => {
// setShowQuestionnaireSection(
// 5
// );
// }}
// className="app-step-nav__button app-step-nav__button--title js-step-title-button"
// aria-expanded="false"
// aria-controls="step-panel-check-youre-allowed-to-drive-1"
// >
// <span className="js-step-title-text govuk-!-font-size-16">
// {t(
// "myrepresentations:s78-section-heading-five"
// )}
// </span>
// </a>
// </span>
// </h3>
// </div>
// </li>{" "}
// <li
// className={
// "app-step-nav__step js-step app-step-nav__step--active" +
// (showQuestionnaireSection >=
// 6
// ? " sectionComplete"
// : " sectionIncomplete")
// }
// aria-current="step"
// data-show=""
// id="check-youre-allowed-to-drive"
// >
// <div
// className="app-step-nav__header js-toggle-panel "
// data-position="1"
// >
// <h3 className="app-step-nav__title ">
// <span className="app-step-nav__circle app-step-nav__circle--number">
// <span className="app-step-nav__circle-inner">
// <span className="app-step-nav__circle-background">
// <span className="app-step-nav__circle-step-label govuk-visually-hidden">
// Step
// </span>{" "}
// 6
// <span
// className="app-step-nav__circle-step-colon govuk-visually-hidden"
// aria-hidden="true"
// >
// :
// </span>
// </span>
// </span>
// </span>
// <span className="js-step-title">
// <a
// href="#"
// onClick={() => {
// setShowQuestionnaireSection(
// 6
// );
// }}
// className="app-step-nav__button app-step-nav__button--title js-step-title-button"
// aria-expanded="false"
// aria-controls="step-panel-check-youre-allowed-to-drive-1"
// >
// <span className="js-step-title-text govuk-!-font-size-16">
// {t(
// "myrepresentations:add-files-label"
// )}
// </span>
// </a>
// </span>
// </h3>
// </div>
// </li>
// <li
// className={
// "app-step-nav__step js-step app-step-nav__step--active" +
// (showQuestionnaireSection >=
// 7
// ? " sectionComplete"
// : " sectionIncomplete")
// }
// aria-current="step"
// data-show=""
// id="check-youre-allowed-to-drive"
// >
// <div
// className="app-step-nav__header js-toggle-panel "
// data-position="1"
// >
// <h3 className="app-step-nav__title ">
// <span className="app-step-nav__circle app-step-nav__circle--number">
// <span className="app-step-nav__circle-inner">
// <span className="app-step-nav__circle-background">
// <span className="app-step-nav__circle-step-label govuk-visually-hidden">
// Step
// </span>{" "}
// 7
// <span
// className="app-step-nav__circle-step-colon govuk-visually-hidden"
// aria-hidden="true"
// >
// :
// </span>
// </span>
// </span>
// </span>
// <span className="js-step-title">
// <a
// href="#"
// onClick={() => {
// setShowQuestionnaireSection(
// 7
// );
// }}
// className="app-step-nav__button app-step-nav__button--title js-step-title-button"
// aria-expanded="false"
// aria-controls="step-panel-check-youre-allowed-to-drive-1"
// >
// <span className="js-step-title-text govuk-!-font-size-16">
// {t(
// "myrepresentations:s78-section-heading-seven"
// )}
// </span>
// </a>
// </span>
// </h3>
// </div>
// </li>
// </ol>
// </div>
// </nav>
}
whichProgress()}
</div>
</div>
</>
components/case/representation/representationAgent.js
+6 -4
View File
@@ -43,28 +43,30 @@ const RepAgent = (props) => {
return (
<>
<div className="govuk-grid-row">
<div className="govuk-form-group">
{typeof formObj.representationForm.values
.representationType == "undefined" ? (
<>
<h2 className="govuk-heading-m ">
{t(
"myrepresentations:representation-from-an-agent-heading"
)}
</h2>
<div className="govuk-form-group">
<label
className="govuk-label govuk-body-m"
htmlFor="representationType"
>
{t("myrepresentations:kind-of-rep-label")}
</label>
{typeof props.representationType == "undefined" ||
typeof formObj.representationForm.values
.representationType == "undefined" ? (
<Field
name="representationType"
component={RenderPickList}
datafieldname="representationType"
optionsArr={appellantApplicantRepresentationArr}
/>
</>
) : (
<label className="govuk-label govuk-body-m">
Representation Type:{" "}
components/case/representation/representationAppellant.js
+4 -3
View File
@@ -45,6 +45,9 @@ const RepAppellant = (props) => {
<>
<div className="govuk-grid-row">
<div className="govuk-form-group">
{typeof formObj.representationForm.values
.representationType == "undefined" ? (
<>
<h2 className="govuk-heading-m ">
{t(
"myrepresentations:representation-from-an-appellant-heading"
@@ -57,15 +60,13 @@ const RepAppellant = (props) => {
{t("myrepresentations:kind-of-rep-label")}
</label>
{typeof props.representationType == "undefined" ||
typeof formObj.representationForm.values
.representationType == "undefined" ? (
<Field
name="representationType"
component={RenderPickList}
datafieldname="representationType"
optionsArr={appellantApplicantRepresentationArr}
/>
</>
) : (
<label className="govuk-label govuk-body-m">
Representation Type:{" "}
components/case/representation/representationElements.js
+15 -26
View File
@@ -122,6 +122,7 @@ export const RenderRadioListWithText = ({
...custom
}) => {
const required = (value) => (value ? undefined : "Required");
const router = useRouter();
return (
<>
@@ -197,8 +198,9 @@ export const RenderRadioListWithText = ({
"_Comments"
}
>
Please give further details for
your this selection
{router.locale == "en"
? "Please give further details for this selection"
: "Rhowch fanylion pellach am y dewis hwn"}
</label>
<Field
name={
@@ -281,7 +283,7 @@ export const RenderCondtionalRadioList = ({
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
<label
className="govuk-fieldset__heading govuk-body-m"
id="representationCapacity_label"
id={id + "_label"}
>
{legend}
</label>
@@ -385,14 +387,6 @@ export const RenderLPACondtionalRadioList = ({
className="govuk-fieldset"
aria-describedby={id + "-hint"}
>
<legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
<label
className="govuk-fieldset__heading govuk-body-m"
id={id + "_label"}
>
{label}
</label>
</legend>
{touched && error && (
<span
id={id + "-error"}
@@ -406,10 +400,7 @@ export const RenderLPACondtionalRadioList = ({
)}
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
<label
className=" govuk-body-m"
id="representationCapacity_label"
>
<label className=" govuk-body-m" id={id + "_label"}>
{legend}
</label>
</legend>
@@ -481,7 +472,9 @@ export const RenderPickList = ({
optionsArr,
meta: { touched, error },
errorMsg,
...custom
}) => {
console.log(custom.disabled);
return (
<>
<div
@@ -491,14 +484,11 @@ export const RenderPickList = ({
: "govuk-form-group "
}
>
<label className="govuk-label" htmlFor="sort">
<label className="govuk-label" htmlFor={datafieldname}>
{label}
</label>
{touched && error && (
<span
id="passport-issued-error"
className="govuk-error-message"
>
<span id={name + "-error"} className="govuk-error-message">
<span className="govuk-visually-hidden">Error:</span>{" "}
{errorMsg}
</span>
@@ -508,8 +498,9 @@ export const RenderPickList = ({
<select
{...input}
className="govuk-select "
id={name}
name={name}
id={datafieldname}
name={datafieldname}
disabled={custom.disabled}
>
<option>Select...</option>
{Object.keys(optionsArr).map((key, index) => {
@@ -702,14 +693,14 @@ export const RenderMultiline = ({
return (
<>
<div className="govuk-form-group ">
<label className="govuk-label" htmlFor={name}>
<label className="govuk-label" htmlFor={datafieldname}>
{label}
</label>
{"hint" in custom}
{"hint" in custom && (
<div
id={name + "-hint"}
id={datafieldname + "-hint"}
className="govuk-hint govuk-!-font-size-14"
>
{custom.hint}
@@ -793,11 +784,9 @@ export function MultiLinefield(props) {
return (
<div className="govuk-form-group">
<h1 className="govuk-label-wrapper">
<label className="govuk-label" htmlFor={props.name}>
{props.label}
</label>
</h1>
<div
id={props.name + "-hint"}
className="govuk-hint govuk-!-font-size-14"
components/case/representation/representationLPA.js
+21 -6
View File
@@ -227,9 +227,14 @@ let RepLPA = (props) => {
return (
<>
<div className="govuk-grid-row">
<div className="govuk-form-group">
{typeof formObj.representationForm.values
.representationType == "undefined" ? (
<>
<h2 className="govuk-heading-m ">
{typeof props.representationType != "undefined"
? props.representationType == "Questionnaire"
? props.representationType ==
"Questionnaire"
? locale == "cy"
? "Holiadur"
: props.representationType
@@ -237,11 +242,14 @@ let RepLPA = (props) => {
: locale == "cy"
? "Cynrychioliadau"
: "Representation"}{" "}
{locale == "cy" ? "o ACLI am a" : "from an LPA for a"}{" "}
{locale == "cy"
? "o ACLI am a"
: "from an LPA for a"}{" "}
{locale == "cy"
? jsonpath(
'$..[?(@.attributevalue=="' +
currentView.caseReference.appealType +
currentView.caseReference
.appealType +
'")].value_cy',
transLookup
)
@@ -250,8 +258,6 @@ let RepLPA = (props) => {
).value}
</h2>
{typeof props.representationType == "undefined" && (
<div className="govuk-form-group">
<label
className="govuk-label govuk-body-m"
htmlFor="representationType"
@@ -268,9 +274,18 @@ let RepLPA = (props) => {
datafieldname="representationType"
optionsArr={appellantApplicantRepresentationArr}
/>
</div>
</>
) : (
<label className="govuk-label govuk-body-m">
Representation Type:{" "}
{
formObj.representationForm.values
.representationType
}{" "}
</label>
)}
</div>
</div>
<div className="govuk-grid-row">
<div className="govuk-form-group">
{typeof props.representationType != "undefined" &&
components/case/representation/representationProgress/representationProgress_enforcement.js
+100 -23
View File
@@ -38,11 +38,7 @@ const RepresentationProgress_enforcement = (props) => {
} = props;
return (
<nav
role="navigation"
aria-labelledby="progress-list"
className="at-nav"
>
<nav role="navigation" aria-label="progress-list" className="at-nav">
<div
id="step-by-step-navigation"
data-module="gemstepnav"
@@ -63,7 +59,9 @@ const RepresentationProgress_enforcement = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:enf-section-heading-one")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -95,7 +93,14 @@ const RepresentationProgress_enforcement = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:enf-section-heading-one"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -116,7 +121,9 @@ const RepresentationProgress_enforcement = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:enf-section-heading-two")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -148,7 +155,14 @@ const RepresentationProgress_enforcement = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:enf-section-heading-two"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -169,7 +183,9 @@ const RepresentationProgress_enforcement = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:enf-section-heading-three")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -201,7 +217,14 @@ const RepresentationProgress_enforcement = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:enf-section-heading-three"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -222,7 +245,9 @@ const RepresentationProgress_enforcement = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:enf-section-heading-four")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -254,7 +279,14 @@ const RepresentationProgress_enforcement = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:enf-section-heading-four"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -275,7 +307,9 @@ const RepresentationProgress_enforcement = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:enf-section-heading-five")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -307,7 +341,14 @@ const RepresentationProgress_enforcement = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:enf-section-heading-five"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -328,7 +369,9 @@ const RepresentationProgress_enforcement = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:enf-section-heading-six")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -360,7 +403,14 @@ const RepresentationProgress_enforcement = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:enf-section-heading-six"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -381,7 +431,9 @@ const RepresentationProgress_enforcement = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:enf-section-heading-seven")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -413,7 +465,14 @@ const RepresentationProgress_enforcement = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:enf-section-heading-seven"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -434,7 +493,9 @@ const RepresentationProgress_enforcement = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:add-files-label")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -466,7 +527,14 @@ const RepresentationProgress_enforcement = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:add-files-label"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -487,7 +555,9 @@ const RepresentationProgress_enforcement = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:enf-section-heading-eight")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -519,7 +589,14 @@ const RepresentationProgress_enforcement = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:enf-section-heading-eight"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
components/case/representation/representationProgress/representationProgress_s78.js
+79 -20
View File
@@ -39,11 +39,7 @@ const RepresentationProgress_s78 = (props) => {
} = props;
return (
<nav
role="navigation"
aria-labelledby="progress-list"
className="at-nav"
>
<nav role="navigation" aria-label="progress-list" className="at-nav">
<div
id="step-by-step-navigation"
data-module="gemstepnav"
@@ -64,7 +60,9 @@ const RepresentationProgress_s78 = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:s78-section-heading-one")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -96,7 +94,14 @@ const RepresentationProgress_s78 = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:s78-section-heading-one"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -117,7 +122,9 @@ const RepresentationProgress_s78 = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:s78-section-heading-two")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -149,7 +156,14 @@ const RepresentationProgress_s78 = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:s78-section-heading-two"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -170,7 +184,9 @@ const RepresentationProgress_s78 = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:s78-section-heading-three")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -202,7 +218,14 @@ const RepresentationProgress_s78 = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:s78-section-heading-three"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -223,7 +246,9 @@ const RepresentationProgress_s78 = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:s78-section-heading-four")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -255,7 +280,14 @@ const RepresentationProgress_s78 = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:s78-section-heading-four"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -276,7 +308,9 @@ const RepresentationProgress_s78 = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:s78-section-heading-five")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -308,11 +342,18 @@ const RepresentationProgress_s78 = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:s78-section-heading-five"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
"myrepresentations:s78-section-heading-five"
"myrepresentations:s78-section-heading-three"
)}
</span>
</a>
@@ -329,7 +370,9 @@ const RepresentationProgress_s78 = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:s78-section-heading-six")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -361,7 +404,14 @@ const RepresentationProgress_s78 = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:add-files-label"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
@@ -382,7 +432,9 @@ const RepresentationProgress_s78 = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={t("myrepresentations:s78-section-heading-seven")
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -414,7 +466,14 @@ const RepresentationProgress_s78 = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
t(
"myrepresentations:s78-section-heading-seven"
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{t(
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
+17 -13
View File
@@ -110,9 +110,9 @@ let S78_Questionnaire = (props) => {
className="govuk-fieldset"
aria-describedby="commentBox-hint"
>
<h3 className="govuk-heading-s ">
<h2 className="govuk-heading-s ">
{t("myrepresentations:s78-section-heading-one")}{" "}
</h3>
</h2>
<div className="govuk-form-group">
<div className="govuk-label">
1. {t("myrepresentations:s78-section-question-1")}{" "}
@@ -150,6 +150,7 @@ let S78_Questionnaire = (props) => {
<div className="govuk-form-group">
<Field
datafieldname="procedureType"
label={
"5. " +
t("myrepresentations:s78-section-question-5")
@@ -308,19 +309,20 @@ let S78_Questionnaire = (props) => {
className="govuk-fieldset govuk-!-margin-top-9"
aria-describedby="commentBox-hint"
>
<h3 className="govuk-heading-s ">
<h2 className="govuk-heading-s ">
{" "}
{t("myrepresentations:s78-section-heading-two")}{" "}
</h3>
</h2>
<div className="govuk-form-group">
<Field
label={
"11. " +
t("myrepresentations:s78-section-question-11")
}
name="LPAcaseFileAndReps"
id="LPAcaseFileAndReps"
name={"LPAcaseFileAndReps"}
id={"LPAcaseFileAndReps"}
component={RenderMultiline}
datafieldname={"LPAcaseFileAndReps"}
type="text"
rows="5"
className="govuk-textarea govuk-input--width-30"
@@ -339,6 +341,7 @@ let S78_Questionnaire = (props) => {
}
name="LPAldpAndMap"
id="LPAldpAndMap"
datafieldname="LPAldpAndMap"
component={RenderMultiline}
type="text"
rows="5"
@@ -358,6 +361,7 @@ let S78_Questionnaire = (props) => {
}
name="LPAlocalGuidance"
id="LPAlocalGuidance"
datafieldname="LPAlocalGuidance"
component={RenderMultiline}
type="text"
rows="5"
@@ -394,9 +398,9 @@ let S78_Questionnaire = (props) => {
className="govuk-fieldset govuk-!-margin-top-9"
aria-describedby="commentBox-hint"
>
<h3 className="govuk-heading-s ">
<h2 className="govuk-heading-s ">
{t("myrepresentations:s78-section-heading-three")}
</h3>
</h2>
<Field
label={
"15. " +
@@ -615,9 +619,9 @@ let S78_Questionnaire = (props) => {
className="govuk-fieldset govuk-!-margin-top-9"
aria-describedby="commentBox-hint"
>
<h3 className="govuk-heading-s ">
<h2 className="govuk-heading-s ">
{t("myrepresentations:s78-section-heading-four")}
</h3>
</h2>
<div className="govuk-form-group govuk-body-m">
{"24. " +
t("myrepresentations:s78-section-question-24")}
@@ -736,9 +740,9 @@ let S78_Questionnaire = (props) => {
className="govuk-fieldset govuk-!-margin-top-9"
aria-describedby="commentBox-hint"
>
<h3 className="govuk-heading-s ">
<h2 className="govuk-heading-s ">
{t("myrepresentations:s78-section-heading-five")}
</h3>
</h2>
<div className="govuk-form-group">
<Field
@@ -958,7 +962,7 @@ let S78_Questionnaire = (props) => {
className="govuk-fieldset govuk-!-margin-top-9"
aria-describedby="commentBox-hint"
>
<h3 className="govuk-heading-s ">Declaration</h3>
<h2 className="govuk-heading-s ">Declaration</h2>
<div className="govuk-form-group">
<Field
className="govuk-input govuk-!-width-one-half"
components/case/summary.js
+9 -20
View File
@@ -441,8 +441,8 @@ const CaseSummary = (props) => {
).length >
0 ==
true ? (
<span
className="govuk-link"
<button
className="govuk-link watchCase"
onClick={() => {
confirm(
t(
@@ -473,10 +473,10 @@ const CaseSummary = (props) => {
{t(
"case:stop-watching-case-link"
)}{" "}
</span>
</button>
) : (
<span
className=" govuk-link"
<button
className="govuk-link watchCase"
onClick={() => {
confirm(
t(
@@ -507,24 +507,13 @@ const CaseSummary = (props) => {
{t(
"case:watch-this-case-link"
)}
</span>
</button>
))}
{!session && (
<span
className="govuk-link"
<button
className="govuk-link watchCase"
onClick={() => {
// signIn("email");
// signIn();
// selectWatchedCase(
// cookies.pinsUser,
// item.incidentid,
// item.pinswg_appealcasetype
// );
// alert(
// "Trying to watch case " +
// item.title
// );
confirm(
"Trying to watch case " +
props.currentView
@@ -546,7 +535,7 @@ const CaseSummary = (props) => {
)}
>
{t("case:watch-this-case-link")}
</span>
</button>
)}
</div>
</div>
components/case/summaryTypes/pinswg_advertsid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_advertsid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -213,7 +213,7 @@ const Pinswg_advertsid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_callinss77id.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_callinss77id = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -213,7 +213,7 @@ const Pinswg_callinss77id = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_commonlandid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_commonlandid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -238,7 +238,7 @@ const Pinswg_commonlandid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -213,7 +213,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -220,7 +220,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_dnsid.js
+2 -2
View File
@@ -111,7 +111,7 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -447,7 +447,7 @@ const Pinswg_dnsid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_electricityactid.js
+2 -2
View File
@@ -51,7 +51,7 @@ const Pinswg_electricityactid = (props) => {
)}
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -297,7 +297,7 @@ const Pinswg_electricityactid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -213,7 +213,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -213,7 +213,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_environmentalpermittingid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_environmentalpermittingid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -238,7 +238,7 @@ const Pinswg_environmentalpermittingid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_harbourrevisionorderid.js
+2 -2
View File
@@ -51,7 +51,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
)}
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -276,7 +276,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -238,7 +238,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_householderappealhasid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_householderappealhasid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -194,7 +194,7 @@ const Pinswg_householderappealhasid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -213,7 +213,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_ldpid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_ldpid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -213,7 +213,7 @@ const Pinswg_ldpid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -213,7 +213,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_maintenanceoflands217id.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -213,7 +213,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_miscellaneouscasewordid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -238,7 +238,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_nonvalidationid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_nonvalidationid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -152,7 +152,7 @@ const Pinswg_nonvalidationid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_planningappeals78id.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_planningappeals78id = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -236,7 +236,7 @@ const Pinswg_planningappeals78id = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_planningconditionss73s79id.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -213,7 +213,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_planningobligationappeals106id.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -213,7 +213,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_rowid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_rowid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -238,7 +238,7 @@ const Pinswg_rowid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_transportandworkactid.js
+2 -2
View File
@@ -51,7 +51,7 @@ const Pinswg_transportandworkactid = (props) => {
)}
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -128,7 +128,7 @@ const Pinswg_transportandworkactid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/case/summaryTypes/pinswg_wayleaveid.js
+2 -2
View File
@@ -13,7 +13,7 @@ const Pinswg_wayleaveid = (props) => {
return (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
<div className="card" id="case-details-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -238,7 +238,7 @@ const Pinswg_wayleaveid = (props) => {
</div>
</div>
</div>
<div className="card" id="casescomment-card">
<div className="card" id="key-dates-card">
<div className="card-body">
<div className="govuk-grid-column-full">
<h3 className="govuk-heading-m govuk-!-margin-bottom-7">
components/dns/applications/applicationTabsDocuments.js
+1 -1
View File
@@ -133,7 +133,7 @@ const ApplicationTabsDocuments = (props) => {
</div>
<div className=" govuk-grid-column-two-thirds govuk-form-group">
<label className="govuk-label-xs " htmlFor="sort">
<label className="govuk-label-xs " htmlFor="showNo">
Show{" "}
<select
className="govuk-select govuk-select-s"
components/dns/applications/applicationsList.js
+21 -19
View File
@@ -9,11 +9,12 @@ const ApplicationList = (props) => {
const router = useRouter();
const { locale } = router;
return <>
return (
<>
<div className="govuk-grid-row govuk-!-margin-top-9">
<div className="govuk-grid-column-full">
<div className="govuk-form-group">
<label className="govuk-label-s " htmlFor="sort">
<label className="govuk-label-s " htmlFor="showNo">
{t("dnsCommon:result-list-show-label")}{" "}
<select
className="govuk-select"
@@ -83,13 +84,13 @@ const ApplicationList = (props) => {
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>TWA - Morlais Demonstration Zone
</span>
TWA - Morlais Demonstration Zone
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -132,13 +133,13 @@ const ApplicationList = (props) => {
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>TWA - Morlais Demonstration Zone
</span>
TWA - Morlais Demonstration Zone
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -181,13 +182,13 @@ const ApplicationList = (props) => {
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>TWA - Morlais Demonstration Zone
</span>
TWA - Morlais Demonstration Zone
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -230,13 +231,13 @@ const ApplicationList = (props) => {
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>TWA - Morlais Demonstration Zone
</span>
TWA - Morlais Demonstration Zone
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -279,13 +280,13 @@ const ApplicationList = (props) => {
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>TWA - Morlais Demonstration Zone
</span>
TWA - Morlais Demonstration Zone
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -328,13 +329,13 @@ const ApplicationList = (props) => {
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>TWA - Morlais Demonstration Zone
</span>
TWA - Morlais Demonstration Zone
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -377,13 +378,13 @@ const ApplicationList = (props) => {
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>TWA - Morlais Demonstration Zone
</span>
TWA - Morlais Demonstration Zone
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -426,13 +427,13 @@ const ApplicationList = (props) => {
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>TWA - Morlais Demonstration Zone
</span>
TWA - Morlais Demonstration Zone
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -489,7 +490,8 @@ const ApplicationList = (props) => {
</p>
</div>
</div>
</>;
</>
);
};
export default ApplicationList;
components/elements/index.js
+1 -8
View File
@@ -251,11 +251,10 @@ export function MultiLinefield(props) {
{parentField != false ? (
showIfHasParentShowValue && (
<div>
<h1 className="govuk-label-wrapper">
<label className="govuk-label" htmlFor={props.name}>
{FieldsTranslations(props.label)}
</label>
</h1>
<div
id={props.name + "-hint"}
className="govuk-hint govuk-!-font-size-14"
@@ -277,11 +276,9 @@ export function MultiLinefield(props) {
)
) : (
<div className="govuk-form-group">
<h1 className="govuk-label-wrapper">
<label className="govuk-label" htmlFor={props.name}>
{FieldsTranslations(props.label)}
</label>
</h1>
<div
id={props.name + "-hint"}
className="govuk-hint govuk-!-font-size-14"
@@ -390,11 +387,9 @@ export function RichMultiLinefield(props) {
{parentField != false ? (
showIfHasParentShowValue && (
<div>
<h1 className="govuk-label-wrapper">
<label className="govuk-label" htmlFor={props.name}>
{FieldsTranslations(props.label)}
</label>
</h1>
<div
id={props.name + "-hint"}
className="govuk-hint govuk-!-font-size-14"
@@ -416,11 +411,9 @@ export function RichMultiLinefield(props) {
)
) : (
<div className="govuk-form-group">
<h1 className="govuk-label-wrapper">
<label className="govuk-label" htmlFor={props.name}>
{FieldsTranslations(props.label)}
</label>
</h1>
<div
id={props.name + "-hint"}
className="govuk-hint govuk-!-font-size-14"
components/footer.js
+23 -19
View File
@@ -13,7 +13,10 @@ export default function Footer(props) {
const linksBlock = Object.keys(linksArr).map((key) => (
<li className="govuk-footer__inline-list-item" key={key}>
<Link href={linksArr[key].path || "/"} className="govuk-footer__link">
<Link
href={linksArr[key].path || "/"}
className="govuk-footer__link"
>
{linksArr[key].title}
</Link>
</li>
@@ -34,8 +37,14 @@ export default function Footer(props) {
" " +
t("common:gov-wales-label").toLowerCase();
return <>
<div className="sharebar" id="sharebar">
return (
<>
<div
className="sharebar"
id="sharebar"
role="complementary"
aria-label="Share this page"
>
<div className="sharebar__components container-fluid">
<div className="main__sharebar">
<div
@@ -173,12 +182,11 @@ export default function Footer(props) {
: "/accessibility"
}
className="govuk-footer__link"
id="aAccessibility">
id="aAccessibility"
>
{t(
"common:footer-accessibility-link-label"
)}
</Link>
</li>
@@ -190,12 +198,9 @@ export default function Footer(props) {
: "/help/cookies"
}
id="aCookies"
className="govuk-footer__link">
{t(
"common:footer-cookies-link"
)}
className="govuk-footer__link"
>
{t("common:footer-cookies-link")}
</Link>
</li>
<li className="govuk-footer__inline-list-item">
@@ -218,12 +223,11 @@ export default function Footer(props) {
"common:footer-privacy-link"
)}
id="aPrivacy"
className="govuk-footer__link">
className="govuk-footer__link"
>
{t(
"common:footer-privacy-link-label"
)}
</Link>
</li>
@@ -233,12 +237,11 @@ export default function Footer(props) {
"common:footer-terms-conditions-link"
)}
id="aTermsConds"
className="govuk-footer__link">
className="govuk-footer__link"
>
{t(
"common:footer-terms-conditions-link-label"
)}
</Link>
</li>
{/* <li className="govuk-footer__inline-list-item">
@@ -276,5 +279,6 @@ export default function Footer(props) {
</div>
</div>
</footer>
</>;
</>
);
}
components/homepage/casesearch.js
+8 -7
View File
@@ -94,13 +94,14 @@ let CaseSearch = (props) => {
});
};
return <>
return (
<>
<div className="card" id="casesearch-card">
<form onSubmit={handleSubmit(onHandleSubmit)}>
<div className="card-body">
<h3 className="heading-small card-heading">
<h2 className="heading-small card-heading">
{t("home:casesearch-card-title")}
</h3>
</h2>
<Field
validate={[
@@ -141,15 +142,15 @@ let CaseSearch = (props) => {
? "/chwiliouwch"
: "/advancedsearch"
}
className="govuk-link--no-underline">
className="govuk-link--no-underline"
>
{t("home:casesearch-card-advanced-link")}
</Link>
</div>
</form>
</div>
</>;
</>
);
};
const mapStateToProps = (state) => {
components/homepage/dns.js
+3 -4
View File
@@ -16,7 +16,7 @@ export default function Dns() {
// : setShowSpinnerState(true);
// };
return (
<div className="card" id="casesearch-card">
<div className="card" id="dns-card">
<div className="card-body">
<h3 className="heading-small card-heading">
{t("home:dns-card-title")}
@@ -36,10 +36,9 @@ export default function Dns() {
// onClick={() => {
// spinnerState();
// }}
className="govuk-button withChevron govuk-button-cta">
className="govuk-button withChevron govuk-button-cta"
>
{t("home:dns-card-button")}
</Link>
</div>
</div>
components/myportal/advancedsearch.js
+1 -1
View File
@@ -194,7 +194,7 @@ let AdvancedSearch = (props) => {
</label>
{touched && error && (
<span
id="passport-issued-error"
id={name + "-error"}
className="govuk-error-message"
>
<span className="govuk-visually-hidden">
components/myportal/awaitingsubmission.js
+3 -4
View File
@@ -13,7 +13,7 @@ const AwaitingSubmission = (props) => {
const { setCurrentView } = props;
return (
<div className="card" id="casescomment-card">
<div className="card" id="awaiting-submission-card">
<div className="card-body">
<h3 className="heading-small card-heading">
{t("myportal:awatitingsubmission-card-title")}
@@ -46,10 +46,9 @@ const AwaitingSubmission = (props) => {
"viewName": "Awaiting Submission",
"viewKey": "awaitingSubmission",
});
}}>
}}
>
{t("myportal:viewall-link")}
</Link>
</div>
)}
components/myportal/awaitingsubmissionfromblob.js
+4 -4
View File
@@ -177,8 +177,8 @@ const AwaitingSubmissionFromBlob = (props) => {
: showTopThreeArrDets[key]["pinswg_lpaname"] || ""}
</div>
<div className="">
<span
href="#"
<button
title={t("case:do-you-want-to-delete-case-label")}
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => {
confirm(
@@ -196,14 +196,14 @@ const AwaitingSubmissionFromBlob = (props) => {
}}
>
&mdash;
</span>
</button>
</div>
</div>
);
});
return (
<div className="card" id="casescomment-card">
<div className="card" id="awaiting-submission-card">
<div className="card-body">
<h3 className="heading-small card-heading">
{t("myportal:awatitingsubmission-card-title")}
components/myportal/dns.js
+3 -4
View File
@@ -16,7 +16,7 @@ export default function Dns() {
// : setShowSpinnerState(true);
// };
return (
<div className="card" id="casesearch-card">
<div className="card" id="dns-card">
<div className="card-body">
<h3 className="heading-small card-heading">
{t("home:dns-card-title")}
@@ -36,10 +36,9 @@ export default function Dns() {
// onClick={() => {
// spinnerState();
// }}
className="govuk-button withChevron govuk-button-cta">
className="govuk-button withChevron govuk-button-cta"
>
{t("home:dns-card-button")}
</Link>
</div>
</div>
components/myportal/makenewappeal.js
+1 -3
View File
@@ -8,7 +8,7 @@ export default function MakeNewAppeal() {
const router = useRouter();
const { locale } = router;
return (
<div className="card" id="casescomment-card">
<div className="card" id="new-appeal-card">
<div className="card-body">
<h2 className="govuk-heading-s">
{t("myportal:makenewappeal-card-title")}
@@ -21,9 +21,7 @@ export default function MakeNewAppeal() {
</p>
<div>
<Link href={"/newappeal"} className="govuk-button">
{t("myportal:makenewappeal-card-button-label")}
</Link>
</div>
</div>
components/myportal/mycases.js
+3 -4
View File
@@ -12,7 +12,7 @@ const MyCases = (props) => {
const { locale } = router;
const { setCurrentView } = props;
return (
<div className="card" id="casescomment-card">
<div className="card" id="my-cases-card">
<div className="card-body">
<h3 className="heading-small card-heading">
{t("myportal:mycases-card-title")}
@@ -40,13 +40,12 @@ const MyCases = (props) => {
"viewName": "My Cases",
"viewKey": "myCases",
});
}}>
}}
>
{t("myportal:viewall-link")}{" "}
{props.isLPA &&
props.myCases.myCases["@odata.count"] +
" appeals"}
</Link>
</div>
)}
components/myportal/myrepresentations.js
+1 -1
View File
@@ -13,7 +13,7 @@ const MyRepresentations = (props) => {
const { setCurrentView } = props;
return (
<div className="card" id="casescomment-card">
<div className="card" id="my-representations-card">
<div className="card-body">
<h3 className="heading-small card-heading">
{t("myportal:myrepresentations-card-title")}
components/myportal/myrepresentationsfromblob.js
+1 -1
View File
@@ -13,7 +13,7 @@ const MyRepresentations = (props) => {
const { setCurrentView } = props;
return (
<div className="card" id="casescomment-card">
<div className="card" id="my-representations-card">
<div className="card-body">
<h3 className="heading-small card-heading">
{t("myportal:myrepresentations-card-title")}dd
components/myportal/topthree.js
+6 -5
View File
@@ -303,8 +303,8 @@ const TopThree = (props) => {
</div>
{topThreeType == "watchedCases" && (
<div className="">
<span
href="#"
<button
title={t("case:you-have-stopped-watching-label")}
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => {
confirm(
@@ -320,12 +320,13 @@ const TopThree = (props) => {
}}
>
&mdash;
</span>
</button>
</div>
)}
{topThreeType == "awaitingSubmission" && (
<div className="">
<span
<button
title={t("case:do-you-want-to-delete-case-label")}
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => {
confirm(
@@ -343,7 +344,7 @@ const TopThree = (props) => {
}}
>
&mdash;
</span>
</button>
</div>
)}
</div>
components/myportal/topthree_reps.js
-1
View File
@@ -50,7 +50,6 @@ const TopThree = (props) => {
});
showTopThreeArr.sort(function compare(a, b) {
console.log(a.createdDate, b.createdDate);
var dateA = new Date(a.createdDate);
var dateB = new Date(b.createdDate);
return dateB - dateA;
components/myportal/watchedcases.js
+1 -1
View File
@@ -13,7 +13,7 @@ const WatchedCases = (props) => {
const { setCurrentView } = props;
return (
<div className="card" id="casescomment-card">
<div className="card" id="my-watched-cases-card">
<div className="card-body">
<h3 className="heading-small card-heading">
{t("myportal:watchedcases-card-title")}
components/myportal/youraccount.js
+9 -6
View File
@@ -7,8 +7,9 @@ export default function YourAccount() {
const router = useRouter();
const { locale } = router;
return <>
<div className="card" id="casescomment-card">
return (
<>
<div className="card" id="your-account-card">
<div className="card-body">
<h3 className="heading-small card-heading">
{t("myportal:yourdetails-card-title")}
@@ -18,10 +19,11 @@ export default function YourAccount() {
</p>
<div>
<Link href="/account/personaldetails" className="govuk-button-secondary">
<Link
href="/account/personaldetails"
className="govuk-button-secondary"
>
{t("myportal:yourdetails-card-link")}
</Link>
</div>
</div>
@@ -44,5 +46,6 @@ export default function YourAccount() {
</div>
</div> */}
</div>
</>;
</>
);
}
components/newappeal/aboutyou.js
+3 -18
View File
@@ -95,6 +95,7 @@ const RenderMultiline = ({
</span>
)}
<textarea
id={id}
{...input}
rows={rows}
className={className}
@@ -124,17 +125,9 @@ const RenderYesNo = ({
: "govuk-form-group "
}
>
<fieldset
className="govuk-fieldset"
aria-describedby={name + "-hint"}
>
<fieldset className="govuk-fieldset">
<legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
<label
className="govuk-fieldset__heading govuk-body-m"
id={id + "_label"}
>
{label}
</label>
</legend>
{touched && error && (
<span
@@ -200,17 +193,9 @@ const RenderRadio = ({
: "govuk-form-group "
}
>
<fieldset
className="govuk-fieldset"
aria-describedby={datafieldname + "-hint"}
>
<fieldset className="govuk-fieldset">
<legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
<label
className="govuk-fieldset__heading govuk-body-m"
id={id + "_label"}
>
{label}
</label>
</legend>
{touched && error && (
<span
components/newappeal/buildprogress.js
+13 -4
View File
@@ -37,7 +37,7 @@ const BuildProgress = (props) => {
<>
<nav
role="navigation"
aria-labelledby="progress-list"
aria-label="progress-list"
className="at-nav"
>
<h2 className="govuk-heading-s govuk-!-font-weight-bold gov-font-dark-grey progress-heading">
@@ -71,7 +71,9 @@ const BuildProgress = (props) => {
}
aria-current="step"
data-show=""
id="check-youre-allowed-to-drive"
id={FieldsTranslations(progObj[index].title)
.replace(/\s+/g, "-")
.toLowerCase()}
>
<div
className="app-step-nav__header js-toggle-panel "
@@ -105,12 +107,19 @@ const BuildProgress = (props) => {
}}
className="app-step-nav__button app-step-nav__button--title js-step-title-button"
aria-expanded="false"
aria-controls="step-panel-check-youre-allowed-to-drive-1"
aria-controls={
"step-panel-" +
FieldsTranslations(
progObj[index].title
)
.replace(/\s+/g, "-")
.toLowerCase()
}
>
<span className="js-step-title-text govuk-!-font-size-16">
{FieldsTranslations(
progObj[index].title
)}
)}{" "}
</span>
</a>
</span>
components/newappeal/createCase.js
+5 -5
View File
@@ -67,12 +67,12 @@ let CreateCase = (props) => {
}
>
{" "}
<label className="govuk-label" htmlFor="sort">
<label className="govuk-label" htmlFor="lpatypes">
{label}
</label>
{touched && error && (
<span
id="passport-issued-error"
id={name + "-error"}
className="govuk-error-message"
>
<span className="govuk-visually-hidden">
@@ -86,7 +86,7 @@ let CreateCase = (props) => {
{...input}
className="govuk-select govuk-input--error"
id="lpatypes"
name={name}
name="lpatypes"
//onChange={(e) => props.onChangeSelectLPA(e)}
>
<option value="" disabled defaultValue>
@@ -136,12 +136,12 @@ let CreateCase = (props) => {
: "govuk-form-group "
}
>
<label className="govuk-label" htmlFor="sort">
<label className="govuk-label" htmlFor="appealTypes">
{label}
</label>
{touched && error && (
<span
id="passport-issued-error"
id={name + "-error"}
className="govuk-error-message"
>
<span className="govuk-visually-hidden">
components/pdftemplates/statement_pdf.js
+1 -4
View File
@@ -11,10 +11,7 @@ import ReactPDF, {
import { createElement } from "react";
import Html from "react-pdf-html";
import { getFormCollectionByID } from "../../components/utils";
import useTranslation from "next-translate/useTranslation";
import renderers, { renderBlock } from "react-pdf-html/dist/renderers";
import transLookupCY from "../../locales/cy/myrepresentations.json";
import transLookupEN from "../../locales/en/myrepresentations.json";
import { JSONPath as jsonpath } from "jsonpath-plus";
@@ -118,7 +115,7 @@ export const statement_pdf = ({ docProps }) => {
let datestr = values.pinswg_name.split("-");
let signedDate = datestr[2] + "/" + datestr[1] + "/" + datestr[0];
let appealTypeValue = getFormCollectionByID(values.appealType);
let { t } = useTranslation();
return (
<Document>
<Page size="A4" style={styles.page} wrap>
components/search/advancedsearch.js
+2 -5
View File
@@ -94,10 +94,7 @@ const RenderCaseStatusList = ({
{name}
</label>
{touched && error && (
<span
id="passport-issued-error"
className="govuk-error-message"
>
<span id={name + "-error"} className="govuk-error-message">
<span className="govuk-visually-hidden">Error:</span>{" "}
{errormsg}
</span>
@@ -290,7 +287,7 @@ let AdvancedSearch = (props) => {
</label>
{touched && error && (
<span
id="passport-issued-error"
id={name + "-error"}
className="govuk-error-message"
>
<span className="govuk-visually-hidden">
components/search/dnssearchresults.js
+5 -3
View File
@@ -308,9 +308,8 @@ const DNSSearchResults = (props) => {
{t("search:searchresults-status-label")}
</button>
</dd>
{myportal == true && (
<dd className="govuk-summary-list__key govuk-!-font-size-16 govuk-summary-list__action"></dd>
)}
</div>
{showSpinnerState == true ? (
@@ -743,7 +742,10 @@ const DNSSearchResults = (props) => {
{searchResultsObj["@odata.count"] > 5 && (
<div id="recordCountSelect" className="govuk-grid-row">
<div className="govuk-form-group">
<label className="govuk-label-s " htmlFor="sort">
<label
className="govuk-label-s "
htmlFor="showNumberOfRecords"
>
{t("search:searchresults-show-records-label-a")}
<select
onChange={(e) => {
components/search/pagination.js
+6 -6
View File
@@ -91,7 +91,7 @@ const PaginationControl = (props) => {
<div className="govuk-grid-row paginationWrapper">
<div className="govuk-grid-column-one-quarter paginationPrevious">
{props.currentView.currentPage != 1 ? (
<span
<button
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem leftTextButton"
onClick={() => {
spinnerState(),
@@ -108,7 +108,7 @@ const PaginationControl = (props) => {
}}
>
{t("common:previous-link-button")}
</span>
</button>
) : (
<span className="govuk-body leftTextButton govuk-!-font-weight-bold">
{t("common:previous-link-button")}
@@ -132,7 +132,7 @@ const PaginationControl = (props) => {
{e}
</span>
) : (
<span
<button
className="govuk-body govuk-link govuk-!-padding-2 govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem"
key={i}
onClick={() => {
@@ -146,13 +146,13 @@ const PaginationControl = (props) => {
}}
>
{e}
</span>
</button>
)
)}
</div>
<div className="govuk-grid-column-one-quarter paginationNext">
{props.currentView.currentPage < pagesCount ? (
<span
<button
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem rightTextButton"
onClick={() => {
spinnerState(),
@@ -169,7 +169,7 @@ const PaginationControl = (props) => {
}}
>
{t("common:next-link-button")}
</span>
</button>
) : (
<span className="govuk-body rightTextButton govuk-!-font-weight-bold">
{" "}
components/search/searchresults.js
+8 -9
View File
@@ -254,9 +254,8 @@ const SearchResults = (props) => {
{t("search:searchresults-status-label")}
</button>
</dd>
{myportal == true && (
<dd className="govuk-summary-list__key govuk-!-font-size-16 govuk-summary-list__action"></dd>
)}
</div>
{showSpinnerState == true ? (
<div className="govuk-summary-list__row">
@@ -497,7 +496,7 @@ const SearchResults = (props) => {
.length >
0 ==
true ? (
<span
<button
className="govuk-summary-list__actionLink watched_link"
onClick={() => {
confirm(
@@ -521,9 +520,9 @@ const SearchResults = (props) => {
)}
>
<span className="eye"></span>
</span>
</button>
) : (
<span
<button
className="govuk-summary-list__actionLink watchLink"
onClick={() => {
confirm(
@@ -546,7 +545,7 @@ const SearchResults = (props) => {
)}
>
<span className="eye"></span>
</span>
</button>
)}
</dd>
)}
@@ -560,7 +559,7 @@ const SearchResults = (props) => {
"case:watch-this-case-link"
)}
</span>
<span
<button
className="govuk-summary-list__actionLink watchLink"
onClick={() => {
confirm(
@@ -589,7 +588,7 @@ const SearchResults = (props) => {
)}
>
<span className="eye"></span>
</span>
</button>
</dd>
)}
</div>
@@ -810,7 +809,7 @@ const SearchResults = (props) => {
<div className="govuk-form-group">
<label
className="govuk-label-s "
htmlFor="sort"
htmlFor="showNumberOfRecords"
>
{t(
"search:searchresults-show-records-label-a"
locales/cy/myrepresentations.json
+1 -1
View File
@@ -15,7 +15,7 @@
"questionnaire-publish-policy-label": "Sylwch y gall holl ddogfennau holiadur gael eu cyhoeddi yn unol â'n Polisi Cyhoeddi. Os bydd eich holiadur yn cynnwys unrhyw wybodaeth sensitif neu wybodaeth a allai fod yn ddifenwol, efallai y caiff ei olygu cyn ei gyhoeddi",
"add-files-label": "Ychwanegwch eich ffeiliau",
"capacity-para-one": "Mae'r ffurflen hon yn eich galluogi i gyflwyno sylwadau ar achos i Benderfyniadau Cynllunio ac Amgylchedd Cymru.",
"capacity-para-two": "Sylwch fod angen gwneud sylwadau gan bartïon â diddordeb o fewn yr amserlen. Mae hwn i'w weld ar y &lsquo;Crynodeb Achos&lsquo; tudalen. Gall sylwadau a gyflwynir ar ôl y dyddiad hwn gael eu hystyried yn annilys.",
"capacity-para-two": "Sylwch fod angen gwneud sylwadau gan bartïon â diddordeb o fewn yr amserlen. Mae hwn i'w weld ar y \"Crynodeb Achos\" tudalen. Gall sylwadau a gyflwynir ar ôl y dyddiad hwn gael eu hystyried yn annilys.",
"capacity-select-your-details": "Eich manylion",
"capacity-select-what-capacity-label": "Ym mha rinwedd ydych chi am gyflwyno sylwadau ar yr achos hwn?",
"capacity-options-arr-appellant": "Apelydd",
locales/en/myrepresentations.json
+1 -1
View File
@@ -15,7 +15,7 @@
"questionnaire-publish-policy-label": "Please note that all questionnaire documents may be published in line with our Publishing Policy. Should your questionnaire include any sensitive information or potentially defamatory information, it may be redacted before publishing",
"add-files-label": "Add your files",
"capacity-para-one": "This form enables you to submit comments on a case to Planning and Environment Decisions Wales.",
"capacity-para-two": "Please note that comments from interested parties need to be made within the timetable. This can be found on the previous &lsquo;Case Summary&lsquo; page. Comments submitted after this date may be considered invalid.",
"capacity-para-two": "Please note that comments from interested parties need to be made within the timetable. This can be found on the previous \"Case Summary\" page. Comments submitted after this date may be considered invalid.",
"capacity-select-your-details": "Your details",
"capacity-select-what-capacity-label": "In what capacity do you wish to make representations on this case?",
"capacity-options-arr-appellant": "Appellant",
pages/auth/error.js
+5 -1
View File
@@ -45,7 +45,11 @@ const Error = (props) => {
<div className="govuk-width-container govuk-!-padding-bottom-9">
<Breadcrumbs />
<main className="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-9">
<main
className="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-9"
id="main-content"
role="main"
>
<div className="govuk-grid-row ">
<div className="govuk-grid-column-two-thirds ">
<h1>{t("auth:auth-error-heading")}</h1>
pages/auth/signin.js
+5 -1
View File
@@ -33,7 +33,11 @@ const SignIn = (props) => {
<Header courseName={t("common:service-name")} />
<div className="govuk-width-container govuk-!-padding-bottom-9">
<Breadcrumbs />
<main className="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-9">
<main
className="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-9"
id="main-content"
role="main"
>
<div className="govuk-grid-row ">
<div className="govuk-grid-column-two-thirds ">
<h1>{t("auth:auth-page-title")} </h1>
pages/auth/verify-request.js
+5 -1
View File
@@ -26,7 +26,11 @@ const SignIn = (props) => {
<div className="govuk-width-container govuk-!-padding-bottom-9">
<Breadcrumbs />
<main className="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-9">
<main
className="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-9"
id="main-content"
role="main"
>
<div className="govuk-grid-row ">
<div className="govuk-grid-column-two-thirds ">
<h1>{t("auth:auth-check-email-page-title")}</h1>
pages/logout.js
+7 -2
View File
@@ -88,14 +88,19 @@ const LogOut = (props) => {
<div id="page_wrapper">
<CookieBanner />
<Header courseName="Appeals Casework Portal" />
<main>
<div className="govuk-width-container">
<h2>{t("common:logged-out-title")}</h2>
<h1>{t("common:logged-out-title")}</h1>
<div className="govuk-!-margin-top-9 govuk-!-margin-bottom-9">
<Link href={locale == "cy" ? "/cy" : "/"} legacyBehavior>
<Link
href={locale == "cy" ? "/cy" : "/"}
legacyBehavior
>
{t("common:logged-out-link")}
</Link>
</div>
</div>
</main>
<Footer footerLinks={footerLinks} />
</div>
</div>
pages/myportal/index.js
+3 -22
View File
@@ -264,12 +264,12 @@ export const getServerSideProps = wrapper.getServerSideProps(
const [
myCasesDetails,
watchedCasesDetails,
awaitingSubmissionDetails,
//awaitingSubmissionDetails,
myRepresentationsDetails,
] = await Promise.all([
await getDetails(myCases, "myCases"),
await getDetails(watchedCases, "myWatchedCases"),
await getDetails(awaitingSubmission, "awaitingSubmission"),
//await getDetails(awaitingSubmission, "awaitingSubmission"),
await getDetails(myRepresentations, "myRepresentations"),
]);
@@ -386,25 +386,7 @@ const getDetails = (resultsObj, detailsType) => {
//console.log(detailsType, " case id : ", caseID);
if (searchDetail.pinswg_appealcasetype == null) {
// console.log(
// "detailsObj:",
// detailsType,
// detailsType == "myCases" && searchDetail.pinswg_title,
// detailsType == "myWatchedCases" &&
// searchDetail[
// "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
// ],
// detailsType == "awaitingSubmission" &&
// searchDetail.ticketnumber,
// detailsType == "myRepresentations" && searchDetail.casereference
// );
console.log(
"=====================================\n",
detailsType + "\n",
"=====================================\n"
);
} else {
searchDetail.pinswg_appealcasetype != null &&
detailsArr.push(
getPortalModuleDetails(
getFormCollectionByID(searchDetail.pinswg_appealcasetype)
@@ -417,7 +399,6 @@ const getDetails = (resultsObj, detailsType) => {
// ]
)
);
}
});
let detArr = Promise.all(detailsArr);
styles/sass/patterns/_card.scss
+2 -1
View File
@@ -81,6 +81,7 @@ html[data-useragent*="MSIE 10.0"] .flex-container {
.card-heading {
margin-top: 0;
font-size: 1.17rem;
}
.card-body {
@@ -266,7 +267,7 @@ div.cardModuleItem:last-of-type {
margin-right: 10px;
}
a {}
}
.cardModuleRemoveCase {
styles/sass/welshgov/_application.scss
+77 -5
View File
@@ -200,6 +200,19 @@ a.longLinkBreak {
letter-spacing: 1px;
padding: 5px 8px 4px;
}
.govuk-phase-banner__content {
line-height: 1.5;
}
.govuk-tag.govuk-phase-banner__content__tag {
line-height: 1.5;
}
.govuk-phase-banner__text {
line-height: 1.5;
}
}
}
}
@@ -1140,8 +1153,10 @@ textarea,
}
&:focus {
border: none;
// border: none;
// box-shadow: none;
box-shadow: none;
border: #ffd530 solid 3px
}
}
}
@@ -1903,10 +1918,22 @@ ul#sharePageLinks.active {
&.activePaginationItem {
color: #b80d0d;
background-color: transparent;
border: none;
cursor: pointer;
// &:before {
// content: "";
// background-image: url(/assets/images/arrow-left--active.svg);
// }
&:focus {
background-color: #ffd530 !important;
border-color: transparent !important;
color: #1f1f1f !important;
outline: 2px solid #1f1f1f;
text-decoration: none !important;
box-shadow: none;
}
}
@media screen and (max-width: 768px) {
@@ -1942,6 +1969,19 @@ ul#sharePageLinks.active {
.activePaginationItem {
color: #b80d0d;
border: none;
background: none;
cursor: pointer;
&:focus {
background-color: #ffd530 !important;
border-color: transparent !important;
color: #1f1f1f !important;
outline: 2px solid #1f1f1f;
text-decoration: none !important;
box-shadow: none;
}
}
@media screen and (max-width: 768px) {
@@ -1966,11 +2006,23 @@ ul#sharePageLinks.active {
&.activePaginationItem {
color: #b80d0d;
background-color: transparent;
border: none;
cursor: pointer;
&:after {
content: "";
background-image: url(/assets/images/arrow-right--active.svg);
}
&:focus {
background-color: #ffd530 !important;
border-color: transparent !important;
color: #1f1f1f !important;
outline: 2px solid #1f1f1f;
text-decoration: none !important;
box-shadow: none;
}
}
@media screen and (max-width: 768px) {
@@ -2047,13 +2099,18 @@ ul#sharePageLinks.active {
color: #0b0c0c;
background-color: #ffdd00;
-webkit-box-shadow: 0 2px 0 #0b0c0c;
box-shadow: 0 2px 0 #0b0c0c;
box-shadow: 0 0px 0 #0b0c0c;
& .eye:before {
background-color: #ffdd00;
border: solid 1px #ffdd00;
}
}
&.watched_link {
color: $black !important;
background-color: $white;
width: 13px;
width: 24px;
display: block;
.eye {
@@ -2068,7 +2125,7 @@ ul#sharePageLinks.active {
&.watchLink {
width: 13px;
width: 24px;
display: block;
}
@@ -2081,7 +2138,7 @@ ul#sharePageLinks.active {
position: relative;
transform: rotate(45deg);
display: block;
top: 3.5px;
top: 0.5px;
background-color: white;
}
@@ -2346,3 +2403,18 @@ fade {
}
.govuk-link.watchCase {
background-color: transparent;
border: none;
cursor: pointer;
&:focus {
background-color: #ffd530 !important;
border-color: transparent !important;
color: #1f1f1f !important;
outline: 2px solid #1f1f1f;
text-decoration: none !important;
box-shadow: none;
}
}