Skip to content
This repository
Browse code

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
  • Loading branch information...
commit b06daba446a60ca6aa078d54cc14a8e657af8e8d 2 parents 87f14b8 + c1b7550
Luke Hatcher lukeman authored

Showing 45 changed files with 214 additions and 89 deletions. Show diff stats Hide diff stats

  1. +27 0 LICENSE
  2. +4 0 README
  3. 0  {symposion_project → }/docs/Makefile
  4. 0  {symposion_project → }/docs/conf.py
  5. 0  {symposion_project → }/docs/conference.rst
  6. 0  {symposion_project → }/docs/index.rst
  7. 0  {symposion_project → }/docs/sponsorship.rst
  8. 0  {symposion_project → }/fixtures/initial_data.json
  9. +9 0 manage.py
  10. +9 11 {symposion_project → }/requirements/base.txt
  11. 0  {symposion_project → }/requirements/docs.txt
  12. 0  {symposion_project → }/requirements/project.txt
  13. 0  {symposion_project → symposion}/__init__.py
  14. 0  {symposion_project/apps → symposion/about}/__init__.py
  15. 0  {symposion_project/apps → symposion}/about/models.py
  16. 0  {symposion_project/apps → symposion}/about/urls.py
  17. 0  {symposion_project/apps → symposion}/about/views.py
  18. 0  {symposion_project/apps/about → symposion/cms}/__init__.py
  19. +12 0 symposion/cms/admin.py
  20. +65 0 symposion/cms/models.py
  21. +15 0 symposion/cms/views.py
  22. 0  {symposion_project/apps → symposion}/conference/__init__.py
  23. +1 1  {symposion_project/apps → symposion}/conference/admin.py
  24. 0  {symposion_project/apps → symposion}/conference/models.py
  25. +18 26 {symposion_project → symposion}/settings.py
  26. 0  {symposion_project/apps → symposion}/sponsorship/__init__.py
  27. +1 1  {symposion_project/apps → symposion}/sponsorship/admin.py
  28. +1 1  {symposion_project/apps → symposion}/sponsorship/models.py
  29. 0  {symposion_project/apps → symposion}/sponsorship/templatetags/__init__.py
  30. +2 2 {symposion_project/apps → symposion}/sponsorship/templatetags/sponsorship_tags.py
  31. 0  {symposion_project → symposion}/static/README
  32. +8 0 symposion/templates/_footer.html
  33. 0  {symposion_project → symposion}/templates/about/what_next.html
  34. +19 0 symposion/templates/cms/page_detail.html
  35. +3 8 {symposion_project → symposion}/templates/homepage.html
  36. +0 2  {symposion_project → symposion}/templates/site_base.html
  37. +11 0 symposion/templates/sitetree/menu.html
  38. 0  {symposion_project → symposion}/templates/sponsorship/_horizontal_by_level.html
  39. 0  {symposion_project → symposion}/templates/sponsorship/_sponsor_link.html
  40. 0  {symposion_project → symposion}/templates/sponsorship/_vertical_by_level.html
  41. 0  {symposion_project → symposion}/templates/sponsorship/_wall.html
  42. +9 13 {symposion_project → symposion}/urls.py
  43. 0  {symposion_project → symposion}/wsgi.py
  44. +0 20 symposion_project/manage.py
  45. +0 4 symposion_project/templates/_footer.html
27 LICENSE
... ... @@ -0,0 +1,27 @@
  1 +Copyright (c) 2010-2012, Eldarion, Inc. and contributors
  2 +All rights reserved.
  3 +
  4 +Redistribution and use in source and binary forms, with or without modification,
  5 +are permitted provided that the following conditions are met:
  6 +
  7 + * Redistributions of source code must retain the above copyright notice,
  8 + this list of conditions and the following disclaimer.
  9 +
  10 + * Redistributions in binary form must reproduce the above copyright notice,
  11 + this list of conditions and the following disclaimer in the documentation
  12 + and/or other materials provided with the distribution.
  13 +
  14 + * Neither the name of Eldarion, Inc. nor the names of its contributors may
  15 + be used to endorse or promote products derived from this software without
  16 + specific prior written permission.
  17 +
  18 +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  19 +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  20 +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  21 +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
  22 +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  23 +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  24 +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  25 +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  26 +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  27 +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4 README
