aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/register.tpl
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-02-18 15:26:50 -0800
committerredmatrix <git@macgirvin.com>2016-02-18 15:26:50 -0800
commit4512a4cdd4713117dabad607e74578af16306350 (patch)
tree69aea5f63140a2bc3a79d39e4a452f01a06e7c58 /view/tpl/register.tpl
parent342fda94e4162634eeb67c18c1d284e7d78f217f (diff)
parent33c34984e647f48452d53b93b635f6f517a0f392 (diff)
downloadvolse-hubzilla-4512a4cdd4713117dabad607e74578af16306350.tar.gz
volse-hubzilla-4512a4cdd4713117dabad607e74578af16306350.tar.bz2
volse-hubzilla-4512a4cdd4713117dabad607e74578af16306350.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl/register.tpl')
-rwxr-xr-xview/tpl/register.tpl8
1 files changed, 3 insertions, 5 deletions
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index 857b5e984..6c1bc87a4 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -31,14 +31,12 @@
{{include file="field_select_grouped.tpl" field=$role}}
<div id="newchannel-role-end" class="newchannel-field-end"></div>
{{/if}}
-
- <div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
-
<label for="newchannel-name" id="label-newchannel-name" class="register-label" >{{$label_name}}</label>
<input type="text" name="name" id="newchannel-name" class="register-input" value="{{$name}}" />
<div id="name-spinner"></div>
<div id="newchannel-name-feedback" class="register-feedback"></div>
<div id="newchannel-name-end" class="register-field-end"></div>
+ <div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
{{/if}}
@@ -62,13 +60,13 @@
<div id="register-password2-end" class="register-field-end"></div>
{{if $auto_create}}
- <div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div>
<label for="newchannel-nickname" id="label-newchannel-nickname" class="register-label" >{{$label_nick}}</label>
<input type="text" name="nickname" id="newchannel-nickname" class="register-input" value="{{$nickname}}" />
<div id="nick-spinner"></div>
- <div id="newchannel-nick-desc" class="descriptive-paragraph" style="text-align: right;">{{$nick_hub}}</div>
+ <div id="newchannel-nick-desc" style="text-align: right;">{{$nick_hub}}</div>
<div id="newchannel-nickname-feedback" class="register-feedback"></div>
<div id="newchannel-nickname-end" class="register-field-end"></div>
+ <div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div>
{{/if}}