Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page

Conflicts:
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/components/whitelabel/wallet/components/cyland/cyland_landing.js

js/components/ascribe_detail/further_details_fileuploader.js

@@ -44,7 +44,7 @@ let FurtherDetailsFileuploader = React.createClass({
 
         return (
             <Property
-                label="Additional files (max. 50MB per file)">
+                label="Additional files">
                 <ReactS3FineUploader
                     uploadStarted={this.props.uploadStarted}
                     keyRoutine={{

js/components/ascribe_forms/input_checkbox.js

@@ -22,6 +22,7 @@ let InputCheckbox = React.createClass({
             React.PropTypes.arrayOf(React.PropTypes.element),
             React.PropTypes.element
         ]),
+        name: React.PropTypes.string,
 
         // provided by Property
         disabled: React.PropTypes.bool,
@@ -50,7 +51,7 @@ let InputCheckbox = React.createClass({
 
         // Developer's are used to define defaultValues for inputs via defaultValue, but since this is a
         // input of type checkbox we warn the dev to not do that.
-        if(this.props.defaultValue) {
+        if(this.props.defaultValue) { //eslint-disable-line react/prop-types
             console.warn('InputCheckbox is of type checkbox. Therefore its value is represented by checked and defaultChecked. defaultValue will do nothing!');
         }
 
@@ -102,8 +103,10 @@ let InputCheckbox = React.createClass({
         return (
             <span
                 style={this.props.style}
-                onClick={this.onChange}>
+                onClick={this.onChange}
+                name={this.props.name}>
                 <input
+                    name={this.props.name}
                     type="checkbox"
                     ref="checkbox"
                     onChange={this.onChange}
@@ -119,4 +122,4 @@ let InputCheckbox = React.createClass({
     }
 });
 
-export default InputCheckbox;
+export default InputCheckbox;

js/components/ascribe_forms/property.js

@@ -31,6 +31,7 @@ let Property = React.createClass({
         footer: React.PropTypes.element,
         handleChange: React.PropTypes.func,
         ignoreFocus: React.PropTypes.bool,
+        name: React.PropTypes.string.isRequired,
         className: React.PropTypes.string,
 
         onClick: React.PropTypes.func,
@@ -210,7 +211,8 @@ let Property = React.createClass({
                 onFocus: this.handleFocus,
                 onBlur: this.handleBlur,
                 disabled: !this.props.editable,
-                ref: 'input'
+                ref: 'input',
+                name: this.props.name
             });
         });
     },
@@ -260,4 +262,4 @@ let Property = React.createClass({
     }
 });
 
-export default Property;
+export default Property;

js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js

@@ -12,7 +12,7 @@ import UserStore from '../../../../../../stores/user_store';
 import GlobalNotificationModel from '../../../../../../models/global_notification_model';
 import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
 
-import CylandSubmitButton from '../ascribe_buttons/cyland_submit_button';
+import CylandSubmitButton from '../cyland_buttons/cyland_submit_button';
 import AclProxy from '../../../../../acl_proxy';
 
 import { getLangText } from '../../../../../../utils/lang_utils';

js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js

@@ -12,6 +12,7 @@ import WhitelabelStore from '../../../../../../stores/whitelabel_store';
 
 import { getLangText } from '../../../../../../utils/lang_utils';
 
+
 let CylandSubmitButton = React.createClass({
     propTypes: {
         className: React.PropTypes.string,

js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js

@@ -7,11 +7,11 @@ import PieceStore from '../../../../../../stores/piece_store';
 
 import UserStore from '../../../../../../stores/user_store';
 
-import CylandSubmitButton from '../ascribe_buttons/cyland_submit_button';
+import CylandSubmitButton from '../cyland_buttons/cyland_submit_button';
 
 import CollapsibleParagraph from '../../../../../../components/ascribe_collapsible/collapsible_paragraph';
 
-import CylandAdditionalDataForm from '../ascribe_forms/cyland_additional_data_form';
+import CylandAdditionalDataForm from '../cyland_forms/cyland_additional_data_form';
 
 import WalletPieceContainer from '../../ascribe_detail/wallet_piece_container';
 

js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js

@@ -43,7 +43,7 @@ let CylandAdditionalDataForm = React.createClass({
     },
 
     handleSuccess() {
-        let notification = new GlobalNotificationModel('Further details successfully updated', 'success', 10000);
+        let notification = new GlobalNotificationModel(getLangText('Further details successfully updated'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 

js/components/whitelabel/wallet/components/cyland/cyland_hero.js

@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react';
-import constants from '../../../../constants/application_constants';
+import AppConstants from '../../../../constants/application_constants';
 
 
 let Hero = React.createClass({
@@ -9,7 +9,7 @@ let Hero = React.createClass({
         return (
             <div className="hero">
                 <img
-                    className="logo" src={constants.whitelabel.logo}
+                    className="logo" src={AppConstants.whitelabel.logo}
                     alt="Sluice Art Prize"
                     height="200px"/>
             </div>

js/components/whitelabel/wallet/components/cyland/cyland_landing.js

@@ -3,6 +3,7 @@
 import React from 'react';
 import { History } from 'react-router';
 
+
 import WhitelabelActions from '../../../../../actions/whitelabel_actions';
 import WhitelabelStore from '../../../../../stores/whitelabel_store';
 

js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js

@@ -6,7 +6,7 @@ import PieceList from '../../../../piece_list';
 import UserActions from '../../../../../actions/user_actions';
 import UserStore from '../../../../../stores/user_store';
 
-import CylandAccordionListItem from './ascribe_accordion_list/cyland_accordion_list_item';
+import CylandAccordionListItem from './cyland_accordion_list/cyland_accordion_list_item';
 
 import { getLangText } from '../../../../../utils/lang_utils';
 

js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js

@@ -25,7 +25,7 @@ import PieceActions from '../../../../../actions/piece_actions';
 import GlobalNotificationModel from '../../../../../models/global_notification_model';
 import GlobalNotificationActions from '../../../../../actions/global_notification_actions';
 
-import CylandAdditionalDataForm from './ascribe_forms/cyland_additional_data_form';
+import CylandAdditionalDataForm from './cyland_forms/cyland_additional_data_form';
 
 import LoanForm from '../../../../ascribe_forms/form_loan';
 

js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js

@@ -12,7 +12,7 @@ import UserStore from '../../../../../../stores/user_store';
 import GlobalNotificationModel from '../../../../../../models/global_notification_model';
 import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
 
-import IkonotvSubmitButton from '../ascribe_buttons/ikonotv_submit_button';
+import IkonotvSubmitButton from '../ikonotv_buttons/ikonotv_submit_button';
 
 import AclProxy from '../../../../../acl_proxy';
 

js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js

@@ -7,13 +7,12 @@ import PieceStore from '../../../../../../stores/piece_store';
 
 import UserStore from '../../../../../../stores/user_store';
 
-
+import IkonotvSubmitButton from '../ikonotv_buttons/ikonotv_submit_button';
-import IkonotvSubmitButton from '../ascribe_buttons/ikonotv_submit_button';
 
 import CollapsibleParagraph from '../../../../../../components/ascribe_collapsible/collapsible_paragraph';
 
-import IkonotvArtistDetailsForm from '../ascribe_forms/ikonotv_artist_details_form';
+import IkonotvArtistDetailsForm from '../ikonotv_forms/ikonotv_artist_details_form';
-import IkonotvArtworkDetailsForm from '../ascribe_forms/ikonotv_artwork_details_form';
+import IkonotvArtworkDetailsForm from '../ikonotv_forms/ikonotv_artwork_details_form';
 
 import WalletPieceContainer from '../../ascribe_detail/wallet_piece_container';
 

js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js

@@ -6,7 +6,7 @@ import PieceList from '../../../../piece_list';
 import UserActions from '../../../../../actions/user_actions';
 import UserStore from '../../../../../stores/user_store';
 
-import IkonotvAccordionListItem from './ascribe_accordion_list/ikonotv_accordion_list_item';
+import IkonotvAccordionListItem from './ikonotv_accordion_list/ikonotv_accordion_list_item';
 
 import { getLangText } from '../../../../../utils/lang_utils';
 

js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js

@@ -22,8 +22,8 @@ import GlobalNotificationActions from '../../../../../actions/global_notificatio
 import RegisterPieceForm from '../../../../ascribe_forms/form_register_piece';
 import LoanForm from '../../../../ascribe_forms/form_loan';
 
-import IkonotvArtistDetailsForm from './ascribe_forms/ikonotv_artist_details_form';
+import IkonotvArtistDetailsForm from './ikonotv_forms/ikonotv_artist_details_form';
-import IkonotvArtworkDetailsForm from './ascribe_forms/ikonotv_artwork_details_form';
+import IkonotvArtworkDetailsForm from './ikonotv_forms/ikonotv_artwork_details_form';
 
 import SlidesContainer from '../../../../ascribe_slides_container/slides_container';
 

js/components/whitelabel/wallet/wallet_routes.js

@@ -17,7 +17,7 @@ import ContractSettings from '../../../components/ascribe_settings/contract_sett
 import ErrorNotFoundPage from '../../../components/error_not_found_page';
 
 import CylandLanding from './components/cyland/cyland_landing';
-import CylandPieceContainer from './components/cyland/ascribe_detail/cyland_piece_container';
+import CylandPieceContainer from './components/cyland/cyland_detail/cyland_piece_container';
 import CylandRegisterPiece from './components/cyland/cyland_register_piece';
 import CylandPieceList from './components/cyland/cyland_piece_list';
 
@@ -25,7 +25,7 @@ import IkonotvLanding from './components/ikonotv/ikonotv_landing';
 import IkonotvPieceList from './components/ikonotv/ikonotv_piece_list';
 import ContractAgreementForm from '../../../components/ascribe_forms/form_contract_agreement';
 import IkonotvRegisterPiece from './components/ikonotv/ikonotv_register_piece';
-import IkonotvPieceContainer from './components/ikonotv/ascribe_detail/ikonotv_piece_container';
+import IkonotvPieceContainer from './components/ikonotv/ikonotv_detail/ikonotv_piece_container';
 import IkonotvContractNotifications from './components/ikonotv/ikonotv_contract_notifications';
 
 import CCRegisterPiece from './components/cc/cc_register_piece';

js/constants/application_constants.js

@@ -61,7 +61,7 @@ let constants = {
         'validation': {
             'additionalData': {
                 'itemLimit': 100,
-                'sizeLimit': '50000000'
+                'sizeLimit': '25000000000'
             },
             'registerWork': {
                 'itemLimit': 1,