1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +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:
diminator 2015-09-25 16:17:50 +02:00
commit 7bc686e8a4
10 changed files with 8 additions and 20 deletions

View File

@ -17,7 +17,7 @@ const CollapsibleParagraph = React.createClass({
getDefaultProps() {
return {
show: false
show: true
};
},

View File

@ -1,6 +1,7 @@
'use strict';
import React from 'react';
import Router from 'react-router';
import ContractListActions from '../../actions/contract_list_actions';
import ContractListStore from '../../stores/contract_list_store';
@ -20,11 +21,13 @@ import { mergeOptions } from '../../utils/general_utils';
let ContractAgreementForm = React.createClass({
propTypes: {
propTypes: {
handleSuccess: React.PropTypes.func
},
},
getInitialState() {
mixins: [Router.Navigation, Router.State],
getInitialState() {
return mergeOptions(
ContractListStore.getState(),
{
@ -54,7 +57,7 @@ let ContractAgreementForm = React.createClass({
let notification = 'Contract agreement send';
notification = new GlobalNotificationModel(notification, 'success', 10000);
GlobalNotificationActions.appendGlobalNotification(notification);
this.refs.form.reset();
this.transitionTo('pieces');
},
getFormData(){

View File

@ -101,7 +101,6 @@ let AccountSettings = React.createClass({
return (
<CollapsibleParagraph
title={getLangText('Account')}
show={true}
defaultExpanded={true}>
{content}
<CopyrightAssociationForm currentUser={this.props.currentUser}/>

View File

@ -97,7 +97,6 @@ let APISettings = React.createClass({
return (
<CollapsibleParagraph
title={getLangText('API Integration')}
show={true}
defaultExpanded={this.props.defaultExpanded}>
<Form
url={ApiUrls.applications}

View File

@ -61,7 +61,6 @@ let BitcoinWalletSettings = React.createClass({
return (
<CollapsibleParagraph
title={getLangText('Crypto Wallet')}
show={true}
defaultExpanded={this.props.defaultExpanded}>
{content}
</CollapsibleParagraph>

View File

@ -97,7 +97,6 @@ let ContractSettings = React.createClass({
<div className="settings-container">
<CollapsibleParagraph
title={getLangText('Contracts')}
show={true}
defaultExpanded={true}>
<AclProxy
aclName="acl_edit_public_contract"

View File

@ -309,7 +309,6 @@ let PrizePieceRatings = React.createClass({
<div>
<CollapsibleParagraph
title={getLangText('Shortlisting')}
show={true}
defaultExpanded={true}>
<div className="row no-margin">
<span className="ascribe-checkbox-wrapper" style={{marginLeft: '1.5em'}}>
@ -329,7 +328,6 @@ let PrizePieceRatings = React.createClass({
</CollapsibleParagraph>
<CollapsibleParagraph
title={getLangText('Average Rating')}
show={true}
defaultExpanded={true}>
<div id="list-rating" style={{marginLeft: '1.5em', marginBottom: '1em'}}>
<StarRating
@ -375,7 +373,6 @@ let PrizePieceRatings = React.createClass({
return (
<CollapsibleParagraph
title={getLangText('Rating')}
show={true}
defaultExpanded={true}>
<div style={{marginLeft: '1.5em', marginBottom: '1em'}}>
<StarRating
@ -417,7 +414,6 @@ let PrizePieceDetails = React.createClass({
return (
<CollapsibleParagraph
title={getLangText('Prize Details')}
show={true}
defaultExpanded={true}>
<Form ref='form'>
{Object.keys(this.props.piece.extra_data).map((data) => {

View File

@ -79,7 +79,6 @@ let PrizeSettings = React.createClass({
return (
<CollapsibleParagraph
title={'Prize Settings for ' + this.state.prize.name}
show={true}
defaultExpanded={true}>
<Form >
<Property
@ -268,19 +267,16 @@ let PrizeJurySettings = React.createClass({
<div>
<CollapsibleParagraph
title={getLangText('Active Jury Members')}
show={true}
defaultExpanded={true}>
{this.getMembersActive()}
</CollapsibleParagraph>
<CollapsibleParagraph
title={getLangText('Pending Jury Invitations')}
show={true}
defaultExpanded={true}>
{this.getMembersPending()}
</CollapsibleParagraph>
<CollapsibleParagraph
title={getLangText('Deactivated Jury Members')}
show={true}
defaultExpanded={false}>
{this.getMembersInactive()}
</CollapsibleParagraph>

View File

@ -64,7 +64,6 @@ let CylandPieceContainer = React.createClass({
submitButtonType={CylandSubmitButton}>
<CollapsibleParagraph
title={getLangText('Further Details')}
show={true}
defaultExpanded={true}>
<CylandAdditionalDataForm
piece={this.state.piece}

View File

@ -68,7 +68,6 @@ let IkonotvPieceContainer = React.createClass({
let furtherDetails = (
<CollapsibleParagraph
title={getLangText('Further Details')}
show={true}
defaultExpanded={true}>
<span>{getLangText('This piece has been loaned before we started to collect further details.')}</span>
</CollapsibleParagraph>
@ -78,7 +77,6 @@ let IkonotvPieceContainer = React.createClass({
furtherDetails = (
<CollapsibleParagraph
title={getLangText('Further Details')}
show={true}
defaultExpanded={true}>
<IkonotvArtistDetailsForm
piece={this.state.piece}