Skip to content

Commit

Permalink
Add talks schedule for MEL. Fix 'Speakers TBA' message on MEL. Allow …
Browse files Browse the repository at this point in the history 
…long titles to use more than 60px height. Abstract talks schedule on main page.
  • Loading branch information
@aj-hamilton
aj-hamilton committed Oct 20, 2018
1 parent 45bb0d9 commit 80b3572
Show file tree
Hide file tree
Showing 6 changed files with 137 additions and 123 deletions.
1 change: 1 addition & 0 deletions _events/brisbane.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ layout: event
title: Brisbane
city: brisbane
eventdate: November 9th to 11th
friendly_talkdate: Friday evening
friendly_eventdate: All weekend
pretix_event_id: 2617
learn_more_link: "/brisbane"
Expand Down
1 change: 1 addition & 0 deletions _events/melbourne.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ layout: event
title: Melbourne
city: melbourne
eventdate: November 9th to 11th
friendly_talkdate: Friday evening
friendly_eventdate: All weekend
pretix_event_id: 2616
learn_more_link: "/melbourne"
Expand Down
10 changes: 6 additions & 4 deletions _includes/rsvp.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<hr>
{% if page.city == 'brisbane' %}
### The Talks
#### {{ page.friendly_talkdate }}
{% if page.city == 'brisbane' %}
We have talks from Dr Monique Mann of the *Australian Privacy Foundation*, Angus Murray of the *Queensland Council for Civil Liberties* and Tim Wilson Brown of *the TOR project* on **9th November**

<div class="center"><a class="button" href="{{ page.rsvp_link}}">Register now</a></div>
{% elsif page.city == 'melbourne' %}
The talks are still being finalised, check back soon.
{% endif %}
<div class="center"><a class="button" href="{{ page.rsvp_link }}">Register now</a></div>

### The Hack
#### {{ page.friendly_eventdate }}
Expand All @@ -22,7 +24,7 @@ We need developers, experience designers, visual designers, quality analysts, bu

We'll form teams – you don't need to be an expert in any field.

<div class="center"><a class="button" href="{{ page.rsvp_link}}">Register now</a></div>
<div class="center"><a class="button" href="{{ page.rsvp_link }}">Register now</a></div>

<hr>

Expand Down
58 changes: 33 additions & 25 deletions _includes/time-schedule.html
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,51 @@

<div class="time-schedule">
<h1>Schedule</h1>
<h1 id="schedule">Schedule</h1>

<div class="day-blob">
<b>Friday:</b>
<ul>
<li> <span> 17:30 </span> Arrive, Drinks, Pizza </li>
<li> <span> 18:15 </span> Monique Mann on *ASS Access but not a backdoor* </li>
<li> <span> 18:35 </span> Angus Murray on *IP and trade secrets and transparency* </li>
<li> <span> 18:55 </span> Tim Wilson-Brown on *Working Together for Online Freedom* </li>
<li> <span> 19:15 </span> Pitching warm up </li>
<li> <span> 19:45 </span> Pitches </li>
<li> <span> 20:00 </span> Form teams </li>
<li> <span> 22:00 </span> Close </li>
<li> <span> 17:30 </span> Arrive, Drinks, Pizza </li>
{% if page.city=='brisbane' %}
<li> <span> 18:15 </span> Monique Mann on *ASS Access but not a backdoor* </li>
<li> <span> 18:35 </span> Angus Murray on *IP and trade secrets and transparency* </li>
<li> <span> 18:55 </span> Tim Wilson-Brown on *Working Together for Online Freedom* </li>
{% elsif page.city=='melbourne' %}
<li> <span> 18:15 </span> Talks from industry professionals. Check back soon to find out more.</li>
{% else %}
<li> <span> 18:15 </span> Talks from industry professionals.
See the <a href="./brisbane#schedule">Brisbane</a> and
<a href="./melbourne#schedule">Melbourne</a> schedules to find out more.</li>
{% endif %}
<li> <span> 19:15 </span> Pitching warm up </li>
<li> <span> 19:45 </span> Pitches </li>
<li> <span> 20:00 </span> Form teams </li>
<li> <span> 22:00 </span> Close </li>
</ul>
</div>

