Fix registration form

This commit is contained in:
Christian Vogeley 2013-01-01 21:05:24 +01:00
parent 966d786982
commit cde9b6370d
7 changed files with 12 additions and 10 deletions

View File

@ -214,7 +214,8 @@ function register_content(&$a) {
$oidlabel = ''; $oidlabel = '';
} }
else { else {
$oidhtml = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >'; $oidhtml = '<label for="register-openid" id="label-register-openid" >%s</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="%s" >';
$oidhtml_old = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
$fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."); $fillwith = t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
$fillext = t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'); $fillext = t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
$oidlabel = t("Your OpenID \x28optional\x29: "); $oidlabel = t("Your OpenID \x28optional\x29: ");
@ -252,6 +253,7 @@ function register_content(&$a) {
$o = replace_macros($o, array( $o = replace_macros($o, array(
'$oidhtml' => $oidhtml, '$oidhtml' => $oidhtml,
'$oidhtml_old' => $oidhtml_old,
'$invitations' => get_config('system','invitation_only'), '$invitations' => get_config('system','invitation_only'),
'$invite_desc' => t('Membership on this site is by invitation only.'), '$invite_desc' => t('Membership on this site is by invitation only.'),
'$invite_label' => t('Your invitation ID: '), '$invite_label' => t('Your invitation ID: '),

View File

@ -12,7 +12,7 @@
<p id="register-fill-ext">$fillext</p> <p id="register-fill-ext">$fillext</p>
<div id="register-openid-wrapper" > <div id="register-openid-wrapper" >
$oidhtml $oidhtml_old
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>

View File

@ -12,7 +12,7 @@
<p id="register-fill-ext">{{$fillext}}</p> <p id="register-fill-ext">{{$fillext}}</p>
<div id="register-openid-wrapper" > <div id="register-openid-wrapper" >
{{$oidhtml}} {{$oidhtml|sprintf:$oidlabel:$openid}}
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>
@ -41,7 +41,7 @@
</div> </div>
<div id="register-email-end" ></div> <div id="register-email-end" ></div>
<p id="register-nickname-desc" >{{$nickdesc}}</p> <p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
<div id="register-nickname-wrapper" > <div id="register-nickname-wrapper" >
<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label> <label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>

View File

@ -12,7 +12,7 @@
<br /> <br />
<div id="register-openid-wrapper" class="field input" > <div id="register-openid-wrapper" class="field input" >
$oidhtml $oidhtml_old
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>

View File

@ -12,7 +12,7 @@
<br /> <br />
<div id="register-openid-wrapper" class="field input" > <div id="register-openid-wrapper" class="field input" >
{{$oidhtml}} {{$oidhtml|sprintf:$oidlabel:$openid}}
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>
@ -54,7 +54,7 @@
<div id="register-nickname-end" ></div> <div id="register-nickname-end" ></div>
<div class="register-explain-wrapper"> <div class="register-explain-wrapper">
<p id="register-nickname-desc" >{{$nickdesc}}</p> <p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
</div> </div>
{{$publish}} {{$publish}}

View File

@ -12,7 +12,7 @@
<br /> <br />
<div id="register-openid-wrapper" class="field input" > <div id="register-openid-wrapper" class="field input" >
$oidhtml $oidhtml_old
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>

View File

@ -12,7 +12,7 @@
<br /> <br />
<div id="register-openid-wrapper" class="field input" > <div id="register-openid-wrapper" class="field input" >
{{$oidhtml}} {{$oidhtml|sprintf:$oidlabel:$openid}}
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>
@ -55,7 +55,7 @@
<div id="register-nickname-end" ></div> <div id="register-nickname-end" ></div>
<div class="register-explain-wrapper"> <div class="register-explain-wrapper">
<p id="register-nickname-desc" >{{$nickdesc}}</p> <p id="register-nickname-desc" >{{$nickdesc|replace:'$sitename':$sitename}}</p>
</div> </div>
{{$publish}} {{$publish}}