mirror of
https://github.com/ascribe/onion.git
synced 2024-12-23 01:39:36 +01:00
Merged in AD-977-prefixing-of-whitelabel-folders-i (pull request #99)
Ad 977 prefixing of whitelabel folders i
This commit is contained in:
commit
f92ea2bf95
@ -12,7 +12,7 @@ import UserStore from '../../../../../../stores/user_store';
|
|||||||
import GlobalNotificationModel from '../../../../../../models/global_notification_model';
|
import GlobalNotificationModel from '../../../../../../models/global_notification_model';
|
||||||
import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
|
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 AclProxy from '../../../../../acl_proxy';
|
||||||
|
|
||||||
import { getLangText } from '../../../../../../utils/lang_utils';
|
import { getLangText } from '../../../../../../utils/lang_utils';
|
@ -10,6 +10,7 @@ import WhitelabelStore from '../../../../../../stores/whitelabel_store';
|
|||||||
|
|
||||||
import { getLangText } from '../../../../../../utils/lang_utils';
|
import { getLangText } from '../../../../../../utils/lang_utils';
|
||||||
|
|
||||||
|
|
||||||
let CylandSubmitButton = React.createClass({
|
let CylandSubmitButton = React.createClass({
|
||||||
propTypes: {
|
propTypes: {
|
||||||
className: React.PropTypes.string,
|
className: React.PropTypes.string,
|
@ -7,11 +7,11 @@ import PieceStore from '../../../../../../stores/piece_store';
|
|||||||
|
|
||||||
import UserStore from '../../../../../../stores/user_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 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';
|
import WalletPieceContainer from '../../ascribe_detail/wallet_piece_container';
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import constants from '../../../../constants/application_constants';
|
import AppConstants from '../../../../constants/application_constants';
|
||||||
|
|
||||||
|
|
||||||
let Hero = React.createClass({
|
let Hero = React.createClass({
|
||||||
@ -9,7 +9,7 @@ let Hero = React.createClass({
|
|||||||
return (
|
return (
|
||||||
<div className="hero">
|
<div className="hero">
|
||||||
<img
|
<img
|
||||||
className="logo" src={constants.whitelabel.logo}
|
className="logo" src={AppConstants.whitelabel.logo}
|
||||||
alt="Sluice Art Prize"
|
alt="Sluice Art Prize"
|
||||||
height="200px"/>
|
height="200px"/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import Router from 'react-router';
|
import Router from 'react-router';
|
||||||
|
|
||||||
|
|
||||||
import WhitelabelActions from '../../../../../actions/whitelabel_actions';
|
import WhitelabelActions from '../../../../../actions/whitelabel_actions';
|
||||||
import WhitelabelStore from '../../../../../stores/whitelabel_store';
|
import WhitelabelStore from '../../../../../stores/whitelabel_store';
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ import PieceList from '../../../../piece_list';
|
|||||||
import UserActions from '../../../../../actions/user_actions';
|
import UserActions from '../../../../../actions/user_actions';
|
||||||
import UserStore from '../../../../../stores/user_store';
|
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';
|
import { getLangText } from '../../../../../utils/lang_utils';
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ import PieceActions from '../../../../../actions/piece_actions';
|
|||||||
import GlobalNotificationModel from '../../../../../models/global_notification_model';
|
import GlobalNotificationModel from '../../../../../models/global_notification_model';
|
||||||
import GlobalNotificationActions from '../../../../../actions/global_notification_actions';
|
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';
|
import LoanForm from '../../../../ascribe_forms/form_loan';
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ import UserStore from '../../../../../../stores/user_store';
|
|||||||
import GlobalNotificationModel from '../../../../../../models/global_notification_model';
|
import GlobalNotificationModel from '../../../../../../models/global_notification_model';
|
||||||
import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
|
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';
|
import AclProxy from '../../../../../acl_proxy';
|
||||||
|
|
@ -7,13 +7,12 @@ import PieceStore from '../../../../../../stores/piece_store';
|
|||||||
|
|
||||||
import UserStore from '../../../../../../stores/user_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 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';
|
import WalletPieceContainer from '../../ascribe_detail/wallet_piece_container';
|
||||||
|
|
@ -6,7 +6,7 @@ import PieceList from '../../../../piece_list';
|
|||||||
import UserActions from '../../../../../actions/user_actions';
|
import UserActions from '../../../../../actions/user_actions';
|
||||||
import UserStore from '../../../../../stores/user_store';
|
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';
|
import { getLangText } from '../../../../../utils/lang_utils';
|
||||||
|
|
||||||
|
@ -22,8 +22,8 @@ import GlobalNotificationActions from '../../../../../actions/global_notificatio
|
|||||||
import RegisterPieceForm from '../../../../ascribe_forms/form_register_piece';
|
import RegisterPieceForm from '../../../../ascribe_forms/form_register_piece';
|
||||||
import LoanForm from '../../../../ascribe_forms/form_loan';
|
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';
|
import SlidesContainer from '../../../../ascribe_slides_container/slides_container';
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ import ContractSettings from '../../../components/ascribe_settings/contract_sett
|
|||||||
import ErrorNotFoundPage from '../../../components/error_not_found_page';
|
import ErrorNotFoundPage from '../../../components/error_not_found_page';
|
||||||
|
|
||||||
import CylandLanding from './components/cyland/cyland_landing';
|
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 CylandRegisterPiece from './components/cyland/cyland_register_piece';
|
||||||
import CylandPieceList from './components/cyland/cyland_piece_list';
|
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 IkonotvPieceList from './components/ikonotv/ikonotv_piece_list';
|
||||||
import IkonotvRequestLoan from './components/ikonotv/ikonotv_request_loan';
|
import IkonotvRequestLoan from './components/ikonotv/ikonotv_request_loan';
|
||||||
import IkonotvRegisterPiece from './components/ikonotv/ikonotv_register_piece';
|
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 IkonotvContractNotifications from './components/ikonotv/ikonotv_contract_notifications';
|
||||||
|
|
||||||
import CCRegisterPiece from './components/cc/cc_register_piece';
|
import CCRegisterPiece from './components/cc/cc_register_piece';
|
||||||
|
Loading…
Reference in New Issue
Block a user