<div class="day-blob">
<b>Saturday:</b>
<ul>
<li> <span> 08:00 </span> Doors open </li>
<li> <span> 08:30 </span> Breakfast </li>
<li> <span> 09:00 </span> Hacking with your team and problem owners</li>
<li> <span> 12:00 </span> Lunch </li>
<li> <span> 18:00 </span> Close </li>
<li> <span> 08:00 </span> Doors open </li>
<li> <span> 08:30 </span> Breakfast </li>
<li> <span> 09:00 </span> Hacking with your team and problem owners</li>
<li> <span> 12:00 </span> Lunch </li>
<li> <span> 18:00 </span> Close </li>
</ul>
</div>

<div class="day-blob">
<b>Sunday:</b>
<ul>
<li> <span> 08:00 </span> Doors open </li>
<li> <span> 09:00 </span> Breakfast </li>
<li> <span> 10:00 </span> Dial in to <a href="https://www.aaronswartzday.org/sfhackathon/">San Fransisco</a> for a live
interview with Barret Brown and others from the <a
href="https://www.aaronswartzday.org/pursuance-project/">Pursuance Project</a></li>
<li> <span> 15:30 </span> Team presentations </li>
<li> <span> 16:30 </span> Awards Ceremony </li>
<li> <span> 17:00 </span> Drinks, Pizza </li>
<li> <span> 08:00 </span> Doors open </li>
<li> <span> 09:00 </span> Breakfast </li>
<li> <span> 10:00 </span> Dial in to <a href="https://www.aaronswartzday.org/sfhackathon/">San Fransisco</a>
for a live
interview with Barret Brown and others from the <a href="https://www.aaronswartzday.org/pursuance-project/">Pursuance
Project</a></li>
<li> <span> 15:30 </span> Team presentations </li>
<li> <span> 16:30 </span> Awards Ceremony </li>
<li> <span> 17:00 </span> Drinks, Pizza </li>
</ul>
</div>
</div>
188 changes: 95 additions & 93 deletions _layouts/event.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ <h4 id="brief-overview">

<div class="posts">
<div class="post-teaser">
<header><h1>RSVP</h1></header>
<header>
<h1>RSVP</h1>
</header>
<div class="excerpt">{% capture rsvp %}{% include rsvp.md %}{% endcapture %}{{ rsvp | markdownify }}</div>
</div>
</div>
Expand All @@ -42,10 +44,10 @@ <h2>{{ page.location.title }}</h2>
<a name="speakers" id="speakers"></a>
<section class="speakers-or-judges">
<h1>Speakers</h1>
{% assign numSpeakers = site.speakers | size %}
{% if numSpeakers == 0 %}
{% assign speaker_cities = site.speakers | map: "cities" | uniq %}
{% unless speaker_cities contains page.city %}
<p>Speakers TBA</p>
{% endif %}
{% endunless %}
{% for person in site.speakers %}
{% if person.cities contains page.city %}
{% if person.headline %}
Expand Down Expand Up @@ -75,9 +77,7 @@ <h1>Judges</h1>
<div class="posts">
<div class="post-teaser">
<div class="excerpt">
{% if page.city=='brisbane' %}
{% capture markdown %}{% include time-schedule.html %}{% endcapture %}{{ markdown | markdownify }}
{% endif %}
{% capture markdown %}{% include time-schedule.html %}{% endcapture %}{{ markdown | markdownify }}
</div>
</div>
</div>
Expand All @@ -98,9 +98,11 @@ <h1>Sponsors</h1>
</section>

<div class="post-teaser idea">
<header><h1>Project ideas for the hackathon</h1></header>
<header>
<h1>Project ideas for the hackathon</h1>
</header>
<div class="excerpt">
{% capture idea %}{% include ideas-current.md %}{% endcapture %}{{ idea | markdownify }}
{% capture idea %}{% include ideas-current.md %}{% endcapture %}{{ idea | markdownify }}
</div>
<!--<div class="excerpt">{% capture idea %}{% include suggest_an_idea.md %}{% endcapture %}{{ idea | markdownify }}</div>-->
</div>
Expand All @@ -117,89 +119,89 @@ <h1>Sponsors</h1>

