diff --git a/README.md b/README.md index 36f47954..e07eca0d 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Additionally, to work on the white labeling functionality, you need to edit your 127.0.0.1 sluice.localhost.com 127.0.0.1 lumenus.localhost.com 127.0.0.1 portfolioreview.localhost.com +127.0.0.1 23vivi.localhost.com ``` diff --git a/fonts/ascribe-font.eot b/fonts/ascribe-font.eot new file mode 100755 index 00000000..860c534b Binary files /dev/null and b/fonts/ascribe-font.eot differ diff --git a/fonts/ascribe-logo.svg b/fonts/ascribe-font.svg old mode 100644 new mode 100755 similarity index 90% rename from fonts/ascribe-logo.svg rename to fonts/ascribe-font.svg index 2a9bb79b..2628dfee --- a/fonts/ascribe-logo.svg +++ b/fonts/ascribe-font.svg @@ -3,7 +3,7 @@ Generated by IcoMoon - + @@ -12,9 +12,10 @@ - - + + + \ No newline at end of file diff --git a/fonts/ascribe-font.ttf b/fonts/ascribe-font.ttf new file mode 100755 index 00000000..a66d8f04 Binary files /dev/null and b/fonts/ascribe-font.ttf differ diff --git a/fonts/ascribe-font.woff b/fonts/ascribe-font.woff new file mode 100755 index 00000000..7d18d089 Binary files /dev/null and b/fonts/ascribe-font.woff differ diff --git a/fonts/ascribe-logo.eot b/fonts/ascribe-logo.eot deleted file mode 100644 index 039f93f5..00000000 Binary files a/fonts/ascribe-logo.eot and /dev/null differ diff --git a/fonts/ascribe-logo.ttf b/fonts/ascribe-logo.ttf deleted file mode 100644 index 61cdce03..00000000 Binary files a/fonts/ascribe-logo.ttf and /dev/null differ diff --git a/fonts/ascribe-logo.woff b/fonts/ascribe-logo.woff deleted file mode 100644 index c563df56..00000000 Binary files a/fonts/ascribe-logo.woff and /dev/null differ diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index fbc13a50..068b526c 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -244,7 +244,16 @@ let CoaDetails = React.createClass({ if(this.props.coa && this.props.coa.url_safe) { return (
-

+

+ +
+
-

+
); } else if(typeof this.props.coa === 'string'){ @@ -268,7 +277,7 @@ let CoaDetails = React.createClass({ } return (
- +

{getLangText("Just a sec, we\'re generating your COA")}

{getLangText('(you may leave the page)')}

diff --git a/js/components/ascribe_detail/edition_container.js b/js/components/ascribe_detail/edition_container.js index 24010d47..a1fa7f58 100644 --- a/js/components/ascribe_detail/edition_container.js +++ b/js/components/ascribe_detail/edition_container.js @@ -87,16 +87,16 @@ let EditionContainer = React.createClass({ }, render() { - if (this.state.edition && this.state.edition.id && - this.state.currentUser && this.state.currentUser.email) { - setDocumentTitle([this.state.edition.artist_name, this.state.edition.title].join(', ')); + const {edition, currentUser, coaMeta} = this.state; + if (edition && edition.id && currentUser && currentUser.email) { + setDocumentTitle([edition.artist_name, edition.title].join(', ')); return ( EditionActions.fetchEdition(this.props.params.editionId)} /> ); } else { diff --git a/js/components/coa_verify_container.js b/js/components/coa_verify_container.js index 3f98fffa..9e6ff4e8 100644 --- a/js/components/coa_verify_container.js +++ b/js/components/coa_verify_container.js @@ -17,9 +17,13 @@ import { setDocumentTitle } from '../utils/dom_utils'; let CoaVerifyContainer = React.createClass({ + + propTypes: { + location: React.PropTypes.object + }, + render() { setDocumentTitle(getLangText('Verify your Certificate of Authenticity')); - return (

@@ -27,7 +31,7 @@ let CoaVerifyContainer = React.createClass({ {getLangText('Verify your Certificate of Authenticity')}
- +

{getLangText('ascribe is using the following public key for verification')}: @@ -47,6 +51,10 @@ let CoaVerifyContainer = React.createClass({ let CoaVerifyForm = React.createClass({ + propTypes: { + location: React.PropTypes.object + }, + handleSuccess(response){ let notification = null; if (response.verdict) { @@ -56,6 +64,7 @@ let CoaVerifyForm = React.createClass({ }, render() { + const {message, signature} = this.props.location.query; return (
@@ -90,6 +100,7 @@ let CoaVerifyForm = React.createClass({
diff --git a/js/components/footer.js b/js/components/footer.js index 65088ee2..31145d4b 100644 --- a/js/components/footer.js +++ b/js/components/footer.js @@ -11,6 +11,7 @@ let Footer = React.createClass({


api | + {getLangText('faq')} | {getLangText('imprint')} | {getLangText('terms of service')} | {getLangText('privacy')} diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js b/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js index a2a70a97..0fbca419 100644 --- a/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js +++ b/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js @@ -63,6 +63,11 @@ const PRRegisterPiece = React.createClass({

Portfolio Review

{getLangText('Submission closing on %s', ' 22 Dec 2015')}

+

For more information, visit:  + + portfolio-review.de + +

{getLangText("You're submitting as %s. ", currentUser.email)} {getLangText('Change account?')} diff --git a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js index ebf2108d..302495a0 100644 --- a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js +++ b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js @@ -18,7 +18,7 @@ let Vivi23Landing = React.createClass({ }, componentWillMount() { - setDocumentTitle('23vivi Marketplace'); + setDocumentTitle('23VIVI Marketplace'); }, componentDidMount() { @@ -42,7 +42,7 @@ let Vivi23Landing = React.createClass({

- {getLangText('Artwork from the 23vivi Marketplace is powered by') + ' '} + {getLangText('Artwork from the 23VIVI Marketplace is powered by') + ' '}
diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js index 1a80c9b1..74edc51b 100644 --- a/js/constants/application_constants.js +++ b/js/constants/application_constants.js @@ -60,7 +60,7 @@ const constants = { }, { 'subdomain': '23vivi', - 'name': '23vivi', + 'name': '23VIVI', 'logo': 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/23vivi/23vivi-logo.png', 'permissions': ['register', 'edit', 'share', 'del_from_collection'], 'type': 'wallet' diff --git a/js/utils/requests.js b/js/utils/requests.js index d3f5d964..8388f9db 100644 --- a/js/utils/requests.js +++ b/js/utils/requests.js @@ -37,7 +37,7 @@ class Requests { reject(error); } else if(body && body.detail) { reject(new Error(body.detail)); - } else if(!body.success) { + } else if('success' in body && !body.success) { let error = new Error('Client Request Error'); error.json = { status: response.status, diff --git a/sass/ascribe-fonts/ascribe-fonts.scss b/sass/ascribe-fonts/ascribe-fonts.scss index bf2f113f..6f95a616 100644 --- a/sass/ascribe-fonts/ascribe-fonts.scss +++ b/sass/ascribe-fonts/ascribe-fonts.scss @@ -4,7 +4,7 @@ its fairly straight forward. If someone wants you to add a new glyph go to the site, - drop in the regular ascribe-logo font and select all icons. + drop in the regular ascribe-font font and select all icons. Then also add the new glyph, name and address it correctly and download the font again. @@ -13,17 +13,18 @@ @font-face { font-family: 'ascribe-font'; - src:url('#{$BASE_URL}static/fonts/ascribe-logo.eot?q6qoae'); - src:url('#{$BASE_URL}static/fonts/ascribe-logo.eot?q6qoae#iefix') format('embedded-opentype'), - url('#{$BASE_URL}static/fonts/ascribe-logo.ttf?q6qoae') format('truetype'), - url('#{$BASE_URL}static/fonts/ascribe-logo.woff?q6qoae') format('woff'), - url('#{$BASE_URL}static/fonts/ascribe-logo.svg?q6qoae#ascribe-logo') format('svg'); + src:url('#{$BASE_URL}static/fonts/ascribe-font.eot?q6qoae'); + src:url('#{$BASE_URL}static/fonts/ascribe-font.eot?q6qoae#iefix') format('embedded-opentype'), + url('#{$BASE_URL}static/fonts/ascribe-font.ttf?q6qoae') format('truetype'), + url('#{$BASE_URL}static/fonts/ascribe-font.woff?q6qoae') format('woff'), + url('#{$BASE_URL}static/fonts/ascribe-font.svg?q6qoae#ascribe-font') format('svg'); font-weight: normal; font-style: normal; } [class^="icon-ascribe-"], [class*=" icon-ascribe-"] { - font-family: 'ascribe-font'; + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'ascribe-font' !important; speak: none; font-style: normal; font-weight: normal; @@ -66,13 +67,15 @@ .icon-ascribe-logo:before { content: "\e808"; } - .icon-ascribe-ok:before { content: "\e809"; font-size: .7em; } +.icon-ascribe-thin-cross:before { + content: "\e810"; +} .btn-glyph-ascribe { font-size: 18px; padding: 4px 12px 0 10px -} \ No newline at end of file +} diff --git a/sass/ascribe_spinner.scss b/sass/ascribe_spinner.scss index 543b1463..133cc6b8 100644 --- a/sass/ascribe_spinner.scss +++ b/sass/ascribe_spinner.scss @@ -114,17 +114,20 @@ $ascribe--spinner-size-sm: 15px; } .spinner-wrapper-lg .spinner-inner { font-size: $ascribe--spinner-size-lg; - top: -64px; + line-height: $ascribe--spinner-size-lg; + top: -50px; } .spinner-wrapper-md .spinner-inner { font-size: $ascribe--spinner-size-md; - top: -38px; + line-height: $ascribe--spinner-size-md; + top: -30px; } .spinner-wrapper-sm .spinner-inner { font-size: $ascribe--spinner-size-sm; - top: -19px; + line-height: $ascribe--spinner-size-sm; + top: -15px; } @-webkit-keyframes spin {