From 66e4591a56d425292161fe6b2861e0fe3482aee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Fri, 4 Mar 2016 14:27:56 +0100
Subject: [PATCH 1/5] Whitelabel signup form

---
 js/components/ascribe_forms/form_signup.js | 8 +++++---
 js/components/signup_container.js          | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/js/components/ascribe_forms/form_signup.js b/js/components/ascribe_forms/form_signup.js
index 90d5e3ec..73a4ad3f 100644
--- a/js/components/ascribe_forms/form_signup.js
+++ b/js/components/ascribe_forms/form_signup.js
@@ -28,7 +28,8 @@ let SignupForm = React.createClass({
             React.PropTypes.arrayOf(React.PropTypes.element),
             React.PropTypes.element,
             React.PropTypes.string
-        ])
+        ]),
+        whitelabel: React.PropTypes.object
     },
 
     mixins: [History],
@@ -61,7 +62,8 @@ let SignupForm = React.createClass({
         const { children,
                 headerMessage,
                 location: { query: { email: emailQuery } },
-                submitMessage } = this.props;
+                submitMessage,
+                whitelabel: { name: whitelabelName} } = this.props;
 
         const tooltipPassword = getLangText('Your password must be at least 10 characters') + '.\n ' +
                                 getLangText('This password is securing your digital property like a bank account') + '.\n ' +
@@ -85,7 +87,7 @@ let SignupForm = React.createClass({
                     </span>
                 }>
                 <div className="ascribe-form-header">
-                    <h3>{headerMessage}</h3>
+                    <h3>{whitelabelName ? `Welcome to ${whitelabelName}` : headerMessage}</h3>
                 </div>
                 <Property
                     name='email'
diff --git a/js/components/signup_container.js b/js/components/signup_container.js
index 42656794..8585cfb1 100644
--- a/js/components/signup_container.js
+++ b/js/components/signup_container.js
@@ -34,7 +34,7 @@ let SignupContainer = React.createClass({
     },
 
     render() {
-        const { location } = this.props;
+        const { location, whitelabel } = this.props;
         const { message, submitted } = this.state;
 
         setDocumentTitle(getLangText('Sign up'));
@@ -53,9 +53,10 @@ let SignupContainer = React.createClass({
             <div className="ascribe-login-wrapper">
                 <SignupForm
                     handleSuccess={this.handleSuccess}
+                    whitelabel={whitelabel}
                     location={location}/>
                 <div className="ascribe-login-text">
-                    {getLangText('Already an ascribe user')}&#63; <Link to="/login">{getLangText('Log in')}...</Link><br/>
+                    {getLangText(`Already a ${whitelabel.name || 'ascribe'} user`)}&#63; <Link to="/login">{getLangText('Log in')}...</Link><br/>
                 </div>
             </div>
 

From 1c94ecc1777c971bf80a92248e2c57e66bfdbd0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Fri, 4 Mar 2016 15:53:55 +0100
Subject: [PATCH 2/5] Add footer property to Route

---
 js/components/ascribe_app.js                  |   3 +-
 js/components/footer.js                       |   9 +-
 .../prize/portfolioreview/pr_app.js           |   3 +-
 .../whitelabel/prize/prize_routes.js          |  72 +++----
 .../prize/simple_prize/prize_app.js           |   3 +-
 js/components/whitelabel/wallet/wallet_app.js |   3 +-
 .../whitelabel/wallet/wallet_routes.js        | 199 ++++++------------
 js/routes.js                                  |  38 ++--
 8 files changed, 128 insertions(+), 202 deletions(-)

diff --git a/js/components/ascribe_app.js b/js/components/ascribe_app.js
index 87ab1daf..4848c01a 100644
--- a/js/components/ascribe_app.js
+++ b/js/components/ascribe_app.js
@@ -21,6 +21,7 @@ let AscribeApp = React.createClass({
 
     render() {
         const { activeRoute, children, currentUser, routes, whitelabel } = this.props;
+        const Footer = activeRoute && activeRoute.footer;
 
         return (
             <div className="ascribe-app ascribe-default-app">
@@ -34,7 +35,7 @@ let AscribeApp = React.createClass({
                     {/* Routes are injected here */}
                     {children}
                 </AppRouteWrapper>
-                <Footer activeRoute={activeRoute} />
+                {Footer ? <Footer /> : null}
             </div>
         );
     }
diff --git a/js/components/footer.js b/js/components/footer.js
index 3010da4d..ced01fb5 100644
--- a/js/components/footer.js
+++ b/js/components/footer.js
@@ -4,13 +4,10 @@ import React from 'react';
 
 import { getLangText } from '../utils/lang_utils';
 
-let Footer = React.createClass({
-    propTypes: {
-        activeRoute: React.PropTypes.object.isRequired
-    },
 
+const Footer = React.createClass({
     render() {
-        return !this.props.activeRoute.hideFooter ? (
+        return (
             <div className="ascribe-footer hidden-print">
                 <p className="ascribe-sub-sub-statement">
                   <br />
@@ -28,7 +25,7 @@ let Footer = React.createClass({
                     <a href="https://www.linkedin.com/company/4816284?trk=vsrp_companies_res_name&trkInfo=VSRPsearchId%3A122827941425632318075%2CVSRPtargetId%3A4816284%2CVSRPcmpt%3Aprimary" className="social social-linked-in" target="_blank"></a>
                 </p>
             </div>
-        ) : null;
+        );
     }
 });
 
diff --git a/js/components/whitelabel/prize/portfolioreview/pr_app.js b/js/components/whitelabel/prize/portfolioreview/pr_app.js
index d8b9f982..1639e750 100644
--- a/js/components/whitelabel/prize/portfolioreview/pr_app.js
+++ b/js/components/whitelabel/prize/portfolioreview/pr_app.js
@@ -35,6 +35,7 @@ let PRApp = React.createClass({
         const { activeRoute, children, currentUser, history, routes, whitelabel } = this.props;
         const subdomain = getSubdomain();
         const path = activeRoute && activeRoute.path;
+        const Footer = activeRoute && activeRoute.footer;
 
         let style = {};
         let header;
@@ -64,7 +65,7 @@ let PRApp = React.createClass({
                     {/* Routes are injected here */}
                     {children}
                 </AppRouteWrapper>
-                <Footer activeRoute={activeRoute} />
+                {Footer ? <Footer /> : null}
             </div>
         );
     }
diff --git a/js/components/whitelabel/prize/prize_routes.js b/js/components/whitelabel/prize/prize_routes.js
index 79b64f29..f1f32772 100644
--- a/js/components/whitelabel/prize/prize_routes.js
+++ b/js/components/whitelabel/prize/prize_routes.js
@@ -35,115 +35,91 @@ const ROUTES = {
     sluice: (
         <Route path='/' component={SPApp}>
             <IndexRoute
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLanding)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLanding)} />
             <Route
                 path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLoginContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLoginContainer)} />
             <Route
                 path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPSignupContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPSignupContainer)} />
             <Route
                 path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)} />
             <Route
                 path='register_piece'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPRegisterPiece)}
-                headerTitle={getLangText('+ NEW WORK')}
-                hideFooter />
+                headerTitle={getLangText('+ NEW WORK')} />
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPPieceList)}
-                headerTitle={getLangText('COLLECTION')}
-                hideFooter />
+                headerTitle={getLangText('COLLECTION')} />
             <Route
                 path='pieces/:pieceId'
-                component={SluicePieceContainer}
-                hideFooter />
+                component={SluicePieceContainer} />
             <Route
                 path='editions/:editionId'
-                component={EditionContainer}
-                hideFooter />
+                component={EditionContainer} />
             <Route
                 path='coa_verify'
-                component={CoaVerifyContainer}
-                hideFooter />
+                component={CoaVerifyContainer} />
             <Route
                 path='*'
-                component={ErrorNotFoundPage}
-                hideFooter />
+                component={ErrorNotFoundPage} />
         </Route>
     ),
     portfolioreview: (
         <Route path='/' component={PRApp}>
             <IndexRoute
-                component={ProxyHandler(AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }))(PRLanding)}
-                hideFooter />
+                component={ProxyHandler(AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }))(PRLanding)} />
             <Route
                 path='register_piece'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PRRegisterPiece)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PRRegisterPiece)} />
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPPieceList)}
-                headerTitle={getLangText('SUBMISSIONS')}
-                hideFooter />
+                headerTitle={getLangText('SUBMISSIONS')} />
             <Route
                 path='login'
                 component={ProxyHandler(
                     AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
                     AuthRedirect({to: '/register_piece', when: 'loggedIn'})
-                )(SPLoginContainer)}
-                hideFooter />
+                )(SPLoginContainer)} />
             <Route
                 path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
                 component={ProxyHandler(
                     AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
                     AuthRedirect({to: '/register_piece', when: 'loggedIn'})
-                )(SPSignupContainer)}
-                hideFooter />
+                )(SPSignupContainer)} />
             <Route
                 path='password_reset'
                 component={ProxyHandler(
                     AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
                     AuthRedirect({to: '/register_piece', when: 'loggedIn'})
-                )(PasswordResetContainer)}
-                hideFooter />
+                )(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)} />
             <Route
                 path='pieces/:pieceId'
