X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/43116c58e5c56f94ef358a5a17fb13a252e02531..143ac9b891b8223386830835709377166564af8f:/apps/catalogue/urls.py?ds=sidebyside

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index feebb3ec..7989d2ad 100644
--- a/apps/catalogue/urls.py
+++ b/apps/catalogue/urls.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 from django.contrib.auth.decorators import permission_required
 from django.views.generic import RedirectView
 from catalogue.feeds import PublishTrackFeed
@@ -9,6 +9,11 @@ from catalogue.views import GalleryView
 urlpatterns = patterns('catalogue.views',
     url(r'^$', RedirectView.as_view(url='catalogue/')),
 
+    url(r'^images/$', 'image_list', name='catalogue_image_list'),
+    url(r'^image/(?P<slug>[^/]+)/$', 'image', name="catalogue_image"),
+    url(r'^image/(?P<slug>[^/]+)/publish$', 'publish_image',
+            name="catalogue_publish_image"),
+
     url(r'^catalogue/$', 'document_list', name='catalogue_document_list'),
     url(r'^user/$', 'my', name='catalogue_user'),
     url(r'^user/(?P<username>[^/]+)/$', 'user', name='catalogue_user'),
@@ -26,7 +31,6 @@ urlpatterns = patterns('catalogue.views',
         'create_missing', name='catalogue_create_missing'),
 
     url(r'^book/(?P<slug>[^/]+)/publish$', 'publish', name="catalogue_publish"),
-    #url(r'^(?P<name>[^/]+)/publish/(?P<version>\d+)$', 'publish', name="catalogue_publish"),
 
     url(r'^book/(?P<slug>[^/]+)/$', 'book', name="catalogue_book"),
     url(r'^book/(?P<slug>[^/]+)/gallery/$',
@@ -36,6 +40,7 @@ urlpatterns = patterns('catalogue.views',
     url(r'^book/(?P<slug>[^/]+)/txt$', 'book_txt', name="catalogue_book_txt"),
     url(r'^book/(?P<slug>[^/]+)/html$', 'book_html', name="catalogue_book_html"),
     url(r'^book/(?P<slug>[^/]+)/epub$', 'book_epub', name="catalogue_book_epub"),
+    url(r'^book/(?P<slug>[^/]+)/mobi$', 'book_mobi', name="catalogue_book_mobi"),
     url(r'^book/(?P<slug>[^/]+)/pdf$', 'book_pdf', name="catalogue_book_pdf"),
 
     url(r'^chunk_add/(?P<slug>[^/]+)/(?P<chunk>[^/]+)/$',
@@ -46,6 +51,9 @@ urlpatterns = patterns('catalogue.views',
         'book_append', name="catalogue_book_append"),
     url(r'^chunk_mass_edit',
         'chunk_mass_edit', name='catalogue_chunk_mass_edit'),
+    url(r'^image_mass_edit',
+        'image_mass_edit', name='catalogue_image_mass_edit'),
 
     url(r'^track/(?P<slug>[^/]*)/$', PublishTrackFeed()),
+    url(r'^active/$', 'active_users_list', name='active_users_list'),
 )