Commit df0adb64 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '404-ct-instructions' into 'main'

CT instructions

Closes #404

See merge request grin-global/grin-global-ui!396
parents 5a91b811 82a6a29f
......@@ -78,6 +78,8 @@
"toDate": "To date",
"toDateExclusive": "To date (exclusive)",
"true": "True",
"tick": "Tick",
"untick": "Untick",
"loadingData": null,
"invalidCoordinates": "Invalid coordinates",
"missing": "Not specified",
......
......@@ -165,7 +165,10 @@
"loadTaxonomy": "Taxonomy",
"loadTaxonomyText": "Refresh USDA Taxonomy data",
"systemAlerts": "System alerts",
"noSystemAlerts": "No system alerts"
"noSystemAlerts": "No system alerts",
"curatorToolConfig": "Curator Tool configuration",
"curatorToolSubtitle": "Connect your CT to this server by adding a new server",
"curatorToolMessage": "<0>\n<0>On the login screen click \"Edit server list\".</0>\n<1>Click \"Add new\" and:</1>\n<2>\n<0>\n<0>Set \"List display name\" to <1>GG-CE</1>.</0>\n<1><0>{{SSLCheck}}</0> the \"Use SSL\" checkbox.</1>\n<2>Set \"Server name\" to <1>{{hostname}}{{port}}</1></2>\n<3>Do <1>NOT</1> click \"Test Server Address\"</3>\n<4>Hit \"OK\" to close the Server list dialog.</4>\n</0>\n</2>\n<3>Back in the login screen, select \"GG-CE\" from the \"Connect to\" dropdown.</3>\n<4>Login with your username and password.</4>\n</0>"
}
}
},
......
......@@ -6,7 +6,7 @@ import { AdminAlertsService, SystemStatusService } from '@gringlobal-ce/client/s
import { Properties, PropertiesItem } from '@gringlobal-ce/client/ui/common/Properties';
import { Card, CardContent, CardHeader, Typography, WithStyles, withStyles } from '@material-ui/core';
import Grid from '@material-ui/core/Grid';
import { WithTranslation, withTranslation } from 'react-i18next';
import { Trans, WithTranslation, withTranslation } from 'react-i18next';
import Number from '@gringlobal-ce/client/ui/common/Number';
import PageTitle from '@gringlobal-ce/client/ui/common/PageTitle';
import { Alert } from '@material-ui/lab';
......@@ -22,6 +22,12 @@ const styles = (theme) => ({
display: 'flex' as const,
flexDirection: 'column' as const,
gap: '1rem'
},
ctMessage: {
margin: 0,
'& li': {
lineHeight: '1.5em',
}
}
});
......@@ -71,6 +77,8 @@ class AdministrationDashboard extends React.Component<PropsFromRedux & WithTrans
const { t, classes, apiUrl } = this.props;
const { systemStatus, alertMessages } = this.state;
const apiUrlTemplate = new URL(apiUrl)
return (
<>
<PageTitle title={ t('admin.p.status.title') }/>
......@@ -160,6 +168,33 @@ class AdministrationDashboard extends React.Component<PropsFromRedux & WithTrans
</Grid>
}
<Grid item xs={12}>
<Card className={ classes.card }>
<CardHeader title={ t('admin.p.status.curatorToolConfig') }
subheader={ <div>{ t('admin.p.status.curatorToolSubtitle') }</div> }
/>
<CardContent>
<Trans i18nKey="admin.p.status.curatorToolMessage" shouldUnescape>
<ul className={ classes.ctMessage }>
<li>On the login screen click &quot;Edit server list&quot;.</li>
<li>Click &quot;Add new&quot; and:</li>
<li style={{ listStyleType: 'none' }}>
<ol>
<li>Set &quot;List display name&quot; to <strong>GG-CE</strong>.</li>
<li><strong>{{SSLCheck: apiUrlTemplate.protocol === 'https:' ? t('common:label.tick') : t('common:label.untick')}}</strong> the &quot;Use SSL&quot; checkbox.</li>
<li>Set &quot;Server name&quot; to <strong>{{hostname: apiUrlTemplate.hostname}}{{port: apiUrlTemplate.port ? `:${apiUrlTemplate.port}` : ''}}</strong></li>
<li>Do <strong>NOT</strong> click &quot;Test Server Address&quot;</li>
<li>Hit &quot;OK&quot; to close the Server list dialog.</li>
</ol>
</li>
<li>Back in the login screen, select &quot;GG-CE&quot; from the &quot;Connect to&quot; dropdown.</li>
<li>Login with your username and password.</li>
</ul>
</Trans>
</CardContent>
</Card>
</Grid>
</Grid>
</div>
</>
......
......@@ -165,7 +165,10 @@
"loadTaxonomy": "Taxonomy",
"loadTaxonomyText": "Refresh USDA Taxonomy data",
"systemAlerts": "System alerts",
"noSystemAlerts": "No system alerts"
"noSystemAlerts": "No system alerts",
"curatorToolConfig": "Curator Tool configuration",
"curatorToolSubtitle": "Connect your CT to this server by adding a new server",
"curatorToolMessage": "<0>\n<0>On the login screen click \"Edit server list\".</0>\n<1>Click \"Add new\" and:</1>\n<2>\n<0>\n<0>Set \"List display name\" to <1>GG-CE</1>.</0>\n<1><0>{{SSLCheck}}</0> the \"Use SSL\" checkbox.</1>\n<2>Set \"Server name\" to <1>{{hostname}}{{port}}</1></2>\n<3>Do <1>NOT</1> click \"Test Server Address\"</3>\n<4>Hit \"OK\" to close the Server list dialog.</4>\n</0>\n</2>\n<3>Back in the login screen, select \"GG-CE\" from the \"Connect to\" dropdown.</3>\n<4>Login with your username and password.</4>\n</0>"
}
}
},
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment