harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into doco

Browse Source
This commit is contained in:
Andrew Manning 2016-12-08 21:16:49 -05:00
commit bc16a1bcc4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Module/Settings/Channel.php
View File

@ -404,9 +404,12 @@ class Channel {
'$desc' => t('Your channel address is'), '$desc' => t('Your channel address is'),
'$nickname' => $nickname, '$nickname' => $nickname,
'$subdir' => $subdir, '$subdir' => $subdir,
'$davdesc' => t('Your files/photos are accessible via WebDAV at'),
'$davpath' => ((get_account_techlevel() > 3) ? z_root() . '/dav/' . $nickname : ''),
'$basepath' => \App::get_hostname() '$basepath' => \App::get_hostname()
)); ));
$stpl = get_markup_template('settings.tpl'); $stpl = get_markup_template('settings.tpl');
$acl = new \Zotlabs\Access\AccessList($channel); $acl = new \Zotlabs\Access\AccessList($channel);

6
view/tpl/settings_nick_set.tpl
View File

@ -1,4 +1,8 @@
<div id="settings-nick-wrapper" class="section-content-info-wrapper"> <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>
<div id="settings-nick-end" ></div> <div id="settings-nick-end" ></div>