from os.path import dirname, join, normpath

import django
from django.conf.urls.defaults import *
from django.conf import settings
from django.contrib.admin import autodiscover

import ella
from ella import newman
from ella.utils import installedapps


newman.autodiscover()
installedapps.init_logger()


ADMIN_ROOTS = (
    normpath(join(dirname(ella.__file__), 'newman', 'media')),
    normpath(join(dirname(django.__file__), 'contrib', 'admin', 'media')),
)

urlpatterns = patterns('',

    # serve admin media static files
    (r'^static/newman_media/(?P<path>.*)$', 'ella.utils.views.fallback_serve', {'document_roots': ADMIN_ROOTS}),
    (r'^static/admin_media/(?P<path>.*)$', 'ella.utils.views.fallback_serve', {'document_roots': ADMIN_ROOTS}),

    # serve static files
    (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT, 'show_indexes': True }),

    # main admin urls
    ('^newman/', include(newman.site.urls)),

    # reverse url lookups
    (r'^', include('ella.core.urls')),

)

handler404 = 'ella.core.views.page_not_found'
handler500 = 'ella.core.views.handle_error'




from os.path import dirname, join, normpath

import django
from django.conf.urls.defaults import *
from django.conf import settings
from django.contrib import admin

import ella
from ella import newman
from ella.utils import installedapps


newman.autodiscover()
admin.autodiscover()
installedapps.init_logger()


ADMIN_ROOTS = (
    normpath(join(dirname(ella.__file__), 'newman', 'media')),
    normpath(join(dirname(django.__file__), 'contrib', 'admin', 'media')),
)

urlpatterns = patterns('',

    # serve admin media static files
    (r'^static/newman_media/(?P<path>.*)$', 'ella.utils.views.fallback_serve', {'document_roots': ADMIN_ROOTS}),
    (r'^static/admin_media/(?P<path>.*)$', 'ella.utils.views.fallback_serve', {'document_roots': ADMIN_ROOTS}),

    # serve static files
    (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT, 'show_indexes': True }),

    # main admin urls
    ('^newman/', include(newman.site.urls)),
    ('^admin/', include(admin.site.urls)),

    # reverse url lookups
    (r'^', include('ella.core.urls')),

)

handler404 = 'ella.core.views.page_not_found'
handler500 = 'ella.core.views.handle_error'




Test running both newman/ and admin/ - some templates still mixed.
Test running both newman/ and admin/ - some templates still mixed.

  from os.path import dirname, join, normpath
  
  import django
  from django.conf.urls.defaults import *
  from django.conf import settings
- from django.contrib.admin import autodiscover
+ from django.contrib import admin
  
  import ella
  from ella import newman
  from ella.utils import installedapps
  
  
  newman.autodiscover()
+ admin.autodiscover()
  installedapps.init_logger()
  
  
  ADMIN_ROOTS = (
      normpath(join(dirname(ella.__file__), 'newman', 'media')),
      normpath(join(dirname(django.__file__), 'contrib', 'admin', 'media')),
  )
  
  urlpatterns = patterns('',
  
      # serve admin media static files
      (r'^static/newman_media/(?P<path>.*)$', 'ella.utils.views.fallback_serve', {'document_roots': ADMIN_ROOTS}),
      (r'^static/admin_media/(?P<path>.*)$', 'ella.utils.views.fallback_serve', {'document_roots': ADMIN_ROOTS}),
  
      # serve static files
      (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT, 'show_indexes': True }),
  
      # main admin urls
      ('^newman/', include(newman.site.urls)),
+     ('^admin/', include(admin.site.urls)),
  
      # reverse url lookups
      (r'^', include('ella.core.urls')),
  
  )
  
  handler404 = 'ella.core.views.page_not_found'
  handler500 = 'ella.core.views.handle_error'
  
  
  
  
Test running both newman/ and admin/ - some templates still mixed.
## Code Before:
from os.path import dirname, join, normpath

import django
from django.conf.urls.defaults import *
from django.conf import settings
from django.contrib.admin import autodiscover

import ella
from ella import newman
from ella.utils import installedapps


newman.autodiscover()
installedapps.init_logger()


ADMIN_ROOTS = (
    normpath(join(dirname(ella.__file__), 'newman', 'media')),
    normpath(join(dirname(django.__file__), 'contrib', 'admin', 'media')),
)

urlpatterns = patterns('',

    # serve admin media static files
    (r'^static/newman_media/(?P<path>.*)$', 'ella.utils.views.fallback_serve', {'document_roots': ADMIN_ROOTS}),
    (r'^static/admin_media/(?P<path>.*)$', 'ella.utils.views.fallback_serve', {'document_roots': ADMIN_ROOTS}),

    # serve static files
    (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT, 'show_indexes': True }),

    # main admin urls
    ('^newman/', include(newman.site.urls)),

    # reverse url lookups
    (r'^', include('ella.core.urls')),

)

handler404 = 'ella.core.views.page_not_found'
handler500 = 'ella.core.views.handle_error'




## Instruction:
Test running both newman/ and admin/ - some templates still mixed.
## Code After:
from os.path import dirname, join, normpath

import django
from django.conf.urls.defaults import *
from django.conf import settings
from django.contrib import admin

import ella
from ella import newman
from ella.utils import installedapps


newman.autodiscover()
admin.autodiscover()
installedapps.init_logger()


ADMIN_ROOTS = (
    normpath(join(dirname(ella.__file__), 'newman', 'media')),
    normpath(join(dirname(django.__file__), 'contrib', 'admin', 'media')),
)

urlpatterns = patterns('',

    # serve admin media static files
    (r'^static/newman_media/(?P<path>.*)$', 'ella.utils.views.fallback_serve', {'document_roots': ADMIN_ROOTS}),
    (r'^static/admin_media/(?P<path>.*)$', 'ella.utils.views.fallback_serve', {'document_roots': ADMIN_ROOTS}),

    # serve static files
    (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT, 'show_indexes': True }),

    # main admin urls
    ('^newman/', include(newman.site.urls)),
    ('^admin/', include(admin.site.urls)),

    # reverse url lookups
    (r'^', include('ella.core.urls')),

)

handler404 = 'ella.core.views.page_not_found'
handler500 = 'ella.core.views.handle_error'



