Skip to content
This repository was archived by the owner on Apr 7, 2019. It is now read-only.

Commit e350a71

Browse files
EvanLovelyEvanLovely
committed
improving template and layout inheritance
1 parent fc53819 commit e350a71

File tree

8 files changed

+87
-59
lines changed

8 files changed

+87
-59
lines changed

‎dist/_patterns/03-templates/00-layouts/00-site.twig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<div class="page" id="page">
2+
{% include "organisms-header" %}
3+
<div role="main">
4+
{% block hero %}{% endblock %}
5+
{% block title %}{% endblock %}
6+
{% block content %}{% endblock %}
7+
</div><!--End role=main-->
8+
{% include "organisms-footer" %}
9+
</div>

‎dist/_patterns/03-templates/00-layouts/01-page-1col.twig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{% extends "templates-site" %}
2+
{% block content %}
3+
<div class="l-one-col">
4+
<div class="l-main">
5+
{% block main %}
6+
<p>Content Placeholder</p>
7+
{% endblock %}
8+
</div>
9+
</div>
10+
{% endblock %}

‎dist/_patterns/03-templates/00-layouts/01-page-2col.twig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{% extends "templates-site" %}
2+
{% block content %}
3+
<div class="l-two-col">
4+
<div class="l-main">
5+
{% block main %}
6+
<p>Content Placeholder</p>
7+
{% endblock %}
8+
</div>
9+
<div class="l-sidebar">
10+
{% block sidebar %}
11+
<h3>Sidebar</h3>
12+
{% endblock %}
13+
</div>
14+
</div>
15+
{% endblock %}

‎dist/_patterns/03-templates/00-site.twig

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎dist/_patterns/03-templates/01-homepage.twig

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{% extends "templates-site" %}
2-
{% block content %}
1+
{% extends "templates-page-2col" %}
2+
{% block hero %}
33
{% if emergency %}
44
{% include "molecules-alert" with emergency %}
55
{% endif %}
@@ -16,22 +16,20 @@
1616
</div><!--end 3up-->
1717

1818
<hr/>
19-
20-
<div class="l-two-col">
21-
<div class="l-main">
22-
<section class="section latest-posts">
23-
<h2 class="section-title">Latest Posts</h2>
24-
<ul class="post-list">
25-
{% for post in latest_posts %}
26-
<li>{% include "molecules-media-block" %}</li>
27-
{% endfor %}
28-
</ul>
29-
<a href="#" class="text-btn">View more posts</a>
30-
</section>
31-
</div><!--end .l-main-->
19+
{% endblock %}
20+
21+
{% block main %}
22+
<section class="section latest-posts">
23+
<h2 class="section-title">Latest Posts</h2>
24+
<ul class="post-list">
25+
{% for post in latest_posts %}
26+
<li>{% include "molecules-media-block" %}</li>
27+
{% endfor %}
28+
</ul>
29+
<a href="#" class="text-btn">View more posts</a>
30+
</section>
31+
{% endblock %}
3232

33-
<div class="l-sidebar">
34-
{% include "organisms-recent-tweets" %}
35-
</div><!--end .l-sidebar-->
36-
</div><!--end .l-two-col-->
33+
{% block sidebar %}
34+
{% include "organisms-recent-tweets" %}
3735
{% endblock %}

‎dist/_patterns/03-templates/02-blog.twig

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
{% extends "templates-site" %}
2-
{% block content %}
3-
<h1 class="section-title">Our Outdoor Blog</h1>
4-
<div class="l-two-col">
5-
<div class="l-main">
6-
{% include "organisms-latest-posts" %}
7-
{% include "molecules-pagination" %}
8-
</div><!--end l-main-->
2+
{% block title %}<h1 class="section-title">Our Outdoor Blog</h1>{% endblock %}
93

10-
<div class="l-sidebar">
11-
{% include "organisms-recent-tweets" %}
12-
</div><!--end l-sidebar-->
13-
</div><!--end two-col-->
4+
{% block main %}
5+
{% include "organisms-latest-posts" %}
6+
{% include "molecules-pagination" %}
7+
{% endblock %}
8+
9+
{% block sidebar %}
10+
{% include "organisms-recent-tweets" %}
1411
{% endblock %}

‎dist/_patterns/03-templates/03-article.twig

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
{% extends "templates-site" %}
2-
{% block content %}
3-
<div class="l-two-col">
4-
<div class="l-main">
5-
<article class="article">
6-
<header class="article-header">
7-
<h1>Article Headline Lorem ipsum dolor sit aweofij</h1>
8-
{% include "molecules-byline" %}
9-
</header>
10-
{% include "organisms-article-body" %}
11-
</article><!--end .article-->
12-
{% include "molecules-social-share" %}
13-
{% include "organisms-comment-thread" %}
14-
</div><!--end l-main-->
1+
{% extends "templates-page-2col" %}
2+
{% block main %}
3+
<article class="article">
4+
<header class="article-header">
5+
<h1>Article Headline Lorem ipsum dolor sit aweofij</h1>
6+
{% include "molecules-byline" %}
7+
</header>
8+
{% include "organisms-article-body" %}
9+
</article><!--end .article-->
10+
{% include "molecules-social-share" %}
11+
{% include "organisms-comment-thread" %}
12+
{% endblock %}
1513

16-
<div class="l-sidebar">
17-
{% include "organisms-related-posts" %}
18-
{% include "organisms-recent-tweets" %}
19-
</div><!--end l-sidebar-->
20-
</div><!--end l-two-col-->
21-
{% endblock %}
14+
{% block sidebar %}
15+
{% include "organisms-related-posts" %}
16+
{% include "organisms-recent-tweets" %}
17+
{% endblock %}

‎dist/_patterns/03-templates/03-article2.twig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{% extends "templates-page-1col" %}
2+
{% block main %}
3+
<article class="article">
4+
<header class="article-header">
5+
<h1>Article Headline Lorem ipsum dolor sit aweofij</h1>
6+
{% include "molecules-byline" %}
7+
</header>
8+
{% include "organisms-article-body" %}
9+
</article><!--end .article-->
10+
{% include "molecules-social-share" %}
11+
{% include "organisms-comment-thread" %}
12+
{% endblock %}

0 commit comments

Comments
 (0)