diff options
7 files changed, 34 insertions, 21 deletions
diff --git a/animism-align/frontend/app/constants.js b/animism-align/frontend/app/constants.js index b73a0ad..9b5396e 100644 --- a/animism-align/frontend/app/constants.js +++ b/animism-align/frontend/app/constants.js @@ -38,11 +38,11 @@ export const ROMAN_NUMERALS = [ 'XI', 'XII', 'XIII', 'XIV', 'XV', 'XVI', 'XVII', 'XVIII', 'XIX', 'XX', ] -export const TEXT_TYPES = new Set([ - 'header', 'sentence', +export const TEXT_ANNOTATION_TYPES = new Set([ + 'header', 'sentence', 'paragraph_end', ]) -export const MEDIA_TYPES = new Set([ +export const MEDIA_ANNOTATION_TYPES = new Set([ 'image', 'carousel', 'grid', 'video', 'vitrine', @@ -56,8 +56,8 @@ export const MEDIA_LABEL_TYPES = { vitrine: 'Vitrine', } -export const UTILITY_TYPES = new Set([ - 'curtain', 'paragraph_end', +export const UTILITY_ANNOTATION_TYPES = new Set([ + 'curtain', ]) export const CURTAIN_COLORS = [ diff --git a/animism-align/frontend/app/views/align/align.css b/animism-align/frontend/app/views/align/align.css index ff07162..760ec4b 100644 --- a/animism-align/frontend/app/views/align/align.css +++ b/animism-align/frontend/app/views/align/align.css @@ -100,7 +100,7 @@ canvas { .script { height: calc(100vh - 3.15rem); - z-index: 1; + z-index: 8; } /* Annotations */ diff --git a/animism-align/frontend/app/views/align/components/annotations/annotation.index.css b/animism-align/frontend/app/views/align/components/annotations/annotation.index.css index 170934f..322f9e1 100644 --- a/animism-align/frontend/app/views/align/components/annotations/annotation.index.css +++ b/animism-align/frontend/app/views/align/components/annotations/annotation.index.css @@ -19,7 +19,7 @@ .annotation.selected { border-color: #bbf; box-shadow: 0px 0px 4px rgba(0,0,0,1.0), 0px 0px 2px rgba(0,0,0,1.0); - z-index: 1; + z-index: 2; background-image: linear-gradient(rgba(0,0,0,0.5), rgba(0,0,0,0.4)); } .annotationIndex .annotation.media { @@ -49,10 +49,12 @@ padding: 0; } .annotation.curtain span { + z-index: 1; color: black; padding: 0.25rem; } .annotation.curtain .fadeIn { + z-index: 0; position: absolute; top: 0; width: 100%; @@ -60,6 +62,7 @@ background-size: cover; } .annotation.curtain .fadeOut { + z-index: 0; position: absolute; bottom: 0; width: 100%; diff --git a/animism-align/frontend/app/views/paragraph/transcript.actions.js b/animism-align/frontend/app/views/paragraph/transcript.actions.js index 3d2b045..7539343 100644 --- a/animism-align/frontend/app/views/paragraph/transcript.actions.js +++ b/animism-align/frontend/app/views/paragraph/transcript.actions.js @@ -1,6 +1,10 @@ import * as types from 'app/types' import { store, history, dispatch } from 'app/store' -import { MEDIA_TYPES } from 'app/constants' +import { + TEXT_ANNOTATION_TYPES, + MEDIA_ANNOTATION_TYPES, + UTILITY_ANNOTATION_TYPES, +} from 'app/constants' export const buildParagraphs = () => dispatch => { const state = store.getState() @@ -13,15 +17,22 @@ export const buildParagraphs = () => dispatch => { annotationOrder.forEach((annotation_id, i) => { const annotation = annotationLookup[annotation_id] const paragraph = paragraphLookup[annotation.paragraph_id] - // if this annotation is media, insert it after the current paragraph - if (MEDIA_TYPES.has(annotation.type)) { - paragraphs.push({ - id: ('index_' + i), - type: annotation.type, - start_ts: annotation.start_ts, - end_ts: 0, - annotations: [annotation], - }) + // if this annotation is a utility (curtain, gallery instructions), then skip it + if (UTILITY_ANNOTATION_TYPES.has(annotation.type)) { + return + } + // if this annotation is media, then insert it after the current paragraph + if (MEDIA_ANNOTATION_TYPES.has(annotation.type)) { + // add option to hide the citation from the transcript + if (!annotation.settings.hideCitation) { + paragraphs.push({ + id: ('index_' + i), + type: annotation.type, + start_ts: annotation.start_ts, + end_ts: 0, + annotations: [annotation], + }) + } return } // if this annotation is from a different paragraph, make a new paragraph diff --git a/animism-align/frontend/app/views/viewer/nav/eflux.css b/animism-align/frontend/app/views/viewer/nav/eflux.css index 2dbd0be..93c9449 100644 --- a/animism-align/frontend/app/views/viewer/nav/eflux.css +++ b/animism-align/frontend/app/views/viewer/nav/eflux.css @@ -3,7 +3,7 @@ top: 0; left: 0; width: 100%; - z-index: 2; + z-index: 10; } .eflux-logo { position: absolute; diff --git a/animism-align/frontend/app/views/viewer/player/player.container.js b/animism-align/frontend/app/views/viewer/player/player.container.js index aefc025..340b6c6 100644 --- a/animism-align/frontend/app/views/viewer/player/player.container.js +++ b/animism-align/frontend/app/views/viewer/player/player.container.js @@ -13,7 +13,6 @@ class PlayerContainer extends Component { return ( <div className='viewer-container'> <div className="player"> - Document container </div> </div> ) diff --git a/animism-align/frontend/app/views/viewer/viewer.actions.js b/animism-align/frontend/app/views/viewer/viewer.actions.js index 73e34fd..f8bc116 100644 --- a/animism-align/frontend/app/views/viewer/viewer.actions.js +++ b/animism-align/frontend/app/views/viewer/viewer.actions.js @@ -1,6 +1,6 @@ import * as types from 'app/types' import { store, history, dispatch } from 'app/store' -import { MEDIA_TYPES, MEDIA_LABEL_TYPES } from 'app/constants' +import { MEDIA_ANNOTATION_TYPES, MEDIA_LABEL_TYPES } from 'app/constants' const newSection = (annotation, index, mediaIndex) => ({ start_ts: annotation.start_ts, @@ -29,7 +29,7 @@ export const loadSections = () => dispatch => { currentSection = newSection(annotation, sections.length, mediaIndex) sections.push(currentSection) } - if (MEDIA_TYPES.has(annotation.type)) { + if (MEDIA_ANNOTATION_TYPES.has(annotation.type)) { if (currentSection) { const media = mediaLookup[annotation.settings.media_id] currentSection.media.push({ |