... ... @@ -0,0 +1,4 @@
  1 +SYMPOSION
  2 +A Django project for conference websites.
  3 +
  4 +A Pinax project sponsored by Eldarion and the Python Software Foundation.
0  symposion_project/docs/Makefile → docs/Makefile
File renamed without changes
0  symposion_project/docs/conf.py → docs/conf.py
File renamed without changes
0  symposion_project/docs/conference.rst → docs/conference.rst
File renamed without changes
0  symposion_project/docs/index.rst → docs/index.rst
File renamed without changes
0  symposion_project/docs/sponsorship.rst → docs/sponsorship.rst
File renamed without changes
0  symposion_project/fixtures/initial_data.json → fixtures/initial_data.json
File renamed without changes
9 manage.py
... ... @@ -0,0 +1,9 @@
  1 +#!/usr/bin/env python
  2 +import os, sys
  3 +
  4 +if __name__ == "__main__":
  5 + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "symposion.settings")
  6 +
  7 + from django.core.management import execute_from_command_line
  8 +
  9 + execute_from_command_line(sys.argv)
20 symposion_project/requirements/base.txt → requirements/base.txt
@@ -7,20 +7,21 @@
7 7 --extra-index-url=http://dist.pinaxproject.com/alpha/
8 8 --extra-index-url=http://dist.pinaxproject.com/fresh-start/
9 9
10   -Django==1.3.1
11   -Pinax
12   -
  10 +Django==1.4
  11 +pinax-theme-bootstrap==2.0.3
  12 +django-forms-bootstrap==2.0.3.post1
  13 +metron==0.1 # 0.2.dev3
  14 +pinax-utils==1.0b1.dev3
13 15 django-debug-toolbar==0.9.1
14   -django-staticfiles==1.1.2
15   -django_compressor==1.0.1
16   -
17 16 django-mailer==0.2a1
18   -django-email-confirmation==0.2
19 17 django-timezones==0.2
20 18 pytz==2011n
21 19 django-openid==0.3a1
22 20 python-openid==2.2.5
23   -metron==0.1
  21 +django_compressor==1.2a1
  22 +
  23 +-e git+git://github.com/pinax/pinax-theme-bootstrap-account.git@70c0be0279d61bd2d0f949698f94b8f938918277#egg=pinax-theme-bootstrap-account
  24 +-e git+git://github.com/pinax/django-user-accounts.git@3676d2c7ea0e9a5c3f8510ac8e6f8d58175e6b5f#egg=django-user-accounts
24 25
25 26 django-mptt==0.5.2
26 27 django-taggit==0.9.3
@@ -28,6 +29,3 @@ django-reversion==1.5.1
28 29 django-markitup==1.0.0
29 30 markdown==2.1.1
30 31 django-sitetree==0.6
31   -
32   -pinax-theme-bootstrap==2.0.3
33   -django-forms-bootstrap==2.0.3.post1
0  symposion_project/requirements/docs.txt → requirements/docs.txt
File renamed without changes
0  symposion_project/requirements/project.txt → requirements/project.txt
File renamed without changes
0  symposion_project/__init__.py → symposion/__init__.py
File renamed without changes
0  symposion_project/apps/__init__.py → symposion/about/__init__.py
File renamed without changes
0  symposion_project/apps/about/models.py → symposion/about/models.py
File renamed without changes
0  symposion_project/apps/about/urls.py → symposion/about/urls.py
File renamed without changes
0  symposion_project/apps/about/views.py → symposion/about/views.py
File renamed without changes
0  symposion_project/apps/about/__init__.py → symposion/cms/__init__.py
File renamed without changes
12 symposion/cms/admin.py
... ... @@ -0,0 +1,12 @@
  1 +from django.contrib import admin
  2 +
  3 +from mptt.admin import MPTTModelAdmin
  4 +
  5 +from cms.models import Page
  6 +
  7 +
  8 +class PageAdmin(MPTTModelAdmin):
  9 + prepopulated_fields = {"slug": ("title",)}
  10 + list_display = ("title", "published", "status")
  11 +
  12 +admin.site.register(Page, PageAdmin)
