diff --git a/js/components/ascribe_buttons/acl_information.js b/js/components/ascribe_buttons/acl_information.js index 59ffd561..f40d2ce7 100644 --- a/js/components/ascribe_buttons/acl_information.js +++ b/js/components/ascribe_buttons/acl_information.js @@ -45,7 +45,7 @@ let AclInformation = React.createClass({ return (

- {replaceSubstringAtIndex(info.slice(2), 's ', ' ')}
+ {replaceSubstringAtIndex(info.slice(2), 's ', ' ')}
{example} @@ -60,7 +60,7 @@ let AclInformation = React.createClass({ {title} - {info}
+ {info + ' '}
{example} @@ -108,18 +108,19 @@ let AclInformation = React.createClass({ }, render() { - const { aim, buttonListSize } = this.props; + const { aim, buttonListSize, verbs } = this.props; const { isVisible } = this.state; /* Lets just fucking get this widget out... */ - const aclInformationSize = buttonListSize - 33; + const aclInformationSize = buttonListSize - 30; return ( {this.getButton()}

300 ? aclInformationSize : 400 + width: aclInformationSize > 300 ? aclInformationSize : 400, + marginLeft: verbs.length === 1 ? '.25em' : null }} className={classnames({'acl-information-dropdown-list': true, 'hidden': aim === 'button' && !isVisible})}> {this.produceInformationBlock()} diff --git a/js/components/ascribe_detail/detail_property.js b/js/components/ascribe_detail/detail_property.js index 828ed81a..9ea37285 100644 --- a/js/components/ascribe_detail/detail_property.js +++ b/js/components/ascribe_detail/detail_property.js @@ -2,6 +2,7 @@ import React from 'react'; + let DetailProperty = React.createClass({ propTypes: { label: React.PropTypes.string, @@ -12,20 +13,29 @@ let DetailProperty = React.createClass({ separator: React.PropTypes.string, labelClassName: React.PropTypes.string, valueClassName: React.PropTypes.string, - ellipsis: React.PropTypes.bool + ellipsis: React.PropTypes.bool, + children: React.PropTypes.oneOfType([ + React.PropTypes.arrayOf(React.PropTypes.element), + React.PropTypes.element + ]) }, getDefaultProps() { return { separator: '', - labelClassName: 'col-xs-3 col-sm-3 col-md-2 col-lg-2 col-xs-height col-bottom ascribe-detail-property-label', + labelClassName: 'col-xs-3 col-sm-3 col-md-2 col-lg-2 col-xs-height ascribe-detail-property-label', valueClassName: 'col-xs-9 col-sm-9 col-md-10 col-lg-10 col-xs-height col-bottom ascribe-detail-property-value' }; }, render() { - let value = this.props.value; let styles = {}; + const { labelClassName, + label, + separator, + valueClassName, + children, + value } = this.props; if(this.props.ellipsis) { styles = { @@ -35,30 +45,16 @@ let DetailProperty = React.createClass({ }; } - - if (this.props.children){ - value = ( -
-
- { this.props.value } -
-
- { this.props.children } -
-
); - } return (
-
- { this.props.label } { this.props.separator} +
+ {label} {separator}
- {value} + {children || value}
diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index fda3eee8..ccab60a0 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -211,30 +211,13 @@ let EditionSummary = React.createClass({ value={ edition.owner } /> {this.getStatus()} -
-
-
- { this.props.label } { this.props.separator} -
-
- {value} -
-
-
-
-
- Actions -
-
- -
-
); + + +
); diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js index b03e11ed..f8a2369f 100644 --- a/js/components/ascribe_detail/piece_container.js +++ b/js/components/ascribe_detail/piece_container.js @@ -190,28 +190,29 @@ let PieceContainer = React.createClass({ currentUser={this.state.currentUser} handleSuccess={this.loadPiece} notifications={this.state.piece.notifications}/>); - } - else { + } else { return ( - - - - - + + + + + + + ); } }, diff --git a/js/components/ascribe_forms/form_loan.js b/js/components/ascribe_forms/form_loan.js index dd9e3b34..d6102f14 100644 --- a/js/components/ascribe_forms/form_loan.js +++ b/js/components/ascribe_forms/form_loan.js @@ -233,7 +233,6 @@ let LoanForm = React.createClass({

{this.props.loanHeading}

-