Merge branch 'New_Enhancement' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI into New_Enhancement

src/layout/MainLayout/Header/index.js

@@ -507,6 +507,13 @@ function Header(props) {
           </Typography>
         </Link>
       </li>
+      <li>
+        <Link className="login" to={'/userGuidePub'}>
+          <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>
+            <FormattedMessage id="userGuide" />
+          </Typography>
+        </Link>
+      </li>
       <li>
         <Link className="login" to='/login'>
           <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>

src/pages/extra-pages/UserMenuPub/index.js

@@ -80,7 +80,7 @@ const UserMenu = () => {
                         }}>
 
                             <p>
-                                <FormattedMessage id="userGuideDes" />
+                                
                                 <table style={tableStyle}>
                                     <tr>
                                         <th style={cellStyle} width="70%"> <FormattedMessage id="fileName" /></th>
@@ -90,106 +90,107 @@ const UserMenu = () => {
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide1" />,
-                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/01 - Account Activation.pdf",
-                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/01c - Account Activation.pdf",
-                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/01sc - Account Activation.pdf",
-                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/01 - Account Activation.pdf",
-                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/01c - Account Activation.pdf",
-                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/01sc - Account Activation.pdf"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/01 - Create account - c 1.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/01c - Create account - c 1.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/01sc - Create account - c 1.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/01 - Create account - p 1.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/01c - Create account - p 1.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/01sc - Create account - p 1.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide2" />,
-                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/02 - Login.pdf",
-                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/02c - Login.pdf",
-                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/02sc - Login.pdf",
-                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/02 - Login.pdf",
-                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/02c - Login.pdf",
-                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/02sc - Login.pdf"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/02 - Login - c 1.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/02c - Login - c 1.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/02sc - Login - c 1.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/02 - Login - p 1.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/02c - Login - p 1.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/02sc - Login - p 1.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide3" />,
-                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/03 - Application for publishing a Public Notice in the Gazette.pdf",
-                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/03c - Application for publishing a Public Notice in the Gazette.pdf",
-                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/03sc - Application for publishing a Public Notice in the Gazette.pdf",
-                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/03 - Application for publishing a Public Notice in the Gazette.pdf",
-                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/03c - Application for publishing a Public Notice in the Gazette.pdf",
-                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/03sc - Application for publishing a Public Notice in the Gazette.pdf"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/03 - Application for publishing a Public Notice in the Gazette - c 1.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/03c - Application for publishing a Public Notice in the Gazette - c 1.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/03sc - Application for publishing a Public Notice in the Gazette - c 1.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/03 - Application for publishing a Public Notice in the Gazette - p 1.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/03c - Application for publishing a Public Notice in the Gazette - p 1.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/03sc - Application for publishing a Public Notice in the Gazette - p 1.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide4" />,
-                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/04 - Proofreading reply (with correction).pdf",
-                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/04c - Proofreading reply (with correction).pdf",
-                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/04sc - Proofreading reply (with correction).pdf",
-                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/04 - Proofreading reply (with correction).pdf",
-                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/04c - Proofreading reply (with correction).pdf",
-                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/04sc - Proofreading reply (with correction).pdf"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/04 - Proofreading reply (with correction) - c 1.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/04c - Proofreading reply (with correction) - c 1.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/04c - Proofreading reply (with correction) - c 1.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/04 - Proofreading reply (with correction) - p 1.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/04c - Proofreading reply (with correction) - p 1.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/04c - Proofreading reply (with correction) - p 1.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide5" />,
-                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/05 - Proofreading reply (pass for printing).pdf",
-                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/05c - Proofreading reply (pass for printing).pdf",
-                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/05sc - Proofreading reply (pass for printing).pdf",
-                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/05 - Proofreading reply (pass for printing).pdf",
-                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/05c - Proofreading reply (pass for printing).pdf",
-                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/05sc - Proofreading reply (pass for printing).pdf"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/05 - Proofreading reply (pass for printing) - c 1.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/05c - Proofreading reply (pass for printing) - c 1.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/05c - Proofreading reply (pass for printing) - c 1.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/05 - Proofreading reply (pass for printing) - p 1.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/05c - Proofreading reply (pass for printing) - p 1.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/05c - Proofreading reply (pass for printing) - p 1.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide6" />,
-                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/06 - Cancellation of application for publishing a Public Notice in the Gazette.pdf",
-                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/06c - Cancellation of application for publishing a Public Notice in the Gazette.pdf",
-                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/06sc - Cancellation of application for publishing a Public Notice in the Gazette.pdf",
-                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/06 - Cancellation of application for publishing a Public Notice in the Gazette.pdf",
-                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/06c - Cancellation of application for publishing a Public Notice in the Gazette.pdf",
-                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/06sc - Cancellation of application for publishing a Public Notice in the Gazette.pdf"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/06 - Cancellation of application for publishing a Public Notice in the Gazette - c 1.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/06c - Cancellation of application for publishing a Public Notice in the Gazette - c 1.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/06c - Cancellation of application for publishing a Public Notice in the Gazette - c 1.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/06 - Cancellation of application for publishing a Public Notice in the Gazette - p 1.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/06c - Cancellation of application for publishing a Public Notice in the Gazette - p 1.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/06c - Cancellation of application for publishing a Public Notice in the Gazette - p 1.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide7" />,
-                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/07 - Forgot password.pdf",
-                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/07c - Forgot password.pdf",
-                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/07sc - Forgot password.pdf",
-                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/07 - Forgot password.pdf",
-                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/07c - Forgot password.pdf",
-                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/07sc - Forgot password.pdf"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/07 - Forgot password - c 1.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/07c - Forgot password - c 1.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/07c - Forgot password - c 1.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/07 - Forgot password - p 1.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/07c - Forgot password - p 1.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/07c - Forgot password - p 1.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide8" />,
-                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/08 - Change password.pdf",
-                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/08c - Change password.pdf",
-                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/08sc - Change password.pdf",
-                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/08 - Change password.pdf",
-                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/08c - Change password.pdf",
-                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/08sc - Change password.pdf"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/08 - Change password - c 1.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/08c - Change password - c 1.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/08c - Change password - c 1.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/08 - Change password - p 1.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/08c - Change password - p 1.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/08c - Change password - p 1.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide9" />,
-                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/09 - Language of email notification.pdf",
-                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/09c - Language of email notification.pdf",
-                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/09sc - Language of email notification.pdf",
-                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/09 - Language of email notification.pdf",
-                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/09c - Language of email notification.pdf",
-                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/09sc - Language of email notification.pdf"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/09 - Language of email notification - c 1.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/09c - Language of email notification - c 1.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/09c - Language of email notification - c 1.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/09 - Language of email notification - p 1.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/09c - Language of email notification - p 1.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/09c - Language of email notification - p 1.pdf"
                                     })}
 
                                     {getRow({
-                                        title: <FormattedMessage id="userGuide10" />,
-                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/10 - Download General Demand Note for making payment(s).pdf",
-                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/10c - Download General Demand Note for making payment(s).pdf",
-                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/10sc - Download General Demand Note for making payment(s).pdf",
-                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/10 - Download General Demand Note for making payment(s).pdf",
-                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/10c - Download General Demand Note for making payment(s).pdf",
-                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/10sc - Download General Demand Note for making payment(s).pdf"
+                                        title: <FormattedMessage id="userGuidePub10" />,
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/10 - Payment - c 1.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/10c - Payment - c 1.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/10c - Payment - c 1.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide-pub/eng/10 - Payment  - p 1.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide-pub/cht/10c - Payment  - p 1.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide-pub/chs/10c - Payment  - p 1.pdf"
                                     })}
 
