Commits

Viliam Segeda committed a71ab63

cms styles + rosetta urls integration

  • Participants
  • Parent commits 474b9ba

Comments (0)

Files changed (2)

File liftinguptheworld/settings.py

     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'cms_admin_style',
     'django.contrib.admin',
     'easy_thumbnails',
     'sekizai',

File liftinguptheworld/urls.py

     (r'^admin/', include(admin.site.urls)),
 )
 if 'rosetta' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('',
-        url(r'^rosetta/', include('rosetta.urls')),
+    urlpatterns = patterns('',
+        url(r'^admin/translation/',include('rosetta.urls')),
+        #url(r'^rosetta/', include('rosetta.urls')),
+        url(r'^admin/', include(admin.site.urls)),
     )
 
 urlpatterns += patterns('',