diff --git a/TODO b/TODO index 69651ad..d05d697 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,6 @@ Content needed ============== - * Formatting for Resources * Media contact data Feedback needed diff --git a/assets/static/beeware.css b/assets/static/beeware.css index 393a7d7..ac985e9 100644 --- a/assets/static/beeware.css +++ b/assets/static/beeware.css @@ -125,7 +125,7 @@ h2 { font-family: 'Cutive', serif; font-size: 160%; margin: 1.8rem 0 0.8rem 0; - line-height: 2rem; + line-height: 1.6rem; } h2:first-child { @@ -136,7 +136,7 @@ h3 { font-family: 'Cutive', serif; font-size: 135%; margin: 1.8rem 0 0.8rem 0; - line-height: 2rem; + line-height: 1.6rem; } h3:first-child { @@ -147,7 +147,7 @@ h4 { font-family: 'Cutive', serif; margin: 1.8rem 0 0.8rem 0; font-size: 120%; - line-height: 2rem; + line-height: 1.6rem; } h4:first-child { @@ -159,7 +159,7 @@ h5 { font-family: 'Cutive', serif; font-size: 110%; margin: 1.8rem 0 0.8rem; - line-height: 2rem; + line-height: 1.6rem; } h6:first-child { @@ -170,7 +170,7 @@ h6 { font-family: 'Cutive', serif; margin: 1.8rem 0 0.8rem 0; font-size: 100%; - line-height: 2rem; + line-height: 1.6rem; } h6:first-child { @@ -332,7 +332,3 @@ body { /*---------------------------------------------------- Events --------------------------------------------------- */ - -.event { - display: none; -} diff --git a/content/news/events/dev-world-2016/contents.lr b/content/news/events/dev-world-2016/contents.lr new file mode 100644 index 0000000..339a383 --- /dev/null +++ b/content/news/events/dev-world-2016/contents.lr @@ -0,0 +1,20 @@ +title: /dev/world/2016 +--- +date: 2016-08-29 +--- +event_type: talk +--- +speaker: Russell Keith-Magee +--- +talk_title: Apple and the Serpent: Writing native applications for Apple platforms in Python +--- +upcoming: yes +--- +url: http://2016.devworld.com.au/ +--- +description: + +Everyone knows you can write iOS, OS X, tvOS and watchOS apps using Objective C and Swift, Apple's officially blessed technologies. But what if you want to use a different language? What if you've got an existing codebase in a different language, or want to us a language that is more approchable to people without a background in programming? + +This talk shows how Python can be used as a viable development language for Apple platforms. It explores the mechanics of how Python can interact with native Apple APIs, and demonstrates some related tools that make the process of creating an iOS, OS X, tvOS or watchOS project in Python relatively easy. + diff --git a/content/news/events/djangocon-us-2016-sprints/contents.lr b/content/news/events/djangocon-us-2016-sprints/contents.lr index 2c80445..f2cbca7 100644 --- a/content/news/events/djangocon-us-2016-sprints/contents.lr +++ b/content/news/events/djangocon-us-2016-sprints/contents.lr @@ -7,3 +7,5 @@ event_type: sprint speaker: Russell Keith-Magee, Philip James --- url: https://2016.djangocon.us/sprints/ +--- +upcoming: yes diff --git a/content/news/events/djangocon-us-2016/contents.lr b/content/news/events/djangocon-us-2016/contents.lr index 8f1ea1b..793bd44 100644 --- a/content/news/events/djangocon-us-2016/contents.lr +++ b/content/news/events/djangocon-us-2016/contents.lr @@ -9,3 +9,5 @@ event_type: attending speaker: Russell Keith-Magee, Philip James --- url: http://djangocon.us +--- +upcoming: yes diff --git a/content/news/events/pycon-au-2016-sprints/contents.lr b/content/news/events/pycon-au-2016-sprints/contents.lr index 1e1507e..d367a08 100644 --- a/content/news/events/pycon-au-2016-sprints/contents.lr +++ b/content/news/events/pycon-au-2016-sprints/contents.lr @@ -7,3 +7,5 @@ event_type: sprint url: https://2016.pycon-au.org/ --- speaker: Russell Keith-Magee, Katie McLaughlin +--- +upcoming: yes diff --git a/content/news/events/pycon-us-2016-sprints/contents.lr b/content/news/events/pycon-us-2016-sprints/contents.lr index 81dbad7..0847334 100644 --- a/content/news/events/pycon-us-2016-sprints/contents.lr +++ b/content/news/events/pycon-us-2016-sprints/contents.lr @@ -7,3 +7,5 @@ event_type: sprint speaker: Philip James, Katie McLaughlin, Russell Keith-Magee --- url: https://2016.pycon.us +--- +upcoming: no \ No newline at end of file diff --git a/content/news/events/pycon-us-2016/contents.lr b/content/news/events/pycon-us-2016/contents.lr index 4b5bd6b..740c512 100644 --- a/content/news/events/pycon-us-2016/contents.lr +++ b/content/news/events/pycon-us-2016/contents.lr @@ -9,3 +9,5 @@ speaker: Russell Keith-Magee talk_title: A Tale of Two Cellphones --- url: https://2016.pycon.us +--- +upcoming: no diff --git a/content/news/events/pycon-us-2016/pycon-us-2016-sprints/contents.lr b/content/news/events/pycon-us-2016/pycon-us-2016-sprints/contents.lr deleted file mode 100644 index 41518fa..0000000 --- a/content/news/events/pycon-us-2016/pycon-us-2016-sprints/contents.lr +++ /dev/null @@ -1,3 +0,0 @@ -_model: page ---- -title: PyCon US 2016-sprints diff --git a/content/news/events/pygotham-2016/contents.lr b/content/news/events/pygotham-2016/contents.lr index 2297211..5b008ff 100644 --- a/content/news/events/pygotham-2016/contents.lr +++ b/content/news/events/pygotham-2016/contents.lr @@ -13,3 +13,5 @@ event_type: talk speaker: Russell Keith-Magee --- talk_title: A Tale Of Two Cellphones +--- +upcoming: yes diff --git a/content/news/events/pyohio-2016-sprints/contents.lr b/content/news/events/pyohio-2016-sprints/contents.lr index 1fef50a..8b0e864 100644 --- a/content/news/events/pyohio-2016-sprints/contents.lr +++ b/content/news/events/pyohio-2016-sprints/contents.lr @@ -7,3 +7,5 @@ event_type: sprint url: http://pyohio.org/sprints/ --- speaker: Russell Keith-Magee +--- +upcoming: yes diff --git a/content/news/events/pyohio-2016/contents.lr b/content/news/events/pyohio-2016/contents.lr index 44351ee..b447a7e 100644 --- a/content/news/events/pyohio-2016/contents.lr +++ b/content/news/events/pyohio-2016/contents.lr @@ -9,3 +9,5 @@ speaker: Russell Keith-Magee url: http://pyohio.org/schedule/presentation/249/ --- talk_title: Snakes in a Browser +--- +upcoming: yes diff --git a/models/event.ini b/models/event.ini index 51dc3ed..d5a9ce6 100644 --- a/models/event.ini +++ b/models/event.ini @@ -13,29 +13,34 @@ label = Event Type type = select choices = talk, sprint, booth, attending choice_labels = Talk, Sprint, Booth, Attending -width = 1/4 +width = 1/2 [fields.speaker] label = Speakers type = checkboxes choices = Russell Keith-Magee, Philip James, Katie McLaughlin choice_labels = Russell Keith-Magee, Philip James, Katie McLaughlin - width = 1/2 [fields.url] label = Event URL type = url - -[fields.talk_title] -label = Talk Title -type = string +width = 1/2 [fields.date] label = Event date type = date width = 1/4 +[fields.upcoming] +label = Upcoming event +type = boolean +width = 1/4 + +[fields.talk_title] +label = Talk Title +type = string + [fields.description] label = Description type = rst diff --git a/templates/events.html b/templates/events.html index 8e99c18..975bb34 100644 --- a/templates/events.html +++ b/templates/events.html @@ -8,13 +8,7 @@ $('.upcoming.event').each(function() { var event_date = new Date($(this).data('date')); if (event_date >= today) { - $(this).show(); - } - }); - $('.past.event').each(function() { - var event_date = new Date($(this).data('date')); - if (event_date < today) { - $(this).show(); + // $(this).hide(); } }); })(); @@ -31,11 +25,11 @@ {% endblock %} {% block main %}

Upcoming events

-{% for child in this.children %} +{% for child in this.children.filter(F.upcoming == True) %}

{{ child.date.strftime("%-d %B %Y") }} {{ child.title }}

{% endfor %}

Past events

-{% for child in this.children.order_by('-date') %} +{% for child in this.children.filter(F.upcoming == False).order_by('-date') %}

{{ child.date.strftime("%-d %B %Y") }} {{ child.title }}

{% endfor %} {% endblock %} diff --git a/templates/home.html b/templates/home.html index 7dac5fc..bfe086f 100644 --- a/templates/home.html +++ b/templates/home.html @@ -98,7 +98,7 @@

Meet the Bee Team @

- {% set events = site.query('/news/events').all() %} + {% set events = site.query('/news/events').filter(F.upcoming==True) %}