Final fixed before official /delta release

This commit is contained in:
Giulio Cesare Solaroli
2015-07-04 18:43:59 +02:00
parent 2e65e86341
commit e6d071a7c1
18 changed files with 520 additions and 691 deletions

View File

@@ -139,6 +139,12 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
}
},
showUrl: function (anUrl) {
return function () {
window.open(anUrl, 'clipperz_about');
}
},
render: function() {
//console.log("LOGIN PAGE", this.props);
// var registrationLink = React.DOM.footer({'key':'registrationLink', 'className':'registrationLink'}, [
@@ -148,10 +154,20 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
var registrationLink = React.DOM.a({'key':'signup', 'className':'registrationLink', 'onClick':this.handleRegistrationLinkClick}, "Sign up");
return React.DOM.div({'key':'loginForm', 'className':'loginForm ' + this.props['style']}, [
React.DOM.header({'key':'header'}, 'clipperz'),
React.DOM.header({'key':'header'}, [
React.DOM.h3({}, 'clipperz'),
React.DOM.h5({}, 'keep it to yourself'),
]),
React.DOM.div({'key':'formWrapper', 'className':'form'}, [
this.props.mode == 'PIN' ? this.pinForm() : this.loginForm(),
]),
React.DOM.div({'key':'links', 'className':'links'}, [
React.DOM.ul({}, [
React.DOM.li({'key':'about', 'onClick':this.showUrl('/about/')}, "About"),
React.DOM.li({'key':'terms', 'onClick':this.showUrl('/terms_service/')}, "Terms of service"),
React.DOM.li({'key':'privacy', 'onClick':this.showUrl('/privacy_policy/')}, "Privacy"),
])
]),
React.DOM.footer({'key':'footer'}, [
this.props['isNewUserRegistrationAvailable'] ? registrationLink : null,
React.DOM.div({'key':'applicationVersion', 'className':'applicationVersion'}, [

View File

@@ -214,6 +214,12 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
]);
},
showUrl: function (anUrl) {
return function () {
window.open(anUrl, 'clipperz_about');
}
},
render: function () {
return React.DOM.div({'className':'registrationForm'},[
React.DOM.header({'key':'header'}, 'clipperz'),
@@ -222,6 +228,13 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
React.DOM.div({'key':'steps', 'className':'steps'}, MochiKit.Base.map(this.renderStep, this.props['steps']))
])
]),
React.DOM.div({'key':'links', 'className':'links'}, [
React.DOM.ul({}, [
React.DOM.li({'key':'about', 'onClick':this.showUrl('/about/')}, "About"),
React.DOM.li({'key':'terms', 'onClick':this.showUrl('/terms_service/')}, "Terms of service"),
React.DOM.li({'key':'privacy', 'onClick':this.showUrl('/privacy_policy/')}, "Privacy"),
])
]),
React.DOM.footer({'key':'footer'}, [
React.DOM.a({'key':'login', 'onClick':this.handleLoginLinkClick}, "Login")
])