From e862fa39a91a930afb151d8bfa49457f33511047 Mon Sep 17 00:00:00 2001
From: diminator <dimi.dejonghe@gmail.com>
Date: Tue, 18 Aug 2015 12:36:38 +0200
Subject: [PATCH] Merge remote-tracking branch
 'remotes/origin/AD-803-refactor-acls' into
 AD-456-ikonotv-branded-page-for-registra

Conflicts:
	web/settings.py
---
 .../ikonotv/ascribe_buttons/ikonotv_submit_button.js         | 5 +----
 js/components/whitelabel/wallet/wallet_routes.js             | 4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js b/js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js
index 0ebf352a..d3f4c0e3 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js
@@ -4,7 +4,6 @@ import React from 'react';
 import classNames from 'classnames';
 
 import ModalWrapper from '../../../../../ascribe_modal/modal_wrapper';
-import CylandPieceSubmitForm from '../ascribe_forms/cyland_form_submit';
 
 import { getLangText } from '../../../../../../utils/lang_utils';
 
@@ -30,9 +29,7 @@ let IkonotvSubmitButton = React.createClass({
                 trigger={this.getSubmitButton()}
                 handleSuccess={this.props.handleSuccess}
                 title={getLangText('Loan to IkonoTV')}>
-                <CylandPieceSubmitForm
-                    piece={this.props.piece}
-                    handleSuccess={this.props.handleSuccess}/>
+
             </ModalWrapper>
             
         );
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index f2aaf1f7..29012d71 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -18,6 +18,8 @@ import CylandPieceContainer from './components/cyland/ascribe_detail/cyland_piec
 import CylandRegisterPiece from './components/cyland/cyland_register_piece';
 import CylandPieceList from './components/cyland/cyland_piece_list';
 
+import IkonotvPieceList from './components/ikonotv/ikonotv_piece_list';
+
 import CCRegisterPiece from './components/cc/cc_register_piece';
 
 import WalletApp from './wallet_app';
@@ -66,7 +68,7 @@ let ROUTES = {
             <Route name="signup" path="signup" handler={SignupContainer} />
             <Route name="password_reset" path="password_reset" handler={PasswordResetContainer} />
             <Route name="register_piece" path="register_piece" handler={CylandRegisterPiece} />
-            <Route name="pieces" path="collection" handler={CylandPieceList} />
+            <Route name="pieces" path="collection" handler={IkonotvPieceList} />
             <Route name="piece" path="pieces/:pieceId" handler={CylandPieceContainer} />
             <Route name="edition" path="editions/:editionId" handler={EditionContainer} />
             <Route name="settings" path="settings" handler={SettingsContainer} />