-
+                                    
                                 </table>
+                                <FormattedMessage id="userGuidePubNote" />
                             </p>
                         </div>
                     </Grid>

src/translations/en.json

@@ -572,6 +572,7 @@
 
   "userGuide": "User Guide",
   "userGuideDes":"User Guide (for users granted with the arrangement to make payment of the gazette fees after the publication of the public notices in the Gazette)",
+  "userGuidePubNote":"Note: This user guide is provided for reference only, and subject to updates and revisions without notice.  Images contained in this guide are intended for illustration only.",
 
   "userGuide1":"1. Account Activation",
   "userGuide2":"2. Login",
@@ -583,6 +584,7 @@
   "userGuide8":"8. Change password",
   "userGuide9":"9. Language of email communication",
   "userGuide10":"10. Download General Demand Note for making payment(s)",
+  "userGuidePub10":"10. Payment",
 
   "Dashboard": "Dashboard",
   "event": "Event"

src/translations/zh-CN.json

@@ -568,6 +568,7 @@
 
   "userGuide":"使用者指南",
   "userGuideDes":"使用者指南(为已获安排在宪报刊登公共启事后才须缴付款项的用户而设)",
+  "userGuidePubNote":"注意：本使用者指南仅供参考，如有更新和修订，恕不另行通知。指南内的图像只供参考之用。",
 
   "userGuide1":"1. 启动登记账号",
   "userGuide2":"2. 登录系统",
@@ -579,6 +580,7 @@
   "userGuide8":"8. 更改密码",
   "userGuide9":"9. 电邮通讯语言",
   "userGuide10":"10. 下载缴款单缴付款项",
+  "userGuidePub10":"10. 付款",
 
   "Dashboard": "仪表板",
   "event": "活动"

src/translations/zh-HK.json

@@ -569,6 +569,7 @@
 
   "userGuide": "使用者指南",
   "userGuideDes":"使用者指南(為已獲安排在憲報刊登公共啟事後才須繳付款項的用戶而設)",
+  "userGuidePubNote":"注意：本使用者指南僅供參考，如有更新和修訂，恕不另行通知。指南內的圖像只供參考之用。",
 
   "userGuide1":"1. 啟動登記帳號",
   "userGuide2":"2. 登入系統",
@@ -580,6 +581,7 @@
   "userGuide8":"8. 更改密碼",
   "userGuide9":"9. 電郵通訊語言",
   "userGuide10":"10. 下載繳款單繳付款項",
+  "userGuidePub10":"10. 付款",
 
   "Dashboard": "儀表板",
   "event": "活動"