Showing the network name on the display page.

diff --git a/boot.php b/boot.php
index ca193693b2bfba9b9961374ee1a5422c16fc732d..f4468bee9278742e3a898b37143876fae2076bb0 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1487,6 +1487,15 @@ if(! function_exists('profile_sidebar')) {
 
                $profile['picdate'] = urlencode($profile['picdate']);
 
+               if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) {
+                       require_once('include/contact_selectors.php');
+                       if ($profile['url'] != "")
+                               $profile['network_name'] = '<a href="'.$profile['url'].'">'.network_to_name($profile['network'])."</a>";
+                       else
+                               $profile['network_name'] = network_to_name($profile['network']);
+               } else
+                       $profile['network_name'] = "";
+
                call_hooks('profile_sidebar_enter', $profile);
 
 
@@ -1626,6 +1635,7 @@ if(! function_exists('profile_sidebar')) {
                        '$pdesc'        => $pdesc,
                        '$marital'  => $marital,
                        '$homepage' => $homepage,
+                       '$network' =>  t('Network:'),
                        '$diaspora' => $diaspora,
                        '$contact_block' => $contact_block,
                ));

diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
index 5c022b6a588b6886d63eebe99a78d510927c0527..1fddccdfe599cd3dac72130b81836b72affc2e0c 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -16,7 +16,7 @@
         {{else}}
                <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></div>
         {{/if}}
-
+       {{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
        {{if $location}}
                <dl class="location"><dt class="location-label">{{$location}}</dt> 
                <dd class="adr">

diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
index 1d898eeed96086a9f13b480b935d42fa90a987db..472bf757d0106e0bd5fc010b2eaa0c0a4732727f 100644 (file)
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -36,7 +36,7 @@
        {{/if}}
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
-
+       {{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
        {{if $location}}
                <dl class="location"><dt class="location-label">{{$location}}</dt><br> 
                <dd class="adr">