Add title to homepage verified check mark

- Decrease log level for not found Memcached keys

diff --git a/src/Core/Cache/Type/MemcachedCache.php b/src/Core/Cache/Type/MemcachedCache.php
index 2d8b4e1c2f99d47a1540ddca7d8aecfe09e7fd1d..3d4627de3370b0f8eba85289c05524995cede938 100644 (file)
--- a/src/Core/Cache/Type/MemcachedCache.php
+++ b/src/Core/Cache/Type/MemcachedCache.php
@@ -127,7 +127,7 @@ class MemcachedCache extends AbstractCache implements ICanCacheInMemory
                if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
                        return $value;
                } elseif ($this->memcached->getResultCode() === Memcached::RES_NOTFOUND) {
-                       $this->logger->notice('Try to use unknown key.', ['key' => $key]);
+                       $this->logger->debug('Try to use unknown key.', ['key' => $key]);
                        return null;
                } else {
                        throw new CachePersistenceException(sprintf('Cannot get cache entry with key %s', $key), new \MemcachedException($this->memcached->getResultMessage(), $this->memcached->getResultCode()));

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 367680c42ce166d4f238f2a5fa979662570c9deb..dcd39a30c1cf2b243bace5a5fa880a26a2546e8c 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -467,6 +467,7 @@ class Profile
                        '$account_type' => $account_type,
                        '$location' => $location,
                        '$homepage' => $homepage,
+                       '$homepage_verified' => DI::l10n()->t('This website has been verified to belong to the same person.'),
                        '$about' => $about,
                        '$network' => DI::l10n()->t('Network:'),
                        '$contacts' => $contact_count,

diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl
index a304a9a1fb27cf77a9302ff71ffb5eba20def8ff..7c301db8c7e9bcb9aa420e8f0b9dee678420fd0a 100644 (file)
--- a/view/templates/profile/vcard.tpl
+++ b/view/templates/profile/vcard.tpl
@@ -39,7 +39,7 @@
 
        {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
 
-       {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</dd></dl>{{/if}}
+       {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</dd></dl>{{/if}}
 
        {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network" dir="auto">{{$profile.about nofilter}}</dd></dl>{{/if}}
 

diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl
index 35e3c841982a21d8c3ad621dd1ad1b4f41012752..3a185d87465db8b9587e344e87c0ad7af6ab3e91 100644 (file)
--- a/view/theme/frio/templates/profile/vcard.tpl
+++ b/view/theme/frio/templates/profile/vcard.tpl
@@ -77,7 +77,7 @@
 
                {{if $location}}
                <div class="location detail">
-                       <span class="location-label icon"><i class="fa fa-map-marker"></i></span>
+                       <span class="location-label icon"><i class="fa fa-map-marker" title="{{$location}}"></i></span>
                        <span class="adr">
                                {{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>{{/if}}
                                {{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
@@ -87,14 +87,14 @@
 
                {{if $profile.xmpp}}
                <div class="xmpp">
-                       <span class="xmpp-label icon"><i class="fa fa-xmpp"></i></span>
+                       <span class="xmpp-label icon"><i class="fa fa-xmpp" title="{{$xmpp}}"></i></span>
                        <span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
                </div>
                {{/if}}
 
                {{if $profile.matrix}}
                <div class="matrix">
-                       <span class="matrix-label icon"><i class="fa fa-matrix-org"></i></span>
+                       <span class="matrix-label icon"><i class="fa fa-matrix-org" title="{{$matrix}}"></i></span>
                        <span class="matrix-data"><a href="matrix:{{$profile.matrix}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.matrix}}</a></span>
                </div>
                {{/if}}
@@ -107,8 +107,8 @@
 
                {{if $homepage}}
                <div class="homepage detail">
-                       <span class="homepage-label icon"><i class="fa fa-external-link"></i></span>
-                       <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</span>
+                       <span class="homepage-label icon"><i class="fa fa-external-link" title="{{$homepage}}"></i></span>
+                       <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</span>
                </div>
                {{/if}}
 

diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl
index 86d4889c8c991b2b4c26e91a6d9b5933496bfeb3..6a874bf51a9750a79a081a80ccdc2d15f9841495 100644 (file)
--- a/view/theme/quattro/templates/profile/vcard.tpl
+++ b/view/theme/quattro/templates/profile/vcard.tpl
@@ -53,7 +53,7 @@
 
        {{if $homepage}}
        <dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
-               <dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</dd>
+               <dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</dd>
        </dl>
        {{/if}}
 

diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl
index 0a93480153378977ce47e909f1878c55572e38b4..05199f227a9ac402a5f041774cd851470c6cc74f 100644 (file)
--- a/view/theme/vier/templates/profile/vcard.tpl
+++ b/view/theme/vier/templates/profile/vcard.tpl
@@ -45,7 +45,7 @@
 
        {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
 
-       {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</dd></dl>{{/if}}
+       {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</dd></dl>{{/if}}
 
        {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network" dir="auto">{{$profile.about nofilter}}</dd></dl>{{/if}}