Move HTML part of oid to template + replace outside the tpl
This commit is contained in:
parent
2a3f8f8ee2
commit
5bfd4cf5c4
|
@ -253,7 +253,6 @@ 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: '),
|
||||||
|
@ -269,7 +268,7 @@ function register_content(&$a) {
|
||||||
'$openid' => $openid_url,
|
'$openid' => $openid_url,
|
||||||
'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
|
'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
|
||||||
'$addrlabel' => t('Your Email Address: '),
|
'$addrlabel' => t('Your Email Address: '),
|
||||||
'$nickdesc' => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'),
|
'$nickdesc' => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.')),
|
||||||
'$nicklabel' => t('Choose a nickname: '),
|
'$nicklabel' => t('Choose a nickname: '),
|
||||||
'$photo' => $photo,
|
'$photo' => $photo,
|
||||||
'$publish' => $profile_publish,
|
'$publish' => $profile_publish,
|
||||||
|
|
|
@ -11,10 +11,12 @@
|
||||||
<p id="register-fill-desc">$fillwith</p>
|
<p id="register-fill-desc">$fillwith</p>
|
||||||
<p id="register-fill-ext">$fillext</p>
|
<p id="register-fill-ext">$fillext</p>
|
||||||
|
|
||||||
|
{{ if $oidlabel }}
|
||||||
<div id="register-openid-wrapper" >
|
<div id="register-openid-wrapper" >
|
||||||
$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" >
|
||||||
</div>
|
</div>
|
||||||
<div id="register-openid-end" ></div>
|
<div id="register-openid-end" ></div>
|
||||||
|
{{ endif }}
|
||||||
|
|
||||||
{{ if $invitations }}
|
{{ if $invitations }}
|
||||||
|
|
||||||
|
|
|
@ -11,10 +11,12 @@
|
||||||
<p id="register-fill-desc">{{$fillwith}}</p>
|
<p id="register-fill-desc">{{$fillwith}}</p>
|
||||||
<p id="register-fill-ext">{{$fillext}}</p>
|
<p id="register-fill-ext">{{$fillext}}</p>
|
||||||
|
|
||||||
|
{{if $oidlabel }}
|
||||||
<div id="register-openid-wrapper" >
|
<div id="register-openid-wrapper" >
|
||||||
{{$oidhtml|sprintf:$oidlabel:$openid}}
|
<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}}" >
|
||||||
</div>
|
</div>
|
||||||
<div id="register-openid-end" ></div>
|
<div id="register-openid-end" ></div>
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
{{if $invitations}}
|
{{if $invitations}}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue