summaryrefslogtreecommitdiffstats
path: root/agenda/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'agenda/urls.py')
-rwxr-xr-xagenda/urls.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/agenda/urls.py b/agenda/urls.py
index 72f093a..47aee05 100755
--- a/agenda/urls.py
+++ b/agenda/urls.py
@@ -17,7 +17,7 @@ from django.shortcuts import render_to_response
from django.core.exceptions import *
from django.http import Http404
from django.core import urlresolvers
-from django.contrib.sites.models import Site
+#from django.contrib.sites.models import Site
from django.utils.translation import ugettext as _
from django.utils.safestring import mark_safe
import inspect, os, re
@@ -27,7 +27,9 @@ from django.contrib.comments.urls import *
from django import forms
from django.contrib.formtools.preview import FormPreview
from infopoint.agenda.forms import *
+from infopoint.agenda.icalviews import SomeEventCalendar
+events_list = Event.events.next_events()
urlpatterns = patterns('infopoint.agenda.views',
(r'^agenda/(?P<object_id>\d+)/$', 'event'),
@@ -38,6 +40,7 @@ urlpatterns = patterns('infopoint.agenda.views',
(r'^agenda/$', 'calendar'),
(r'^orphan/$', 'orphan_events'),
(r'^agenda/wishlist/$', 'wishlist'),
+ (r'^agenda/wishlist/(?P<wish_id>\d+)/done$', 'closewishitem'),
(r'^agenda/add/$', 'add_new_event'),
(r'^cal/(?P<year>\d+)/(?P<month>\d+)/$', 'calendarshape'),
(r'^agenda/add/submit/$', 'submit_new_event'),
@@ -56,6 +59,11 @@ urlpatterns = patterns('infopoint.agenda.views',
)
+
+urlpatterns += patterns('infopoint.agenda.icalviews',
+ (r'^user/(?P<user_id>\d+)/fb$', 'user_freebusy'),
+ (r'^ical/$', SomeEventCalendar() ),
+)
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'),