aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-08-07 20:16:14 -0700
committerredmatrix <git@macgirvin.com>2016-08-07 20:16:14 -0700
commit3338f3c5b2be8c70725d0bc930f716e25ffe50ad (patch)
treefd56cc2cb8f107984c8911f76dc88b901f4fae78
parentde455e4cd0fbe69742a420fbaed1003b677a03ef (diff)
downloadvolse-hubzilla-3338f3c5b2be8c70725d0bc930f716e25ffe50ad.tar.gz
volse-hubzilla-3338f3c5b2be8c70725d0bc930f716e25ffe50ad.tar.bz2
volse-hubzilla-3338f3c5b2be8c70725d0bc930f716e25ffe50ad.zip
diaspora vcard updates
-rw-r--r--include/channel.php1
-rw-r--r--view/tpl/diaspora_vcard.tpl16
2 files changed, 12 insertions, 5 deletions
diff --git a/include/channel.php b/include/channel.php
index ff2cf24d8..62c35e3ff 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1069,6 +1069,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
$diaspora = array(
'podloc' => z_root(),
'guid' => $profile['channel_guid'] . str_replace('.','',App::get_hostname()),
+ 'pubkey' => pemtorsa($profile['channel_pubkey']),
'searchable' => (($block) ? 'false' : 'true'),
'nickname' => $profile['channel_address'],
'fullname' => $profile['channel_name'],
diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
index 3812823da..017eb555c 100644
--- a/view/tpl/diaspora_vcard.tpl
+++ b/view/tpl/diaspora_vcard.tpl
@@ -8,7 +8,7 @@
<dl class='entity_nickname'>
<dt>Nickname</dt>
<dd>
- <a class="nickname p-nickname">{{$diaspora.nickname}}</a>
+ <span class="nickname p-nickname">{{$diaspora.nickname}}</span>
</dd>
</dl>
<dl class='entity_full_name'>
@@ -33,25 +33,25 @@
<dl class="entity_url">
<dt>URL</dt>
<dd>
- <a href="{{$diaspora.podloc}}/" id="pod_location" >{{$diaspora.podloc}}/</a>
+ <a href="{{$diaspora.podloc}}/" id="pod_location" class="url" rel="me" >{{$diaspora.podloc}}/</a>
</dd>
</dl>
<dl class="entity_photo">
<dt>Photo</dt>
<dd>
- <img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}">
+ <img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}" />
</dd>
</dl>
<dl class="entity_photo_medium">
<dt>Photo</dt>
<dd>
- <img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}">
+ <img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}" />
</dd>
</dl>
<dl class="entity_photo_small">
<dt>Photo</dt>
<dd>
- <img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
+ <img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}" />
</dd>
</dl>
<dl class="entity_searchable">
@@ -60,4 +60,10 @@
<span class="searchable">{{$diaspora.searchable}}</span>
</dd>
</dl>
+ <dl class="entity_key">
+ <dt>Key</dt>
+ <dd>
+ <pre class="key">{{$diaspora.pubkey}}</pre>
+ </dd>
+ </dl>
</div>