Merge pull request #2630 from dissolve/mf2updates

author fabrixxm <fabrix.xm@gmail.com>

Tue, 21 Jun 2016 18:48:09 +0000 (20:48 +0200)

committer GitHub <noreply@github.com>

Tue, 21 Jun 2016 18:48:09 +0000 (20:48 +0200)
author fabrixxm <fabrix.xm@gmail.com>
Tue, 21 Jun 2016 18:48:09 +0000 (20:48 +0200)
committer GitHub <noreply@github.com>
Tue, 21 Jun 2016 18:48:09 +0000 (20:48 +0200)
diff --git a/view/templates/diaspora_vcard.tpl b/view/templates/diaspora_vcard.tpl

index 45b9fa4ff7a83e10891f8d43ace0b05764abc5af..c71577aee122857e0453343541ebc155e34b65ef 100644 (file)
--- a/view/templates/diaspora_vcard.tpl
+++ b/view/templates/diaspora_vcard.tpl
@@ -3,19 +3,19 @@
         <dl class="entity_uid">
                 <dt>Uid</dt>
                 <dd>
-                       <span class="uid">{{$diaspora.guid}}</span>
+                       <span class="uid p-uid">{{$diaspora.guid}}</span>
                 </dd>
         </dl>
         <dl class='entity_nickname'>
                 <dt>Nickname</dt>
                 <dd>            
-                       <span class="nickname">{{$diaspora.nickname}}</span>
+                       <span class="nickname p-nickname">{{$diaspora.nickname}}</span>
                 </dd>
         </dl>
         <dl class='entity_full_name'>
                 <dt>Full_name</dt>
                 <dd>
-                       <span class='fn'>{{$diaspora.fullname}}</span>
+                       <span class='fn p-name'>{{$diaspora.fullname}}</span>
                 </dd>
         </dl>
         <dl class="entity_searchable">
@@ -27,37 +27,37 @@
         <dl class='entity_first_name'>
                 <dt>First_name</dt>
                 <dd>
-               <span class='given_name'>{{$diaspora.firstname}}</span>
+               <span class='given_name p-given-name'>{{$diaspora.firstname}}</span>
                 </dd>
         </dl>
         <dl class='entity_family_name'>
                 <dt>Family_name</dt>
                 <dd>
-               <span class='family_name'>{{$diaspora.lastname}}</span>
+               <span class='family_name p-family-name'>{{$diaspora.lastname}}</span>
                 </dd>
         </dl>
         <dl class="entity_url">
                 <dt>Url</dt>
                 <dd>
-                       <a id="pod_location" class="url" rel="me" href="{{$diaspora.podloc}}/">{{$diaspora.podloc}}/</a>
+                       <a id="pod_location" href="{{$diaspora.podloc}}/">{{$diaspora.podloc}}/</a>
                 </dd>
         </dl>
         <dl class="entity_photo">
                 <dt>Photo</dt>
                 <dd>
-                       <img class="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_medium</dt>
                 <dd> 
-                       <img class="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_small</dt>
                 <dd>
-                       <img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
+                       <img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
                 </dd>
         </dl>
  </div>
diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl

index 0f1cf070c4fcbb07999c8deaaa5cbe569ba6041a..558daf26d7cdd30a8bde5bd92e740c8d8c7b8c4c 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -16,7 +16,7 @@
         {{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">
+               <dd class="adr h-adr">
                         {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                         <span class="city-state-zip">
                                 <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
@@ -28,7 +28,7 @@
                 </dl>
         {{/if}}
  
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender p-gender-identity">{{$profile.gender}}</dd></dl>{{/if}}
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
         
         {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
diff --git a/view/templates/vcard-widget.tpl b/view/templates/vcard-widget.tpl

index ec59fa46dcb731262955b1a994c2c1b41785b2a1..47b64b68dafe5d0f561b8071ff3e0340173d527c 100644 (file)
--- a/view/templates/vcard-widget.tpl
+++ b/view/templates/vcard-widget.tpl
@@ -1,12 +1,12 @@
  
-<div class="vcard">
-       <div class="fn">{{$name}}</div>
+<div class="vcard h-card">
+       <div class="fn p-name">{{$name}}</div>
         {{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
-       {{if $pdesc}}<div class="title">{{$pdesc}}</div>{{/if}}
+       {{if $pdesc}}<div class="title p-job-title">{{$pdesc}}</div>{{/if}}
         {{if $url}}
-       <div id="profile-photo-wrapper"><a href="{{$url}}"><img class="vcard-photo photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></a></div>
+       <div id="profile-photo-wrapper"><a href="{{$url}}"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></a></div>
         {{else}}
-       <div id="profile-photo-wrapper"><img class="vcard-photo photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
+       <div id="profile-photo-wrapper"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
         {{/if}}
         {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
         {{if $network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_name}}</dd></dl>{{/if}}
diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl

index ae360adff2c24d68f03ebbda69f7cdd66d806184..335d54f4163100d815285fb6e374128ba150ca24 100644 (file)
--- a/view/templates/wall_thread.tpl
+++ b/view/templates/wall_thread.tpl
@@ -5,7 +5,7 @@
         </div>
         <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
  {{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}} {{if $item.toplevel}} h-entry {{else}} u-comment h-cite {{/if}}">
  <a name="{{$item.id}}" ></a>
  <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
         <div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
@@ -17,11 +17,11 @@
                         </div>
                         <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
                         {{/if}}
-                       <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"
+                       <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" id="wall-item-photo-wrapper-{{$item.id}}"
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                  onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape:'html'}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape:'html'}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                 <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                  <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                      <ul>
@@ -39,24 +39,24 @@
                 </div>
                 <div class="wall-item-author">
                                 <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape:'html'}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape:'html'}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-                               <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime|escape:'html'}}">{{$item.ago}}</div>
+                               <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime|escape:'html'}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></div>
                 </div>
                 <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                         <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body}}<span>
                                         <div class="body-tag">
                                                 {{foreach $item.tags as $tag}}
                                                         <span class='tag'>{{$tag}}</span>
                                                 {{/foreach}}
                                         </div>
                         {{if $item.has_cats}}
