mirror of
https://github.com/ascribe/onion.git
synced 2025-02-14 21:10:27 +01:00
Merged in AD-940-spool-features-in-piece-detail-we (pull request #82)
set collapsible default show=true
This commit is contained in:
commit
7bc686e8a4
@ -17,7 +17,7 @@ const CollapsibleParagraph = React.createClass({
|
|||||||
|
|
||||||
getDefaultProps() {
|
getDefaultProps() {
|
||||||
return {
|
return {
|
||||||
show: false
|
show: true
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import Router from 'react-router';
|
||||||
|
|
||||||
import ContractListActions from '../../actions/contract_list_actions';
|
import ContractListActions from '../../actions/contract_list_actions';
|
||||||
import ContractListStore from '../../stores/contract_list_store';
|
import ContractListStore from '../../stores/contract_list_store';
|
||||||
@ -20,11 +21,13 @@ import { mergeOptions } from '../../utils/general_utils';
|
|||||||
|
|
||||||
|
|
||||||
let ContractAgreementForm = React.createClass({
|
let ContractAgreementForm = React.createClass({
|
||||||
propTypes: {
|
propTypes: {
|
||||||
handleSuccess: React.PropTypes.func
|
handleSuccess: React.PropTypes.func
|
||||||
},
|
},
|
||||||
|
|
||||||
getInitialState() {
|
mixins: [Router.Navigation, Router.State],
|
||||||
|
|
||||||
|
getInitialState() {
|
||||||
return mergeOptions(
|
return mergeOptions(
|
||||||
ContractListStore.getState(),
|
ContractListStore.getState(),
|
||||||
{
|
{
|
||||||
@ -54,7 +57,7 @@ let ContractAgreementForm = React.createClass({
|
|||||||
let notification = 'Contract agreement send';
|
let notification = 'Contract agreement send';
|
||||||
notification = new GlobalNotificationModel(notification, 'success', 10000);
|
notification = new GlobalNotificationModel(notification, 'success', 10000);
|
||||||
GlobalNotificationActions.appendGlobalNotification(notification);
|
GlobalNotificationActions.appendGlobalNotification(notification);
|
||||||
this.refs.form.reset();
|
this.transitionTo('pieces');
|
||||||
},
|
},
|
||||||
|
|
||||||
getFormData(){
|
getFormData(){
|
||||||
|
@ -101,7 +101,6 @@ let AccountSettings = React.createClass({
|
|||||||
return (
|
return (
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Account')}
|
title={getLangText('Account')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
{content}
|
{content}
|
||||||
<CopyrightAssociationForm currentUser={this.props.currentUser}/>
|
<CopyrightAssociationForm currentUser={this.props.currentUser}/>
|
||||||
|
@ -97,7 +97,6 @@ let APISettings = React.createClass({
|
|||||||
return (
|
return (
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('API Integration')}
|
title={getLangText('API Integration')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={this.props.defaultExpanded}>
|
defaultExpanded={this.props.defaultExpanded}>
|
||||||
<Form
|
<Form
|
||||||
url={ApiUrls.applications}
|
url={ApiUrls.applications}
|
||||||
|
@ -61,7 +61,6 @@ let BitcoinWalletSettings = React.createClass({
|
|||||||
return (
|
return (
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Crypto Wallet')}
|
title={getLangText('Crypto Wallet')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={this.props.defaultExpanded}>
|
defaultExpanded={this.props.defaultExpanded}>
|
||||||
{content}
|
{content}
|
||||||
</CollapsibleParagraph>
|
</CollapsibleParagraph>
|
||||||
|
@ -97,7 +97,6 @@ let ContractSettings = React.createClass({
|
|||||||
<div className="settings-container">
|
<div className="settings-container">
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Contracts')}
|
title={getLangText('Contracts')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
<AclProxy
|
<AclProxy
|
||||||
aclName="acl_edit_public_contract"
|
aclName="acl_edit_public_contract"
|
||||||
|
@ -309,7 +309,6 @@ let PrizePieceRatings = React.createClass({
|
|||||||
<div>
|
<div>
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Shortlisting')}
|
title={getLangText('Shortlisting')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
<div className="row no-margin">
|
<div className="row no-margin">
|
||||||
<span className="ascribe-checkbox-wrapper" style={{marginLeft: '1.5em'}}>
|
<span className="ascribe-checkbox-wrapper" style={{marginLeft: '1.5em'}}>
|
||||||
@ -329,7 +328,6 @@ let PrizePieceRatings = React.createClass({
|
|||||||
</CollapsibleParagraph>
|
</CollapsibleParagraph>
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Average Rating')}
|
title={getLangText('Average Rating')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
<div id="list-rating" style={{marginLeft: '1.5em', marginBottom: '1em'}}>
|
<div id="list-rating" style={{marginLeft: '1.5em', marginBottom: '1em'}}>
|
||||||
<StarRating
|
<StarRating
|
||||||
@ -375,7 +373,6 @@ let PrizePieceRatings = React.createClass({
|
|||||||
return (
|
return (
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Rating')}
|
title={getLangText('Rating')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
<div style={{marginLeft: '1.5em', marginBottom: '1em'}}>
|
<div style={{marginLeft: '1.5em', marginBottom: '1em'}}>
|
||||||
<StarRating
|
<StarRating
|
||||||
@ -417,7 +414,6 @@ let PrizePieceDetails = React.createClass({
|
|||||||
return (
|
return (
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Prize Details')}
|
title={getLangText('Prize Details')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
<Form ref='form'>
|
<Form ref='form'>
|
||||||
{Object.keys(this.props.piece.extra_data).map((data) => {
|
{Object.keys(this.props.piece.extra_data).map((data) => {
|
||||||
|
@ -79,7 +79,6 @@ let PrizeSettings = React.createClass({
|
|||||||
return (
|
return (
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={'Prize Settings for ' + this.state.prize.name}
|
title={'Prize Settings for ' + this.state.prize.name}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
<Form >
|
<Form >
|
||||||
<Property
|
<Property
|
||||||
@ -268,19 +267,16 @@ let PrizeJurySettings = React.createClass({
|
|||||||
<div>
|
<div>
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Active Jury Members')}
|
title={getLangText('Active Jury Members')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
{this.getMembersActive()}
|
{this.getMembersActive()}
|
||||||
</CollapsibleParagraph>
|
</CollapsibleParagraph>
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Pending Jury Invitations')}
|
title={getLangText('Pending Jury Invitations')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
{this.getMembersPending()}
|
{this.getMembersPending()}
|
||||||
</CollapsibleParagraph>
|
</CollapsibleParagraph>
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Deactivated Jury Members')}
|
title={getLangText('Deactivated Jury Members')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={false}>
|
defaultExpanded={false}>
|
||||||
{this.getMembersInactive()}
|
{this.getMembersInactive()}
|
||||||
</CollapsibleParagraph>
|
</CollapsibleParagraph>
|
||||||
|
@ -64,7 +64,6 @@ let CylandPieceContainer = React.createClass({
|
|||||||
submitButtonType={CylandSubmitButton}>
|
submitButtonType={CylandSubmitButton}>
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Further Details')}
|
title={getLangText('Further Details')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
<CylandAdditionalDataForm
|
<CylandAdditionalDataForm
|
||||||
piece={this.state.piece}
|
piece={this.state.piece}
|
||||||
|
@ -68,7 +68,6 @@ let IkonotvPieceContainer = React.createClass({
|
|||||||
let furtherDetails = (
|
let furtherDetails = (
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Further Details')}
|
title={getLangText('Further Details')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
<span>{getLangText('This piece has been loaned before we started to collect further details.')}</span>
|
<span>{getLangText('This piece has been loaned before we started to collect further details.')}</span>
|
||||||
</CollapsibleParagraph>
|
</CollapsibleParagraph>
|
||||||
@ -78,7 +77,6 @@ let IkonotvPieceContainer = React.createClass({
|
|||||||
furtherDetails = (
|
furtherDetails = (
|
||||||
<CollapsibleParagraph
|
<CollapsibleParagraph
|
||||||
title={getLangText('Further Details')}
|
title={getLangText('Further Details')}
|
||||||
show={true}
|
|
||||||
defaultExpanded={true}>
|
defaultExpanded={true}>
|
||||||
<IkonotvArtistDetailsForm
|
<IkonotvArtistDetailsForm
|
||||||
piece={this.state.piece}
|
piece={this.state.piece}
|
||||||
|
Loading…
Reference in New Issue
Block a user