Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix talk topic and added event.time #13

Merged
merged 13 commits into from Mar 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion _events/2017-03-31_en.yaml
Expand Up @@ -2,6 +2,7 @@
sortDate: 20170331
title: 31 Марта 2017
lang: en
time: at 7 p.m.
upcoming: true
location: wix
# regLink: 'http://'
Expand All @@ -12,6 +13,6 @@ speakers:
topics:
shvayka:
name: A word on regular expressions
voronianski:
mostovenko:
name: l10n in ES6 with c-3po
---
3 changes: 2 additions & 1 deletion _events/2017-03-31_ru.yaml
Expand Up @@ -2,6 +2,7 @@
sortDate: 20170331
title: 31 Марта 2017
lang: ru
time: в 19:00
upcoming: true
location: wix
# regLink: 'http://'
Expand All @@ -12,6 +13,6 @@ speakers:
topics:
shvayka:
name: A word on regular expressions
voronianski:
mostovenko:
name: Локализация в ES6 с помощью c-3po
---
6 changes: 4 additions & 2 deletions _includes/event.html
@@ -1,7 +1,9 @@
{% assign event = include.event %}
<article class="event">
<header class="event__header">
<h1 class="event__title">{{ event.title }}</h1>
<h1 class="event__title">
{{ event.title }}{% if event.upcoming and event.time %}, {{event.time}}.{% endif %}
</h1>
{% if event.dou != nil %}
<h2 class="event__dou"><a href="{{event.dou}}" target="_blank">каледарь DOU</a></h2>
{% endif %}
Expand Down Expand Up @@ -37,4 +39,4 @@ <h5 class="human__talk">
{% endfor %}
</ul>
</div>
</article>
</article>
2 changes: 1 addition & 1 deletion _layouts/default.html
Expand Up @@ -32,7 +32,7 @@ <h1>{{page.nextTitle}}</h1>
{% assign location = site.data.locations[event.location][page.lang] %}
<address class="upcoming-info__location">
<label class="upcoming-info__show-map" for="{{event.sortDate}}map" title="{{commonStrings.showMap}}">
{{location.name}}, {{location.address}}
{{location.name}}, {{location.address}}, {{event.time}}
</label>
</address>
<input class="upcoming-info__map-toggler" type="checkbox" id="{{event.sortDate}}map">
Expand Down