@@ -129,7 +129,7 @@ const Index = () => { | |||||
</div> | </div> | ||||
</Grid> | </Grid> | ||||
<Grid item xs={12} width="100%"> | <Grid item xs={12} width="100%"> | ||||
<Button title="Back" sx={{ ml: 6, mt: 2.5 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/emailTemplate") }}> | |||||
<Button title="Back" sx={{ ml: 6, mt: 2.5 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate(-1) }}> | |||||
<ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} /> | <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} /> | ||||
</Button> | </Button> | ||||
</Grid> | </Grid> | ||||
@@ -126,7 +126,7 @@ const OrganizationDetailPage = () => { | |||||
isLoading ? | isLoading ? | ||||
<LoadingComponent /> | <LoadingComponent /> | ||||
: | : | ||||
<Grid container sx={{ backgroundColor: "backgroundColor.default" }}> | |||||
<Grid container direction="column" sx={{minHeight: '90vh',backgroundColor:isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }}> | |||||
<Grid item xs={12}> | <Grid item xs={12}> | ||||
<div style={BackgroundHead}> | <div style={BackgroundHead}> | ||||
<Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> | <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> | ||||
@@ -143,7 +143,7 @@ const OrganizationDetailPage = () => { | |||||
</div> | </div> | ||||
</Grid> | </Grid> | ||||
<Grid item xs={12}> | <Grid item xs={12}> | ||||
<Button aria-label={intl.formatMessage({id: 'back'})} title="Back" sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/org") }}> | |||||
<Button aria-label={intl.formatMessage({id: 'back'})} title="Back" sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate(-1)}}> | |||||
<ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} /> | <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} /> | ||||
</Button> | </Button> | ||||
</Grid> | </Grid> | ||||
@@ -1,6 +1,6 @@ | |||||
// material-ui | // material-ui | ||||
import { | import { | ||||
CButton, | |||||
Button, | |||||
Grid, TextField, | Grid, TextField, | ||||
Typography, | Typography, | ||||
Autocomplete, | Autocomplete, | ||||
@@ -19,7 +19,7 @@ const PaymentDetails = Loadable(React.lazy(() => import('./PaymentDetails'))); | |||||
const DataGrid = Loadable(React.lazy(() => import('./DataGrid'))); | const DataGrid = Loadable(React.lazy(() => import('./DataGrid'))); | ||||
import ForwardIcon from '@mui/icons-material/Forward'; | import ForwardIcon from '@mui/icons-material/Forward'; | ||||
import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' | import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' | ||||
import {FormattedMessage} from "react-intl"; | |||||
import {FormattedMessage,useIntl} from "react-intl"; | |||||
const BackgroundHead = { | const BackgroundHead = { | ||||
backgroundImage: `url(${titleBackgroundImg})`, | backgroundImage: `url(${titleBackgroundImg})`, | ||||
width: '100%', | width: '100%', | ||||
@@ -101,7 +101,7 @@ const Index = () => { | |||||
</Stack> | </Stack> | ||||
</div> | </div> | ||||
</Grid> | </Grid> | ||||
<Grid item xs={12} width={{xs:"90%", sm:"90%", md:"60%", lg:"60%"}}> | |||||
<Grid item xs={12} width={{xs:"90%", sm:"90%", md:"90%", lg:"80%"}}> | |||||
<Button | <Button | ||||
aria-label={intl.formatMessage({id: 'back'})} | aria-label={intl.formatMessage({id: 'back'})} | ||||
title={intl.formatMessage({id: 'back'})} | title={intl.formatMessage({id: 'back'})} | ||||
@@ -120,7 +120,7 @@ const UserMaintainPage_Individual = () => { | |||||
isLoading ? | isLoading ? | ||||
<LoadingComponent /> | <LoadingComponent /> | ||||
: | : | ||||
<Grid container sx={{ backgroundColor: 'backgroundColor.default', maxWidth:'100%' }}> | |||||
<Grid container direction="column" sx={{minHeight: '90vh', backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff', maxWidth:'100%' }}> | |||||
<Grid item xs={12}> | <Grid item xs={12}> | ||||
<div style={BackgroundHead}> | <div style={BackgroundHead}> | ||||
<Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> | <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> | ||||
@@ -139,7 +139,7 @@ const UserMaintainPage_Individual = () => { | |||||
<Grid item xs={12}> | <Grid item xs={12}> | ||||
<Button title="Back" | <Button title="Back" | ||||
sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} | sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} | ||||
variant="outlined" onClick={() => { navigate("/indUser") }} | |||||
variant="outlined" onClick={() => { navigate(-1) }} | |||||
> | > | ||||
<ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} /> | <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} /> | ||||
</Button> | </Button> | ||||
@@ -181,7 +181,7 @@ const UserMaintainPage_Organization = () => { | |||||
isLoading ? | isLoading ? | ||||
<LoadingComponent /> | <LoadingComponent /> | ||||
: | : | ||||
<Grid container sx={{ backgroundColor: "backgroundColor.default" }}> | |||||
<Grid container sx={{ backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }}> | |||||
<Grid item xs={12}> | <Grid item xs={12}> | ||||
<div style={BackgroundHead}> | <div style={BackgroundHead}> | ||||
<Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> | <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center"> | ||||
@@ -198,7 +198,7 @@ const UserMaintainPage_Organization = () => { | |||||
</div> | </div> | ||||
</Grid> | </Grid> | ||||
<Grid item xs={12}> | <Grid item xs={12}> | ||||
<Button title="Back" sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/orgUser") }}> | |||||
<Button title="Back" sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate(-1) }}> | |||||
<ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} /> | <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} /> | ||||
</Button> | </Button> | ||||
</Grid> | </Grid> | ||||
@@ -42,6 +42,10 @@ export const PNSPS_BUTTON_THEME = createTheme({ | |||||
exportExcel:{ | exportExcel:{ | ||||
main: '#6A8B9E', | main: '#6A8B9E', | ||||
contrastText: '#FFFFFF', | contrastText: '#FFFFFF', | ||||
}, | |||||
success:{ | |||||
main: '#6A8B9E', | |||||
contrastText: '#FFFFFF', | |||||
} | } | ||||
}, | }, | ||||
components: { | components: { | ||||