ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00
Code Issues Releases Wiki Activity

Merge with AD1251

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/components/ascribe_forms/form_consign.js
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'

4
js/components/ascribe_forms/form_loan.js
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()}
@ -304,4 +304,4 @@ let LoanForm = React.createClass({
}
});
export default LoanForm;
export default LoanForm;

2
js/components/ascribe_forms/form_piece_extradata.js
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>

4
js/components/ascribe_forms/form_share_email.js
View File

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

4
js/components/ascribe_forms/form_submit_to_prize.js
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"

4
js/components/ascribe_forms/form_transfer.js
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'
@ -93,4 +93,4 @@ let TransferForm = React.createClass({
}
});
export default TransferForm;
export default TransferForm;

4
js/components/ascribe_forms/form_unconsign.js
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'
@ -74,4 +74,4 @@ let UnConsignForm = React.createClass({
}
});
export default UnConsignForm;
export default UnConsignForm;

4
js/components/ascribe_forms/form_unconsign_request.js
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>
@ -65,4 +65,4 @@ let UnConsignRequestForm = React.createClass({
}
});
export default UnConsignRequestForm;
export default UnConsignRequestForm;

9
js/components/ascribe_forms/input_textarea_toggable.js
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() {
@ -66,4 +69,4 @@ let InputTextAreaToggable = React.createClass({
});
export default InputTextAreaToggable;
export default InputTextAreaToggable;

4
js/components/whitelabel/prize/components/prize_register_piece.js
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"

2
sass/ascribe_acl_information.scss
View File

@ -22,4 +22,4 @@
.example {
color: #616161;
}
}
}