Komenda do poprawiania przyciskow.

[redakcja.git] / apps / toolbar / models.py

diff --git a/apps/toolbar/models.py b/apps/toolbar/models.py
index ad4752a..614cfcb 100644 (file)
--- a/apps/toolbar/models.py
+++ b/apps/toolbar/models.py
@@ -8,25 +8,42 @@ class ButtonGroup(models.Model):
     position = models.IntegerField(default=0)
     
     class Meta:
     position = models.IntegerField(default=0)
     
     class Meta:

-        ordering = ['name']
+        ordering = ('position', 'name',)

         verbose_name, verbose_name_plural = _('button group'), _('button groups')
     
     def __unicode__(self):
         return self.name
 
         verbose_name, verbose_name_plural = _('button group'), _('button groups')
     
     def __unicode__(self):
         return self.name
 

-

 class Button(models.Model):
     label = models.CharField(max_length=32)
 class Button(models.Model):
     label = models.CharField(max_length=32)

-    slug = models.SlugField()
-    tag = models.CharField(max_length=128)
-    key = models.IntegerField(blank=True, null=True)
-    position = models.IntegerField(default=0)
-    
+    slug = models.SlugField() #unused
+
+    # behaviour
+    params = models.TextField() # TODO: should be a JSON field
+    scriptlet = models.ForeignKey('Scriptlet')
+
+    # ui related stuff
+    key = models.CharField(blank=True, max_length=1)
+    tooltip = models.CharField(blank=True, max_length=120)
+
+    # Why the button is restricted to have the same position in each group ?
+    # position = models.IntegerField(default=0)
+   

     group = models.ManyToManyField(ButtonGroup)
     
     class Meta:
     group = models.ManyToManyField(ButtonGroup)
     
     class Meta:

-        ordering = ['label']
+        ordering = ('label',)

         verbose_name, verbose_name_plural = _('button'), _('buttons')
     
     def __unicode__(self):
         return self.label
         verbose_name, verbose_name_plural = _('button'), _('buttons')
     
     def __unicode__(self):
         return self.label

+
+class Scriptlet(models.Model):
+    name = models.CharField(max_length=64, primary_key=True)
+    code = models.TextField()
+
+    # TODO: add this later and remap code property to this
+    # code_min = models.TextField()
+
+    def __unicode__(self):
+        return _(u'javascript')+u':'+self.name