diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 00:36:57 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 00:36:57 -0400 |
| commit | df7a6aa620af6a165bdacd755757f8cb1179331c (patch) | |
| tree | 384b4c62d1f50d8effb733d81d2a810666807624 /templates/news/view.html | |
| parent | 94f972bb892dbf9a86f089f1872ae6d849c0cd0e (diff) | |
| parent | a22557811a24b68ef85d4271787c48d8d1e4fc99 (diff) | |
Merge branch 'archweb-generic2'
Conflicts:
README.BRANDING
local_settings.py.example
packages/templatetags/package_extras.py
public/views.py
releng/views.py
settings.py
sitestatic/archnavbar/archnavbar.css
sitestatic/silhouette.png
templates/base.html
templates/packages/differences.html
templates/packages/opensearch.xml
templates/packages/search.html
templates/public/donate.html
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
urls.py
Diffstat (limited to 'templates/news/view.html')
| -rw-r--r-- | templates/news/view.html | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/templates/news/view.html b/templates/news/view.html index 47830867..93cf32d4 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -1,11 +1,20 @@ {% extends "base.html" %} -{% load markup %} {% block title %}{{ BRANDING_DISTRONAME }} - News: {{ news.title }}{% endblock %} {% block content %} -<div class="news-article box"> - - <h2>News: {{ news.title }}</h2> +<div itemscope itemtype="http://schema.org/Article" class="news-article box"> + <h2 itemprop="headline">{{ news.title }}</h2> + <meta itemprop="dateCreated" content="{{ news.postdate|date:"Y-m-d" }}"/> + <meta itemprop="datePublished" content="{{ news.postdate|date:"Y-m-d" }}"/> + <meta itemprop="dateModified" content="{{ news.last_modified|date:"Y-m-d" }}"/> + <meta itemprop="inLanguage" content="en"/> + <meta itemprop="wordCount" content="{{ news.content|wordcount }}"/> + <div style="display:none" itemprop="author" itemscope itemtype="http://schema.org/Person"> + <meta itemprop="name" content="{{ news.author.get_full_name|escape }}"/> + </div> + <div style="display:none" itemprop="publisher" itemscope itemtype="http://schema.org/Organization"> + <meta itemprop="name" content="{{ BRANDING_DISTRONAME }}"/> + </div> {% if perms.news.change_news %} <ul class="admin-actions"> @@ -18,7 +27,6 @@ <p class="article-info">{{ news.postdate|date }} - {{ news.author.get_full_name }}</p> - <div class="article-content">{{ news.content|markdown }}</div> - + <div class="article-content" itemprop="articleBody">{{ news.html }}</div> </div> {% endblock %} |