diff options
| author | redmatrix <git@macgirvin.com> | 2016-01-26 15:39:25 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-01-26 15:39:25 -0800 |
| commit | 9c71b74d373001ac47add095fc204bddb25ee91d (patch) | |
| tree | 70422b830b0e97cba30d503f3648e6b189e9b253 /view/tpl | |
| parent | 535a54040f84bee6c90a24920cf861c2c307dfa4 (diff) | |
| parent | 68030d12cfefa8982774cca9714b0c1eed7b9537 (diff) | |
| download | volse-hubzilla-9c71b74d373001ac47add095fc204bddb25ee91d.tar.gz volse-hubzilla-9c71b74d373001ac47add095fc204bddb25ee91d.tar.bz2 volse-hubzilla-9c71b74d373001ac47add095fc204bddb25ee91d.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/email_notify_html.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/email_notify_text.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/new_channel.tpl | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index 61ede1ca2..5b4954c8e 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -18,7 +18,7 @@ <tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr> <tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr> <tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr> - <tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr> + <tr><td style="padding:11px 0;" colspan="2">{{$hitemlink}}</td></tr> <tr><td></td><td>{{$thanks}}</td></tr> <tr><td></td><td>{{$site_admin}}</td></tr> </tbody> diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl index bdab4c273..56925c18b 100755 --- a/view/tpl/email_notify_text.tpl +++ b/view/tpl/email_notify_text.tpl @@ -5,6 +5,7 @@ {{$textversion}} {{$tsitelink}} + {{$titemlink}} {{$thanks}} diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index 46b32b8a9..156b5ec2f 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -22,8 +22,9 @@ <div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div> <label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label> - <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> + <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> <div id="nick-spinner"></div> + <div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_hub}}</div> <div id="newchannel-nickname-feedback" class="newchannel-feedback"></div> <div id="newchannel-nickname-end" class="newchannel-field-end"></div> |