<!--<div class="home">-->

<!--<div class="posts">-->
<!--&lt;!&ndash; <div class="post-teaser">-->
<!--<header><h1>RSVP</h1></header>-->
<!--<div class="excerpt center">{% capture rsvp %}{% include rsvp.md %}{% endcapture %}{{ rsvp | markdownify }}</div>-->
<!--</div> &ndash;&gt;-->
<!--<div class="post-teaser interest">-->
<!--<header><h1>Registration for Aaron Swartz Day 2018</h1></header>-->
<!--<div class="excerpt">{% capture interest %}{% include register_interest.md %}{% endcapture %}{{ interest | markdownify }}</div>-->
<!--</div>-->
<!--&lt;!&ndash; <div class="post-teaser idea">-->
<!--<header><h1>Suggest an idea</h1></header>-->
<!--<div class="excerpt">{% capture idea %}{% include suggest_an_idea.md %}{% endcapture %}{{ idea | markdownify }}</div>-->
<!--</div> &ndash;&gt;-->
<!--</div>-->

<!--<div class="call-out" style="background-image: url('{{ site.baseurl }}/{{ site.theme_settings.header_text_feature_image }}')">-->
<!--<div class="{{ page.city }}-tint">-->
<!--<h1 id="hackathon-title">-->
<!--{{ site.theme_settings.title }}: {{site.theme_settings.subtitle }}-->
<!--</h1>-->
<!--<h4 id="hackathon-theme">-->
<!--{{ page.title }} - <nobr>{{ page.eventdate }}</nobr>-->
<!--</h4>-->

<!--<h4 id="brief-overview">-->
<!--{{ site.theme_settings.header_text }}-->
<!--</h4>-->
<!--</div>-->
<!--</div>-->

<!--<a name="speakers" id="speakers"></a>-->
<!--<section class="speakers-or-judges">-->
<!--<h1>Speakers</h1>-->
<!--{% for person in site.speakers %}-->
<!--{% if person.cities contains page.city %}-->
<!--{% if person.headline %}-->
<!--{% include speaker_or_judge.html person=person %}-->
<!--{% endif %}-->
<!--{% endif %}-->
<!--{% endfor %}-->
<!--{% for person in site.speakers %}-->
<!--{% if person.cities contains page.city %}-->
<!--{% unless person.headline %}-->
<!--{% include speaker_or_judge.html person=person %}-->
<!--{% endunless %}-->
<!--{% endif %}-->
<!--{% endfor %}-->
<!--{% comment %}-->
<!--<h1>Judges</h1>-->
<!--{% for person in site.judges %}-->
<!--{% if person.cities contains page.city %}-->
<!--{% include speaker_or_judge.html person=person %}-->
<!--{% endif %}-->
<!--{% endfor %}-->
<!--{% endcomment %}-->
<!--</section>-->

<!--<section class="location">-->
<!--<h1>Location</h1>-->
<!--<div class="location-container">-->
<!--<div class="map">-->
<!--{% google_map zoom="15" class="google-map" %}-->
<!--</div>-->
<!--<div class="address">-->
<!--<h2>{{ page.location.title }}</h2>-->
<!--{{ page.location.address }}-->
<!--</div>-->
<!--</div>-->
<!--</section>-->

