templates: Migrate login and register templates to pyramid.

rhodecode/templates/login.html

@@ -1,62 +1,77 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 
 <%def name="title()">
     ${_('Sign In')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <style>body{background-color:#eeeeee;}</style>
 <div class="loginbox">
     <div class="header">
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
                     <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
                 %endif
             </div>
         </div>
     </div>
 
     <div class="loginwrapper">
         <div class="left-column">
             <img class="sign-in-image" src="${h.url('/images/sign-in.png')}" alt="RhodeCode"/>
         </div>
         
         <div id="login" class="right-column">
             <%include file="/base/flash_msg.html"/>
             <!-- login -->
             <div class="sign-in-title">
                 <h1>${_('Sign In')}</h1>
                 %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
-                <h4>${h.link_to(_("Go to the registration page to create a new account."),h.url('register'))}</h4>
+                <h4>${h.link_to(_("Go to the registration page to create a new account."), request.route_path('register'))}</h4>
                 %endif
             </div>
             <div class="inner form">
-                ${h.form(h.url.current(**request.GET), needs_csrf_token=False)}
+                ${h.form(request.route_path('login', _query={'came_from': came_from}), needs_csrf_token=False)}
+
                     <label for="username">${_('Username')}:</label>
-                    ${h.text('username',class_='focus')}
+                    ${h.text('username', class_='focus', value=defaults.get('username'))}
+                    %if 'username' in errors:
+                    <span class="error-message">${errors.get('username')}</span>
+                    <br />
+                    %endif
+
                     <label for="password">${_('Password')}:</label>
-                    ${h.password('password',class_='focus')}
-                    <input type="checkbox" id="remember" name="remember" />
+                    ${h.password('password', class_='focus')}
+                    %if 'password' in errors:
+                    <span class="error-message">${errors.get('password')}</span>
+                    <br />
+                    %endif
+
+                    ${h.checkbox('remember', value=True, checked=defaults.get('remember'))}
                     <label class="checkbox" for="remember">${_('Remember me')}</label>
+
                     <p class="links">
-                        ${h.link_to(_('Forgot your password?'),h.url('reset_password'))}
+                        ${h.link_to(_('Forgot your password?'), h.route_path('reset_password'))}
                     </p> 
-                    ${h.submit('sign_in',_('Sign In'),class_="btn sign-in")}
+
+                    ${h.submit('sign_in', _('Sign In'), class_="btn sign-in")}
+
                 ${h.end_form()}
                 <script type="text/javascript">
                     $(document).ready(function(){
                         $('#username').focus();
                     })
                 </script>
             </div>
             <!-- end login -->
+            <%block name="below_login_button" />
         </div>
     </div>
 </div>

rhodecode/templates/register.html

@@ -1,88 +1,123 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 
 <%def name="title()">
     ${_('Create an Account')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 <style>body{background-color:#eeeeee;}</style>
 
 <div class="loginbox">
     <div class="header">
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
                     <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
                 %endif
             </div>
         </div>
     </div>
 
     <div class="loginwrapper">
         <div class="left-column">
             <img class="sign-in-image" src="${h.url('/images/sign-in.png')}" alt="RhodeCode"/>
         </div>
         
         <div id="register" class="right-column">
             <%include file="/base/flash_msg.html"/>
             <!-- login -->
             <div class="sign-in-title">
                 <h1>${_('Create an account')}</h1>
-                <h4>${h.link_to(_("Go to the login page to sign in with an existing account."),h.url('login'))}</h4>
+                <h4>${h.link_to(_("Go to the login page to sign in with an existing account."), request.route_path('login'))}</h4>
             </div>
             <div class="inner form">
-                ${h.form(url('register'), needs_csrf_token= False)}
+                ${h.form(request.route_path('register'), needs_csrf_token=False)}
+
                     <label for="username">${_('Username')}:</label>
-                    ${h.text('username', c.form_data.get('username'))}
+                    ${h.text('username', defaults.get('username'))}
+                    %if 'username' in errors:
+                      <span class="error-message">${errors.get('username')}</span>
+                      <br />
+                    %endif
+
                     <label for="password">${_('Password')}:</label>
-                    ${h.password('password', c.form_data.get('password'))}
-                    <label for="password">${_('Re-enter password')}:</label>
-                    ${h.password('password_confirmation', c.form_data.get('password'))}
+                    ${h.password('password', defaults.get('password'))}
+                    %if 'password' in errors:
+                      <span class="error-message">${errors.get('password')}</span>
+                      <br />
+                    %endif
+
+                    <label for="password_confirmation">${_('Re-enter password')}:</label>
+                    ${h.password('password_confirmation', defaults.get('password_confirmation'))}
+                    %if 'password_confirmation' in errors:
+                      <span class="error-message">${errors.get('password_confirmation')}</span>
+                      <br />
+                    %endif
+
                     <label for="firstname">${_('First Name')}:</label>
-                    ${h.text('firstname')}
+                    ${h.text('firstname', defaults.get('firstname'))}
+                    %if 'firstname' in errors:
+                      <span class="error-message">${errors.get('firstname')}</span>
+                      <br />
+                    %endif
+
                     <label for="lastname">${_('Last Name')}:</label>
-                    ${h.text('lastname')}
+                    ${h.text('lastname', defaults.get('lastname'))}
+                    %if 'lastname' in errors:
+                      <span class="error-message">${errors.get('lastname')}</span>
+                      <br />
+                    %endif
+
                     <label for="email">${_('Email')}:</label>
-                    ${h.text('email', c.form_data.get('email'))}
+                    ${h.text('email', defaults.get('email'))}
+                    %if 'email' in errors:
+                      <span class="error-message">${errors.get('email')}</span>
+                      <br />
+                    %endif
 
-                    %if c.captcha_active:
+                    %if captcha_active:
                     <div>
-                        <label for="email">${_('Captcha')}:</label>
+                        <label for="recaptcha">${_('Captcha')}:</label>
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>
+                        %if 'recaptcha_field' in errors:
+                          <span class="error-message">${errors.get('recaptcha_field')}</span>
+                          <br />
+                        %endif
                     </div>
                     %endif
 
-                    %if not c.auto_active:
+                    %if not auto_active:
                         <p class="activation_msg">
                             ${_('Account activation requires admin approval.')}
                         </p>
                     %endif
                     <p class="register_message">
-                        ${c.register_message|n}
+                        ${register_message|n}
                     </p>
 
                     ${h.submit('sign_up',_('Create Account'),class_="btn sign-in")}
 
                 ${h.end_form()}
             </div>
+            <%block name="below_register_button" />
         </div>
     </div>
 </div>
 
-%if c.captcha_active:
+%if captcha_active:
 <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
 %endif
 <script type="text/javascript">
 $(document).ready(function(){
     $('#username').focus();
-    %if c.captcha_active:
-      Recaptcha.create("${c.captcha_public_key}", "recaptcha", {theme: "white"});
+    %if captcha_active:
+      Recaptcha.create("${captcha_public_key}", "recaptcha", {theme: "white"});
     %endif
 });
 </script>