From 3230b0d8c0ddea21c1007b632858e305309fb431 Mon Sep 17 00:00:00 2001
From: tim <tim@ascribe.io>
Date: Mon, 7 Nov 2016 17:47:13 +0100
Subject: [PATCH 1/4] Custom bokk ACL button

---
 .../ascribe_buttons/acls/acl_button.js        |  2 +
 .../ascribe_forms/acl_form_factory.js         | 25 ++++++++
 .../components/bokk/bokk_acl_button_list.js   | 61 +++++++++++++++++++
 .../wallet/components/bokk/bokk_piece_list.js | 34 +++++++++++
 .../whitelabel/wallet/wallet_routes.js        |  4 +-
 5 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 js/components/whitelabel/wallet/components/bokk/bokk_acl_button_list.js
 create mode 100644 js/components/whitelabel/wallet/components/bokk/bokk_piece_list.js

diff --git a/js/components/ascribe_buttons/acls/acl_button.js b/js/components/ascribe_buttons/acls/acl_button.js
index f4559627..6d11a3f5 100644
--- a/js/components/ascribe_buttons/acls/acl_button.js
+++ b/js/components/ascribe_buttons/acls/acl_button.js
@@ -42,6 +42,7 @@ export default function AclButton({ action, displayName, title, tooltip }) {
 
         render() {
             const { availableAcls,
+                    buttonAcceptName,
                     buttonAcceptClassName,
                     currentUser,
                     email,
@@ -63,6 +64,7 @@ export default function AclButton({ action, displayName, title, tooltip }) {
                         title={title}>
                         <AclFormFactory
                             action={action}
+                            acceptName={buttonAcceptName}
                             currentUser={currentUser}
                             email={email}
                             pieceOrEditions={pieceOrEditions}
diff --git a/js/components/ascribe_forms/acl_form_factory.js b/js/components/ascribe_forms/acl_form_factory.js
index 7e9ab4a9..1f6fd018 100644
--- a/js/components/ascribe_forms/acl_form_factory.js
+++ b/js/components/ascribe_forms/acl_form_factory.js
@@ -2,6 +2,8 @@
 
 import React from 'react';
 
+import Button from 'react-bootstrap/lib/Button';
+
 import ConsignForm from '../ascribe_forms/form_consign';
 import UnConsignForm from '../ascribe_forms/form_unconsign';
 import TransferForm from '../ascribe_forms/form_transfer';
@@ -16,10 +18,13 @@ import GlobalNotificationModel from '../../models/global_notification_model';
 import GlobalNotificationActions from '../../actions/global_notification_actions';
 
 import { getAclFormMessage, getAclFormDataId } from '../../utils/form_utils';
+import { getLangText } from '../../utils/lang_utils';
+
 
 let AclFormFactory = React.createClass({
     propTypes: {
         action: React.PropTypes.oneOf(AppConstants.aclList).isRequired,
+        acceptName: React.PropTypes.string,
         pieceOrEditions: React.PropTypes.oneOfType([
             React.PropTypes.object,
             React.PropTypes.array
@@ -63,6 +68,7 @@ let AclFormFactory = React.createClass({
                 labels,
                 handleSuccess,
                 showNotification } = this.props;
+        let acceptButton;
 
         const formMessage = message || getAclFormMessage({
             aclName: action,
@@ -71,9 +77,24 @@ let AclFormFactory = React.createClass({
             senderName: currentUser && currentUser.username
         });
 
+        if (this.props.acceptName) {
+            acceptButton = (
+                <div className="modal-footer">
+                    <p className="pull-right">
+                        <Button
+                            className="btn btn-default btn-sm ascribe-margin-1px"
+                            type="submit">
+                            {getLangText(this.props.acceptName)}
+                        </Button>
+                    </p>
+                </div>
+            );
+        }
+
         if (action === 'acl_consign') {
             return (
                 <ConsignForm
+                    buttons={acceptName}
                     autoFocusProperty={autoFocusProperty}
                     email={email}
                     message={formMessage}
@@ -85,6 +106,7 @@ let AclFormFactory = React.createClass({
         } else if (action === 'acl_unconsign') {
             return (
                 <UnConsignForm
+                    buttons={acceptButton}
                     message={formMessage}
                     id={this.getFormDataId()}
                     url={ApiUrls.ownership_unconsigns}
@@ -93,6 +115,7 @@ let AclFormFactory = React.createClass({
         } else if (action === 'acl_transfer') {
             return (
                 <TransferForm
+                    buttons={acceptButton}
                     message={formMessage}
                     id={this.getFormDataId()}
                     url={ApiUrls.ownership_transfers}
@@ -101,6 +124,7 @@ let AclFormFactory = React.createClass({
         } else if (action === 'acl_loan') {
             return (
                 <LoanForm
+                    buttons={acceptButton}
                     email={email}
                     message={formMessage}
                     id={this.getFormDataId()}
@@ -119,6 +143,7 @@ let AclFormFactory = React.createClass({
         } else if (action === 'acl_share') {
             return (
                 <ShareForm
+                    buttons={acceptButton}
                     message={formMessage}
                     id={this.getFormDataId()}
                     url={this.isPiece() ? ApiUrls.ownership_shares_pieces
diff --git a/js/components/whitelabel/wallet/components/bokk/bokk_acl_button_list.js b/js/components/whitelabel/wallet/components/bokk/bokk_acl_button_list.js
new file mode 100644
index 00000000..9b0711c3
--- /dev/null
+++ b/js/components/whitelabel/wallet/components/bokk/bokk_acl_button_list.js
@@ -0,0 +1,61 @@
+'use strict';
+
+import React from 'react';
+
+import AclButton from '../../../../ascribe_buttons/acls/acl_button';
+import DeleteButton from '../../../../ascribe_buttons/delete_button';
+import EmailButton from '../../../../ascribe_buttons/acls/email_button';
+
+import { selectFromObject } from '../../../../../utils/general_utils';
+import { getLangText } from '../../../../../utils/lang_utils';
+
+
+let BokkAclButtonList = React.createClass({
+    propTypes: {
+        availableAcls: React.PropTypes.object.isRequired,
+        currentUser: React.PropTypes.object.isRequired,
+        handleSuccess: React.PropTypes.func.isRequired,
+        pieceOrEditions: React.PropTypes.array.isRequired,
+        whitelabel: React.PropTypes.object.isRequired,
+
+        children: React.PropTypes.oneOfType([
+            React.PropTypes.arrayOf(React.PropTypes.element),
+            React.PropTypes.element
+        ]),
+        className: React.PropTypes.string
+    },
+
+    render() {
+        const { availableAcls,
+                children,
+                className,
+                currentUser,
+                handleSuccess,
+                pieceOrEditions,
+                whitelabel } = this.props;
+
+        const buttonProps = selectFromObject(this.props, [
+            'availableAcls',
+            'currentUser',
+            'handleSuccess',
+            'pieceOrEditions'
+        ]);
+
+        let BokkButton = AclButton({
+            action: 'acl_loan',
+            displayName: 'LoanButton',
+            title: getLangText('Partager avec Bokk')
+        })
+
+        return (
+            <div className={className}>
+                <EmailButton {...buttonProps} />
+                <DeleteButton {...buttonProps} />
+                <BokkButton buttonAcceptName='PARTAGER AVEC BOKK' {...buttonProps} />
+                {children}
+            </div>
+        );
+    }
+});
+
+export default BokkAclButtonList;
diff --git a/js/components/whitelabel/wallet/components/bokk/bokk_piece_list.js b/js/components/whitelabel/wallet/components/bokk/bokk_piece_list.js
new file mode 100644
index 00000000..f2431f0c
--- /dev/null
+++ b/js/components/whitelabel/wallet/components/bokk/bokk_piece_list.js
@@ -0,0 +1,34 @@
+'use strict';
+
+import React from 'react';
+
+import PieceList from '../../../../piece_list';
+import BokkAclButtonList from './bokk_acl_button_list.js';
+
+
+let BokkPieceList = React.createClass({
+    propTypes: {
+        // Provided from PrizeApp
+        currentUser: React.PropTypes.object,
+        whitelabel: React.PropTypes.object,
+
+        // Provided from router
+        location: React.PropTypes.object
+    },
+
+    render() {
+        return (
+            <PieceList
+                {...this.props}
+                redirectTo={{
+                    pathname: '/register_piece',
+                    query: {
+                        'slide_num': 0
+                    }
+                }}
+                bulkModalButtonListType={BokkAclButtonList} />
+        );
+    }
+});
+
+export default BokkPieceList;
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 1bea27db..7b27f4a6 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -20,7 +20,9 @@ import ErrorNotFoundPage from '../../../components/error_not_found_page';
 import Footer from '../../../components/footer.js';
 
 import CCRegisterPiece from './components/cc/cc_register_piece';
+
 import BokkRegisterPiece from './components/bokk/bokk_register_piece';
+import BokkPieceList from './components/bokk/bokk_piece_list';
 
 import CylandLanding from './components/cyland/cyland_landing';
 import CylandPieceContainer from './components/cyland/cyland_detail/cyland_piece_container';
@@ -476,7 +478,7 @@ let ROUTES = {
                 headerTitle={getLangText('+ NEW WORK')} />
             <Route
                 path='collection'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PieceList)}
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(BokkPieceList)}
                 headerTitle={getLangText('COLLECTION')}
                 disableOn='noPieces' />
             <Route

From f4e1b1d796b2cf5d54bd8c9614dd9f3009b2c7c9 Mon Sep 17 00:00:00 2001
From: tim <tim@ascribe.io>
Date: Tue, 8 Nov 2016 12:06:04 +0100
Subject: [PATCH 2/4] Add custom loan button to edition container

---
 .../components/bokk/bokk_edition_container.js | 22 +++++++++++++++++++
 .../whitelabel/wallet/wallet_routes.js        |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 js/components/whitelabel/wallet/components/bokk/bokk_edition_container.js

diff --git a/js/components/whitelabel/wallet/components/bokk/bokk_edition_container.js b/js/components/whitelabel/wallet/components/bokk/bokk_edition_container.js
new file mode 100644
index 00000000..f955fb7d
--- /dev/null
+++ b/js/components/whitelabel/wallet/components/bokk/bokk_edition_container.js
@@ -0,0 +1,22 @@
+'use strict';
+
+import React from 'react';
+
+import BokkAclButtonList from './bokk_acl_button_list';
+
+import EditionContainer from '../../../../ascribe_detail/edition_container';
+
+
+let BokkEditionContainer = React.createClass({
+    propTypes: EditionContainer.propTypes,
+
+    render() {
+        return (
+            <EditionContainer
+                {...this.props}
+                actionPanelButtonListType={BokkAclButtonList} />
+        );
+    }
+});
+
+export default BokkEditionContainer;
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 7b27f4a6..007fd657 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -23,6 +23,7 @@ import CCRegisterPiece from './components/cc/cc_register_piece';
 
 import BokkRegisterPiece from './components/bokk/bokk_register_piece';
 import BokkPieceList from './components/bokk/bokk_piece_list';
+import BokkEditionContainer from './components/bokk/bokk_edition_container';
 
 import CylandLanding from './components/cyland/cyland_landing';
 import CylandPieceContainer from './components/cyland/cyland_detail/cyland_piece_container';
@@ -486,7 +487,7 @@ let ROUTES = {
                 component={PieceContainer} />
             <Route
                 path='editions/:editionId'
-                component={EditionContainer} />
+                component={BokkEditionContainer} />
             <Route
                 path='coa_verify'
                 component={CoaVerifyContainer} />

From 84ef592ed3954de247c54b372bd5df51df3ab84d Mon Sep 17 00:00:00 2001
From: tim <tim@ascribe.io>
Date: Tue, 8 Nov 2016 12:09:21 +0100
Subject: [PATCH 3/4] Fix incorrect variable reference

---
 js/components/ascribe_forms/acl_form_factory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/components/ascribe_forms/acl_form_factory.js b/js/components/ascribe_forms/acl_form_factory.js
index 1f6fd018..64dfacea 100644
--- a/js/components/ascribe_forms/acl_form_factory.js
+++ b/js/components/ascribe_forms/acl_form_factory.js
@@ -94,7 +94,7 @@ let AclFormFactory = React.createClass({
         if (action === 'acl_consign') {
             return (
                 <ConsignForm
-                    buttons={acceptName}
+                    buttons={acceptButton}
                     autoFocusProperty={autoFocusProperty}
                     email={email}
                     message={formMessage}

From 94b27c71e6048f927b191cf8d7b0ab6a28bab52b Mon Sep 17 00:00:00 2001
From: Oscar Rezo <o.perez@rezoloco.com>
Date: Mon, 7 Nov 2016 16:17:57 +0100
Subject: [PATCH 4/4] New bokk custom scss.

---
 .../wallet/bokk/bokk_custom_style.scss        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/sass/whitelabel/wallet/bokk/bokk_custom_style.scss b/sass/whitelabel/wallet/bokk/bokk_custom_style.scss
index cc6842ca..0038627f 100644
--- a/sass/whitelabel/wallet/bokk/bokk_custom_style.scss
+++ b/sass/whitelabel/wallet/bokk/bokk_custom_style.scss
@@ -2,6 +2,7 @@ $bokk--nav-bg-color: #4d2e80;
 $bokk--nav-fg-prim-color: #1E1E1E;
 $bokk--button-color: #ab52bd;
 $bokk--hover-color: ;
+$bokk--nav-bt:#FFFFFF;
 
 .client--bokk {
     .navbar-default {
@@ -14,17 +15,19 @@ $bokk--hover-color: ;
 	}
     .navbar-nav > li > a,
     .navbar-nav > li > .active a {
-        color: $bokk--nav-fg-prim-color;
+        color: $bokk--nav-bt;
         background-color: $bokk--nav-bg-color;
     }
     .navbar-nav > li > a:hover {
         color: lighten($bokk--nav-fg-prim-color, 40%);
+		padding-bottom:5px;
+		border-bottom: 1px solid $bokk--button-color;
     }
     .navbar-nav > .active a,
     .navbar-nav > .active a:hover,
     .navbar-nav > .active a:focus {
-        color: $bokk--nav-fg-prim-color;
-        border-bottom-color: $bokk--nav-fg-prim-color;
+        color: $bokk--nav-bt;
+        border-bottom-color: $bokk--button-color;
         background-color: $bokk--nav-bg-color;
     }
     .dropdown-menu > li > a:hover,
@@ -46,7 +49,7 @@ $bokk--hover-color: ;
     }
 
     .dropdown-menu > li > a {
-        color: $bokk--nav-fg-prim-color;
+        color: $bokk--nav-bt;
     }
 
     .navbar-toggle .icon-bar {
@@ -93,7 +96,7 @@ $bokk--hover-color: ;
     .btn-secondary {
         background-color: $bokk--nav-bg-color;
         border-color: $bokk--nav-fg-prim-color;
-        color: $bokk--nav-fg-prim-color;
+        color: $bokk--nav-bt;
 
         &:hover,
         &:active,
@@ -104,8 +107,8 @@ $bokk--hover-color: ;
         &.active:hover,
         &.active:focus,
         &.active.focus {
-            background-color: $bokk--nav-fg-prim-color;
-            border-color: $bokk--nav-fg-prim-color;
+            background-color: $bokk--nav-bt;
+            border-color: $bokk--nav-bg-color;
             color: $bokk--nav-bg-color;
         }
     }
@@ -219,4 +222,4 @@ $bokk--hover-color: ;
 
 .client--bokk  .upload-button-wrapper > span {
     color: $bokk--button-color;
-}
+}
\ No newline at end of file