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