ui: make branding consistent in all pages.

rhodecode/templates/login.mako

@@ -1,90 +1,90 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.mako"/>
 
 <%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.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
-                <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
+                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
                 %endif
             </div>
         </div>
     </div>
 
     <div class="loginwrapper">
         <rhodecode-toast id="notifications"></rhodecode-toast>
         <div class="left-column">
             <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/>
         </div>
         <%block name="above_login_button" />
         <div id="login" class="right-column">
             <!-- 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."), request.route_path('register'))}</h4>
                 %endif
             </div>
             <div class="inner form">
                 ${h.form(request.route_path('login', _query={'came_from': c.came_from}), needs_csrf_token=False)}
 
                     <label for="username">${_('Username')}:</label>
                     ${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')}
                     %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>
 
                     %if h.HasPermissionAny('hg.password_reset.enabled')():
                         <p class="links">
                             ${h.link_to(_('Forgot your password?'), h.route_path('reset_password'), class_='pwd_reset')}
                         </p>
                     %elif h.HasPermissionAny('hg.password_reset.hidden')():
                         <p class="help-block">
                             ${_('Password reset is disabled. Please contact ')}
                             % if c.visual.rhodecode_support_url:
                                 <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a>
                                 ${_('or')}
                             % endif
                             ${_('an administrator if you need help.')}
                         </p>
                     %endif
 
                     ${h.submit('sign_in', _('Sign In'), class_="btn sign-in")}
                     <p class="help-block pull-right">
                         RhodeCode ${c.rhodecode_edition}
                     </p>
                 ${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/password_reset.mako

@@ -1,101 +1,101 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.mako"/>
 
 <%def name="title()">
     ${_('Reset Password')}
     %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.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
-                <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
+                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
                 %endif
             </div>
         </div>
     </div>
 
     <div class="loginwrapper">
         <rhodecode-toast id="notifications"></rhodecode-toast>
         <div class="left-column">
             <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/>
         </div>
 
         %if h.HasPermissionAny('hg.password_reset.disabled')():
             <div class="right-column">
                 <p>
                     ${_('Password reset is disabled. Please contact ')}
                     % if c.visual.rhodecode_support_url:
                         <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a>
                         ${_('or')}
                     % endif
                     ${_('an administrator if you need help.')}
                 </p>
             </div>
         %else:
             <div id="register" class="right-column">
                 <!-- login -->
                 <div class="sign-in-title">
                     <h1>${_('Reset your Password')}</h1>
                     <h4>${h.link_to(_("Go to the login page to sign in."), request.route_path('login'))}</h4>
                 </div>
                 <div class="inner form">
                     ${h.form(request.route_path('reset_password'), needs_csrf_token=False)}
                         <label for="email">${_('Email Address')}:</label>
                         ${h.text('email', defaults.get('email'))}
                         %if 'email' in errors:
                           <span class="error-message">${errors.get('email')}</span>
                           <br />
                         %endif
                         <p class="help-block">${_('Password reset link will be sent to matching email address')}</p>
     
                         %if captcha_active:
                         <div class="login-captcha">
                             <label for="email">${_('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
     
                         ${h.submit('send', _('Send password reset email'), class_="btn sign-in")}
                         <p class="help-block pull-right">
                             RhodeCode ${c.rhodecode_edition}
                         </p>
     
                     ${h.end_form()}
                 </div>
             </div>
         %endif
     </div>
 </div>
 
 <script type="text/javascript">
  $(document).ready(function(){
     $('#email').focus();
  });
 </script>
 
 % if captcha_active:
 <script type="text/javascript">
 var onloadCallback = function() {
     grecaptcha.render('recaptcha', {
       'sitekey' : "${captcha_public_key}"
     });
 };
 </script>
 <script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit" async defer></script>
 % endif
 

rhodecode/templates/register.mako

@@ -1,147 +1,147 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.mako"/>
 
 <%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.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
-                <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
+                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
                 %endif
             </div>
         </div>
     </div>
 
     <div class="loginwrapper">
         <rhodecode-toast id="notifications"></rhodecode-toast>
         <div class="left-column">
             <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/>
         </div>
         <%block name="above_register_button" />
         <div id="register" class="right-column">
             <!-- login -->
             <div class="sign-in-title">
                 % if social_auth_provider:
                     <h1>${_('Create an account linked with {}').format(social_auth_provider)}</h1>
                 % else:
                     <h1>${_('Create an account')}</h1>
                 % endif
 
                 <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(request.route_path('register'), needs_csrf_token=False)}
 
                     <label for="username">${_('Username')}:</label>
                     ${h.text('username', defaults.get('username'))}
                     %if 'username' in errors:
                       <span class="error-message">${errors.get('username')}</span>
                       <br />
                     %endif
 
                     % if social_auth_provider:
                         ## hide password prompts for social auth
                         <div style="display: none">
                     % endif
 
                     <label for="password">${_('Password')}:</label>
                     ${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
 
                     % if social_auth_provider:
                         ## hide password prompts for social auth
                         </div>
                     % endif
 
                     <label for="firstname">${_('First Name')}:</label>
                     ${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', 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', defaults.get('email'))}
                     %if 'email' in errors:
                       <span class="error-message">${errors.get('email')}</span>
                       <br />
                     %endif
 
                     %if captcha_active:
                     <div>
                         <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 auto_active:
                         <p class="activation_msg">
                             ${_('Account activation requires admin approval.')}
                         </p>
                     %endif
                     <p class="register_message">
                         ${register_message|n}
                     </p>
 
                     ${h.submit('sign_up',_('Create Account'),class_="btn sign-in")}
                     <p class="help-block pull-right">
                         RhodeCode ${c.rhodecode_edition}
                     </p>
                 ${h.end_form()}
             </div>
             <%block name="below_register_button" />
         </div>
     </div>
 </div>
 
 
 <script type="text/javascript">
  $(document).ready(function(){
     $('#username').focus();
  });
 </script>
 
 % if captcha_active:
 <script type="text/javascript">
 var onloadCallback = function() {
     grecaptcha.render('recaptcha', {
       'sitekey' : "${captcha_public_key}"
     });
 };
 </script>
 <script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit" async defer></script>
 % endif