Changeset - b06daba446a6
[Not reviewed]
Merge
! ! !
Luke Hatcher - 12 years ago 2012-07-10 19:35:30
lukeman@gmail.com
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
45 files changed with 214 insertions and 89 deletions:
LICENSE
27
README
4
docs/Makefile
rename
docs/conf.py
rename
0 comments (0 inline, 0 general)
LICENSE
Show inline comments
 
new file 100644
 
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.
README
Show inline comments
 
SYMPOSION
 
A Django project for conference websites.
 

	
 
A Pinax project sponsored by Eldarion and the Python Software Foundation.
docs/Makefile
Show inline comments
 
file renamed from symposion_project/docs/Makefile to docs/Makefile
docs/conf.py
Show inline comments
 
file renamed from symposion_project/docs/conf.py to docs/conf.py
docs/conference.rst
Show inline comments
 
file renamed from symposion_project/docs/conference.rst to docs/conference.rst
docs/index.rst
Show inline comments
 
file renamed from symposion_project/docs/index.rst to docs/index.rst
docs/sponsorship.rst
Show inline comments
 
file renamed from symposion_project/docs/sponsorship.rst to docs/sponsorship.rst
fixtures/initial_data.json
Show inline comments
 
file renamed from symposion_project/fixtures/initial_data.json to fixtures/initial_data.json
manage.py
Show inline comments
 
new file 100755
 
#!/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)
requirements/base.txt
Show inline comments
 
file renamed from symposion_project/requirements/base.txt to 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
requirements/docs.txt
Show inline comments
 
file renamed from symposion_project/requirements/docs.txt to requirements/docs.txt
requirements/project.txt
Show inline comments
 
file renamed from symposion_project/requirements/project.txt to requirements/project.txt
symposion/__init__.py
Show inline comments
 
file renamed from symposion_project/__init__.py to symposion/__init__.py
symposion/about/__init__.py
Show inline comments
 
file renamed from symposion_project/apps/__init__.py to symposion/about/__init__.py
symposion/about/models.py
Show inline comments
 
file renamed from symposion_project/apps/about/models.py to symposion/about/models.py
symposion/about/urls.py
Show inline comments
 
file renamed from symposion_project/apps/about/urls.py to symposion/about/urls.py
symposion/about/views.py
Show inline comments
 
file renamed from symposion_project/apps/about/views.py to symposion/about/views.py
symposion/cms/__init__.py
Show inline comments
 
file renamed from symposion_project/apps/about/__init__.py to symposion/cms/__init__.py
symposion/cms/admin.py
Show inline comments
 
new file 100644
 
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)
symposion/cms/models.py
Show inline comments
 
new file 100644
 
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)
symposion/cms/views.py
Show inline comments
 
new file 100644
 
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))
symposion/conference/__init__.py
Show inline comments
 
file renamed from symposion_project/apps/conference/__init__.py to symposion/conference/__init__.py
symposion/conference/admin.py
Show inline comments
 
file renamed from symposion_project/apps/conference/admin.py to symposion/conference/admin.py
 
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"))
symposion/conference/models.py
Show inline comments
 
file renamed from symposion_project/apps/conference/models.py to symposion/conference/models.py
symposion/settings.py
Show inline comments
 
file renamed from symposion_project/settings.py to 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"
symposion/sponsorship/__init__.py
Show inline comments
 
file renamed from symposion_project/apps/sponsorship/__init__.py to symposion/sponsorship/__init__.py
symposion/sponsorship/admin.py
Show inline comments
 
file renamed from symposion_project/apps/sponsorship/admin.py to symposion/sponsorship/admin.py
 
from django.contrib import admin
 

	
 
from sponsorship.models import SponsorLevel, Sponsor
 
from symposion.sponsorship.models import SponsorLevel, Sponsor
 

	
 

	
 
admin.site.register(SponsorLevel)
symposion/sponsorship/models.py
Show inline comments
 
file renamed from symposion_project/apps/sponsorship/models.py to 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):
symposion/sponsorship/templatetags/__init__.py
Show inline comments
 
file renamed from symposion_project/apps/sponsorship/templatetags/__init__.py to symposion/sponsorship/templatetags/__init__.py
symposion/sponsorship/templatetags/sponsorship_tags.py
Show inline comments
 
file renamed from symposion_project/apps/sponsorship/templatetags/sponsorship_tags.py to symposion/sponsorship/templatetags/sponsorship_tags.py
 
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()
symposion/static/README
Show inline comments
 
