Changeset - f690dafcc824
[Not reviewed]
Merge
0 6 5
Joshua Simmons - 4 years ago 2017-11-14 04:04:27
i@joshuasimmons.name
Merge branch 'master' of github.com:northbaypython/website
5 files changed with 62 insertions and 1 deletions:
0 comments (0 inline, 0 general)
pinaxcon/settings.py
Show inline comments
...
 
@@ -123,29 +123,32 @@ TEMPLATES = [
 
            "context_processors": [
 
                "django.contrib.auth.context_processors.auth",
 
                "django.template.context_processors.debug",
 
                "django.template.context_processors.i18n",
 
                "django.template.context_processors.media",
 
                "django.template.context_processors.static",
 
                "django.template.context_processors.tz",
 
                "django.template.context_processors.request",
 
                "django.contrib.messages.context_processors.messages",
 
                "account.context_processors.account",
 
                "pinax_theme_bootstrap.context_processors.theme",
 
                "symposion.reviews.context_processors.reviews",
 
                "sekizai.context_processors.sekizai",
 
            ],
 
        },
 
    },
 
]
 

	
 
TEMPLATE_DEBUG = False
 

	
 
MIDDLEWARE_CLASSES = [
 
    "django.contrib.sessions.middleware.SessionMiddleware",
 
    "django.middleware.common.CommonMiddleware",
 
    "django.middleware.csrf.CsrfViewMiddleware",
 
    "django.contrib.auth.middleware.AuthenticationMiddleware",
 
    "django.contrib.auth.middleware.SessionAuthenticationMiddleware",
 
    "django.contrib.messages.middleware.MessageMiddleware",
 
    "reversion.middleware.RevisionMiddleware",
 
    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 
    "ssl_redirect.middleware.SSLRedirectMiddleware",
 
    "pinaxcon.middleware.CanonicalHostMiddleware",
 
    "pinaxcon.middleware.UnprependWWWMiddleware",
...
 
@@ -203,24 +206,36 @@ INSTALLED_APPS = [
 

	
 
    #admin - required by registrasion ??
 
    "nested_admin",
 

	
 
    # project
 
    "pinaxcon",
 
    "pinaxcon.proposals",
 
    "pinaxcon.registrasion",
 

	
 
    #testing
 
    "django_nose",
 

	
 
    # wiki
 
    'django.contrib.humanize',
 
    'django_nyt',
 
    'mptt',
 
    'sekizai',
 
    #'sorl.thumbnail',
 
    'wiki',
 
    'wiki.plugins.attachments',
 
    'wiki.plugins.notifications',
 
    #'wiki.plugins.images',
 
    'wiki.plugins.macros',
 

	
 
    # stylesheets and js
 
    'compressor',
 
]
 

	
 
# A sample logging configuration. The only tangible logging
 
# performed by this configuration is to send an email to
 
# the site admins on every HTTP 500 error when DEBUG=False.
 
# See http://docs.djangoproject.com/en/dev/topics/logging for
 
# more details on how to customize your logging configuration.
 
LOGGING = {
 
    "version": 1,
 
    "disable_existing_loggers": False,
...
 
@@ -300,24 +315,31 @@ SYMPOSION_SPEAKER_FORM = "pinaxcon.proposals.forms.ConferenceSpeakerForm"
 
ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile"
 
# Registrasion attendee profile form -- must act on ATTENDEE_PROFILE_FORM
 
# You only need to provide this if you're customising the form from the default
 
# ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"
 

	
 
# Ticket product category -- used to identify which products must be available
 
# in order to register.
 
TICKET_PRODUCT_CATEGORY = 1
 

	
 

	
 
INVOICE_CURRENCY = "USD"
 

	
 
WIKI_ACCOUNT_HANDLING = False
 
WIKI_ACCOUNT_SIGNUP_ALLOWED = False
 

	
 
WIKI_ANONYMOUS_WRITE = False
 
WIKI_ANONYMOUS_UPLOAD = False
 

	
 

	
 
# Use nose to run all tests
 
TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 

	
 

	
 
# Tell nose to measure coverage on the 'foo' and 'bar' apps
 
NOSE_ARGS = [
 
    '--with-coverage',
 
    '--cover-package=registrasion.controllers,registrasion.models',
 
]
 

	
 
MARKDOWN_DEUX_STYLES = {
 
    "default": {
pinaxcon/templates/static_pages/attend/hotels.html
Show inline comments
...
 
@@ -27,25 +27,25 @@
 
      <dt>Where</dt><dd><a href="https://www.google.com/maps/dir/Mystic+Theatre,+Petaluma+Boulevard+North,+Petaluma,+CA/Hotel+Petaluma,+205+Kentucky+St,+Petaluma,+CA+94952">205 Kentucky St (0.2mi from venue)</a></dd>
 
      <dt>Price</dt><dd>$117-$153/night + tax</dd>
 
      <dt>Style</dt><dd>Limited-Service Hotel</dd>
 
    </dl>
 
  </div>
 
  <div class="col-md-2">
 
    <a class="btn btn-lg btn-primary" href="https://www.choicehotels.com/reservations/groups/GH6NY6">Book Hotel Petaluma</a>
 
  </div>
 
</div>
 

	
 
<p>The only hotel in Downtown Petaluma is a recently renovated boutique hotel in a 1920s-era building. It's a short walk from North Bay Python's venue, and is close to Petaluma's best places to eat and drink.</p>
 

	
 
<p>Hotel Petaluma has offered all of their available rooms to North Bay Python attendees, so if you want to stay as close as possible to the venue, book through our exclusive link by November 1st.</p>
 
<p>Hotel Petaluma has offered all of their available rooms to North Bay Python attendees, so if you want to stay as close as possible to the venue, book through our exclusive link.</p>
 

	
 
<h3>Sheraton Petaluma</h3>
 

	
 
<div class="row">
 
  <div class="col-md-7">
 
    <dl class="dl-horizontal">
 
      <dt>Where</dt><dd>Petaluma Marina, <a href="https://www.google.com/maps/dir/Mystic+Theatre,+23+Petaluma+Blvd+N,+Petaluma,+CA+94952/Sheraton+Sonoma+County+-+Petaluma,+Baywood+Drive,+Petaluma,+CA">745 Baywood Dr (1.7mi from venue)</a></dd>
 
      <dt>Price</dt><dd>$129/night + tax</dd>
 
      <dt>Style</dt><dd>Full-Service Hotel</dd>
 
      <dt>Book by</dt><dd>November 17th</dd>
 
    </dl>
 
  </div>
pinaxcon/templates/wiki/base.html
Show inline comments
 
new file 100644
 
{% extends "wiki/base_site.html" %}
 
{% load staticfiles %}
 
{% load compress %}
 
{% load sitetree %}
 
{% load sekizai_tags %}
 

	
 
{% block wiki_body %}
 
  {% addtoblock "css" %}
 
    {% compress css %}
 
        <link rel="stylesheet" type="text/x-scss" href="{% static "scss/site.scss" %}">
 
    {% endcompress %}
 
  {% endaddtoblock %}
 

	
 
  {{ block.super }}
 
{% endblock %}
 

	
 
{% block wiki_site_title %} - North Bay Python Wiki{% endblock %}
 

	
 
{% block wiki_header_branding %}
 
<a class="navbar-brand" href="/">North Bay Python</a>
 
{% endblock %}
 

	
 
{% block wiki_header_navlinks %}
 
<ul class="nav navbar-nav">
 
  <li class="active"><a href="{% url 'wiki:root' %}">Wiki</a></li>
 
  {% sitetree_menu from "main" include "trunk" template "sitetree/menu_bootstrap3.html" %}
 
</ul>
 
{% endblock %}
 

	
 
{% block wiki_footer_prepend %}
 
  All contributions to this wiki page are licensed under a Creative Commons Attribution-ShareAlike 4.0 licence.
 
{% endblock %}
pinaxcon/urls.py
Show inline comments
 
from django.conf import settings
 
from django.conf.urls import include, url
 
from django.conf.urls.static import static
 
from django.contrib.staticfiles.templatetags.staticfiles import static as _static
 
from django.views.generic import TemplateView
 
from django.views.generic import RedirectView
 
from django_nyt.urls import get_pattern as get_nyt_pattern
 
from wiki.urls import get_pattern as get_wiki_pattern
 

	
 
from django.contrib import admin
 

	
 
from pinaxcon import views
 

	
 
import symposion.views
 

	
 

	
 
urlpatterns = [
 
    url(r"^$", TemplateView.as_view(template_name="static_pages/homepage.html"), name="home"),
 

	
 
    # about
...
 
@@ -86,19 +88,23 @@ urlpatterns = [
 
    url(r"^reviews/", include("symposion.reviews.urls")),
 
    url(r"^schedule/", include("symposion.schedule.urls")),
 

	
 
    url(r"^teams/", include("symposion.teams.urls")),
 

	
 
    # Demo payment gateway and related features
 
    url(r"^tickets/payments/", include("registripe.urls")),
 

	
 
    # Required by registrasion
 
    url(r'^tickets/', include('registrasion.urls')),
 
    url(r'^nested_admin/', include('nested_admin.urls')),
 

	
 
    url(r'^wiki/notifications/', get_nyt_pattern()),
 
    url(r'^wiki/', get_wiki_pattern())
 

	
 
    # Catch-all MUST go last.
 
    #url(r"^", include("pinax.pages.urls")),
 
]
 

	
 

	
 
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 

	
 
handler500 = views.server_error
requirements/base.txt
Show inline comments
...
 
@@ -8,23 +8,24 @@ dj-static==0.0.6
 
dj-database-url==0.4.0
 
pinax-pages==0.4.2
 
pinax-boxes==2.1.2
 
django-ssl-redirect==2.0
 
django-storages==1.6.5
 
django-libsass==0.7
 
django-markdown-deux==1.0.5
 
django-sitetree==1.8.0
 
django-countries==4.6.1
 
easy-thumbnails==2.4.1
 
django-timezone-field==2.0
 
django-model-utils==3.0.0
 
wiki==0.3b3
 

	
 

	
 
# For testing
 
django-nose==1.4.4
 
coverage==4.0.3
 

	
 
# Registrasion
 
https://github.com/chrisjrn/registrasion/tarball/master
 
https://github.com/chrisjrn/symposion/tarball/northbaypython
 
https://github.com/chrisjrn/registrasion-stripe/tarball/master
 
https://github.com/chrisjrn/symposion-bootstrap-templates/tarball/master
0 comments (0 inline, 0 general)