From dfdb1aa7ccb3c292dc60128978a91917f7f104bb Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 31 May 2015 01:24:23 +0000
Subject: [PATCH] Create meta class for showing metadata in right margin

---
 i2p2www/pages/blog/post.html           |  9 ++++-----
 i2p2www/pages/global/layout.html       | 10 +++++-----
 i2p2www/static/styles/duck/default.css |  9 +++++++--
 i2p2www/static/styles/duck/desktop.css | 10 +++++++---
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/i2p2www/pages/blog/post.html b/i2p2www/pages/blog/post.html
index ce6d9f52..484127a3 100644
--- a/i2p2www/pages/blog/post.html
+++ b/i2p2www/pages/blog/post.html
@@ -1,15 +1,14 @@
 {% extends "global/layout.html" %}
 {%- from "global/macros" import render_categories with context -%}
 {% block title %}{{ title }} - {{ _('Blog') }}{% endblock %}
-{% block sidebar %}
-<ul id="post-info" class="lastupdated">
+{% block content %}
+<div class="meta">
+<ul id="post-info">
   <li class="date">{{ _('Posted:') }} {{ meta.date }}</li>
   <li class="author">{{ _('Author:') }} {{ meta.author }}</li>
   <li class="category">{{ render_categories(meta.category)|safe }}</li>
 </ul>
-{% endblock %}
-
-{% block content %}
+</div>
 {% autoescape false %}
 {{ body }}
 {% endautoescape %}
diff --git a/i2p2www/pages/global/layout.html b/i2p2www/pages/global/layout.html
index 35bac7eb..2e2c3d5c 100644
--- a/i2p2www/pages/global/layout.html
+++ b/i2p2www/pages/global/layout.html
@@ -55,18 +55,20 @@
 
         <main role="main" class="inner">
         <div class="fluid">
-          {% if self.content_nav() or self.sidebar() or self.lastupdated() or self.accuratefor() -%}
+          {% if self.content_nav() or self.sidebar() -%}
           <aside class="sidebar">
             {% if self.content_nav() -%}
-            <nav{% if self.lastupdated() or self.accuratefor() %} class="top"{% endif %}>
+            <nav{% if self.sidebar() %} class="top"{% endif %}>
             {% block content_nav %}{% endblock %}
             </nav>
             {%- endif %}
 
             {% block sidebar %}{% endblock %}
+          </aside>
+          {%- endif %}
 
           {% if self.lastupdated() or self.accuratefor() -%}
-          <div class="lastupdated">
+          <div class="meta lastupdated">
             <!--
             {% block lastupdated %}{% endblock %}
             {% block accuratefor %}{% endblock %}
@@ -86,8 +88,6 @@
             {%- endif %}{% endif %}{% endif %}
           </div>
           {%- endif %}
-          </aside>
-          {%- endif %}
 
           <article class="content-inner">
           {% block content %}{% endblock %}
diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css
index 7c69bfc0..36fdd7d2 100644
--- a/i2p2www/static/styles/duck/default.css
+++ b/i2p2www/static/styles/duck/default.css
@@ -203,13 +203,18 @@ div#content .sidebar nav ul {
     padding-left: 0.5em;
 }
 
-div#content .lastupdated {
+div#content .meta {
     background-color: #ffffdd;
-    padding: 2px 4px;
+    border: 1px dashed;
+    padding: 0.5em 1em;
     position: relative;
     text-align: center;
 }
 
+div#content .lastupdated {
+    margin: 1em 2em;
+}
+
 div#content .content-inner {
     padding: 1em 2em;
 }
diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css
index cee68eaa..8e27ee25 100644
--- a/i2p2www/static/styles/duck/desktop.css
+++ b/i2p2www/static/styles/duck/desktop.css
@@ -250,9 +250,13 @@ div#content .inner .sidebar {
     width: 250px;
 }
 
-div#content .lastupdated {
-    border-radius: 0 0 10px 0;
-    text-align: right;
+div#content .inner .meta {
+    border: 1px dashed;
+    position: absolute;
+    left: 72%;
+    margin: 1em 0;
+    right: 2%;
+    text-align: left;
 }
 
 div#content .content-inner {