-                       <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove|escape:'html'}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}<span class="p-category">{{$cat.name}}</span>{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove|escape:'html'}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
  
                         {{if $item.has_folders}}
-                       <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove|escape:'html'}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}<span class="p-category">{{$cat.name}}</span>{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove|escape:'html'}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
                         </div>
@@ -71,7 +71,7 @@
                         </div>
                         {{/if}}
                         {{if $item.plink}}
-                               <div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title|escape:'html'}}" target="_blank" class="icon remote-link{{$item.sparkle}}"></a></div>
+                               <div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title|escape:'html'}}" target="_blank" class="icon remote-link{{$item.sparkle}} u-url"></a></div>
                         {{/if}}
                         {{if $item.edpost}}
                                 <a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1|escape:'html'}}"></a>
diff --git a/view/theme/decaf-mobile/templates/profile_vcard.tpl b/view/theme/decaf-mobile/templates/profile_vcard.tpl

index 0ce464dbf534d94c887c4af303498064e46fed3e..120550c4a75259e52ce9185284b90c3f05eee605 100644 (file)
--- a/view/theme/decaf-mobile/templates/profile_vcard.tpl
+++ b/view/theme/decaf-mobile/templates/profile_vcard.tpl
@@ -1,36 +1,36 @@
  
-<div class="vcard">
+<div class="vcard h-card">
  
