Merge branch 'master' into rwd

[wolnelektury.git] / apps / funding / urls.py

diff --git a/apps/funding/urls.py b/apps/funding/urls.py
old mode 100755 (executable)
new mode 100644 (file)
index 7aed8dc..3e55ba4
--- a/apps/funding/urls.py
+++ b/apps/funding/urls.py
@@ -2,16 +2,26 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls import patterns, url
+from django.conf.urls import patterns, url, include

 
 from .models import Offer
 
 from .models import Offer

-from .views import WLFundView, OfferDetailView, ThanksView, OfferListView
+from .views import (WLFundView, OfferDetailView, OfferListView,
+                ThanksView, NoThanksView, CurrentView, DisableNotifications)

 
 
 urlpatterns = patterns('',
 
 
 urlpatterns = patterns('',

-    url(r'^$', OfferDetailView.as_view(), name='funding_current'),
+
+    url(r'^$', CurrentView.as_view(), name='funding_current'),
+    url(r'^teraz/$', CurrentView.as_view()),
+    url(r'^teraz/(?P<slug>[^/]+)/$', CurrentView.as_view(), name='funding_current'),

     url(r'^lektura/$', OfferListView.as_view(), name='funding'),
     url(r'^lektura/(?P<slug>[^/]+)/$', OfferDetailView.as_view(), name='funding_offer'),
     url(r'^lektura/$', OfferListView.as_view(), name='funding'),
     url(r'^lektura/(?P<slug>[^/]+)/$', OfferDetailView.as_view(), name='funding_offer'),

+    url(r'^pozostale/$', WLFundView.as_view(), name='funding_wlfund'),
+    

     url(r'^dziekujemy/$', ThanksView.as_view(), name='funding_thanks'),
     url(r'^dziekujemy/$', ThanksView.as_view(), name='funding_thanks'),

-    url(r'^fundusz/$', WLFundView.as_view(), name='funding_wlfund'),
+    url(r'^niepowodzenie/$', NoThanksView.as_view(), name='funding_nothanks'),
+
+    url(r'^wylacz_email/$', DisableNotifications.as_view(), name='funding_disable_notifications'),
+    
+    url(r'^getpaid/', include('getpaid.urls')),

 )
 )