13 geänderte Dateien mit 142 neuen und 142 gelöschten Zeilen
-
+6 -6src/pages/Proof/Reply_Public/ApplicationDetails.js
-
+13 -13src/pages/Proof/Reply_Public/ProofForm.js
-
+4 -4src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
-
+6 -6src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
-
+10 -10src/pages/User/ChangePasswordPage/index.js
-
+1 -1src/pages/User/ManagePage_OrgPublic/index.js
-
+4 -4src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js
-
+4 -4src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js
-
+23 -23src/pages/authentication/auth-forms/BusCustomFormWizard.js
-
+20 -20src/pages/authentication/auth-forms/CustomFormWizard.js
-
+48 -48src/pages/authentication/auth-forms/IAmSmartFormWizard.js
-
+2 -2src/pages/dashboard/Public/Notice.js
-
+1 -1src/pages/dashboard/Public/index.js
+ 6
- 6
src/pages/Proof/Reply_Public/ApplicationDetails.js
Datei anzeigen
| @@ -70,7 +70,7 @@ const ApplicationDetailCard = ({ formData, }) => { | |||||
| border={false} | border={false} | ||||
| content={false} | content={false} | ||||
| > | > | ||||
| <Typography variant="h4" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}> | |||||
| <Typography variant="h4" component="h2" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}> | |||||
| <FormattedMessage id="publicNoticePaymentProofInfo" /> | <FormattedMessage id="publicNoticePaymentProofInfo" /> | ||||
| </Typography> | </Typography> | ||||
| <form> | <form> | ||||
| @@ -262,12 +262,12 @@ const ApplicationDetailCard = ({ formData, }) => { | |||||
| <> | <> | ||||
| <Grid item xs={12} md={12} lg={12} | <Grid item xs={12} md={12} lg={12} | ||||
| sx={{ display: 'flex', alignItems: 'center' }}> | sx={{ display: 'flex', alignItems: 'center' }}> | ||||
| <Typography variant="h5" display="inline"> | |||||
| <Typography variant="h5" component="span" display="inline"> | |||||
| <FormattedMessage id="commentDeadline" />： | <FormattedMessage id="commentDeadline" />： | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}> | <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}> | ||||
| <Typography variant="h5">  | |||||
| <Typography variant="h5" component="span">  | |||||
| {locale === 'en' ? | {locale === 'en' ? | ||||
| `${intl.formatMessage({ id: 'before' })} ${DateUtils.dateFormat(data?.reviseDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} ` | `${intl.formatMessage({ id: 'before' })} ${DateUtils.dateFormat(data?.reviseDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} ` | ||||
| : | : | ||||
| @@ -278,12 +278,12 @@ const ApplicationDetailCard = ({ formData, }) => { | |||||
| <Grid item xs={12} md={12} lg={12} | <Grid item xs={12} md={12} lg={12} | ||||
| sx={{ display: 'flex', alignItems: 'center' }}> | sx={{ display: 'flex', alignItems: 'center' }}> | ||||
| <Typography variant="h5" display="inline"> | |||||
| <Typography variant="h5" component="span" display="inline"> | |||||
| <FormattedMessage id="paymentDeadline" />： | <FormattedMessage id="paymentDeadline" />： | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}> | <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}> | ||||
| <Typography variant="h5">  | |||||
| <Typography variant="h5" component="span">  | |||||
| {locale === 'en' ? | {locale === 'en' ? | ||||
| `${intl.formatMessage({ id: 'before' })} ${DateUtils.dateFormat(data?.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} ` | `${intl.formatMessage({ id: 'before' })} ${DateUtils.dateFormat(data?.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} ` | ||||
| : | : | ||||
| @@ -304,7 +304,7 @@ const ApplicationDetailCard = ({ formData, }) => { | |||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} sm={9} md={9} lg={9} sx={{ mb: 1, display: 'flex', alignItems: 'center' }}> | <Grid item xs={12} sm={9} md={9} lg={9} sx={{ mb: 1, display: 'flex', alignItems: 'center' }}> | ||||
| <Typography variant="h4" style={{ color: "#0049B8", fontWeight: "bold", }}>{FormatUtils.currencyFormat(data.fee)}</Typography> | |||||
| <Typography variant="h4" component="span" style={{ color: "#0049B8", fontWeight: "bold", }}>{FormatUtils.currencyFormat(data.fee)}</Typography> | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={9} lg={9} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}> | <Grid item xs={12} md={9} lg={9} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}> | ||||
| { | { | ||||
+ 13
- 13
src/pages/Proof/Reply_Public/ProofForm.js
Datei anzeigen
| @@ -252,7 +252,7 @@ const FormPanel = ({ formData }) => { | |||||
| border={false} | border={false} | ||||
| content={false}> | content={false}> | ||||
| <Typography variant="h4" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}> | |||||
| <Typography variant="h4" component="h2" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}> | |||||
| <FormattedMessage id="publicNoticePaymentProofComment" /> | <FormattedMessage id="publicNoticePaymentProofComment" /> | ||||
| </Typography> | </Typography> | ||||
| @@ -262,7 +262,7 @@ const FormPanel = ({ formData }) => { | |||||
| formik.values.replyDate ? | formik.values.replyDate ? | ||||
| <Grid container direction="column" sx={{ paddingLeft: 0, paddingRight: 0 }}> | <Grid container direction="column" sx={{ paddingLeft: 0, paddingRight: 0 }}> | ||||
| <Grid item xs={12} sm={12} md={12} lg={8} textAlign="left"> | <Grid item xs={12} sm={12} md={12} lg={8} textAlign="left"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="proofReplyDate" /> : | <FormattedMessage id="proofReplyDate" /> : | ||||
| { | { | ||||
| locale === 'en' ? | locale === 'en' ? | ||||
| @@ -273,7 +273,7 @@ const FormPanel = ({ formData }) => { | |||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={12} textAlign="left"> | <Grid item xs={12} md={12} textAlign="left"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="proofReply" /> : {formik.values.action ? | <FormattedMessage id="proofReply" /> : {formik.values.action ? | ||||
| (<span style={{ color: 'green' }}> | (<span style={{ color: 'green' }}> | ||||
| <FormattedMessage id="proofErrorFree" /> | <FormattedMessage id="proofErrorFree" /> | ||||
| @@ -285,7 +285,7 @@ const FormPanel = ({ formData }) => { | |||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| {/* <Grid item xs={12} md={12} textAlign="left"> | {/* <Grid item xs={12} md={12} textAlign="left"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="proofReply" /> : | <FormattedMessage id="proofReply" /> : | ||||
| <span style={{ color: 'green' }}> | <span style={{ color: 'green' }}> | ||||
| { | { | ||||
| @@ -322,7 +322,7 @@ const FormPanel = ({ formData }) => { | |||||
| isOverTime() ? | isOverTime() ? | ||||
| <Grid container direction="column" sx={{ paddingLeft: 0, paddingRight: 0 }} spacing={1}> | <Grid container direction="column" sx={{ paddingLeft: 0, paddingRight: 0 }} spacing={1}> | ||||
| <Grid item xs={12} md={12} textAlign="left"> | <Grid item xs={12} md={12} textAlign="left"> | ||||
| <Typography variant="h5"><FormattedMessage id="MSG.proofOutOfTime" /></Typography> | |||||
| <Typography variant="h5" component="span"><FormattedMessage id="MSG.proofOutOfTime" /></Typography> | |||||
| </Grid> | </Grid> | ||||
| </Grid> | </Grid> | ||||
| : | : | ||||
| @@ -381,7 +381,7 @@ const FormPanel = ({ formData }) => { | |||||
| <li><FormattedMessage id="store" /></li> | <li><FormattedMessage id="store" /></li> | ||||
| <li><FormattedMessage id="post" /></li> | <li><FormattedMessage id="post" /></li> | ||||
| </ul> | </ul> | ||||
| <Typography variant="h6"> | |||||
| <Typography variant="h6" component="span"> | |||||
| <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} /> | <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} /> | ||||
| </Typography> | </Typography> | ||||
| </> | </> | ||||
| @@ -535,7 +535,7 @@ const FormPanel = ({ formData }) => { | |||||
| <li><FormattedMessage id="store" /></li> | <li><FormattedMessage id="store" /></li> | ||||
| <li><FormattedMessage id="post" /></li> | <li><FormattedMessage id="post" /></li> | ||||
| </ul> | </ul> | ||||
| <Typography variant="h6"> | |||||
| <Typography variant="h6" component="span"> | |||||
| <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} /> | <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} /> | ||||
| </Typography> | </Typography> | ||||
| </> | </> | ||||
| @@ -598,13 +598,13 @@ const FormPanel = ({ formData }) => { | |||||
| </Grid> | </Grid> | ||||
| } | } | ||||
| {/* <Grid item xs={12}> | {/* <Grid item xs={12}> | ||||
| <Typography variant="h6" height="100%" > | |||||
| <Typography variant="h6" component="span" height="100%" > | |||||
| <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} /> | <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} /> | ||||
| </Typography> | </Typography> | ||||
| </Grid> */} | </Grid> */} | ||||
| {!isOnlyOnlinePayment? | {!isOnlyOnlinePayment? | ||||
| <Grid item xs={12}> | <Grid item xs={12}> | ||||
| <Typography variant="h6" height="100%" > | |||||
| <Typography variant="h6" component="span" height="100%" > | |||||
| <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofImportant" }) }} /> | <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofImportant" }) }} /> | ||||
| </Typography> | </Typography> | ||||
| </Grid>:null | </Grid>:null | ||||
| @@ -618,14 +618,14 @@ const FormPanel = ({ formData }) => { | |||||
| { | { | ||||
| isOverReviseDeadline() ? | isOverReviseDeadline() ? | ||||
| <Grid item xs={12} md={12} textAlign="left"> | <Grid item xs={12} md={12} textAlign="left"> | ||||
| <Typography variant="h5" style={{ color: "red" }}> | |||||
| <Typography variant="h5" component="span" style={{ color: "red" }}> | |||||
| <FormattedMessage id="MSG.overReviseDeadline" /> | <FormattedMessage id="MSG.overReviseDeadline" /> | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| : | : | ||||
| <> | <> | ||||
| <Grid item xs={12} md={12} textAlign="left"> | <Grid item xs={12} md={12} textAlign="left"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="requiredUploadFix" />： | <FormattedMessage id="requiredUploadFix" />： | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| @@ -684,7 +684,7 @@ const FormPanel = ({ formData }) => { | |||||
| <Grid item xs={12} sm={12} md={12} lg={12}> | <Grid item xs={12} sm={12} md={12} lg={12}> | ||||
| <Stack direction="row" alignItems="center"> | <Stack direction="row" alignItems="center"> | ||||
| <FormLabel sx={{ paddingRight: 2, paddingBottom: 3, textAlign: "center" }}> | <FormLabel sx={{ paddingRight: 2, paddingBottom: 3, textAlign: "center" }}> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="sign" />： | <FormattedMessage id="sign" />： | ||||
| </Typography> | </Typography> | ||||
| </FormLabel> | </FormLabel> | ||||
| @@ -754,7 +754,7 @@ const FormPanel = ({ formData }) => { | |||||
| {warningTitle} | {warningTitle} | ||||
| </DialogTitle> | </DialogTitle> | ||||
| <DialogContent style={{ display: 'flex', }}> | <DialogContent style={{ display: 'flex', }}> | ||||
| <Typography variant="h5" style={{ padding: '16px' }}>{warningText}</Typography> | |||||
| <Typography variant="h5" component="span" style={{ padding: '16px' }}>{warningText}</Typography> | |||||
| </DialogContent> | </DialogContent> | ||||
| <DialogActions> | <DialogActions> | ||||
| <Button | <Button | ||||
+ 4
- 4
src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
Datei anzeigen
| @@ -458,7 +458,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => | |||||
| <li><FormattedMessage id="store" /></li> | <li><FormattedMessage id="store" /></li> | ||||
| <li><FormattedMessage id="post" /></li> | <li><FormattedMessage id="post" /></li> | ||||
| </ul> | </ul> | ||||
| <Typography variant="h6"> | |||||
| <Typography variant="h6" component="span"> | |||||
| <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} /> | <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} /> | ||||
| </Typography> | </Typography> | ||||
| </> | </> | ||||
| @@ -629,7 +629,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => | |||||
| "aria-label": intl.formatMessage({ id: "applyTickStr" }) | "aria-label": intl.formatMessage({ id: "applyTickStr" }) | ||||
| }} | }} | ||||
| /> | /> | ||||
| <Typography variant="h6" height="100%" > | |||||
| <Typography variant="h6" component="span" height="100%" > | |||||
| <div style={{ padding: 12, textAlign: 'justify' }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickStr" }) }} /> | <div style={{ padding: 12, textAlign: 'justify' }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickStr" }) }} /> | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -652,7 +652,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12}> | <Grid item xs={12}> | ||||
| <Typography variant="h6" height="100%" > | |||||
| <Typography variant="h6" component="span" height="100%" > | |||||
| <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyPublicNoticeText" }) }} /> | <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyPublicNoticeText" }) }} /> | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| @@ -678,7 +678,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => | |||||
| {warningTitle} | {warningTitle} | ||||
| </DialogTitle> | </DialogTitle> | ||||
| <DialogContent style={{ display: 'flex', }}> | <DialogContent style={{ display: 'flex', }}> | ||||
| <Typography variant="h5" style={{ padding: '16px' }}> | |||||
| <Typography variant="h5" component="span" style={{ padding: '16px' }}> | |||||
| {warningText} | {warningText} | ||||
| </Typography> | </Typography> | ||||
| </DialogContent> | </DialogContent> | ||||
+ 6
- 6
src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
Datei anzeigen
| @@ -254,7 +254,7 @@ const ApplicationDetailCard = ( | |||||
| </div> | </div> | ||||
| :null | :null | ||||
| } | } | ||||
| <Typography variant="h4" sx={{ mb: 2, borderBottom: "1px solid black" }}> | |||||
| <Typography variant="h4" component="h3" sx={{ mb: 2, borderBottom: "1px solid black" }}> | |||||
| <FormattedMessage id="publicNoticeDetailTitle" /> | <FormattedMessage id="publicNoticeDetailTitle" /> | ||||
| </Typography> | </Typography> | ||||
| <form> | <form> | ||||
| @@ -753,13 +753,13 @@ const ApplicationDetailCard = ( | |||||
| }} | }} | ||||
| > | > | ||||
| <DialogTitle> | <DialogTitle> | ||||
| <Typography variant="h3" > | |||||
| <Typography variant="h3" component="span"> | |||||
| <FormattedMessage id="payConfirm" /> | <FormattedMessage id="payConfirm" /> | ||||
| </Typography> | </Typography> | ||||
| </DialogTitle> | </DialogTitle> | ||||
| <DialogContent style={{ display: 'flex', }}> | <DialogContent style={{ display: 'flex', }}> | ||||
| <Stack direction="column" justifyContent="space-between"> | <Stack direction="column" justifyContent="space-between"> | ||||
| <Typography variant="h4"> | |||||
| <Typography variant="h4" component="span"> | |||||
| <FormattedMessage id="totalAmount" /> ($): {FormatUtils.currencyFormat(fee)} | <FormattedMessage id="totalAmount" /> ($): {FormatUtils.currencyFormat(fee)} | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -799,7 +799,7 @@ const ApplicationDetailCard = ( | |||||
| }} | }} | ||||
| > | > | ||||
| <DialogTitle></DialogTitle> | <DialogTitle></DialogTitle> | ||||
| <Typography variant="h2" style={{ padding: '16px' }}><FormattedMessage id="MSG.actionFail" /></Typography> | |||||
| <Typography variant="h2" component="span" style={{ padding: '16px' }}><FormattedMessage id="MSG.actionFail" /></Typography> | |||||
| <DialogContent style={{ display: 'flex', }}> | <DialogContent style={{ display: 'flex', }}> | ||||
| <Stack direction="column" justifyContent="space-between"> | <Stack direction="column" justifyContent="space-between"> | ||||
| { | { | ||||
| @@ -831,7 +831,7 @@ const ApplicationDetailCard = ( | |||||
| }} | }} | ||||
| > | > | ||||
| <DialogTitle></DialogTitle> | <DialogTitle></DialogTitle> | ||||
| <Typography variant="h4" style={{ paddingLeft: '24px' }}><FormattedMessage id="MSG.actionFail" /></Typography> | |||||
| <Typography variant="h4" component="span" style={{ paddingLeft: '24px' }}><FormattedMessage id="MSG.actionFail" /></Typography> | |||||
| <DialogContent style={{ display: 'flex', }}> | <DialogContent style={{ display: 'flex', }}> | ||||
| <Stack direction="column" justifyContent="space-between"> | <Stack direction="column" justifyContent="space-between"> | ||||
| <div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: 'MSG.paymentHolded' }, { appNo: paymentHoldedErrText }) }} /> | <div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: 'MSG.paymentHolded' }, { appNo: paymentHoldedErrText }) }} /> | ||||
| @@ -839,7 +839,7 @@ const ApplicationDetailCard = ( | |||||
| </DialogContent> | </DialogContent> | ||||
| <DialogActions> | <DialogActions> | ||||
| <Button onClick={() => setPaymentHoldedErr(false)} aria-label={intl.formatMessage({ id: 'close' })}> | <Button onClick={() => setPaymentHoldedErr(false)} aria-label={intl.formatMessage({ id: 'close' })}> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="close" /> | <FormattedMessage id="close" /> | ||||
| </Typography></Button> | </Typography></Button> | ||||
| </DialogActions> | </DialogActions> | ||||
+ 10
- 10
src/pages/User/ChangePasswordPage/index.js
Datei anzeigen
| @@ -215,13 +215,13 @@ const Index = () => { | |||||
| <Grid container spacing={4} sx={{ minHeight: {xs:"80vh", sm:"50vh", md: "50vh", lg:"70vh", xl:"50vh"} }} direction="column" justifyContent="flex-start" alignItems="center"> | <Grid container spacing={4} sx={{ minHeight: {xs:"80vh", sm:"50vh", md: "50vh", lg:"70vh", xl:"50vh"} }} direction="column" justifyContent="flex-start" alignItems="center"> | ||||
| {isPasswordExpiry()? | {isPasswordExpiry()? | ||||
| <Grid item width="70%" xs={12} md={12} lg={12} sx={{ mb: 1, mt:2 }}> | <Grid item width="70%" xs={12} md={12} lg={12} sx={{ mb: 1, mt:2 }}> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="passwordExpired"/> | <FormattedMessage id="passwordExpired"/> | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| : | : | ||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:2 }}> | <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:2 }}> | ||||
| <Typography variant="h5" > | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="setNewPassword"/> | <FormattedMessage id="setNewPassword"/> | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| @@ -433,14 +433,14 @@ const Index = () => { | |||||
| <DialogTitle></DialogTitle> | <DialogTitle></DialogTitle> | ||||
| <DialogContent style={{ display: 'flex', }}> | <DialogContent style={{ display: 'flex', }}> | ||||
| <Stack direction="column" justifyContent="space-between"> | <Stack direction="column" justifyContent="space-between"> | ||||
| <Typography variant="h5" style={{ padding: '10px' }}> | |||||
| <Typography variant="h5" component="span" style={{ padding: '10px' }}> | |||||
| <FormattedMessage id ="changePasswordConfirm"/> | <FormattedMessage id ="changePasswordConfirm"/> | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| </DialogContent> | </DialogContent> | ||||
| <DialogActions> | <DialogActions> | ||||
| <Button disabled={isChangingPassword} onClick={() => setComfirmChangeMessage(false)}> | <Button disabled={isChangingPassword} onClick={() => setComfirmChangeMessage(false)}> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="close"/> | <FormattedMessage id="close"/> | ||||
| </Typography> | </Typography> | ||||
| </Button> | </Button> | ||||
| @@ -449,7 +449,7 @@ const Index = () => { | |||||
| onClick={() => goLogin(changePasswordValues)} | onClick={() => goLogin(changePasswordValues)} | ||||
| startIcon={isChangingPassword ? <CircularProgress color="inherit" size={18} /> : null} | startIcon={isChangingPassword ? <CircularProgress color="inherit" size={18} /> : null} | ||||
| > | > | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="confirm"/> | <FormattedMessage id="confirm"/> | ||||
| </Typography> | </Typography> | ||||
| </Button> | </Button> | ||||
| @@ -468,13 +468,13 @@ const Index = () => { | |||||
| }} | }} | ||||
| > | > | ||||
| <DialogTitle> | <DialogTitle> | ||||
| <Typography variant="h5" style={{ padding: '10px' }}> | |||||
| <Typography variant="h5" component="span" style={{ padding: '10px' }}> | |||||
| <FormattedMessage id ="MSG.actionFail"/> | <FormattedMessage id ="MSG.actionFail"/> | ||||
| </Typography> | </Typography> | ||||
| </DialogTitle> | </DialogTitle> | ||||
| <DialogContent style={{ display: 'flex', }}> | <DialogContent style={{ display: 'flex', }}> | ||||
| <Stack direction="column" justifyContent="space-between"> | <Stack direction="column" justifyContent="space-between"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| { | { | ||||
| expiryErrText | expiryErrText | ||||
| } | } | ||||
| @@ -483,7 +483,7 @@ const Index = () => { | |||||
| </DialogContent> | </DialogContent> | ||||
| <DialogActions> | <DialogActions> | ||||
| <Button onClick={() => setExpiryErr(false)}> | <Button onClick={() => setExpiryErr(false)}> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="close"/> | <FormattedMessage id="close"/> | ||||
| </Typography> | </Typography> | ||||
| </Button> | </Button> | ||||
| @@ -498,13 +498,13 @@ const Index = () => { | |||||
| <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} /> | <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} /> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5,}}> | <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5,}}> | ||||
| <Typography display="inline" variant="h4"> | |||||
| <Typography display="inline" variant="h4" component="span"> | |||||
| <FormattedMessage id="resetPasswordSuccess"/> | <FormattedMessage id="resetPasswordSuccess"/> | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5,}}> | <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5,}}> | ||||
| <Button color="success" variant="outlined" onClick={()=>logout()}> | <Button color="success" variant="outlined" onClick={()=>logout()}> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="backToLogin"/> | <FormattedMessage id="backToLogin"/> | ||||
| </Typography> | </Typography> | ||||
| </Button> | </Button> | ||||
+ 1
- 1
src/pages/User/ManagePage_OrgPublic/index.js
Datei anzeigen
| @@ -279,7 +279,7 @@ const ManageOrgUserPage = () => { | |||||
| <FormattedMessage id="confirm" /> | <FormattedMessage id="confirm" /> | ||||
| </DialogTitle> | </DialogTitle> | ||||
| <DialogContent style={{ display: 'flex', }}> | <DialogContent style={{ display: 'flex', }}> | ||||
| <Typography variant="h5" style={{ padding: '16px' }}>{warningText}</Typography> | |||||
| <Typography variant="h5" component="span" style={{ padding: '16px' }}>{warningText}</Typography> | |||||
| </DialogContent> | </DialogContent> | ||||
| <DialogActions> | <DialogActions> | ||||
| <Button onClick={() => { | <Button onClick={() => { | ||||
+ 4
- 4
src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js
Datei anzeigen
| @@ -128,17 +128,17 @@ const ForgotPasswordApplyForm = () => { | |||||
| <Grid container spacing={2} sx={{ minHeight: '40vh' }} direction="column" justifyContent="flex-start" alignItems="center"> | <Grid container spacing={2} sx={{ minHeight: '40vh' }} direction="column" justifyContent="flex-start" alignItems="center"> | ||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { xs: 'none', sm: 'none', md: 'block' } }}> | <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { xs: 'none', sm: 'none', md: 'block' } }}> | ||||
| <InputLabel htmlFor="email-login-title"> | <InputLabel htmlFor="email-login-title"> | ||||
| <Typography variant="h5" > | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="forgotPasswordSubTitle"/> | <FormattedMessage id="forgotPasswordSubTitle"/> | ||||
| </Typography> | </Typography> | ||||
| </InputLabel> | </InputLabel> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { md: 'none', xl: 'none', lg: 'none' } }}> | <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { md: 'none', xl: 'none', lg: 'none' } }}> | ||||
| <InputLabel htmlFor="email-login-subtitle"> | <InputLabel htmlFor="email-login-subtitle"> | ||||
| <Typography variant="h6" > | |||||
| <Typography variant="h6" component="span"> | |||||
| <FormattedMessage id="forgotPasswordSubTitle1"/> | <FormattedMessage id="forgotPasswordSubTitle1"/> | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="h6" > | |||||
| <Typography variant="h6" component="span"> | |||||
| <FormattedMessage id="forgotPasswordSubTitle2"/> | <FormattedMessage id="forgotPasswordSubTitle2"/> | ||||
| </Typography> | </Typography> | ||||
| </InputLabel> | </InputLabel> | ||||
| @@ -212,7 +212,7 @@ const ForgotPasswordApplyForm = () => { | |||||
| <FormattedMessage id="attention"/> | <FormattedMessage id="attention"/> | ||||
| </DialogTitle> | </DialogTitle> | ||||
| <DialogContent style={{ display: 'flex', }}> | <DialogContent style={{ display: 'flex', }}> | ||||
| {/* <Typography variant="h5" style={{ padding: '16px' }}>{warningText}</Typography> */} | |||||
| {/* <Typography variant="h5" component="span" style={{ padding: '16px' }}>{warningText}</Typography> */} | |||||
| </DialogContent> | </DialogContent> | ||||
| <DialogActions> | <DialogActions> | ||||
| <Button | <Button | ||||
+ 4
- 4
src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js
Datei anzeigen
| @@ -127,17 +127,17 @@ const ForgotUsernameApplyForm = () => { | |||||
| <Grid container spacing={2} sx={{ minHeight: '40vh' }} direction="column" justifyContent="flex-start" alignItems="center"> | <Grid container spacing={2} sx={{ minHeight: '40vh' }} direction="column" justifyContent="flex-start" alignItems="center"> | ||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { xs: 'none', sm: 'none', md: 'block' } }}> | <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { xs: 'none', sm: 'none', md: 'block' } }}> | ||||
| <InputLabel htmlFor="email-login-title"> | <InputLabel htmlFor="email-login-title"> | ||||
| <Typography variant="h5" > | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="forgotUsernameSubTitle"/> | <FormattedMessage id="forgotUsernameSubTitle"/> | ||||
| </Typography> | </Typography> | ||||
| </InputLabel> | </InputLabel> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { md: 'none', xl: 'none', lg: 'none' } }}> | <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { md: 'none', xl: 'none', lg: 'none' } }}> | ||||
| <InputLabel htmlFor="email-login-subtitle"> | <InputLabel htmlFor="email-login-subtitle"> | ||||
| <Typography variant="h6" > | |||||
| <Typography variant="h6" component="span"> | |||||
| <FormattedMessage id="forgotUsernameSubTitle1"/> | <FormattedMessage id="forgotUsernameSubTitle1"/> | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="h6" > | |||||
| <Typography variant="h6" component="span"> | |||||
| <FormattedMessage id="forgotPasswordSubTitle2"/> | <FormattedMessage id="forgotPasswordSubTitle2"/> | ||||
| </Typography> | </Typography> | ||||
| </InputLabel> | </InputLabel> | ||||
| @@ -211,7 +211,7 @@ const ForgotUsernameApplyForm = () => { | |||||
| <FormattedMessage id="attention"/> | <FormattedMessage id="attention"/> | ||||
| </DialogTitle> | </DialogTitle> | ||||
| <DialogContent style={{ display: 'flex', }}> | <DialogContent style={{ display: 'flex', }}> | ||||
| {/* <Typography variant="h5" style={{ padding: '16px' }}>{warningText}</Typography> */} | |||||
| {/* <Typography variant="h5"component="span" style={{ padding: '16px' }}>{warningText}</Typography> */} | |||||
| </DialogContent> | </DialogContent> | ||||
| <DialogActions> | <DialogActions> | ||||
| <Button | <Button | ||||
+ 23
- 23
src/pages/authentication/auth-forms/BusCustomFormWizard.js
Datei anzeigen
| @@ -739,14 +739,14 @@ const BusCustomFormWizard = (props) => { | |||||
| </Typography> | </Typography> | ||||
| </Button> | </Button> | ||||
| <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | ||||
| <Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}> | |||||
| <Typography display="inline" variant="h3"component="h1" sx={{ color: '#1A4399' }}> | |||||
| <FormattedMessage id="becomeNewBusinessUser"/> | <FormattedMessage id="becomeNewBusinessUser"/> | ||||
| </Typography> | </Typography> | ||||
| </div> | </div> | ||||
| <Typography mt={0.25} variant="h6" sx={{ color: '#B00020' }}> | |||||
| <Typography mt={0.25} variant="h6" component="span" sx={{ color: '#B00020' }}> | |||||
| <FormattedMessage id="requireString"/> | <FormattedMessage id="requireString"/> | ||||
| </Typography> | </Typography> | ||||
| <Typography mt={0.25} variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography mt={0.25} variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourLoginInformation"/> | <FormattedMessage id="yourLoginInformation"/> | ||||
| </Typography> | </Typography> | ||||
| {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | ||||
| @@ -766,7 +766,7 @@ const BusCustomFormWizard = (props) => { | |||||
| variant="contained" | variant="contained" | ||||
| onClick={handleCheckUsername} | onClick={handleCheckUsername} | ||||
| sx={{ ml: 2, height: "40px" }}> | sx={{ ml: 2, height: "40px" }}> | ||||
| <Typography variant="h6">檢查是否重覆</Typography> | |||||
| <Typography variant="h6" component="span">檢查是否重覆</Typography> | |||||
| </Button> */} | </Button> */} | ||||
| </Typography> | </Typography> | ||||
| </InputLabel> | </InputLabel> | ||||
| @@ -953,7 +953,7 @@ const BusCustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" /*sx={{ color: '#1A4399' }}*/> | |||||
| <Typography display="inline" variant="h4" component="h2" /*sx={{ color: '#1A4399' }}*/> | |||||
| <FormattedMessage id="yourBusinessInformation"/> | <FormattedMessage id="yourBusinessInformation"/> | ||||
| </Typography> | </Typography> | ||||
| {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | ||||
| @@ -1273,7 +1273,7 @@ const BusCustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourContact"/> | <FormattedMessage id="yourContact"/> | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -1551,14 +1551,14 @@ const BusCustomFormWizard = (props) => { | |||||
| <Grid container> | <Grid container> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="businessRegCertAndDoc"/> | <FormattedMessage id="businessRegCertAndDoc"/> | ||||
| <span style={{ color: '#B00020' }}>*</span> | <span style={{ color: '#B00020' }}>*</span> | ||||
| </Typography> | </Typography> | ||||
| <Typography display="inline" variant="h6" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h6" component="span" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="pleaseUploadDoc"/> | <FormattedMessage id="pleaseUploadDoc"/> | ||||
| </Typography> | </Typography> | ||||
| {/* <Typography display="inline" variant="h6" sx={{ fontSize: 12,color: 'primary.primary'}}>如: 香港身份證; 護照; 中國內地身份證等</Typography> */} | |||||
| {/* <Typography display="inline" variant="h6" component="span" sx={{ fontSize: 12,color: 'primary.primary'}}>如: 香港身份證; 護照; 中國內地身份證等</Typography> */} | |||||
| <Stack mt={1} direction="row" justifyContent="flex-start" alignItems="center" spacing={2}> | <Stack mt={1} direction="row" justifyContent="flex-start" alignItems="center" spacing={2}> | ||||
| <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}> | <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}> | ||||
| <Button | <Button | ||||
| @@ -1593,7 +1593,7 @@ const BusCustomFormWizard = (props) => { | |||||
| style={{ display: 'none' }} | style={{ display: 'none' }} | ||||
| /> | /> | ||||
| </ThemeProvider> | </ThemeProvider> | ||||
| {/* <Typography display="inline" variant="h6" sx={{ fontSize: 12, color: 'primary.primary'}}></Typography> */} | |||||
| {/* <Typography display="inline" variant="h6" component="span" sx={{ fontSize: 12, color: 'primary.primary'}}></Typography> */} | |||||
| </Stack> | </Stack> | ||||
| {fileList != null && props.step === 0 ? | {fileList != null && props.step === 0 ? | ||||
| <UploadFileTable key="uploadTable" recordList={fileListData} setUpdateRows={setUpdateRows} /> : null} | <UploadFileTable key="uploadTable" recordList={fileListData} setUpdateRows={setUpdateRows} /> : null} | ||||
| @@ -1609,7 +1609,7 @@ const BusCustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Grid container> | <Grid container> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="termsAndCondition"/> | <FormattedMessage id="termsAndCondition"/> | ||||
| <span style={{ color: '#B00020' }}>*</span> | <span style={{ color: '#B00020' }}>*</span> | ||||
| </Typography> | </Typography> | ||||
| @@ -1617,7 +1617,7 @@ const BusCustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Grid container> | <Grid container> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Typography variant="h6" height="100%" sx={{ textAlign: "left", /*overflow: "scroll",*/ borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}> | |||||
| <Typography variant="h6" component="span" height="100%" sx={{ textAlign: "left", /*overflow: "scroll",*/ borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}> | |||||
| <div style={{padding: 12}} dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} /> | <div style={{padding: 12}} dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} /> | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| @@ -1670,7 +1670,7 @@ const BusCustomFormWizard = (props) => { | |||||
| <Grid item xs={12} lg={12}> | <Grid item xs={12} lg={12}> | ||||
| <Grid container> | <Grid container> | ||||
| <Stack direction="column"> | <Stack direction="column"> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="verify"/> | <FormattedMessage id="verify"/> | ||||
| <span style={{ color: '#B00020' }}>*</span> | <span style={{ color: '#B00020' }}>*</span> | ||||
| </Typography> | </Typography> | ||||
| @@ -1744,12 +1744,12 @@ const BusCustomFormWizard = (props) => { | |||||
| <Grid item xs={12}> | <Grid item xs={12}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | ||||
| <Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}> | |||||
| <Typography display="inline" variant="h3"component="h1" sx={{ color: '#1A4399' }}> | |||||
| <FormattedMessage id="becomeNewBusinessUser"/> | <FormattedMessage id="becomeNewBusinessUser"/> | ||||
| </Typography> | </Typography> | ||||
| </div> | </div> | ||||
| {/* <Typography mt={0.25} variant="h6" sx={{ fontSize: 12,color: '#B00020'}}>註有*的項目必須輸入資料</Typography> */} | |||||
| <Typography mt={0.25} variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| {/* <Typography mt={0.25} variant="h6" component="span" sx={{ fontSize: 12,color: '#B00020'}}>註有*的項目必須輸入資料</Typography> */} | |||||
| <Typography mt={0.25} variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourLoginInformation"/> | <FormattedMessage id="yourLoginInformation"/> | ||||
| </Typography> | </Typography> | ||||
| {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | ||||
| @@ -1771,7 +1771,7 @@ const BusCustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" /*sx={{ color: '#1A4399' }}*/> | |||||
| <Typography display="inline" variant="h4" component="h2" /*sx={{ color: '#1A4399' }}*/> | |||||
| <FormattedMessage id="yourBusinessInformation"/> | <FormattedMessage id="yourBusinessInformation"/> | ||||
| </Typography> | </Typography> | ||||
| {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | ||||
| @@ -1872,7 +1872,7 @@ const BusCustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourContact"/> | <FormattedMessage id="yourContact"/> | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -1921,8 +1921,8 @@ const BusCustomFormWizard = (props) => { | |||||
| <Grid container> | <Grid container> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="userIdDoc"/> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="businessRegCertAndDoc"/> | |||||
| </Typography> | </Typography> | ||||
| {fileList != null && props.step === 1 ? | {fileList != null && props.step === 1 ? | ||||
| <PreviewUploadFileTable key="previewTable" recordList={fileListData} /> : null} | <PreviewUploadFileTable key="previewTable" recordList={fileListData} /> : null} | ||||
| @@ -1944,10 +1944,10 @@ const BusCustomFormWizard = (props) => { | |||||
| // SUCCESS page | // SUCCESS page | ||||
| <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | ||||
| <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} /> | <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} /> | ||||
| <Typography display="inline" variant="h4"> | |||||
| <Typography display="inline" variant="h4" component="span"> | |||||
| <FormattedMessage id="registerSubmitted"/> | <FormattedMessage id="registerSubmitted"/> | ||||
| </Typography> | </Typography> | ||||
| <Typography display="inline" variant="h4"> | |||||
| <Typography display="inline" variant="h4" component="span"> | |||||
| <FormattedMessage id="emailSent"/> | <FormattedMessage id="emailSent"/> | ||||
| </Typography> | </Typography> | ||||
| <Button variant="outlined" component={Link} to="/login" > | <Button variant="outlined" component={Link} to="/login" > | ||||
| @@ -1960,7 +1960,7 @@ const BusCustomFormWizard = (props) => { | |||||
| <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | ||||
| {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */} | {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */} | ||||
| <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} /> | <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} /> | ||||
| <Typography display="inline" variant="h4"> | |||||
| <Typography display="inline" variant="h4" component="span"> | |||||
| <FormattedMessage id="registerFail" /> | <FormattedMessage id="registerFail" /> | ||||
| </Typography> | </Typography> | ||||
| <Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader"> | <Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader"> | ||||
+ 20
- 20
src/pages/authentication/auth-forms/CustomFormWizard.js
Datei anzeigen
| @@ -960,14 +960,14 @@ const CustomFormWizard = (props) => { | |||||
| </Typography> | </Typography> | ||||
| </Button> | </Button> | ||||
| <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | ||||
| <Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}> | |||||
| <Typography display="inline" variant="h3" component="h1" sx={{ color: '#1A4399' }}> | |||||
| <FormattedMessage id="becomeNewPersonalUser" /> | <FormattedMessage id="becomeNewPersonalUser" /> | ||||
| </Typography> | </Typography> | ||||
| </div> | </div> | ||||
| <Typography mt={0.25} variant="h6" sx={{ color: '#B00020' }}> | |||||
| <Typography mt={0.25} variant="h6" component="span" sx={{ color: '#B00020' }}> | |||||
| <FormattedMessage id="requireString" /> | <FormattedMessage id="requireString" /> | ||||
| </Typography> | </Typography> | ||||
| <Typography mt={0.25} variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography mt={0.25} variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourLoginInformation" /> | <FormattedMessage id="yourLoginInformation" /> | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -984,7 +984,7 @@ const CustomFormWizard = (props) => { | |||||
| {/* variant="contained"*/} | {/* variant="contained"*/} | ||||
| {/* onClick={handleCheckUsername}*/} | {/* onClick={handleCheckUsername}*/} | ||||
| {/* sx={{ ml: 2, height: "40px" }}>*/} | {/* sx={{ ml: 2, height: "40px" }}>*/} | ||||
| {/* <Typography variant="h6">檢查是否重覆</Typography>*/} | |||||
| {/* <Typography variant="h6" component="span">檢查是否重覆</Typography>*/} | |||||
| {/*</Button> **/} | {/*</Button> **/} | ||||
| </Typography> | </Typography> | ||||
| </InputLabel> | </InputLabel> | ||||
| @@ -1171,7 +1171,7 @@ const CustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourPersonalInformation" /> | <FormattedMessage id="yourPersonalInformation" /> | ||||
| </Typography> | </Typography> | ||||
| {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | ||||
| @@ -1185,7 +1185,7 @@ const CustomFormWizard = (props) => { | |||||
| <InputLabel htmlFor="idDocType-signup"> | <InputLabel htmlFor="idDocType-signup"> | ||||
| <Typography variant="pnspsFormHeader"> | <Typography variant="pnspsFormHeader"> | ||||
| <FormattedMessage id="userIdDoc" /> | <FormattedMessage id="userIdDoc" /> | ||||
| <span style={{ color: '#B00020' }}>*</span> | |||||
| <span style={{ color: '#131313' }}>*</span> | |||||
| </Typography> | </Typography> | ||||
| </InputLabel> | </InputLabel> | ||||
| {/* {formik.touched.enName && formik.errors.enName && ( | {/* {formik.touched.enName && formik.errors.enName && ( | ||||
| @@ -1634,7 +1634,7 @@ const CustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourContact" /> | <FormattedMessage id="yourContact" /> | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -1878,7 +1878,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid container> | <Grid container> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="userIdDoc" /> | <FormattedMessage id="userIdDoc" /> | ||||
| <span style={{ color: '#B00020' }}>*</span></Typography> | <span style={{ color: '#B00020' }}>*</span></Typography> | ||||
| <Typography display="inline" variant="subtitle1" sx={{ color: 'primary.primary' }}> | <Typography display="inline" variant="subtitle1" sx={{ color: 'primary.primary' }}> | ||||
| @@ -1937,7 +1937,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Grid container> | <Grid container> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="termsAndCondition" /> | <FormattedMessage id="termsAndCondition" /> | ||||
| <span style={{ color: '#B00020' }}>*</span> | <span style={{ color: '#B00020' }}>*</span> | ||||
| </Typography> | </Typography> | ||||
| @@ -1945,7 +1945,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Grid container> | <Grid container> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Typography variant="h6" height="100%" sx={{ textAlign: "left", /*overflow: "scroll",*/ borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}> | |||||
| <Typography variant="h6" component="span" height="100%" sx={{ textAlign: "left", /*overflow: "scroll",*/ borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}> | |||||
| <div style={{padding: 12}} dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} /> | <div style={{padding: 12}} dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} /> | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| @@ -1998,7 +1998,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} lg={12}> | <Grid item xs={12} lg={12}> | ||||
| <Grid container> | <Grid container> | ||||
| <Stack direction="column"> | <Stack direction="column"> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="verify" /> | <FormattedMessage id="verify" /> | ||||
| <span style={{ color: '#B00020' }}>*</span> | <span style={{ color: '#B00020' }}>*</span> | ||||
| </Typography> | </Typography> | ||||
| @@ -2072,12 +2072,12 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | ||||
| <Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}> | |||||
| <Typography display="inline" variant="h3" component="h1" sx={{ color: '#1A4399' }}> | |||||
| <FormattedMessage id="becomeNewPersonalUser" /> | <FormattedMessage id="becomeNewPersonalUser" /> | ||||
| </Typography> | </Typography> | ||||
| </div> | </div> | ||||
| {/* <Typography mt={0.25} variant="h6" sx={{ fontSize: 12,color: '#B00020'}}>註有*的項目必須輸入資料</Typography> */} | |||||
| <Typography mt={0.25} variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| {/* <Typography mt={0.25} variant="h6" component="span" sx={{ fontSize: 12,color: '#B00020'}}>註有*的項目必須輸入資料</Typography> */} | |||||
| <Typography mt={0.25} variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourLoginInformation" /> | <FormattedMessage id="yourLoginInformation" /> | ||||
| </Typography> | </Typography> | ||||
| {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | ||||
| @@ -2099,7 +2099,7 @@ const CustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourPersonalInformation" /> | <FormattedMessage id="yourPersonalInformation" /> | ||||
| </Typography> | </Typography> | ||||
| {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | ||||
| @@ -2218,7 +2218,7 @@ const CustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourContact" /> | <FormattedMessage id="yourContact" /> | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -2259,7 +2259,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid container> | <Grid container> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="userIdDoc" /> | <FormattedMessage id="userIdDoc" /> | ||||
| </Typography> | </Typography> | ||||
| {fileList != null && props.step === 1 ? | {fileList != null && props.step === 1 ? | ||||
| @@ -2282,10 +2282,10 @@ const CustomFormWizard = (props) => { | |||||
| // SUCCESS page | // SUCCESS page | ||||
| <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | ||||
| <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} /> | <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} /> | ||||
| <Typography display="inline" variant="h4"> | |||||
| <Typography display="inline" variant="h4" component="span"> | |||||
| <FormattedMessage id="registerSubmitted" /> | <FormattedMessage id="registerSubmitted" /> | ||||
| </Typography> | </Typography> | ||||
| <Typography display="inline" variant="h4"> | |||||
| <Typography display="inline" variant="h4" component="span"> | |||||
| <FormattedMessage id="emailSent" /> | <FormattedMessage id="emailSent" /> | ||||
| </Typography> | </Typography> | ||||
| <Button variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader"> | <Button variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader"> | ||||
| @@ -2297,7 +2297,7 @@ const CustomFormWizard = (props) => { | |||||
| <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | ||||
| {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */} | {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */} | ||||
| <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} /> | <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} /> | ||||
| <Typography display="inline" variant="h4"> | |||||
| <Typography display="inline" variant="h4" component="span"> | |||||
| <FormattedMessage id="registerFail" /> | <FormattedMessage id="registerFail" /> | ||||
| </Typography> | </Typography> | ||||
| <Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader"> | <Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader"> | ||||
+ 48
- 48
src/pages/authentication/auth-forms/IAmSmartFormWizard.js
Datei anzeigen
| @@ -566,15 +566,15 @@ const CustomFormWizard = (props) => { | |||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | ||||
| <Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}> | |||||
| <Typography display="inline" variant="h3" component="h1" sx={{ color: '#1A4399' }}> | |||||
| <FormattedMessage id="becomeNewPersonalUser" /> | <FormattedMessage id="becomeNewPersonalUser" /> | ||||
| </Typography> | </Typography> | ||||
| </div> | </div> | ||||
| <Typography mt={0.25} variant="h6" sx={{ color: '#B00020' }}> | |||||
| <Typography mt={0.25} variant="h6" component="span" sx={{ color: '#B00020' }}> | |||||
| <FormattedMessage id="requireString" />。 | <FormattedMessage id="requireString" />。 | ||||
| </Typography> | </Typography> | ||||
| <Stack mt={1} direction="row" style={{ alignItems: "center" }}><img src={iAmSmartICon} alt="iAM Smart" width="25" /><Typography mt={0.25} variant="h6" >: <FormattedMessage id="MSG.providedByIAmSmart" /></Typography></Stack> | |||||
| <Stack mt={1} direction="row" style={{ alignItems: "center" }}><img src={iAmSmartICon} alt="iAM Smart" width="25" /><Typography mt={0.25} variant="h6" component="span" >: <FormattedMessage id="MSG.providedByIAmSmart" /></Typography></Stack> | |||||
| </Stack> | </Stack> | ||||
| </Grid> | </Grid> | ||||
| @@ -582,7 +582,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid container spacing={1}> | <Grid container spacing={1}> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourPersonalInformation" /> | <FormattedMessage id="yourPersonalInformation" /> | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -591,12 +591,12 @@ const CustomFormWizard = (props) => { | |||||
| <Grid container sx={{ mb: 1 }}> | <Grid container sx={{ mb: 1 }}> | ||||
| <InputLabel htmlFor="idDocType-signup"> | <InputLabel htmlFor="idDocType-signup"> | ||||
| <Typography variant="h5" sx={{ mr: 1 }}> | |||||
| <Typography variant="h5" component="span" sx={{ mr: 1 }}> | |||||
| <FormattedMessage id="HKIDcard" />: {iAmSmartData.idNo ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>} | <FormattedMessage id="HKIDcard" />: {iAmSmartData.idNo ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>} | ||||
| {/* {iAmSmartData.idNo + "(" + iAmSmartData.checkDigit + ")"} */} | {/* {iAmSmartData.idNo + "(" + iAmSmartData.checkDigit + ")"} */} | ||||
| </Typography> | </Typography> | ||||
| <Stack direction="row"> | <Stack direction="row"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| {iAmSmartData?.idNo?.slice(0, 4)}{showId ? iAmSmartData?.idNo?.slice(4) : "****"}{showId ? '(' + iAmSmartData.checkDigit + ')' : null} | {iAmSmartData?.idNo?.slice(0, 4)}{showId ? iAmSmartData?.idNo?.slice(4) : "****"}{showId ? '(' + iAmSmartData.checkDigit + ')' : null} | ||||
| </Typography> | </Typography> | ||||
| <IconButton | <IconButton | ||||
| @@ -619,7 +619,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={6}> | <Grid item xs={12} md={6}> | ||||
| <Stack spacing={1}> | <Stack spacing={1}> | ||||
| <InputLabel htmlFor="enName-signup"> | <InputLabel htmlFor="enName-signup"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="userEnglishName" />: {iAmSmartData.enName}{iAmSmartData.enName ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>} | <FormattedMessage id="userEnglishName" />: {iAmSmartData.enName}{iAmSmartData.enName ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>} | ||||
| </Typography> | </Typography> | ||||
| @@ -629,7 +629,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={6}> | <Grid item xs={12} md={6}> | ||||
| <Stack spacing={1}> | <Stack spacing={1}> | ||||
| <InputLabel htmlFor="chName-signup"> | <InputLabel htmlFor="chName-signup"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| {intl.formatMessage({ id: 'userChineseName' })}: {iAmSmartData.chName}{iAmSmartData.chName ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>} | {intl.formatMessage({ id: 'userChineseName' })}: {iAmSmartData.chName}{iAmSmartData.chName ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>} | ||||
| </Typography> | </Typography> | ||||
| </InputLabel> | </InputLabel> | ||||
| @@ -638,7 +638,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12}> | <Grid item xs={12}> | ||||
| <Stack spacing={1}> | <Stack spacing={1}> | ||||
| <InputLabel htmlFor="address1-signup"> | <InputLabel htmlFor="address1-signup"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="formAddress" /> | <FormattedMessage id="formAddress" /> | ||||
| <span style={{ color: '#B00020' }}>*</span> | <span style={{ color: '#B00020' }}>*</span> | ||||
| @@ -794,7 +794,7 @@ const CustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourContact" /> | <FormattedMessage id="yourContact" /> | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -804,7 +804,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={6}> | <Grid item xs={12} md={6}> | ||||
| <Stack spacing={1} sx={{ mr: { md: 1 }, mb: 1 }}> | <Stack spacing={1} sx={{ mr: { md: 1 }, mb: 1 }}> | ||||
| <InputLabel htmlFor="email-login"> | <InputLabel htmlFor="email-login"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="userContactEmail" /> | <FormattedMessage id="userContactEmail" /> | ||||
| <span style={{ color: '#B00020' }}>*</span> | <span style={{ color: '#B00020' }}>*</span> | ||||
| @@ -850,7 +850,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={6}> | <Grid item xs={12} md={6}> | ||||
| <Stack spacing={1} > | <Stack spacing={1} > | ||||
| <InputLabel htmlFor="emailConfirm-login"> | <InputLabel htmlFor="emailConfirm-login"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="confirmEmail" /> | <FormattedMessage id="confirmEmail" /> | ||||
| <span style={{ color: '#B00020' }}>*</span> | <span style={{ color: '#B00020' }}>*</span> | ||||
| </Typography> | </Typography> | ||||
| @@ -899,7 +899,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Stack direction="column" spacing={1} sx={{ mr: { md: 1 }, mb: 1 }}> | <Stack direction="column" spacing={1} sx={{ mr: { md: 1 }, mb: 1 }}> | ||||
| <InputLabel htmlFor="phone-signup"> | <InputLabel htmlFor="phone-signup"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="userContactNumber" /> | <FormattedMessage id="userContactNumber" /> | ||||
| <span style={{ color: '#B00020' }}>*</span> | <span style={{ color: '#B00020' }}>*</span> | ||||
| @@ -978,7 +978,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Stack spacing={1} direction="column"> | <Stack spacing={1} direction="column"> | ||||
| <InputLabel htmlFor="fax-signup"> | <InputLabel htmlFor="fax-signup"> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="userFaxNumber" /> | <FormattedMessage id="userFaxNumber" /> | ||||
| </Typography> | </Typography> | ||||
| </InputLabel> | </InputLabel> | ||||
| @@ -1045,7 +1045,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Grid container> | <Grid container> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="termsAndCondition" /> | <FormattedMessage id="termsAndCondition" /> | ||||
| <span style={{ color: '#B00020' }}>*</span> | <span style={{ color: '#B00020' }}>*</span> | ||||
| </Typography> | </Typography> | ||||
| @@ -1053,7 +1053,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Grid container> | <Grid container> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Typography variant="h5" sx={{ textAlign: "left", borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}> | |||||
| <Typography variant="h5" component="span" sx={{ textAlign: "left", borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}> | |||||
| <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "termsAndCon" }) }} /> | <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "termsAndCon" }) }} /> | ||||
| </Typography> | </Typography> | ||||
| @@ -1071,7 +1071,7 @@ const CustomFormWizard = (props) => { | |||||
| color="primary" | color="primary" | ||||
| size="small" | size="small" | ||||
| /> | /> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="iConfirm" /> | <FormattedMessage id="iConfirm" /> | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| @@ -1088,7 +1088,7 @@ const CustomFormWizard = (props) => { | |||||
| size="small" | size="small" | ||||
| /> | /> | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="rejectTerms" /> | <FormattedMessage id="rejectTerms" /> | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| @@ -1102,7 +1102,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} lg={12}> | <Grid item xs={12} lg={12}> | ||||
| <Grid container> | <Grid container> | ||||
| <Stack direction="column"> | <Stack direction="column"> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="verify" /> | <FormattedMessage id="verify" /> | ||||
| <span style={{ color: '#B00020' }}>*</span> | <span style={{ color: '#B00020' }}>*</span> | ||||
| </Typography> | </Typography> | ||||
| @@ -1172,7 +1172,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | <div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}> | ||||
| <Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}> | |||||
| <Typography display="inline" variant="h3" component="h1" sx={{ color: '#1A4399' }}> | |||||
| <FormattedMessage id="becomeNewPersonalUser" /> | <FormattedMessage id="becomeNewPersonalUser" /> | ||||
| </Typography> | </Typography> | ||||
| </div> | </div> | ||||
| @@ -1182,7 +1182,7 @@ const CustomFormWizard = (props) => { | |||||
| <Grid container spacing={2}> | <Grid container spacing={2}> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourPersonalInformation" /> | <FormattedMessage id="yourPersonalInformation" /> | ||||
| </Typography> | </Typography> | ||||
| {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary"> | ||||
| @@ -1192,14 +1192,14 @@ const CustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={12} > | <Grid item xs={12} md={12} > | ||||
| <Stack direction="row"> | <Stack direction="row"> | ||||
| <Typography variant="h5" color={theme.palette.grey[600]} sx={{ mr: 1 }}> | |||||
| <Typography variant="h5" component="h2" color={theme.palette.grey[600]} sx={{ mr: 1 }}> | |||||
| <FormattedMessage id="userIdDoc" /> | <FormattedMessage id="userIdDoc" /> | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="h5" name="preview-idDocType-1"> | |||||
| <Typography variant="h5" component="span" name="preview-idDocType-1"> | |||||
| {formik?.values?.idNo?.slice(0, 4)} | {formik?.values?.idNo?.slice(0, 4)} | ||||
| {/* {formik.values.idNo + "(" + formik.values.checkDigit + ")"} */} | {/* {formik.values.idNo + "(" + formik.values.checkDigit + ")"} */} | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="h5" name="preview-idDocType-2"> | |||||
| <Typography variant="h5" component="span" name="preview-idDocType-2"> | |||||
| {showComId ? formik?.values?.idNo?.slice(4) : "****"}{showComId ? '(' + formik.values.checkDigit + ')' : null} | {showComId ? formik?.values?.idNo?.slice(4) : "****"}{showComId ? '(' + formik.values.checkDigit + ')' : null} | ||||
| {/* {formik.values.idNo + "(" + formik.values.checkDigit + ")"} */} | {/* {formik.values.idNo + "(" + formik.values.checkDigit + ")"} */} | ||||
| </Typography> | </Typography> | ||||
| @@ -1219,10 +1219,10 @@ const CustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={6}> | <Grid item xs={12} md={6}> | ||||
| <Stack spacing={1} direction="row"> | <Stack spacing={1} direction="row"> | ||||
| <Typography variant="h5" color={theme.palette.grey[600]}> | |||||
| <Typography variant="h5" component="span" color={theme.palette.grey[600]}> | |||||
| <FormattedMessage id="userEnglishName" />: | <FormattedMessage id="userEnglishName" />: | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="h5" id="preview-enName-signup"> | |||||
| <Typography variant="h5" component="span" id="preview-enName-signup"> | |||||
| {formik.values.enName} | {formik.values.enName} | ||||
| </Typography> | </Typography> | ||||
| {iAmSmartData.enName ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>} | {iAmSmartData.enName ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>} | ||||
| @@ -1230,48 +1230,48 @@ const CustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={6}> | <Grid item xs={12} md={6}> | ||||
| <Stack spacing={1} direction="row"> | <Stack spacing={1} direction="row"> | ||||
| <Typography variant="h5" color={theme.palette.grey[600]}> | |||||
| <Typography variant="h5" component="span" color={theme.palette.grey[600]}> | |||||
| <FormattedMessage id="userChineseName" />: | <FormattedMessage id="userChineseName" />: | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="h5" id="preview-chName-signup"> | |||||
| <Typography variant="h5" component="span" id="preview-chName-signup"> | |||||
| {formik.values.chName} | {formik.values.chName} | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12}> | <Grid item xs={12}> | ||||
| <Stack spacing={1} direction="column"> | <Stack spacing={1} direction="column"> | ||||
| <Typography variant="h5" color={theme.palette.grey[600]}> | |||||
| <Typography variant="h5" component="span" color={theme.palette.grey[600]}> | |||||
| <FormattedMessage id="formAddress" />: | <FormattedMessage id="formAddress" />: | ||||
| </Typography> | </Typography> | ||||
| <Stack spacing={1} direction="column"> | <Stack spacing={1} direction="column"> | ||||
| <Typography variant="h5" id="preview-address1-signup"> | |||||
| <Typography variant="h5" component="span" id="preview-address1-signup"> | |||||
| {formik.values.address1} | {formik.values.address1} | ||||
| </Typography> | </Typography> | ||||
| {formik.values.address2 != null ? | {formik.values.address2 != null ? | ||||
| <Typography variant="h5" id="preview-address2-signup"> | |||||
| <Typography variant="h5" component="span" id="preview-address2-signup"> | |||||
| {formik.values.address2} | {formik.values.address2} | ||||
| </Typography> | </Typography> | ||||
| : null} | : null} | ||||
| {formik.values.address3 != null ? | {formik.values.address3 != null ? | ||||
| <Typography variant="h5" id="preview-address3-signup"> | |||||
| <Typography variant="h5" component="span" id="preview-address3-signup"> | |||||
| {formik.values.address3} | {formik.values.address3} | ||||
| </Typography> | </Typography> | ||||
| : null} | : null} | ||||
| {selectedAddress5.type === "hongKong" ? | {selectedAddress5.type === "hongKong" ? | ||||
| <Stack direction="column"> | <Stack direction="column"> | ||||
| {/* <Typography variant="h5" color={theme.palette.grey[600]} id="preview-address4-signup"> | |||||
| {/* <Typography variant="h5" component="span" color={theme.palette.grey[600]} id="preview-address4-signup"> | |||||
| <FormattedMessage id="region" />: | <FormattedMessage id="region" />: | ||||
| </Typography> */} | </Typography> */} | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| {!selectedAddress4 ? "" : intl.formatMessage({ id: selectedAddress4.type })} | {!selectedAddress4 ? "" : intl.formatMessage({ id: selectedAddress4.type })} | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| : null} | : null} | ||||
| <Stack direction="column"> | <Stack direction="column"> | ||||
| {/* <Typography variant="h5" color={theme.palette.grey[600]} id="preview-address5-signup"> | |||||
| {/* <Typography variant="h5" component="span" color={theme.palette.grey[600]} id="preview-address5-signup"> | |||||
| <FormattedMessage id="regionOrCountry" />: | <FormattedMessage id="regionOrCountry" />: | ||||
| </Typography> */} | </Typography> */} | ||||
| <Typography variant="h5"> | |||||
| <Typography variant="h5" component="span"> | |||||
| {intl.formatMessage({ id: selectedAddress5.type })} | {intl.formatMessage({ id: selectedAddress5.type })} | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -1280,27 +1280,27 @@ const CustomFormWizard = (props) => { | |||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} mt={1} mb={1}> | <Grid item xs={12} mt={1} mb={1}> | ||||
| <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}> | ||||
| <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}> | |||||
| <Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}> | |||||
| <FormattedMessage id="yourContact" /> | <FormattedMessage id="yourContact" /> | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={12}> | <Grid item xs={12} md={12}> | ||||
| <Stack spacing={1} direction="row"> | <Stack spacing={1} direction="row"> | ||||
| <Typography variant="h5" color={theme.palette.grey[600]}> | |||||
| <Typography variant="h5" component="span" color={theme.palette.grey[600]}> | |||||
| <FormattedMessage id="userContactEmail" />: | <FormattedMessage id="userContactEmail" />: | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="h5" id="preview-email-signup"> | |||||
| <Typography variant="h5" component="span" id="preview-email-signup"> | |||||
| {formik.values.email} | {formik.values.email} | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| </Grid> | </Grid> | ||||
| <Grid item xs={12} md={6}> | <Grid item xs={12} md={6}> | ||||
| <Stack spacing={1} direction="row"> | <Stack spacing={1} direction="row"> | ||||
| <Typography variant="h5" color={theme.palette.grey[600]}> | |||||
| <Typography variant="h5" component="span" color={theme.palette.grey[600]}> | |||||
| <FormattedMessage id="userContactNumber" />: | <FormattedMessage id="userContactNumber" />: | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="h5" id="preview-phone-signup"> | |||||
| <Typography variant="h5" component="span" id="preview-phone-signup"> | |||||
| +{formik.values.phoneCountryCode} {formik.values.phone} | +{formik.values.phoneCountryCode} {formik.values.phone} | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -1308,10 +1308,10 @@ const CustomFormWizard = (props) => { | |||||
| {formik.values.faxCountryCode != "" && formik.values.fax != "" ? | {formik.values.faxCountryCode != "" && formik.values.fax != "" ? | ||||
| <Grid item xs={12} md={6}> | <Grid item xs={12} md={6}> | ||||
| <Stack spacing={1} direction="row"> | <Stack spacing={1} direction="row"> | ||||
| <Typography variant="h5" color={theme.palette.grey[600]}> | |||||
| <Typography variant="h5" component="span" color={theme.palette.grey[600]}> | |||||
| <FormattedMessage id="userFaxNumber" />: | <FormattedMessage id="userFaxNumber" />: | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="h5" id="preview-fax-signup"> | |||||
| <Typography variant="h5" component="span" id="preview-fax-signup"> | |||||
| +{formik.values.faxCountryCode} {formik.values.fax} | +{formik.values.faxCountryCode} {formik.values.fax} | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| @@ -1331,13 +1331,13 @@ const CustomFormWizard = (props) => { | |||||
| // SUCCESS page | // SUCCESS page | ||||
| <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | ||||
| <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} /> | <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} /> | ||||
| <Typography display="inline" variant="h4"> | |||||
| <Typography display="inline" variant="h4" component="span"> | |||||
| <FormattedMessage id="registerSubmitted" /> | <FormattedMessage id="registerSubmitted" /> | ||||
| </Typography> | </Typography> | ||||
| <Typography display="inline" variant="h4"> | |||||
| <Typography display="inline" variant="h4" component="span"> | |||||
| <FormattedMessage id="emailSent" /> | <FormattedMessage id="emailSent" /> | ||||
| </Typography> | </Typography> | ||||
| <Button variant="outlined" component={Link} to="/login" ><Typography variant="h5"> | |||||
| <Button variant="outlined" component={Link} to="/login" ><Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="backToLogin" /> | <FormattedMessage id="backToLogin" /> | ||||
| </Typography></Button> | </Typography></Button> | ||||
| </Stack> | </Stack> | ||||
| @@ -1346,10 +1346,10 @@ const CustomFormWizard = (props) => { | |||||
| <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> | ||||
| {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */} | {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */} | ||||
| <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} /> | <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} /> | ||||
| <Typography display="inline" variant="h4"> | |||||
| <Typography display="inline" variant="h4" component="span"> | |||||
| <FormattedMessage id="registerFail" /> | <FormattedMessage id="registerFail" /> | ||||
| </Typography> | </Typography> | ||||
| <Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="h5"> | |||||
| <Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="h5" component="span"> | |||||
| <FormattedMessage id="backToLogin" /> | <FormattedMessage id="backToLogin" /> | ||||
| </Typography></Button> | </Typography></Button> | ||||
| </Stack> | </Stack> | ||||
+ 2
- 2
src/pages/dashboard/Public/Notice.js
Datei anzeigen
| @@ -35,10 +35,10 @@ const SearchDemandNoteForm = (props) => { | |||||
| <Typography component="h3" variant="h5" align="justify"> | <Typography component="h3" variant="h5" align="justify"> | ||||
| {locale === 'en' ? item.subjectEng : locale === 'zh-HK' ? item.subjectCht : item.subjectChs} | {locale === 'en' ? item.subjectEng : locale === 'zh-HK' ? item.subjectCht : item.subjectChs} | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="subtitle2" sx={{ color: '#000' }} align="justify"> | |||||
| <Typography component="span" variant="subtitle2" sx={{ color: '#000' }} align="justify"> | |||||
| {DateUtils.dateValue(item.announceDate)} | {DateUtils.dateValue(item.announceDate)} | ||||
| </Typography> | </Typography> | ||||
| <Typography component="h4" variant="h6" sx={{ pt: 1, fontWeight: 400 }} align="justify"> | |||||
| <Typography component="span" variant="h6" sx={{ pt: 1, fontWeight: 400 }} align="justify"> | |||||
| {locale === 'en' ? item.contentEng : locale === 'zh-HK' ? item.contentCht : item.contentChs} | {locale === 'en' ? item.contentEng : locale === 'zh-HK' ? item.contentCht : item.contentChs} | ||||
| </Typography> | </Typography> | ||||
| <Divider sx={{ pt: 1 }} /> | <Divider sx={{ pt: 1 }} /> | ||||
+ 1
- 1
src/pages/dashboard/Public/index.js
Datei anzeigen
| @@ -126,7 +126,7 @@ const DashboardDefault = () => { | |||||
| > | > | ||||
| {item.subject} | {item.subject} | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="subtitle2" sx={{ color: '#000' }} align="justify"> | |||||
| <Typography component="span" variant="subtitle2" sx={{ color: '#000' }} align="justify"> | |||||
| {DateUtils.datetimeStr(item.sentDate)} | {DateUtils.datetimeStr(item.sentDate)} | ||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||