[Fmsystem-commits] [16320] styling

[sigurdne]

Revision: 16320
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16320
Author:   sigurdne
Date:     2017-02-16 06:42:45 -0500 (Thu, 16 Feb 2017)
Log Message:
-----------
styling

Modified Paths:
--------------
    trunk/registration/inc/class.uireg.inc.php
    trunk/registration/templates/base/lostpw_change.tpl
    trunk/registration/templates/base/personal_info.tpl

Modified: trunk/registration/inc/class.uireg.inc.php
===================================================================
--- trunk/registration/inc/class.uireg.inc.php  2017-02-16 09:48:32 UTC (rev 
16319)
+++ trunk/registration/inc/class.uireg.inc.php  2017-02-16 11:42:45 UTC (rev 
16320)
@@ -273,6 +273,7 @@
                        $this->template->set_var('lang_password', 
lang('Password'));
                        $this->template->set_var('lang_reenter_password', 
lang('Re-enter password'));
                        $this->template->set_var('lang_submit', lang('Submit'));
+                       $this->template->set_var('lang_error_match', lang('The 
two passwords are not the same'));
 
                        if (!$show_password_prompt)
                        {
@@ -380,6 +381,7 @@
                        $this->template->set_var('lang_enter_password', 
lang('Enter your new password'));
                        $this->template->set_var('lang_reenter_password', 
lang('Re-enter your password'));
                        $this->template->set_var('lang_change', lang('Change'));
+                       $this->template->set_var('lang_error_match', lang('The 
two passwords are not the same'));
 
                        $this->template->pfp('out', 'form');
                        $this->footer();

Modified: trunk/registration/templates/base/lostpw_change.tpl
===================================================================
--- trunk/registration/templates/base/lostpw_change.tpl 2017-02-16 09:48:32 UTC 
(rev 16319)
+++ trunk/registration/templates/base/lostpw_change.tpl 2017-02-16 11:42:45 UTC 
(rev 16320)
@@ -3,31 +3,39 @@
 
 <center>{errors}</center>
 
-<form method="POST" action="{form_action}">
-    <table border="0">
-               <tr>
-                       <td>
+<form method="POST" action="{form_action}" class="pure-form pure-form-aligned">
+    <fieldset>
+               <div class="pure-control-group">
+                       <label>
                                {lang_enter_password}
-                       </td>
-                       <td>
-                               <input type="password" name="r_reg[passwd]">
-                       </td>
-               </tr>
-               <tr>
-                       <td>
+                       </label>
+                       <input type="password" name="r_reg[passwd]" 
required="required" id="password">
+               </div>
+               <div class="pure-control-group">
+                       <label>
                                {lang_reenter_password}
-                       </td>
-                       <td>
-                               <input type="password" name="r_reg[passwd_2]">
-                       </td>
-               </tr>
-               <tr>
-                       <td colspan="2">
-                               <input type="submit" name="submit" 
value="{lang_change}">
-                       </td>
-               </tr>
-    </table>
+                       </label>
+                       <input type="password" name="r_reg[passwd_2]" 
required="required" id="password_confirm" oninput="check(this)">
+               </div>
+               <div class="pure-controls">
+                       <button type="submit" class="pure-button 
pure-button-primary" name="submit">{lang_change}</button>
+        </div>
+    </fieldset>
 </form>
+<script language='javascript' type='text/javascript'>
+       function check(input)
+       {
+               if (input.value != document.getElementById('password').value)
+               {
+                       input.setCustomValidity('{lang_error_match}');
+               }
+               else
+               {
+                       // input is valid -- reset the error message
+                       input.setCustomValidity('');
+               }
+       }
+</script>
 <br>
 <pre>{sql_message}</pre>
 <!-- END form -->

Modified: trunk/registration/templates/base/personal_info.tpl
===================================================================
--- trunk/registration/templates/base/personal_info.tpl 2017-02-16 09:48:32 UTC 
(rev 16319)
+++ trunk/registration/templates/base/personal_info.tpl 2017-02-16 11:42:45 UTC 
(rev 16320)
@@ -47,7 +47,7 @@
 
                <div class="pure-control-group">
                        <label 
for="password2">{missing_passwd_confirm}{lang_reenter_password}</label>
-                       <input type="password" id="password2" type="text" 
placeholder="{lang_password}" name="r_reg[passwd_confirm]" 
value="{value_passwd_confirm}" required>
+                       <input type="password" id="password2" type="text" 
placeholder="{lang_password}" name="r_reg[passwd_confirm]" 
value="{value_passwd_confirm}" required oninput="check(this)">
                </div>
                <!-- END password -->
 
@@ -73,5 +73,19 @@
 
        </fieldset>
 </form>
+<script language='javascript' type='text/javascript'>
+       function check(input)
+       {
+               if (input.value != document.getElementById('password').value)
+               {
+                       input.setCustomValidity('{lang_error_match}');
+               }
+               else
+               {
+                       // input is valid -- reset the error message
+                       input.setCustomValidity('');
+               }
+       }
+</script>
 <!-- END form -->