Merge branch 'master' into talks
This commit is contained in:
commit
bd1c285366
34 changed files with 73 additions and 57 deletions
116
source/_layouts/default.html.twig
Normal file
116
source/_layouts/default.html.twig
Normal file
|
|
@ -0,0 +1,116 @@
|
|||
<!DOCTYPE html>
|
||||
<!--[if lte IE 8]><html lang="{{ site.html_lang }}" class="ie ie8 lt9 lte8 lte7"> <![endif]-->
|
||||
<!--[if IE 9]><html lang="{{ site.html_lang }}" class="ie ie9 lte9"> <![endif]-->
|
||||
<!--[if gt IE 9]><html lang="{{ site.html_lang }}"><![endif]-->
|
||||
<!--[if !IE]><!--><html lang="{{ site.html_lang }}"><!--<![endif]-->
|
||||
<head>
|
||||
{% include 'title' %}
|
||||
|
||||
{% if page.meta.description %}
|
||||
<meta name="description" content="{{ page.meta.description|e('html') }}">
|
||||
{% endif %}
|
||||
|
||||
{% if page.meta.og %}
|
||||
{% include "og" with { og: page.meta.og } %}
|
||||
{% endif %}
|
||||
|
||||
<meta lang="{{ site.html_lang }}" charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<link rel="stylesheet" href="{{ site.url }}/css/styles.css">
|
||||
<link rel="stylesheet" href="{{ site.url }}/components/bootswatch/cosmo/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css">
|
||||
<link rel="stylesheet" href="{{ site.url }}/components/font-awesome/css/font-awesome.min.css">
|
||||
|
||||
{% for size in site.apple_touch_icon_sizes %}
|
||||
<link rel="apple-touch-icon" href="{{ site.gravatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">
|
||||
{% endfor %}
|
||||
|
||||
{% for size in site.favicon_sizes %}
|
||||
<link rel="icon" href="{{ site.gravatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">
|
||||
{% endfor %}
|
||||
</head>
|
||||
<body{% if page.blocks.body_classes %} class="{{ page.blocks.body_classes }}"{% endif %}>
|
||||
<nav class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="{{ site.url }}/">{{ site.title }}</a>
|
||||
</div>
|
||||
|
||||
<div id="navbar" class="collapse navbar-collapse" role="navigation">
|
||||
<ul class="nav navbar-nav">
|
||||
{% for name, item in site.main_menu %}
|
||||
<li{% if page.nav == name %} class="active"{% endif %}>
|
||||
<a href="{{ item.href }}">{{ item.title }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>{# .nav-collapse #}
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
{% block content_wrapper %}
|
||||
<main class="col-md-9">
|
||||
{% block content %}{% endblock content %}
|
||||
</main>
|
||||
{% endblock content_wrapper %}
|
||||
|
||||
{% block sidebar_wrapper %}
|
||||
<div class="col-md-3">
|
||||
{% block sidebar %}
|
||||
<div class="panel">
|
||||
<a href="https://assoc.drupal.org/membership" title="Become a Drupal Association member">
|
||||
<img src="{{ site.url }}/assets/images/da-individual-member.png" alt="Drupal Association Individual Member" width="150">
|
||||
</a>
|
||||
|
||||
<a href="https://events.drupal.org/barcelona2015">
|
||||
<img src="{{ site.url }}/assets/images/drupalcon-barcelona.png" alt="I’m attending DrupalCon Barcelona." width="150">
|
||||
</a>
|
||||
</div>
|
||||
|
||||
{% include 'availability' %}
|
||||
{% endblock sidebar %}
|
||||
</div>
|
||||
{% endblock sidebar_wrapper %}
|
||||
</div>{# .row #}
|
||||
</div>{# .container #}
|
||||
|
||||
<footer class="container">
|
||||
<p class="copyright">© 2010-{{ 'now'|date('Y') }} {{ site.title }}. Powered by <a href="https://sculpin.io">Sculpin</a> and <a href="https://www.digitalocean.com/?refcode={{ site.digitalocean_referral }}">DigitalOcean</a>.</p>
|
||||
|
||||
{% include 'meetups' %}
|
||||
</footer>
|
||||
|
||||
<script src="{{ site.url }}/components/jquery/jquery.min.js"></script>
|
||||
<script src="{{ site.url }}/components/bootstrap/js/bootstrap.min.js"></script>
|
||||
<script src="{{ site.url }}/components/highlightjs/highlight.pack.js"></script>
|
||||
<script>hljs.initHighlightingOnLoad();</script>
|
||||
|
||||
{% block scripts %}{% endblock scripts %}
|
||||
|
||||
{% if page.tweets %}
|
||||
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
|
||||
{% endif %}
|
||||
|
||||
{% if site.google_analytics_tracking_id %}
|
||||
<script>
|
||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
||||
|
||||
ga('create', '{{ site.google_analytics_tracking_id }}', 'auto');
|
||||
ga('send', 'pageview');
|
||||
</script>
|
||||
{% endif %}
|
||||
</body>
|
||||
</html>
|
||||
50
source/_layouts/post.html.twig
Normal file
50
source/_layouts/post.html.twig
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{% extends 'default.html.twig' %}
|
||||
|
||||
{% block content_wrapper %}
|
||||
<main class="col-md-9">
|
||||
{% include 'post-header' %}
|
||||
|
||||
{% block content %}{% endblock content %}
|
||||
|
||||
<p class="post-feedback" style="font-style: italic">
|
||||
<b>Have feedback about this post?</b> <a href="mailto:{{ site.email }}?subject=Feedback: {{ page.title }}">Email me</a> or <a href="https://twitter.com/home?status=@{{ site.twitter.name }} {{ site.url }}{{ page.url }}:">send me a tweet</a>.
|
||||
</p>
|
||||
|
||||
{% if page.related -%}
|
||||
<h2>Related Posts</h2>
|
||||
|
||||
<ul>
|
||||
{% for relate in page.related -%}
|
||||
<li>
|
||||
<a href="{{ relate.source.url }}">{{ relate.title }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{%- endif %}
|
||||
|
||||
{% if page.tags %}
|
||||
<p class="tags">
|
||||
Tags:
|
||||
{% for tag in page.tags %}
|
||||
<a href="{{ site.url }}/blog/tags/{{ tag|url_encode(true) }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}
|
||||
{% endfor %}
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
<div class="about-author">
|
||||
<h2>About the Author</h2>
|
||||
|
||||
<img src="{{ site.gravatar.url }}?s=50" alt="Picture of Oliver" class="img-circle">
|
||||
|
||||
<p>{{ site.author.bio|raw }}</p>
|
||||
</div>
|
||||
|
||||
{% if page.next_post or page.previous_post %}
|
||||
<ul>
|
||||
{% if page.next_post %}<li>Next post: <a href="{{ page.next_post.url }}">{{ page.next_post.title }}</a></li>{% endif %}
|
||||
{% if page.previous_post %}<li>Previous post: <a href="{{ page.previous_post.url }}">{{ page.previous_post.title }}</a></li>{% endif %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
|
||||
</main>
|
||||
{% endblock content_wrapper %}
|
||||
22
source/_layouts/talk.html.twig
Normal file
22
source/_layouts/talk.html.twig
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{% extends 'default.html.twig' %}
|
||||
|
||||
{% block content_wrapper %}
|
||||
<main class="col-md-9">
|
||||
<h1>{{ page.title }}</h1>
|
||||
|
||||
<p>
|
||||
At {{ page.event.name }} -
|
||||
{% spaceless %}{% if page.fuzzy_date %}
|
||||
{{ page.date|date(site.fuzzy_date_format) }}
|
||||
{% else %}
|
||||
{{ page.date|date(site.default_date_format) }}
|
||||
{% endif %}{% endspaceless %}.
|
||||
</p>
|
||||
|
||||
{{ page.blocks.content|raw }}
|
||||
|
||||
{% if page.slides.embed %}
|
||||
{{ page.slides.embed|raw }}
|
||||
{% endif %}
|
||||
</main>
|
||||
{% endblock content_wrapper %}
|
||||
Loading…
Add table
Add a link
Reference in a new issue