1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00

Merge with AD1251

This commit is contained in:
Brett Sun 2015-11-03 10:48:28 +01:00
commit 68c1dd9407
11 changed files with 23 additions and 21 deletions

View File

@ -9,7 +9,6 @@ import Property from './property';
import InputTextAreaToggable from './input_textarea_toggable';
import AscribeSpinner from '../ascribe_spinner';
import AclInformation from '../ascribe_buttons/acl_information';
import { getLangText } from '../../utils/lang_utils.js';
@ -71,7 +70,7 @@ let ConsignForm = React.createClass({
rows={1}
defaultValue={this.props.message}
placeholder={getLangText('Enter a message...')}
required="required"/>
required />
</Property>
<Property
name='password'

View File

@ -285,7 +285,7 @@ let LoanForm = React.createClass({
rows={1}
defaultValue={this.props.message}
placeholder={getLangText('Enter a message...')}
required={this.props.showPersonalMessage ? 'required' : ''}/>
required={this.props.showPersonalMessage}/>
</Property>
{this.getContractCheckbox()}
{this.getAppendix()}

View File

@ -50,7 +50,7 @@ let PieceExtraDataForm = React.createClass({
rows={1}
defaultValue={defaultValue}
placeholder={getLangText('Fill in%s', ' ') + this.props.title}
required="required"/>
required />
</Property>
<hr />
</Form>

View File

@ -71,7 +71,7 @@ let ShareForm = React.createClass({
rows={1}
defaultValue={this.props.message}
placeholder={getLangText('Enter a message...')}
required="required"/>
required />
</Property>
</Form>
);

View File

@ -52,7 +52,7 @@ let PieceSubmitToPrizeForm = React.createClass({
<InputTextAreaToggable
rows={1}
placeholder={getLangText('Enter your statement')}
required="required"/>
required />
</Property>
<Property
name='work_description'
@ -62,7 +62,7 @@ let PieceSubmitToPrizeForm = React.createClass({
<InputTextAreaToggable
rows={1}
placeholder={getLangText('Enter the description for your work')}
required="required"/>
required />
</Property>
<Property
name="terms"

View File

@ -72,7 +72,7 @@ let TransferForm = React.createClass({
rows={1}
defaultValue={this.props.message}
placeholder={getLangText('Enter a message...')}
required="required"/>
required />
</Property>
<Property
name='password'

View File

@ -58,7 +58,7 @@ let UnConsignForm = React.createClass({
rows={1}
defaultValue={this.props.message}
placeholder={getLangText('Enter a message...')}
required="required"/>
required />
</Property>
<Property
name='password'

View File

@ -57,7 +57,7 @@ let UnConsignRequestForm = React.createClass({
rows={1}
defaultValue={this.props.message}
placeholder={getLangText('Enter a message...')}
required="required"/>
required />
</Property>
<hr />
</Form>

View File

@ -9,8 +9,11 @@ let InputTextAreaToggable = React.createClass({
propTypes: {
disabled: React.PropTypes.bool,
rows: React.PropTypes.number.isRequired,
required: React.PropTypes.string,
defaultValue: React.PropTypes.string
required: React.PropTypes.bool,
defaultValue: React.PropTypes.string,
placeholder: React.PropTypes.string,
onBlur: React.PropTypes.func,
onChange: React.PropTypes.func
},
getInitialState() {

View File

@ -49,7 +49,7 @@ let PrizeRegisterPiece = React.createClass({
<InputTextAreaToggable
rows={1}
placeholder={getLangText('Enter your statement')}
required="required"/>
required />
</Property>
<Property
name='work_description'
@ -59,7 +59,7 @@ let PrizeRegisterPiece = React.createClass({
<InputTextAreaToggable
rows={1}
placeholder={getLangText('Enter the description for your work')}
required="required"/>
required />
</Property>
<Property
name="terms"