From 2dab9254e1da14db38c0862c44bace2ad4993bda Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Mon, 12 Mar 2012 01:45:07 +0100 Subject: Add seperate page per post --- static/main.css | 29 ++++++--- templates/aggregator/base.html | 24 ++++++++ templates/aggregator/post_content.html | 28 +++++++++ templates/aggregator/post_detail.html | 24 ++++++++ templates/aggregator/posts.html | 105 ++++++++++++--------------------- urls.py | 6 +- 6 files changed, 140 insertions(+), 76 deletions(-) create mode 100644 templates/aggregator/base.html create mode 100644 templates/aggregator/post_content.html create mode 100644 templates/aggregator/post_detail.html diff --git a/static/main.css b/static/main.css index c040cbf..8a7f2b5 100644 --- a/static/main.css +++ b/static/main.css @@ -18,6 +18,10 @@ body { font-family: "DejaVu Sans", sans-serif; } +.clear { + clear: both; +} + .post { background-color: #808080; padding: 5px; @@ -27,7 +31,18 @@ body { } .post h3 { - margin-bottom: 10px; + float: left; +} + +.post .postsubtitle { + margin-left: 50px; + text-align: right; + font-size: 75%; +} + +.post .postcontent { + margin-top: 17px; + clear: left; } #logo { @@ -70,7 +85,7 @@ body { } #content h2 { - margin-bottom: 3px; + margin-bottom: 5px; } #feeds { @@ -97,15 +112,13 @@ body { position: relative; } -#pager #previous { - position: absolute; - left: 5px; +#pager .nav-prev { + float: left; } -#pager #next { +#pager .nav-next { float: right; - position: absolute; - right: 5px; + text-align: right; } #pager #current { diff --git a/templates/aggregator/base.html b/templates/aggregator/base.html new file mode 100644 index 0000000..1f3ec37 --- /dev/null +++ b/templates/aggregator/base.html @@ -0,0 +1,24 @@ + + + + + ryuslash + + + + + +

+ +

+ ryuslash +

Will this ever really be my website?

+ + {% block menu %}{% endblock %} + +

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

+ + diff --git a/templates/aggregator/post_content.html b/templates/aggregator/post_content.html new file mode 100644 index 0000000..36b419d --- /dev/null +++ b/templates/aggregator/post_content.html @@ -0,0 +1,28 @@ +

+ + + {% if post.feed.uses_title %} + {{ post.title }} + {% else %} + {{ post.updated }} + {% endif %} + +

+ Via + {{ post.feed.name }} + (profile, + origin) +

+ +

+ {% autoescape off %} + {% if post.feed.br2nl %} + {{ post.body|linebreaks }} + {% else %} + {{ post.body }} + {% endif %} + {% endautoescape %} +

diff --git a/templates/aggregator/post_detail.html b/templates/aggregator/post_detail.html new file mode 100644 index 0000000..eb39f95 --- /dev/null +++ b/templates/aggregator/post_detail.html @@ -0,0 +1,24 @@ +{% extends "aggregator/base.html" %} + +{% block content %} +{% include "aggregator/post_content.html" with post=object %} + + +{% endblock %} diff --git a/templates/aggregator/posts.html b/templates/aggregator/posts.html index 5b8bc1c..2a5b8a1 100644 --- a/templates/aggregator/posts.html +++ b/templates/aggregator/posts.html @@ -1,70 +1,41 @@ - - - - - ryuslash - - - - - -

- -

ryuslash

Will this ever really be my website?

- -

- {% for feed in feeds %} - -

- {{ feed.name }} - - {% endfor %} +{% extends "aggregator/base.html" %} + +{% block menu %} +

+ {% for feed in feeds %} + +

+ {{ feed.name }} + + {% endfor %} +

+{% endblock %} + +{% block content %} +{% regroup list.object_list by updated.date as grouped_list %} +{% for group in grouped_list %} +

+ + {% for post in group.list %} + {% include "aggregator/post_content.html" %} + {% endfor %} +{% endfor %} + +

+ ryuslash +

+ + + {% if post.feed.uses_title %} + {{ post.title }} + {% else %} + {{ post.updated }} + {% endif %} + +

ryuslash

{{ group.grouper }}

{{ group.grouper }}

- - - {% if post.feed.uses_title %} - {{ post.title }} - {% else %} - {{ post.updated }} - {% endif %} - -