singleuser site mode plus fix search template layout
This commit is contained in:
parent
f089b1610e
commit
80ed4242ee
|
@ -63,8 +63,16 @@ function nav(&$a) {
|
|||
}
|
||||
|
||||
$a->page['nav'] .= '<a id="nav-search-link" class="nav-link" href="search">' . t('Search') . "</a>\r\n";
|
||||
$a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="directory">' . t('Directory') . "</a>\r\n";
|
||||
|
||||
$gdirpath = 'directory';
|
||||
|
||||
if(strlen(get_config('system','singleuser'))) {
|
||||
$gdir = dirname(get_config('system','directory_submit_url'));
|
||||
if(strlen($gdir))
|
||||
$gdirpath = $gdir;
|
||||
}
|
||||
|
||||
$a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="' . $gdirpath . '">' . t('Directory') . "</a>\r\n";
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
|
@ -4,9 +4,11 @@ if(! function_exists('home_init')) {
|
|||
function home_init(&$a) {
|
||||
|
||||
if(local_user() && ($a->user['nickname']))
|
||||
goaway( $a->get_baseurl() . "/profile/" . $a->user['nickname'] );
|
||||
goaway( $a->get_baseurl() . "/profile/" . $a->user['nickname'] );
|
||||
|
||||
if(strlen(get_config('system','singleuser')))
|
||||
goaway( $a->get_baseurl() . "/profile/" . get_config('system','singleuser'));
|
||||
|
||||
$a->page['htmlhead'] .= "<meta name=\"dfrn-template\" content=\"" . $a->get_baseurl() . "/profile/%s" . "\" />\r\n";
|
||||
}}
|
||||
|
||||
|
||||
|
|
|
@ -245,6 +245,7 @@ function network_content(&$a, $update = 0) {
|
|||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$id' => $item['item_id'],
|
||||
'$linktitle' => t('View $name\'s profile'),
|
||||
'$profile_url' => $profile_link,
|
||||
'$name' => $profile_name,
|
||||
'$sparkle' => $sparkle,
|
||||
|
|
|
@ -113,6 +113,7 @@ function search_content(&$a) {
|
|||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$id' => $item['item_id'],
|
||||
'$linktitle' => t('View $name\'s profile'),
|
||||
'$profile_url' => $profile_link,
|
||||
'$name' => $profile_name,
|
||||
'$sparkle' => $sparkle,
|
||||
|
|
|
@ -2,19 +2,20 @@
|
|||
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
|
||||
<span class="wall-item-info" id="wall-item-info-$id">
|
||||
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
|
||||
<a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
|
||||
<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
|
||||
<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-photo-end"></div>
|
||||
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
|
||||
$lock
|
||||
<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
|
||||
<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
|
||||
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
|
||||
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
|
||||
</div>
|
||||
</span>
|
||||
<div class="wall-item-content" id="wall-item-content-$id" >
|
||||
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
|
||||
<div class="wall-item-title-end"></div>
|
||||
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
|
||||
</div>
|
||||
<div class="wall-item-tools" id="wall-item-tools-$id">
|
||||
|
|
Loading…
Reference in a new issue