fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [16310] formatting


From: sigurdne
Subject: [Fmsystem-commits] [16310] formatting
Date: Wed, 15 Feb 2017 10:47:40 -0500 (EST)

Revision: 16310
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16310
Author:   sigurdne
Date:     2017-02-15 10:47:40 -0500 (Wed, 15 Feb 2017)
Log Message:
-----------
formatting

Modified Paths:
--------------
    trunk/registration/inc/class.uireg.inc.php
    trunk/registration/templates/base/loginid_select.tpl
    trunk/registration/templates/base/lostpw_select.tpl

Modified: trunk/registration/inc/class.uireg.inc.php
===================================================================
--- trunk/registration/inc/class.uireg.inc.php  2017-02-14 18:40:38 UTC (rev 
16309)
+++ trunk/registration/inc/class.uireg.inc.php  2017-02-15 15:47:40 UTC (rev 
16310)
@@ -154,8 +154,9 @@
 
                                $lang_domain = lang('domain');
                                $domain_select = <<<HTML
-               <td>{$lang_domain}</td>
-               <td>
+
+       <div class="pure-control-group">
+               <label>{$lang_domain}</label>
                        <select name="logindomain" id="logindomain" 
class="inputbox">
 HTML;
 
@@ -178,7 +179,7 @@
                                $domain_select .= <<<HTML
                                {$options}
                        </select>
-               </td>
+               </div>
 HTML;
 
                                $values = array
@@ -335,8 +336,19 @@
                                $this->template->set_var('errors', 
$GLOBALS['phpgw']->common->error_list($errors));
                        }
 
+                       if($this->config['username_is'] == 'email')
+                       {
+                               $input_type = 'email';
+                       }
+                       else
+                       {
+                               $input_type = 'text';
+                               
+                       }
+
                        $this->template->set_var('form_action', 
$GLOBALS['phpgw']->link('/registration/main.php', array(
                                        'menuaction' => 
'registration.boreg.lostpw1', 'logindomain' => $_REQUEST['logindomain'])));
+                       $this->template->set_var('input_type', $input_type);
                        $this->template->set_var('lang_explain', lang('After 
you enter your username, instructions to change your password will be sent to 
you by e-mail to the address you gave when you registered.'));
                        $this->template->set_var('lang_username', 
lang('Username'));
                        $this->template->set_var('lang_submit', lang('Submit'));

Modified: trunk/registration/templates/base/loginid_select.tpl
===================================================================
--- trunk/registration/templates/base/loginid_select.tpl        2017-02-14 
18:40:38 UTC (rev 16309)
+++ trunk/registration/templates/base/loginid_select.tpl        2017-02-15 
15:47:40 UTC (rev 16310)
@@ -2,22 +2,19 @@
 <center>{errors}</center>
 
 <!-- BEGIN input -->
-<form action="{form_action}" method="POST" id="form">
-       <table border="0" width="40%" align="center">
+<form action="{form_action}" method="POST" id="form" class="pure-form 
pure-form-aligned">
+       <fieldset border="0" width="40%" align="center">
 
-               <tr>
-                       {domain_select}
-               </tr>
-               <tr>
-                       <td>{lang_username}</td>
-                       <td>{domain_from_host}<input name="r_reg[loginid]" 
value="{value_username}" data-validation="length alphanumeric" 
data-validation-length="3-10"/>
-                       </td>
-               </tr>
+               {domain_select}
+               <div class="pure-control-group">
+                       <label>{lang_username}</label>
+                       {domain_from_host}<input name="r_reg[loginid]" 
value="{value_username}" data-validation="length alphanumeric" 
data-validation-length="3-10"/>
+               </div>
 
-               <tr>
-                       <td colspan="2"><input type="submit" name="submit" 
value="{lang_submit}"></td>
-               </tr>
-       </table>
+               <div class="pure-controls">
+                       <button type="submit" class="pure-button 
pure-button-primary" name="submit">{lang_submit}</button>
+        </div>
+       </fieldset>
 </form>
 <!-- END input -->
 <!-- END form -->

Modified: trunk/registration/templates/base/lostpw_select.tpl
===================================================================
--- trunk/registration/templates/base/lostpw_select.tpl 2017-02-14 18:40:38 UTC 
(rev 16309)
+++ trunk/registration/templates/base/lostpw_select.tpl 2017-02-15 15:47:40 UTC 
(rev 16310)
@@ -7,7 +7,7 @@
        <fieldset>
                <div class="pure-control-group">
                        <label>{lang_username}</label>
-                       <input name="r_reg[loginid]" value="{value_username}" 
required="required" type="email">
+                       <input name="r_reg[loginid]" value="{value_username}" 
required="required" type="{input_type}">
                </div>
 
                <div class="pure-controls">




reply via email to

[Prev in Thread] Current Thread [Next in Thread]