diff --git a/js/components/ascribe_accordion_list/accordion_list_item.js b/js/components/ascribe_accordion_list/accordion_list_item.js index 00235d96..96fe619c 100644 --- a/js/components/ascribe_accordion_list/accordion_list_item.js +++ b/js/components/ascribe_accordion_list/accordion_list_item.js @@ -155,7 +155,7 @@ let AccordionListItem = React.createClass({
- +
diff --git a/js/components/ascribe_detail/media_container.js b/js/components/ascribe_detail/media_container.js index f7ed5cfc..6bf58a9c 100644 --- a/js/components/ascribe_detail/media_container.js +++ b/js/components/ascribe_detail/media_container.js @@ -18,7 +18,8 @@ let MediaContainer = React.createClass({ }, render() { - let thumbnail = this.props.content.thumbnail; + let thumbnail = this.props.content.thumbnail.thumbnail_sizes && this.props.content.thumbnail.thumbnail_sizes['600x600'] ? + this.props.content.thumbnail.thumbnail_sizes['600x600'] : this.props.content.thumbnail.url_safe; let mimetype = this.props.content.digital_work.mime; let embed = null; let extraData = null; diff --git a/js/components/ascribe_media/media_player.js b/js/components/ascribe_media/media_player.js index 3d032bef..b4d821ae 100644 --- a/js/components/ascribe_media/media_player.js +++ b/js/components/ascribe_media/media_player.js @@ -153,7 +153,10 @@ let MediaPlayer = React.createClass({ if (this.props.mimetype === 'video' && this.props.encodingStatus !== undefined && this.props.encodingStatus !== 100) { return (
-

Please be patient, the video is been encoded

+

+ We successfully received your video and it is now being encoded. +
You can leave this page and check back on the status later.
+

diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js index e6c5cb20..3ececa6d 100644 --- a/js/components/ascribe_uploader/react_s3_fine_uploader.js +++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js @@ -209,6 +209,7 @@ var ReactS3FineUploader = React.createClass({ requestKey(fileId) { let defer = new fineUploader.Promise(); let filename = this.state.uploader.getName(fileId); + let uuid = this.state.uploader.getUuid(fileId); window.fetch(this.props.keyRoutine.url, { method: 'post', @@ -220,7 +221,8 @@ var ReactS3FineUploader = React.createClass({ credentials: 'include', body: JSON.stringify({ 'filename': filename, - 'file_class': this.props.keyRoutine.fileClass, + 'category': this.props.keyRoutine.fileClass, + 'uuid': uuid, 'piece_id': this.props.keyRoutine.pieceId }) }) diff --git a/sass/ascribe_accordion_list.scss b/sass/ascribe_accordion_list.scss index 1b682735..3d5d071c 100644 --- a/sass/ascribe_accordion_list.scss +++ b/sass/ascribe_accordion_list.scss @@ -32,6 +32,7 @@ $ascribe-accordion-list-font: 'Source Sans Pro'; height: 110px; padding:0; cursor: pointer; + text-align: center; img { max-width: 100%; max-height: 100%;