jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move HTML part of oid to template + replace outside the tpl

Browse source
This commit is contained in:
Christian Vogeley 2013-01-01 22:40:05 +01:00
parent 2a3f8f8ee2
commit 5bfd4cf5c4
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mod/register.php
View file

@ -253,7 +253,6 @@ function register_content(&$a) {
$o = replace_macros($o, array(
'$oidhtml' => $oidhtml,
'$oidhtml_old' => $oidhtml_old,
'$invitations' => get_config('system','invitation_only'),
'$invite_desc' => t('Membership on this site is by invitation only.'),
'$invite_label' => t('Your invitation ID: '),
@ -269,7 +268,7 @@ function register_content(&$a) {
'$openid' => $openid_url,
'$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
'$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: '),
'$photo' => $photo,
'$publish' => $profile_publish,

4
view/register.tpl
View file

@ -11,10 +11,12 @@
<p id="register-fill-desc">$fillwith</p>
<p id="register-fill-ext">$fillext</p>
{{ if $oidlabel }}
<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 id="register-openid-end" ></div>
{{ endif }}
{{ if $invitations }}

4
view/smarty3/register.tpl
View file

@ -11,10 +11,12 @@
<p id="register-fill-desc">{{$fillwith}}</p>
<p id="register-fill-ext">{{$fillext}}</p>
{{if $oidlabel }}
<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 id="register-openid-end" ></div>
{{/if}}
{{if $invitations}}