<!--<section class="partners-or-sponsors">-->
<!--<h1>Partners</h1>-->
<!--<div class="grid">-->
<!--{% for org in site.partners %}-->
<!--{% include partner_or_sponsor.html org=org %}-->
<!--{% endfor %}-->
<!--</div>-->
<!--<h1>Sponsors</h1>-->
<!--<div class="grid">-->
<!--{% for org in site.sponsors %}-->
<!--{% include partner_or_sponsor.html org=org %}-->
<!--{% endfor %}-->
<!--</div>-->
<!--</section>-->
<!--<div class="posts">-->
<!--&lt;!&ndash; <div class="post-teaser">-->
<!--<header><h1>RSVP</h1></header>-->
<!--<div class="excerpt center">{% capture rsvp %}{% include rsvp.md %}{% endcapture %}{{ rsvp | markdownify }}</div>-->
<!--</div> &ndash;&gt;-->
<!--<div class="post-teaser interest">-->
<!--<header><h1>Registration for Aaron Swartz Day 2018</h1></header>-->
<!--<div class="excerpt">{% capture interest %}{% include register_interest.md %}{% endcapture %}{{ interest | markdownify }}</div>-->
<!--</div>-->
<!--&lt;!&ndash; <div class="post-teaser idea">-->
<!--<header><h1>Suggest an idea</h1></header>-->
<!--<div class="excerpt">{% capture idea %}{% include suggest_an_idea.md %}{% endcapture %}{{ idea | markdownify }}</div>-->
<!--</div> &ndash;&gt;-->
<!--</div>-->

<!--<div class="call-out" style="background-image: url('{{ site.baseurl }}/{{ site.theme_settings.header_text_feature_image }}')">-->
<!--<div class="{{ page.city }}-tint">-->
<!--<h1 id="hackathon-title">-->
<!--{{ site.theme_settings.title }}: {{site.theme_settings.subtitle }}-->
<!--</h1>-->
<!--<h4 id="hackathon-theme">-->
<!--{{ page.title }} - <nobr>{{ page.eventdate }}</nobr>-->
<!--</h4>-->

<!--<h4 id="brief-overview">-->
<!--{{ site.theme_settings.header_text }}-->
<!--</h4>-->
<!--</div>-->
<!--</div>-->

<!--<a name="speakers" id="speakers"></a>-->
<!--<section class="speakers-or-judges">-->
<!--<h1>Speakers</h1>-->
<!--{% for person in site.speakers %}-->
<!--{% if person.cities contains page.city %}-->
<!--{% if person.headline %}-->
<!--{% include speaker_or_judge.html person=person %}-->
<!--{% endif %}-->
<!--{% endif %}-->
<!--{% endfor %}-->
<!--{% for person in site.speakers %}-->
<!--{% if person.cities contains page.city %}-->
<!--{% unless person.headline %}-->
<!--{% include speaker_or_judge.html person=person %}-->
<!--{% endunless %}-->
<!--{% endif %}-->
<!--{% endfor %}-->
<!--{% comment %}-->
<!--<h1>Judges</h1>-->
<!--{% for person in site.judges %}-->
<!--{% if person.cities contains page.city %}-->
<!--{% include speaker_or_judge.html person=person %}-->
<!--{% endif %}-->
<!--{% endfor %}-->
<!--{% endcomment %}-->
<!--</section>-->

<!--<section class="location">-->
<!--<h1>Location</h1>-->
<!--<div class="location-container">-->
<!--<div class="map">-->
<!--{% google_map zoom="15" class="google-map" %}-->
<!--</div>-->
<!--<div class="address">-->
<!--<h2>{{ page.location.title }}</h2>-->
<!--{{ page.location.address }}-->
<!--</div>-->
<!--</div>-->
<!--</section>-->

<!--<section class="partners-or-sponsors">-->
<!--<h1>Partners</h1>-->
<!--<div class="grid">-->
<!--{% for org in site.partners %}-->
<!--{% include partner_or_sponsor.html org=org %}-->
<!--{% endfor %}-->
<!--</div>-->
<!--<h1>Sponsors</h1>-->
<!--<div class="grid">-->
<!--{% for org in site.sponsors %}-->
<!--{% include partner_or_sponsor.html org=org %}-->
<!--{% endfor %}-->
<!--</div>-->
<!--</section>-->

<!--</div>-->
2 changes: 1 addition & 1 deletion _sass/static-contents/content-tiles.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
font-weight: bold;
text-transform: uppercase;
padding: 0 0 20px 0;
height: 60px;
min-height: 60px;
}

.image-section {
Expand Down

0 comments on commit 80b3572

Please sign in to comment.