From 0f3f0f33470d2ebc5fd98bb619959dabfa588f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88kull=20So=CC=81lberg=20Au=C3=B0unsson?= Date: Mon, 28 Nov 2011 22:23:07 +0000 Subject: [PATCH] Calepin update. Display tags and categories in post footer. --- calepin/static/styles.css | 20 ++++++++++++++++---- calepin/templates/article.html | 24 ++++++++++++++++++++++++ calepin/templates/base.html | 25 +++++++++++++++++++++---- calepin/templates/tag.html | 4 ++++ 4 files changed, 65 insertions(+), 8 deletions(-) diff --git a/calepin/static/styles.css b/calepin/static/styles.css index f47a4b72e..ca7ab2106 100644 --- a/calepin/static/styles.css +++ b/calepin/static/styles.css @@ -3,13 +3,13 @@ @import url(http://fonts.googleapis.com/css?family=Merriweather:400,700,300); -body { font-family: arial, helvetica, sans-serif; background: #f0f0f0; } +body { font-family: arial, helvetica, sans-serif; } h1, h2, h3, h4, h5, h6 { font-family: 'Merriweather', serif; } header { margin-bottom: 30px; - background: white; + background: #f0f0f0; border-bottom: 1px solid #e0e0e0; } h1 { font-size: 18px; padding: 20px 0; margin: 0; } @@ -17,9 +17,17 @@ h1 a:hover, h1 a:visited, h1 a { font-weight: bold; text-decoration: none; display: block; } +h2.section { + font-size: 13px; + font-weight: bold; + margin-bottom: 20px; + font-family: arial, helvetica, sans-serif; +} + +iframe, object { margin-bottom: 1em; } + footer { font-size: 14px; - font-weight: bold; font-family: 'Merriweather', serif; font-weight: bold; text-shadow: 0 1px 0 white; @@ -58,8 +66,8 @@ article h6, article hr, article table { max-width: 480px; } -article p { font-size: 100%; } article ul { list-style: disc outside; margin-left: 2em; } +article blockquote { font-size: 14px; padding-top: 7px; } article .entry-header { margin-bottom: 20px; } article .entry-header h2 { margin: 20px 0; } @@ -72,6 +80,10 @@ article .entry-content h4 { font-size: 12pt; } article .entry-content h5 { font-size: 10pt; } article .entry-content h6 { font-size: 10pt; margin-bottom: .3em; } +article .metadata { font-size: 11px; color: #888; } +article .metadata p { margin-bottom: 0; } +article .metadata a { color: #666; } + sup { vertical-align: .2em; font-size: 80%; margin: -2px 0 0 2px; } p img { max-width: 100%; } diff --git a/calepin/templates/article.html b/calepin/templates/article.html index 7d4b7b922..c2f2cf2f1 100644 --- a/calepin/templates/article.html +++ b/calepin/templates/article.html @@ -15,6 +15,30 @@

{{ article.title }}

{{ article.content }}
+ +
+ + {# + {% if article.author %} +
+ By {{ article.author }} +
+ {% endif %} + #} + + {% if article.category and article.category != "misc" %} +

+ Posted in {{ article.category }} +

+ {% endif %} + + {% if article.tags %} +

+ Tags: {% for tag in article.tags %}{{ tag }} {% endfor %} +

+ {% endif %} + +
{% if DISQUS_SITENAME %}
diff --git a/calepin/templates/base.html b/calepin/templates/base.html index c7e0f6c9f..6562d2a90 100644 --- a/calepin/templates/base.html +++ b/calepin/templates/base.html @@ -15,7 +15,7 @@ - + @@ -23,7 +23,6 @@ -
@@ -36,8 +35,10 @@

{{ SITENAME }}

- {% block content %} - {% endblock %} +

{% block section -%} + + {% endblock %}

+ {% block content %}{% endblock %}
@@ -54,6 +55,22 @@

{{ SITENAME }}

+ +{% if GOOGLE_ANALYTICS %} + +{% endif -%} diff --git a/calepin/templates/tag.html b/calepin/templates/tag.html index e69de29bb..c53140587 100644 --- a/calepin/templates/tag.html +++ b/calepin/templates/tag.html @@ -0,0 +1,4 @@ +{% extends "index.html" %} +{% block title %}{{ tag }} - {{ SITENAME }}{% endblock %} +{% block section %}Posts in {{ tag }}{% endblock %} +