From 63a32d949ab4409bc8c5c408ce03213acba4737a Mon Sep 17 00:00:00 2001 From: Cevo Date: Thu, 19 Nov 2015 19:47:33 +0100 Subject: [PATCH] transfer added --- js/components/ascribe_detail/edition_action_panel.js | 2 +- js/components/ascribe_detail/piece_container.js | 3 ++- js/components/whitelabel/prize/prize_routes.js | 2 +- js/constants/acl_information_text.js | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/js/components/ascribe_detail/edition_action_panel.js b/js/components/ascribe_detail/edition_action_panel.js index a2ad1e58..2ef753fa 100644 --- a/js/components/ascribe_detail/edition_action_panel.js +++ b/js/components/ascribe_detail/edition_action_panel.js @@ -162,7 +162,7 @@ let EditionActionPanel = React.createClass({ editions={[edition]}/> diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js index 59fbfe5c..8cd7df1c 100644 --- a/js/components/ascribe_detail/piece_container.js +++ b/js/components/ascribe_detail/piece_container.js @@ -215,7 +215,8 @@ let PieceContainer = React.createClass({ piece={piece}/> diff --git a/js/components/whitelabel/prize/prize_routes.js b/js/components/whitelabel/prize/prize_routes.js index 1f2c6374..ec0269a5 100644 --- a/js/components/whitelabel/prize/prize_routes.js +++ b/js/components/whitelabel/prize/prize_routes.js @@ -71,7 +71,7 @@ const ROUTES = { component={AuthProxyHandler({to: '/register_piece', when: 'loggedIn'})(SPLoginContainer)} /> + component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)} /> diff --git a/js/constants/acl_information_text.js b/js/constants/acl_information_text.js index 0672ed4c..6a04d360 100644 --- a/js/constants/acl_information_text.js +++ b/js/constants/acl_information_text.js @@ -16,6 +16,7 @@ export const AclInformationText = { 'acl_consign': ' - Lets someone represent you in dealing with the work, under the terms you agree to.', 'acl_loan': ' - Lets someone use or put the Work on display for a limited amount of time.', 'acl_share': ' - Lets someone view the Work or Edition via email, but does not give rights to publish or display it.', + 'acl_transfer': ' - Changes ownership of an Edition. As with a physical piece Work, Transferring ownership of an Edition does not transfer copyright in the Work.', 'acl_delete': ' - Removes the Work from your Wallet. Note that the previous registration and transfer ' + 'history will still exist on the blockchain and cannot be deleted.', 'acl_create_editions': ' Lets the artist set a fixed number of editions of a work which can then be transferred, guaranteeing each edition is authentic and from the artist.', @@ -27,6 +28,7 @@ export const AclInformationText = { 'so the gallery can sell them on her behalf, under the terms the artist and the gallery have agreed to)', 'acl_loan': '(e.g. a collector Loans a Work to a gallery for one month for display in the gallery\'s show)', 'acl_share': '(e.g. a photographer Shares proofs of a graduation photo with the graduate\'s grandparents by email)', + 'acl_transfer': '(e.g. a musician Transfers limited edition 1 of 10 of her new album to a very happy fan)', 'acl_delete': '(e.g. an artist uploaded the wrong file and doesn\'t want it cluttering his Wallet, so he Deletes it)', 'acl_create_editions': '(e.g. A company commissions a visual artists to create three limited edition prints for a giveaway)', 'acl_unconsign': '(e.g. An artist regains full control over their work and releases the consignee of any rights or responsibilities)',