Commit e303b517 authored by chris's avatar chris

Move content and general to flyers namespace

parent 7431a01f
......@@ -8,4 +8,4 @@ export DH_VERBOSE=1
dh $@ --with python2,sphinxdoc --buildsystem=pybuild
override_dh_auto_test:
./manage.py test flyers content general
./manage.py test flyers flyers.content flyers.general
from django.db import models
from content.models import Page
from flyers.content.models import Page
class Settings(models.Model):
site_name = models.CharField(max_length=90, blank=True, null=True)
......@@ -8,5 +8,5 @@ class Settings(models.Model):
logo = models.ImageField(upload_to="images", blank=True, null=True)
home_page = models.ForeignKey(Page, blank=True, null=True)
class Meta:
class Meta:
verbose_name_plural = "Settings"
......@@ -39,8 +39,8 @@ INSTALLED_APPS = (
'django.contrib.staticfiles',
'sorl.thumbnail',
'ckeditor',
'content',
'general'
'flyers.content',
'flyers.general'
)
MIDDLEWARE_CLASSES = (
......@@ -92,8 +92,8 @@ CKEDITOR_UPLOAD_PATH = os.path.join(BASE_DIR, 'media', 'uploads')
from django.conf import global_settings
TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
'content.context_processors.menu',
'general.context_processors.settings',
'flyers.content.context_processors.menu',
'flyers.general.context_processors.settings',
)
......
......@@ -2,8 +2,8 @@ from django.conf.urls import patterns, include, url
from django.views.generic import TemplateView
from django.views.generic import DetailView
from django.shortcuts import get_object_or_404
from content.models import Page
from general.models import Settings
from flyers.content.models import Page
from flyers.general.models import Settings
from django.contrib import admin
admin.autodiscover()
......
......@@ -54,14 +54,8 @@ setup(
url='http://flyers.domainepublic.net/',
packages=find_packages([
'flyers',
'general',
'content',
]),
package_data=dict(
find_package_data('flyers').items() +
find_package_data('general').items() +
find_package_data('content').items()
),
package_data=find_package_data('flyers'),
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: Web Environment',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment