Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 08:22:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1828 from tobiasd/20150816-fix1621

Browse source 
add the profile url to the settings pages as alternative to the webfi…
This commit is contained in:
Michael Vogel 2015-08-17 21:51:03 +02:00
commit 6ae34f4802
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mod/settings.php
View file

@ -1103,14 +1103,12 @@ function settings_content(&$a) {
info( t('Profile is <strong>not published</strong>.') . EOL );
$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
//$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
$tpl_addr = get_markup_template("settings_nick_set.tpl");
$prof_addr = replace_macros($tpl_addr,array(
'$desc' => t('Your Identity Address is'),
'$nickname' => $nickname,
'$subdir' => $subdir,
'$desc' => sprintf(t("Your Identity Address is <strong>'%s'</strong> or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), $a->get_baseurl().'/profile/'.$nickname),
'$basepath' => $a->get_hostname()
));

2
view/templates/settings_nick_set.tpl
View file

@ -1,6 +1,6 @@
<div id="settings-nick-wrapper" >
<div id="settings-nickname-desc" class="info-message">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div>
<div id="settings-nickname-desc" class="info-message">{{$desc}}</div>
</div>
<div id="settings-nick-end" ></div>