65 symposion/cms/models.py
... ... @@ -0,0 +1,65 @@
  1 +from datetime import datetime
  2 +
  3 +from django.db import models
  4 +from django.utils.translation import ugettext_lazy as _
  5 +
  6 +from markitup.fields import MarkupField
  7 +
  8 +from taggit.managers import TaggableManager
  9 +
  10 +from mptt.models import MPTTModel, TreeForeignKey
  11 +from mptt.utils import drilldown_tree_for_node
  12 +
  13 +import reversion
  14 +
  15 +
  16 +class ContentBase(models.Model):
  17 +
  18 + STATUS_CHOICES = (
  19 + (1, _("Draft")),
  20 + (2, _("Public")),
  21 + )
  22 +
  23 + title = models.CharField(max_length=100)
  24 + slug = models.CharField(max_length=100, blank=True, null=True)
  25 + body = MarkupField()
  26 +
  27 + tags = TaggableManager(blank=True)
  28 +
  29 + status = models.IntegerField(choices=STATUS_CHOICES, default=2)
  30 + published = models.DateTimeField(default=datetime.now)
  31 + created = models.DateTimeField(editable=False, default=datetime.now)
  32 + updated = models.DateTimeField(editable=False, default=datetime.now)
  33 +
  34 + class Meta:
  35 + abstract = True
  36 +
  37 +
  38 +class Page(MPTTModel, ContentBase):
  39 +
  40 + parent = TreeForeignKey("self", null=True, blank=True, related_name="children")
  41 + ordering = models.PositiveIntegerField(default=1)
  42 + path = models.TextField(blank=True, editable=False)
  43 +
  44 + def __unicode__(self):
  45 + return self.title
  46 +
  47 + def save(self, calculate_path=True, *args, **kwargs):
  48 + super(Page, self).save(*args, **kwargs)
  49 + if calculate_path:
  50 + self.calculate_path()
  51 +
  52 + def calculate_path(self):
  53 + self.path = ""
  54 + for page in drilldown_tree_for_node(self):
  55 + if page == self:
  56 + self.path += page.slug
  57 + break
  58 + else:
  59 + self.path += "%s/" % page.slug
  60 + self.save(calculate_path=False)
  61 +
  62 + class MPTTMeta:
  63 + order_insertion_by = ["ordering", "title"]
  64 +
  65 +reversion.register(Page)
15 symposion/cms/views.py
... ... @@ -0,0 +1,15 @@
  1 +from django.shortcuts import render_to_response, get_object_or_404
  2 +from django.template import RequestContext
  3 +
  4 +from cms.models import Page
  5 +
  6 +
  7 +def page(request, slug):
  8 +
  9 + page = get_object_or_404(Page, path=slug)
  10 + siblings = page.get_siblings(include_self=True)
  11 +
  12 + return render_to_response("cms/page_detail.html", {
  13 + "page": page,
  14 + "siblings": siblings,
  15 + }, context_instance=RequestContext(request))
0  symposion_project/apps/conference/__init__.py → symposion/conference/__init__.py
File renamed without changes
2  symposion_project/apps/conference/admin.py → symposion/conference/admin.py
... ... @@ -1,6 +1,6 @@
1 1 from django.contrib import admin
2 2
3   -from conference.models import Conference, Section
  3 +from symposion.conference.models import Conference, Section
