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 6b60035..3e55ba4
--- a/apps/funding/urls.py
+++ b/apps/funding/urls.py
@@ -6,17 +6,22 @@ from django.conf.urls import patterns, url, include
 
 from .models import Offer
 from .views import (WLFundView, OfferDetailView, OfferListView,
 
 from .models import Offer
 from .views import (WLFundView, OfferDetailView, OfferListView,

-                ThanksView, NoThanksView)
+                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'^fundusz/$', WLFundView.as_view(), name='funding_wlfund'),
+    url(r'^pozostale/$', WLFundView.as_view(), name='funding_wlfund'),

     
     url(r'^dziekujemy/$', ThanksView.as_view(), name='funding_thanks'),
     url(r'^niepowodzenie/$', NoThanksView.as_view(), name='funding_nothanks'),
     
     url(r'^dziekujemy/$', ThanksView.as_view(), name='funding_thanks'),
     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')),
 )
     
     url(r'^getpaid/', include('getpaid.urls')),
 )