singleuser site mode plus fix search template layout

diff --git a/include/nav.php b/include/nav.php
index 430841722b0b3b98e3a4060907fbadc2d4235d43..bfbc10f5a71a70ae71da0f20cacd5818dd8b891c 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -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";
 
        /**
         *

diff --git a/mod/home.php b/mod/home.php
index d45b13ed5fb4e21ca02bd8d7296bbabb0a879741..20d38cfca9967749f477131b46dc08d637c68171 100644 (file)
--- a/mod/home.php
+++ b/mod/home.php
@@ -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"; 
 }}
 
 

diff --git a/mod/network.php b/mod/network.php
index e50723ae72fe74f9af223e6eb7861bae430de2d3..8ac51cee36c938f0194ad0b644f13d979003bb3a 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -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,

diff --git a/mod/search.php b/mod/search.php
index a6a4b613fcb5b87a3cff55dce47f24e2f5ddc516..561bb6c620e58a4f026b164e0552a125bfe5e95b 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -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,

diff --git a/view/search_item.tpl b/view/search_item.tpl
index 0547fd9efbc3271e255fdc30908f7a07a85f830f..fcdaac834c362f3df13b29d585946f422341523e 100644 (file)
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -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">