4 4
5 5
6 6 admin.site.register(Conference, list_display=("title", "start_date", "end_date"))
0  symposion_project/apps/conference/models.py → symposion/conference/models.py
File renamed without changes
44 symposion_project/settings.py → symposion/settings.py
@@ -77,9 +77,8 @@
77 77 ]
78 78
79 79 STATICFILES_FINDERS = [
80   - "staticfiles.finders.FileSystemFinder",
81   - "staticfiles.finders.AppDirectoriesFinder",
82   - "staticfiles.finders.LegacyAppDirectoriesFinder",
  80 + "django.contrib.staticfiles.finders.FileSystemFinder",
  81 + "django.contrib.staticfiles.finders.AppDirectoriesFinder",
83 82 "compressor.finders.CompressorFinder",
84 83 ]
85 84
@@ -96,8 +95,8 @@
96 95
97 96 # List of callables that know how to import templates from various sources.
98 97 TEMPLATE_LOADERS = [
99   - "django.template.loaders.filesystem.load_template_source",
100   - "django.template.loaders.app_directories.load_template_source",
  98 + "django.template.loaders.filesystem.Loader",
  99 + "django.template.loaders.app_directories.Loader",
101 100 ]
102 101
103 102 MIDDLEWARE_CLASSES = [
@@ -107,14 +106,12 @@
107 106 "django.contrib.auth.middleware.AuthenticationMiddleware",
108 107 "django_openid.consumer.SessionConsumer",
109 108 "django.contrib.messages.middleware.MessageMiddleware",
110   - "pinax.apps.account.middleware.LocaleMiddleware",
111 109 "django.middleware.transaction.TransactionMiddleware",
112 110 "reversion.middleware.RevisionMiddleware",
113   - "pinax.middleware.security.HideSensistiveFieldsMiddleware",
114 111 "debug_toolbar.middleware.DebugToolbarMiddleware",
115 112 ]
116 113
117   -ROOT_URLCONF = "symposion_project.urls"
  114 +ROOT_URLCONF = "symposion.urls"
