ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-02-14 21:10:27 +01:00
Code Issues Releases Wiki Activity

Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-999-style-login-and-signup-forms

Browse Source
This commit is contained in:
vrde 2015-09-18 15:43:44 +02:00
commit 94568934ea
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_forms/form_register_piece.js
View File

@ -137,7 +137,7 @@ let RegisterPieceForm = React.createClass({
<input <input
type="number" type="number"
placeholder="(e.g. 1962)" placeholder="(e.g. 1962)"
min={0} min={1}
required/> required/>
</Property> </Property>
{this.props.children} {this.props.children}

4
js/components/ascribe_settings/contract_settings.js
View File

@ -110,7 +110,7 @@ let ContractSettings = React.createClass({
{getLangText('PREVIEW')} {getLangText('PREVIEW')}
</a> </a>
<button <button
className="btn btn-default btn-sm margin-left-2px" className="btn btn-danger btn-sm margin-left-2px"
onClick={this.removeContract(contract)}> onClick={this.removeContract(contract)}>
{getLangText('REMOVE')} {getLangText('REMOVE')}
</button> </button>
@ -148,7 +148,7 @@ let ContractSettings = React.createClass({
{getLangText('PREVIEW')} {getLangText('PREVIEW')}
</a> </a>
<button <button
className="btn btn-default btn-sm margin-left-2px" className="btn btn-danger btn-sm margin-left-2px"
onClick={this.removeContract(contract)}> onClick={this.removeContract(contract)}>
{getLangText('REMOVE')} {getLangText('REMOVE')}
</button> </button>

8
js/components/signup_container.js
View File

@ -1,8 +1,13 @@
'use strict'; 'use strict';
import React from 'react'; import React from 'react';
import Router from 'react-router';
import SignupForm from './ascribe_forms/form_signup'; import SignupForm from './ascribe_forms/form_signup';
import { getLangText } from '../utils/lang_utils';
let Link = Router.Link;
let SignupContainer = React.createClass({ let SignupContainer = React.createClass({
getInitialState() { getInitialState() {
@ -33,6 +38,9 @@ let SignupContainer = React.createClass({
return ( return (
<div className="ascribe-login-wrapper"> <div className="ascribe-login-wrapper">
<SignupForm handleSuccess={this.handleSuccess} /> <SignupForm handleSuccess={this.handleSuccess} />
<div className="ascribe-login-text">
{getLangText('Already an ascribe user')}&#63; <Link to="login">{getLangText('Log in')}...</Link><br/>
</div>
</div> </div>
); );
} }