file renamed from symposion_project/static/README to symposion/static/README
symposion/templates/_footer.html
Show inline comments
 
new file 100644
 
{% load i18n %}
 
<div class="legal">
 
    <a href="http://pinax.github.com/symposion/"><b>symposion</b></a>:
 
    a Pinax project sponsored by
 
    <a href="http://eldarion.com/">Eldarion</a>
 
    and the
 
    <a href="http://www.python.org/psf/">Python Software Foundation</a>.
 
</div>
...
 
\ No newline at end of file
symposion/templates/about/what_next.html
Show inline comments
 
file renamed from symposion_project/templates/about/what_next.html to symposion/templates/about/what_next.html
symposion/templates/cms/page_detail.html
Show inline comments
 
new file 100644
 
{% extends "subnav_base.html" %}
 

	
 
{% block subnav %}
 
    <ul class="nav nav-list">
 
        <li class="nav-header">{{ page.parent }}</li>
 
        {% for sibling in siblings %}
 
            {% if sibling == page %}
 
                <li>{{ sibling }}</li>
 
            {% else %}
 
                <li><a href="{% url cms_page sibling.path %}">{{ sibling }}</a>
 
            {% endif %}
 
        {% endfor %}
 
    </ul>
 
{% endblock %}
 

	
 
{% block body %}
 
    <h1>{{ page.title }}</h1>
 
    {{ page.body }}
 
{% endblock %}
...
 
\ No newline at end of file
symposion/templates/homepage.html
Show inline comments
 
file renamed from symposion_project/templates/homepage.html to symposion/templates/homepage.html
 
{% 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 %}
 
        <p class="what_next">{% blocktrans %}Wondering <a href="{{ what_next_url }}" class="btn primary large">What Next</a>?{% endblocktrans %}</p>
 
    {% else %}
 
        {% url acct_login as login_url %}
 
        {% ifsetting ACCOUNT_OPEN_SIGNUP %}
 
            {% url acct_signup as signup_url %}
 
            <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>
 
        {% else %}
 
            <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn primary large">Log In</a> to try out the site.{% endblocktrans %}</p>
 
        {% endifsetting %}
 
        {% url account_login as login_url %}
 
        {% url account_signup as signup_url %}
 
        <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>
 
    {% endif %}
 
{% endblock %}
symposion/templates/site_base.html
Show inline comments
 
file renamed from symposion_project/templates/site_base.html to symposion/templates/site_base.html
...
 
@@ -13,9 +13,7 @@
 
{% endblock %}
 

	
 
{% block footer %}
 
<div class="legal">
 
    {% include "_footer.html" %}
 
</div>
 
{% endblock %}
 

	
 
{% block extra_script %}
symposion/templates/sitetree/menu.html
Show inline comments
 
new file 100644
 
{% load sitetree %}
 
<ul class="nav">
 
	{% for item in sitetree_items %}
 
	<li class="{{ item.is_current|yesno:"active ," }}">
 
        <a href="{% sitetree_url for item %}" title="{{ item.hint|default:"" }}">{{ item.title_resolved }}</a>
 
		{% if item.has_children %}
 
			{% sitetree_children of item for menu template "sitetree/menu.html" %}
 
		{% endif %}
 
	</li>
 
	{% endfor %}
 
</ul>
...
 
\ No newline at end of file
symposion/templates/sponsorship/_horizontal_by_level.html
Show inline comments
 
file renamed from symposion_project/templates/sponsorship/_horizontal_by_level.html to symposion/templates/sponsorship/_horizontal_by_level.html
symposion/templates/sponsorship/_sponsor_link.html
Show inline comments
 
file renamed from symposion_project/templates/sponsorship/_sponsor_link.html to symposion/templates/sponsorship/_sponsor_link.html
symposion/templates/sponsorship/_vertical_by_level.html
Show inline comments
 
file renamed from symposion_project/templates/sponsorship/_vertical_by_level.html to symposion/templates/sponsorship/_vertical_by_level.html
symposion/templates/sponsorship/_wall.html
Show inline comments
 
file renamed from symposion_project/templates/sponsorship/_wall.html to symposion/templates/sponsorship/_wall.html
symposion/urls.py
Show inline comments
 
file renamed from symposion_project/urls.py to symposion/urls.py
 
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<slug>%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
symposion/wsgi.py
Show inline comments
 
file renamed from symposion_project/wsgi.py to symposion/wsgi.py
symposion_project/manage.py
Show inline comments
 
deleted file
symposion_project/templates/_footer.html
Show inline comments
 
deleted file
0 comments (0 inline, 0 general)