1 files changed, 27 insertions, 22 deletions
diff --git a/nikola/data/themes/base/templates/index.tmpl b/nikola/data/themes/base/templates/index.tmpl
index 1a280b0..e833eb0 100644
--- a/nikola/data/themes/base/templates/index.tmpl
+++ b/nikola/data/themes/base/templates/index.tmpl
@@ -2,28 +2,33 @@
 <%namespace name="helper" file="index_helper.tmpl"/>
 <%namespace name="comments" file="comments_helper.tmpl"/>
 <%inherit file="base.tmpl"/>
+
 <%block name="content">
-    % for post in posts:
-        <article class="postbox h-entry post-${post.meta('type')}">
-        <h1 class="p-name"><a href="${post.permalink()}" class="u-url">${post.title()}</a>
-        <small>&nbsp;&nbsp;
-             ${messages("Posted:")} <time class="published dt-published" datetime="${post.date.isoformat()}">${post.formatted_date(date_format)}</time>
-        </small></h1>
-        <hr>
-        %if index_teasers:
-        <div class="p-summary">
-        ${post.text(teaser_only=True)}
-        %else:
-        <div class="e-content">
-        ${post.text(teaser_only=False)}
-        %endif
+<div class="postindex">
+% for post in posts:
+    <article class="h-entry post-${post.meta('type')}">
+    <header>
+        <h1 class="p-name entry-title"><a href="${post.permalink()}" class="u-url">${post.title()}</h1></a>
+        <div class="metadata">
+            <p class="byline author vcard"><span class="byline-name fn">${post.author()}</span></p>
+            <p class="dateline"><a href="${post.permalink()}" rel="bookmark"><time class="published dt-published" datetime="${post.date.isoformat()}" itemprop="datePublished" title="${messages("Publication date")}">${post.formatted_date(date_format)}</time></a></p>
+            % if not post.meta('nocomments') and site_has_comments:
+                <p class="commentline">${comments.comment_link(post.permalink(), post._base_path)}
+            % endif
         </div>
-        % if not post.meta('nocomments'):
-            ${comments.comment_link(post.permalink(), post._base_path)}
-        % endif
-        </article>
-    % endfor
-    ${helper.html_pager()}
-    ${comments.comment_link_script()}
-	${helper.mathjax_script(posts)}
+    </header>
+    %if index_teasers:
+    <div class="p-summary entry-summary">
+    ${post.text(teaser_only=True)}
+    %else:
+    <div class="e-content entry-content">
+    ${post.text(teaser_only=False)}
+    %endif
+    </div>
+    </article>
+% endfor
+</div>
+${helper.html_pager()}
+${comments.comment_link_script()}
+${helper.mathjax_script(posts)}
 </%block>