Skip to content

Commit c3454ec

Browse files
committed
more 2017
1 parent 869a97f commit c3454ec

File tree

10 files changed

+29
-29
lines changed

10 files changed

+29
-29
lines changed

README.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11

22
=====================
3-
PyCon 2016 Web Site
3+
PyCon 2017 Web Site
44
=====================
55

66
Built by the Caktus Consulting Group atop the Django web framework.
77

88
Rather than use this as the basis for your conference site directly, you should
99
instead look at https://github.com/pinax/symposion which was designed for reuse.
1010

11-
PyCon 2016 is built on top of Pinax Symposion but may have customizations that
11+
PyCon 2017 is built on top of Pinax Symposion but may have customizations that
1212
will just make things more difficult for you.
1313

1414
Installation instructions are in this README. There's more documentation
@@ -70,10 +70,10 @@ Running the PyCon web site in production
7070

7171
* If you have ssh access to the staging server, copy the database and media::
7272

73-
$ fab staging get_db_dump:pycon2016
73+
$ fab staging get_db_dump:pycon
7474
$ fab staging get_media
7575

76-
Change ``pycon2016`` in that first command to the name of your local database.
76+
Change ``pycon`` in that first command to the name of your local database.
7777

7878
If you get Postgres authorization errors when trying the get_db_dump,
7979
find another developer who has access already and copy the ~/.pgpass
@@ -99,11 +99,11 @@ Running the PyCon web site in production
9999

100100
python manage.py collectstatic --noinput
101101

102-
* Arrange to serve the site_media directory as ``/2016/site_media/whatever``.
103-
E.g. ``site_media/foo.html`` would be at ``/2016/site_media/foo.html``.
102+
* Arrange to serve the site_media directory as ``/2017/site_media/whatever``.
103+
E.g. ``site_media/foo.html`` would be at ``/2017/site_media/foo.html``.
104104
* Arrange to serve the wsgi application in ``symposion/wsgi.py`` at ``/``, running
105105
with the same virtualenv (or equivalent). It will only handle URLs
106-
starting with ``/2016`` though, so you don't have to pass it any other requests.
106+
starting with ``/2017`` though, so you don't have to pass it any other requests.
107107

108108
To run tests
109109
------------

develop/motd

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ the PyCon web site! To run the Django application:
55
cd /vagrant
66
./manage.py runserver 0.0.0.0:8000
77

8-
You can view the site at http://localhost:8000/2016/ in your browser.
8+
You can view the site at http://localhost:8000/2017/ in your browser.
99
To log into the site, create a user with an email address and password:
1010

1111
./manage.py createsuperuser

diagrams/overview.tpl

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
% end
1616
%
1717
% def tutorials(w=30, offset=143):
18-
<a class="tutorials" xlink:href="/2016/schedule/tutorials/" target="_top">
18+
<a class="tutorials" xlink:href="/2017/schedule/tutorials/" target="_top">
1919
% for x in range(0, w*9, w):
2020
<rect x="{{x+1}}" width="{{w-3}}" y="{{t(900)}}" height="{{t(900,1220)}}" />
2121
% end
2222
<text x="{{w*4.5}}" y="{{t(900+offset)}}">Morning Tutorials ($)</text>
2323
</a>
24-
<a class="tutorials" xlink:href="/2016/schedule/tutorials/" target="_top">
24+
<a class="tutorials" xlink:href="/2017/schedule/tutorials/" target="_top">
2525
% for x in range(0, w*9, w):
2626
<rect x="{{x+1}}" width="{{w-3}}" y="{{t(1320)}}" height="{{t(1320,1640)}}" />
2727
% end
@@ -31,7 +31,7 @@
3131
% end
3232
%
3333
% def workshops(w=55):
34-
<a class="workshops" xlink:href="/2016/schedule/sponsor-tutorials/" target="_top">
34+
<a class="workshops" xlink:href="/2017/schedule/sponsor-tutorials/" target="_top">
3535
% for x in range(0, w*2, w):
3636
<rect x="{{x+1}}" width="{{w-3}}" y="{{t(900)}}" height="{{t(900,1030)}}" />
3737
<rect x="{{x+1}}" width="{{w-3}}" y="{{t(1050)}}" height="{{t(1050,1220)}}" />
@@ -45,7 +45,7 @@
4545
% end
4646
%
4747
% def talks(start, odd_pattern, even_pattern):
48-
<a xlink:href="/2016/schedule/talks/" target="_top" class="talks">
48+
<a xlink:href="/2017/schedule/talks/" target="_top" class="talks">
4949
% w = 50
5050
% for i, pattern in zip(range(5), cycle([odd_pattern, even_pattern])):
5151
% t0 = t(start)
@@ -65,7 +65,7 @@
6565
%
6666
% def summit(name, w=100):
6767
% slug = 'edusummit' if name == 'Education' else 'langsummit'
68-
<a xlink:href="/2016/events/{{slug}}/" target="_top" class="summit">
68+
<a xlink:href="/2017/events/{{slug}}/" target="_top" class="summit">
6969
<rect x="{{1}}" width="{{w-3}}" y="{{t(900)}}" height="{{t(900,1220)}}" />
7070
<rect x="{{1}}" width="{{w-3}}" y="{{t(1320)}}" height="{{t(1320,1640)}}" />
7171
<text x="{{w//2}}" y="{{t(930)}}">{{name}}</text>
@@ -130,7 +130,7 @@
130130
</g>
131131
% end
132132
% if day == 2:
133-
<a xlink:href="/2016/events/reception/" target="_top" class="event">
133+
<a xlink:href="/2017/events/reception/" target="_top" class="event">
134134
<rect x="1" width="267" y="{{t(1800)}}" height="{{t(1800,2100)}}" />
135135
<text x="{{267//2}}" y="{{t(1930)}}">Opening Reception</text>
136136
</a>
@@ -142,11 +142,11 @@
142142
% title = 'PyLadies Auction ($)' if day == 4 else 'Dinner ($)'
143143
% slug = 'sponsors/charityauction' if day == 4 else 'events/dinners'
144144
% start = 1830 if day == 4 else 1900
145-
<a xlink:href="/2016/{{slug}}/" target="_top" class="event">
145+
<a xlink:href="/2017/{{slug}}/" target="_top" class="event">
146146
<rect x="1" width="248" y="{{t(start)}}" height="{{t(start,2030)}}" />
147147
<text x="{{267//2}}" y="{{t(1947)}}">{{ title }}</text>
148148
</a>
149-
<a xlink:href="/2016/events/open-spaces/" target="_top" class="open-spaces"
149+
<a xlink:href="/2017/events/open-spaces/" target="_top" class="open-spaces"
150150
transform="translate(570, 0)" >
151151
% hour = t(0,60)
152152
<rect width="{{hour * 4}}" y="{{t(900)}}" height="{{t(900,2000)}}" />
@@ -169,7 +169,7 @@
169169
% if day in [3, 4]:
170170
% plenary(1740, 1840, 'Lightning Talks', '')
171171
% talks(1050, '334L334B33', '333L433B43')
172-
<a xlink:href="/2016/sponsors/exhibitfloor/" target="_top" class="expo"
172+
<a xlink:href="/2017/sponsors/exhibitfloor/" target="_top" class="expo"
173173
transform="translate(350, 0)" >
174174
<rect x="1" width="120" y="{{t(800)}}" height="{{t(800,1700)}}" />
175175
<text x="60" y="{{t(1155)}}">Expo Hall</text>
@@ -180,7 +180,7 @@
180180
</a>
181181
% elif day == 5:
182182
% talks(1310, '333', '333')
183-
<a xlink:href="/2016/sponsors/exhibitfloor/" target="_top" class="expo"
183+
<a xlink:href="/2017/sponsors/exhibitfloor/" target="_top" class="expo"
184184
transform="translate(350, 0)" >
185185
<rect x="1" width="120" y="{{t(1000)}}" height="{{t(1000,1300)}}" />
186186
<text x="60" y="{{t(1050)}}">Posters and</text>

docs/finaid.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ a template, and click "Send". Each applicant selected will receive an email
2323
customized for them using the template chosen.
2424

2525
Templates for this function are created and edited in the admin, at e.g.
26-
``/2016/admin/finaid/financialaidemailtemplate/``.
26+
``/2017/admin/finaid/financialaidemailtemplate/``.
2727

2828
Each template has a name, which is just used to identify the template
2929
here and on the mail sending page, and a body, which uses Django templating