-                component={SPPieceContainer}
-                hideFooter />
+                component={SPPieceContainer} />
             <Route
                 path='editions/:editionId'
-                component={EditionContainer}
-                hideFooter />
+                component={EditionContainer} />
             <Route
                 path='coa_verify'
-                component={CoaVerifyContainer}
-                hideFooter />
+                component={CoaVerifyContainer} />
             <Route
                 path='*'
-                component={ErrorNotFoundPage}
-                hideFooter />
+                component={ErrorNotFoundPage} />
         </Route>
     )
 };
diff --git a/js/components/whitelabel/prize/simple_prize/prize_app.js b/js/components/whitelabel/prize/simple_prize/prize_app.js
index 7e0facc9..dd1556c5 100644
--- a/js/components/whitelabel/prize/simple_prize/prize_app.js
+++ b/js/components/whitelabel/prize/simple_prize/prize_app.js
@@ -29,6 +29,7 @@ let PrizeApp = React.createClass({
         const { activeRoute, children, currentUser, history, routes, whitelabel } = this.props;
         const subdomain = getSubdomain();
         const path = activeRoute && activeRoute.path;
+        const Footer = activeRoute && activeRoute.footer;
 
         let header = null;
         // if the path of the current activeRoute is not defined, then this is the IndexRoute
@@ -52,7 +53,7 @@ let PrizeApp = React.createClass({
                     {/* Routes are injected here */}
                     {children}
                 </AppRouteWrapper>
-                <Footer activeRoute={activeRoute} />
+                {Footer ? <Footer /> : null}
             </div>
         );
     }
diff --git a/js/components/whitelabel/wallet/wallet_app.js b/js/components/whitelabel/wallet/wallet_app.js
index 61e3327f..c40d075c 100644
--- a/js/components/whitelabel/wallet/wallet_app.js
+++ b/js/components/whitelabel/wallet/wallet_app.js
@@ -27,6 +27,7 @@ let WalletApp = React.createClass({
         const { activeRoute, children, currentUser, history, routes, whitelabel } = this.props;
         const subdomain = getSubdomain();
         const path = activeRoute && activeRoute.path;
+        const Footer = activeRoute && activeRoute.footer;
 
         let header = null;
         // if the path of the current activeRoute is not defined, then this is the IndexRoute
@@ -53,7 +54,7 @@ let WalletApp = React.createClass({
                     {/* Routes are injected here */}
                     {children}
                 </AppRouteWrapper>
-                <Footer activeRoute={activeRoute} />
+                {Footer ? <Footer /> : null}
             </div>
         );
     }
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index f7c60a88..75e59487 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -17,6 +17,7 @@ import EditionContainer from '../../../components/ascribe_detail/edition_contain
 import SettingsContainer from '../../../components/ascribe_settings/settings_container';
 import ContractSettings from '../../../components/ascribe_settings/contract_settings';
 import ErrorNotFoundPage from '../../../components/error_not_found_page';
+import Footer from '../../../components/footer.js';
 
 import CCRegisterPiece from './components/cc/cc_register_piece';
 
@@ -57,301 +58,235 @@ let ROUTES = {
     'cyland': (
         <Route path='/' component={WalletApp}>
             <IndexRoute
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(CylandLanding)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(CylandLanding)} />
             <Route
                 path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
             <Route
                 path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
             <Route
                 path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
             <Route
                 path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
             <Route
                 path='register_piece'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CylandRegisterPiece)}
                 headerTitle={getLangText('+ NEW WORK')}
-                aclName='acl_wallet_submit'
-                hideFooter />
+                aclName='acl_wallet_submit' />
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CylandPieceList)}
                 headerTitle={getLangText('COLLECTION')}
-                disableOn='noPieces'
-                hideFooter />
+                disableOn='noPieces' />
             <Route
                 path='editions/:editionId'
-                component={EditionContainer}
-                hideFooter />
+                component={EditionContainer} />
             <Route
                 path='coa_verify'
-                component={CoaVerifyContainer}
-                hideFooter />
+                component={CoaVerifyContainer} />
             <Route
                 path='pieces/:pieceId'
-                component={CylandPieceContainer}
-                hideFooter />
+                component={CylandPieceContainer} />
             <Route
                 path='*'
-                component={ErrorNotFoundPage}
-                hideFooter />
+                component={ErrorNotFoundPage} />
         </Route>
     ),
     'cc': (
         <Route path='/' component={WalletApp}>
             <Route
                 path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
             <Route
                 path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
             <Route
                 path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
             <Route
                 path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
             <Route
                 path='register_piece'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CCRegisterPiece)}
