CAMP/edgware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed stories to studies

Browse Source
This commit is contained in:
sanj 2010-06-29 18:12:01 +05:30
parent 99e7412240
commit 713ee646e3
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
edgware/editor/models.py
View File

@ -389,6 +389,7 @@ class TextBox(models.Model):
background_color = models.CharField(max_length=16) background_color = models.CharField(max_length=16)
border_style = models.CharField(max_length=16) border_style = models.CharField(max_length=16)
border_width = models.IntegerField() border_width = models.IntegerField()
direction = models.CharField(max_length=8)
# line_height = models.IntegerField(blank=True, null=True) # line_height = models.IntegerField(blank=True, null=True)
# letter_spacing = models.IntegerField(blank=True, null=True) # letter_spacing = models.IntegerField(blank=True, null=True)
# word_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), 'left': addPx(self.left),
'z-index': self.z_index, 'z-index': self.z_index,
'opacity': self.opacity, 'opacity': self.opacity,
'direction': self.direction,
'border-style': self.border_style, 'border-style': self.border_style,
'border-width': addPx(self.border_width), 'border-width': addPx(self.border_width),
'border-color': self.border_color, 'border-color': self.border_color,

6
edgware/files/models.py
View File

@ -32,7 +32,7 @@ class File(models.Model):
userID = models.ForeignKey(User) userID = models.ForeignKey(User)
file_date = models.DateField("Date", blank=True, null=True) file_date = models.DateField("Date", blank=True, null=True)
added = models.DateField("Date Added", auto_now_add=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') type = models.ForeignKey('Type', verbose_name='File Type')
def __unicode__(self): def __unicode__(self):
@ -54,8 +54,8 @@ class Category(models.Model):
return self.name return self.name
class Meta: class Meta:
verbose_name = 'Story' verbose_name = 'Study'
verbose_name_plural = 'Stories' verbose_name_plural = 'Studies'
class Type(models.Model): class Type(models.Model):
name = models.CharField(max_length=255) name = models.CharField(max_length=255)

7
edgware/static/css/editor.css
View File

@ -198,6 +198,10 @@ p {
} }
.searchBin {
margin-top:5px;
}
#addElements a { #addElements a {
color:white; color:white;
text-decoration:none; text-decoration:none;
@ -311,6 +315,3 @@ margin-top:0px;
font-size:13px; font-size:13px;
} }
.searchBin {
margin-top:5px;
}