ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00
Code Issues Releases Wiki Activity

Merge pull request #51 from ascribe/AD-1313-Add-marketplace-whitelabel-changes

Browse Source 
AD-1313 Add marketplace whitelabel changes
This commit is contained in:
Tim Daubenschütz 2015-12-07 17:29:48 +01:00
commit c6443bb79d
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/components/ascribe_forms/form_register_piece.js
View File

@ -28,6 +28,7 @@ let RegisterPieceForm = React.createClass({
isFineUploaderActive: React.PropTypes.bool,
isFineUploaderEditable: React.PropTypes.bool,
enableLocalHashing: React.PropTypes.bool,
enableSeparateThumbnail: React.PropTypes.bool,
// For this form to work with SlideContainer, we sometimes have to disable it
disabled: React.PropTypes.bool,
@ -42,7 +43,8 @@ let RegisterPieceForm = React.createClass({
return {
headerMessage: getLangText('Register your work'),
submitMessage: getLangText('Register work'),
enableLocalHashing: true
enableLocalHashing: true,
enableSeparateThumbnail: true
};
},
@ -108,9 +110,10 @@ let RegisterPieceForm = React.createClass({
},
isThumbnailDialogExpanded() {
const { enableSeparateThumbnail } = this.props;
const { digitalWorkFile } = this.state;
if(digitalWorkFile) {
if(digitalWorkFile && enableSeparateThumbnail) {
const { type: mimeType } = digitalWorkFile;
const mimeSubType = mimeType && mimeType.split('/').length ? mimeType.split('/')[1]
: 'unknown';

7
js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js
View File

@ -119,12 +119,6 @@ let MarketAdditionalDataForm = React.createClass({
GlobalNotificationActions.appendGlobalNotification(notification);
},
uploadStarted() {
this.setState({
isUploadReady: false
});
},
setIsUploadReady(isReady) {
this.setState({
isUploadReady: isReady
@ -180,7 +174,6 @@ let MarketAdditionalDataForm = React.createClass({
{heading}
<FurtherDetailsFileuploader
label={getLangText('Marketplace Thumbnail Image')}
uploadStarted={this.uploadStarted}
submitFile={function () {}}
setIsUploadReady={this.setIsUploadReady}
isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}

2
js/components/whitelabel/wallet/components/market/market_register_piece.js
View File

@ -115,7 +115,6 @@ let MarketRegisterPiece = React.createClass({
render() {
const {
isFineUploaderActive,
step,
whitelabel: {
name: whitelabelName = 'Market'
@ -141,6 +140,7 @@ let MarketRegisterPiece = React.createClass({
headerMessage={getLangText('Consign to %s', whitelabelName)}
submitMessage={getLangText('Proceed to additional details')}
isFineUploaderActive={true}
enableSeparateThumbnail={false}
handleSuccess={this.handleRegisterSuccess}
location={this.props.location}>
<Property

14
sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss
View File

@ -214,6 +214,7 @@ $vivi23--highlight-color: #de2600;
.btn-secondary {
border-color: $vivi23--button-default-color;
color: $vivi23--button-default-color;
&:hover,
&:active,
@ -226,6 +227,7 @@ $vivi23--highlight-color: #de2600;
&.active.focus {
background-color: $vivi23--button-default-color;
border-color: $vivi23--button-default-color;
color: $vivi23--bg-color;
}
}
@ -324,6 +326,18 @@ $vivi23--highlight-color: #de2600;
background-color: lighten($vivi23--fg-color, 20%);
}
.ascribe-progress-bar span {
text-shadow: -1px 0 lighten($vivi23--fg-color, 20%),
0 1px lighten($vivi23--fg-color, 20%),
1px 0 lighten($vivi23--fg-color, 20%),
0 -1px lighten($vivi23--fg-color, 20%);
}
.action-file.icon-ascribe-ok,
.action-file.icon-ascribe-ok:hover {
color: lighten($vivi23--fg-color, 20%);
}
// spinner
.spinner-circle {
border-color: $vivi23--fg-color;