Add the "show on" faq checkboxes to the admin listview

.gitignore

@@ -23,6 +23,8 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+symposion
+pyenv
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -87,3 +89,10 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+dev.db
+
+pybay/site_media/*
+
+# jetbrains
+.idea/

.travis.yml

@@ -0,0 +1,9 @@
+language: python
+python:
+- 3.5
+- 3.6
+install:
+- pip install -r requirements.txt
+script: ./manage.py migrate && ./manage.py collectstatic --no-input && ./manage.py test
+env:
+- TRAVIS=true

Pipfile

@@ -0,0 +1,44 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+
+[packages]
+
+django-appconf = "==1.0.1"
+django-bootstrap-form = "==3.2.1"
+django-columns = "==0.1.0"
+django-crispy-forms = "==1.6.1"
+django-generic-flatblocks = "==1.2"
+django-jsonfield = "==1.0.1"
+django-markup = "==1.2"
+django-markitup = "==2.2.2"
+django-model-utils = "==2.4"
+django-ordered-model = "==1.4.1"
+django-reversion = "==1.10.1"
+django-sitetree = "==1.5.1"
+django-taggit = "==0.18.0"
+django-timezone-field = "==2.0"
+django-timezones = "==0.2"
+django-user-accounts = "==2.0"
+django = "==1.9.2"
+easy-thumbnails = "==2.3"
+eventlog = "==0.8.0"
+symposion = {git = "https://github.com/pybay/symposion.git"}
+"html5lib" = "==0.9999999"
+markdown = "==2.6.5"
+metron = "==1.3.5"
+olefile = "==0.44"
+pillow = "*"
+pinax-boxes = "==2.1.2"
+pinax-theme-bootstrap = "==5.6.0"
+pytz = "==2015.7"
+rollbar = "==0.13.2"
+model-mommy = "==1.3.2"
+
+
+[dev-packages]
+
+mysqlclient = "==1.3.10"

README.md

@@ -1,24 +1,30 @@
 # pybay
 
+[![Build Status](https://travis-ci.org/pybay/pybay.svg)](https://travis-ci.org/pybay)
+
 The website for PyBay - the Bay Area Python Conference.
 
 To work on this you'll need Python 3. Then:
 
 1. Fork the repo to your own personal github.
+    - also clone the symposion repository, take note of the path to symposion/
 2. Clone the repo to your local environment.
 3. Create a virtualenv and activate it
 4. `pip install` the requirements
-5. start the management server
+5. `pip install -e` the symposion repository
+6. start the management server
 
 Try:
 
     $ git clone git@github.com:YOURUSERNAME/pybay
+    $ git clone git@github.com:pybay/symposion.git
     $ cd pybay
     $ python3 -m venv ENV
     $ source ENV/bin/activate
     (ENV)$ pip install -r requirements.txt
+    (ENV)$ pip install -e YOUR/PATH/TO/symposion/   # this installs our symposion fork to ENV!
     (ENV)$ ./manage.py migrate
-    (ENV)$ ./manage.py loaddata fixtures/*
+    (ENV)$ ./manage.py loaddata fixtures/*     # doesn't work on Windows, see "Windows instructions" below
     (ENV)$ ./manage.py runserver
 
 The default admin user is test and password is test
@@ -29,4 +35,39 @@ disk. Eg:
 
     $ cd ~/workspace/pybay/ENV/lib/python3.6/site-packages/
     $ rm -rf symposion
-    $ ln -s /Users/sfranklin/workspace/symposion/symposion .
+    $ ln -s ~/workspace/symposion/symposion .
+
+### Windows Instructions
+
+For some reason, running `manage.py loaddata fixtures/*` gives a `No fixture named '*' found` error on Windows. You'll have to load each fixture file individually:
+
+    (ENV)$ python manage.py loaddata fixtures/auth.json
+    (ENV)$ python manage.py loaddata fixtures/conference.json
+    (ENV)$ python manage.py loaddata fixtures/proposal_base.json
+    (ENV)$ python manage.py loaddata fixtures/sites.json
+    (ENV)$ python manage.py loaddata fixtures/sponsor_benefits.json
+    (ENV)$ python manage.py loaddata fixtures/sponsor_levels.json
+
+(You can ignore the "invalid foreign keys" warnings you get. The foreign keys will become valid once you've loaded all the fixture files.)
+
+## Deploying
+
+Install fabric. Then use the `fab` command to run the deploy
+task. You'll need the ssh login password for this.
+
+    $ pip install fabric3
+    $ fab deploy
+    [pyconsf.com] Executing task 'deploy'
+    Start with a git checkout.
+    [pyconsf.com] Passphrase for private key:
+    ... much output...
+    Successfully completed
+
+By default the deploy task deploys to staging.pyconsf.com using pybay's
+staging branch.  To deploy master branch to production (same server but
+virtualhost pyconsf.com) run it with the prod target as an argument.
+
+    $ fab deploy:prod
+    [pyconsf.com] Executing task 'deploy'
+    ... much output...
+    Successfully completed

blockstuff/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from .models import Col3
+
+
+admin.site.register(Col3)

blockstuff/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class BlockstuffConfig(AppConfig):
+    name = 'blockstuff'

blockstuff/migrations/0001_initial.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2018-02-19 20:05
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Col3',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('overall_title', models.CharField(blank=True, max_length=255)),
+                ('icon_1', models.CharField(blank=True, help_text='Choose from http://themes-pixeden.com/font-demos/7-stroke/', max_length=50)),
+                ('title_1', models.CharField(blank=True, max_length=255)),
+                ('content_1', models.TextField(blank=True)),
+                ('icon_2', models.CharField(blank=True, max_length=50)),
+                ('title_2', models.CharField(blank=True, max_length=255)),
+                ('content_2', models.TextField(blank=True)),
+                ('icon_3', models.CharField(blank=True, max_length=50)),
+                ('title_3', models.CharField(blank=True, max_length=255)),
+                ('content_3', models.TextField(blank=True)),
+                ('show_title', models.BooleanField(default=True)),
+            ],
+        ),
+    ]

blockstuff/models.py

@@ -0,0 +1,27 @@
+from django.db import models
+
+
+class Col3(models.Model):
+    overall_title = models.CharField(max_length=255, blank=True)
+
+    icon_1 = models.CharField(max_length=50, blank=True,
+                              help_text="Choose from " +
+                              "http://themes-pixeden.com/font-demos/7-stroke/")
+    title_1 = models.CharField(max_length=255, blank=True)
+    content_1 = models.TextField(blank=True)
+
+    icon_2 = models.CharField(max_length=50, blank=True)
+    title_2 = models.CharField(max_length=255, blank=True)
+    content_2 = models.TextField(blank=True)
+
+    icon_3 = models.CharField(max_length=50, blank=True)
+    title_3 = models.CharField(max_length=255, blank=True)
+    content_3 = models.TextField(blank=True)
+
+    show_title = models.BooleanField(default=True)
+
+    def __unicode__(self):
+        return self.overall_title
+
+    def __str__(self):
+        return self.overall_title

blockstuff/templates/blockstuff/col3/flatblock.html

@@ -0,0 +1,36 @@
+{% load blockstuff %}
+{% if object.show_title %}
+<div class="row">
+    <div class="col-sm-12">
+        <h1 class="blue-header"><strong>{{ object.overall_title|safe }}</strong></h1>
+        {% if admin_url %}<a href="{{ admin_url }}">edit</a>{% endif %}
+    </div>
+</div>
+{% else %}
+  {% if admin_url %}<div class="row"><a href="{{ admin_url }}">edit</a></div>{% endif %}
+{% endif %}
+<div class="row">
+    <div class="{{ object|three_col_class }}">
+        <div class="topic">
+            <i class="{{ object.icon_1 }}"></i>
+            <h3 class="blue-header"><strong>{{ object.title_1|safe }}</strong></h3>
+              {{ object.content_1|safe }}
+        </div>
+    </div>
+
+    <div class="{{ object|three_col_class }}">
+        <div class="topic">
+            <i class="{{ object.icon_2 }}"></i>
+            <h3 class="blue-header"><strong>{{ object.title_2|safe }}</strong></h3>
+              {{ object.content_2|safe }}
+        </div>
+    </div>
+
+    <div class="{{ object|three_col_class }}">
+        <div class="topic">
+            <i class="{{ object.icon_3 }}"></i>
+            <h3 class="blue-header"><strong>{{ object.title_3|safe }}</strong></h3>
+              {{ object.content_3|safe }}
+        </div>
+    </div>
+</div>

blockstuff/templates/blockstuff/title_text_image_2col.html

@@ -0,0 +1,28 @@
+{% if object.title %}
+<section class="duplicatable-content visitor-info">
+  <div class="container">
+    <div class="row"><a href="{{ admin_url }}">edit</a></div>
+    <div class="row">
+      <div class="col-sm-14">
+        <h1><strong>{{ object.title }}</strong></h1>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-sm-6">
+        <!-- change cols 6 to 9 -->
+        <div>
+          {{ object.text|safe }}
+        </div>
+      </div>
+      <div class="col-sm-6">
+        {% if object.image %}
+        <img id="workshop2" src="{{ MEDIA_URL }}{{ object.image }}" alt="">
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</section>
+{% else %}
+{% if admin_url %}<section><div class="container"><div class="row"><a href="{{ admin_url }}">edit</a></div></div></section>{% endif %}
+{% endif %}

blockstuff/templates/flatpages/text_image_2col.html

@@ -0,0 +1,15 @@
+{% extends 'frontend/base.html' %}
+{% load generic_flatblocks %}
+
+{% block head_title %}{{ flatpage.title }}{% endblock %}
+
+{% block content %}
+<section class="code_of_conduct">
+{% gblock "flatpage",flatpage.id for "gblocks.TitleTextAndImage" with 'blockstuff/title_text_image_2col.html'%}
+    <div class="container">
+        <div class="row">
+            {{ flatpage.content }}
+        </div>
+    </div>
+</section>
+{% endblock %}

blockstuff/templatetags/blockstuff.py

@@ -0,0 +1,13 @@
+import datetime
+from django import template
+
+register = template.Library()
+
+@register.filter
+def three_col_class(object):
+    if object.title_3:
+        return "col-md-4 col-sm-6"
+    elif object.title_2:
+        return "col-md-6 col-sm-12"
+    else:
+        return "col-md-12 col-sm-12"

blockstuff/tests.py

@@ -0,0 +1 @@
+from django.test import TestCase

fabfile.py

@@ -0,0 +1,66 @@
+from __future__ import print_function
+from datetime import datetime as dt
+from os.path import join
+
+from fabric.api import cd, env, hide, local, run, sudo
+from fabric.contrib import files
+
+env.hosts = ['pyconsf.com']
+env.user = 'pybay'
+
+BASE = "/data/websites"
+CHECKOUTS = "/data/websites/checkouts"
+
+def checkout(prod=False):
+    """Git clone pybay project to unique folder"""
+    path = "prod" if prod else "staging"
+    ts = dt.now().strftime("%Y-%m-%d.%H.%M.%S")
+    dirname = join(CHECKOUTS, path, ts)
+    run("mkdir %s" % dirname)
+    with cd(dirname):
+        with hide('running', 'stdout'):
+            clone_args = '' if prod else ' -b staging'
+            run("git clone https://github.com/pybay/pybay.git%s" % clone_args)
+    return dirname
+
+def virtualenv(checkout):
+    """Create virtualenv in checkout directory."""
+    with cd(checkout):
+        run("virtualenv ENV")
+        with hide('running', 'stdout'):
+            run("ENV/bin/pip3 install -r pybay/requirements.txt")
+            run("ENV/bin/pip3 install -r pybay/requirements-server.txt")
+
+def migrate(checkout, prod=False):
+    """Run migrations in checkout."""
+    settings = "pybay.prod_settings" if prod else "pybay.staging_settings"
+    with cd(checkout):
+        run("ENV/bin/python3 pybay/manage.py migrate --settings=%s" % settings)
+        run("ENV/bin/python3 pybay/manage.py collectstatic --noinput --settings=%s" % settings)
+
+def relink(checkout, prod=False):
+    """Move symlink to point to current checkout."""
+    dir = "prod" if prod else "staging"
+    with cd(BASE):
+        run("ln -s %s new && mv -Tf new %s" % (checkout, dir))
+
+def touch(prod):
+    """Touch symlinks to reload uwsgi config."""
+    dir = "prod" if prod else "staging"
+    run("touch /etc/uwsgi-emperor/vassals/%s_uwsgi.ini" % dir)
+
+
+def deploy(version="staging"):
+    """Run this to redeploy site from github master. Run `fab deploy:prod` to deploy main site."""
+    prod = True if version == 'prod' else False
+    print("Start with a git checkout.")
+    dir = checkout(prod)
+    print("Created %s" % dir)
+    print("Now create the virtualenv")
+    virtualenv(dir)
+    print("Run migrations and collectstatic")
+    migrate(dir, prod)
+    print("Update the active version")
+    relink(dir, prod)
+    touch(prod)
+    print("Successfully completed")