From: Marcel Werk Date: Mon, 11 Jul 2016 14:41:13 +0000 (+0200) Subject: Microdata overhaul X-Git-Tag: 3.0.0_Beta_1~1200 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=956745ba0c7084ff371457432acce81338bcc04f;p=GitHub%2FWoltLab%2FWCF.git Microdata overhaul --- diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl index b46be86c81..e17a55b627 100644 --- a/com.woltlab.wcf/templates/article.tpl +++ b/com.woltlab.wcf/templates/article.tpl @@ -1,27 +1,35 @@ {capture assign='pageTitle'}{$articleContent->title}{/capture} +{assign var='__mainItemScope' value='itemprop="mainEntity" itemscope itemtype="http://schema.org/Article"'} + {capture assign='contentHeader'}

{$articleContent->title}

+
{if $article->userID} - {$article->username} + + {$article->username} + {else} - {$article->username} + {$article->username} {/if}
- {@$article->time|time} + {@$article->time|time} + +
+
- {lang}wcf.article.articleComments{/lang} + {lang}wcf.article.articleComments{/lang} + +
@@ -31,6 +39,14 @@

+ + +

+ +

+ {* @TODO *} +

{hascontent} @@ -76,51 +92,20 @@ {/foreach} {/if} - - {/capture} {include file='header'} {if $articleContent->getImage()}

{@$articleContent->getImage()->getThumbnailTag('large')}

{if $articleContent->getImage()->caption} -

{$articleContent->getImage()->caption}

{/if} + + +

{/if} diff --git a/com.woltlab.wcf/templates/breadcrumbs.tpl b/com.woltlab.wcf/templates/breadcrumbs.tpl index 519840fc6a..bf5512a7ea 100644 --- a/com.woltlab.wcf/templates/breadcrumbs.tpl +++ b/com.woltlab.wcf/templates/breadcrumbs.tpl @@ -1,16 +1,16 @@ {if !$__microdata|isset}{assign var=__microdata value=true}{/if} {hascontent} {/hascontent} diff --git a/com.woltlab.wcf/templates/commentList.tpl b/com.woltlab.wcf/templates/commentList.tpl index a52cef6f3b..35693c18b3 100644 --- a/com.woltlab.wcf/templates/commentList.tpl +++ b/com.woltlab.wcf/templates/commentList.tpl @@ -10,21 +10,25 @@ {@$comment->getUserProfile()->getAvatar()->getImageTag(48)} {/if} -

+ +

+

{if $comment->userID} - {$comment->username} + + {$comment->username} + {else} - {$comment->username} + {$comment->username} {/if} {@$comment->time|time}

{@$comment->getFormattedMessage()}

+ +

+

{if $response->userID} - {$response->username} + + {$response->username} + {else} - {$response->username} + {$response->username} {/if} {@$response->time|time}

{@$response->getFormattedMessage()}

{/hascontent} -

{hascontent}

diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl index 162982c825..0a4385c20a 100644 --- a/com.woltlab.wcf/templates/messageSidebar.tpl +++ b/com.woltlab.wcf/templates/messageSidebar.tpl @@ -1,8 +1,11 @@ +{if !$enableMicrodata|isset} + {assign var=enableMicrodata value=false} +{/if} {if !$__messageSidebarJavascript|isset} {assign var=__messageSidebarJavascript value=true} {/if} -

{event name='messageAuthor'} @@ -18,8 +21,8 @@ {/if}

- - {if MESSAGE_SIDEBAR_ENABLE_USER_ONLINE_MARKING}{@$userProfile->getFormattedUsername()}{else}{$username}{/if} + + {if MESSAGE_SIDEBAR_ENABLE_USER_ONLINE_MARKING}{@$userProfile->getFormattedUsername()}{else}{$username}{/if} {if $userProfile->banned}{/if} @@ -38,7 +41,7 @@ {/if} {else}

- {$userProfile->username} + {$userProfile->username} {event name='messageAuthorContainer'}

diff --git a/com.woltlab.wcf/templates/pageHeaderSearch.tpl b/com.woltlab.wcf/templates/pageHeaderSearch.tpl index e3ca796d6a..1eccf74a44 100644 --- a/com.woltlab.wcf/templates/pageHeaderSearch.tpl +++ b/com.woltlab.wcf/templates/pageHeaderSearch.tpl @@ -20,8 +20,14 @@ {event name='settings'} -

- +