-                headerTitle={getLangText('+ NEW WORK')}
-                hideFooter />
+                headerTitle={getLangText('+ NEW WORK')} />
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PieceList)}
                 headerTitle={getLangText('COLLECTION')}
-                disableOn='noPieces'
-                hideFooter />
+                disableOn='noPieces' />
             <Route
                 path='pieces/:pieceId'
-                component={PieceContainer}
-                hideFooter />
+                component={PieceContainer} />
             <Route
                 path='editions/:editionId'
-                component={EditionContainer}
-                hideFooter />
+                component={EditionContainer} />
             <Route
                 path='coa_verify'
-                component={CoaVerifyContainer}
-                hideFooter />
+                component={CoaVerifyContainer} />
             <Route
                 path='*'
-                component={ErrorNotFoundPage}
-                hideFooter />
+                component={ErrorNotFoundPage} />
         </Route>
     ),
     'ikonotv': (
         <Route path='/' component={WalletApp}>
             <IndexRoute
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(IkonotvLanding)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(IkonotvLanding)} />
             <Route
                 path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
             <Route
                 path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
             <Route
                 path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
             <Route
                 path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
             <Route
                 path='request_loan'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SendContractAgreementForm)}
                 headerTitle={getLangText('SEND NEW CONTRACT')}
