diff options
| author | Markus Zapke-Grùˆndemann <info@keimlink.de> | 2011-12-30 04:00:30 +0100 |
|---|---|---|
| committer | Markus Zapke-Grùˆndemann <info@keimlink.de> | 2011-12-30 04:00:30 +0100 |
| commit | 4fbeb44718ca0f378baeae6fdda29388ff70b29d (patch) | |
| tree | 0b9008f684664753e7e7667b811e2246ff3e7312 /sublab_project/news/templates | |
| parent | 1347410c5125775f8b84bff0d12086158c39bea0 (diff) | |
| parent | 4d8b78ba8747804d0e090eae0674b22ba8f53198 (diff) | |
Merge branch 'master' of sublab.org:subweb
Conflicts:
sublab_project/news/templates/news/news_list.html
Diffstat (limited to 'sublab_project/news/templates')
| -rw-r--r-- | sublab_project/news/templates/news/news_detail.html | 6 | ||||
| -rw-r--r-- | sublab_project/news/templates/news/news_list.html | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sublab_project/news/templates/news/news_detail.html b/sublab_project/news/templates/news/news_detail.html index 49d2b7a..27c7449 100644 --- a/sublab_project/news/templates/news/news_detail.html +++ b/sublab_project/news/templates/news/news_detail.html @@ -5,9 +5,7 @@ {% block content %} <p class="news_date">{{ object.date_updated|date:"DATETIME_FORMAT" }}</p> <h2 id="{{ object.slug }}">{{ object.title }}</h3> - <p> - {% if object.image %}<img src="{{ MEDIA_URL }}{{ object.image }}" width="{{ object.image_width }}" height="{{ object.image_height }}" align="right" />{% endif %} - {{ object.content_html|safe }} - </p> + {% if object.image %}<img src="{{ MEDIA_URL }}{{ object.image }}" width="{{ object.image_width }}" height="{{ object.image_height }}" align="right" />{% endif %} + {{ object.content_html|safe }} <p class="header">{{ object.author }}</p> {% endblock content %} diff --git a/sublab_project/news/templates/news/news_list.html b/sublab_project/news/templates/news/news_list.html index 52ded72..080feaf 100644 --- a/sublab_project/news/templates/news/news_list.html +++ b/sublab_project/news/templates/news/news_list.html @@ -6,10 +6,8 @@ <h3 id="{{ post.slug }}"> <a href="{{ post.get_absolute_url }}">{{ post.date_updated|date }} - {{ post.title }}</a> </h3> - <p> - {% if post.image %}<img src="{{ MEDIA_URL }}{{ post.image }}" width="{{ post.image_width }}" height="{{ post.image_height }}" align="right" />{% endif %} - {{ post.content_html|safe }} - </p> + {% if post.image %}<img src="{{ MEDIA_URL }}{{ post.image }}" width="{{ post.image_width }}" height="{{ post.image_height }}" align="right" />{% endif %} + {{ post.content_html|safe }} {% endfor %} {% if is_paginated %} <p> |