Merge pull request #18 from IUBLibTech/marker_change

Remove marker icon and highlight from annotations list.
IUBLibTech · Mar 29, 2019 · ccc937d · ccc937d
2 parents 1574082 + 48935a7
commit ccc937d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/src/components/MarkerMetadata/MarkerMetadata.js b/src/components/MarkerMetadata/MarkerMetadata.js
@@ -31,7 +31,6 @@ function DisplayMarker(props) {
       >
         <Grid item>
           <Typography variant="h6" component="h3">
-            <Bookmark fontSize="inherit" style={{ marginRight: 5 }} />{' '}
             {label || 'Unnamed marker'}
           </Typography>
         </Grid>

diff --git a/src/components/Metadata/Metadata.js b/src/components/Metadata/Metadata.js
@@ -110,7 +110,7 @@ const Metadata = props => {
                     <MarkerMetadata
                       inset={rangesToShow.length}
                       key={marker.id}
-                      highlight={marker === currentMarker}
+                      highlight={false}
                       marker={marker}
                       onDeleteMarker={() => props.deleteMarker(marker.id)}
                       onSaveMarker={data => props.updateMarker(marker.id, data)}
@@ -128,7 +128,7 @@ const Metadata = props => {
             color="textSecondary"
             style={{ marginBottom: 10 }}
           >
-            Project information
+            Timeline information
           </Typography>
           <div className="metadata__content">
             {props.projectMetadataEditorOpen ? (

diff --git a/src/components/ProjectMetadataDisplay/ProjectMetadataDisplay.js b/src/components/ProjectMetadataDisplay/ProjectMetadataDisplay.js
@@ -19,11 +19,16 @@ const ProjectMetadataDisplay = props => (
           whiteSpace: 'pre-line',
         }}
       >
-        {props.manifestSummary || 'Description of manifest'}
+        {props.manifestSummary || 'Description of timeline'}
       </Typography>
     </div>
     {props.homepage && props.homepageLabel ? (
-      <Typography variant="body1" component="p">
+      <Typography
+        variant="body1"
+        component="p"
+        style={{
+          marginTop: 14,
+        }}>
         <a href={props.homepage}>{props.homepageLabel}</a>
       </Typography>
     ) : (
@@ -60,10 +65,10 @@ const ProjectMetadataDisplay = props => (
             variant="text"
             color="primary"
             onClick={props.onSaveButtonClicked}
-            title="Download project"
+            title="Download timeline"
           >
             <CloudDownload nativeColor="#FF4081" style={{ marginRight: 20 }} />
-            Download this project
+            Download this timeline
           </Button>
         </Grid>
       ) : null}
@@ -73,10 +78,10 @@ const ProjectMetadataDisplay = props => (
             variant="text"
             color="primary"
             onClick={props.onEraseButtonClicked}
-            title="Start project over"
+            title="Start timeline over"
           >
             <RestorePage nativeColor="#303F9F" style={{ marginRight: 20 }} />
-            Start this project over
+            Start this timeline over
           </Button>
         </Grid>
       ) : (

diff --git a/src/components/ProjectMetadataEditor/ProjectMetadataEditor.js b/src/components/ProjectMetadataEditor/ProjectMetadataEditor.js
@@ -83,7 +83,7 @@ class ProjectMetadataEditor extends Component {
           InputLabelProps={{
             shrink: true,
           }}
-          placeholder="Description of manifest"
+          placeholder="Description of timeline"
           fullWidth
           multiline={true}
           margin="normal"

diff --git a/src/components/VariationsAppBar/VariationsAppBar.js b/src/components/VariationsAppBar/VariationsAppBar.js
@@ -58,7 +58,7 @@ const VariationsAppBar = props => (
             color="inherit"
             onClick={props.onSave}
             disabled={!props.canUndo}
-            title={props.onSave ? 'Save project' : 'No backend set up to save'}
+            title={props.onSave ? 'Save timeline' : 'No backend set up to save'}
           >
             <Save />
           </IconButton>

diff --git a/src/constants/project.js b/src/constants/project.js
@@ -5,7 +5,7 @@ export const BUBBLE_STYLES = {
 
 const DEFAULT_BUBBLE_HEIGHT = 80;
 const DEFAULT_LANGUAGE_CODE = 'en';
-const DEFAULT_TITLE = 'Untitled Project';
+const DEFAULT_TITLE = 'Untitled Timeline';
 const DEFAULT_BACKGROUND_COLOUR = '#fff';
 
 const DESCRIPTION = 'description';