From b709699df0a0a1895cce8514ae23d9603df14d61 Mon Sep 17 00:00:00 2001 From: PadmaTextUser Date: Mon, 21 Feb 2011 10:14:16 +0000 Subject: [PATCH] changes on server --- padmaTexts/static/css/text.css | 11 ++++++++++- padmaTexts/templates/text_embed.html | 2 +- padmaTexts/templates/text_list.html | 17 +++++++++++++---- padmaTexts/texts/admin.py | 1 + 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/padmaTexts/static/css/text.css b/padmaTexts/static/css/text.css index 2ac962c..b930998 100644 --- a/padmaTexts/static/css/text.css +++ b/padmaTexts/static/css/text.css @@ -51,6 +51,7 @@ h1 { padding-top: 0; margin-bottom: 0; padding-bottom: 0; + margin-left: 8px; } h4 { margin-top: 0; @@ -59,8 +60,12 @@ h4 { margin-bottom: 0; } h3 { - margin-bottom: 0; + margin-bottom: 4px; padding-bottom: 0; + font-family: "DejaVu Sans", Arial, Verdana, sans-serif; +} +p { + margin-top: 0; } #essay, #essayAbstract, #authorBio { @@ -70,6 +75,10 @@ h3 { #authorBio p { margin: 0; } +#authorBio { + margin-top: 48px; + margin-bottom: 96px; +} #loading { position: fixed; right: 0px; diff --git a/padmaTexts/templates/text_embed.html b/padmaTexts/templates/text_embed.html index e803643..01bcaa3 100644 --- a/padmaTexts/templates/text_embed.html +++ b/padmaTexts/templates/text_embed.html @@ -127,7 +127,7 @@ $(function() { {{ text.title }}

- by {{ text.author }} + by {{ text.author }}, {{text.date|date:"F Y"}}

diff --git a/padmaTexts/templates/text_list.html b/padmaTexts/templates/text_list.html index 3d0b450..3a618c6 100644 --- a/padmaTexts/templates/text_list.html +++ b/padmaTexts/templates/text_list.html @@ -1,7 +1,7 @@ - Padma essays + Padma Essays -

Padma essays

+

Padma Essays

{% for t in texts %}
- {{ t.title }}
- by {{ t.author }} + {{ t.title }}
+ by {{ t.author }}, {{t.date|date:"F Y"}} {{ t.abstract|safe }}
{% endfor %} diff --git a/padmaTexts/texts/admin.py b/padmaTexts/texts/admin.py index 63efa22..8b2c962 100644 --- a/padmaTexts/texts/admin.py +++ b/padmaTexts/texts/admin.py @@ -7,6 +7,7 @@ from django.db import models class PadmaTextAdmin(admin.ModelAdmin): formfield_overrides = {models.TextField: {'widget':forms.Textarea(attrs={'class':'ckeditor'})}, } prepopulated_fields = {'slug': ('title',)} + list_display = ['title', 'author', 'date'] class Media: js = ('ckeditor/ckeditor.js',) # The , at the end of this list IS important.