include friendica address in hcard

diff --git a/include/identity.php b/include/identity.php
index 3ab65d9e64e8711cd0f6412311cf671f96a06e75..a785ce981dc8074873c9fb354b2e72a4e31f310d 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -62,7 +62,7 @@ if(! function_exists('profile_load')) {
 
                if($profile) {
                        $profile_int = intval($profile);
-                       $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+                       $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr` AS faddr, `user`.* FROM `profile`
                                        INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
                                        WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d AND `contact`.`self` = 1 LIMIT 1",
                                        dbesc($nickname),
@@ -70,7 +70,7 @@ if(! function_exists('profile_load')) {
                        );
                }
                if((!$r) && (!count($r))) {
-                       $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+                       $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr` AS faddr, `user`.* FROM `profile`
                                        INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
                                        WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 AND `contact`.`self` = 1 LIMIT 1",
                                        dbesc($nickname)

diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
index fe5762973fbb0113c8d3b7b5283d85f2a1576d3b..05e44432fd2d33635edd787841f3d7eace0f2079 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -3,7 +3,7 @@
 
        <div class="fn label p-name">{{$profile.name}}</div>
        
-                               
+       {{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
        
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0198431919bfc9759dcfb1b3a1dc1236532689f7..4642fb2b75416cb9399d847bc07aa18e507b610b 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2507,7 +2507,8 @@ aside input[type='text'] {
        font-weight: bold;
 }
 
-.vcard .title {
+.vcard .title,
+.vcard .p-faddr {
        margin-bottom: 5px;
        margin-left: 12px;
 }

diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
index 9a34605732d223c8af688dfa16c743ca64e80840..bf2eb27349815370e1ff6fe0f488569d6b9bb187 100644 (file)
--- a/view/theme/duepuntozero/templates/profile_vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile_vcard.tpl
@@ -3,7 +3,7 @@
 
        <div class="fn label">{{$profile.name}}</div>
        
-                               
+       {{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
        
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
        <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
@@ -38,12 +38,12 @@
        <div id="profile-extra-links">
                <ul>
                        {{if $connect}}
-                                {{if $remoteconnect}}
-                                        <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-                                {{else}}
-                                        <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                                {{/if}}
-                        {{/if}}
+                               {{if $remoteconnect}}
+                                       <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
+                               {{else}}
+                                       <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+                               {{/if}}
+                       {{/if}}
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}

diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index f8b49df7c508d05a379cebf6cc75ccd6fc72cf6a..4485c056ffedea5c70dc09acf25bdfb19799d38e 100644 (file)
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -3105,7 +3105,8 @@ aside input[type='text'] {
        font-weight: bold;\r
 }\r
 \r
-.vcard .title {\r
+.vcard .title,\r
+.vcard .p-faddr {\r
        margin-bottom: 5px;\r
        margin-left: 12px;\r
 }\r

diff --git a/view/theme/frost-mobile/templates/profile_vcard.tpl b/view/theme/frost-mobile/templates/profile_vcard.tpl
index 6e097c62bf07f8d978c091b86a2a0b87363c7499..515740871385e0951b5100fa77e4b9cbb51b5e94 100644 (file)
--- a/view/theme/frost-mobile/templates/profile_vcard.tpl
+++ b/view/theme/frost-mobile/templates/profile_vcard.tpl
@@ -3,7 +3,7 @@
 
        <div class="fn label">{{$profile.name}}</div>
        
-                               
+       {{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
        
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
        <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>

diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 35abed3c5d011d248509b421cbe8128c9eacc58b..14899a866be004717261a029bffb594a1a6f1a26 100644 (file)
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -2880,7 +2880,8 @@ aside input[type='text'] {
        font-weight: bold;
 }
 
-.vcard .title {
+.vcard .title,
+.vcard .p-faddr {
        margin-bottom: 5px;
        margin-left: 12px;
 }

diff --git a/view/theme/frost/templates/profile_vcard.tpl b/view/theme/frost/templates/profile_vcard.tpl
index 6e097c62bf07f8d978c091b86a2a0b87363c7499..515740871385e0951b5100fa77e4b9cbb51b5e94 100644 (file)
--- a/view/theme/frost/templates/profile_vcard.tpl
+++ b/view/theme/frost/templates/profile_vcard.tpl
@@ -3,7 +3,7 @@
 
        <div class="fn label">{{$profile.name}}</div>
        
-                               
+       {{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
        
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
        <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 93ee1ccd58feefcf6014b4675c01bd77bae850eb..25102ba31d900ef499670e440f49d268123a920d 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -810,6 +810,9 @@ aside .vcard .fn {
 aside .vcard .title {
   margin-bottom: 5px;
 }
+aside .vcard .p-faddr {
+  margin-bottom: 5px;
+}
 aside .vcard dl {
   height: auto;
   overflow: auto;

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index ab50d93ae1b0ed8a72b0d41dd0c0b5cf38de9a69..78de88654292add54764fa4d1c2de792de74cf80 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -810,6 +810,9 @@ aside .vcard .fn {
 aside .vcard .title {
   margin-bottom: 5px;
 }
+aside .vcard .p-faddr {
+  margin-bottom: 5px;
+}
 aside .vcard dl {
   height: auto;
   overflow: auto;

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 510b2f7c8c6539548eebc63db6e65d483b16dcd4..1ca27b895c058a3b527ee732039270b5bb4bd2fc 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -420,7 +420,7 @@
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
   font-size: 11px;
-  background-color: #F6ECF9;
+  background-color: #f6ecf9;
   color: #2d2d2d;
   margin: 50px 0px 0px 0px;
   display: table;
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -810,6 +810,9 @@ aside .vcard .fn {
 aside .vcard .title {
   margin-bottom: 5px;
 }
+aside .vcard .p-faddr {
+  margin-bottom: 5px;
+}
 aside .vcard dl {
   height: auto;
   overflow: auto;
@@ -1704,7 +1707,7 @@ span[id^="showmore-wrap"] {
   height: 20px;
   width: 500px;
   font-weight: bold;
-  border: 1px solid #F6ECF9;
+  border: 1px solid #f6ecf9;
 }
 #jot #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1731,7 +1734,7 @@ span[id^="showmore-wrap"] {
   margin: 0px;
   height: 20px;
   width: 200px;
-  border: 1px solid #F6ECF9;
+  border: 1px solid #f6ecf9;
 }
 #jot #jot-category:hover {
   border: 1px solid #999999;

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 2faa7966f06c38a875ec02aaa8c04ca08d530fc4..db1f42d769b12690943dabde461562ab558a5f1a 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -317,6 +317,7 @@ aside {
        .vcard {
                .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
                .title { margin-bottom: 5px; }
+               .p-faddr{ margin-bottom: 5px; }
                dl { height: auto; overflow: auto; }
                dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
                dd {float: left; margin-left: 4px; width: 60%;}

diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
index d57169dcc1781728d075bcd89e2023a37d217a38..dfa6d0445d6d0b625009914882ab1e5a5b81834b 100644 (file)
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -6,17 +6,17 @@
                        <div class="action">
                        <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
                        <ul id="profiles-menu" class="menu-popup">
-                           {{if $profile.menu.entries}}
-                               {{foreach $profile.menu.entries as $e}}
-                               <li>
-                                       <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
-                               </li>
-                               {{/foreach}}
-                       {{else}}
-                               <li>
-                                       <a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
-                               </li>
-                       {{/if}}
+                       {{if $profile.menu.entries}}
+                               {{foreach $profile.menu.entries as $e}}
+                               <li>
+                                       <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+                               </li>
+                               {{/foreach}}
+                       {{else}}
+                               <li>
+                                       <a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
+                               </li>
+                       {{/if}}
                                <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
                                {{if $profile.menu.cr_new }}
                                <li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
@@ -26,6 +26,7 @@
                {{/if}}
        </div>
 
+       {{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
 
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
        <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
@@ -52,21 +53,23 @@
 
        {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
 
-       {{if $homepage}}<dl class="homepage"><dt
-        class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a
-        href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+       {{if $homepage}}
+       <dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
+               <dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd>
+       </dl>
+       {{/if}}
 
        {{include file="diaspora_vcard.tpl"}}
        
        <div id="profile-extra-links">
                <ul>
                        {{if $connect}}
-                                {{if $remoteconnect}}
-                                        <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-                                {{else}}
-                                        <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                                {{/if}}
-                        {{/if}}
+                               {{if $remoteconnect}}
+                                       <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
+                               {{else}}
+                                       <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+                               {{/if}}
+                       {{/if}}
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}

diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
index 3317d668ce69df45fb42e3891c3f0998de757844..c5a51ccbafe9ebae73e67815868e37cec4918830 100644 (file)
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -13,6 +13,8 @@
                {{/if}}
        </div>
 
+       {{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
+
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
        {{if $profile.picdate}}
@@ -20,6 +22,7 @@
        {{else}}
                <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></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>