-                aclName='acl_create_contractagreement'
-                hideFooter />
+                aclName='acl_create_contractagreement' />
             <Route
                 path='register_piece'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvRegisterPiece)}
                 headerTitle={getLangText('+ NEW WORK')}
-                aclName='acl_wallet_submit'
-                hideFooter />
+                aclName='acl_wallet_submit' />
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvPieceList)}
                 headerTitle={getLangText('COLLECTION')}
-                disableOn='noPieces'
-                hideFooter />
+                disableOn='noPieces' />
             <Route
                 path='contract_notifications'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvContractNotifications)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvContractNotifications)} />
             <Route
                 path='pieces/:pieceId'
-                component={IkonotvPieceContainer}
-                hideFooter />
+                component={IkonotvPieceContainer} />
             <Route
                 path='editions/:editionId'
-                component={EditionContainer}
-                hideFooter />
+                component={EditionContainer} />
             <Route
                 path='coa_verify'
-                component={CoaVerifyContainer}
-                hideFooter />
+                component={CoaVerifyContainer} />
             <Route
                 path='*'
-                component={ErrorNotFoundPage}
-                hideFooter />
+                component={ErrorNotFoundPage} />
         </Route>
     ),
     'lumenus': (
         <Route path='/' component={WalletApp}>
             <IndexRoute
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LumenusLanding)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LumenusLanding)} />
             <Route
                 path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
             <Route
                 path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
             <Route
                 path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
             <Route
                 path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
             <Route
                 path='register_piece'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketRegisterPiece)}
                 headerTitle={getLangText('+ NEW WORK')}
-                aclName='acl_wallet_submit'
-                hideFooter />
+                aclName='acl_wallet_submit' />
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketPieceList)}
                 headerTitle={getLangText('COLLECTION')}
-                disableOn='noPieces'
-                hideFooter />
+                disableOn='noPieces' />
             <Route
                 path='pieces/:pieceId'
-                component={MarketPieceContainer}
-                hideFooter />
+                component={MarketPieceContainer} />
             <Route
                 path='editions/:editionId'
-                component={MarketEditionContainer}
-                hideFooter />
+                component={MarketEditionContainer} />
             <Route
                 path='coa_verify'
-                component={CoaVerifyContainer}
-                hideFooter />
+                component={CoaVerifyContainer} />
             <Route
                 path='*'
-                component={ErrorNotFoundPage}
-                hideFooter />
+                component={ErrorNotFoundPage} />
         </Route>
     ),
     '23vivi': (
         <Route path='/' component={WalletApp}>
-            <IndexRoute component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(Vivi23Landing)}
-                hideFooter />
+            <IndexRoute component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(Vivi23Landing)} />
             <Route
                 path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
             <Route
                 path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
             <Route
                 path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
             <Route
                 path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
             <Route
                 path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
             <Route
                 path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
-                hideFooter />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
             <Route
                 path='register_piece'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketRegisterPiece)}
                 headerTitle={getLangText('+ NEW WORK')}
-                aclName='acl_wallet_submit'
-                hideFooter />
+                aclName='acl_wallet_submit' />
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(Vivi23PieceList)}
                 headerTitle={getLangText('COLLECTION')}
-                disableOn='noPieces'
-                hideFooter />
+                disableOn='noPieces' />
             <Route
                 path='pieces/:pieceId'
-                component={MarketPieceContainer}
-                hideFooter />
+                component={MarketPieceContainer} />
             <Route
                 path='editions/:editionId'
-                component={MarketEditionContainer}
-                hideFooter />
+                component={MarketEditionContainer} />
             <Route
                 path='coa_verify'
-                component={CoaVerifyContainer}
-                hideFooter />
+                component={CoaVerifyContainer} />
             <Route
                 path='*'
