Skip to content

Commit 1e9f904

Browse files
committed
first pass 2018
1 parent 492549f commit 1e9f904

23 files changed

+247
-101
lines changed

README.rst

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

22
=====================
3-
PyCon 2017 Web Site
3+
PyCon 2018 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 2017 is built on top of Pinax Symposion but may have customizations that
11+
PyCon 2018 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
@@ -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 ``/2017/site_media/whatever``.
103-
E.g. ``site_media/foo.html`` would be at ``/2017/site_media/foo.html``.
102+
* Arrange to serve the site_media directory as ``/2018/site_media/whatever``.
103+
E.g. ``site_media/foo.html`` would be at ``/2018/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 ``/2017`` though, so you don't have to pass it any other requests.
106+
starting with ``/2018`` 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/2017/ in your browser.
8+
You can view the site at http://localhost:8000/2018/ in your browser.
99
To log into the site, create a user with an email address and password:
1010

1111
./manage.py createsuperuser

develop/tools/import-list.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ then
1717
exit 1
1818
fi
1919

20-
psql "${1:-pycon2017}" <<'EOF'
20+
psql "${1:-pycon2018}" <<'EOF'
2121
2222
begin;
2323

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="/2017/schedule/tutorials/" target="_top">
18+
<a class="tutorials" xlink:href="/2018/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="/2017/schedule/tutorials/" target="_top">
24+
<a class="tutorials" xlink:href="/2018/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="/2017/schedule/sponsor-tutorials/" target="_top">
34+
<a class="workshops" xlink:href="/2018/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="/2017/schedule/talks/" target="_top" class="talks">
48+
<a xlink:href="/2018/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="/2017/events/{{slug}}/" target="_top" class="summit">
68+
<a xlink:href="/2018/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="/2017/events/reception/" target="_top" class="event">
133+
<a xlink:href="/2018/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="/2017/{{slug}}/" target="_top" class="event">
145+
<a xlink:href="/2018/{{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="/2017/events/open-spaces/" target="_top" class="open-spaces"
149+
<a xlink:href="/2018/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="/2017/sponsors/exhibitfloor/" target="_top" class="expo"
172+
<a xlink:href="/2018/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="/2017/sponsors/exhibitfloor/" target="_top" class="expo"
183+
<a xlink:href="/2018/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>

pycon/finaid/forms.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def validate_is_checked(value):
1616

1717
class FinancialAidApplicationForm(forms.ModelForm):
1818
i_have_read = forms.BooleanField(
19-
label='I have read the <a href="https://us.pycon.org/2017/financial-assistance/">Financial Assistance</a> page',
19+
label='I have read the <a href="/2018/financial-assistance/">Financial Assistance</a> page',
2020
required=False, # so our own validator gets called
2121
validators=[validate_is_checked],
2222
)

pycon/models.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ class PyConProposal(ProposalBase):
117117
u"the Python Software Foundation to record, edit, and release audio "
118118
u"and/or video of your presentation. If you do not agree to this, "
119119
u"please uncheck this box. See "
120-
u"<a href='https://us.pycon.org/2017/speaking/recording/' "
121-
u"target='_blank'>PyCon 2017 Recording Release</a> for details.")
120+
u"<a href='/2018/speaking/recording/' "
121+
u"target='_blank'>PyCon 2018 Recording Release</a> for details.")
122122
)
123123

124124
additional_requirements = models.TextField(

pycon/settings/base.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def env_or_default(NAME, default):
1515
return os.environ.get(NAME, default)
1616

1717

18-
CONFERENCE_YEAR = "2017"
18+
CONFERENCE_YEAR = "2018"
1919

2020
# Top level of our source / repository
2121
PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),
@@ -307,10 +307,10 @@ def env_or_default(NAME, default):
307307
# (10) In the Create Client ID popup, select
308308
# Application type: Web application
309309
# Authorized JS origins: Your site base URL (e.g. https://staging-pycon.python.org,
310-
# not https://staging-pycon.python.org/2017/)
310+
# not https://staging-pycon.python.org/2018/)
311311
# Authorized redirect URIs: Should be the same base URL, plus
312312
# YYYY/account/social/complete/google-oauth2/ - e.g.
313-
# https://staging-pycon.python.org/2017/account/social/complete/google-oauth2/
313+
# https://staging-pycon.python.org/2018/account/social/complete/google-oauth2/
314314
# (11) Copy the displayed client ID and client secret
315315

316316
# Google OAuth2 won't work without these defined, but not having them defined

pycon/sponsorship/models.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# Column titles are arbitrary.
2929

3030
BENEFITS = [
31-
# Print logo not being used for 2017 but keep it in anyway
31+
# Print logo not being used for 2018 but keep it in anyway
3232
{
3333
'name': 'Print logo',
3434
'field_name': 'print_logo_benefit',
@@ -98,13 +98,13 @@ class Sponsor(models.Model):
9898
wants_table = models.BooleanField(
9999
_(
100100
'Does your organization want a table at the job fair? '
101-
'(See <a href="/2017/sponsors/fees/">Estimated Sponsor Fees</a> '
101+
'(See <a href="/2018/sponsors/fees/">Estimated Sponsor Fees</a> '
102102
'for costs that might be involved.)'
103103
), default=False)
104104
wants_booth = models.BooleanField(
105105
_(
106106
'Does your organization want a booth on the expo floor? '
107-
'(See <a href="/2017/sponsors/fees/">Estimated Sponsor Fees</a> '
107+
'(See <a href="/2018/sponsors/fees/">Estimated Sponsor Fees</a> '
108108
'for costs that might be involved.)'
109109
), default=False)
110110
small_entity_discount = models.BooleanField(

0 commit comments

Comments
 (0)