diff options
Diffstat (limited to 'juick-server/src/main')
4 files changed, 17 insertions, 30 deletions
diff --git a/juick-server/src/main/resources/templates/layouts/content.html b/juick-server/src/main/resources/templates/layouts/content.html index 2ca9fd7e..d2d29c4e 100644 --- a/juick-server/src/main/resources/templates/layouts/content.html +++ b/juick-server/src/main/resources/templates/layouts/content.html @@ -1,6 +1,6 @@ <!DOCTYPE html> <html prefix="og: http://ogp.me/ns#"> -<head id="org" itemprop="publisher" itemscope="" itemtype="http://schema.org/Organization"> +<head> <meta charset="utf-8"/> <meta http-equiv="X-UA-Compatible" content="IE=edge"/> <script type="text/javascript" src="{{ beans.webApp.scriptsUrl }}"></script> @@ -8,8 +8,7 @@ {% block headers %} {{ headers | default('') | raw }} {% endblock %} - <title itemprop="name">{{ title | default('Juick') }}</title> - <meta itemprop="url" content="https://juick.com/" /> + <title>{{ title | default('Juick') }}</title> <meta property="og:type" content="{{ ogtype | default('website') }}" /> <meta property="fb:app_id" content="130568668304" /> <meta name="viewport" content="width=device-width,initial-scale=1"/> @@ -27,21 +26,10 @@ <link rel="apple-touch-icon" sizes="144x144" href="//i.juick.com/apple-icon-144x144.png"/> <link rel="apple-touch-icon" sizes="152x152" href="//i.juick.com/apple-icon-152x152.png"/> <link rel="apple-touch-icon" sizes="180x180" href="//i.juick.com/apple-icon-180x180.png"/> - <link itemprop="logo" href="http://juick.com/#juick-logo" itemtype="http://schema.org/ImageObject" /> <link rel="icon" type="image/png" sizes="32x32" href="//i.juick.com/favicon-32x32.png"/> <link rel="icon" type="image/png" sizes="96x96" href="//i.juick.com/favicon-96x96.png"/> <link rel="icon" type="image/png" sizes="16x16" href="//i.juick.com/favicon-16x16.png"/> <link rel="manifest" href="//i.juick.com/manifest.json"/> - <script type="application/ld+json"> -{ - "@context": "http://schema.org", - "@id": "http://juick.com/#juick-logo", - "@type": "ImageObject", - "url": "http://juick.com/logo.png", - "width": 110, - "height": 36 -} - </script> </head> <body id="body" {% if visitor.uid > 0 %}data-hash="{{visitor.authHash}}"{% endif %}> {% block body %} diff --git a/juick-server/src/main/resources/templates/views/blog.html b/juick-server/src/main/resources/templates/views/blog.html index 9cf4714e..91decad6 100644 --- a/juick-server/src/main/resources/templates/views/blog.html +++ b/juick-server/src/main/resources/templates/views/blog.html @@ -7,8 +7,7 @@ {% if paramTag | default('') is not empty %} <p class="page"><a href="/tag/{{ paramTag.name | urlencode }}">← {{ i18n("messages","blog.allPostsWithTag") }} <b>{{ paramTag.name | escape }}</b></a></p> {% endif %} -<div itemscope="" itemtype="http://schema.org/Blog"> - <meta itemprop="url" content="{{ pageUrl }}"/> +<div> {% for msg in msgs %} {% include "views/partial/message" %} {% endfor %} diff --git a/juick-server/src/main/resources/templates/views/partial/message.html b/juick-server/src/main/resources/templates/views/partial/message.html index 0b6db3df..00ca048c 100644 --- a/juick-server/src/main/resources/templates/views/partial/message.html +++ b/juick-server/src/main/resources/templates/views/partial/message.html @@ -1,27 +1,27 @@ -<article data-mid="{{ msg.mid }}" itemprop="blogPost" itemscope="" itemtype="http://schema.org/BlogPosting" itemref="org"> +<article data-mid="{{ msg.mid }}"> <header class="h"> - <span itemprop="author" itemscope="" itemtype="http://schema.org/Person"> - <a href="/{{ msg.user.name }}/" itemprop="url" rel="author"><span itemprop="name">{{ msg.user.name }}</span></a> + <span> + <a href="/{{ msg.user.name }}/"><span>{{ msg.user.name }}</span></a> </span> <div class="msg-avatar"><a href="/{{ msg.user.name }}/"> <img src="//i.juick.com/a/{{ msg.user.uid }}.png" alt="{{ msg.user.name }}"/></a> </div> <div class="msg-ts"> <a href="/{{ msg.user.name }}/{{ msg.mid }}"> - <time itemprop="datePublished dateModified" itemtype="http://schema.org/Date" datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z" + <time datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z" title="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }} GMT"> {{ msg.timestamp | prettyTime }} </time> </a> </div> - <div class="msg-tags" itemprop="headline"> + <div class="msg-tags"> {{ tags(msg.user.name, msg.tags | tagsList) }} </div> </header> - <p itemprop="description">{{ msg | formatMessage }}</p> + <p>{{ msg | formatMessage }}</p> {% if msg.AttachmentType is not empty %} <p class="ir"><a href="//i.juick.com/p/{{ msg.mid }}.{{ msg.AttachmentType }}" data-fname="{{ msg.mid }}.{{ msg.AttachmentType }}"> - <img itemprop="image" src="//i.juick.com/photos-512/{{ msg.mid }}.{{ msg.AttachmentType }}" alt=""/></a> + <img src="//i.juick.com/photos-512/{{ msg.mid }}.{{ msg.AttachmentType }}" alt=""/></a> </p> {% endif %} <nav class="l"> diff --git a/juick-server/src/main/resources/templates/views/thread.html b/juick-server/src/main/resources/templates/views/thread.html index af9b4069..478258cf 100644 --- a/juick-server/src/main/resources/templates/views/thread.html +++ b/juick-server/src/main/resources/templates/views/thread.html @@ -3,31 +3,31 @@ {% block content %} <ul id="0"> <li id="msg-{{ msg.mid }}" class="msg msgthread"> - <div class="msg-cont" itemscope="" itemtype="http://schema.org/BlogPosting" itemref="org"> + <div class="msg-cont"> <div class="msg-header"> <div class="msg-avatar"> <a href="/{{ msg.user.name }}/"><img src="//i.juick.com/a/{{ msg.user.uid }}.png" alt="{{ msg.user.name }}"/></a> </div> - <span itemprop="author" itemscope="" itemtype="http://schema.org/Person"> - <a itemprop="url" rel="author" href="/{{ msg.user.name }}/"><span itemprop="name">{{ msg.user.name }}</span></a> + <span> + <a href="/{{ msg.user.name }}/"><span>{{ msg.user.name }}</span></a> </span> <div class="msg-ts"> <a href="/{{ msg.user.name }}/{{ msg.mid }}"> - <time itemprop="datePublished dateModified" datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z" + <time datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z" title="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }} GMT"> {{ msg.timestamp | prettyTime }} </time> </a> </div> - <div class="msg-tags" itemprop="headline"> + <div class="msg-tags"> {{ tags(msg.user.name, msg.tags | tagsList) }} </div> </div> - <div class="msg-txt" itemprop="articleBody">{{ msg | formatMessage }}</div> + <div class="msg-txt">{{ msg | formatMessage }}</div> {% if msg.AttachmentType is not empty %} <div class="msg-media"> <a href="//i.juick.com/p/{{ msg.mid }}.{{ msg.AttachmentType }}" data-fname="{{ msg.mid }}.{{ msg.AttachmentType }}"> - <img itemprop="image" src="//i.juick.com/photos-512/{{ msg.mid }}.{{ msg.AttachmentType }}" alt=""/> + <img src="//i.juick.com/photos-512/{{ msg.mid }}.{{ msg.AttachmentType }}" alt=""/> </a> </div> {% endif %} |