Skip to content
Snippets Groups Projects
Commit e331640c authored by Giannis Kopanas's avatar Giannis Kopanas
Browse files

Merge branch '111-small-ui-changes' into 'master'

rename Submission , move assign reviewers link to decision Page , title changes

Closes #111

See merge request xpub!100
parents b32a79d5 9adcf0dd
No related branches found
No related tags found
No related merge requests found
......@@ -14,7 +14,7 @@ import VersionTitle from './VersionTitle'
const Actions = ({ project, version }) => (
<div className={classes.links}>
<div className={classes.link}>
{(!version.decision ||
{/* {(!version.decision ||
version.decision.status !== 'revising' ||
version.decision.status !== 'submitted') && (
<span>
......@@ -24,7 +24,7 @@ const Actions = ({ project, version }) => (
<Divider separator="|" />
</span>
)}
)} */}
<ProjectLink
id={project.id}
......@@ -34,7 +34,7 @@ const Actions = ({ project, version }) => (
>
{version.decision && version.decision.status === 'submitted'
? `Decision: ${version.decision.recommendation}`
: 'Make decision'}
: 'Control Panel'}
</ProjectLink>
</div>
</div>
......
......@@ -17,7 +17,7 @@ const OwnerItem = ({ project, version, deleteProject }) => (
<div className={classes.links}>
<div className={classes.link}>
<ProjectLink page="submit" project={project} version={version}>
Submission
Summary info
</ProjectLink>
</div>
......
import React from 'react'
import moment from 'moment'
// import classnames from 'classnames'
import { Link } from 'react-router-dom'
import SimpleEditor from 'wax-editor-react'
import classes from './DecisionLayout.local.scss'
import DecisionForm from './DecisionForm'
......@@ -68,11 +69,17 @@ const DecisionLayout = ({
const submittedMoment = moment()
const key = submittedMoment.format('x')
const label = submittedMoment.format('YYYY-MM-DD')
decisionSections.push({
content: (
<div>
<ReviewMetadata version={currentVersion} />
<Link
to={`/projects/${project.id}/versions/${
currentVersion.id
}/reviewers`}
>
Assign Reviewers
</Link>
<DecisionReviews version={currentVersion} />
<DecisionForm
decision={decision}
......
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