-                component={ErrorNotFoundPage}
-                hideFooter />
+                component={ErrorNotFoundPage} />
         </Route>
     ),
     'polline': (
diff --git a/js/routes.js b/js/routes.js
index cc76cb3a..6baba4de 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -25,6 +25,8 @@ import ErrorNotFoundPage from './components/error_not_found_page';
 
 import RegisterPiece from './components/register_piece';
 
+import Footer from './components/footer';
+
 import { ProxyHandler, AuthRedirect } from './components/ascribe_routes/proxy_handler';
 
 import { getLangText } from './utils/lang_utils';
@@ -34,35 +36,47 @@ const COMMON_ROUTES = (
     <Route path='/' component={AscribeApp}>
         <Route
             path='login'
-            component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
+            component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+            footer={Footer} />
         <Route
             path='register_piece'
             component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(RegisterPiece)}
-            headerTitle={getLangText('+ NEW WORK')} />
+            headerTitle={getLangText('+ NEW WORK')}
+            footer={Footer} />
         <Route
             path='collection'
             component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PieceList)}
             headerTitle={getLangText('COLLECTION')}
-            disableOn='noPieces' />
+            disableOn='noPieces'
+            footer={Footer} />
         <Route
             path='signup'
-            component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
+            component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+            footer={Footer} />
         <Route
             path='logout'
-            component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(LogoutContainer)}/>
-        <Route path='pieces/:pieceId' component={PieceContainer} />
-        <Route path='editions/:editionId' component={EditionContainer} />
+            component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(LogoutContainer)}
+            footer={Footer} />
+        <Route path='pieces/:pieceId' component={PieceContainer}
+            footer={Footer} />
+        <Route path='editions/:editionId' component={EditionContainer}
+            footer={Footer} />
         <Route
             path='password_reset'
-            component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
+            component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+            footer={Footer} />
         <Route
             path='settings'
-            component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
+            component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+            footer={Footer} />
         <Route
             path='contract_settings'
-            component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
-        <Route path='coa_verify' component={CoaVerifyContainer} />
-        <Route path='*' component={ErrorNotFoundPage} />
+            component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+            footer={Footer} />
+        <Route path='coa_verify' component={CoaVerifyContainer}
+            footer={Footer} />
+        <Route path='*' component={ErrorNotFoundPage}
+            footer={Footer} />
     </Route>
 );
 

From 6301c0fe467ca8b57524c4c1f9e942206d9bd2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Mon, 7 Mar 2016 13:45:40 +0100
Subject: [PATCH 3/5] Refactor to route specific footer

---
 js/components/header.js                       | 24 ++++++------
 .../prize/portfolioreview/pr_app.js           |  1 -
 .../prize/simple_prize/prize_app.js           |  1 -
 .../components/23vivi/23vivi_landing.js       |  2 +-
 .../wallet/components/market/market_footer.js | 27 ++++++++++++++
 js/components/whitelabel/wallet/wallet_app.js |  1 -
 .../whitelabel/wallet/wallet_routes.js        | 37 +++++++++++++------
 sass/whitelabel/wallet/index.scss             |  1 +
 sass/whitelabel/wallet/market/index.scss      |  1 +
 .../wallet/market/market_footer.scss          | 15 ++++++++
 10 files changed, 82 insertions(+), 28 deletions(-)
 create mode 100644 js/components/whitelabel/wallet/components/market/market_footer.js
 create mode 100644 sass/whitelabel/wallet/market/index.scss
 create mode 100644 sass/whitelabel/wallet/market/market_footer.scss

