Templaty używają teraz ścieżek z konfiguracji dal plików statycznych.

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

diff --git a/apps/toolbar/models.py b/apps/toolbar/models.py
index ad4752a..f91f739 100644 (file)
--- a/apps/toolbar/models.py
+++ b/apps/toolbar/models.py
@@ -8,7 +8,7 @@ class ButtonGroup(models.Model):
     position = models.IntegerField(default=0)
     
     class Meta:
-        ordering = ['name']
+        ordering = ('position', 'name',)
         verbose_name, verbose_name_plural = _('button group'), _('button groups')
     
     def __unicode__(self):
@@ -17,16 +17,19 @@ class ButtonGroup(models.Model):
 
 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
+  
+    action = models.CharField(max_length=256)
     
+    key = models.CharField(blank=True, max_length=1)
+    position = models.IntegerField(default=0)    
+   
     group = models.ManyToManyField(ButtonGroup)
     
     class Meta:
-        ordering = ['label']
+        ordering = ('position', 'label',)
         verbose_name, verbose_name_plural = _('button'), _('buttons')
     
     def __unicode__(self):
         return self.label
+