##// END OF EJS Templates
templates: Remove social auth plugins code from login and register templates.
johbo -
r24:fd48e82c default
parent child Browse files
Show More
@@ -1,72 +1,62 b''
1 ## -*- coding: utf-8 -*-
1 ## -*- coding: utf-8 -*-
2 <%inherit file="base/root.html"/>
2 <%inherit file="base/root.html"/>
3 <%namespace file="base/social_buttons.html" import="render_social_buttons"/>
4
3
5 <%def name="title()">
4 <%def name="title()">
6 ${_('Sign In')}
5 ${_('Sign In')}
7 %if c.rhodecode_name:
6 %if c.rhodecode_name:
8 &middot; ${h.branding(c.rhodecode_name)}
7 &middot; ${h.branding(c.rhodecode_name)}
9 %endif
8 %endif
10 </%def>
9 </%def>
11
10
12 <style>body{background-color:#eeeeee;}</style>
11 <style>body{background-color:#eeeeee;}</style>
13 <div class="loginbox">
12 <div class="loginbox">
14 <div class="header">
13 <div class="header">
15 <div id="header-inner" class="title">
14 <div id="header-inner" class="title">
16 <div id="logo">
15 <div id="logo">
17 <div class="logo-wrapper">
16 <div class="logo-wrapper">
18 <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
17 <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
19 </div>
18 </div>
20 %if c.rhodecode_name:
19 %if c.rhodecode_name:
21 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
20 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
22 %endif
21 %endif
23 </div>
22 </div>
24 </div>
23 </div>
25 </div>
24 </div>
26
25
27 <div class="loginwrapper">
26 <div class="loginwrapper">
28 <div class="left-column">
27 <div class="left-column">
29 <img class="sign-in-image" src="${h.url('/images/sign-in.png')}" alt="RhodeCode"/>
28 <img class="sign-in-image" src="${h.url('/images/sign-in.png')}" alt="RhodeCode"/>
30 </div>
29 </div>
31
30
32 <div id="login" class="right-column">
31 <div id="login" class="right-column">
33 <%include file="/base/flash_msg.html"/>
32 <%include file="/base/flash_msg.html"/>
34 <!-- login -->
33 <!-- login -->
35 <div class="sign-in-title">
34 <div class="sign-in-title">
36 <h1>${_('Sign In')}</h1>
35 <h1>${_('Sign In')}</h1>
37 %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
36 %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
38 <h4>${h.link_to(_("Go to the registration page to create a new account."),h.url('register'))}</h4>
37 <h4>${h.link_to(_("Go to the registration page to create a new account."),h.url('register'))}</h4>
39 %endif
38 %endif
40 </div>
39 </div>
41 <div class="inner form">
40 <div class="inner form">
42 ${h.form(h.url.current(**request.GET), needs_csrf_token=False)}
41 ${h.form(h.url.current(**request.GET), needs_csrf_token=False)}
43 <label for="username">${_('Username')}:</label>
42 <label for="username">${_('Username')}:</label>
44 ${h.text('username',class_='focus')}
43 ${h.text('username',class_='focus')}
45 <label for="password">${_('Password')}:</label>
44 <label for="password">${_('Password')}:</label>
46 ${h.password('password',class_='focus')}
45 ${h.password('password',class_='focus')}
47 <input type="checkbox" id="remember" name="remember" />
46 <input type="checkbox" id="remember" name="remember" />
48 <label class="checkbox" for="remember">${_('Remember me')}</label>
47 <label class="checkbox" for="remember">${_('Remember me')}</label>
49 <p class="links">
48 <p class="links">
50 ${h.link_to(_('Forgot your password?'),h.url('reset_password'))}
49 ${h.link_to(_('Forgot your password?'),h.url('reset_password'))}
51 </p>
50 </p>
52 ${h.submit('sign_in',_('Sign In'),class_="btn sign-in")}
51 ${h.submit('sign_in',_('Sign In'),class_="btn sign-in")}
53 ${h.end_form()}
52 ${h.end_form()}
54 <script type="text/javascript">
53 <script type="text/javascript">
55 $(document).ready(function(){
54 $(document).ready(function(){
56 $('#username').focus();
55 $('#username').focus();
57 })
56 })
58 </script>
57 </script>
59 </div>
58 </div>
60
61 % if c.social_plugins:
62 <p>${_('Sign In using one of external services')}:</p>
63
64 <p>
65 ${render_social_buttons(c.social_plugins, 'login')}
66 </p>
67 % endif
68
69 <!-- end login -->
59 <!-- end login -->
70 </div>
60 </div>
71 </div>
61 </div>
72 </div>
62 </div>
@@ -1,98 +1,88 b''
1 ## -*- coding: utf-8 -*-
1 ## -*- coding: utf-8 -*-
2 <%inherit file="base/root.html"/>
2 <%inherit file="base/root.html"/>
3 <%namespace file="base/social_buttons.html" import="render_social_buttons"/>
4
3
5 <%def name="title()">
4 <%def name="title()">
6 ${_('Create an Account')}
5 ${_('Create an Account')}
7 %if c.rhodecode_name:
6 %if c.rhodecode_name:
8 &middot; ${h.branding(c.rhodecode_name)}
7 &middot; ${h.branding(c.rhodecode_name)}
9 %endif
8 %endif
10 </%def>
9 </%def>
11 <style>body{background-color:#eeeeee;}</style>
10 <style>body{background-color:#eeeeee;}</style>
12
11
13 <div class="loginbox">
12 <div class="loginbox">
14 <div class="header">
13 <div class="header">
15 <div id="header-inner" class="title">
14 <div id="header-inner" class="title">
16 <div id="logo">
15 <div id="logo">
17 <div class="logo-wrapper">
16 <div class="logo-wrapper">
18 <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
17 <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
19 </div>
18 </div>
20 %if c.rhodecode_name:
19 %if c.rhodecode_name:
21 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
20 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
22 %endif
21 %endif
23 </div>
22 </div>
24 </div>
23 </div>
25 </div>
24 </div>
26
25
27 <div class="loginwrapper">
26 <div class="loginwrapper">
28 <div class="left-column">
27 <div class="left-column">
29 <img class="sign-in-image" src="${h.url('/images/sign-in.png')}" alt="RhodeCode"/>
28 <img class="sign-in-image" src="${h.url('/images/sign-in.png')}" alt="RhodeCode"/>
30 </div>
29 </div>
31
30
32 <div id="register" class="right-column">
31 <div id="register" class="right-column">
33 <%include file="/base/flash_msg.html"/>
32 <%include file="/base/flash_msg.html"/>
34 <!-- login -->
33 <!-- login -->
35 <div class="sign-in-title">
34 <div class="sign-in-title">
36 <h1>${_('Create an account')}</h1>
35 <h1>${_('Create an account')}</h1>
37 <h4>${h.link_to(_("Go to the login page to sign in with an existing account."),h.url('login'))}</h4>
36 <h4>${h.link_to(_("Go to the login page to sign in with an existing account."),h.url('login'))}</h4>
38 </div>
37 </div>
39 <div class="inner form">
38 <div class="inner form">
40 ${h.form(url('register'), needs_csrf_token= False)}
39 ${h.form(url('register'), needs_csrf_token= False)}
41 <label for="username">${_('Username')}:</label>
40 <label for="username">${_('Username')}:</label>
42 ${h.text('username', c.form_data.get('username'))}
41 ${h.text('username', c.form_data.get('username'))}
43 <label for="password">${_('Password')}:</label>
42 <label for="password">${_('Password')}:</label>
44 ${h.password('password', c.form_data.get('password'))}
43 ${h.password('password', c.form_data.get('password'))}
45 <label for="password">${_('Re-enter password')}:</label>
44 <label for="password">${_('Re-enter password')}:</label>
46 ${h.password('password_confirmation', c.form_data.get('password'))}
45 ${h.password('password_confirmation', c.form_data.get('password'))}
47 <label for="firstname">${_('First Name')}:</label>
46 <label for="firstname">${_('First Name')}:</label>
48 ${h.text('firstname')}
47 ${h.text('firstname')}
49 <label for="lastname">${_('Last Name')}:</label>
48 <label for="lastname">${_('Last Name')}:</label>
50 ${h.text('lastname')}
49 ${h.text('lastname')}
51 <label for="email">${_('Email')}:</label>
50 <label for="email">${_('Email')}:</label>
52 ${h.text('email', c.form_data.get('email'))}
51 ${h.text('email', c.form_data.get('email'))}
53
52
54 %if c.captcha_active:
53 %if c.captcha_active:
55 <div>
54 <div>
56 <label for="email">${_('Captcha')}:</label>
55 <label for="email">${_('Captcha')}:</label>
57 ${h.hidden('recaptcha_field')}
56 ${h.hidden('recaptcha_field')}
58 <div id="recaptcha"></div>
57 <div id="recaptcha"></div>
59 </div>
58 </div>
60 %endif
59 %endif
61
60
62 %if not c.auto_active:
61 %if not c.auto_active:
63 <p class="activation_msg">
62 <p class="activation_msg">
64 ${_('Account activation requires admin approval.')}
63 ${_('Account activation requires admin approval.')}
65 </p>
64 </p>
66 %endif
65 %endif
67 <p class="register_message">
66 <p class="register_message">
68 ${c.register_message|n}
67 ${c.register_message|n}
69 </p>
68 </p>
70
69
71 ${h.submit('sign_up',_('Create Account'),class_="btn sign-in")}
70 ${h.submit('sign_up',_('Create Account'),class_="btn sign-in")}
72
71
73 ${h.end_form()}
72 ${h.end_form()}
74 </div>
73 </div>
75
76 % if c.social_plugins:
77 <p>${_('Register using one of external services')}:</p>
78
79 <p>
80 ${render_social_buttons(c.social_plugins, 'register')}
81 </p>
82 % endif
83
84 </div>
74 </div>
85 </div>
75 </div>
86 </div>
76 </div>
87
77
88 %if c.captcha_active:
78 %if c.captcha_active:
89 <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
79 <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
90 %endif
80 %endif
91 <script type="text/javascript">
81 <script type="text/javascript">
92 $(document).ready(function(){
82 $(document).ready(function(){
93 $('#username').focus();
83 $('#username').focus();
94 %if c.captcha_active:
84 %if c.captcha_active:
95 Recaptcha.create("${c.captcha_public_key}", "recaptcha", {theme: "white"});
85 Recaptcha.create("${c.captcha_public_key}", "recaptcha", {theme: "white"});
96 %endif
86 %endif
97 });
87 });
98 </script>
88 </script>
General Comments 0
You need to be logged in to leave comments. Login now