diff options
| -rw-r--r-- | agenda/admin.py | 18 | ||||
| -rwxr-xr-x | agenda/models.py | 21 | ||||
| -rwxr-xr-x | agenda/urls.py | 2 |
3 files changed, 22 insertions, 19 deletions
diff --git a/agenda/admin.py b/agenda/admin.py index df5cd5a..8763ab5 100644 --- a/agenda/admin.py +++ b/agenda/admin.py @@ -51,24 +51,6 @@ class NetworkAdmin(admin.ModelAdmin): list_display = ('event', 'group') admin.site.register(Network,NetworkAdmin) -class Billboard(models.Model): - title = models.CharField(max_length=100) - groups = models.ManyToManyField(Group, null=True,blank=True,related_name='cartel') - refresh = models.IntegerField(help_text=_('In seconds'),max_length=3) - published = models.BooleanField(null=True,blank=True) - location = models.ManyToManyField(Location, null=True,blank=True, related_name='cartel') - timespan = models.CharField(max_length=1, choices=TIMESPAN_CHOICES) - color1 = models.CharField(max_length=6) - color2 = models.CharField(max_length=6) - color3 = models.CharField(max_length=6) - color4 = models.CharField(max_length=6) - csstitle = models.TextField(max_length=500, help_text="decide the style of the title here",blank=True,default="padding: 30px;font-family: verdana, arial, sans-serif;text-transform: capitalize;BORder: 10px dotted;") - cssdate = models.TextField(max_length=500, help_text="decide the style of the date here",blank=True,default="padding: 30px;") - csslocation = models.TextField(max_length=500, help_text="decide the style of the location here",blank=True,default="padding: 30px;text-transform: capitalize;") - cssdescription = models.TextField(max_length=500, help_text="decide the style of the description here",blank=True) - - def __unicode__(self): - return self.title class BillboardInline(admin.TabularInline): model = Billboard diff --git a/agenda/models.py b/agenda/models.py index 06ad072..b92941c 100755 --- a/agenda/models.py +++ b/agenda/models.py @@ -231,4 +231,25 @@ class Attendance(models.Model): return self.person +class Billboard(models.Model): + title = models.CharField(max_length=100) + groups = models.ManyToManyField(Group, null=True,blank=True,related_name='cartel') + refresh = models.IntegerField(help_text=_('In seconds'),max_length=3) + published = models.BooleanField(null=True,blank=True) + location = models.ManyToManyField(Location, null=True,blank=True, related_name='cartel') + timespan = models.CharField(max_length=1, choices=TIMESPAN_CHOICES) + color1 = models.CharField(max_length=6) + color2 = models.CharField(max_length=6) + color3 = models.CharField(max_length=6) + color4 = models.CharField(max_length=6) + csstitle = models.TextField(max_length=500, help_text="decide the style of the title here",blank=True,default="padding: 30px;font-family: verdana, arial, sans-serif;text-transform: capitalize;BORder: 10px dotted;") + cssdate = models.TextField(max_length=500, help_text="decide the style of the date here",blank=True,default="padding: 30px;") + csslocation = models.TextField(max_length=500, help_text="decide the style of the location here",blank=True,default="padding: 30px;text-transform: capitalize;") + cssdescription = models.TextField(max_length=500, help_text="decide the style of the description here",blank=True) + + def __unicode__(self): + return self.title + + + diff --git a/agenda/urls.py b/agenda/urls.py index 47aee05..71a2250 100755 --- a/agenda/urls.py +++ b/agenda/urls.py @@ -66,7 +66,7 @@ urlpatterns += patterns('infopoint.agenda.icalviews', ) urlpatterns += patterns('infopoint.agenda.billboardviews', (r'^agenda/map/(?P<object_id>\d+)/$', 'event_galaxy'), - (r'^agenda/map2/(?P<object_id>\d+)/$', 'event_galaxy_for_map'), + (r'^agenda/map3/(?P<object_id>\d+)/$', 'event_galaxy_for_map'), (r'^agenda/(?P<object_id>\d+)/(?P<billboard_id>\d+)$', 'one_still_event'), (r'^agenda/random/(?P<billboard_id>\d+)$', 'billboard'), |
