Merge branch 'master' into develop
This commit is contained in:
commit
993baa5e5e
9 changed files with 90 additions and 3 deletions
|
@ -40,3 +40,7 @@
|
|||
<meta name="twitter:text:description" content="{{ og.description|raw }}"/>
|
||||
<meta name="twitter:site" content="@{{ site.twitter.name }}"/>
|
||||
{% endif %}
|
||||
|
||||
{% if page.hide_page %}
|
||||
<meta name="robots" content="no-index, no-follow">
|
||||
{% endif %}
|
||||
|
|
|
@ -23,9 +23,13 @@
|
|||
|
||||
{% if not hide_talk %}
|
||||
<td>
|
||||
<a href="{{ event.talk.url }}">
|
||||
{% if not event.talk.hide_page %}
|
||||
<a href="{{ event.talk.url }}">
|
||||
{{ event.talk.title }}
|
||||
</a>
|
||||
{% else %}
|
||||
{{ event.talk.title }}
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
{% if event.talk.type %}
|
||||
<small class="talk-type">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue