From 801227cfee659ddde1f22baec8ad5a9aa4cc0e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Wed, 9 Sep 2015 14:11:52 +0200 Subject: [PATCH] remove react-progress-bar for react-bootstrap progressbar --- js/components/ascribe_media/media_player.js | 3 ++- js/components/ascribe_uploader/file_drag_and_drop.js | 8 +++++--- .../file_drag_and_drop_preview_image.js | 6 ++++-- .../file_drag_and_drop_preview_other.js | 6 ++++-- .../file_drag_and_drop_preview_progress.js | 12 +++++++----- .../ascribe_uploader/react_s3_fine_uploader.js | 2 +- package.json | 3 +-- sass/main.scss | 11 +++++++++++ 8 files changed, 35 insertions(+), 16 deletions(-) diff --git a/js/components/ascribe_media/media_player.js b/js/components/ascribe_media/media_player.js index ad53b61f..09fafd27 100644 --- a/js/components/ascribe_media/media_player.js +++ b/js/components/ascribe_media/media_player.js @@ -200,7 +200,8 @@ let MediaPlayer = React.createClass({
You can leave this page and check back on the status later.

+ label="%(percent)s%" + className="ascribe-progress-bar" /> ); } else { diff --git a/js/components/ascribe_uploader/file_drag_and_drop.js b/js/components/ascribe_uploader/file_drag_and_drop.js index 7d6c8a66..6dbdb66c 100644 --- a/js/components/ascribe_uploader/file_drag_and_drop.js +++ b/js/components/ascribe_uploader/file_drag_and_drop.js @@ -1,7 +1,7 @@ 'use strict'; import React from 'react'; -import ProgressBar from 'react-progressbar'; +import ProgressBar from 'react-bootstrap/lib/ProgressBar'; import FileDragAndDropDialog from './file_drag_and_drop_dialog'; import FileDragAndDropPreviewIterator from './file_drag_and_drop_preview_iterator'; @@ -171,10 +171,12 @@ let FileDragAndDrop = React.createClass({

{getLangText('Computing hash(es)... This may take a few minutes.')}

- {Math.ceil(this.props.hashingProgress)}% {getLangText('Cancel hashing')}

- +
); } else { diff --git a/js/components/ascribe_uploader/file_drag_and_drop_preview_image.js b/js/components/ascribe_uploader/file_drag_and_drop_preview_image.js index f4b61760..8e599e27 100644 --- a/js/components/ascribe_uploader/file_drag_and_drop_preview_image.js +++ b/js/components/ascribe_uploader/file_drag_and_drop_preview_image.js @@ -1,7 +1,7 @@ 'use strict'; import React from 'react'; -import ProgressBar from 'react-progressbar'; +import ProgressBar from 'react-bootstrap/lib/ProgressBar'; import AppConstants from '../../constants/application_constants'; import { getLangText } from '../../utils/lang_utils.js'; @@ -60,7 +60,9 @@ let FileDragAndDropPreviewImage = React.createClass({
- + {actionSymbol}
); diff --git a/js/components/ascribe_uploader/file_drag_and_drop_preview_other.js b/js/components/ascribe_uploader/file_drag_and_drop_preview_other.js index 1d948572..2528a9d7 100644 --- a/js/components/ascribe_uploader/file_drag_and_drop_preview_other.js +++ b/js/components/ascribe_uploader/file_drag_and_drop_preview_other.js @@ -1,7 +1,7 @@ 'use strict'; import React from 'react'; -import ProgressBar from 'react-progressbar'; +import ProgressBar from 'react-bootstrap/lib/ProgressBar'; import AppConstants from '../../constants/application_constants'; import { getLangText } from '../../utils/lang_utils.js'; @@ -55,7 +55,9 @@ let FileDragAndDropPreviewOther = React.createClass({ return (
- +
{actionSymbol} diff --git a/js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js b/js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js index 4d01f822..0974142a 100644 --- a/js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js +++ b/js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js @@ -2,6 +2,8 @@ import React from 'react'; +import ProgressBar from 'react-bootstrap/lib/ProgressBar'; + let FileDragAndDropPreviewProgress = React.createClass({ propTypes: { files: React.PropTypes.array @@ -10,7 +12,7 @@ let FileDragAndDropPreviewProgress = React.createClass({ calcOverallProgress() { let overallProgress = 0; let sizeOfAllFiles = 0; - let files = this.props.files.filter((file) => file.status !== 'deleted' && file.status !== 'canceled'); + let files = this.props.files.filter((file) => file.status !== 'deleted' && file.status !== 'canceled' && file.status !== 'online'); for(let i = 0; i < files.length; i++) { sizeOfAllFiles += files[i].size; @@ -29,10 +31,10 @@ let FileDragAndDropPreviewProgress = React.createClass({ if(overallProgress !== 0) { return ( - - Overall progress: {overallProgress.toFixed(2)}% - + ); } else { return null; diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js index e41284aa..d7a35adb 100644 --- a/js/components/ascribe_uploader/react_s3_fine_uploader.js +++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js @@ -161,7 +161,7 @@ var ReactS3FineUploader = React.createClass({ } return name; }, - multiple: false, + multiple: true, defaultErrorMessage: getLangText('Unexpected error. Please contact us if this happens repeatedly.') }; }, diff --git a/package.json b/package.json index b716d73a..9160487b 100644 --- a/package.json +++ b/package.json @@ -73,9 +73,8 @@ "q": "^1.4.1", "raven-js": "^1.1.19", "react": "^0.13.2", - "react-bootstrap": "^0.24.3", + "react-bootstrap": "^0.25.1", "react-datepicker": "^0.12.0", - "react-progressbar": "^1.1.0", "react-router": "^0.13.3", "react-router-bootstrap": "~0.16.0", "react-star-rating": "~1.3.2", diff --git a/sass/main.scss b/sass/main.scss index e8d708e3..d3e0feaf 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -422,3 +422,14 @@ hr { padding-bottom: 30%; text-align: center; } + +.ascribe-progress-bar { + margin-bottom: 0; + > .progress-bar { + background-color: $ascribe-color-green; + } +} + +.ascribe-progress-bar-xs { + height: 12px; +} \ No newline at end of file