kallithea Changeset - 1433199fb0f5

Changeset - 1433199fb0f5

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

domruf - 8 years ago 2017-09-11 22:19:32
dominikruf@gmail.com

templates: use consistent form-group/buttons pattern for buttons in centered panels

4 files changed with 10 insertions and 7 deletions:

kallithea/templates/login.html

kallithea/templates/password_reset.html

kallithea/templates/password_reset_confirmation.html

kallithea/templates/register.html

0 comments (0 inline, 0 general)

kallithea/templates/login.html

➞

Show inline comments

@@ @@ -21,43 +21,48 @@ @@
                 <div class="form-group">
                     <label class="control-label" for="username">${_('Username')}:</label>
                     <div>
                         ${h.text('username',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="password">${_('Password')}:</label>
                     <div>
                         ${h.password('password',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <div>
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" id="remember" name="remember"/>
                                 ${_('Stay logged in after browser restart')}
                             </label>
                         </div>
                     </div>
                 </div>
             <div class="links">
             <div class="form-group">
                 <div>
                 ${h.link_to(_('Forgot your password ?'),h.url('reset_password'))}
                 %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
+                  /
                  ${h.link_to(_("Don't have an account ?"),h.url('register'))}
                 %endif
                 <span class="buttons">
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('sign_in',_('Sign In'),class_="btn btn-default")}
-                </span>
+                </div>
             </div>
         </div>
         ${h.end_form()}
         <script type="text/javascript">
         $(document).ready(function(){
             $('#username').focus();
         });
         </script>
     </div>
 </div>

kallithea/templates/password_reset.html

➞

Show inline comments

@@ @@ -13,50 +13,50 @@ @@
         %else:
             <h5>${_('Reset Your Password')}</h5>
         %endif
     </div>
     <div class="panel-body">
         ${h.form(url('password_reset'))}
         <div class="form">
                 <div class="form-group">
                     <label class="control-label" for="email">${_('Email Address')}:</label>
                     <div>
                         ${h.text('email', class_='form-control')}
                     </div>
                 </div>
                 %if c.captcha_active:
                 <div class="form-group">
                     <label class="control-label" for="recaptcha_field">${_('Captcha')}:</label>
                     <div>
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>
                     </div>
                 </div>
                 %endif
                 <div class="form-group">
                 <div class="buttons">
                     <div class="nohighlight">
                       ${h.submit('send',_('Send Password Reset Email'),class_="btn btn-default")}
                     </div>
                 </div>
                 <div class="alert alert-info">
                     ${_('A password reset link will be sent to the specified email address if it is registered in the system.')}
                 </div>
         </div>
         ${h.end_form()}
         %if c.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(){
             $('#email').focus();
             %if c.captcha_active:
             Recaptcha.create(${h.js(c.captcha_public_key)}, "recaptcha",
+                {
                   theme: "white"
+                }
             );
             %endif
          });
         </script>

kallithea/templates/password_reset_confirmation.html

➞

Show inline comments

@@ @@ -24,33 +24,31 @@ @@
         <div class="form">
                 <div class="form-group">
                     <label class="control-label" for="token">${_('Code you received in the email')}:</label>
                     <div>
                         ${h.text('token', class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="password">${_('New Password')}:</label>
                     <div>
                         ${h.password('password',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="password_confirm">${_('Confirm New Password')}:</label>
                     <div>
                         ${h.password('password_confirm',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="buttons">
                         <div class="nohighlight">
                             ${h.submit('send',_('Confirm'),class_="btn btn-default")}
                         </div>
                     </div>
                 </div>
         </div>
         ${h.end_form()}
     </div>
    </div>

kallithea/templates/register.html

➞

Show inline comments

@@ @@ -49,50 +49,50 @@ @@
                 <div class="form-group">
                     <label class="control-label" for="lastname">${_('Last Name')}:</label>
                     <div>
                         ${h.text('lastname',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="email">${_('Email')}:</label>
                     <div>
                         ${h.text('email',class_='form-control')}
                     </div>
                 </div>
                 %if c.captcha_active:
                 <div class="form-group">
                     <label class="control-label" for="recaptcha_field">${_('Captcha')}:</label>
                     <div>
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>
                     </div>
                 </div>
                 %endif
                 <div class="form-group">
                 <div class="buttons">
                     <div class="nohighlight">
                         ${h.submit('sign_up',_('Sign Up'),class_="btn btn-default")}
                         %if c.auto_active:
                             <div class="alert alert-info">${_('Registered accounts are ready to use and need no further action.')}</div>
                         %else:
                             <div class="alert alert-info">${_('Please wait for an administrator to activate your account.')}</div>
                         %endif
                     </div>
                 </div>
         </div>
         ${h.end_form()}
         %if c.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(${h.js(c.captcha_public_key)}, "recaptcha",
+                {
                   theme: "white"
+                }
             );
             %endif

0 comments (0 inline, 0 general)