diff options
author | Andrew Manning <tamanning@zoho.com> | 2016-12-08 21:16:49 -0500 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2016-12-08 21:16:49 -0500 |
commit | bc16a1bcc4a5f58df2f8994cd53661c8f53acab5 (patch) | |
tree | a390b6e21bc835cd7efb3665f9f84e508754edfb /view | |
parent | f5737a63545ef5b18f59775d4a6d39503c493aa5 (diff) | |
parent | 33d75ad7b0b203f121d35d857a9c17d71dda6327 (diff) | |
download | volse-hubzilla-bc16a1bcc4a5f58df2f8994cd53661c8f53acab5.tar.gz volse-hubzilla-bc16a1bcc4a5f58df2f8994cd53661c8f53acab5.tar.bz2 volse-hubzilla-bc16a1bcc4a5f58df2f8994cd53661c8f53acab5.zip |
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'view')
-rwxr-xr-x | view/tpl/settings_nick_set.tpl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl index 2460952fe..76fe7cd8d 100755 --- a/view/tpl/settings_nick_set.tpl +++ b/view/tpl/settings_nick_set.tpl @@ -1,4 +1,8 @@ <div id="settings-nick-wrapper" class="section-content-info-wrapper"> -<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div> +<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong></div> +{{if $davpath}} +<br> +<div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div> +{{/if}} </div> <div id="settings-nick-end" ></div> |