From 5f1241ebadbd6df4907d6914ce00d92e15f805c9 Mon Sep 17 00:00:00 2001 From: Nora Castaneda-Alvarez Date: Tue, 11 Sep 2018 17:06:23 +0200 Subject: [PATCH] Texts updated - descriptor parser - descriptor lists (form and stepper) - dataset stepper (list of accessions, location), descriptor (form and display) and descriptor list display. - steppers: basic information, creators and location --- .../catalog/descriptor/DescriptorParser.tsx | 11 +++++----- src/ui/pages/dataset/dataset-stepper/steps.ts | 6 +++--- .../steps/accessions-list/ListOfAccesion.tsx | 13 ++++++------ .../steps/basic-info/BasicInfoForm.tsx | 11 +++++----- .../steps/creators/DatasetCreatorForm.tsx | 4 ++-- .../steps/location/LocationForm.tsx | 20 ++++++++++--------- src/ui/pages/descriptor/DisplayPage.tsx | 2 +- src/ui/pages/descriptor/c/DescriptorForm.tsx | 6 +++--- .../c/DescriptorListDisplay.tsx | 2 +- .../descriptorlist/c/DescriptorListForm.tsx | 12 +++++------ .../descriptorlist-stepper/index.tsx | 2 +- .../descriptorlist-stepper/steps.ts | 2 +- 12 files changed, 48 insertions(+), 43 deletions(-) diff --git a/src/ui/catalog/descriptor/DescriptorParser.tsx b/src/ui/catalog/descriptor/DescriptorParser.tsx index 09e7c8d..0e26c68 100644 --- a/src/ui/catalog/descriptor/DescriptorParser.tsx +++ b/src/ui/catalog/descriptor/DescriptorParser.tsx @@ -131,12 +131,13 @@ class DescriptorParser extends React.Component {

INSTRUCTIONS FOR USE

-
    +
    1. Use "Descriptors" sheet from template: Genesys Catalog template.
      2. -
    2. Do not change header names in the template!
      3. -
    3. Fill the template with the descriptor information, save it.
      4. -
    4. Copy and paste the table from Excel into the text field below.
      5. -
+
  • The first row in the template contains the header names, the second row contains a description of the content expected on each column, and rows three and four contain examples to help you fill in the template.
    • +
  • Do not change the header names in the template
    • +
  • Fill the template with the descriptor information, remove the rows that contain the description of each column (second row) and examples (third and fourth row) and save the file.
    • +
  • Copy and paste the table from Excel into the text field "Descriptor definitions".
    • +
    diff --git a/src/ui/pages/dataset/dataset-stepper/steps.ts b/src/ui/pages/dataset/dataset-stepper/steps.ts index cf7a853..8065986 100644 --- a/src/ui/pages/dataset/dataset-stepper/steps.ts +++ b/src/ui/pages/dataset/dataset-stepper/steps.ts @@ -16,7 +16,7 @@ const steps = [ }, { id: 4, - name: 'Location', + name: 'Location and timing', link: 'edit/location', }, { @@ -26,12 +26,12 @@ const steps = [ }, { id: 6, - name: 'Pasting traits', + name: 'Select descriptors in batch', link: 'edit/pasting-traits', }, { id: 7, - name: 'Traits observed', + name: 'Browse and select descriptors', link: 'edit/traits-observed', }, { diff --git a/src/ui/pages/dataset/dataset-stepper/steps/accessions-list/ListOfAccesion.tsx b/src/ui/pages/dataset/dataset-stepper/steps/accessions-list/ListOfAccesion.tsx index ca37d1b..1d587ec 100644 --- a/src/ui/pages/dataset/dataset-stepper/steps/accessions-list/ListOfAccesion.tsx +++ b/src/ui/pages/dataset/dataset-stepper/steps/accessions-list/ListOfAccesion.tsx @@ -93,12 +93,13 @@ class ListOfAccession extends React.Component {

    INSTRUCTIONS FOR USE

    -
      -
    • Use "Acccessions" sheet from template: Genesys Catalog template.
      • -
    • Do not change header name in the template
      • -
    • Fill the template with the informations of the accessions, save it.
      • -
    • Copy and paste the table from Excel into the text field below.
      • -
    +
      +
    1. Use the "Acccessions" sheet from the template: Genesys Catalog template.
      2. +
    2. The first row in the template contains the header names, whilst the second contains a description of the content expected on each column.
      3. +
    3. Do not change the header names in the template
      4. +
    4. Fill the template with the informations of the accessions, remove the row that contains the description of each column (second row) and save the file.
      5. +
    5. Copy and paste the table from Excel into the text field "List of accessions described in the dataset".
      6. +
    diff --git a/src/ui/pages/dataset/dataset-stepper/steps/basic-info/BasicInfoForm.tsx b/src/ui/pages/dataset/dataset-stepper/steps/basic-info/BasicInfoForm.tsx index 133b92e..ece95b1 100644 --- a/src/ui/pages/dataset/dataset-stepper/steps/basic-info/BasicInfoForm.tsx +++ b/src/ui/pages/dataset/dataset-stepper/steps/basic-info/BasicInfoForm.tsx @@ -42,8 +42,8 @@ class BasicInfoStep extends React.Component { name="title" basicMarkdown component={ MarkdownField } - label="Title of the dataset" - placeholder="Title" + label="Dataset title" + placeholder="Name given to the dataset (e.g., Characterization of maize accessions in Kenya)" validate={ [ Validators.required ] } /> { name="description" component={ MarkdownField } label="Dataset description" - placeholder="An abstract, short or long description of the resource. Descriptive details improves discoverability of the resource." + placeholder="An abstract, short or long description of the dataset. Descriptive details improves discoverability of the resource." /> { name="language" component={ VocabularyTermPicker } label="Language" - placeholder="Select language" + placeholder="Select language of the dataset" suggestionLabel="title" vocabularyUuid="21b10067-ba15-44dd-867f-6a18a117fee8" /> @@ -80,6 +80,7 @@ class BasicInfoStep extends React.Component { name="source" component={ TextField } label="Source" + placeholder="A related resource from which the described dataset is derived (e.g., journal article, data article, conference proceedings). Use DOI, URL, Journal title, or Journal/conference title; vol., no. (year)" />
    ), diff --git a/src/ui/pages/dataset/dataset-stepper/steps/location/LocationForm.tsx b/src/ui/pages/dataset/dataset-stepper/steps/location/LocationForm.tsx index 767b5ad..f532cc0 100644 --- a/src/ui/pages/dataset/dataset-stepper/steps/location/LocationForm.tsx +++ b/src/ui/pages/dataset/dataset-stepper/steps/location/LocationForm.tsx @@ -99,7 +99,7 @@ class LocationForm extends React.Component { name={ `${location}.userCountry` } component={ MaterialAutosuggest } label="Country" - placeholder="Select country" + placeholder="Select country where the characterization/evaluation was performed." suggestions={ countries } suggestionLabel="name" validate={ [ Validators.required ] } @@ -129,8 +129,8 @@ class LocationForm extends React.Component { {
    diff --git a/src/ui/pages/descriptor/DisplayPage.tsx b/src/ui/pages/descriptor/DisplayPage.tsx index 8245598..7338032 100644 --- a/src/ui/pages/descriptor/DisplayPage.tsx +++ b/src/ui/pages/descriptor/DisplayPage.tsx @@ -65,7 +65,7 @@ class DisplayPage extends React.Component { const {descriptor, publishDescriptor} = this.props; confirm(Publish { descriptor.title }?, { - description: `The descriptor will be reviewing by administrator before publishing.`, + description: `The descriptor will be reviewed by the administrator before publishing.`, confirmLabel: 'Publish', abortLabel: 'Cancel', }).then(() => { diff --git a/src/ui/pages/descriptor/c/DescriptorForm.tsx b/src/ui/pages/descriptor/c/DescriptorForm.tsx index 6332832..190af8c 100644 --- a/src/ui/pages/descriptor/c/DescriptorForm.tsx +++ b/src/ui/pages/descriptor/c/DescriptorForm.tsx @@ -159,7 +159,7 @@ class DescriptorForm extends React.Component { validate={ [ Validators.required ] } /> @@ -169,7 +169,7 @@ class DescriptorForm extends React.Component { validate={ [ Validators.required ] } /> @@ -182,7 +182,7 @@ class DescriptorForm extends React.Component { component={ MarkdownField } /> { const {descriptorList, publishDescriptorList} = this.props; confirm(Publish { descriptorList.title }?, { - description: `The descriptor list will be reviewing by administrator before publishing.`, + description: `The descriptor list will be reviewed by administrator before publishing.`, confirmLabel: 'Publish', abortLabel: 'Cancel', }).then(() => { diff --git a/src/ui/pages/descriptorlist/c/DescriptorListForm.tsx b/src/ui/pages/descriptorlist/c/DescriptorListForm.tsx index 706f620..f8da5b3 100644 --- a/src/ui/pages/descriptorlist/c/DescriptorListForm.tsx +++ b/src/ui/pages/descriptorlist/c/DescriptorListForm.tsx @@ -50,7 +50,7 @@ class DescriptorListForm extends React.Component { { { { validate={ [Validators.url] } /> diff --git a/src/ui/pages/descriptorlist/descriptorlist-stepper/index.tsx b/src/ui/pages/descriptorlist/descriptorlist-stepper/index.tsx index 379d7ff..1cfa7b8 100644 --- a/src/ui/pages/descriptorlist/descriptorlist-stepper/index.tsx +++ b/src/ui/pages/descriptorlist/descriptorlist-stepper/index.tsx @@ -91,7 +91,7 @@ class DescriptorListStepper extends React.Component { const {descriptorList, publishDescriptorList} = this.props; confirm(Publish { descriptorList.title }?, { - description: `The descriptor list will be reviewing by administrator before publishing.`, + description: `The descriptor list will be reviewed by the administrator before publishing.`, confirmLabel: 'Publish', abortLabel: 'Cancel', }).then(() => { diff --git a/src/ui/pages/descriptorlist/descriptorlist-stepper/steps.ts b/src/ui/pages/descriptorlist/descriptorlist-stepper/steps.ts index afd28c1..50c5482 100644 --- a/src/ui/pages/descriptorlist/descriptorlist-stepper/steps.ts +++ b/src/ui/pages/descriptorlist/descriptorlist-stepper/steps.ts @@ -7,7 +7,7 @@ const steps = [ }, { id: 2, - name: 'Select descriptors', + name: 'Select registered descriptors', link: 'edit/select-descriptors', }, { -- GitLab