Merge pull request #572 from cvogeley/master

Fix registration form
This commit is contained in:
fermionic 2013-01-01 15:12:45 -08:00
commit 3c49a1b769
7 changed files with 23 additions and 12 deletions

View File

@ -239,7 +239,6 @@ function register_content(&$a) {
)); ));
} }
$license = ''; $license = '';
$o = get_markup_template("register.tpl"); $o = get_markup_template("register.tpl");
@ -267,7 +266,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,

View File

@ -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 <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 }}

View File

@ -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}} <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}}

View File

@ -11,10 +11,12 @@
<p id="register-realpeople">$realpeople</p> <p id="register-realpeople">$realpeople</p>
<br /> <br />
<div id="register-openid-wrapper" class="field input" > {{ if $oidlabel }}
$oidhtml <div id="register-openid-wrapper" >
<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 }}
<div class="register-explain-wrapper"> <div class="register-explain-wrapper">
<p id="register-fill-desc">$fillwith $fillext</p> <p id="register-fill-desc">$fillwith $fillext</p>

View File

@ -11,10 +11,12 @@
<p id="register-realpeople">{{$realpeople}}</p> <p id="register-realpeople">{{$realpeople}}</p>
<br /> <br />
<div id="register-openid-wrapper" class="field input" > {{if $oidlabel }}
{{$oidhtml}} <div id="register-openid-wrapper" >
<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}}
<div class="register-explain-wrapper"> <div class="register-explain-wrapper">
<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p> <p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>

View File

@ -11,10 +11,12 @@
<p id="register-realpeople">$realpeople</p> <p id="register-realpeople">$realpeople</p>
<br /> <br />
<div id="register-openid-wrapper" class="field input" > {{ if $oidlabel }}
$oidhtml <div id="register-openid-wrapper" >
<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 }}
<div class="register-explain-wrapper"> <div class="register-explain-wrapper">
<p id="register-fill-desc">$fillwith $fillext</p> <p id="register-fill-desc">$fillwith $fillext</p>

View File

@ -11,10 +11,12 @@
<p id="register-realpeople">{{$realpeople}}</p> <p id="register-realpeople">{{$realpeople}}</p>
<br /> <br />
<div id="register-openid-wrapper" class="field input" > {{if $oidlabel }}
{{$oidhtml}} <div id="register-openid-wrapper" >
<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}}
<div class="register-explain-wrapper"> <div class="register-explain-wrapper">
<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p> <p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>