diff --git a/packages/component-faraday-ui/src/AuthorCard.js b/packages/component-faraday-ui/src/AuthorCard.js
index 51230df5157b402f30fba0cf0be3e5399d116ba9..508e7207fac236485d363530bcf9e48e6285613e 100644
--- a/packages/component-faraday-ui/src/AuthorCard.js
+++ b/packages/component-faraday-ui/src/AuthorCard.js
@@ -39,16 +39,16 @@ const AuthorTitle = ({
) : (
<Fragment>
<IconButton
- icon="check-circle"
+ icon="x-circle"
iconSize={2}
- onClick={saveChanges}
- right={36}
+ onClick={toggleEditMode}
+ right={48}
top={15}
/>
<IconButton
- icon="x-circle"
+ icon="check-circle"
iconSize={2}
- onClick={toggleEditMode}
+ onClick={saveChanges}
right={8}
top={15}
/>
@@ -66,7 +66,7 @@ const AuthorTitle = ({
component={({ value, onChange }) => (
<Checkbox
checked={value}
- label="Set corresponding"
+ label="Corresponding"
onChange={onChange}
value={value}
/>
@@ -242,6 +242,9 @@ const Root = styled.div`
${H3} {
margin: 0;
margin-right: ${th('gridUnit')};
+ & + div div[role='alert'] {
+ margin-top: 0;
+ }
}
`
// #endregion
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js
index 3d139b5c248697eef3af4f9e47aa167485d8b7df..1e2661c510f0245c54c264b2471cd5c163276120 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js
@@ -1,5 +1,5 @@
import React, { Fragment } from 'react'
-import { Text, FileItem, Item, Row } from 'pubsweet-component-faraday-ui'
+import { ManuscriptFileSection } from 'pubsweet-component-faraday-ui'
import { withFilePreview, withFileDownload } from '../helpers'
@@ -10,84 +10,27 @@ const ManuscriptFileList = ({
...rest
}) => (
<Fragment>
- {!!manuscripts.length && (
- <Fragment>
- <Text labelLine mb={1} mt={1}>
- MAIN MANUSCRIPT
- </Text>
- <Row justify="flex-start" mb={1}>
- {manuscripts.map(file => (
- <Item
- alignItems="flex-start"
- flex={0}
- key={file.id}
- mr={1}
- vertical
- >
- <FileItem
- item={file}
- onDownload={downloadFile}
- onPreview={previewFile}
- {...rest}
- mb={1}
- />
- </Item>
- ))}
- </Row>
- </Fragment>
- )}
- {!!supplementary.length && (
- <Fragment>
- <Text labelLine mb={1} mt={2}>
- SUPPLEMENTARY FILES
- </Text>
- <Row justify="flex-start" mb={1}>
- {supplementary.map(file => (
- <Item
- alignItems="flex-start"
- flex={0}
- key={file.id}
- mr={1}
- vertical
- >
- <FileItem
- item={file}
- onDownload={downloadFile}
- onPreview={previewFile}
- {...rest}
- mb={1}
- />
- </Item>
- ))}
- </Row>
- </Fragment>
- )}
- {!!coverLetter.length && (
- <Fragment>
- <Text labelLine mb={1} mt={2}>
- COVER LETTER
- </Text>
- <Row justify="flex-start" mb={1}>
- {coverLetter.map(file => (
- <Item
- alignItems="flex-start"
- flex={0}
- key={file.id}
- mr={1}
- vertical
- >
- <FileItem
- item={file}
- onDownload={downloadFile}
- onPreview={previewFile}
- {...rest}
- mb={1}
- />
- </Item>
- ))}
- </Row>
- </Fragment>
- )}
+ <ManuscriptFileSection
+ label="MAIN MANUSCRIPT"
+ list={manuscripts}
+ onDownload={downloadFile}
+ onPreview={previewFile}
+ {...rest}
+ />
+ <ManuscriptFileSection
+ label="SUPPLEMENTARY FILES"
+ list={supplementary}
+ onDownload={downloadFile}
+ onPreview={previewFile}
+ {...rest}
+ />
+ <ManuscriptFileSection
+ label="COVER LETTER"
+ list={coverLetter}
+ onDownload={downloadFile}
+ onPreview={previewFile}
+ {...rest}
+ />
</Fragment>
)
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileSection.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileSection.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b0976d54a175c262de3880e92097ee97306adb1
--- /dev/null
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileSection.js
@@ -0,0 +1,29 @@
+import React, { Fragment } from 'react'
+import { Text, FileItem, Item, Row } from 'pubsweet-component-faraday-ui'
+
+const ManuscriptFileSection = ({ list = [], label = '', ...rest }) => (
+ <Fragment>
+ {!!list.length && (
+ <Fragment>
+ <Text labelLine mb={1} mt={1}>
+ {label}
+ </Text>
+ <Row justify="flex-start" mb={1}>
+ {list.map(file => (
+ <Item
+ alignItems="flex-start"
+ flex={0}
+ key={file.id}
+ mr={1}
+ vertical
+ >
+ <FileItem item={file} {...rest} mb={1} />
+ </Item>
+ ))}
+ </Row>
+ </Fragment>
+ )}
+ </Fragment>
+)
+
+export default ManuscriptFileSection
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileSection.md b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileSection.md
new file mode 100644
index 0000000000000000000000000000000000000000..5435a77649f0bc8ef5210ef6f16e6f398d2a5324
--- /dev/null
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileSection.md
@@ -0,0 +1,28 @@
+Manuscript file section that appears in ManuscriptFilesList
+
+```js
+const files = {
+ supplementary: [
+ {
+ id:
+ '8dca903a-05b9-45ab-89b9-9cb99a9a29c6/02db6c5e-2938-45ac-a5ee-67ae63919bb2',
+ name: 'Supplementary File 1.jpg',
+ size: 59621,
+ originalName: 'Supplementary File 1.jpg',
+ },
+ {
+ id:
+ '8dca903a-05b9-45ab-89b9-9cb99a9a29c6/5e69e3d9-7f9d-4e8d-b649-6e6a45658d75',
+ name: 'Supplementary File 2.docx',
+ size: 476862,
+ originalName: 'Supplementary File 2.docx',
+ },
+ ]
+}
+;<ManuscriptFileSection
+ list={files.supplementary}
+ label="Supplementary files"
+ onDownload={() => alert('downloading')}
+ onPreview={() => alert('No preview')}
+/>
+```
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/index.js b/packages/component-faraday-ui/src/manuscriptDetails/index.js
index 42416b39d677f99e55a4c55fe0f644e1dfb06378..85b997fa07bced9f74be3d428c2c80772d12f365 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/index.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/index.js
@@ -3,5 +3,6 @@ export { default as ManuscriptVersion } from './ManuscriptVersion'
export { default as ManuscriptHeader } from './ManuscriptHeader'
export { default as ManuscriptMetadata } from './ManuscriptMetadata'
export { default as ManuscriptFileList } from './ManuscriptFileList'
+export { default as ManuscriptFileSection } from './ManuscriptFileSection'
export { default as ManuscriptAssignHE } from './ManuscriptAssignHE'
export { default as ManuscriptEicDecision } from './ManuscriptEicDecision'
diff --git a/packages/component-wizard/src/components/StepOne.js b/packages/component-wizard/src/components/StepOne.js
index fb43bb706eea7dcafe919933553a2292dc8da98a..cf6f402db41ab98660af3f7dad40c4fddcc28575 100644
--- a/packages/component-wizard/src/components/StepOne.js
+++ b/packages/component-wizard/src/components/StepOne.js
@@ -88,6 +88,9 @@ export default StepOne
const RootCheckbox = styled.div.attrs({
className: 'custom-checkbox',
})`
+ + div[role='alert'] {
+ margin-top: 0;
+ }
& label {
margin-bottom: calc(${th('gridUnit')} / 2);
& span {
diff --git a/packages/component-wizard/src/components/SubmissionWizard.js b/packages/component-wizard/src/components/SubmissionWizard.js
index 33cf84cff81ee5fbbdc1c94671086231741af789..eba2781dbe081d7a1b792f0e32802bb5a2ae9804 100644
--- a/packages/component-wizard/src/components/SubmissionWizard.js
+++ b/packages/component-wizard/src/components/SubmissionWizard.js
@@ -73,13 +73,11 @@ const Wizard = ({
<Spinner />
) : (
<Fragment>
- {!isFirstStep && (
- <Button
- data-test="submission-back"
- mr={1}
- onClick={prevStep}
- >{`< BACK`}</Button>
- )}
+ <Button
+ data-test="submission-back"
+ mr={1}
+ onClick={isFirstStep ? history.goBack : prevStep}
+ >{`< BACK`}</Button>
<Button
data-test="submission-next"
ml={isFirstStep ? 0 : 1}
diff --git a/packages/xpub-faraday/app/index-production.html b/packages/xpub-faraday/app/index-production.html
index 9408ded17046ffed4fe706313dff0f9ba3ab07d5..e76102f559bc3625df0428c4c1ce6014bd2e5554 100644
--- a/packages/xpub-faraday/app/index-production.html
+++ b/packages/xpub-faraday/app/index-production.html
@@ -9,6 +9,7 @@
<title>
<%= htmlWebpackPlugin.options.title %>
</title>
+ <link xmlns="http://www.w3.org/1999/xhtml" rel="shortcut icon" href="/assets/favicon.ico" type="image/x-icon" />
</head>
<body>
diff --git a/packages/xpub-faraday/app/index.html b/packages/xpub-faraday/app/index.html
index 9dfcd619060052a1bd0709f36fcd48e52c1e0e1a..95cf2616b10504c8878f03681e40c99e410c3a0f 100644
--- a/packages/xpub-faraday/app/index.html
+++ b/packages/xpub-faraday/app/index.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title> Faraday </title>
+ <link xmlns="http://www.w3.org/1999/xhtml" rel="shortcut icon" href="/assets/favicon.ico" type="image/x-icon" />
</head>
<body style="margin: 0;">
<div id="root"></div>
diff --git a/packages/xpub-faraday/static/favicon.ico b/packages/xpub-faraday/static/favicon.ico
index 8a6bcd88d0d0461a41667716bc4f4390b4ec61a3..fdf801f7b6f71aa8f9920f4ea37e6afe0825d782 100644
Binary files a/packages/xpub-faraday/static/favicon.ico and b/packages/xpub-faraday/static/favicon.ico differ