diff --git a/js/components/header.js b/js/components/header.js
index ed04a736..181e14c0 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -82,16 +82,12 @@ let Header = React.createClass({
 
     getPoweredBy() {
         return (
-            <AclProxy
-                aclObject={this.props.whitelabel}
-                aclName="acl_view_powered_by">
-                    <li>
-                        <a className="pull-right ascribe-powered-by" href="https://www.ascribe.io/" target="_blank">
-                            <span id="powered">{getLangText('powered by')} </span>
-                            <span className="icon-ascribe-logo"></span>
-                        </a>
-                    </li>
-            </AclProxy>
+            <li>
+                <a className="pull-right ascribe-powered-by" href="https://www.ascribe.io/" target="_blank">
+                    <span id="powered">{getLangText('powered by')} </span>
+                    <span className="icon-ascribe-logo"></span>
+                </a>
+            </li>
         );
     },
 
@@ -130,7 +126,7 @@ let Header = React.createClass({
     },
 
     render() {
-        const { currentUser, routes  } = this.props;
+        const { currentUser, routes, whitelabel } = this.props;
         const { unfilteredPieceListCount } = this.state;
 
         let account;
@@ -211,7 +207,11 @@ let Header = React.createClass({
                     className="hidden-print">
                     <CollapsibleNav eventKey={0}>
                         <Nav navbar left>
-                            {this.getPoweredBy()}
+                            <AclProxy
+                                aclObject={whitelabel}
+                                aclName="acl_view_powered_by">
+                                {this.getPoweredBy()}
+                            </AclProxy>
                         </Nav>
                         <Nav navbar right>
                             <HeaderNotificationDebug show={false} />
diff --git a/js/components/whitelabel/prize/portfolioreview/pr_app.js b/js/components/whitelabel/prize/portfolioreview/pr_app.js
index 1639e750..2d097c75 100644
--- a/js/components/whitelabel/prize/portfolioreview/pr_app.js
+++ b/js/components/whitelabel/prize/portfolioreview/pr_app.js
@@ -12,7 +12,6 @@ import Hero from './components/pr_hero';
 
 import AppBase from '../../../app_base';
 import AppRouteWrapper from '../../../app_route_wrapper';
-import Footer from '../../../footer';
 import Header from '../../../header';
 
 import { getSubdomain } from '../../../../utils/general_utils';
diff --git a/js/components/whitelabel/prize/simple_prize/prize_app.js b/js/components/whitelabel/prize/simple_prize/prize_app.js
index dd1556c5..43d7ebc9 100644
--- a/js/components/whitelabel/prize/simple_prize/prize_app.js
+++ b/js/components/whitelabel/prize/simple_prize/prize_app.js
@@ -7,7 +7,6 @@ import Hero from './components/prize_hero';
 
 import AppBase from '../../../app_base';
 import AppRouteWrapper from '../../../app_route_wrapper';
-import Footer from '../../../footer';
 import Header from '../../../header';
 
 import { getSubdomain } from '../../../../utils/general_utils';
diff --git a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
index 2a1cd0bc..06fdccb6 100644
--- a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
+++ b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
@@ -36,7 +36,7 @@ let Vivi23Landing = React.createClass({
                                 src={this.props.whitelabel.logo}
                                 height="75" />
                             <div>
-                                {getLangText('23VIVI Marketplace is powered by') + ' '}
+                                {getLangText('23VIVI digital wallet is powered by') + ' '}
                                 <span className="icon-ascribe-logo" />
                             </div>
                         </div>
diff --git a/js/components/whitelabel/wallet/components/market/market_footer.js b/js/components/whitelabel/wallet/components/market/market_footer.js
new file mode 100644
index 00000000..6d033fdb
--- /dev/null
+++ b/js/components/whitelabel/wallet/components/market/market_footer.js
@@ -0,0 +1,27 @@
+'use strict';
+
+import React from 'react';
+
+import { getLangText } from '../../../../../utils/lang_utils';
+
+
+const MarketFooter = React.createClass({
+    render() {
+        return (
+            <div className="container hidden-print">
+                <div className="row">
+                    <div className="whitelabel-footer">
+                    <hr/>
+                        <span id="powered">{getLangText('Digital wallet powered by')} </span>
+                        <a className="ascribe-powered-by" href="https://www.ascribe.io/" target="_blank">
+                            <span className="icon-ascribe-logo"></span>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+});
+
+
+export default MarketFooter;
diff --git a/js/components/whitelabel/wallet/wallet_app.js b/js/components/whitelabel/wallet/wallet_app.js
index c40d075c..e382377b 100644
--- a/js/components/whitelabel/wallet/wallet_app.js
+++ b/js/components/whitelabel/wallet/wallet_app.js
@@ -5,7 +5,6 @@ import classNames from 'classnames';
 
 import AppBase from '../../app_base';
 import AppRouteWrapper from '../../app_route_wrapper';
-import Footer from '../../footer';
 import Header from '../../header';
 
 import { getSubdomain } from '../../../utils/general_utils';
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 75e59487..d94d8130 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -37,6 +37,7 @@ import MarketPieceList from './components/market/market_piece_list';
 import MarketRegisterPiece from './components/market/market_register_piece';
 import MarketPieceContainer from './components/market/market_detail/market_piece_container';
 import MarketEditionContainer from './components/market/market_detail/market_edition_container';
+import MarketFooter from './components/market/market_footer';
 
 import LumenusLanding from './components/lumenus/lumenus_landing';
 
@@ -249,44 +250,56 @@ let ROUTES = {
             <IndexRoute component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(Vivi23Landing)} />
             <Route
                 path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+                footer={MarketFooter} />
             <Route
                 path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+                footer={MarketFooter} />
             <Route
                 path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+                footer={MarketFooter} />
             <Route
                 path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+                footer={MarketFooter} />
             <Route
                 path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+                footer={MarketFooter} />
             <Route
                 path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+                footer={MarketFooter} />
             <Route
                 path='register_piece'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketRegisterPiece)}
                 headerTitle={getLangText('+ NEW WORK')}
-                aclName='acl_wallet_submit' />
+                aclName='acl_wallet_submit'
+                footer={MarketFooter} />
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(Vivi23PieceList)}
                 headerTitle={getLangText('COLLECTION')}
-                disableOn='noPieces' />
+                disableOn='noPieces'
+                footer={MarketFooter} />
             <Route
                 path='pieces/:pieceId'
-                component={MarketPieceContainer} />
+                component={MarketPieceContainer}
+                footer={MarketFooter} />
             <Route
                 path='editions/:editionId'
-                component={MarketEditionContainer} />
+                component={MarketEditionContainer}
+                footer={MarketFooter} />
             <Route
                 path='coa_verify'
-                component={CoaVerifyContainer} />
+                component={CoaVerifyContainer}
+                footer={MarketFooter} />
             <Route
                 path='*'
-                component={ErrorNotFoundPage} />
+                component={ErrorNotFoundPage}
+                footer={MarketFooter} />
         </Route>
     ),
     'polline': (
diff --git a/sass/whitelabel/wallet/index.scss b/sass/whitelabel/wallet/index.scss
index 0871f3d6..99c78a1f 100644
--- a/sass/whitelabel/wallet/index.scss
+++ b/sass/whitelabel/wallet/index.scss
@@ -5,6 +5,7 @@
 @import 'polline/polline_custom_style';
 @import 'artcity/artcity_custom_style';
 @import 'demo/demo_custom_style';
+@import 'market/index';
 
 .ascribe-wallet-app {
     border-radius: 0;
diff --git a/sass/whitelabel/wallet/market/index.scss b/sass/whitelabel/wallet/market/index.scss
new file mode 100644
index 00000000..706b7b51
--- /dev/null
+++ b/sass/whitelabel/wallet/market/index.scss
@@ -0,0 +1 @@
+@import 'market_footer';
diff --git a/sass/whitelabel/wallet/market/market_footer.scss b/sass/whitelabel/wallet/market/market_footer.scss
new file mode 100644
index 00000000..90fb94d2
--- /dev/null
+++ b/sass/whitelabel/wallet/market/market_footer.scss
@@ -0,0 +1,15 @@
+.whitelabel-footer {
+    text-align: center;
+    margin-top: 4em;
+    padding: 1em 0 1em 0;
+
+    hr {
+        background-color: rgba(0, 0, 0, 0);
+        //border: 0;
+        margin-bottom: 1.5em;
+    }
+
+    .ascribe-powered-by {
+        font-weight: 300 !important;
+    }
+}

From bc3093d4d7218286b21e69a3505a8a334596d14e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Mon, 7 Mar 2016 14:04:34 +0100
Subject: [PATCH 4/5] Whitelabel login form

- also make some changes to signup form
---
 js/components/ascribe_forms/form_login.js  |  8 +++++---
 js/components/ascribe_forms/form_signup.js | 16 +++++-----------
 js/components/login_container.js           |  9 +++++++--
 js/components/signup_container.js          |  7 ++++---
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/js/components/ascribe_forms/form_login.js b/js/components/ascribe_forms/form_login.js
index 062b4709..2e04e450 100644
--- a/js/components/ascribe_forms/form_login.js
+++ b/js/components/ascribe_forms/form_login.js
@@ -22,7 +22,8 @@ let LoginForm = React.createClass({
     propTypes: {
         headerMessage: React.PropTypes.string,
         submitMessage: React.PropTypes.string,
-        location: React.PropTypes.object
+        location: React.PropTypes.object,
+        whitelabelName: React.PropTypes.string
     },
 
     mixins: [History],
@@ -46,7 +47,8 @@ let LoginForm = React.createClass({
     render() {
         const { headerMessage,
                 location: { query: { email: emailQuery } },
-                submitMessage } = this.props;
+                submitMessage,
+                whitelabelName } = this.props;
 
         return (
             <Form
@@ -67,7 +69,7 @@ let LoginForm = React.createClass({
                     </span>
                     }>
                 <div className="ascribe-form-header">
-                    <h3>{headerMessage}</h3>
+                    <h3>{whitelabelName ? `Welcome to ${whitelabelName}` : headerMessage}</h3>
                 </div>
                 <Property
                     name='email'
diff --git a/js/components/ascribe_forms/form_signup.js b/js/components/ascribe_forms/form_signup.js
index 73a4ad3f..b52eaf6c 100644
--- a/js/components/ascribe_forms/form_signup.js
+++ b/js/components/ascribe_forms/form_signup.js
@@ -29,7 +29,7 @@ let SignupForm = React.createClass({
             React.PropTypes.element,
             React.PropTypes.string
         ]),
-        whitelabel: React.PropTypes.object
+        whitelabelName: React.PropTypes.string
     },
 
     mixins: [History],
@@ -63,11 +63,7 @@ let SignupForm = React.createClass({
                 headerMessage,
                 location: { query: { email: emailQuery } },
                 submitMessage,
-                whitelabel: { name: whitelabelName} } = this.props;
-
-        const tooltipPassword = getLangText('Your password must be at least 10 characters') + '.\n ' +
-                                getLangText('This password is securing your digital property like a bank account') + '.\n ' +
-                                getLangText('Store it in a safe place') + '!';
+                whitelabelName } = this.props;
 
         return (
             <Form
@@ -101,18 +97,16 @@ let SignupForm = React.createClass({
                 </Property>
                 <Property
                     name='password'
-                    label={getLangText('Password')}
-                    tooltip={tooltipPassword}>
+                    label={getLangText('Password')}>
                     <input
                         type="password"
-                        placeholder={getLangText('Use a combination of minimum 10 chars and numbers')}
+                        placeholder={getLangText('Use a combination of minimum 10 characters and numbers')}
                         autoComplete="on"
                         required/>
                 </Property>
                 <Property
                     name='password_confirm'
-                    label={getLangText('Confirm Password')}
-                    tooltip={tooltipPassword}>
+                    label={getLangText('Confirm Password')}>
                     <input
                         type="password"
                         placeholder={getLangText('Enter your password once again')}
diff --git a/js/components/login_container.js b/js/components/login_container.js
index 00c89328..c66d0b21 100644
--- a/js/components/login_container.js
+++ b/js/components/login_container.js
@@ -20,13 +20,18 @@ let LoginContainer = React.createClass({
     },
 
     render() {
+        const { whitelabel: { name: whitelabelName },
+                location } = this.props;
+
         setDocumentTitle(getLangText('Log in'));
 
         return (
             <div className="ascribe-login-wrapper">
-                <LoginForm location={this.props.location} />
+                <LoginForm
+                    location={location}
+                    whitelabelName={whitelabelName} />
                 <div className="ascribe-login-text">
-                    {getLangText('Not an ascribe user')}&#63; <Link to="/signup">{getLangText('Sign up')}...</Link><br/>
+                    {getLangText(`Not a ${whitelabelName || 'ascribe'} user`)}&#63; <Link to="/signup">{getLangText('Sign up')}...</Link><br/>
                     {getLangText('Forgot my password')}&#63; <Link to="/password_reset">{getLangText('Rescue me')}...</Link>
                 </div>
             </div>
diff --git a/js/components/signup_container.js b/js/components/signup_container.js
index 8585cfb1..7fea7ff5 100644
--- a/js/components/signup_container.js
+++ b/js/components/signup_container.js
@@ -34,7 +34,8 @@ let SignupContainer = React.createClass({
     },
 
     render() {
-        const { location, whitelabel } = this.props;
+        const { location,
+                whitelabel: { name: whitelabelName } } = this.props;
         const { message, submitted } = this.state;
 
         setDocumentTitle(getLangText('Sign up'));
@@ -53,10 +54,10 @@ let SignupContainer = React.createClass({
             <div className="ascribe-login-wrapper">
                 <SignupForm
                     handleSuccess={this.handleSuccess}
-                    whitelabel={whitelabel}
+                    whitelabelName={whitelabelName}
                     location={location}/>
                 <div className="ascribe-login-text">
-                    {getLangText(`Already a ${whitelabel.name || 'ascribe'} user`)}&#63; <Link to="/login">{getLangText('Log in')}...</Link><br/>
+                    {getLangText(`Already a ${whitelabelName || 'ascribe'} user`)}&#63; <Link to="/login">{getLangText('Log in')}...</Link><br/>
                 </div>
             </div>
 

From 1edfca48c860f5c9cb558ea01b31370adea91fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Mon, 7 Mar 2016 14:09:51 +0100
Subject: [PATCH 5/5] Fix minor indentation issue

---
 .../whitelabel/wallet/components/market/market_footer.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/components/whitelabel/wallet/components/market/market_footer.js b/js/components/whitelabel/wallet/components/market/market_footer.js
index 6d033fdb..079216ad 100644
--- a/js/components/whitelabel/wallet/components/market/market_footer.js
+++ b/js/components/whitelabel/wallet/components/market/market_footer.js
@@ -11,7 +11,7 @@ const MarketFooter = React.createClass({
             <div className="container hidden-print">
                 <div className="row">
                     <div className="whitelabel-footer">
-                    <hr/>
+                        <hr/>
                         <span id="powered">{getLangText('Digital wallet powered by')} </span>
                         <a className="ascribe-powered-by" href="https://www.ascribe.io/" target="_blank">
                             <span className="icon-ascribe-logo"></span>