[IMP] auth_signup remove all css, better wording, auth_oauth align button better wording
bzr revid: al@openerp.com-20121128001449-jy86hb86eyv0milv
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
<field name="validation_endpoint">https://accounts.openerp.com/oauth2/tokeninfo</field>
|
||||
<field name="data_endpoint"></field>
|
||||
<field name="css_class">zocial openerp</field>
|
||||
<field name="body">Sign in with OpenERP.com</field>
|
||||
<field name="body">Log in with OpenERP.com</field>
|
||||
<field name="enabled" eval="True"/>
|
||||
</record>
|
||||
<record id="provider_facebook" model="auth.oauth.provider">
|
||||
@@ -18,7 +18,7 @@
|
||||
<field name="validation_endpoint">https://graph.facebook.com/me/permissions</field>
|
||||
<field name="data_endpoint"></field>
|
||||
<field name="css_class">zocial facebook</field>
|
||||
<field name="body">Sign in with facebook</field>
|
||||
<field name="body">Log in with facebook</field>
|
||||
</record>
|
||||
<record id="provider_google" model="auth.oauth.provider">
|
||||
<field name="name">Google OAuth2</field>
|
||||
@@ -27,7 +27,7 @@
|
||||
<field name="validation_endpoint">https://www.googleapis.com/oauth2/v1/tokeninfo</field>
|
||||
<field name="data_endpoint">https://www.googleapis.com/oauth2/v1/userinfo</field>
|
||||
<field name="css_class">zocial google</field>
|
||||
<field name="body">Sign in with google</field>
|
||||
<field name="body">Log in with google</field>
|
||||
</record>
|
||||
<!--
|
||||
<record id="provider_twitter" model="auth.oauth.provider">
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
}
|
||||
|
||||
.openerp a.zocial.openerp {
|
||||
float: right;
|
||||
border: 1px solid #222222;
|
||||
color: white;
|
||||
margin: 0;
|
||||
|
||||
@@ -37,6 +37,5 @@ Allow users to sign up.
|
||||
'res_users_view.xml',
|
||||
],
|
||||
'js': ['static/src/js/auth_signup.js'],
|
||||
'css' : ['static/src/css/base.css'],
|
||||
'qweb': ['static/src/xml/auth_signup.xml'],
|
||||
}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
base.css: base.sass
|
||||
sass --trace -t expanded base.sass base.css
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
@charset "utf-8";
|
||||
.openerp .oe_login .oe_signup_show {
|
||||
display: none;
|
||||
}
|
||||
.openerp .oe_login_signup .oe_signup_show {
|
||||
display: block !important;
|
||||
}
|
||||
.openerp .oe_login_signup .oe_signup_hide {
|
||||
display: none;
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
@charset "utf-8"
|
||||
|
||||
.openerp
|
||||
// Regular login form
|
||||
.oe_login
|
||||
.oe_signup_show
|
||||
display: none
|
||||
// Signup form
|
||||
.oe_login_signup
|
||||
.oe_signup_show
|
||||
display: block !important
|
||||
.oe_signup_hide
|
||||
display: none
|
||||
@@ -7,12 +7,15 @@ openerp.auth_signup = function(instance) {
|
||||
var self = this;
|
||||
var d = this._super();
|
||||
|
||||
self.$(".oe_signup_show").hide();
|
||||
// to switch between the signup and regular login form
|
||||
this.$('a.oe_signup_signup').click(function(ev) {
|
||||
if (ev) {
|
||||
ev.preventDefault();
|
||||
}
|
||||
self.$el.addClass("oe_login_signup");
|
||||
self.$(".oe_signup_show").show();
|
||||
self.$(".oe_signup_hide").hide();
|
||||
return false;
|
||||
});
|
||||
this.$('a.oe_signup_back').click(function(ev) {
|
||||
@@ -20,6 +23,8 @@ openerp.auth_signup = function(instance) {
|
||||
ev.preventDefault();
|
||||
}
|
||||
self.$el.removeClass("oe_login_signup");
|
||||
self.$(".oe_signup_show").hide();
|
||||
self.$(".oe_signup_hide").show();
|
||||
delete self.params.token;
|
||||
return false;
|
||||
});
|
||||
|
||||
@@ -17,12 +17,12 @@
|
||||
<li class="oe_signup_show"><input name="confirm_password" type="password"/></li>
|
||||
</t>
|
||||
<t t-jquery="form ul:first li:has(button[name=submit])" t-operation="replace">
|
||||
<li class="oe_signup_hide"><button name="submit">Log in</button></li>
|
||||
<li class="oe_signup_show"><button name="submit">Sign in</button></li>
|
||||
</t>
|
||||
<t t-jquery="form ul button" t-operation="after">
|
||||
<a class="oe_signup_hide oe_signup_signup" href="#">Sign Up</a>
|
||||
<a class="oe_signup_show oe_signup_back" href="#">Back to Login</a>
|
||||
<li>
|
||||
<button class="oe_signup_hide" name="submit">Log in</button>
|
||||
<button class="oe_signup_show" name="submit">Sign up</button>
|
||||
<a class="oe_signup_hide oe_signup_signup" href="#">Sign Up</a>
|
||||
<a class="oe_signup_show oe_signup_back" href="#">Back to Login</a>
|
||||
</li>
|
||||
</t>
|
||||
</t>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user