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

src/layout/MainLayout/Header/index.js

@@ -135,14 +135,14 @@ function Header(props) {
           </ul>
         </li>
         <li>
-          <Link className="emailTemplate" to='/emailTemplate'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>Email Template</Typography></Link>
-        </li>
-        <li>
-          <Link className="client" ><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>Setting</Typography><KeyboardArrowDownIcon sx={{ fontSize: '1.0rem' }} /></Link>
+          <Link className="client" ><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>Settings</Typography><KeyboardArrowDownIcon sx={{ fontSize: '1.0rem' }} /></Link>
           <ul className='dropdown'>
             <li>
               <Link className="userProfileGld" to='/user/profile'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>Users Profile</Typography></Link>
             </li>
+            <li>
+              <Link className="emailTemplate" to='/emailTemplate'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>Email Template</Typography></Link>
+            </li>
             <li>
               <Link className="systemSetting" to='/setting/sys'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>System Setting</Typography></Link>
             </li>

src/pages/DemandNote/Search/SearchForm.js

@@ -93,7 +93,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                     {/*row 1*/}
                     <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1, ml:3,mb:2.5}}>
                         <Typography variant="pnspsFormHeader" >
-                            Search Form
+                            Search
                         </Typography>
                     </Grid>
                     {/*row 2*/}

src/pages/Organization/SearchPage/OrganizationSearchForm.js

@@ -67,7 +67,7 @@ const OrganizationSearchForm = ({ applySearch }) => {
                     {/*row 1*/}
                     <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
                         <Typography variant="pnspsFormHeader" >
-                            Search Form
+                            Search
                         </Typography>
                     </Grid>
                     {/*row 2*/}

src/pages/Payment/Search_GLD/SearchForm.js

@@ -50,7 +50,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                     {/*row 1*/}
                     <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
                         <Typography variant="pnspsFormHeader" >
-                            Search Form
+                            Search
                         </Typography>
                     </Grid>
                     {/*row 2*/}

src/pages/Proof/Search_GLD/SearchForm.js

@@ -97,7 +97,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                     {/*row 1*/}
                     <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
                         <Typography variant="pnspsFormHeader" >
-                            Search Form
+                            Search
                         </Typography>
                     </Grid>
 

src/pages/PublicNotice/Search_GLD/SearchForm.js

@@ -95,7 +95,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                     {/*row 1*/}
                     <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:marginBottom}}>
                         <Typography variant="pnspsFormHeader" >
-                            Search Form
+                            Search
                         </Typography>
                     </Grid>
                     {/*row 2*/}

src/pages/User/SearchPage/UserSearchForm.js

@@ -82,7 +82,7 @@ const UserSearchForm = ({ applySearch }) => {
                     {/*row 1*/}
                     <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
                         <Typography variant="pnspsFormHeader" >
-                            Search Form (GLD User)
+                            Search
                         </Typography>
                     </Grid>
                     {/*row 2*/}

src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js

@@ -53,7 +53,7 @@ const UserSearchForm_Individual = ({ applySearch }) => {
                     {/*row 1*/}
                     <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
                         <Typography variant="pnspsFormHeader" >
-                            Search Form
+                            Search
                         </Typography>
                     </Grid>
                     {/*row 2*/}

src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js

@@ -58,7 +58,7 @@ const UserSearchForm_Organization = ({applySearch}) => {
                     {/*row 1*/}
                     <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
                         <Typography variant="pnspsFormHeader" >
-                            Search Form
+                            Search
                         </Typography>
                     </Grid>
                     {/*row 2*/}

src/pages/pnspsUserGroupSearchPage/UserGroupSearchForm.js

@@ -42,7 +42,7 @@ const UserGroupSearchForm = ({ applySearch }) => {
                     {/*row 1*/}
                     <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
                         <Typography variant="pnspsFormHeader" >
-                            Search Form
+                            Search
                         </Typography>
                     </Grid>
                     {/*row 2*/}

src/translations/en.json

@@ -55,7 +55,7 @@
   "publicNoticePaymentProofInfo": "Public Notice: Proofreading Information",
   "proofRecord": "Proof Record",
   "onlinePaymentHistory": "Online Payment History",
-  "setting": "Setting",
+  "setting": "Settings",
   "companyOrUserRecord": "Company/Institutional User Records",
   "welcomeMsg": "Good afternoon! Please select the required service.",
 

src/utils/ComboData.js

@@ -83,7 +83,7 @@ export const groupTitle = [
     { key: 3, labelCht: 'B - 公司條例', label: 'B - Companies Ordinance', title: 'Companies Ordinance',  type: 'B' }, 
     { key: 4, labelCht: 'C - 高等法院', label: 'C - High Court', title: 'High Court',  type: 'C' }, 
     { key: 5, labelCht: 'D - 通知', label: 'D - Notices', title: 'Notices',  type: 'D' },
-    { key: 6, labelCht: 'E - 其他', label: 'E - Miscellaneous (Companies)', title: 'Miscellaneous  (Companies)',  type: 'E' },
+    { key: 6, labelCht: 'E - 其他', label: 'E - Miscellaneous (Companies)', title: 'Miscellaneous (Companies)',  type: 'E' },
 ];
 
 export const proofPrice = [