update project layout

pinax · Jul 11, 2012 · 1f59ffa · 1f59ffa
1 parent 3bed4f0
commit 1f59ffa
Show file tree

Hide file tree

Showing 26 changed files with 11 additions and 30 deletions.
diff --git 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
@@ -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
diff --git a/symposion/about/models.py b/symposion/about/models.py
diff --git a/symposion/about/urls.py b/symposion/about/urls.py
diff --git a/symposion/about/views.py b/symposion/about/views.py
diff --git a/symposion_project/__init__.py 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 → symposion_project/settings.py b/symposion/settings.py → symposion_project/settings.py
@@ -111,7 +111,7 @@
     "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 @@
     "reversion",
     "easy_thumbnails",
     "sitetree",
-
-    # Pinax
     "account",
 
-    # project
+    # symposion
-    "symposion.about",
     "symposion.sponsorship",
     "symposion.conference",
     "symposion.cms",

diff --git a/symposion/static/README → symposion_project/static/README b/symposion/static/README → symposion_project/static/README
diff --git a/symposion/templates/_footer.html → symposion_project/templates/_footer.html b/symposion/templates/_footer.html → symposion_project/templates/_footer.html
diff --git a/symposion/templates/about/what_next.html → ...on_project/templates/about/what_next.html b/symposion/templates/about/what_next.html → ...on_project/templates/about/what_next.html
diff --git a/symposion/templates/boxes/box.html → symposion_project/templates/boxes/box.html b/symposion/templates/boxes/box.html → symposion_project/templates/boxes/box.html
diff --git a/symposion/templates/cms/page_detail.html → ...on_project/templates/cms/page_detail.html b/symposion/templates/cms/page_detail.html → ...on_project/templates/cms/page_detail.html
diff --git a/symposion/templates/cms/page_edit.html → ...sion_project/templates/cms/page_edit.html b/symposion/templates/cms/page_edit.html → ...sion_project/templates/cms/page_edit.html
diff --git a/symposion/templates/homepage.html → symposion_project/templates/homepage.html b/symposion/templates/homepage.html → symposion_project/templates/homepage.html
diff --git a/symposion/templates/site_base.html → symposion_project/templates/site_base.html b/symposion/templates/site_base.html → symposion_project/templates/site_base.html
diff --git a/...osion/templates/sitetree/breadcrumbs.html → ...oject/templates/sitetree/breadcrumbs.html b/...osion/templates/sitetree/breadcrumbs.html → ...oject/templates/sitetree/breadcrumbs.html
diff --git a/symposion/templates/sitetree/menu.html → ...sion_project/templates/sitetree/menu.html b/symposion/templates/sitetree/menu.html → ...sion_project/templates/sitetree/menu.html
diff --git a/symposion/templates/sitetree/submenu.html → ...n_project/templates/sitetree/submenu.html b/symposion/templates/sitetree/submenu.html → ...n_project/templates/sitetree/submenu.html
diff --git a/symposion/templates/sitetree/tree.html → ...sion_project/templates/sitetree/tree.html b/symposion/templates/sitetree/tree.html → ...sion_project/templates/sitetree/tree.html
diff --git a/...tes/sponsorship/_horizontal_by_level.html → ...tes/sponsorship/_horizontal_by_level.html b/...tes/sponsorship/_horizontal_by_level.html → ...tes/sponsorship/_horizontal_by_level.html
diff --git a/.../templates/sponsorship/_sponsor_link.html → .../templates/sponsorship/_sponsor_link.html b/.../templates/sponsorship/_sponsor_link.html → .../templates/sponsorship/_sponsor_link.html
diff --git a/...lates/sponsorship/_vertical_by_level.html → ...lates/sponsorship/_vertical_by_level.html b/...lates/sponsorship/_vertical_by_level.html → ...lates/sponsorship/_vertical_by_level.html
diff --git a/symposion/templates/sponsorship/_wall.html → ..._project/templates/sponsorship/_wall.html b/symposion/templates/sponsorship/_wall.html → ..._project/templates/sponsorship/_wall.html
diff --git a/symposion/urls.py → symposion_project/urls.py b/symposion/urls.py → symposion_project/urls.py
@@ -16,7 +16,6 @@
         "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 → symposion_project/wsgi.py b/symposion/wsgi.py → symposion_project/wsgi.py