Youtube and stats modules style improvements

[snf-cloudcms] / cloudcms / urls.py

diff --git a/cloudcms/urls.py b/cloudcms/urls.py
index 60570be..4950f3e 100644 (file)
--- a/cloudcms/urls.py
+++ b/cloudcms/urls.py
@@ -1,17 +1,56 @@
+# Copyright 2012 GRNET S.A. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+#   1. Redistributions of source code must retain the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer.
+#
+#   2. Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and
+# documentation are those of the authors and should not be
+# interpreted as representing official policies, either expressed
+# or implied, of GRNET S.A.
+
+

 from django.conf.urls.defaults import patterns, include, url
 from django.conf import settings
 from django.contrib import admin
 
 from feincms.module.page.sitemap import PageSitemap
 from django.conf.urls.defaults import patterns, include, url
 from django.conf import settings
 from django.contrib import admin
 
 from feincms.module.page.sitemap import PageSitemap

-#from cloudcmsblog.sitemap import BlogSitemap
+from cloudcmsblog.sitemap import BlogSitemap
+from cloudcmsblog.feeds import BlogFeed

 
 admin.autodiscover()
 
 
 admin.autodiscover()
 

-sitemaps = {'pages': PageSitemap }
+sitemaps = {'pages': PageSitemap, 'blog_posts': BlogSitemap }

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

+    url(r'^feed/', BlogFeed(), name="blogfeed"),
+    url(r'^cmsmanage/rstimport/$', 'cloudcms.admin.sphinx_import'),

     url(r'^cmsmanage/', include(admin.site.urls)),
     url(r'', include('feincms.urls')),
     url(r'^sitemap\.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps }),
 )
 
     url(r'^cmsmanage/', include(admin.site.urls)),
     url(r'', include('feincms.urls')),
     url(r'^sitemap\.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps }),
 )
 

+synnefo_urls = (1000, urlpatterns)
+