removed experimental HTML5 microdata implementation from default template set

This commit is contained in:
Michael Save 2012-01-09 14:13:54 +11:00
parent 40c1089052
commit 118d50a76e
2 changed files with 15 additions and 18 deletions

View File

@ -1,14 +1,13 @@
{% filter remove_whitespace %} {% filter remove_whitespace %}
{# tabs and new lines will be ignored #} {# tabs and new lines will be ignored #}
<div class="post reply" id="reply_{{ post.id }}" itemprop="comment" itemscope itemid="/{{ board.uri }}/{{ post.id }}" itemtype="http://schema.org/UserComments" <div class="post reply" id="reply_{{ post.id }}">
{% if not index %} itemref="/{{ board.uri }}/{{ post.thread }}"{% endif %}>
<p class="intro"{% if not index %} id="{{ post.id }}"{% endif %}> <p class="intro"{% if not index %} id="{{ post.id }}"{% endif %}>
<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" /> <input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
<label for="delete_{{ post.id }}"> <label for="delete_{{ post.id }}">
{% if post.subject|length > 0 %} {% if post.subject|length > 0 %}
{# show subject #} {# show subject #}
<span itemprop="name" class="subject">{{ post.subject }}</span> <span class="subject">{{ post.subject }}</span>
{% endif %} {% endif %}
{% if post.email|length > 0 %} {% if post.email|length > 0 %}
{# start email #} {# start email #}
@ -29,13 +28,13 @@
{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %} {% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
[<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>] [<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
{% endif %} {% endif %}
<time itemprop="commentTime" datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S%z') }}">{{ post.time|date(config.post_date) }}</time> <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}">{{ post.time|date(config.post_date) }}</time>
</label> </label>
{% if config.poster_ids %} {% if config.poster_ids %}
ID: {{ post.ip|poster_id(post.thread) }} ID: {{ post.ip|poster_id(post.thread) }}
{% endif %} {% endif %}
<a itemprop="url" class="post_no" {% if not index %}onclick="highlightReply({{ post.id }})" {% endif %}href="{{ post.link }}">No.</a> <a class="post_no" {% if not index %}onclick="highlightReply({{ post.id }})" {% endif %}href="{{ post.link }}">No.</a>
<a itemprop="replyToUrl" class="post_no" <a class="post_no"
{% if not index %} {% if not index %}
onclick="citeReply({{ post.id }});" onclick="citeReply({{ post.id }});"
{% endif %} {% endif %}
@ -50,7 +49,7 @@
{% if post.embed %} {% if post.embed %}
{{ post.embed }} {{ post.embed }}
{% elseif post.file == 'deleted' %} {% elseif post.file == 'deleted' %}
<img itemprop="image" src="{{ config.image_deleted }}" alt="" /> <img src="{{ config.image_deleted }}" alt="" />
{% elseif post.file and post.file %} {% elseif post.file and post.file %}
<p class="fileinfo">File: <a href="{{ config.uri_img }}{{ post.file }}">{{ post.file }}</a> <span class="unimportant"> <p class="fileinfo">File: <a href="{{ config.uri_img }}{{ post.file }}">{{ post.file }}</a> <span class="unimportant">
( (
@ -92,7 +91,7 @@
</a> </a>
{% endif %} {% endif %}
{{ post.postControls }} {{ post.postControls }}
<p itemprop="commentText" class="body"> <p class="body">
{% endfilter %}{% if index %}{{ post.body|truncate_body(post.link) }}{% else %}{{ post.body }}{% endif %}{% filter remove_whitespace %} {% endfilter %}{% if index %}{{ post.body|truncate_body(post.link) }}{% else %}{{ post.body }}{% endif %}{% filter remove_whitespace %}
</p> </p>
</div> </div>

View File

@ -2,13 +2,13 @@
{# tabs and new lines will be ignored #} {# tabs and new lines will be ignored #}
{% if index %} {% if index %}
<div id="thread_{{ post.id }}" itemscope itemid="/{{ board.uri }}/{{ post.id }}" itemtype="http://schema.org/CreativeWork"> <div id="thread_{{ post.id }}">
{% endif %} {% endif %}
{% if post.embed %} {% if post.embed %}
{{ post.embed }} {{ post.embed }}
{% elseif post.file == 'deleted' %} {% elseif post.file == 'deleted' %}
<img itemprop="image" src="{{ config.image_deleted }}" alt="" /> <img src="{{ config.image_deleted }}" alt="" />
{% elseif post.file and post.file %} {% elseif post.file and post.file %}
<p class="fileinfo">File: <a href="{{ config.uri_img }}{{ post.file }}">{{ post.file }}</a> <span class="unimportant"> <p class="fileinfo">File: <a href="{{ config.uri_img }}{{ post.file }}">{{ post.file }}</a> <span class="unimportant">
( (
@ -47,12 +47,12 @@
{{ config.uri_thumb }}{{ post.thumb }} {{ config.uri_thumb }}{{ post.thumb }}
{% endif %}" style="width:{{ post.thumbx }}px;height:{{ post.thumby }}px" alt="" /></a> {% endif %}" style="width:{{ post.thumbx }}px;height:{{ post.thumby }}px" alt="" /></a>
{% endif %} {% endif %}
<div class="post op"{% if not index %} itemscope itemid="/{{ board.uri }}/{{ post.id }}" itemtype="http://schema.org/Article"{% endif %}><p class="intro"{% if not index %} id="{{ post.id }}"{% endif %}> <div class="post op"><p class="intro"{% if not index %} id="{{ post.id }}"{% endif %}>
<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" /> <input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
<label for="delete_{{ post.id }}"> <label for="delete_{{ post.id }}">
{% if post.subject|length > 0 %} {% if post.subject|length > 0 %}
{# show subject #} {# show subject #}
<span itemprop="headline" class="subject">{{ post.subject }}</span> <span class="subject">{{ post.subject }}</span>
{% endif %} {% endif %}
{% if post.email|length > 0 %} {% if post.email|length > 0 %}
{# start email #} {# start email #}
@ -73,12 +73,12 @@
{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %} {% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
[<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>] [<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
{% endif %} {% endif %}
<time itemprop="dateCreated" datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S%z') }}">{{ post.time|date(config.post_date) }}</time> <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}">{{ post.time|date(config.post_date) }}</time>
</label> </label>
{% if config.poster_ids %} {% if config.poster_ids %}
ID: {{ post.ip|poster_id(post.id) }} ID: {{ post.ip|poster_id(post.id) }}
{% endif %} {% endif %}
<a itemprop="url" class="post_no" href="{{ post.link }}">No.</a> <a class="post_no" href="{{ post.link }}">No.</a>
<a class="post_no" <a class="post_no"
{% if not index %} {% if not index %}
onclick="citeReply({{ post.id }});" onclick="citeReply({{ post.id }});"
@ -100,11 +100,11 @@
<img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Locked" /> <img class="icon" title="Bumplocked" src="{{ config.image_bumplocked }}" alt="Locked" />
{% endif %} {% endif %}
{% if index %} {% if index %}
<a itemprop="discussionUrl" href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ config.file_page|sprintf(post.id) }}">[{% trans %}Reply{% endtrans %}]</a> <a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ config.file_page|sprintf(post.id) }}">[{% trans %}Reply{% endtrans %}]</a>
{% endif %} {% endif %}
{{ post.postControls }} {{ post.postControls }}
</p> </p>
<p itemprop="description" class="body"> <p class="body">
{% endfilter %}{% if index %}{{ post.body|truncate_body(post.link) }}{% else %}{{ post.body }}{% endif %}{% filter remove_whitespace %} {% endfilter %}{% if index %}{{ post.body|truncate_body(post.link) }}{% else %}{{ post.body }}{% endif %}{% filter remove_whitespace %}
</p> </p>
{% if post.omitted or post.omitted_images %} {% if post.omitted or post.omitted_images %}
@ -128,9 +128,7 @@
{% endif %} omitted. Click reply to view. {% endif %} omitted. Click reply to view.
</span> </span>
{% endif %} {% endif %}
<meta itemprop="genre" content="/{{ board.uri }}/" />
{% if not index %} {% if not index %}
<meta itemprop="interactionCount" content="UserComments:{{ post.posts|count }}" />
{% endif %} {% endif %}
</div>{% endfilter %} </div>{% endfilter %}
{% set hr = post.hr %} {% set hr = post.hr %}