fixing citations. fix pullquote left border in transcript

8 files changed, 29 insertions, 5 deletions

diff --git a/animism-align/frontend/app/views/viewer/nav/eflux.css b/animism-align/frontend/app/views/viewer/nav/eflux.css
index 063198f..9f26595 100644
--- a/animism-align/frontend/app/views/viewer/nav/eflux.css
+++ b/animism-align/frontend/app/views/viewer/nav/eflux.css
@@ -85,6 +85,7 @@
   color: white;
   border: 1px solid;
   padding: 0.75rem;
+  text-align: center;
 }
 .growl-tooltip.tooltip-eflux {
   left: 1.8rem;
diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js
index ba3df4c..8898ad9 100644
--- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js
+++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js
@@ -21,7 +21,7 @@ export const MediaImage = ({ paragraph, media, currentParagraph, currentAnnotati
     }
     url = frame.url
     captionItem = item.settings.caption_lookup[frame_id]
-    if (!captionItem.short_caption) {
+    if (!captionItem.caption) {
       captionItem = item
     }
     colorName = annotation.settings.inline_color || annotation.settings.color || 'white'
diff --git a/animism-align/frontend/app/views/viewer/player/components.media/media.citation.js b/animism-align/frontend/app/views/viewer/player/components.media/media.citation.js
index ea20a3b..bbe498f 100644
--- a/animism-align/frontend/app/views/viewer/player/components.media/media.citation.js
+++ b/animism-align/frontend/app/views/viewer/player/components.media/media.citation.js
@@ -7,16 +7,20 @@ export const MediaCitation = ({ media }) => {
     )
   }
   const settings = media.settings || media
+
+  // citations - so many names for the same thing
   if (settings.bibliography) {
     return (
       <div className='citation' dangerouslySetInnerHTML={{ __html: settings.bibliography }} />
     )
   }
-  if (settings.short_caption) {
+  if (settings.caption) {
     return (
-      <div className='citation' dangerouslySetInnerHTML={{ __html: settings.short_caption }} />
+      <div className='citation' dangerouslySetInnerHTML={{ __html: settings.caption }} />
     )
   }
+
+  // generated citations
   return (
     <div className='citation'>
       {media.author}
diff --git a/animism-align/frontend/app/views/viewer/sections/sections.css b/animism-align/frontend/app/views/viewer/sections/sections.css
index e49e3c1..a172f6f 100644
--- a/animism-align/frontend/app/views/viewer/sections/sections.css
+++ b/animism-align/frontend/app/views/viewer/sections/sections.css
@@ -26,6 +26,7 @@
   z-index: 22;
   border-top: 1px solid white;
   background: black;
+  user-select: none;
 }
 .sections-nav.viewer-nav > .nav-row {
   z-index: 24;
diff --git a/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.gallery.js b/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.gallery.js
index d21cc79..30a8fa5 100644
--- a/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.gallery.js
+++ b/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.gallery.js
@@ -10,6 +10,7 @@ export const MediaGallery = ({ paragraph, media, currentParagraph, currentAnnota
     return <div />
   }
   const item = media.lookup[annotation.settings.media_id]
+  console.log(item)
   if (!item) return <div>Media not found: {annotation.settings.media_id}</div>
   return (
     <div
diff --git a/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.image.js b/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.image.js
index 9a9c0a6..b1b846f 100644
--- a/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.image.js
+++ b/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.image.js
@@ -1,6 +1,11 @@
 import React, { Component } from 'react'
 
 export const MediaCitation = ({ media }) => {
+  if (media.settings.caption) {
+    return (
+      <span dangerouslySetInnerHTML={{ __html: media.settings.caption }} />
+    )
+  }
   if (media.settings.bibliography) {
     return (
       <span dangerouslySetInnerHTML={{ __html: media.settings.bibliography }} />
@@ -31,6 +36,7 @@ export const MediaImage = ({ paragraph, media, currentParagraph, currentAnnotati
   if (!media.lookup) return <div />
   const className = currentParagraph ? 'media image current' : 'media image'
   const annotation = paragraph.annotations[0]
+  console.log(annotation.settings.hide_in_transcript)
   if (annotation.settings.hide_in_transcript) {
     return <div />
   }
diff --git a/animism-align/frontend/app/views/viewer/transcript/transcript.css b/animism-align/frontend/app/views/viewer/transcript/transcript.css
index ba3f672..1649f94 100644
--- a/animism-align/frontend/app/views/viewer/transcript/transcript.css
+++ b/animism-align/frontend/app/views/viewer/transcript/transcript.css
@@ -101,6 +101,12 @@
 .transcript .media:hover span {
   background: rgba(0,0,0,0.12);
 }
+.transcript .paragraph span:hover {
+  background: rgba(225,225,225,1.0);
+}
+.transcript .paragraph span.pullquote_credit:hover {
+  background: transparent;
+}
 
 .transcript .paragraph {
   cursor: pointer;
@@ -115,9 +121,14 @@
   border-left: 2px solid #ddd;
   padding-left: 1rem;
 }
+.transcript .pullquote + .pullquote {
+  margin-top: -1rem;
+  padding-top: 1rem;
+}
 .transcript .pullquote_credit {
   display: block;
   text-align: right;
+  cursor: arrow;
 }
 .transcript .pullquote_credit:before {
   content: '—';
@@ -128,13 +139,13 @@
 .transcript span {
   margin-right: 4px;
   box-shadow: 0 0 0 rgba(255,255,255,0.0);
+  transition: all 0.2s;
 }
 .transcript .media span {
   margin-right: 0;
   border-bottom: 1px solid;
   cursor: pointer;
   background: rgba(0,0,0,0.0);
-  transition: background 0.2s;
 }
 
 .transcript .paragraph .current {
diff --git a/animism-align/frontend/app/views/viewer/viewer.actions.js b/animism-align/frontend/app/views/viewer/viewer.actions.js
index acba982..1eb2997 100644
--- a/animism-align/frontend/app/views/viewer/viewer.actions.js
+++ b/animism-align/frontend/app/views/viewer/viewer.actions.js
@@ -190,7 +190,7 @@ export const loadSections = () => dispatch => {
     section.inlineParagraphCount = section.paragraphs.filter(p => !p.hidden).length
     // console.log(i, section.inlineParagraphCount)
   })
-  // console.log(sections)
+  console.log(sections)
   // console.log(footnoteList)
   // console.log(fullscreenTimeline)
   dispatch({ type: types.viewer.load_sections, sections, footnoteList })