From 713ee646e32c6d45d4e267593f8029f9584df552 Mon Sep 17 00:00:00 2001 From: sanj Date: Tue, 29 Jun 2010 18:12:01 +0530 Subject: [PATCH] changed stories to studies --- edgware/editor/models.py | 2 ++ edgware/files/models.py | 6 +++--- edgware/static/css/editor.css | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/edgware/editor/models.py b/edgware/editor/models.py index 157fa85..dcf001d 100644 --- a/edgware/editor/models.py +++ b/edgware/editor/models.py @@ -389,6 +389,7 @@ class TextBox(models.Model): background_color = models.CharField(max_length=16) border_style = models.CharField(max_length=16) border_width = models.IntegerField() + direction = models.CharField(max_length=8) # line_height = models.IntegerField(blank=True, null=True) # letter_spacing = models.IntegerField(blank=True, null=True) # word_spacing = models.IntegerField(blank=True, null=True) @@ -422,6 +423,7 @@ class TextBox(models.Model): 'left': addPx(self.left), 'z-index': self.z_index, 'opacity': self.opacity, + 'direction': self.direction, 'border-style': self.border_style, 'border-width': addPx(self.border_width), 'border-color': self.border_color, diff --git a/edgware/files/models.py b/edgware/files/models.py index 8cd89cf..aad8b85 100755 --- a/edgware/files/models.py +++ b/edgware/files/models.py @@ -32,7 +32,7 @@ class File(models.Model): userID = models.ForeignKey(User) file_date = models.DateField("Date", blank=True, null=True) added = models.DateField("Date Added", auto_now_add=True) - categories = models.ManyToManyField('Category', verbose_name='Stories') + categories = models.ManyToManyField('Category', verbose_name='Studies') type = models.ForeignKey('Type', verbose_name='File Type') def __unicode__(self): @@ -54,8 +54,8 @@ class Category(models.Model): return self.name class Meta: - verbose_name = 'Story' - verbose_name_plural = 'Stories' + verbose_name = 'Study' + verbose_name_plural = 'Studies' class Type(models.Model): name = models.CharField(max_length=255) diff --git a/edgware/static/css/editor.css b/edgware/static/css/editor.css index 594b347..ff73ac6 100644 --- a/edgware/static/css/editor.css +++ b/edgware/static/css/editor.css @@ -198,6 +198,10 @@ p { } +.searchBin { + margin-top:5px; +} + #addElements a { color:white; text-decoration:none; @@ -311,6 +315,3 @@ margin-top:0px; font-size:13px; } -.searchBin { - margin-top:5px; -}