From bc92084d0643db30904f327658b9eba46504db26 Mon Sep 17 00:00:00 2001 From: etienne Date: Tue, 24 Nov 2009 01:37:42 +0000 Subject: Styles modifications for category detail - #61 git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@42 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864 --- main/admin.py | 10 ++++++++-- main/forms.py | 10 +++++++++- main/models.py | 2 +- static/styles.css | 6 ++++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/main/admin.py b/main/admin.py index 824a10d..195e7c4 100644 --- a/main/admin.py +++ b/main/admin.py @@ -24,7 +24,7 @@ Settings for administration pages from chimere.main.models import Category, Icon, SubCategory, Marker, \ PropertyModel, News, Route, Area, ColorTheme, Color from chimere.main.forms import MarkerAdminForm, RouteAdminForm, AreaAdminForm,\ - NewsAdminForm + NewsAdminForm, CategoryAdminForm from chimere.main.widgets import TextareaWidget from django.contrib import admin @@ -67,6 +67,12 @@ class NewsAdmin(admin.ModelAdmin): """ form = NewsAdminForm +class CategoryAdmin(admin.ModelAdmin): + """ + Use the TinyMCE widget for categories + """ + form = CategoryAdminForm + class ColorInline(admin.TabularInline): model = Color @@ -75,8 +81,8 @@ class ColorThemeAdmin(admin.ModelAdmin): # register of differents database fields admin.site.register(News, NewsAdmin) +admin.site.register(Category, CategoryAdmin) admin.site.register(Icon) -admin.site.register(Category) admin.site.register(SubCategory, SubCategoryAdmin) admin.site.register(Marker, MarkerAdmin) admin.site.register(Route, RouteAdmin) diff --git a/main/forms.py b/main/forms.py index 98c6b9e..ee69328 100644 --- a/main/forms.py +++ b/main/forms.py @@ -29,7 +29,7 @@ from django.core.mail import send_mail from chimere import settings from chimere.main.models import Marker, Route, PropertyModel, Property, Area,\ - News + News, Category from chimere.main.widgets import AreaField, PointField, TextareaWidget def notifyStaff(geo_object): @@ -52,6 +52,14 @@ class NewsAdminForm(forms.ModelForm): class Meta: model = News +class CategoryAdminForm(forms.ModelForm): + """ + Main form for categories + """ + description = forms.CharField(widget=TextareaWidget, required=False) + class Meta: + model = Category + class MarkerAdminForm(forms.ModelForm): """ Main form for marker diff --git a/main/models.py b/main/models.py index f56f854..14f3481 100644 --- a/main/models.py +++ b/main/models.py @@ -69,7 +69,7 @@ class Category(models.Model): name = models.CharField(_("Name"), max_length=150) available = models.BooleanField(_("Available")) order = models.IntegerField(_("Order")) - description = models.CharField(_("Description"), max_length=5000) + description = models.TextField(blank=True, null=True) def __unicode__(self): return self.name class Meta: diff --git a/static/styles.css b/static/styles.css index 5bb4377..e64a7a0 100644 --- a/static/styles.css +++ b/static/styles.css @@ -264,6 +264,12 @@ font-variant:normal; margin-left:20px; } +ul#categories li li a{ +line-height:25px; +margin-left:0; +font-weight:bold; +} + ul#categories ul{ margin:0; padding:0; -- cgit v1.2.3