From 1f59ffa4894598a176b4ba4e6fe71381d65bb72d Mon Sep 17 00:00:00 2001 From: Luke Hatcher Date: Wed, 11 Jul 2012 18:51:09 -0400 Subject: [PATCH] update project layout --- manage.py | 2 +- symposion/__init__.py | 8 -------- symposion/about/__init__.py | 0 symposion/about/models.py | 3 --- symposion/about/urls.py | 11 ----------- symposion/about/views.py | 1 - symposion_project/__init__.py | 8 ++++++++ {symposion => symposion_project}/settings.py | 7 ++----- {symposion => symposion_project}/static/README | 0 .../templates/_footer.html | 0 .../templates/about/what_next.html | 0 .../templates/boxes/box.html | 0 .../templates/cms/page_detail.html | 0 .../templates/cms/page_edit.html | 0 .../templates/homepage.html | 0 .../templates/site_base.html | 0 .../templates/sitetree/breadcrumbs.html | 0 .../templates/sitetree/menu.html | 0 .../templates/sitetree/submenu.html | 0 .../templates/sitetree/tree.html | 0 .../templates/sponsorship/_horizontal_by_level.html | 0 .../templates/sponsorship/_sponsor_link.html | 0 .../templates/sponsorship/_vertical_by_level.html | 0 .../templates/sponsorship/_wall.html | 0 {symposion => symposion_project}/urls.py | 1 - {symposion => symposion_project}/wsgi.py | 0 26 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 symposion/about/__init__.py delete mode 100644 symposion/about/models.py delete mode 100644 symposion/about/urls.py delete mode 100644 symposion/about/views.py create mode 100644 symposion_project/__init__.py rename {symposion => symposion_project}/settings.py (98%) rename {symposion => symposion_project}/static/README (100%) rename {symposion => symposion_project}/templates/_footer.html (100%) rename {symposion => symposion_project}/templates/about/what_next.html (100%) rename {symposion => symposion_project}/templates/boxes/box.html (100%) rename {symposion => symposion_project}/templates/cms/page_detail.html (100%) rename {symposion => symposion_project}/templates/cms/page_edit.html (100%) rename {symposion => symposion_project}/templates/homepage.html (100%) rename {symposion => symposion_project}/templates/site_base.html (100%) rename {symposion => symposion_project}/templates/sitetree/breadcrumbs.html (100%) rename {symposion => symposion_project}/templates/sitetree/menu.html (100%) rename {symposion => symposion_project}/templates/sitetree/submenu.html (100%) rename {symposion => symposion_project}/templates/sitetree/tree.html (100%) rename {symposion => symposion_project}/templates/sponsorship/_horizontal_by_level.html (100%) rename {symposion => symposion_project}/templates/sponsorship/_sponsor_link.html (100%) rename {symposion => symposion_project}/templates/sponsorship/_vertical_by_level.html (100%) rename {symposion => symposion_project}/templates/sponsorship/_wall.html (100%) rename {symposion => symposion_project}/urls.py (94%) rename {symposion => symposion_project}/wsgi.py (100%) diff --git a/manage.py b/manage.py index 2587018b..6cb95086 100755 --- a/manage.py +++ b/manage.py @@ -2,7 +2,7 @@ import os, sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "symposion.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "symposion_project.settings") from django.core.management import execute_from_command_line diff --git a/symposion/__init__.py b/symposion/__init__.py index ccd713a2..e69de29b 100644 --- a/symposion/__init__.py +++ b/symposion/__init__.py @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -__about__ = """ -This project takes the zero_project and adds basic account management -functionality such as sign up, log in, password change/reset and email -confirmation. It is a foundation suitable for most sites that have user -accounts. -""" diff --git a/symposion/about/__init__.py b/symposion/about/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/symposion/about/models.py b/symposion/about/models.py deleted file mode 100644 index 71a83623..00000000 --- a/symposion/about/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/symposion/about/urls.py b/symposion/about/urls.py deleted file mode 100644 index 3b5c17ea..00000000 --- a/symposion/about/urls.py +++ /dev/null @@ -1,11 +0,0 @@ -from django.conf.urls.defaults import * -from django.views.generic.simple import direct_to_template - - -urlpatterns = patterns("", - url(r"^$", direct_to_template, {"template": "about/about.html"}, name="about"), - url(r"^terms/$", direct_to_template, {"template": "about/terms.html"}, name="terms"), - url(r"^privacy/$", direct_to_template, {"template": "about/privacy.html"}, name="privacy"), - url(r"^dmca/$", direct_to_template, {"template": "about/dmca.html"}, name="dmca"), - url(r"^what_next/$", direct_to_template, {"template": "about/what_next.html"}, name="what_next"), -) diff --git a/symposion/about/views.py b/symposion/about/views.py deleted file mode 100644 index 60f00ef0..00000000 --- a/symposion/about/views.py +++ /dev/null @@ -1 +0,0 @@ -# Create your views here. diff --git a/symposion_project/__init__.py b/symposion_project/__init__.py new file mode 100644 index 00000000..ccd713a2 --- /dev/null +++ b/symposion_project/__init__.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- + +__about__ = """ +This project takes the zero_project and adds basic account management +functionality such as sign up, log in, password change/reset and email +confirmation. It is a foundation suitable for most sites that have user +accounts. +""" diff --git a/symposion/settings.py b/symposion_project/settings.py similarity index 98% rename from symposion/settings.py rename to symposion_project/settings.py index f0815a34..60ce8b58 100644 --- a/symposion/settings.py +++ b/symposion_project/settings.py @@ -111,7 +111,7 @@ MIDDLEWARE_CLASSES = [ "debug_toolbar.middleware.DebugToolbarMiddleware", ] -ROOT_URLCONF = "symposion.urls" +ROOT_URLCONF = "symposion_project.urls" TEMPLATE_DIRS = [ os.path.join(PROJECT_ROOT, "templates"), @@ -159,12 +159,9 @@ INSTALLED_APPS = [ "reversion", "easy_thumbnails", "sitetree", - - # Pinax "account", - # project - "symposion.about", + # symposion "symposion.sponsorship", "symposion.conference", "symposion.cms", diff --git a/symposion/static/README b/symposion_project/static/README similarity index 100% rename from symposion/static/README rename to symposion_project/static/README diff --git a/symposion/templates/_footer.html b/symposion_project/templates/_footer.html similarity index 100% rename from symposion/templates/_footer.html rename to symposion_project/templates/_footer.html diff --git a/symposion/templates/about/what_next.html b/symposion_project/templates/about/what_next.html similarity index 100% rename from symposion/templates/about/what_next.html rename to symposion_project/templates/about/what_next.html diff --git a/symposion/templates/boxes/box.html b/symposion_project/templates/boxes/box.html similarity index 100% rename from symposion/templates/boxes/box.html rename to symposion_project/templates/boxes/box.html diff --git a/symposion/templates/cms/page_detail.html b/symposion_project/templates/cms/page_detail.html similarity index 100% rename from symposion/templates/cms/page_detail.html rename to symposion_project/templates/cms/page_detail.html diff --git a/symposion/templates/cms/page_edit.html b/symposion_project/templates/cms/page_edit.html similarity index 100% rename from symposion/templates/cms/page_edit.html rename to symposion_project/templates/cms/page_edit.html diff --git a/symposion/templates/homepage.html b/symposion_project/templates/homepage.html similarity index 100% rename from symposion/templates/homepage.html rename to symposion_project/templates/homepage.html diff --git a/symposion/templates/site_base.html b/symposion_project/templates/site_base.html similarity index 100% rename from symposion/templates/site_base.html rename to symposion_project/templates/site_base.html diff --git a/symposion/templates/sitetree/breadcrumbs.html b/symposion_project/templates/sitetree/breadcrumbs.html similarity index 100% rename from symposion/templates/sitetree/breadcrumbs.html rename to symposion_project/templates/sitetree/breadcrumbs.html diff --git a/symposion/templates/sitetree/menu.html b/symposion_project/templates/sitetree/menu.html similarity index 100% rename from symposion/templates/sitetree/menu.html rename to symposion_project/templates/sitetree/menu.html diff --git a/symposion/templates/sitetree/submenu.html b/symposion_project/templates/sitetree/submenu.html similarity index 100% rename from symposion/templates/sitetree/submenu.html rename to symposion_project/templates/sitetree/submenu.html diff --git a/symposion/templates/sitetree/tree.html b/symposion_project/templates/sitetree/tree.html similarity index 100% rename from symposion/templates/sitetree/tree.html rename to symposion_project/templates/sitetree/tree.html diff --git a/symposion/templates/sponsorship/_horizontal_by_level.html b/symposion_project/templates/sponsorship/_horizontal_by_level.html similarity index 100% rename from symposion/templates/sponsorship/_horizontal_by_level.html rename to symposion_project/templates/sponsorship/_horizontal_by_level.html diff --git a/symposion/templates/sponsorship/_sponsor_link.html b/symposion_project/templates/sponsorship/_sponsor_link.html similarity index 100% rename from symposion/templates/sponsorship/_sponsor_link.html rename to symposion_project/templates/sponsorship/_sponsor_link.html diff --git a/symposion/templates/sponsorship/_vertical_by_level.html b/symposion_project/templates/sponsorship/_vertical_by_level.html similarity index 100% rename from symposion/templates/sponsorship/_vertical_by_level.html rename to symposion_project/templates/sponsorship/_vertical_by_level.html diff --git a/symposion/templates/sponsorship/_wall.html b/symposion_project/templates/sponsorship/_wall.html similarity index 100% rename from symposion/templates/sponsorship/_wall.html rename to symposion_project/templates/sponsorship/_wall.html diff --git a/symposion/urls.py b/symposion_project/urls.py similarity index 94% rename from symposion/urls.py rename to symposion_project/urls.py index cd922680..4327ef0c 100644 --- a/symposion/urls.py +++ b/symposion_project/urls.py @@ -16,7 +16,6 @@ urlpatterns = patterns("", "template": "homepage.html", }, name="home"), url(r"^admin/", include(admin.site.urls)), - url(r"^about/", include("symposion.about.urls")), url(r"^account/", include("account.urls")), # url(r"^openid/", include(PinaxConsumer().urls)), diff --git a/symposion/wsgi.py b/symposion_project/wsgi.py similarity index 100% rename from symposion/wsgi.py rename to symposion_project/wsgi.py