docs/special_events.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ Add events to Menus
2626
To add an event to the site menus, go to the Django admin, find the
2727
site tree called "main" and open it, then add a new item. Set the
2828
URL to the event's URL, minus the hostname part - e.g. if the
29-
full URL is ``https://us.pycon.org/2016/special_events/bigbash/``,
30-
just include ``/2016/special_events/bigbash/``.
29+
full URL is ``https://us.pycon.org/2017/special_events/bigbash/``,
30+
just include ``/2017/special_events/bigbash/``.

fixtures/conference.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"pk": 1,
44
"model": "conference.conference",
55
"fields": {
6-
"timezone": "US/Eastern",
7-
"start_date": "2016-05-28",
8-
"end_date": "2014-06-05",
9-
"title": "PyCon 2016"
6+
"timezone": "US/Pacific",
7+
"start_date": "2017-05-17",
8+
"end_date": "2017-05-25",
9+
"title": "PyCon 2017"
1010
}
1111
}
1212
]

pycon/migrations/0005_edusummittalkproposal.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
2020
('overall_status', models.IntegerField(default=1, help_text='The status of the proposal.', choices=[(1, b'Not Yet Reviewed'), (2, b'In Kittendome'), (3, b'In Thunderdome'), (4, b'Accepted'), (5, b'Damaged'), (6, b'Rejected')])),
2121
('damaged_score', models.IntegerField(help_text="Numerical indicator of the amount of interest in a talk set to 'damaged' status.", null=True, blank=True)),
2222
('rejection_status', models.IntegerField(blank=True, help_text='The reason the proposal was rejected.', null=True, choices=[(1, b'Suggest re-submission as poster.'), (2, b'Suggest lightning talk.'), (3, b'Re-submitted under appropriate category.'), (4, b'Duplicate'), (5, b'Administrative Action (Other)'), (6, b"No really: rejected. It's just plain bad.")])),
23-
('recording_release', models.BooleanField(default=True, help_text="By submitting your talk proposal, you agree to give permission to the Python Software Foundation to record, edit, and release audio and/or video of your presentation. If you do not agree to this, please uncheck this box. See <a href='https://us.pycon.org/2016/speaking/recording/' target='_blank'>PyCon 2016 Recording Release</a> for details.")),
23+
('recording_release', models.BooleanField(default=True, help_text="By submitting your talk proposal, you agree to give permission to the Python Software Foundation to record, edit, and release audio and/or video of your presentation. If you do not agree to this, please uncheck this box. See <a href='https://us.pycon.org/2017/speaking/recording/' target='_blank'>PyCon 2017 Recording Release</a> for details.")),
2424
('additional_requirements', models.TextField(help_text="Please let us know if you have any specific needs (A/V requirements, multiple microphones, a table, etc). Note for example that 'audio out' is not provided for your computer unless you tell us in advance.", verbose_name='Additional requirements', blank=True)),
2525
('category', models.ForeignKey(to='pycon.PyConProposalCategory')),
2626
],

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
setup(
55
name='pycon',
6-
version='2016',
6+
version='2017',
77
packages=['pycon', 'pycon.profile', 'pycon.schedule', 'pycon.sponsorship',
88
'pycon.sponsorship.management',
99
'pycon.sponsorship.management.commands',

symposion/templates/proposals/proposal_speaker_manage.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
with selectable (JQuery UI)
1717
{% endcomment %}
1818
{% block extra_head_base %}
19-
<meta property="og:image" content="{% static "img/pycon2016-logo.png" %}" />
19+
<meta property="og:image" content="{% static "img/pycon2017-logo.png" %}" />
2020
<link href="{{ STATIC_URL }}img/favicon.ico" rel="shortcut icon" />
2121
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
2222
{% block extra_head %}{% endblock %}

symposion/templates/site_base.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
{% endblock %}
3636

3737
{% block extra_head_base %}
38-
<meta property="og:image" content="{% static "img/pycon2016-logo.png" %}" />
38+
<meta property="og:image" content="{% static "img/pycon2017-logo.png" %}" />
3939
<link href="{{ STATIC_URL }}img/favicon.ico" rel="shortcut icon" />
4040
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
4141
{% include "markedit/includes/markedit-js.html" %}

0 commit comments

Comments
 (0)