From b06daba446a60ca6aa078d54cc14a8e657af8e8d 2012-07-10 19:35:30 From: Luke Hatcher Date: 2012-07-10 19:35:30 Subject: [PATCH] Merge branch 'master' into cms-features * master: added BSD license Update master use django-forms-bootstrap fixed account links on homepage fixed staticfiles settings removed homepage use of ifsetting_tag updated urls updated templates updated imports to reflect new layout updated imports to reflect new layout updated settings updated manage.py updated requirements to 1.4 / DUA and latest versions updated project layout for 1.4 (without content changes) Conflicts: requirements/base.txt symposion/settings.py symposion_project/urls.py --- diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..3ef50d929e4978c89e07bc19f7758508c9941bdd --- /dev/null +++ b/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2010-2012, Eldarion, Inc. and contributors +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name of Eldarion, Inc. nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README b/README index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e8832bb16ace88ab13002e24f5d3afb35b84cae8 100644 --- a/README +++ b/README @@ -0,0 +1,4 @@ +SYMPOSION +A Django project for conference websites. + +A Pinax project sponsored by Eldarion and the Python Software Foundation. diff --git a/symposion_project/docs/Makefile b/docs/Makefile similarity index 100% rename from symposion_project/docs/Makefile rename to docs/Makefile diff --git a/symposion_project/docs/conf.py b/docs/conf.py similarity index 100% rename from symposion_project/docs/conf.py rename to docs/conf.py diff --git a/symposion_project/docs/conference.rst b/docs/conference.rst similarity index 100% rename from symposion_project/docs/conference.rst rename to docs/conference.rst diff --git a/symposion_project/docs/index.rst b/docs/index.rst similarity index 100% rename from symposion_project/docs/index.rst rename to docs/index.rst diff --git a/symposion_project/docs/sponsorship.rst b/docs/sponsorship.rst similarity index 100% rename from symposion_project/docs/sponsorship.rst rename to docs/sponsorship.rst diff --git a/symposion_project/fixtures/initial_data.json b/fixtures/initial_data.json similarity index 100% rename from symposion_project/fixtures/initial_data.json rename to fixtures/initial_data.json diff --git a/manage.py b/manage.py new file mode 100755 index 0000000000000000000000000000000000000000..2587018bfd99ef40e3dacd5740211c51e33b3153 --- /dev/null +++ b/manage.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +import os, sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "symposion.settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) diff --git a/symposion_project/requirements/base.txt b/requirements/base.txt similarity index 68% rename from symposion_project/requirements/base.txt rename to requirements/base.txt index ca321225c1efbcac4b68584fe638022c684bd799..730e35c226ace009f4d823b7d618a93a65f24c11 100644 --- a/symposion_project/requirements/base.txt +++ b/requirements/base.txt @@ -7,20 +7,21 @@ --extra-index-url=http://dist.pinaxproject.com/alpha/ --extra-index-url=http://dist.pinaxproject.com/fresh-start/ -Django==1.3.1 -Pinax - +Django==1.4 +pinax-theme-bootstrap==2.0.3 +django-forms-bootstrap==2.0.3.post1 +metron==0.1 # 0.2.dev3 +pinax-utils==1.0b1.dev3 django-debug-toolbar==0.9.1 -django-staticfiles==1.1.2 -django_compressor==1.0.1 - django-mailer==0.2a1 -django-email-confirmation==0.2 django-timezones==0.2 pytz==2011n django-openid==0.3a1 python-openid==2.2.5 -metron==0.1 +django_compressor==1.2a1 + +-e git+git://github.com/pinax/pinax-theme-bootstrap-account.git@70c0be0279d61bd2d0f949698f94b8f938918277#egg=pinax-theme-bootstrap-account +-e git+git://github.com/pinax/django-user-accounts.git@3676d2c7ea0e9a5c3f8510ac8e6f8d58175e6b5f#egg=django-user-accounts django-mptt==0.5.2 django-taggit==0.9.3 @@ -28,6 +29,3 @@ django-reversion==1.5.1 django-markitup==1.0.0 markdown==2.1.1 django-sitetree==0.6 - -pinax-theme-bootstrap==2.0.3 -django-forms-bootstrap==2.0.3.post1 diff --git a/symposion_project/requirements/docs.txt b/requirements/docs.txt similarity index 100% rename from symposion_project/requirements/docs.txt rename to requirements/docs.txt diff --git a/symposion_project/requirements/project.txt b/requirements/project.txt similarity index 100% rename from symposion_project/requirements/project.txt rename to requirements/project.txt diff --git a/symposion_project/__init__.py b/symposion/__init__.py similarity index 100% rename from symposion_project/__init__.py rename to symposion/__init__.py diff --git a/symposion_project/apps/__init__.py b/symposion/about/__init__.py similarity index 100% rename from symposion_project/apps/__init__.py rename to symposion/about/__init__.py diff --git a/symposion_project/apps/about/models.py b/symposion/about/models.py similarity index 100% rename from symposion_project/apps/about/models.py rename to symposion/about/models.py diff --git a/symposion_project/apps/about/urls.py b/symposion/about/urls.py similarity index 100% rename from symposion_project/apps/about/urls.py rename to symposion/about/urls.py diff --git a/symposion_project/apps/about/views.py b/symposion/about/views.py similarity index 100% rename from symposion_project/apps/about/views.py rename to symposion/about/views.py diff --git a/symposion_project/apps/about/__init__.py b/symposion/cms/__init__.py similarity index 100% rename from symposion_project/apps/about/__init__.py rename to symposion/cms/__init__.py diff --git a/symposion/cms/admin.py b/symposion/cms/admin.py new file mode 100644 index 0000000000000000000000000000000000000000..ded416ad94637eb9cf0e6c2638f679d717d3bb1b --- /dev/null +++ b/symposion/cms/admin.py @@ -0,0 +1,12 @@ +from django.contrib import admin + +from mptt.admin import MPTTModelAdmin + +from cms.models import Page + + +class PageAdmin(MPTTModelAdmin): + prepopulated_fields = {"slug": ("title",)} + list_display = ("title", "published", "status") + +admin.site.register(Page, PageAdmin) diff --git a/symposion/cms/models.py b/symposion/cms/models.py new file mode 100644 index 0000000000000000000000000000000000000000..5d07b538088382db926a84f58f084fc9dae0557d --- /dev/null +++ b/symposion/cms/models.py @@ -0,0 +1,65 @@ +from datetime import datetime + +from django.db import models +from django.utils.translation import ugettext_lazy as _ + +from markitup.fields import MarkupField + +from taggit.managers import TaggableManager + +from mptt.models import MPTTModel, TreeForeignKey +from mptt.utils import drilldown_tree_for_node + +import reversion + + +class ContentBase(models.Model): + + STATUS_CHOICES = ( + (1, _("Draft")), + (2, _("Public")), + ) + + title = models.CharField(max_length=100) + slug = models.CharField(max_length=100, blank=True, null=True) + body = MarkupField() + + tags = TaggableManager(blank=True) + + status = models.IntegerField(choices=STATUS_CHOICES, default=2) + published = models.DateTimeField(default=datetime.now) + created = models.DateTimeField(editable=False, default=datetime.now) + updated = models.DateTimeField(editable=False, default=datetime.now) + + class Meta: + abstract = True + + +class Page(MPTTModel, ContentBase): + + parent = TreeForeignKey("self", null=True, blank=True, related_name="children") + ordering = models.PositiveIntegerField(default=1) + path = models.TextField(blank=True, editable=False) + + def __unicode__(self): + return self.title + + def save(self, calculate_path=True, *args, **kwargs): + super(Page, self).save(*args, **kwargs) + if calculate_path: + self.calculate_path() + + def calculate_path(self): + self.path = "" + for page in drilldown_tree_for_node(self): + if page == self: + self.path += page.slug + break + else: + self.path += "%s/" % page.slug + self.save(calculate_path=False) + + class MPTTMeta: + order_insertion_by = ["ordering", "title"] + +reversion.register(Page) diff --git a/symposion/cms/views.py b/symposion/cms/views.py new file mode 100644 index 0000000000000000000000000000000000000000..478d2cee57abbcc2b6ab3301b727ce97616aa5b6 --- /dev/null +++ b/symposion/cms/views.py @@ -0,0 +1,15 @@ +from django.shortcuts import render_to_response, get_object_or_404 +from django.template import RequestContext + +from cms.models import Page + + +def page(request, slug): + + page = get_object_or_404(Page, path=slug) + siblings = page.get_siblings(include_self=True) + + return render_to_response("cms/page_detail.html", { + "page": page, + "siblings": siblings, + }, context_instance=RequestContext(request)) diff --git a/symposion_project/apps/conference/__init__.py b/symposion/conference/__init__.py similarity index 100% rename from symposion_project/apps/conference/__init__.py rename to symposion/conference/__init__.py diff --git a/symposion_project/apps/conference/admin.py b/symposion/conference/admin.py similarity index 77% rename from symposion_project/apps/conference/admin.py rename to symposion/conference/admin.py index e385acdf6b58d9d3895056a7eb77374b53cb7a3d..3d2bccaa10ea74cf1b14fe305b7708a2067acdd9 100644 --- a/symposion_project/apps/conference/admin.py +++ b/symposion/conference/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from conference.models import Conference, Section +from symposion.conference.models import Conference, Section admin.site.register(Conference, list_display=("title", "start_date", "end_date")) diff --git a/symposion_project/apps/conference/models.py b/symposion/conference/models.py similarity index 100% rename from symposion_project/apps/conference/models.py rename to symposion/conference/models.py diff --git a/symposion_project/settings.py b/symposion/settings.py similarity index 86% rename from symposion_project/settings.py rename to symposion/settings.py index d0a3366e5507160d8a480472aec28740309a3cbe..9b3a5b80cc736d4bb1924cf1c6d8ef894600d4e8 100644 --- a/symposion_project/settings.py +++ b/symposion/settings.py @@ -77,9 +77,8 @@ STATICFILES_DIRS = [ ] STATICFILES_FINDERS = [ - "staticfiles.finders.FileSystemFinder", - "staticfiles.finders.AppDirectoriesFinder", - "staticfiles.finders.LegacyAppDirectoriesFinder", + "django.contrib.staticfiles.finders.FileSystemFinder", + "django.contrib.staticfiles.finders.AppDirectoriesFinder", "compressor.finders.CompressorFinder", ] @@ -96,8 +95,8 @@ SECRET_KEY = "8*br)9@fs!4nzg-imfrsst&oa2udy6z-fqtdk0*e5c1=wn)(t3" # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = [ - "django.template.loaders.filesystem.load_template_source", - "django.template.loaders.app_directories.load_template_source", + "django.template.loaders.filesystem.Loader", + "django.template.loaders.app_directories.Loader", ] MIDDLEWARE_CLASSES = [ @@ -107,14 +106,12 @@ MIDDLEWARE_CLASSES = [ "django.contrib.auth.middleware.AuthenticationMiddleware", "django_openid.consumer.SessionConsumer", "django.contrib.messages.middleware.MessageMiddleware", - "pinax.apps.account.middleware.LocaleMiddleware", "django.middleware.transaction.TransactionMiddleware", "reversion.middleware.RevisionMiddleware", - "pinax.middleware.security.HideSensistiveFieldsMiddleware", "debug_toolbar.middleware.DebugToolbarMiddleware", ] -ROOT_URLCONF = "symposion_project.urls" +ROOT_URLCONF = "symposion.urls" TEMPLATE_DIRS = [ os.path.join(PROJECT_ROOT, "templates"), @@ -125,14 +122,12 @@ TEMPLATE_CONTEXT_PROCESSORS = [ "django.core.context_processors.debug", "django.core.context_processors.i18n", "django.core.context_processors.media", + "django.core.context_processors.static", + "django.core.context_processors.tz", "django.core.context_processors.request", "django.contrib.messages.context_processors.messages", - - "staticfiles.context_processors.static", - - "pinax.core.context_processors.pinax_settings", - - "pinax.apps.account.context_processors.account", + "pinax_utils.context_processors.settings", + "account.context_processors.account", ] INSTALLED_APPS = [ @@ -143,22 +138,20 @@ INSTALLED_APPS = [ "django.contrib.sessions", "django.contrib.sites", "django.contrib.messages", + "django.contrib.staticfiles", "django.contrib.humanize", - "pinax.templatetags", - # theme + "pinax_theme_bootstrap_account", "pinax_theme_bootstrap", "django_forms_bootstrap", # external - "staticfiles", "compressor", "debug_toolbar", "mailer", "django_openid", "timezones", - "emailconfirmation", "metron", "markitup", "taggit", @@ -169,13 +162,12 @@ INSTALLED_APPS = [ "sitetree", # Pinax - "pinax.apps.account", - "pinax.apps.signup_codes", + "account", # project - "about", - "sponsorship", - "conference", + "symposion.about", + "symposion.sponsorship", + "symposion.conference", ] FIXTURE_DIRS = [ @@ -193,9 +185,9 @@ ACCOUNT_EMAIL_VERIFICATION = False ACCOUNT_EMAIL_AUTHENTICATION = False ACCOUNT_UNIQUE_EMAIL = EMAIL_CONFIRMATION_UNIQUE_EMAIL = False -AUTHENTICATION_BACKENDS = [ - "pinax.apps.account.auth_backends.AuthenticationBackend", -] +# AUTHENTICATION_BACKENDS = [ +# "pinax.apps.account.auth_backends.AuthenticationBackend", +# ] LOGIN_URL = "/account/login/" # @@@ any way this can be a url name? LOGIN_REDIRECT_URLNAME = "what_next" diff --git a/symposion_project/apps/sponsorship/__init__.py b/symposion/sponsorship/__init__.py similarity index 100% rename from symposion_project/apps/sponsorship/__init__.py rename to symposion/sponsorship/__init__.py diff --git a/symposion_project/apps/sponsorship/admin.py b/symposion/sponsorship/admin.py similarity index 73% rename from symposion_project/apps/sponsorship/admin.py rename to symposion/sponsorship/admin.py index 6814c4da21d30e193d5dddc619e0a227f9f34345..a26b0a96fc809514ecc1b439485303654288bd1e 100644 --- a/symposion_project/apps/sponsorship/admin.py +++ b/symposion/sponsorship/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from sponsorship.models import SponsorLevel, Sponsor +from symposion.sponsorship.models import SponsorLevel, Sponsor admin.site.register(SponsorLevel) diff --git a/symposion_project/apps/sponsorship/models.py b/symposion/sponsorship/models.py similarity index 96% rename from symposion_project/apps/sponsorship/models.py rename to symposion/sponsorship/models.py index 07d0cb3022e51a88aa5aaa6b5a42af449d488cbb..a902c0be1c4d91a26a8d5e2f038e2e24aebd67c4 100644 --- a/symposion_project/apps/sponsorship/models.py +++ b/symposion/sponsorship/models.py @@ -3,7 +3,7 @@ import datetime from django.db import models from django.utils.translation import ugettext_lazy as _ -from conference.models import Conference +from symposion.conference.models import Conference class SponsorLevel(models.Model): diff --git a/symposion_project/apps/sponsorship/templatetags/__init__.py b/symposion/sponsorship/templatetags/__init__.py similarity index 100% rename from symposion_project/apps/sponsorship/templatetags/__init__.py rename to symposion/sponsorship/templatetags/__init__.py diff --git a/symposion_project/apps/sponsorship/templatetags/sponsorship_tags.py b/symposion/sponsorship/templatetags/sponsorship_tags.py similarity index 94% rename from symposion_project/apps/sponsorship/templatetags/sponsorship_tags.py rename to symposion/sponsorship/templatetags/sponsorship_tags.py index 00fb8139538f6cfabf2ee63a78ca45961ee3c974..cd1f33ba025d1338402d0f9efff0ca2b09edca7a 100644 --- a/symposion_project/apps/sponsorship/templatetags/sponsorship_tags.py +++ b/symposion/sponsorship/templatetags/sponsorship_tags.py @@ -1,7 +1,7 @@ from django import template -from conference.models import current_conference -from sponsorship.models import Sponsor, SponsorLevel +from symposion.conference.models import current_conference +from symposion.sponsorship.models import Sponsor, SponsorLevel register = template.Library() diff --git a/symposion_project/static/README b/symposion/static/README similarity index 100% rename from symposion_project/static/README rename to symposion/static/README diff --git a/symposion/templates/_footer.html b/symposion/templates/_footer.html new file mode 100644 index 0000000000000000000000000000000000000000..4f334c9bde2df3563ac874af599e35d4f0804c29 --- /dev/null +++ b/symposion/templates/_footer.html @@ -0,0 +1,8 @@ +{% load i18n %} +
+ symposion: + a Pinax project sponsored by + Eldarion + and the + Python Software Foundation. +
\ No newline at end of file diff --git a/symposion_project/templates/about/what_next.html b/symposion/templates/about/what_next.html similarity index 100% rename from symposion_project/templates/about/what_next.html rename to symposion/templates/about/what_next.html diff --git a/symposion/templates/cms/page_detail.html b/symposion/templates/cms/page_detail.html new file mode 100644 index 0000000000000000000000000000000000000000..fb9e336e534422229e9b708e8e1a15fd891f133e --- /dev/null +++ b/symposion/templates/cms/page_detail.html @@ -0,0 +1,19 @@ +{% extends "subnav_base.html" %} + +{% block subnav %} + +{% endblock %} + +{% block body %} +

{{ page.title }}

+ {{ page.body }} +{% endblock %} \ No newline at end of file diff --git a/symposion_project/templates/homepage.html b/symposion/templates/homepage.html similarity index 69% rename from symposion_project/templates/homepage.html rename to symposion/templates/homepage.html index 962af38996f133a37cc1b1fec0a465a56b66b96e..2365f67a9adb4a99420f0c0851b198621ec3aeb6 100644 --- a/symposion_project/templates/homepage.html +++ b/symposion/templates/homepage.html @@ -1,7 +1,6 @@ {% extends "banner_base.html" %} {% load i18n %} -{% load ifsetting_tag %} {% block head_title %}{% trans "Welcome" %}{% endblock %} @@ -33,12 +32,8 @@ {% url what_next as what_next_url %}

{% blocktrans %}Wondering What Next?{% endblocktrans %}

{% else %} - {% url acct_login as login_url %} - {% ifsetting ACCOUNT_OPEN_SIGNUP %} - {% url acct_signup as signup_url %} -

{% blocktrans %}You can Log In or Sign Up to try out the site.{% endblocktrans %}

- {% else %} -

{% blocktrans %}You can Log In to try out the site.{% endblocktrans %}

- {% endifsetting %} + {% url account_login as login_url %} + {% url account_signup as signup_url %} +

{% blocktrans %}You can Log In or Sign Up to try out the site.{% endblocktrans %}

{% endif %} {% endblock %} diff --git a/symposion_project/templates/site_base.html b/symposion/templates/site_base.html similarity index 91% rename from symposion_project/templates/site_base.html rename to symposion/templates/site_base.html index b84747575a0eccb15db90e1d269eeeaea1ff7b1d..5924007d8e33d53747238fde334d66b77d279568 100644 --- a/symposion_project/templates/site_base.html +++ b/symposion/templates/site_base.html @@ -13,9 +13,7 @@ {% endblock %} {% block footer %} -
{% include "_footer.html" %} -
{% endblock %} {% block extra_script %} diff --git a/symposion/templates/sitetree/menu.html b/symposion/templates/sitetree/menu.html new file mode 100644 index 0000000000000000000000000000000000000000..93a50ea800e06180978935cec55661b48f4b7e9c --- /dev/null +++ b/symposion/templates/sitetree/menu.html @@ -0,0 +1,11 @@ +{% load sitetree %} + \ No newline at end of file diff --git a/symposion_project/templates/sponsorship/_horizontal_by_level.html b/symposion/templates/sponsorship/_horizontal_by_level.html similarity index 100% rename from symposion_project/templates/sponsorship/_horizontal_by_level.html rename to symposion/templates/sponsorship/_horizontal_by_level.html diff --git a/symposion_project/templates/sponsorship/_sponsor_link.html b/symposion/templates/sponsorship/_sponsor_link.html similarity index 100% rename from symposion_project/templates/sponsorship/_sponsor_link.html rename to symposion/templates/sponsorship/_sponsor_link.html diff --git a/symposion_project/templates/sponsorship/_vertical_by_level.html b/symposion/templates/sponsorship/_vertical_by_level.html similarity index 100% rename from symposion_project/templates/sponsorship/_vertical_by_level.html rename to symposion/templates/sponsorship/_vertical_by_level.html diff --git a/symposion_project/templates/sponsorship/_wall.html b/symposion/templates/sponsorship/_wall.html similarity index 100% rename from symposion_project/templates/sponsorship/_wall.html rename to symposion/templates/sponsorship/_wall.html diff --git a/symposion_project/urls.py b/symposion/urls.py similarity index 52% rename from symposion_project/urls.py rename to symposion/urls.py index 2df8a82b200b9a57a03884a3dbe7423f52c5ef5e..8a8a6f9f83f6e3052ede4e07d391dd3dd23961d5 100644 --- a/symposion_project/urls.py +++ b/symposion/urls.py @@ -1,14 +1,13 @@ from django.conf import settings from django.conf.urls.defaults import * +from django.conf.urls.static import static + from django.views.generic.simple import direct_to_template from django.contrib import admin admin.autodiscover() -from pinax.apps.account.openid_consumer import PinaxConsumer - - -handler500 = "pinax.views.server_error" +# from pinax.apps.account.openid_consumer import PinaxConsumer WIKI_SLUG = r"(([\w-]{2,})(/[\w-]{2,})*)" @@ -16,17 +15,14 @@ urlpatterns = patterns("", url(r"^$", direct_to_template, { "template": "homepage.html", }, name="home"), - url(r"^admin/invite_user/$", "pinax.apps.signup_codes.views.admin_invite_user", name="admin_invite_user"), url(r"^admin/", include(admin.site.urls)), - url(r"^about/", include("about.urls")), - url(r"^account/", include("pinax.apps.account.urls")), - url(r"^openid/", include(PinaxConsumer().urls)), - url(r"^markitup/", include("markitup.urls")), + url(r"^about/", include("symposion.about.urls")), + url(r"^account/", include("account.urls")), + # url(r"^openid/", include(PinaxConsumer().urls)), + url(r"^(?P%s)/$" % WIKI_SLUG, "cms.views.page", name="cms_page"), + url(r"^markitup/", include("markitup.urls")), ) -if settings.SERVE_MEDIA: - urlpatterns += patterns("", - url(r"", include("staticfiles.urls")), - ) +urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff --git a/symposion_project/wsgi.py b/symposion/wsgi.py similarity index 100% rename from symposion_project/wsgi.py rename to symposion/wsgi.py diff --git a/symposion_project/manage.py b/symposion_project/manage.py deleted file mode 100755 index 378e3b0be3df7c4943a0edb78dc49a6589cc86df..0000000000000000000000000000000000000000 --- a/symposion_project/manage.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -import sys - -try: - import pinax -except ImportError: - sys.stderr.write("Error: Can't import Pinax. Make sure you are in a " - "virtual environment that has\nPinax installed.\n") - sys.exit(1) -else: - import pinax.env - -from django.core.management import execute_from_command_line - - -pinax.env.setup_environ(__file__) - - -if __name__ == "__main__": - execute_from_command_line() diff --git a/symposion_project/templates/_footer.html b/symposion_project/templates/_footer.html deleted file mode 100644 index 79a20fd5b75e2d1c89194bb63c17b01d67accaaa..0000000000000000000000000000000000000000 --- a/symposion_project/templates/_footer.html +++ /dev/null @@ -1,4 +0,0 @@ -{% load i18n %} -
- {% trans "© 2012 <your company here>" %} -
\ No newline at end of file