118 115
119 116 TEMPLATE_DIRS = [
120 117 os.path.join(PROJECT_ROOT, "templates"),
@@ -125,14 +122,12 @@
125 122 "django.core.context_processors.debug",
126 123 "django.core.context_processors.i18n",
127 124 "django.core.context_processors.media",
  125 + "django.core.context_processors.static",
  126 + "django.core.context_processors.tz",
128 127 "django.core.context_processors.request",
129 128 "django.contrib.messages.context_processors.messages",
130   -
131   - "staticfiles.context_processors.static",
132   -
133   - "pinax.core.context_processors.pinax_settings",
134   -
135   - "pinax.apps.account.context_processors.account",
  129 + "pinax_utils.context_processors.settings",
  130 + "account.context_processors.account",
136 131 ]
137 132
138 133 INSTALLED_APPS = [
@@ -143,22 +138,20 @@
143 138 "django.contrib.sessions",
144 139 "django.contrib.sites",
145 140 "django.contrib.messages",
  141 + "django.contrib.staticfiles",
146 142 "django.contrib.humanize",
147 143
148   - "pinax.templatetags",
149   -
150 144 # theme
  145 + "pinax_theme_bootstrap_account",
151 146 "pinax_theme_bootstrap",
152 147 "django_forms_bootstrap",
153 148
154 149 # external
155   - "staticfiles",
156 150 "compressor",
157 151 "debug_toolbar",
158 152 "mailer",
159 153 "django_openid",
160 154 "timezones",
161   - "emailconfirmation",
162 155 "metron",
163 156 "markitup",
164 157 "taggit",
@@ -169,13 +162,12 @@
169 162 "sitetree",
170 163
171 164 # Pinax
172   - "pinax.apps.account",
173   - "pinax.apps.signup_codes",
  165 + "account",
174 166
175 167 # project
176   - "about",
177   - "sponsorship",
178   - "conference",
  168 + "symposion.about",
  169 + "symposion.sponsorship",
  170 + "symposion.conference",
179 171 ]
180 172
181 173 FIXTURE_DIRS = [
@@ -193,9 +185,9 @@
193 185 ACCOUNT_EMAIL_AUTHENTICATION = False
194 186 ACCOUNT_UNIQUE_EMAIL = EMAIL_CONFIRMATION_UNIQUE_EMAIL = False
195 187
196   -AUTHENTICATION_BACKENDS = [
197   - "pinax.apps.account.auth_backends.AuthenticationBackend",
198   -]
  188 +# AUTHENTICATION_BACKENDS = [
  189 +# "pinax.apps.account.auth_backends.AuthenticationBackend",
  190 +# ]
199 191
200 192 LOGIN_URL = "/account/login/" # @@@ any way this can be a url name?
201 193 LOGIN_REDIRECT_URLNAME = "what_next"
0  symposion_project/apps/sponsorship/__init__.py → symposion/sponsorship/__init__.py
File renamed without changes
2  symposion_project/apps/sponsorship/admin.py → symposion/sponsorship/admin.py
... ... @@ -1,6 +1,6 @@
1 1 from django.contrib import admin
2 2
3   -from sponsorship.models import SponsorLevel, Sponsor
  3 +from symposion.sponsorship.models import SponsorLevel, Sponsor
4 4
5 5
6 6 admin.site.register(SponsorLevel)
2  symposion_project/apps/sponsorship/models.py → symposion/sponsorship/models.py
@@ -3,7 +3,7 @@
3 3 from django.db import models
4 4 from django.utils.translation import ugettext_lazy as _
5 5
6   -from conference.models import Conference
  6 +from symposion.conference.models import Conference
7 7
8 8
9 9 class SponsorLevel(models.Model):
0  ...project/apps/sponsorship/templatetags/__init__.py → symposion/sponsorship/templatetags/__init__.py
File renamed without changes
4 ...apps/sponsorship/templatetags/sponsorship_tags.py → ...sion/sponsorship/templatetags/sponsorship_tags.py
... ... @@ -1,7 +1,7 @@
1 1 from django import template
2 2
3   -from conference.models import current_conference
4   -from sponsorship.models import Sponsor, SponsorLevel
  3 +from symposion.conference.models import current_conference
  4 +from symposion.sponsorship.models import Sponsor, SponsorLevel
5 5
6 6
7 7 register = template.Library()
0  symposion_project/static/README → symposion/static/README
File renamed without changes
8 symposion/templates/_footer.html
... ... @@ -0,0 +1,8 @@
0  symposion_project/templates/about/what_next.html → symposion/templates/about/what_next.html
File renamed without changes
19 symposion/templates/cms/page_detail.html
... ... @@ -0,0 +1,19 @@
  1 +{% extends "subnav_base.html" %}
  2 +
  3 +{% block subnav %}
  4 + <ul class="nav nav-list">
  5 + <li class="nav-header">{{ page.parent }}</li>
  6 + {% for sibling in siblings %}
  7 + {% if sibling == page %}
  8 + <li>{{ sibling }}</li>
  9 + {% else %}
  10 + <li><a href="{% url cms_page sibling.path %}">{{ sibling }}</a>
  11 + {% endif %}
  12 + {% endfor %}
  13 + </ul>
  14 +{% endblock %}
  15 +
  16 +{% block body %}
  17 + <h1>{{ page.title }}</h1>
  18 + {{ page.body }}
  19 +{% endblock %}
11 symposion_project/templates/homepage.html → symposion/templates/homepage.html
... ... @@ -1,7 +1,6 @@
1 1 {% extends "banner_base.html" %}
2 2
3 3 {% load i18n %}
4   -{% load ifsetting_tag %}
5 4
6 5 {% block head_title %}{% trans "Welcome" %}{% endblock %}
7 6
@@ -33,12 +32,8 @@
33 32 {% url what_next as what_next_url %}
34 33 <p class="what_next">{% blocktrans %}Wondering <a href="{{ what_next_url }}" class="btn primary large">What Next</a>?{% endblocktrans %}</p>
35 34 {% else %}
36   - {% url acct_login as login_url %}
37   - {% ifsetting ACCOUNT_OPEN_SIGNUP %}
38   - {% url acct_signup as signup_url %}
39   - <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn">Log In</a> or <a href="{{ signup_url }}" class="btn primary">Sign Up</a> to try out the site.{% endblocktrans %}</p>
40   - {% else %}
41   - <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn primary large">Log In</a> to try out the site.{% endblocktrans %}</p>
42   - {% endifsetting %}
  35 + {% url account_login as login_url %}
  36 + {% url account_signup as signup_url %}
  37 + <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn">Log In</a> or <a href="{{ signup_url }}" class="btn primary">Sign Up</a> to try out the site.{% endblocktrans %}</p>
43 38 {% endif %}
44 39 {% endblock %}
2  symposion_project/templates/site_base.html → symposion/templates/site_base.html
@@ -13,9 +13,7 @@
13 13 {% endblock %}
14 14
15 15 {% block footer %}
16   -<div class="legal">
17 16 {% include "_footer.html" %}
18   -</div>
19 17 {% endblock %}
20 18
21 19 {% block extra_script %}
11 symposion/templates/sitetree/menu.html
... ... @@ -0,0 +1,11 @@
  1 +{% load sitetree %}
  2 +<ul class="nav">
  3 + {% for item in sitetree_items %}
  4 + <li class="{{ item.is_current|yesno:"active ," }}">
  5 + <a href="{% sitetree_url for item %}" title="{{ item.hint|default:"" }}">{{ item.title_resolved }}</a>
  6 + {% if item.has_children %}
  7 + {% sitetree_children of item for menu template "sitetree/menu.html" %}
  8 + {% endif %}
  9 + </li>
  10 + {% endfor %}
  11 +</ul>
0  ...t/templates/sponsorship/_horizontal_by_level.html → ...n/templates/sponsorship/_horizontal_by_level.html
File renamed without changes
0  ..._project/templates/sponsorship/_sponsor_link.html → symposion/templates/sponsorship/_sponsor_link.html
File renamed without changes
0  ...ect/templates/sponsorship/_vertical_by_level.html → ...ion/templates/sponsorship/_vertical_by_level.html
File renamed without changes
0  symposion_project/templates/sponsorship/_wall.html → symposion/templates/sponsorship/_wall.html
File renamed without changes
22 symposion_project/urls.py → symposion/urls.py
... ... @@ -1,14 +1,13 @@
1 1 from django.conf import settings
2 2 from django.conf.urls.defaults import *
  3 +from django.conf.urls.static import static
  4 +
3 5 from django.views.generic.simple import direct_to_template
4 6
5 7 from django.contrib import admin
6 8 admin.autodiscover()
7 9
8   -from pinax.apps.account.openid_consumer import PinaxConsumer
9   -
10   -
11   -handler500 = "pinax.views.server_error"
  10 +# from pinax.apps.account.openid_consumer import PinaxConsumer
12 11
13 12 WIKI_SLUG = r"(([\w-]{2,})(/[\w-]{2,})*)"
14 13
@@ -16,17 +15,14 @@
16 15 url(r"^$", direct_to_template, {
17 16 "template": "homepage.html",
18 17 }, name="home"),
19   - url(r"^admin/invite_user/$", "pinax.apps.signup_codes.views.admin_invite_user", name="admin_invite_user"),
20 18 url(r"^admin/", include(admin.site.urls)),
21   - url(r"^about/", include("about.urls")),
22   - url(r"^account/", include("pinax.apps.account.urls")),
23   - url(r"^openid/", include(PinaxConsumer().urls)),
24   - url(r"^markitup/", include("markitup.urls")),
  19 + url(r"^about/", include("symposion.about.urls")),
  20 + url(r"^account/", include("account.urls")),
  21 + # url(r"^openid/", include(PinaxConsumer().urls)),
  22 +
25 23 url(r"^(?P<slug>%s)/$" % WIKI_SLUG, "cms.views.page", name="cms_page"),
  24 + url(r"^markitup/", include("markitup.urls")),
26 25 )
27 26
28 27
29   -if settings.SERVE_MEDIA:
30   - urlpatterns += patterns("",
31   - url(r"", include("staticfiles.urls")),
32   - )
  28 +urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
0  symposion_project/wsgi.py → symposion/wsgi.py
File renamed without changes
20 symposion_project/manage.py
... ... @@ -1,20 +0,0 @@
1   -#!/usr/bin/env python
2   -import sys
3   -
4   -try:
5   - import pinax
6   -except ImportError:
7   - sys.stderr.write("Error: Can't import Pinax. Make sure you are in a "
8   - "virtual environment that has\nPinax installed.\n")
9   - sys.exit(1)
10   -else:
11   - import pinax.env
12   -
13   -from django.core.management import execute_from_command_line
14   -
15   -
16   -pinax.env.setup_environ(__file__)
17   -
18   -
19   -if __name__ == "__main__":
20   - execute_from_command_line()
4 symposion_project/templates/_footer.html
... ... @@ -1,4 +0,0 @@

0 comments on commit b06daba

Please sign in to comment.
Something went wrong with that request. Please try again.