diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-18 20:33:25 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-18 20:33:25 +0100 |
| commit | cc264b2d60049a844fe17322fbcb367712a7071f (patch) | |
| tree | f1f069a49dd186d4cf21c37a25fb794d6d53e6f2 /view/tpl/register.tpl | |
| parent | b77c5ae61e5a208daf4b9431a730db874c487e32 (diff) | |
| parent | 33c34984e647f48452d53b93b635f6f517a0f392 (diff) | |
| download | volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.tar.gz volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.tar.bz2 volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/register.tpl')
| -rwxr-xr-x | view/tpl/register.tpl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index b72e069c3..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,12 +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" 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}} |