-       <div class="fn label">{{$profile.name}}</div>
+       <div class="fn label p-name">{{$profile.name}}</div>
         
                                 
         
         {{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>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
  
  
  
         {{if $location}}
                 <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr">
-                       {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                         <span class="city-state-zip">
-                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region">{{$profile.region}}</span>
-                               <span class="postal-code">{{$profile.postal_code}}</span>
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                         </span>
-                       {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                 </dd>
                 </dl>
         {{/if}}
  
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
         
         {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
         {{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 u-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
  
         {{include file="diaspora_vcard.tpl"}}
  
diff --git a/view/theme/decaf-mobile/templates/wall_thread.tpl b/view/theme/decaf-mobile/templates/wall_thread.tpl

index f9cfa5d0e9c1ff4e8e30d310ecb5e72a61c729a7..b5d5810ae3e7790ff66650296003a77ee1ebbfc3 100644 (file)
--- a/view/theme/decaf-mobile/templates/wall_thread.tpl
+++ b/view/theme/decaf-mobile/templates/wall_thread.tpl
@@ -1,5 +1,5 @@
  
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}} {{if $item.toplevel}} h-entry {{else}} u-comment h-cite {{/if}}">
  <a name="{{$item.id}}" ></a>
  {{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
         <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
@@ -16,9 +16,11 @@
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                  onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
                         {{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">-->*}}
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+                <span class="p-author h-card">
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
                                 </a>
+                </span>
                                 {{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                  <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                      <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
@@ -36,24 +38,24 @@
                 </div>
                 {{*<!--<div class="wall-item-author">-->*}}
                                 <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-                               <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>                         
+                               <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></div>
                 {{*<!--</div>-->*}}
                 <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                         {{*<!--<div class="wall-item-title-end"></div>-->*}}
-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body}}</span>
                                         {{*<!--<div class="body-tag">-->*}}
                                                 {{foreach $item.tags as $tag}}
                                                         <span class='body-tag tag'>{{$tag}}</span>
                                                 {{/foreach}}
                                         {{*<!--</div>-->*}}
                         {{if $item.has_cats}}
-                       <div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}<span class="p-category">{{$cat.name}}</span> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
  
                         {{if $item.has_folders}}
-                       <div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}<span class="p-category">{{$cat.name}}</span> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
                         </div>
@@ -70,7 +72,7 @@
                         </div>
                         {{/if}}
                         {{if $item.plink}}
-                               {{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
+                               {{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}} u-url"></a>{{*<!--</div>-->*}}
                         {{/if}}
                         {{if $item.edpost}}
                                 <a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
diff --git a/view/theme/diabook/templates/directory_item.tpl b/view/theme/diabook/templates/directory_item.tpl

index 127b6207216517b5dfde1e8a7c886ddcdb152b07..fa2279ee193f53769e908591ec86887ff08c89b8 100644 (file)
--- a/view/theme/diabook/templates/directory_item.tpl
+++ b/view/theme/diabook/templates/directory_item.tpl
@@ -28,7 +28,7 @@
                                 </dl>
                         {{/if}}
  
-                       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+                       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
                         </div>  
                         <div class="directory-detailscolumn-wrapper" id="directory-detailscolumn2-wrapper-{{$id}}">     
                                 {{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}}
diff --git a/view/theme/diabook/templates/profile_vcard.tpl b/view/theme/diabook/templates/profile_vcard.tpl

index 71e32d3e3b6ab07d397b9be4cbad2babfb3f5672..7628fb8d53dd75a8c99bf024e63e84ddccd586cb 100644 (file)
--- a/view/theme/diabook/templates/profile_vcard.tpl
+++ b/view/theme/diabook/templates/profile_vcard.tpl
@@ -1,8 +1,8 @@
  
-<div class="vcard">
+<div class="vcard h-card">
  
         <div class="tool">
-               <div class="fn label">{{$profile.name}}</div>
+               <div class="fn label p-name">{{$profile.name}}</div>
                 {{if $profile.edit}}
                         <div class="action">
                         <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
@@ -23,31 +23,31 @@
                                 
         
  
-       <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
         {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
  
  
         {{if $location}}
                 <dl class="location"><dt class="location-label">{{$location}}</dt><br> 
-               <dd class="adr">
-                       {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                         <span class="city-state-zip">
-                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region">{{$profile.region}}</span>
-                               <span class="postal-code">{{$profile.postal_code}}</span>
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                         </span>
-                       {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                 </dd>
                 </dl>
         {{/if}}
  
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
         
         {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
         {{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}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
  
         {{include file="diaspora_vcard.tpl"}}
         
diff --git a/view/theme/diabook/templates/wall_thread.tpl b/view/theme/diabook/templates/wall_thread.tpl

index 1d921935fc989c55d1c7abf5eecd45c6149ac22d..e7a3ccd188af9702850515c1c1280e48e1528112 100644 (file)
--- a/view/theme/diabook/templates/wall_thread.tpl
+++ b/view/theme/diabook/templates/wall_thread.tpl
@@ -5,7 +5,7 @@
         </div>
         <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
  {{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}} {{if $item.toplevel}} h-entry {{else}} u-comment h-cite {{/if}}">
  {{if $item.indent}}{{else}}
  <div class="wall-item-decor">
         <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
@@ -28,22 +28,24 @@
                         </div>
                 </div>
                         <div class="wall-item-actions-author">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> 
+                <span class="p-author h-card">
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link u-url"><span class="wall-item-name{{$item.sparkle}} p-name">{{$item.name}}</span></a> 
+                </span>
                         <span class="wall-item-ago">-
-                       {{if $item.plink}}<a class="link{{$item.sparkle}}" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+                       {{if $item.plink}}<a class="link{{$item.sparkle}} u-url" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time> {{/if}}
                         {{if $item.lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
                         </span>
                         </div>
                 <div class="wall-item-content">
-                       {{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
-                       {{$item.body}}
+                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="p-name">{{$item.title}}</a></h2>{{/if}}
+                       <span class="e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
                         {{if $item.has_cats}}
-                       <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}<span class="p-category">{{$cat.name}}</span> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
  
                         {{if $item.has_folders}}
-                       <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}<span class="p-category">{{$cat.name}}</span> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
                 </div>
diff --git a/view/theme/dispy/templates/profile_vcard.tpl b/view/theme/dispy/templates/profile_vcard.tpl

index 7d6191c62cfb3a9ed3623f27a3bb760807f39a69..1145c4db18d25f619f8200ff8be8a12e2175ca42 100644 (file)
--- a/view/theme/dispy/templates/profile_vcard.tpl
+++ b/view/theme/dispy/templates/profile_vcard.tpl
@@ -1,5 +1,5 @@
  
-<div class="vcard">
+<div class="vcard h-card">
  
         {{if $profile.edit}}
         <div class="action">
@@ -17,27 +17,27 @@
         </div>
         {{/if}}
  
-       <div class="fn label">{{$profile.name}}</div>
+       <div class="fn label p-name">{{$profile.name}}</div>
  
         {{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}}" />
+               <img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" />
      </div>
  
         {{if $location}}
                 <div class="location">
          <span class="location-label">{{$location}}</span>
-               <div class="adr">
+               <div class="adr h-adr">
                         {{if $profile.address}}
-            <div class="street-address">{{$profile.address}}</div>{{/if}}
+            <div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                         <span class="city-state-zip">
-                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region">{{$profile.region}}</span>
-                               <span class="postal-code">{{$profile.postal_code}}</span>
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                         </span>
-                       {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                 </div>
                 </div>
         {{/if}}
@@ -45,7 +45,7 @@
         {{if $gender}}
      <div class="mf">
          <span class="gender-label">{{$gender}}</span>
-        <span class="x-gender">{{$profile.gender}}</span>
+        <span class="p-gender">{{$profile.gender}}</span>
      </div>
      {{/if}}
         
@@ -64,7 +64,7 @@
         {{if $homepage}}
      <div class="homepage">
      <span class="homepage-label">{{$homepage}}</span>
-    <span class="homepage-url"><a href="{{$profile.homepage}}"
+    <span class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me"
      target="external-link">{{$profile.homepage}}</a></span>
      </div>{{/if}}
  
diff --git a/view/theme/dispy/templates/wall_thread.tpl b/view/theme/dispy/templates/wall_thread.tpl

index 4f6e9898deaf6eaa6dc1ee420731ae26ed95df1b..73fa5e51f538c45a31be2fdfd44d569a6c7715d7 100644 (file)
--- a/view/theme/dispy/templates/wall_thread.tpl
+++ b/view/theme/dispy/templates/wall_thread.tpl
@@ -5,7 +5,7 @@
         </div>
         <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
  {{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}} {{if $item.toplevel}} h-entry {{else}} u-comment h-cite {{/if}}">
  <a name="{{$item.id}}" ></a>
  <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
         <div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
@@ -17,11 +17,11 @@
                         </div>
                         <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
                         {{/if}}
-                       <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
+                       <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" id="wall-item-photo-wrapper-{{$item.id}}" 
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                  onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                 <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                  <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                      <ul>
@@ -38,7 +38,7 @@
                                 <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}">{{$item.name}}</span></a>
                         </div>
                         <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
-                               {{$item.ago}}
+                               <time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time>
                         </div>
                 </div>
                 <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
@@ -75,7 +75,7 @@ class="icon recycle wall-item-share-buttons"  title="{{$item.vote.share.0}}" onc
                                 <li class="wall-item-filer-wrapper"><a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon file-as" title="{{$item.star.filer}}"></a></li>
                         {{/if}}
                         {{if $item.plink}}
-                               <li class="wall-item-links-wrapper{{$item.sparkle}}"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a></li>
+                               <li class="wall-item-links-wrapper{{$item.sparkle}}"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link u-url"></a></li>
                         {{/if}}
                         {{if $item.edpost}}
                                 <li><a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a></li>
@@ -89,22 +89,22 @@ class="icon recycle wall-item-share-buttons"  title="{{$item.vote.share.0}}" onc
                         <div class="wall-item-delete-end"></div>
                 </div>
                 <div class="wall-item-content" id="wall-item-content-{{$item.id}}">
-                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                         <div class="wall-item-title-end"></div>
                         <div class="wall-item-body" id="wall-item-body-{{$item.id}}">
-                               {{$item.body}}
+                               <span class="e-content">{{$item.body}}</span>
                                 <div class="body-tag">
                                         {{foreach $item.tags as $tag}}
                                                 <span class="tag">{{$tag}}</span>
                                         {{/foreach}}
                                 </div>                  
                         {{if $item.has_cats}}
-                       <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}<span class="p-category">{{$cat.name}}</span> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
  
                         {{if $item.has_folders}}
-                       <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}<span class="p-category">{{$cat.name}}</span> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
  
diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl

index 1b084ba872fcea742dc2ec8a586a8ff121a36ef8..186b7e44900e5d6e1951fc5767558a12dc66100c 100644 (file)
--- a/view/theme/duepuntozero/templates/profile_vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile_vcard.tpl
@@ -1,12 +1,12 @@
  
-<div class="vcard">
+<div class="vcard h-card">
  
-       <div class="fn label">{{$profile.name}}</div>
+       <div class="fn label p-name">{{$profile.name}}</div>
         
         {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
         
         {{if $profile.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>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
  
         {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
  
@@ -14,25 +14,25 @@
  
         {{if $location}}
                 <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr">
-                       {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                         <span class="city-state-zip">
-                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region">{{$profile.region}}</span>
-                               <span class="postal-code">{{$profile.postal_code}}</span>
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                         </span>
-                       {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                 </dd>
                 </dl>
         {{/if}}
  
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
         
         {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
         {{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}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
  
         {{include file="diaspora_vcard.tpl"}}
  
diff --git a/view/theme/facepark/templates/profile_vcard.tpl b/view/theme/facepark/templates/profile_vcard.tpl

index 7182ab471766e4f077a15b622f9103117f0b4c0b..6074c5075bc976627c9a302fd7664dde2e552c56 100644 (file)
--- a/view/theme/facepark/templates/profile_vcard.tpl
+++ b/view/theme/facepark/templates/profile_vcard.tpl
@@ -1,36 +1,36 @@
  
-<div class="vcard">
+<div class="vcard h-card">
  
-       <div class="fn label">{{$profile.name}}</div>
+       <div class="fn label p-name">{{$profile.name}}</div>
         
                                 
         
         {{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>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
  
  
  
         {{if $location}}
                 <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr">
-                       {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                         <span class="city-state-zip">
-                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region">{{$profile.region}}</span>
-                               <span class="postal-code">{{$profile.postal_code}}</span>
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                         </span>
-                       {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                 </dd>
                 </dl>
         {{/if}}
  
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
         
         {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
         {{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}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
  
         {{include file="diaspora_vcard.tpl"}}
         
diff --git a/view/theme/frio/templates/profile_vcard.tpl b/view/theme/frio/templates/profile_vcard.tpl

index de448b82b45cf38ae9850575388ad6b6d4b5ad07..5d9fad774c0a1a0d3fbd9c1506c9b03e6abd862a 100644 (file)
--- a/view/theme/frio/templates/profile_vcard.tpl
+++ b/view/theme/frio/templates/profile_vcard.tpl
@@ -91,7 +91,7 @@
                 {{if $gender}}
                 <div class="mf detail">
                         <span class="gender-label icon"><i class="fa fa-venus-mars"></i></span>
-                       <span class="x-gender p-gender-identity">{{$profile.gender}}</span>
+                       <span class="p-gender">{{$profile.gender}}</span>
                 </div>
                 {{/if}}
  
diff --git a/view/theme/frio/templates/vcard-widget.tpl b/view/theme/frio/templates/vcard-widget.tpl

index 472dced2b4b5a5c666e0b71032c6d62275abbfca..040a6aa84a2326b45c95b936adba0690e0ac6a9a 100644 (file)
--- a/view/theme/frio/templates/vcard-widget.tpl
+++ b/view/theme/frio/templates/vcard-widget.tpl
@@ -1,9 +1,9 @@
  
-<div class="vcard widget">
+<div class="vcard widget h-card">
         {{if $url}}
-               <div id="profile-photo-wrapper" class="thumbnail"><a href="{{$url}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
+               <div id="profile-photo-wrapper" class="thumbnail"><a class="u-url" href="{{$url}}"><img class="vcard-photo photo u-photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
         {{else}}
-               <div id="profile-photo-wrapper" class="thumbnail"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></div>
+               <div id="profile-photo-wrapper" class="thumbnail"><img class="vcard-photo photo u-photo" src="{{$photo}}" alt="{{$name}}" /></div>
         {{/if}}
  
         {{* The short information which will appended to the second navbar by scrollspy *}}
@@ -21,7 +21,7 @@
         </div>
  
         <div class="panel-body">
-               <div class="fn">{{$name}}</div>
+               <div class="fn p-name">{{$name}}</div>
                 {{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
                 {{if $pdesc}}<div class="title">{{$pdesc}}</div>{{/if}}
  
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl

index b2e10a10a16ba01e514b326adedaffcd01cf9493..21792d41cfbdae6c4cf0caccff0355f1f3dcb28c 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -67,9 +67,9 @@ as the value of $top_child_total (this is done at the end of this file)
  
  {{* Use a different div container in dependence max thread-level = 7 *}}
  {{if $item.thread_level<7}}
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
  {{else}}
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7" id="item-{{$item.guid}}">
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid}}">
   {{/if}}
         <div class="media">
                 {{* Put addional actions in a top-right dropdown menu *}}
@@ -84,7 +84,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
                                         {{if $item.plink}}      {{*link to the original source of the item *}}
                                         <li role="menuitem">
-                                               <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a>
+                                               <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink u-url"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a>
                                         </li>
                                         {{/if}}
  
@@ -140,10 +140,10 @@ as the value of $top_child_total (this is done at the end of this file)
                 {{* The avatar picture and the photo-menu *}}
                 <div class="dropdown pull-left"><!-- Dropdown -->
                         {{if $item.thread_level==1}}
-                       <div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
-                               <a class="userinfo" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
+                       <div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
+                               <a class="userinfo" id="wall-item-photo-menu-{{$item.id}} u-url" href="{{$item.profile_url}}">
                                         <div class="contact-photo-image-wrapper">
-                                               <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                         </div>
                                 </a>
                         </div>
@@ -168,10 +168,10 @@ as the value of $top_child_total (this is done at the end of this file)
  
                         {{* The avatar picture for comments *}}
                         {{if $item.thread_level!=1}}
-                       <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
-                               <a class="userinfo" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
+                       <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
+                               <a class="userinfo" id="wall-item-photo-menu-{{$item.id}} u-url" href="{{$item.profile_url}}">
                                         <div class="contact-photo-image-wrapper">
-                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                         </div>
                                 </a>
                         </div>
@@ -190,7 +190,7 @@ as the value of $top_child_total (this is done at the end of this file)
  
                         <div class="additional-info text-muted">
                                 <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
-                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span></a></small>
+                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span></a></small>
                                 </div>
  
                                 {{if $item.location}}
@@ -239,10 +239,10 @@ as the value of $top_child_total (this is done at the end of this file)
                         {{/if}}
  
                         {{if $item.title}}
-                       <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h4><br /></span>
+                       <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h4><br /></span>
                         {{/if}}
  
-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}">{{$item.body}}</div>
+                       <div class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}" id="wall-item-body-{{$item.id}}">{{$item.body}}</div>
                 </div>
  
                 <!-- TODO -->
@@ -259,11 +259,11 @@ as the value of $top_child_total (this is done at the end of this file)
                                 {{/foreach}}
  
                                 {{foreach $item.folders as $cat}}
-                                       <span class='folder label btn-danger sm'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                                       <span class='folder label btn-danger sm'><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                                 {{/foreach}}
  
                                 {{foreach $item.categories as $cat}}
-                                       <span class='category label btn-success sm'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                                       <span class='category label btn-success sm'><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                                 {{/foreach}}
                         </div>
                                 {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
diff --git a/view/theme/frost-mobile/templates/profile_vcard.tpl b/view/theme/frost-mobile/templates/profile_vcard.tpl

index 43c8f7e21ed7af86e4a1e37db8e618a553f6991e..c37b528ce36258526b287ba3d7509cb1792ac1a9 100644 (file)
--- a/view/theme/frost-mobile/templates/profile_vcard.tpl
+++ b/view/theme/frost-mobile/templates/profile_vcard.tpl
@@ -1,12 +1,12 @@
  
-<div class="vcard">
+<div class="vcard h-card">
  
-       <div class="fn label">{{$profile.name}}</div>
+       <div class="fn label p-name">{{$profile.name}}</div>
         
         {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
         
         {{if $profile.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>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
  
         {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
  
@@ -14,25 +14,25 @@
  
         {{if $location}}
                 <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr">
-                       {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                         <span class="city-state-zip">
-                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region">{{$profile.region}}</span>
-                               <span class="postal-code">{{$profile.postal_code}}</span>
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                         </span>
-                       {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                 </dd>
                 </dl>
         {{/if}}
  
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
         
         {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
         {{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}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
  
         {{include file="diaspora_vcard.tpl"}}
  
diff --git a/view/theme/frost-mobile/templates/wall_thread.tpl b/view/theme/frost-mobile/templates/wall_thread.tpl

index 377c90242f257e95aa11592266b35ee903d538fa..1223919fa5bca668f5ae880bd6bc7704de99bccc 100644 (file)
--- a/view/theme/frost-mobile/templates/wall_thread.tpl
+++ b/view/theme/frost-mobile/templates/wall_thread.tpl
@@ -5,7 +5,7 @@
         </div>
         <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
  {{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}} {{if $item.toplevel}} h-entry {{else}} u-comment h-cite {{/if}}">
  <a name="{{$item.id}}" ></a>
  {{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
         <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
@@ -22,9 +22,11 @@
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                  onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
                         {{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">-->*}}
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 48px; width: 48px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+            <span class="p-author h-card">
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}} p-name u-photo" style="height: 48px; width: 48px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
                                 </a>
+            </span>
                                 {{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                  <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                      <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
@@ -43,25 +45,25 @@
                 {{*<!--<div class="wall-item-author">-->*}}
                                 <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
                                 <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-                               {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+                               {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time> {{/if}}
                                 </div>
                 {{*<!--</div>-->*}}
                 <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                         {{*<!--<div class="wall-item-title-end"></div>-->*}}
-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body}}</span>
                                         {{*<!--<div class="body-tag">-->*}}
                                                 {{foreach $item.tags as $tag}}
                                                         <span class='body-tag tag'>{{$tag}}</span>
                                                 {{/foreach}}
                                         {{*<!--</div>-->*}}
                         {{if $item.has_cats}}
-                       <div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}<span class="p-category">{{$cat.name}}</span> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
  
                         {{if $item.has_folders}}
-                       <div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}<span class="p-category">{{$cat.name}}</span> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
                         </div>
diff --git a/view/theme/frost/templates/profile_vcard.tpl b/view/theme/frost/templates/profile_vcard.tpl

index 26730f8253e830f9dadcbf8c9bfcc5d84a32e42f..4d5a40bc59e647ffca601691366a4d234ffcfc50 100644 (file)
--- a/view/theme/frost/templates/profile_vcard.tpl
+++ b/view/theme/frost/templates/profile_vcard.tpl
@@ -1,12 +1,12 @@
  
-<div class="vcard">
+<div class="vcard h-card">
  
-       <div class="fn label">{{$profile.name}}</div>
+       <div class="fn label p-name">{{$profile.name}}</div>
         
         {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
         
         {{if $profile.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>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
  
         {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
  
@@ -14,25 +14,25 @@
  
         {{if $location}}
                 <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr">
-                       {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                         <span class="city-state-zip">
-                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region">{{$profile.region}}</span>
-                               <span class="postal-code">{{$profile.postal_code}}</span>
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                         </span>
-                       {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                 </dd>
                 </dl>
         {{/if}}
  
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
         
         {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
         {{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}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
  
         {{include file="diaspora_vcard.tpl"}}
  
diff --git a/view/theme/frost/templates/wall_thread.tpl b/view/theme/frost/templates/wall_thread.tpl

index 0f1dcf75a460fe4a6fc4131357c9f58cfc29ab55..ef18d479c6e669c62c1bb10cbc2e235fca31ae70 100644 (file)
--- a/view/theme/frost/templates/wall_thread.tpl
+++ b/view/theme/frost/templates/wall_thread.tpl
@@ -5,7 +5,7 @@
         </div>
         <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
  {{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}} {{if $item.toplevel}} h-entry {{else}} u-comment h-cite {{/if}}">
  <a name="{{$item.id}}" ></a>
  {{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
         <div class="wall-item-content-wrapper {{$item.indent}} {{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-content-wrapper-{{$item.id}}" >
@@ -18,11 +18,11 @@
                         </div>
                         <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
                         {{/if}}
-                       <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
+                       <div class="wall-item-photo-wrapper wwfrom p-author h-card" id="wall-item-photo-wrapper-{{$item.id}}" 
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                  onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
                                 </a>
                                 <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
  {{*<!--                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">-->*}}
@@ -41,24 +41,24 @@
                 </div>
                 {{*<!--<div class="wall-item-author">-->*}}
                                 <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-                               <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}" ><a href="display/{{$user.nickname}}/{{$item.id}}">{{$item.ago}}</a></div>
+                               <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}" ><a href="display/{{$user.nickname}}/{{$item.id}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></a></div>
                 {{*<!--</div>-->*}}
                 <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                         {{*<!--<div class="wall-item-title-end"></div>-->*}}
-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body}}</span>
                                         {{*<!--<div class="body-tag">-->*}}
                                                 {{foreach $item.tags as $tag}}
                                                         <span class='body-tag tag'>{{$tag}}</span>
                                                 {{/foreach}}
                                         {{*<!--</div>-->*}}
                         {{if $item.has_cats}}
-                       <div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}<span class="p-category">{{$cat.name}}</span> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
  
                         {{if $item.has_folders}}
-                       <div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="filesavetags">{{$item.txt_folders}} {{foreach $item.folders as $cat}}<span class="p-category">{{$cat.name}}</span> <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                         </div>
                         {{/if}}
                         </div>
@@ -75,7 +75,7 @@
                         </div>
                         {{/if}}
                         {{if $item.plink}}
-                               {{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
+                               {{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}} u-url"></a>{{*<!--</div>-->*}}
                         {{/if}}
                         {{if $item.edpost}}
                                 <a class="editpost tool pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl

index ca702380d2db60fb95bfffba2ed1b95bfc58f67f..2428c4735bfab06a9326ea6574d2fddc303280f4 100644 (file)
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -1,7 +1,7 @@
-<div class="vcard">
+<div class="vcard h-card">
  
         <div class="tool">
-               <div class="fn label">{{$profile.name}}</div>
+               <div class="fn label p-name">{{$profile.name}}</div>
                 {{if $profile.edit}}
                         <div class="action">
                         <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
@@ -29,7 +29,7 @@
         {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</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>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
  
         {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
  
@@ -37,19 +37,19 @@
  
         {{if $location}}
                 <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr">
-                       {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                         <span class="city-state-zip">
-                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region">{{$profile.region}}</span>
-                               <span class="postal-code">{{$profile.postal_code}}</span>
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                         </span>
-                       {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                 </dd>
                 </dl>
         {{/if}}
  
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
         
         {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
@@ -57,7 +57,7 @@
  
         {{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>
+               <dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd>
         </dl>
         {{/if}}
  
diff --git a/view/theme/quattro/templates/threaded_conversation.tpl b/view/theme/quattro/templates/threaded_conversation.tpl

index 0ed148eef5697bf96f513de82129271b581c4921..a257a2904346a97c1eaf608b6e2e1d59f49cf7bb 100644 (file)
--- a/view/theme/quattro/templates/threaded_conversation.tpl
+++ b/view/theme/quattro/templates/threaded_conversation.tpl
@@ -2,7 +2,7 @@
  
  {{foreach $threads as $thread}}
  
-<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}} {{$thread.network}}">
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}} {{if $thread.toplevel}} h-entry  {{else}} u-comment h-cite {{/if}} {{$thread.network}}">
  
  
                 {{if $thread.type == tag}}
diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl

index a5baff6e4082c7d01bf5266d6b43769b1934c46f..247bd16c9f8bec76d0e2149075fceb2de6f63db4 100644 (file)
--- a/view/theme/quattro/templates/wall_thread.tpl
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -19,7 +19,7 @@
  {{/if}}
  {{/if}}
  
-{{if $item.thread_level!=1}}<div class="children">{{/if}}
+{{if $item.thread_level!=1}}<div class="children u-comment h-cite">{{/if}}
  
  <div class="wall-item-decor">
         {{if $item.star}}<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>{{/if}}
@@ -30,11 +30,11 @@
  <div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}}" id="item-{{$item.guid}}">
         <div class="wall-item-item">
                 <div class="wall-item-info">
-                       <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}"
+                       <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card"
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
                                 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                 </a>
                                 <a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
                                 <ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
@@ -52,8 +52,8 @@
                         <div class="wall-item-location">{{$item.location}}</div>        
                 </div>
                 <div class="wall-item-content">
-                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h2>{{/if}}
-                       {{$item.body}}
+                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
+                       <span class="e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
                 </div>
         </div>
         <div class="wall-item-bottom">
@@ -67,16 +67,16 @@
                                 <span class='mention'>{{$tag}}</span>
                         {{/foreach}}
                 {{foreach $item.folders as $cat}}
-                    <span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                    <span class='folder p-category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                 {{/foreach}}
                  {{foreach $item.categories as $cat}}
-                    <span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                    <span class='category p-category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                  {{/foreach}}
                 </div>
         </div>  
         <div class="wall-item-bottom">
                 <div class="wall-item-links">
-                       {{if $item.plink}}<a class="icon s16 link{{$item.sparkle}}" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
+                       {{if $item.plink}}<a class="icon s16 link{{$item.sparkle}} u-url" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
                 </div>
                 <div class="wall-item-actions">
                         <div class="wall-item-actions-author">
@@ -84,7 +84,7 @@
                                  title="{{$item.linktitle}}"
                                  class="wall-item-name-link"><span
                                  class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
-                                <span class="wall-item-ago" title="{{$item.localtime}}">{{$item.ago}}</span>
+                                <span class="wall-item-ago" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span>
                                  {{if $item.owner_url}}<br/>{{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}
                                  {{/if}}
                         </div>
diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl

index cb4b1fba22d86b77b0667ae0c060927b8df53608..743612054fc85ded3025196abbc0925399315fa8 100644 (file)
--- a/view/theme/smoothly/templates/wall_thread.tpl
+++ b/view/theme/smoothly/templates/wall_thread.tpl
@@ -7,7 +7,7 @@
         <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
  {{/if}}
  
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}} {{if $item.toplevel}} h-entry {{else}} u-comment h-cite {{/if}}">
  <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >
  <div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
  
@@ -19,11 +19,11 @@
                         </div>
                         <div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="{{$item.wall}}" /></div>
                         {{/if}}
-                       <div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
+                       <div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" id="wall-item-photo-wrapper-{{$item.id}}" 
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                  onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                 <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                  <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                      <ul>
@@ -50,15 +50,15 @@
                         <span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span>
                         </a>
                         <div class="wall-item-ago">&bull;</div>
-                       <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
+                       <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></div>
                 </div>  
  
                 <div>
                 <hr class="line-dots">
                 </div>
-                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                         <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body}}</span>
                                 <div class="body-tag">
                                         {{foreach $item.tags as $tag}}
                                         <span class='tag'>{{$tag}}</span>
@@ -66,14 +66,14 @@
                                 </div>
  
                                 {{if $item.has_cats}}
-                               <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} 
+                               <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}<span class="p-category">{{$cat.name}}</span> 
                                 <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> 
                                 {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                                 </div>
                                 {{/if}}
  
                                 {{if $item.has_folders}}
-                               <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} 
+                               <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}<span class="p-category">{{$cat.name}}</span> 
                                 <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> 
                                 {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                                 </div>
@@ -97,7 +97,7 @@
  
                         {{if $item.plink}}
                         <div class="wall-item-links-wrapper">
-                               <a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a>
+                               <a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link u-url"></a>
                         </div>
                         {{/if}}
                  
diff --git a/view/theme/testbubble/templates/profile_vcard.tpl b/view/theme/testbubble/templates/profile_vcard.tpl

index 1d070ecc4081dfd367eabf986bedf28dfb7acb5d..a2b147298ac51450a2747d1033a704136765a9e4 100644 (file)
--- a/view/theme/testbubble/templates/profile_vcard.tpl
+++ b/view/theme/testbubble/templates/profile_vcard.tpl
@@ -1,34 +1,34 @@
  
-<div class="vcard">
-       <div class="fn label">{{$profile.name}}</div>
+<div class="vcard h-card">
+       <div class="fn label p-name">{{$profile.name}}</div>
                                 
         
         {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-       <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></div>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></div>
  
  
  
         {{if $location}}
                 <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr">
-                       {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+               <dd class="adr h-adr">
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                         <span class="city-state-zip">
-                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region">{{$profile.region}}</span>
-                               <span class="postal-code">{{$profile.postal_code}}</span>
+                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                               <span class="region p-region">{{$profile.region}}</span>
+                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                         </span>
-                       {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                 </dd>
                 </dl>
         {{/if}}
  
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
         
         {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
         {{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}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
  
         {{include file="diaspora_vcard.tpl"}}
         
diff --git a/view/theme/testbubble/templates/wall_thread.tpl b/view/theme/testbubble/templates/wall_thread.tpl

index c573ce951533e9f2c0601ba74d6390a6bb61c251..af85e7e8e1c1e204701b2ce6502a921781a4fa57 100644 (file)
--- a/view/theme/testbubble/templates/wall_thread.tpl
+++ b/view/theme/testbubble/templates/wall_thread.tpl
@@ -5,7 +5,7 @@
         </div>
         <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
  {{/if}}
-<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}} {{if $item.toplevel}} h-entry {{else}} u-comment h-cite {{/if}}">
  <div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >
         <div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
                 <div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
@@ -16,11 +16,11 @@
                         </div>
                         <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
                         {{/if}}
-                       <div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
+                       <div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" id="wall-item-photo-wrapper-{{$item.id}}" 
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                  onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                 <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                  <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                      <ul>
@@ -37,9 +37,9 @@
                                 {{else}}<div class="wall-item-lock"></div>{{/if}}
                 </div>
                 <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                         <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body}}</span>
                                         <div class="body-tag">
                                                 {{foreach $item.tags as $tag}}
                                                         <span class='tag'>{{$tag}}</span>
@@ -57,7 +57,7 @@
                         </div>
                         {{/if}}
                         {{if $item.plink}}
-                               <div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a></div>
+                               <div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link u-url"></a></div>
                         {{/if}}
                         {{if $item.edpost}}
                                 <a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
@@ -78,7 +78,7 @@
                 </div>
                 <div class="wall-item-author">
                         <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-                       <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+                       <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></div>
                 </div>  
         </div>  
         <div class="wall-item-wrapper-end"></div>
diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl

index 2d7c72f8c89db2596e8ea2db7a5533249652dada..ab69fd1b792cafda574a6bebf99d1ac96d6705a5 100644 (file)
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -27,7 +27,7 @@
         {{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">
+               <dd class="adr h-adr">
                         {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
                         <span class="city-state-zip">
                                 <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
@@ -39,7 +39,7 @@
                 </dl>
         {{/if}}
  
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender p-gender-identity">{{$profile.gender}}</dd></dl>{{/if}}
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
         
         {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
@@ -49,7 +49,7 @@
  
         {{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 u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$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}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
  
         {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about}}</dd></dl>{{/if}}
  
diff --git a/view/theme/vier/templates/threaded_conversation.tpl b/view/theme/vier/templates/threaded_conversation.tpl

index ae56371912a3d9fc056b8239aeafa2d63ae69e65..3553a5dcbc4f9e83dfe24d1ff735806b892115f9 100644 (file)
--- a/view/theme/vier/templates/threaded_conversation.tpl
+++ b/view/theme/vier/templates/threaded_conversation.tpl
@@ -2,7 +2,7 @@
  
  {{foreach $threads as $thread}}
  <hr class="sr-only" />
-<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}} {{$thread.network}}">
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}} {{if $thread.toplevel}}h-entry{{/if}} {{$thread.network}}">
         
         
                 {{if $thread.type == tag}}
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl

index c9ee770819c8e5e33070bb03a6923a485650de69..1f6032f4a55d1354f75484a438ae22ab59b3fb32 100644 (file)
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -17,7 +17,7 @@
  {{/if}}
  {{/if}}
  
-{{if $item.thread_level!=1}}<div class="children">{{/if}}
+{{if $item.thread_level!=1}}<div class="children u-comment h-cite">{{/if}}
  
  <div aria-hidden="true" class="wall-item-decor">
         <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
@@ -30,9 +30,9 @@
  {{/if}}
         <div class="wall-item-item">
                 <div class="wall-item-info">
-                       <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
-                               <!-- <a aria-hidden="true" href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}"></a> -->
-                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+                       <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
+                               <!-- <a aria-hidden="true" href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"></a> -->
+                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                 <ul role="menu" aria-haspopup="true" class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
                                 {{$item.item_photo_menu}}
                                 </ul>
@@ -40,8 +40,8 @@
                         </div>
                         {{if $item.owner_url}}
                         <div aria-hidden="true" class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
+                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link u-url" id="wall-item-ownerphoto-link-{{$item.id}}">
+                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}} p-name u-photo" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
                                 </a>
                         </div>
                         {{/if}}                 
@@ -50,7 +50,7 @@
                         <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
                         {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
                         <span class="wall-item-ago">
-                               {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.created}}</a>{{else}} {{$item.created}} {{/if}}
+                               {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}}
                         </span>
                         {{if $item.lock}}<span class="icon s10 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}
                         <span class="wall-item-network" title="{{$item.app}}">
@@ -60,8 +60,8 @@
                 </div>
  
                 <div itemprop="description" class="wall-item-content">
-                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h2>{{/if}}
-                       {{$item.body}}
+                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
+                       <span class="e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
                 </div>
         </div>
         <div class="wall-item-bottom">
@@ -75,10 +75,10 @@
                                 <span class='mention'>{{$tag}}</span>
                         {{/foreach}}
                 {{foreach $item.folders as $cat}}
-                    <span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                    <span class='folder p-category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                 {{/foreach}}
                  {{foreach $item.categories as $cat}}
-                    <span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                    <span class='category p-category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                  {{/foreach}}
                 </div>
         </div>
author	fabrixxm <fabrix.xm@gmail.com>
	Tue, 21 Jun 2016 18:48:09 +0000 (20:48 +0200)
committer	GitHub <noreply@github.com>
	Tue, 21 Jun 2016 18:48:09 +0000 (20:48 +0200)
view/templates/diaspora_vcard.tpl		patch \| blob \| history
view/templates/profile_vcard.tpl		patch \| blob \| history
view/templates/vcard-widget.tpl		patch \| blob \| history
view/templates/wall_thread.tpl		patch \| blob \| history
view/theme/decaf-mobile/templates/profile_vcard.tpl		patch \| blob \| history
view/theme/decaf-mobile/templates/wall_thread.tpl		patch \| blob \| history
view/theme/diabook/templates/directory_item.tpl		patch \| blob \| history
view/theme/diabook/templates/profile_vcard.tpl		patch \| blob \| history
view/theme/diabook/templates/wall_thread.tpl		patch \| blob \| history
view/theme/dispy/templates/profile_vcard.tpl		patch \| blob \| history
view/theme/dispy/templates/wall_thread.tpl		patch \| blob \| history
view/theme/duepuntozero/templates/profile_vcard.tpl		patch \| blob \| history
view/theme/facepark/templates/profile_vcard.tpl		patch \| blob \| history
view/theme/frio/templates/profile_vcard.tpl		patch \| blob \| history
view/theme/frio/templates/vcard-widget.tpl		patch \| blob \| history
view/theme/frio/templates/wall_thread.tpl		patch \| blob \| history
view/theme/frost-mobile/templates/profile_vcard.tpl		patch \| blob \| history
view/theme/frost-mobile/templates/wall_thread.tpl		patch \| blob \| history
view/theme/frost/templates/profile_vcard.tpl		patch \| blob \| history
view/theme/frost/templates/wall_thread.tpl		patch \| blob \| history
view/theme/quattro/templates/profile_vcard.tpl		patch \| blob \| history
view/theme/quattro/templates/threaded_conversation.tpl		patch \| blob \| history
view/theme/quattro/templates/wall_thread.tpl		patch \| blob \| history
view/theme/smoothly/templates/wall_thread.tpl		patch \| blob \| history
view/theme/testbubble/templates/profile_vcard.tpl		patch \| blob \| history
view/theme/testbubble/templates/wall_thread.tpl		patch \| blob \| history
view/theme/vier/templates/profile_vcard.tpl		patch \| blob \| history
view/theme/vier/templates/threaded_conversation.tpl		patch \| blob \| history
view/theme/vier/templates/wall_thread.tpl		patch \| blob \| history