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}> +

+ +

+ + ); + } + if (action === 'acl_consign') { return ( + + + + {children} + + ); + } +}); + +export default BokkAclButtonList; 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 ( + + ); + } +}); + +export default BokkEditionContainer; 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 ( + + ); + } +}); + +export default BokkPieceList; diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js index 1bea27db..007fd657 100644 --- a/js/components/whitelabel/wallet/wallet_routes.js +++ b/js/components/whitelabel/wallet/wallet_routes.js @@ -20,7 +20,10 @@ 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 BokkEditionContainer from './components/bokk/bokk_edition_container'; import CylandLanding from './components/cyland/cyland_landing'; import CylandPieceContainer from './components/cyland/cyland_detail/cyland_piece_container'; @@ -476,7 +479,7 @@ let ROUTES = { headerTitle={getLangText('+ NEW WORK')} /> + component={BokkEditionContainer} /> 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